Hi, as I said - better than before, no errors anymore while checking and applying 'ipv6.patch': ***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*** Patch applied: ***SNIP*** root(a)Devel: /home/matz/ipfire-2.x # git status Auf Branch ipv6_in_fw_logs Änderungen, die nicht zum Commit vorgemerkt sind: (benutzen Sie "git add ...", um die Änderungen zum Commit vorzumerken) (benutzen Sie "git checkout -- ...", um die Änderungen im Arbeitsverzeichnis zu verwerfen) geändert: html/cgi-bin/logs.cgi/firewalllog.dat geändert: html/cgi-bin/logs.cgi/firewalllogcountry.dat geändert: html/cgi-bin/logs.cgi/firewalllogip.dat geändert: html/cgi-bin/logs.cgi/firewalllogport.dat geändert: html/cgi-bin/logs.cgi/showrequestfromcountry.dat geändert: html/cgi-bin/logs.cgi/showrequestfromip.dat geändert: html/cgi-bin/logs.cgi/showrequestfromport.dat Unversionierte Dateien: (benutzen Sie "git add ...", um die Änderungen zum Commit vorzumerken) ipv6.patch ***SNAP*** 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 significant differences so far. Until now. Best, Matthias On 10.01.2016 15:12, Matthias Fischer wrote: > Hi (answering, I added list), > > Ok, this looks better than before: ;-) > > ***SNIP*** > root(a)Devel: /home/matz/ipfire-2.x # git apply ipv6.patch > ipv6.patch:258: trailing whitespace. > $srcaddr = $1 > ipv6.patch:289: space before tab in indent. > if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ > kernel:.*(IN=.*)$/) { > ipv6.patch:326: trailing whitespace. > my $iface = ''; > ipv6.patch:328: trailing whitespace. > if ($packet =~ /PHYSIN=(\w+)/) { $iface = $1 } elsif ($packet =~ > /IN=(\w+)/) { $iface = $1 } > ipv6.patch:584: trailing whitespace. > my $chain = $3; > warning: unterdrückte 2 Whitespace-Fehler > warning: 7 Zeilen fügen Whitespace-Fehler hinzu. > ***SNAP*** > > Best, > Matthias > > On 10.01.2016 11:50, Michael Eitelwein wrote: >> Hi Michael, Matthias >> >> Sorry for creating these issues. To summarize what happened: >> >> * The patches which I shared on developer were obviously generated >> wrongly >> using "/git diff" >> >> / >> * I resupplied the patch to Matthias generated with "/git format-patch >> origin/master —stdout > ipv6.patch/“. This single file contains >> the 4 >> individual patches which form ipv6 support in ipfire logs UI. >> >> * As I messed up tabs and whitespace I cleaned this up generating a >> 5th patch. >> >> * I mailed all 5 resulting patches as individual files >> (ipv6_new-*.patch) to >> Michael to also request a login for git.ipfire.org >> >> >> >> * I generated an account on github and verified that I can apply >> these patches >> to a fork of ipfire-2.x.git >> >> >> 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. >> >> 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. >> >> 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. >> >> Michael >> >> ------------------- >> >> Using 5 individual patch files (ipv6_new-*.patch) >> >> 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* >> >> 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./ >> >> MichaelsMacBook:git michael$ *cd ipfire-2.x/* >> >> 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…/ >> >> MichaelsMacBook:ipfire-2.x michael$ *git apply --whitespace=fix >> ~/git/ipv6_new-1.patch* >> //Users/michael/git/ipv6_new-1.patch:190: trailing whitespace./ >> >> // >> >> //Users/michael/git/ipv6_new-1.patch:258: trailing whitespace./ >> / $srcaddr = $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=.*)$/) {/ >> //Users/michael/git/ipv6_new-1.patch:326: trailing whitespace./ >> / my $iface = ''; / >> /warning: squelched 4 whitespace errors/ >> /warning: 4 lines applied after fixing whitespace errors./ >> >> MichaelsMacBook:ipfire-2.x michael$ *git apply --whitespace=fix >> ~/git/ipv6_new-2.patch* >> >> MichaelsMacBook:ipfire-2.x michael$ *git apply --whitespace=fix >> ~/git/ipv6_new-3.patch* >> //Users/michael/git/ipv6_new-3.patch:30: trailing whitespace./ >> / my $chain = $3; / >> /warning: 1 line applied after fixing whitespace errors./ >> >> MichaelsMacBook:ipfire-2.x michael$ *git apply --whitespace=fix >> ~/git/ipv6_new-4.patch* >> //Users/michael/git/ipv6_new-4.patch:21: trailing whitespace./ >> / my $chain = $3; / >> //Users/michael/git/ipv6_new-4.patch:74: trailing whitespace./ >> / $srcaddr = $1; / >> //Users/michael/git/ipv6_new-4.patch:79: space before tab in >> indent./ >> / if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ >> kernel:.*(IN=.*)$/) {/ >> //Users/michael/git/ipv6_new-4.patch:95: trailing whitespace./ >> / my $iface = ''; / >> //Users/michael/git/ipv6_new-4.patch:99: trailing whitespace./ >> / if ($packet =~ /PHYSIN=(\w+)/) { $iface = $1; } elsif ($packet =~ >> /IN=(\w+)/) { $iface = $1; } / >> /warning: 2 lines applied after fixing whitespace errors./ >> >> MichaelsMacBook:ipfire-2.x michael$ *git apply --whitespace=fix >> ~/git/ipv6_new-5.patch* >> //Users/michael/git/ipv6_new-5.patch:157: trailing whitespace./ >> >> // >> >> //Users/michael/git/ipv6_new-5.patch:313: trailing whitespace./ >> >> // >> >> //Users/michael/git/ipv6_new-5.patch:352: trailing whitespace./ >> /print "selected='selected' "; / >> //Users/michael/git/ipv6_new-5.patch:370: trailing whitespace./ >> /for (my $day = 1; $day <= 31; $day++) / >> //Users/michael/git/ipv6_new-5.patch:378: trailing whitespace./ >> /print "selected='selected' "; / >> /warning: squelched 54 whitespace errors/ >> /warning: 47 lines applied after fixing whitespace errors./ >> >> >> Using one summarized patch file (ipv6.patch) >> >> 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./ >> >> 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=fix >> ~/git/ipv6.patch* >> //Users/michael/git/ipv6.patch:190: trailing whitespace./ >> >> / >> / >> >> //Users/michael/git/ipv6.patch:258: trailing whitespace./ >> / $srcaddr = $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=.*)$/) {/ >> //Users/michael/git/ipv6.patch:326: trailing whitespace./ >> / my $iface = ''; / >> /warning: squelched 10 whitespace errors/ >> /warning: 7 lines applied after fixing whitespace errors./ >> >> > >