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

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 40c1bc87eba1c852b23dbc9230b996d04b2ac576..c3fb43eeb83246e3a31efffb5ecf5503d85210ce 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -257,11 +257,11 @@ sub updateloadgraph {
                "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE",
                "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE",
                "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE",
-               "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":",
+               "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'},
                "GPRINT:load1:LAST:%5.2lf",
-               "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":",
+               "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'},
                "GPRINT:load5:LAST:%5.2lf",
-               "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":",
+               "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'},
                "GPRINT:load15:LAST:%5.2lf\\j",
                "LINE1:load5".$color{"color13"},
                "LINE1:load1".$color{"color18"},
@@ -519,7 +519,7 @@ sub updatediskgraph {
                "CDEF:writen=write,-1,*",
                "DEF:standby=".$mainsettings{'RRDLOG'}."/hddshutdown-".$disk.".rrd:standby:AVERAGE",
                "CDEF:st=standby,INF,*",
-               "CDEF:st1=standby,-INF,*",
+               "CDEF:st1=standby,NEGINF,*",
                "COMMENT:".sprintf("%-25s",$Lang::tr{'caption'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),

diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool
index c957d523bdfa7a25644a0217f536db4924bb8da0..738fe37105a45bfddc1a900ae25430fbb8932ab6 100644 (file)
--- a/config/rootfiles/common/rrdtool
+++ b/config/rootfiles/common/rrdtool
@@ -1,5 +1,7 @@
 #srv/web/ipfire/html/graphs
 usr/bin/rrdcached
+#usr/bin/rrdcreate
+#usr/bin/rrdinfo
 usr/bin/rrdtool
 usr/bin/rrdupdate
 #usr/include/rrd.h
@@ -9,12 +11,12 @@ usr/bin/rrdupdate
 #usr/lib/librrd.la
 #usr/lib/librrd.so
 usr/lib/librrd.so.4
-usr/lib/librrd.so.4.2.0
+usr/lib/librrd.so.4.3.0
 #usr/lib/librrd_th.a
 #usr/lib/librrd_th.la
 #usr/lib/librrd_th.so
 usr/lib/librrd_th.so.4
-usr/lib/librrd_th.so.4.2.0
+usr/lib/librrd_th.so.4.3.0
 usr/lib/perl5/site_perl/5.12.3/RRDp.pm
 usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDp
@@ -24,98 +26,98 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.bs
 usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so
 #usr/lib/pkgconfig/librrd.pc
-#usr/share/doc/rrdtool-1.4.7
-#usr/share/doc/rrdtool-1.4.7/html
-#usr/share/doc/rrdtool-1.4.7/html/RRDp.html
-#usr/share/doc/rrdtool-1.4.7/html/RRDs.html
-#usr/share/doc/rrdtool-1.4.7/html/bin_dec_hex.html
-#usr/share/doc/rrdtool-1.4.7/html/cdeftutorial.html
-#usr/share/doc/rrdtool-1.4.7/html/index.html
-#usr/share/doc/rrdtool-1.4.7/html/librrd.html
-#usr/share/doc/rrdtool-1.4.7/html/rpntutorial.html
-#usr/share/doc/rrdtool-1.4.7/html/rrd-beginners.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdbuild.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdcached.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdcgi.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdcreate.html
-#usr/share/doc/rrdtool-1.4.7/html/rrddump.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdfetch.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdfirst.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdflushcached.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdgraph.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_data.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_examples.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_graph.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_rpn.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdinfo.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdlast.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdlastupdate.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdresize.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdrestore.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdthreads.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdtool.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdtune.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdtutorial.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdupdate.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdxport.html
-#usr/share/doc/rrdtool-1.4.7/txt
-#usr/share/doc/rrdtool-1.4.7/txt/bin_dec_hex.pod
-#usr/share/doc/rrdtool-1.4.7/txt/bin_dec_hex.txt
-#usr/share/doc/rrdtool-1.4.7/txt/cdeftutorial.pod
-#usr/share/doc/rrdtool-1.4.7/txt/cdeftutorial.txt
-#usr/share/doc/rrdtool-1.4.7/txt/librrd.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rpntutorial.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rpntutorial.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrd-beginners.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrd-beginners.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdbuild.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdbuild.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdcached.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdcached.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdcgi.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdcgi.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdcreate.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdcreate.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrddump.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrddump.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdfetch.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdfetch.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdfirst.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdfirst.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdflushcached.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdflushcached.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_data.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_data.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_examples.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_examples.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_graph.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_graph.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_rpn.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_rpn.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdinfo.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdinfo.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdlast.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdlast.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdlastupdate.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdlastupdate.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdresize.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdresize.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdrestore.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdrestore.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdthreads.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdthreads.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdtool.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdtool.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdtune.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdtune.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdtutorial.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdtutorial.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdupdate.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdupdate.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdxport.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdxport.txt
+#usr/share/doc/rrdtool-1.5.3
+#usr/share/doc/rrdtool-1.5.3/html
+#usr/share/doc/rrdtool-1.5.3/html/RRDp.html
+#usr/share/doc/rrdtool-1.5.3/html/RRDs.html
+#usr/share/doc/rrdtool-1.5.3/html/bin_dec_hex.html
+#usr/share/doc/rrdtool-1.5.3/html/cdeftutorial.html
+#usr/share/doc/rrdtool-1.5.3/html/index.html
+#usr/share/doc/rrdtool-1.5.3/html/librrd.html
+#usr/share/doc/rrdtool-1.5.3/html/rpntutorial.html
+#usr/share/doc/rrdtool-1.5.3/html/rrd-beginners.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdbuild.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdcached.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdcgi.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdcreate.html
+#usr/share/doc/rrdtool-1.5.3/html/rrddump.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdfetch.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdfirst.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdflushcached.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdgraph.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_data.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_examples.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_graph.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_rpn.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdinfo.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdlast.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdlastupdate.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdresize.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdrestore.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdthreads.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdtool.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdtune.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdtutorial.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdupdate.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdxport.html
+#usr/share/doc/rrdtool-1.5.3/txt
+#usr/share/doc/rrdtool-1.5.3/txt/bin_dec_hex.pod
+#usr/share/doc/rrdtool-1.5.3/txt/bin_dec_hex.txt
+#usr/share/doc/rrdtool-1.5.3/txt/cdeftutorial.pod
+#usr/share/doc/rrdtool-1.5.3/txt/cdeftutorial.txt
+#usr/share/doc/rrdtool-1.5.3/txt/librrd.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rpntutorial.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rpntutorial.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrd-beginners.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrd-beginners.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdbuild.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdbuild.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdcached.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdcached.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdcgi.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdcgi.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdcreate.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdcreate.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrddump.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrddump.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdfetch.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdfetch.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdfirst.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdfirst.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdflushcached.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdflushcached.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_data.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_data.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_examples.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_examples.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_graph.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_graph.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_rpn.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_rpn.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdinfo.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdinfo.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdlast.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdlast.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdlastupdate.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdlastupdate.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdresize.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdresize.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdrestore.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdrestore.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdthreads.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdthreads.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdtool.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdtool.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdtune.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdtune.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdtutorial.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdtutorial.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdupdate.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdupdate.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdxport.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdxport.txt
 #usr/share/man/man1/bin_dec_hex.1
 #usr/share/man/man1/cdeftutorial.1
 #usr/share/man/man1/rpntutorial.1

diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index 5da892bbdf81ba0e403eb9b936eca1c36aff8c75..08b87a356739bdfcb339007cf713516a421b0abd 100644 (file)
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -92,6 +92,7 @@ srv/web/ipfire/html/blob.gif
 srv/web/ipfire/html/clwarn.cgi
 srv/web/ipfire/html/dial.cgi
 srv/web/ipfire/html/favicon.ico
+#srv/web/ipfire/html/graphs
 #srv/web/ipfire/html/images
 srv/web/ipfire/html/images/IPFire.png
 srv/web/ipfire/html/images/add.gif

diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh
index 90a6d776b09e0434967660d186635a4836265500..13c645a1a2ffacdac7a34bc62ade0b2816bb2a27 100644 (file)
--- a/config/rootfiles/core/89/update.sh
+++ b/config/rootfiles/core/89/update.sh
@@ -75,15 +75,17 @@ chown nobody.nobody \
        /var/run/ovpnserver.log
 
 # Update OpenVPN/collectd configuration
-files=`find /var/ipfire/ovpn/n2nconf/ -type d`
-for i in $files;
-do
-       if ! grep -q "status-version" $i/${i##*/}.conf; then
-               echo "# Logfile" >> $i/${i##*/}.conf
-               echo "status-version 1" >> $i/${i##*/}.conf
+for i in /var/ipfire/ovpn/n2nconf/*/*.conf; do
+       name="${i##*/}"
+       name="${name%*.conf}"
+
+       if ! grep -qE "^status-version" ${i}; then
+               echo "# Logfile" >> ${i}
+               echo "status-version 1" >> ${i}
        fi
-       if ! grep -q "status " $i/${i##*/}.conf; then
-               echo "status /var/run/openvpn/${i##*/}-n2n 10" >> $i/${i##*/}.conf
+
+       if ! grep -qE "^status " ${i}; then
+               echo "status /var/run/openvpn/${name}-n2n 10" >> ${i}
        fi
 done
 

diff --git a/config/rootfiles/core/90/exclude b/config/rootfiles/core/90/exclude
index 56e840d8cc430f92a45b03e2c122fadc2061050e..73b7b73e630fb896f20e3af5331ebde0476121f5 100644 (file)
--- a/config/rootfiles/core/90/exclude
+++ b/config/rootfiles/core/90/exclude
@@ -15,7 +15,6 @@ etc/sudoers
 etc/sysconfig/firewall.local
 etc/sysconfig/modules
 etc/sysconfig/rc.local
-etc/udev/rules.d/30-persistent-network.rules
 srv/web/ipfire/html/proxy.pac
 var/ipfire/firewall/geoipblock
 var/ipfire/fwhosts/custmgeoipgrp

diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files
index 431dcd61c061c451fbb78908b609d1a7593d8bbd..ee596a070133cc46cb21cde91802c64dd1738777 100644 (file)
--- a/config/rootfiles/core/90/filelists/files
+++ b/config/rootfiles/core/90/filelists/files
@@ -5,6 +5,8 @@ etc/rc.d/init.d/network-trigger
 etc/rc.d/init.d/networking/functions.network
 etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/rcsysinit.d/S90network-trigger
+opt/pakfire/pakfire
+opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/country.cgi
 srv/web/ipfire/cgi-bin/ddns.cgi
 srv/web/ipfire/cgi-bin/firewall.cgi

diff --git a/config/rootfiles/core/90/filelists/openldap b/config/rootfiles/core/90/filelists/openldap
new file mode 120000 (symlink)
index 0000000..80c324f
--- /dev/null
+++ b/config/rootfiles/core/90/filelists/openldap
@@ -0,0 +1 @@
+../../../common/openldap
\ No newline at end of file

diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh
index 4835c5a29cbec3cfbc4e71eaabd9cf5acfa35da7..34dacf1134654caab5f8ef8a23e6c0bc26175717 100644 (file)
--- a/config/rootfiles/core/90/update.sh
+++ b/config/rootfiles/core/90/update.sh
@@ -208,6 +208,13 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+# Remove old udev configuration
+rm -vf /etc/udev/rules.d/30-persistent-network.rules
+
+# Remove pids from dhcp client because it hang at normal shutdown
+# so let the sysvinit kill it
+rm -f /run/dhcpcd-*.pid
+
 #
 # Start services
 #
@@ -218,22 +225,9 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
        /etc/init.d/ipsec start
 fi
 
-case "$(uname -m)" in
-       i?86)
-       case "$(find_device "/")" in
-               xvd* )
-                       echo Skip remove grub2 files, because pygrub fail.
-                       rm -f /boot/grub/*
-                       echo config will recreated by linux-pae install.
-                       ;;
-               * )
-                       #
-                       # Update to GRUB2 config
-                       #
-                       grub-mkconfig > /boot/grub/grub.cfg
-                       ;;
-       esac
-esac
+if [ -e /boot/grub/grub.cfg ]; then
+               grub-mkconfig > /boot/grub/grub.cfg
+fi
 
 # Upadate Kernel version uEnv.txt
 if [ -e /boot/uEnv.txt ]; then
@@ -247,7 +241,7 @@ fi
 
 
 # Force (re)install pae kernel if pae is supported
-rm -rf /opt/pakfire/db/*/meta-linux-pae
+rm -rf /opt/pakfire/db/installed/meta-linux-pae
 if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
        ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
        BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
@@ -258,9 +252,7 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
                echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
                echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
                echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
-               echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
-               echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
-               echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-pae
+#              rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null
        fi
 fi
 

diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi
index 60c2e5869e260b89d2f37f1c98a90892ff6d9822..f2ae81300905ee5fafb995224471cdbe5a09aa54 100644 (file)
--- a/html/cgi-bin/country.cgi
+++ b/html/cgi-bin/country.cgi
@@ -23,12 +23,9 @@ use strict;
 
 use Locale::Codes::Country;
 
-my $flagdir = '/srv/web/ipfire/html/images/flags';
+my $col;
 my $lines = '1';
 my $lines2 = '';
-my @flaglist=();
-my @flaglistfiles=();
-my $flag = '';
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/geoip-functions.pl";
@@ -41,44 +38,41 @@ require "${General::swroot}/header.pl";
 &Header::openbigbox('100%', 'left');
 
 &Header::openbox('100%', 'left', $Lang::tr{'country codes and flags'});
-print "<table class='tbl'>";
-print "<tr><th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
-print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
-print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th>";
-print "<th>&nbsp;</th>";
-print "<th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
-print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
-print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th></tr>";
-
-@flaglist = <$flagdir/*>;
-
-undef @flaglistfiles;
-
-foreach (@flaglist)
-{
-       if (!-d) { push(@flaglistfiles,substr($_,rindex($_,"/")+1));    }
-}
-my $col="";
-foreach $flag (@flaglistfiles)
-{
+
+print<<END;
+<table class='tbl'>
+       <tr>
+               <th style='width=5%'><b>$Lang::tr{'flag'}</b></th>
+               <th style='width=5%'><b>$Lang::tr{'countrycode'}</b></th>
+               <th style='width=40% text-align:left'><b>$Lang::tr{'country'}</b></th>
+               <th>&nbsp;</th>
+               <th style='width=5%'><b>$Lang::tr{'flag'}</b></th>
+               <th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>
+               <th style='width=40% text-align:left;'><b>$Lang::tr{'country'}</b></th>
+       </tr>
+END
+
+# Get a list of all supported country codes.
+my @countries = Locale::Codes::Country::all_country_codes();
+
+# Loop through whole country list.
+foreach my $country (@countries) {
        $lines++;
 
-       my $flagcode = uc(substr($flag, 0, 2));
-       my $fcode = lc($flagcode);
+       # Convert country code into upper case.
+       my $country_uc = uc($country);
 
        # Get flag icon for of the country.
-       my $flag_icon = &GeoIP::get_flag_icon($fcode);
+       my $flag_icon = &GeoIP::get_flag_icon($country);
+
+       # Get country name.
+       my $name = &GeoIP::get_full_country_name($country);
 
-       my $country = Locale::Country::code2country($fcode);
-       if($fcode eq 'eu') { $country = 'Europe'; }
-       if($fcode eq 'tp') { $country = 'East Timor'; }
-       if($fcode eq 'yu') { $country = 'Yugoslavia'; }
        if ($lines % 2) {
-               print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>";
-               print "<td $col>$flagcode</td>";
-               print "<td $col>$country</td></tr>\n";
-       }
-       else {
+               print "<td $col><a id='$country'><img src='$flag_icon' alt='$country_uc' title='$country_uc'/></a></td>";
+               print "<td $col>$country_uc</td>";
+               print "<td $col>$name</td></tr>\n";
+       } else {
                $lines2++;
                if($lines2 % 2) {
                        $col="style='background-color:${Header::table2colour};'";
@@ -86,25 +80,25 @@ foreach $flag (@flaglistfiles)
                        $col="style='background-color:${Header::table1colour};'";
                }
                print "<tr>";
-               print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>";
-               print "<td $col>$flagcode</td>";
-               print "<td $col>$country</td>";
+               print "<td $col><a id='$country'><img src='$flag_icon' alt='$country_uc' title='$country_uc'/></a></td>";
+               print "<td $col>$country_uc</td>";
+               print "<td $col>$name</td>";
                print "<td $col>&nbsp;</td>";
+
+               # Finish column when the last element in the array has passed and we have an uneven amount of items.
+               if ( $country eq $countries[-1] ) {
+                       print "<td $col>&nbsp;</td>\n";
+                       print "<td $col>&nbsp;</td>\n";
+                       print "<td $col>&nbsp;</td></tr>\n";
+               }
        }
 }
-
-
 print "</table>";
 &Header::closebox();
 
 &Header::closebigbox();
 
-print <<END
-<div style='text-align:center'>
-<a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a>
-</div>
-END
-; 
+print "<div style='text-align:center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></div>\n";
 
 &Header::closepage();
 

diff --git a/html/cgi-bin/geoip-block.cgi b/html/cgi-bin/geoip-block.cgi
index ccbfa926a0ad3c576217107f0fbc7842edf1cfc4..056b333e8c955eee667a982c2b227804c75c2d0b 100644 (file)
--- a/html/cgi-bin/geoip-block.cgi
+++ b/html/cgi-bin/geoip-block.cgi
@@ -225,7 +225,16 @@ foreach my $location (@locations) {
        print "<td align='center' $col>$flag</td>\n";
        print "<td align='center' $col>$ccode_uc</td>\n";
        print "<td align='left' $col>$cname</td>$line_end\n";
-                       
+
+       # Finish column when the last element in the array has passed and we have an uneven amount of items.
+       if(! ($lines2 % 2) && ($location eq $locations[-1] )) {
+               print "<td $col>&nbsp;</td>\n";
+               print "<td $col>&nbsp;</td>\n";
+               print "<td $col>&nbsp;</td>\n";
+               print "<td $col>&nbsp;</td>\n";
+               print "<td $col>&nbsp;</td></tr>\n";
+       }
+
 $lines2++;
 }
 

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 2a020eaddd84060688898b4f66ede388726f2028..94900765f523107efed7327e88e0491c87716436 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -3029,12 +3029,6 @@ sub make_algos($$$$$) {
                                        if (!$is_aead) {
                                                push(@algo, $int);
                                        }
-
-                                       if ($grp =~ m/^e(.*)$/) {
-                                               push(@algo, "ecp$1");
-                                       } else {
-                                               push(@algo, "modp$grp");
-                                       }
                                }
 
                                push(@algos, join("-", @algo));

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index 2a826cd7039b7996feab4e4ce242189739167f6b..8e61354520cc96424b3e2eef755b87c5739c625e 100644 (file)
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cyrus-imapd
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""
 

diff --git a/lfs/elinks b/lfs/elinks
index 59f1426ead95a57304beb675cc97e5cc161b268b..2727423f0269a565d5ed7a2f0e993695740bcdd9 100644 (file)
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = elinks
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 

diff --git a/lfs/linux b/lfs/linux
index b2d2552dc848200fec573a8c6e2c022a579a62b9..f59a709a5827eeab1e70cb3b54dea57011b5074b 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,11 +24,11 @@
 
 include Config
 
-VER        = 3.14.41
+VER        = 3.14.43
 
-RPI_PATCHES = 3.14.41-grsec-ipfire1
-A7M_PATCHES = 3.14.41-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.1-3.14.41-201505072056.patch.xz
+RPI_PATCHES = 3.14.43-grsec-ipfire1
+A7M_PATCHES = 3.14.43-grsec-ipfire1
+GRS_PATCHES = grsecurity-3.1-3.14.43-201505191737.patch.xz
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -37,7 +37,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 59
+PAK_VER    = 61
 DEPS      = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -77,10 +77,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz         = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
 arm7-multi-patches-$(A7M_PATCHES).patch.xz     = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
 $(GRS_PATCHES)                                 = $(URL_IPFIRE)/$(GRS_PATCHES)
 
-$(DL_FILE)_MD5                                 = b28dfc6907c388c2adcc65aee2ad68ff
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = 9c8b20647429a64d656999a3c7af890f
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = a4a4103255e93bfcb02652212b0ae3fc
-$(GRS_PATCHES)_MD5                             = 8af3b27954311da581cc6f803f048779
+$(DL_FILE)_MD5                                 = 927f2343f298dfe531a8371f81356e53
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = b5ba925ae1d4279d3ac0f03c27dd16eb
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = b9c696fe4f22b05b81c168329ca33c94
+$(GRS_PATCHES)_MD5                             = 35e26b1214b1b0b515ee67e5ce50633a
 
 install : $(TARGET)
 

diff --git a/lfs/netsnmpd b/lfs/netsnmpd
index 388b20b120d68a5396e7568e275901b85faf5a22..661596513b7ece1374634b152a328a846f8b573d 100644 (file)
--- a/lfs/netsnmpd
+++ b/lfs/netsnmpd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG      = netsnmpd
-PAK_VER           = 2
+PAK_VER           = 3
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/rrdtool b/lfs/rrdtool
index 0237b89f2e48d5dff2f1c7a3c218f342b3e27809..d0a11817566c9e5dc040793c18f2efb703d06247 100644 (file)
--- a/lfs/rrdtool
+++ b/lfs/rrdtool
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.7
+VER        = 1.5.3
 
 THISAPP    = rrdtool-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ffe369d8921b4dfdeaaf43812100c38f
+$(DL_FILE)_MD5 = 868a828cc6b10654c440a85054240ae2
 
 install : $(TARGET)
 

diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup
index dca3e40163caeb050dc546684ff0d00258171851..70c30b4e230fb8b9fcff9e4f607394f2f948e8b1 100644 (file)
--- a/src/initscripts/init.d/firstsetup
+++ b/src/initscripts/init.d/firstsetup
@@ -40,9 +40,6 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
                echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
                echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
                echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
-               echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
-               echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
-               echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-pae
        fi
 fi
 

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index d14e0314da05e1a7bfd5377cd7811c1812e22afd..6bf85afdca3895b7b4c32a2387e44cd5d66f0f0c 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2015   IPFire Team   <info@ipfire.org>                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -393,6 +393,7 @@ sub dbgetlist {
        foreach $file (@files) {
                next if ( $file eq "." );
                next if ( $file eq ".." );
+               next if ( $file eq "meta-" );
                next if ( $file =~ /^old/ );
                open(FILE, "<$Conf::dbdir/meta/$file");
                @meta = <FILE>;
@@ -589,6 +590,25 @@ sub resolvedeps {
        return @all;
 }
 
+sub resolvedeps_recursive {
+       my @packages = shift;
+       my @result = ();
+
+       foreach my $pkg (@packages) {
+               my @deps = &Pakfire::resolvedeps($pkg);
+
+               foreach my $dep (@deps) {
+                       push(@result, $dep);
+               }
+       }
+
+       # Sort the result array and remove dupes
+       my %sort = map{ $_, 1 } @result;
+       @result = keys %sort;
+
+       return @result;
+}
+
 sub cleanup {
        my $dir = shift;
        my $path;
@@ -695,7 +715,7 @@ sub getpak {
        }
        
        unless ($file) {
-               message("No filename given in meta-file. Please phone the developers.");
+               message("No filename given in meta-file.");
                exit 1;
        }
        

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 3d0270aa41db8fb49f0f4f1002c9ba1e826606e6..8bca061aba696b34807c6cda0e19f928fa668736 100644 (file)
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2015   IPFire Team   <info@ipfire.org>                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -255,14 +255,11 @@
        } elsif ("$ARGV[0]" eq "upgrade") {
                &Pakfire::upgradecore();
                my @upgradepaks = &Pakfire::dblist("upgrade", "noweb");
-               my @temp, $pak;
-               
-               foreach (@upgradepaks) {
-                       @temp = &Pakfire::resolvedeps("$_");
-                       foreach (@temp) { push(@upgradepaks,$_) if $_; }
-               }
-               
+
                if (@upgradepaks) {
+                       # Resolve the dependencies of the to be upgraded packages
+                       my @deps = &Pakfire::resolvedeps_recursive(@upgradepaks);
+
                        &Pakfire::message("");
                        &Pakfire::message("PAKFIRE UPGR: We are going to install all packages listed above.");
                        if ($interactive) {
@@ -277,16 +274,24 @@
                        }
                }
                
-               ### Download first
+               # Download packages
                foreach $pak (@upgradepaks) {
-                       #system("mv $Conf::dbdir/meta/meta-$pak $Conf::dbdir/meta/old-meta-$pak");
                        &Pakfire::getpak("$pak", "");
                }
-               
+
+               # Download dependencies
+               foreach $pak (@deps) {
+                       &Pakfire::getpak("$pak", "");
+               }
+
+               # Install dependencies first
+               foreach $pak (@deps) {
+                       &Pakfire::setuppak("$pak");
+               }
+
+               # Install all upgrades
                foreach $pak (@upgradepaks) {
-                       if (&Pakfire::upgradepak("$pak")) {
-                               #system("mv $Conf::dbdir/meta/old-meta-$pak $Conf::dbdir/meta/meta-$pak");
-                       }
+                       &Pakfire::upgradepak("$pak");
                }
                
        } elsif ("$ARGV[0]" eq "list") {

diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index c980a0136bfd81732965bfda823522846531895d..27e665f9243b1e18be7a31b5d23b6843be7957fe 100644 (file)
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -55,29 +55,24 @@ depmod -a $KVER-ipfire-pae
 #
 /usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae  
 
-
-ROOT="$(find_partition "/")"
-case $ROOT in
-       xvd* )
-               #
-               # We are on XEN so create new grub.conf / menu.lst for pygrub
-               #
-               echo "timeout 10"                          > /boot/grub/grub.conf
-               echo "default 0"                          >> /boot/grub/grub.conf
-               echo "title IPFire (pae-kernel)"          >> /boot/grub/grub.conf
-               echo "  kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \
-                                                         >> /boot/grub/grub.conf
-               echo "  initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf
-               echo "# savedefault 0"                    >> /boot/grub/grub.conf
-               ln -s grub.conf $MNThdd/boot/grub/menu.lst
-               ;;
-       * )
-               #
-               # Update grub2 config
-               #
-               grub-mkconfig > /boot/grub/grub.cfg
-               ;;
-esac
+if [ -e /boot/grub/grub.cfg ]; then
+       #
+       # Update grub2 config
+       #
+       grub-mkconfig > /boot/grub/grub.cfg
+else
+       #
+       # xen pv with pygrub need grub.conf / menu.lst
+       #
+       echo "timeout 10"                          > /boot/grub/grub.conf
+       echo "default 0"                          >> /boot/grub/grub.conf
+       echo "title IPFire (pae-kernel)"          >> /boot/grub/grub.conf
+       echo "  kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \
+                                                 >> /boot/grub/grub.conf
+       echo "  initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf
+       echo "# savedefault 0"                    >> /boot/grub/grub.conf
+       ln -s grub.conf $MNThdd/boot/grub/menu.lst
+fi
 
 # request a reboot if pae is supported
 if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then