From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Eitelwein To: development@lists.ipfire.org Subject: Re: ipv6-Patch (was: Re: Probleme mit ipv6 Patch) Date: Sun, 10 Jan 2016 17:38:13 +0100 Message-ID: <9AC9E01B-CF40-4F40-BA81-DC9181A8C197@eitelwein.net> In-Reply-To: <56926D31.8010107@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2638838685817094136==" List-Id: --===============2638838685817094136== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Good, thanks, then I will repost the patch in the correct formatting (git for= mat-patch) later this evening. Michael > Am 10.01.2016 um 15:39 schrieb Matthias Fischer : >=20 > Hi, >=20 > as I said - better than before, no errors anymore while checking and applyi= ng 'ipv6.patch': >=20 > ***SNIP*** > root(a)Devel: /home/matz/ipfire-2.x # git apply --check ipv6.patch > root(a)Devel: /home/matz/ipfire-2.x # git apply --stat ipv6.patch > html/cgi-bin/logs.cgi/firewalllog.dat | 14 +++- > html/cgi-bin/logs.cgi/firewalllogcountry.dat | 43 +++++++----- > html/cgi-bin/logs.cgi/firewalllogip.dat | 15 ++-- > html/cgi-bin/logs.cgi/firewalllogport.dat | 12 +-- > html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 81 ++++++++++++++++---= --- > html/cgi-bin/logs.cgi/showrequestfromip.dat | 27 ++++--- > html/cgi-bin/logs.cgi/showrequestfromport.dat | 14 ++-- > html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 8 +- > html/cgi-bin/logs.cgi/showrequestfromip.dat | 2 - > html/cgi-bin/logs.cgi/showrequestfromport.dat | 2 - > html/cgi-bin/logs.cgi/firewalllog.dat | 20 +++-- > html/cgi-bin/logs.cgi/firewalllog.dat | 2 - > html/cgi-bin/logs.cgi/firewalllogcountry.dat | 8 +- > html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 22 +++--- > html/cgi-bin/logs.cgi/showrequestfromip.dat | 6 +- > html/cgi-bin/logs.cgi/showrequestfromport.dat | 6 +- > 16 files changed, 169 insertions(+), 113 deletions(-) > ***SNAP*** >=20 > Patch applied: >=20 > ***SNIP*** > root(a)Devel: /home/matz/ipfire-2.x # git status > Auf Branch ipv6_in_fw_logs > =C3=84nderungen, die nicht zum Commit vorgemerkt sind: > (benutzen Sie "git add ...", um die =C3=84nderungen zum Commit vorz= umerken) > (benutzen Sie "git checkout -- ...", um die =C3=84nderungen im Arbe= itsverzeichnis zu verwerfen) >=20 > ge=C3=A4ndert: html/cgi-bin/logs.cgi/firewalllog.dat > ge=C3=A4ndert: html/cgi-bin/logs.cgi/firewalllogcountry.dat > ge=C3=A4ndert: html/cgi-bin/logs.cgi/firewalllogip.dat > ge=C3=A4ndert: html/cgi-bin/logs.cgi/firewalllogport.dat > ge=C3=A4ndert: html/cgi-bin/logs.cgi/showrequestfromcountry.dat > ge=C3=A4ndert: html/cgi-bin/logs.cgi/showrequestfromip.dat > ge=C3=A4ndert: html/cgi-bin/logs.cgi/showrequestfromport.dat >=20 > Unversionierte Dateien: > (benutzen Sie "git add ...", um die =C3=84nderungen zum Commit vorz= umerken) >=20 > ipv6.patch > ***SNAP*** >=20 > I transferred the patched files to my productive machine (no risk, no fun!)= and browsed through the various FW-logs. Using a non-ipv6-setup I can see no= errors in display, no errors in '/var/log/httpd/error_log', no problems or s= ignificant differences so far. Until now. >=20 > Best, > Matthias >=20 > On 10.01.2016 15:12, Matthias Fischer wrote: >> Hi (answering, I added list), >>=20 >> Ok, this looks better than before: ;-) >>=20 >> ***SNIP*** >> root(a)Devel: /home/matz/ipfire-2.x # git apply ipv6.patch >> ipv6.patch:258: trailing whitespace. >> $srcaddr =3D $1 >> ipv6.patch:289: space before tab in indent. >> if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ >> kernel:.*(IN=3D.*)$/) { >> ipv6.patch:326: trailing whitespace. >> my $iface =3D ''; >> ipv6.patch:328: trailing whitespace. >> if ($packet =3D~ /PHYSIN=3D(\w+)/) { $iface =3D $1 } elsif ($packet =3D~ >> /IN=3D(\w+)/) { $iface =3D $1 } >> ipv6.patch:584: trailing whitespace. >> my $chain =3D $3; >> warning: unterdr=C3=BCckte 2 Whitespace-Fehler >> warning: 7 Zeilen f=C3=BCgen Whitespace-Fehler hinzu. >> ***SNAP*** >>=20 >> Best, >> Matthias >>=20 >> On 10.01.2016 11:50, Michael Eitelwein wrote: >>> Hi Michael, Matthias >>>=20 >>> Sorry for creating these issues. To summarize what happened: >>>=20 >>> * The patches which I shared on developer were obviously generated >>> wrongly >>> using "/git diff" >>>=20 >>> / >>> * I resupplied the patch to Matthias generated with "/git format-patch >>> origin/master =E2=80=94stdout > ipv6.patch/=E2=80=9C. This single fil= e contains >>> the 4 >>> individual patches which form ipv6 support in ipfire logs UI. >>>=20 >>> * As I messed up tabs and whitespace I cleaned this up generating a >>> 5th patch. >>>=20 >>> * I mailed all 5 resulting patches as individual files >>> (ipv6_new-*.patch) to >>> Michael to also request a login for git.ipfire.org >>> >>>=20 >>>=20 >>> * I generated an account on github and verified that I can apply >>> these patches >>> to a fork of ipfire-2.x.git >>>=20 >>>=20 >>> To verify with git.ipfire.org , I removed and >>> re-installed git and all repositories on my laptop this morning. As >>> you can see >>> in the log below, I can successfully use the complete patch which I >>> mailed to >>> Matthias (ipv6.patch) as well as the split version of 5 individual >>> patches >>> (ipv6_new-*.patch) which I sent to Michael. >>>=20 >>> Does it now work for you as well or what do I have to change? Should I >>> work on >>> next rather than master? I do not think it matters in this case, as I am >>> probably the only one working on these files. >>>=20 >>> Should we have this conversation via developer? I felt hesitant to >>> publish >>> another patch as long as I were not sure it can be applied correctly. >>>=20 >>> Michael >>>=20 >>> ------------------- >>>=20 >>> Using 5 individual patch files (ipv6_new-*.patch) >>>=20 >>> MichaelsMacBook:~ michael$ *mkdir git* >>> MichaelsMacBook:~ michael$ *git config --global user.name "Your >>> Name Comes >>> Here"* >>> MichaelsMacBook:~ michael$ *git config --global user.name >>> "Michael Eitelwein"* >>> MichaelsMacBook:~ michael$ *git config --global user.email >>> michael(a)eitelwein.net * >>> MichaelsMacBook:~ michael$ *git config --global color.ui auto* >>> MichaelsMacBook:~ michael$ *cd git* >>>=20 >>> MichaelsMacBook:git michael$ *git clone >>> git://git.ipfire.org/ipfire-2.x.git* >>> /Cloning into 'ipfire-2.x'.../ >>> /remote: Counting objects: 85859, done./ >>> /remote: Compressing objects: 100% (26263/26263), done./ >>> /remote: Total 85859 (delta 57398), reused 85030 (delta 56569)/ >>> /Receiving objects: 100% (85859/85859), 44.85 MiB | 2.08 MiB/s, >>> done./ >>> /Resolving deltas: 100% (57398/57398), done./ >>> /Checking connectivity... done./ >>>=20 >>> MichaelsMacBook:git michael$ *cd ipfire-2.x/* >>>=20 >>> MichaelsMacBook:ipfire-2.x michael$ *git apply --check -v >>> ~/git/ipv6_new-1.patch* >>> /Checking patch html/cgi-bin/logs.cgi/firewalllog.dat.../ >>> /Checking patch html/cgi-bin/logs.cgi/firewalllogcountry.dat.../ >>> /Checking patch html/cgi-bin/logs.cgi/firewalllogip.dat.../ >>> /Checking patch html/cgi-bin/logs.cgi/firewalllogport.dat.../ >>> /Checking patch html/cgi-bin/logs.cgi/showrequestfromcountry.dat.../ >>> /Checking patch html/cgi-bin/logs.cgi/showrequestfromip.dat.../ >>> /Checking patch html/cgi-bin/logs.cgi/showrequestfromport.dat=E2=80= =A6/ >>>=20 >>> MichaelsMacBook:ipfire-2.x michael$ *git apply --whitespace=3Dfix >>> ~/git/ipv6_new-1.patch* >>> //Users/michael/git/ipv6_new-1.patch:190: trailing whitespace./ >>>=20 >>> // >>>=20 >>> //Users/michael/git/ipv6_new-1.patch:258: trailing whitespace./ >>> / $srcaddr =3D $1 / >>> //Users/michael/git/ipv6_new-1.patch:277: trailing whitespace./ >>> /close (FILE);/ >>> //Users/michael/git/ipv6_new-1.patch:289: space before tab in >>> indent./ >>> / if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ >>> kernel:.*(IN=3D.*)$/) {/ >>> //Users/michael/git/ipv6_new-1.patch:326: trailing whitespace./ >>> / my $iface =3D ''; / >>> /warning: squelched 4 whitespace errors/ >>> /warning: 4 lines applied after fixing whitespace errors./ >>>=20 >>> MichaelsMacBook:ipfire-2.x michael$ *git apply --whitespace=3Dfix >>> ~/git/ipv6_new-2.patch* >>>=20 >>> MichaelsMacBook:ipfire-2.x michael$ *git apply --whitespace=3Dfix >>> ~/git/ipv6_new-3.patch* >>> //Users/michael/git/ipv6_new-3.patch:30: trailing whitespace./ >>> / my $chain =3D $3; / >>> /warning: 1 line applied after fixing whitespace errors./ >>>=20 >>> MichaelsMacBook:ipfire-2.x michael$ *git apply --whitespace=3Dfix >>> ~/git/ipv6_new-4.patch* >>> //Users/michael/git/ipv6_new-4.patch:21: trailing whitespace./ >>> / my $chain =3D $3; / >>> //Users/michael/git/ipv6_new-4.patch:74: trailing whitespace./ >>> / $srcaddr =3D $1; / >>> //Users/michael/git/ipv6_new-4.patch:79: space before tab in >>> indent./ >>> / if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ >>> kernel:.*(IN=3D.*)$/) {/ >>> //Users/michael/git/ipv6_new-4.patch:95: trailing whitespace./ >>> / my $iface =3D ''; / >>> //Users/michael/git/ipv6_new-4.patch:99: trailing whitespace./ >>> / if ($packet =3D~ /PHYSIN=3D(\w+)/) { $iface =3D $1; } elsif ($pack= et =3D~ >>> /IN=3D(\w+)/) { $iface =3D $1; } / >>> /warning: 2 lines applied after fixing whitespace errors./ >>>=20 >>> MichaelsMacBook:ipfire-2.x michael$ *git apply --whitespace=3Dfix >>> ~/git/ipv6_new-5.patch* >>> //Users/michael/git/ipv6_new-5.patch:157: trailing whitespace./ >>>=20 >>> // >>>=20 >>> //Users/michael/git/ipv6_new-5.patch:313: trailing whitespace./ >>>=20 >>> // >>>=20 >>> //Users/michael/git/ipv6_new-5.patch:352: trailing whitespace./ >>> /print "selected=3D'selected' "; / >>> //Users/michael/git/ipv6_new-5.patch:370: trailing whitespace./ >>> /for (my $day =3D 1; $day <=3D 31; $day++) / >>> //Users/michael/git/ipv6_new-5.patch:378: trailing whitespace./ >>> /print "selected=3D'selected' "; / >>> /warning: squelched 54 whitespace errors/ >>> /warning: 47 lines applied after fixing whitespace errors./ >>>=20 >>>=20 >>> Using one summarized patch file (ipv6.patch) >>>=20 >>> MichaelsMacBook:git michael$ *cd ~/git* >>> MichaelsMacBook:git michael$ *rm -rf ipfire-2.x/* >>> MichaelsMacBook:git michael$ *git clone >>> git://git.ipfire.org/ipfire-2.x.git* >>> /Cloning into 'ipfire-2.x'.../ >>> /remote: Counting objects: 85859, done./ >>> /remote: Compressing objects: 100% (26263/26263), done./ >>> /remote: Total 85859 (delta 57398), reused 85030 (delta 56569)/ >>> /Receiving objects: 100% (85859/85859), 44.85 MiB | 1.09 MiB/s, >>> done./ >>> /Resolving deltas: 100% (57398/57398), done./ >>> /Checking connectivity... done./ >>>=20 >>> MichaelsMacBook:git michael$ *cd ipfire-2.x/* >>> MichaelsMacBook:ipfire-2.x michael$ *git apply --check >>> ~/git/ipv6.patch* >>> MichaelsMacBook:ipfire-2.x michael$ *git apply --whitespace=3Dfix >>> ~/git/ipv6.patch* >>> //Users/michael/git/ipv6.patch:190: trailing whitespace./ >>>=20 >>> / >>> / >>>=20 >>> //Users/michael/git/ipv6.patch:258: trailing whitespace./ >>> / $srcaddr =3D $1 / >>> //Users/michael/git/ipv6.patch:277: trailing whitespace./ >>> /close (FILE);/ >>> //Users/michael/git/ipv6.patch:289: space before tab in indent./ >>> / if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ >>> kernel:.*(IN=3D.*)$/) {/ >>> //Users/michael/git/ipv6.patch:326: trailing whitespace./ >>> / my $iface =3D ''; / >>> /warning: squelched 10 whitespace errors/ >>> /warning: 7 lines applied after fixing whitespace errors./ >>>=20 >>>=20 >>=20 >>=20 >=20 --===============2638838685817094136==--