From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <ahb.ipfire@gmail.com>
To: development@lists.ipfire.org
Subject: Re: OpenVPN-2.5.0 update procedure and idea collector
Date: Sat, 28 Nov 2020 15:12:10 +0100
Message-ID: <9033e836-40a1-0ef2-e285-193151197818@gmail.com>
In-Reply-To: <c8e50e8ab753e15d6688263e90fca924df941901.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0535228987124802314=="
List-Id: <development.lists.ipfire.org>

--===============0535228987124802314==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 in=
stall it today but Erik had some fixes mentioned below. I followed the link a=
nd clicked on patch to download it to my local computer. I then did a git pul=
l on next and then created a local branch from it and ran git am patch-name b=
ut 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=3Ddiff' 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 g=
ot 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 an=
y progress by myself so would appreciate any help on how to solve this so I c=
an build and test the update.

Regards,

Adolf


On 28/11/2020 06:52, ummeegge wrote:
> Hi all,
> made some fixes
>=20
> - --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.
>=20
> New version is here
>=20
> https://git.ipfire.org/?p=3Dpeople/ummeegge/ipfire-2.x.git;a=3Dcommit;h=3D7=
bd13546f3c5e28fd62e25b487e440690860339b
>=20
> located.
>=20
> Best,
>=20
> Erik
>=20
>=20
> 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=3Dpeople/ummeegge/ipfire-2.x.git;a=3Dcommit;h=3D3=
4af1d714178b2cd0c27e8c39052a8c7ce87d116
> feel free to test and criticize it :-) .
>=20
> 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.
>=20
> Happy testing. Best,
>=20
> Erik
>=20
>=20
>=20

--===============0535228987124802314==--