[Buildroot] [PATCH 1/1] package/softether: bump to version 4.30-9700-beta

[Fabrice Fontaine]

Hi Thomas,

Le dim. 27 oct. 2019 à 11:40, Thomas Petazzoni
<thomas.petazzoni at bootlin.com> a écrit :
>
> Hello,
>
> On Sun, 27 Oct 2019 10:56:00 +0100
> Fabrice Fontaine <fontaine.fabrice at gmail.com> wrote:
>
> > - Update first patch
>
> Why is the first patch still there, since it is a patch from upstream ?
> I would have expected it to go away ?
Nope, this patch is from SoftEtherVPN, it has not been backported to
SoftEtherVPN_stable.
>
> Also, your patch overall doesn't apply:
>
> $ git pwam 1184954
> Applying patch #1184954 using "git am -s"
> Description: [1/1] package/softether: bump to version 4.30-9700-beta
> Applying: package/softether: bump to version 4.30-9700-beta
> error: patch failed: package/softether/0010-Encrypt-set-default-RSA-key-size-to-1024-everywhere-.patch:1
> error: package/softether/0010-Encrypt-set-default-RSA-key-size-to-1024-everywhere-.patch: patch does not apply
> Patch failed at 0001 package/softether: bump to version 4.30-9700-beta
> hint: Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 'git am' failed with exit status 128
>
> It is probably not your fault, if I remember correctly, there are some
> DOS-style newlines in softether that always cause problems. Could you
> push your patch somewhere in a Git branch, so that I can pick it up
> directly ?
>
> Note that I will apply Matt's patch that drops the "v" prefix, so if
> you could rebase on that, it would be nice.
OK, done here: https://github.com/ffontaine/buildroot/commit/2b9579264b96d05a199960254d2016054014a74e
>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Regards,

Fabrice