From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: OpenVPN-2.5.0 update procedure and idea collector Date: Sat, 28 Nov 2020 17:00:54 +0100 Message-ID: In-Reply-To: <9033e836-40a1-0ef2-e285-193151197818@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6037039570762047216==" List-Id: --===============6037039570762047216== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi All, I may have found a solution. I downloaded the whole files and copied them int= o my local repo branch copy. IPFire is building now. Will see if everything c= ompletes okay. Regards, Adolf On 28/11/2020 15:12, Adolf Belka wrote: > Hi All, > > I am having problems getting the latest patch from Erik to apply to my loca= l 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 p= ull on next and then created a local branch from it and ran git am patch-name= but it came back with the following error. > > =C2=A0=C2=A0=C2=A0=C2=A0git am ipfire-2.x.git-7bd13546f3c5e28fd62e25b487e44= 0690860339b.patch > =C2=A0=C2=A0=C2=A0=C2=A0Applying: OpenVPN: Introduce advanced encryption se= ction > =C2=A0=C2=A0=C2=A0=C2=A0error: patch failed: langs/de/cgi-bin/de.pl:894 > =C2=A0=C2=A0=C2=A0=C2=A0error: langs/de/cgi-bin/de.pl: patch does not apply > =C2=A0=C2=A0=C2=A0=C2=A0Patch failed at 0001 OpenVPN: Introduce advanced en= cryption section > =C2=A0=C2=A0=C2=A0=C2=A0hint: Use 'git am --show-current-patch=3Ddiff' to s= ee the failed patch > =C2=A0=C2=A0=C2=A0=C2=A0When you have resolved this problem, run "git am --= continue". > =C2=A0=C2=A0=C2=A0=C2=A0If you prefer to skip this patch, run "git am --ski= p" instead. > =C2=A0=C2=A0=C2=A0=C2=A0To restore the original branch and stop patching, r= un "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 i= s still within the ovpnmain.cgi diff section. > > > I downloaded the diff for just ovpnmain.cgi and tried applying it but again= got an error. > > =C2=A0=C2=A0=C2=A0=C2=A0git apply ovpnmain.diff > =C2=A0=C2=A0=C2=A0=C2=A0error: patch failed: html/cgi-bin/ovpnmain.cgi:325 > =C2=A0=C2=A0=C2=A0=C2=A0error: html/cgi-bin/ovpnmain.cgi: patch does not ap= ply > > 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. >> =C2=A0=C2=A0=C2=A0=C2=A0 Fixes tls-crypt key generation. >> - Fixed comments and changed box size to prevent line break. >> >> New version is here >> >> https://git.ipfire.org/?p=3Dpeople/ummeegge/ipfire-2.x.git;a=3Dcommit;h=3D= 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=3Dpeople/ummeegge/ipfire-2.x.git;a=3Dcommit;h=3D= 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 >> >> >> --===============6037039570762047216==--