Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh
index 5e09240bcd74d4d4144b4b44e7f4f4e79f9996d7..270da2137e2a2397d6ecab505abde65812f1e4a8 100644 (file)
--- a/config/rootfiles/core/90/update.sh
+++ b/config/rootfiles/core/90/update.sh
@@ -172,6 +172,11 @@ if [ ! -e "/var/ipfire/fwhosts/customgeoipgrp" ]; then
        chown nobody:nobody /var/ipfire/fwhosts/customgeoipgrp
 fi
 
+#Fix BUG10812 (openvpn server.conf has wrong collectd logfile path)
+if grep -q "status /var/log/ovpnserver.log 30" /var/ipfire/ovpnserver.conf; then
+       sed -i "s/\/var\/log\/ovpnserver.log 30/\/var\/run\/ovpnserver.log 30/" /var/ipfire/ovpn/server.conf
+fi
+
 # Download/Update GeoIP databases.
 /usr/local/bin/xt_geoip_update
 

diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl
index 68912358486d1f2373495e0fbe7169481a40f81d..779ecf81039bd3c5c5b2c1b298e95dd4de34c6b8 100644 (file)
--- a/src/squid-accounting/acct-lib.pl
+++ b/src/squid-accounting/acct-lib.pl
@@ -337,7 +337,12 @@ sub getmonth{
                my $monat=$_[0]-1 if($_[0]);
                my $tag=1;
                my $time1=timelocal(0,0,0,$tag,$monat,$jahr);
-               my $time2=timelocal(0,0,0,$tag,($monat+1),$jahr);
+               my $time2=0;
+               if (($monat+1) == 12){
+                       $time2=timelocal(0,0,0,$tag,0,$jahr+1);
+               }else{
+                       $time2=timelocal(0,0,0,$tag,$monat+1,$jahr);
+               }
                --$time2;
                return ($time1,$time2);
 }