[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 415cbcecfae2330a8c4211dc4c17e8a98ee4f64b

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 415cbcecfae2330a8c4211dc4c17e8a98ee4f64b

[git]

[-- Attachment #1: Type: text/plain, Size: 6981 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  415cbcecfae2330a8c4211dc4c17e8a98ee4f64b (commit)
       via  057aaf42b6c6f82eb14808b5167eec703bcc4989 (commit)
      from  094a27c8f9bf39b5b5b6df1a28d976d9f52e776f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 415cbcecfae2330a8c4211dc4c17e8a98ee4f64b
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sun Apr 30 12:59:23 2017 +0200

    GUI: Some simple FW-Log cosmetics
    
    I altered 'showrequestfromcountry.dat', 'showrequestfromip.dat' and 'showrequestfromport.dat'
    in the same manner as the 'Loggraphs'-Pages in commit
    
    Each 'Details'-page got a unique title.
    
    Furthermore, I added a 'Back'-Button to go back to the previous page. For this, I used
    'back.png' from 'wio' (thanks Stephan! ;-) ) since I found no other appropriate image.
    
    'ipinfo.cgi' got a centered 'Back'-Button, too.
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 057aaf42b6c6f82eb14808b5167eec703bcc4989
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Fri Apr 28 21:29:58 2017 +0200

    BUG 11305: Suggested fix for '/var/log/btmp' permissions
    
    Fixes BUG 11305, for details see:
    https://bugzilla.ipfire.org/show_bug.cgi?id=11305
    
    Best,
    Matthias
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/ipinfo.cgi                          |   2 +-
 html/cgi-bin/logs.cgi/showrequestfromcountry.dat |   6 ++++--
 html/cgi-bin/logs.cgi/showrequestfromip.dat      |   6 ++++--
 html/cgi-bin/logs.cgi/showrequestfromport.dat    |   6 ++++--
 html/html/images/back.png                        | Bin 0 -> 315 bytes
 lfs/stage2                                       |   1 +
 6 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 html/html/images/back.png

Difference in files:
diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi
index 8cefe6e..16541f1 100644
--- a/html/cgi-bin/ipinfo.cgi
+++ b/html/cgi-bin/ipinfo.cgi
@@ -102,7 +102,7 @@ print <<END
 <div align='center'>
 <table width='80%'>
 <tr>
-	<td align='center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></td>
+	<td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td>
 </tr>
 </table>
 </div>
diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
index cd97f87..b6383ed 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
@@ -233,7 +233,7 @@ if ($multifile) {
 }
 
 &Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log country'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 if ($errormessage) {
@@ -292,7 +292,7 @@ END
 
 &Header::closebox();
 
-&Header::openbox('100%', 'left', $Lang::tr{'firewall log'});
+&Header::openbox('100%', 'left', $Lang::tr{'firewall log country'});
 print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
 
 if ($start == -1) {
@@ -415,6 +415,8 @@ END
 
 &oldernewer();
 
+	print"<table width='100%'><tr><td align='center'><a href='/cgi-bin/logs.cgi/firewalllogcountry.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>";
+
 &Header::closebox();
 
 &Header::closebigbox();
diff --git a/html/cgi-bin/logs.cgi/showrequestfromip.dat b/html/cgi-bin/logs.cgi/showrequestfromip.dat
index 154fa40..31cd42c 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromip.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromip.dat
@@ -194,7 +194,7 @@ if ($multifile) {
 }
 
 &Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log ip'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 if ($errormessage) {
@@ -252,7 +252,7 @@ END
 
 &Header::closebox();
 
-&Header::openbox('100%', 'left', $Lang::tr{'firewall log'});
+&Header::openbox('100%', 'left', $Lang::tr{'firewall log ip'});
 print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
 
 if ($start == -1) {
@@ -357,6 +357,8 @@ END
 
 &oldernewer();
 
+	print"<table width='100%'><tr><td align='center'><a href='/cgi-bin/logs.cgi/firewalllogip.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>";
+
 &Header::closebox();
 
 &Header::closebigbox();
diff --git a/html/cgi-bin/logs.cgi/showrequestfromport.dat b/html/cgi-bin/logs.cgi/showrequestfromport.dat
index e1f00ae..004a00e 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromport.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromport.dat
@@ -202,7 +202,7 @@ if ($multifile) {
 }
 
 &Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log port'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 if ($errormessage) {
@@ -260,7 +260,7 @@ END
 
 &Header::closebox();
 
-&Header::openbox('100%', 'left', $Lang::tr{'firewall log'});
+&Header::openbox('100%', 'left', $Lang::tr{'firewall log port'});
 print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
 
 if ($start == -1) {
@@ -367,6 +367,8 @@ END
 
 &oldernewer();
 
+	print"<table width='100%'><tr><td align='center'><a href='/cgi-bin/logs.cgi/firewalllogport.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>";
+
 &Header::closebox();
 
 &Header::closebigbox();
diff --git a/html/html/images/back.png b/html/html/images/back.png
new file mode 100644
index 0000000..66921af
Binary files /dev/null and b/html/html/images/back.png differ
diff --git a/lfs/stage2 b/lfs/stage2
index 2d2a645..1256fd3 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -127,6 +127,7 @@ endif
 	-mkdir -pv /var/log/{counter,calamaris}
 	chown nobody.nobody /var/log/calamaris
 	touch /var/log/{btmp,lastlog,wtmp}
+	chmod -v 600 /var/log/btmp
 	chgrp -v utmp /var/log/lastlog
 	chmod -v 664 /var/log/lastlog
 


hooks/post-receive
--
IPFire 2.x development tree