Hi All,

I am having problems getting the latest patch from Erik to apply to my local repo.

The previous version worked well. I successfully built it and was going to install it today but Erik had some fixes mentioned below. I followed the link and clicked on patch to download it to my local computer. I then did a git pull on next and then created a local branch from it and ran git am patch-name but it came back with the following error.

	git am ipfire-2.x.git-7bd13546f3c5e28fd62e25b487e440690860339b.patch
	Applying: OpenVPN: Introduce advanced encryption section
	error: patch failed: langs/de/cgi-bin/de.pl:894
	error: langs/de/cgi-bin/de.pl: patch does not apply
	Patch failed at 0001 OpenVPN: Introduce advanced encryption section
	hint: Use 'git am --show-current-patch=diff' 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".

I tried re-downloading the patch but the same thing happened.
The fail mentions line number 894 against de.pl but in the patch line 894 is still within the ovpnmain.cgi diff section.


I downloaded the diff for just ovpnmain.cgi and tried applying it but again got an error.

	git apply ovpnmain.diff
	error: patch failed: html/cgi-bin/ovpnmain.cgi:325
	error: html/cgi-bin/ovpnmain.cgi: patch does not apply

The fail location this time is in a different part of ovpnmain.cgi

I am probably doing something fundamentally wrong but I am failing to make any progress by myself so would appreciate any help on how to solve this so I can build and test the update.

Regards,

Adolf


On 28/11/2020 06:52, ummeegge wrote:
> Hi all,
> made some fixes
> 
> - --tls-auth will now be displayed and saved correctly.
> - de.pl needed other 'save-enc-options' name since it was a double.
>      Fixes tls-crypt key generation.
> - Fixed comments and changed box size to prevent line break.
> 
> New version is here
> 
> https://git.ipfire.org/?p=people/ummeegge/ipfire-2.x.git;a=commit;h=7bd13546f3c5e28fd62e25b487e440690860339b
> 
> located.
> 
> Best,
> 
> Erik
> 
> 
> Am Donnerstag, den 26.11.2020, 19:47 +0100 schrieb ummeegge:
> Hi all,
> for the interested ones, have push the current state to my repo which
> can be found in here -->
> https://git.ipfire.org/?p=people/ummeegge/ipfire-2.x.git;a=commit;h=34af1d714178b2cd0c27e8c39052a8c7ce87d116
> feel free to test and criticize it :-) .
> 
> After integration and configuration, the 'save' button in the global
> section should also be pushed since --cipher will replaced by --data-
> channel-fallback. For the langs files, a update-lang-cache should be
> executed via console so the changes can take affect.
> 
> Happy testing. Best,
> 
> Erik
> 
> 
>