Merge remote-tracking branch 'ms/dfs' into next

diff --git a/config/backup/includes/dnsdist b/config/backup/includes/dnsdist
new file mode 100644 (file)
index 0000000..8d9b825
--- /dev/null
+++ b/config/backup/includes/dnsdist
@@ -0,0 +1 @@
+/etc/dnsdist.conf

diff --git a/config/cfgroot/geoip-functions.pl b/config/cfgroot/geoip-functions.pl
index d03503a3f9ad0a2f8e38bdb2da660ecbdda43550..b2319daaaffe7168d04cfafeabb2113af92cd08a 100644 (file)
--- a/config/cfgroot/geoip-functions.pl
+++ b/config/cfgroot/geoip-functions.pl
@@ -122,10 +122,10 @@ sub get_full_country_name($) {
 
 # Function to get all available GeoIP locations.
 sub get_geoip_locations() {
-       my @locations;
+       my @locations = ();
 
        # Open the location database.
-       open(LOCATION, "$geoip_database_dir/$location_database") or die "Could not open $geoip_database_dir/$location_database. $!\n";
+       open(LOCATION, "$geoip_database_dir/$location_database") or return @locations;
 
        # Loop through the file.
        while(my $line = <LOCATION>) {

diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool
index 4254b2ec9b49baec4dd8782dca23b5d68982360d..9edf10c011452d639c445609d0ec58fe68fc7987 100644 (file)
--- a/config/rootfiles/common/rrdtool
+++ b/config/rootfiles/common/rrdtool
@@ -11,7 +11,7 @@ usr/bin/rrdupdate
 #usr/lib/librrd.la
 #usr/lib/librrd.so
 usr/lib/librrd.so.8
-usr/lib/librrd.so.8.0.0
+usr/lib/librrd.so.8.2.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
@@ -21,105 +21,114 @@ 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.6.0
-#usr/share/doc/rrdtool-1.6.0/html
-#usr/share/doc/rrdtool-1.6.0/html/RRDp.html
-#usr/share/doc/rrdtool-1.6.0/html/RRDs.html
-#usr/share/doc/rrdtool-1.6.0/html/bin_dec_hex.html
-#usr/share/doc/rrdtool-1.6.0/html/cdeftutorial.html
-#usr/share/doc/rrdtool-1.6.0/html/index.html
-#usr/share/doc/rrdtool-1.6.0/html/librrd.html
-#usr/share/doc/rrdtool-1.6.0/html/rpntutorial.html
-#usr/share/doc/rrdtool-1.6.0/html/rrd-beginners.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdbuild.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdcached.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdcgi.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdcreate.html
-#usr/share/doc/rrdtool-1.6.0/html/rrddump.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdfetch.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdfirst.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdflushcached.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdgraph.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdgraph_data.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdgraph_examples.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdgraph_graph.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdgraph_rpn.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdinfo.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdlast.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdlastupdate.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdlua.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdresize.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdrestore.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdthreads.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdtool.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdtune.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdtutorial.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdupdate.html
-#usr/share/doc/rrdtool-1.6.0/html/rrdxport.html
-#usr/share/doc/rrdtool-1.6.0/txt
-#usr/share/doc/rrdtool-1.6.0/txt/bin_dec_hex.pod
-#usr/share/doc/rrdtool-1.6.0/txt/bin_dec_hex.txt
-#usr/share/doc/rrdtool-1.6.0/txt/cdeftutorial.pod
-#usr/share/doc/rrdtool-1.6.0/txt/cdeftutorial.txt
-#usr/share/doc/rrdtool-1.6.0/txt/librrd.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rpntutorial.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rpntutorial.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrd-beginners.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrd-beginners.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdbuild.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdbuild.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdcached.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdcached.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdcgi.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdcgi.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdcreate.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdcreate.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrddump.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrddump.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdfetch.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdfetch.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdfirst.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdfirst.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdflushcached.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdflushcached.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_data.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_data.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_examples.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_examples.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_graph.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_graph.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_rpn.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_rpn.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdinfo.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdinfo.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdlast.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdlast.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdlastupdate.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdlastupdate.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdlua.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdlua.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdresize.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdresize.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdrestore.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdrestore.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdthreads.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdthreads.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdtool.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdtool.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdtune.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdtune.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdtutorial.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdtutorial.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdupdate.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdupdate.txt
-#usr/share/doc/rrdtool-1.6.0/txt/rrdxport.pod
-#usr/share/doc/rrdtool-1.6.0/txt/rrdxport.txt
+#usr/share/doc/rrdtool-1.7.1
+#usr/share/doc/rrdtool-1.7.1/html
+#usr/share/doc/rrdtool-1.7.1/html/RRDp.html
+#usr/share/doc/rrdtool-1.7.1/html/RRDs.html
+#usr/share/doc/rrdtool-1.7.1/html/bin_dec_hex.html
+#usr/share/doc/rrdtool-1.7.1/html/cdeftutorial.html
+#usr/share/doc/rrdtool-1.7.1/html/index.html
+#usr/share/doc/rrdtool-1.7.1/html/librrd.html
+#usr/share/doc/rrdtool-1.7.1/html/rpntutorial.html
+#usr/share/doc/rrdtool-1.7.1/html/rrd-beginners.html
+#usr/share/doc/rrdtool-1.7.1/html/rrd_pdpcalc.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdbuild.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdcached.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdcgi.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdcreate.html
+#usr/share/doc/rrdtool-1.7.1/html/rrddump.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdfetch.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdfirst.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdflushcached.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdgraph.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdgraph_data.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdgraph_examples.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdgraph_graph.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdgraph_rpn.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdinfo.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdlast.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdlastupdate.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdlist.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdlua.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdresize.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdrestore.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdthreads.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdtool.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdtune.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdtutorial.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdupdate.html
+#usr/share/doc/rrdtool-1.7.1/html/rrdxport.html
+#usr/share/doc/rrdtool-1.7.1/txt
+#usr/share/doc/rrdtool-1.7.1/txt/bin_dec_hex.pod
+#usr/share/doc/rrdtool-1.7.1/txt/bin_dec_hex.txt
+#usr/share/doc/rrdtool-1.7.1/txt/cdeftutorial.pod
+#usr/share/doc/rrdtool-1.7.1/txt/cdeftutorial.txt
+#usr/share/doc/rrdtool-1.7.1/txt/librrd.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rpntutorial.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rpntutorial.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrd-beginners.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrd-beginners.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrd_pdpcalc.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrd_pdpcalc.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdbuild.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdbuild.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdcached.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdcached.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdcgi.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdcgi.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdcreate.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdcreate.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrddump.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrddump.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdfetch.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdfetch.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdfirst.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdfirst.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdflushcached.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdflushcached.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_data.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_data.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_examples.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_examples.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_graph.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_graph.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_rpn.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_rpn.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdinfo.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdinfo.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdlast.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdlast.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdlastupdate.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdlastupdate.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdlist.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdlist.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdlua.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdlua.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdresize.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdresize.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdrestore.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdrestore.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdthreads.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdthreads.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdtool.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdtool.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdtune.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdtune.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdtutorial.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdtutorial.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdupdate.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdupdate.txt
+#usr/share/doc/rrdtool-1.7.1/txt/rrdxport.pod
+#usr/share/doc/rrdtool-1.7.1/txt/rrdxport.txt
+#usr/share/locale/fr/LC_MESSAGES/rrdtool.mo
+#usr/share/locale/hu/LC_MESSAGES/rrdtool.mo
 #usr/share/man/man1/bin_dec_hex.1
 #usr/share/man/man1/cdeftutorial.1
 #usr/share/man/man1/rpntutorial.1
 #usr/share/man/man1/rrd-beginners.1
+#usr/share/man/man1/rrd_pdpcalc.1
 #usr/share/man/man1/rrdbuild.1
 #usr/share/man/man1/rrdcached.1
 #usr/share/man/man1/rrdcgi.1
@@ -136,7 +145,7 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so
 #usr/share/man/man1/rrdinfo.1
 #usr/share/man/man1/rrdlast.1
 #usr/share/man/man1/rrdlastupdate.1
-#usr/share/man/man1/rrdlua.1
+#usr/share/man/man1/rrdlist.1
 #usr/share/man/man1/rrdresize.1
 #usr/share/man/man1/rrdrestore.1
 #usr/share/man/man1/rrdthreads.1
@@ -163,3 +172,5 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so
 #usr/share/rrdtool/examples/stripes.pl
 #usr/share/rrdtool/examples/stripes.py
 var/log/rrd
+usr/lib/collectd/rrdcached.so
+usr/lib/collectd/rrdtool.so

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

diff --git a/config/rootfiles/core/130/filelists/files b/config/rootfiles/core/130/filelists/files
index d33ede19caa82404a051383b368048e2c41cefcd..ab1e82fcbc0de07f1a02a98c5d45fd23de37125e 100644 (file)
--- a/config/rootfiles/core/130/filelists/files
+++ b/config/rootfiles/core/130/filelists/files
@@ -9,15 +9,20 @@ etc/rc.d/init.d/networking/red.up/23-suricata
 etc/rc.d/init.d/suricata
 etc/syslog.conf
 srv/web/ipfire/cgi-bin/aliases.cgi
+srv/web/ipfire/cgi-bin/dnsforward.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/ids.dat
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+usr/local/bin/ipsec-interfaces
 usr/local/bin/suricatactrl
 usr/local/bin/update-ids-ruleset
 usr/sbin/convert-snort
+usr/sbin/unbound-dhcp-leases-bridge
 var/ipfire/backup/bin/backup.pl
 var/ipfire/backup/include
 var/ipfire/general-functions.pl
+var/ipfire/geoip-functions.pl
 var/ipfire/ids-functions.pl
 var/ipfire/menu.d/40-services.menu
 var/ipfire/menu.d/50-firewall.menu

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

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

diff --git a/config/rootfiles/core/130/update.sh b/config/rootfiles/core/130/update.sh
index d33321c3206dc1e6e79f01d9efd3bb3c5242b53a..6d32bdba291a1f048871b7877c5475e0794f9087 100644 (file)
--- a/config/rootfiles/core/130/update.sh
+++ b/config/rootfiles/core/130/update.sh
@@ -37,21 +37,6 @@ if [ -e "/etc/init.d/suricata" ]; then
        /etc/init.d/suricata stop
 fi
 
-# Remove files
-rm -rfv \
-       /etc/rc.d/rc*.d/*snort \
-       /etc/rc.d/init.d/networking/red.up/23-RS-snort \
-       /etc/snort \
-       /usr/bin/daq-modules-config \
-       /usr/bin/u2boat \
-       /usr/bin/u2spewfoo \
-       /usr/lib/daq \
-       /usr/lib/snort \
-       /usr/lib/libdaq.so* \
-       /usr/lib/libsfbpf.so* \
-       /usr/local/bin/snortctl \
-       /usr/sbin/snort
-
 # Rename snort user to suricata
 if getent group snort &>/dev/null; then
        groupmod -n suricata snort
@@ -74,6 +59,22 @@ ldconfig
 # Migrate snort configuration to suricata
 /usr/sbin/convert-snort
 
+# Remove files
+rm -rfv \
+       /etc/rc.d/rc*.d/*snort \
+       /etc/rc.d/init.d/networking/red.up/23-RS-snort \
+       /etc/snort \
+       /usr/bin/daq-modules-config \
+       /usr/bin/u2boat \
+       /usr/bin/u2spewfoo \
+       /usr/lib/daq \
+       /usr/lib/snort \
+       /usr/lib/libdaq.so* \
+       /usr/lib/libsfbpf.so* \
+       /usr/local/bin/snortctl \
+       /usr/sbin/snort \
+       /var/ipfire/snort
+
 # Start services
 /etc/init.d/collectd restart
 /etc/init.d/firewall restart

diff --git a/config/rootfiles/packages/armv5tel/python3-yaml b/config/rootfiles/packages/armv5tel/python3-yaml
index 6f8354a244464c0a04deb3c5ec933c5dd118f290..9525d0e37c5977b7c9c59e0edad0ba294215a176 100644 (file)
--- a/config/rootfiles/packages/armv5tel/python3-yaml
+++ b/config/rootfiles/packages/armv5tel/python3-yaml
@@ -1,5 +1,5 @@
 #usr/lib/python3.6/site-packages/PyYAML-3.13-py3.6.egg-info
-usr/lib/python3.6/site-packages/_yaml.cpython-36m-arm-linux-gnu.so
+usr/lib/python3.6/site-packages/_yaml.cpython-36m-arm-linux-gnueabi.so
 usr/lib/python3.6/site-packages/yaml
 #usr/lib/python3.6/site-packages/yaml/__init__.py
 #usr/lib/python3.6/site-packages/yaml/__pycache__

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index e95d4dc6e90219ee5b482542ac025811996403e1..9d6d686473a28999581bbed2cd9440a32cb6cb52 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -13,7 +13,7 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.9
-usr/lib/libclamav.so.9.0.1
+usr/lib/libclamav.so.9.0.2
 #usr/lib/libclammspack.la
 usr/lib/libclammspack.so
 usr/lib/libclammspack.so.0
@@ -21,11 +21,11 @@ usr/lib/libclammspack.so.0.1.0
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.9
-usr/lib/libclamunrar.so.9.0.1
+usr/lib/libclamunrar.so.9.0.2
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.9
-usr/lib/libclamunrar_iface.so.9.0.1
+usr/lib/libclamunrar_iface.so.9.0.2
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 #usr/share/man/man1/clambc.1

diff --git a/config/rootfiles/packages/dnsdist b/config/rootfiles/packages/dnsdist
index ba7381f34f914e42a5d1337af1b9ab8e0a10cfe5..3ccb1260c2ef6d8befc3b23351816ddbbb5b2f22 100644 (file)
--- a/config/rootfiles/packages/dnsdist
+++ b/config/rootfiles/packages/dnsdist
@@ -1,3 +1,4 @@
+etc/rc.d/init.d/dnsdist
 usr/bin/dnsdist
 #usr/share/man/man1/dnsdist.1
-etc/rc.d/init.d/dnsdist
+var/ipfire/backup/addons/includes/dnsdist

diff --git a/config/rootfiles/packages/freeradius b/config/rootfiles/packages/freeradius
index a5b8414b4fece046b3602e5449739c58ad767470..aacb08b024c0f689500b7a6edd5475ed1aa1d851 100644 (file)
--- a/config/rootfiles/packages/freeradius
+++ b/config/rootfiles/packages/freeradius
@@ -6,6 +6,7 @@ etc/raddb
 #etc/raddb/certs/bootstrap
 #etc/raddb/certs/ca.cnf
 #etc/raddb/certs/client.cnf
+#etc/raddb/certs/inner-server.cnf
 #etc/raddb/certs/passwords.mk
 #etc/raddb/certs/server.cnf
 #etc/raddb/certs/xpextensions
@@ -156,7 +157,6 @@ etc/raddb
 #etc/raddb/mods-config/sql/main/postgresql
 #etc/raddb/mods-config/sql/main/postgresql/extras
 #etc/raddb/mods-config/sql/main/postgresql/extras/cisco_h323_db_schema.sql
-#etc/raddb/mods-config/sql/main/postgresql/extras/update_radacct_group.sql
 #etc/raddb/mods-config/sql/main/postgresql/extras/voip-postpaid.conf
 #etc/raddb/mods-config/sql/main/postgresql/queries.conf
 #etc/raddb/mods-config/sql/main/postgresql/schema.sql
@@ -183,7 +183,6 @@ etc/raddb
 #etc/raddb/mods-enabled/date
 #etc/raddb/mods-enabled/detail
 #etc/raddb/mods-enabled/detail.log
-#etc/raddb/mods-enabled/dhcp
 #etc/raddb/mods-enabled/digest
 #etc/raddb/mods-enabled/dynamic_clients
 #etc/raddb/mods-enabled/eap
@@ -219,6 +218,7 @@ etc/raddb
 #etc/raddb/policy.d/filter
 #etc/raddb/policy.d/moonshot-targeted-ids
 #etc/raddb/policy.d/operator-name
+#etc/raddb/policy.d/rfc7542
 #etc/raddb/proxy.conf
 #etc/raddb/radiusd.conf
 #etc/raddb/sites-available
@@ -269,6 +269,7 @@ usr/bin/rlm_ippool_tool
 usr/bin/smbencrypt
 #usr/include/freeradius
 #usr/include/freeradius/attributes.h
+#usr/include/freeradius/autoconf.h
 #usr/include/freeradius/base64.h
 #usr/include/freeradius/build.h
 #usr/include/freeradius/conf.h
@@ -293,6 +294,7 @@ usr/bin/smbencrypt
 #usr/include/freeradius/radpaths.h
 #usr/include/freeradius/radutmp.h
 #usr/include/freeradius/realms.h
+#usr/include/freeradius/regex.h
 #usr/include/freeradius/rfc2865.h
 #usr/include/freeradius/rfc2866.h
 #usr/include/freeradius/rfc2867.h
@@ -325,9 +327,12 @@ usr/bin/smbencrypt
 #usr/include/freeradius/rfc7268.h
 #usr/include/freeradius/rfc7499.h
 #usr/include/freeradius/rfc7930.h
+#usr/include/freeradius/rfc8045.h
 #usr/include/freeradius/sha1.h
 #usr/include/freeradius/stats.h
 #usr/include/freeradius/sysutmp.h
+#usr/include/freeradius/tcp.h
+#usr/include/freeradius/threads.h
 #usr/include/freeradius/tls.h
 #usr/include/freeradius/token.h
 #usr/include/freeradius/udpfromto.h
@@ -659,6 +664,13 @@ usr/sbin/radmin
 #usr/share/doc/freeradius/schemas/ldap/openldap/freeradius-clients.schema
 #usr/share/doc/freeradius/schemas/ldap/openldap/freeradius.ldif
 #usr/share/doc/freeradius/schemas/ldap/openldap/freeradius.schema
+#usr/share/doc/freeradius/schemas/ldap/samba
+#usr/share/doc/freeradius/schemas/ldap/samba/README.txt
+#usr/share/doc/freeradius/schemas/ldap/samba/freeradius-attrs.ldif
+#usr/share/doc/freeradius/schemas/ldap/samba/freeradius-classes.ldif
+#usr/share/doc/freeradius/schemas/ldap/samba/freeradius-clients-attrs.ldif
+#usr/share/doc/freeradius/schemas/ldap/samba/freeradius-clients-classes.ldif
+#usr/share/doc/freeradius/schemas/ldap/samba/freeradius-user.ldif
 #usr/share/doc/freeradius/schemas/logstash
 #usr/share/doc/freeradius/schemas/logstash/README
 #usr/share/doc/freeradius/schemas/logstash/kibana4-dashboard.json
@@ -703,6 +715,7 @@ usr/share/freeradius
 #usr/share/freeradius/dictionary.avaya
 #usr/share/freeradius/dictionary.azaire
 #usr/share/freeradius/dictionary.bay
+#usr/share/freeradius/dictionary.bigswitch
 #usr/share/freeradius/dictionary.bintec
 #usr/share/freeradius/dictionary.bluecoat
 #usr/share/freeradius/dictionary.boingo
@@ -761,6 +774,7 @@ usr/share/freeradius
 #usr/share/freeradius/dictionary.huawei
 #usr/share/freeradius/dictionary.iana
 #usr/share/freeradius/dictionary.iea
+#usr/share/freeradius/dictionary.infinera
 #usr/share/freeradius/dictionary.infoblox
 #usr/share/freeradius/dictionary.infonet
 #usr/share/freeradius/dictionary.ipunplugged
@@ -782,6 +796,7 @@ usr/share/freeradius
 #usr/share/freeradius/dictionary.microsemi
 #usr/share/freeradius/dictionary.microsoft
 #usr/share/freeradius/dictionary.mikrotik
+#usr/share/freeradius/dictionary.mimosa
 #usr/share/freeradius/dictionary.motorola
 #usr/share/freeradius/dictionary.motorola.illegal
 #usr/share/freeradius/dictionary.motorola.wimax
@@ -838,6 +853,7 @@ usr/share/freeradius
 #usr/share/freeradius/dictionary.rfc7268
 #usr/share/freeradius/dictionary.rfc7499
 #usr/share/freeradius/dictionary.rfc7930
+#usr/share/freeradius/dictionary.rfc8045
 #usr/share/freeradius/dictionary.riverbed
 #usr/share/freeradius/dictionary.riverstone
 #usr/share/freeradius/dictionary.roaringpenguin
@@ -850,6 +866,7 @@ usr/share/freeradius
 #usr/share/freeradius/dictionary.siemens
 #usr/share/freeradius/dictionary.slipstream
 #usr/share/freeradius/dictionary.sofaware
+#usr/share/freeradius/dictionary.softbank
 #usr/share/freeradius/dictionary.sonicwall
 #usr/share/freeradius/dictionary.springtide
 #usr/share/freeradius/dictionary.starent
@@ -869,6 +886,7 @@ usr/share/freeradius
 #usr/share/freeradius/dictionary.usr.illegal
 #usr/share/freeradius/dictionary.utstarcom
 #usr/share/freeradius/dictionary.valemount
+#usr/share/freeradius/dictionary.verizon
 #usr/share/freeradius/dictionary.versanet
 #usr/share/freeradius/dictionary.vqp
 #usr/share/freeradius/dictionary.walabi

diff --git a/config/rootfiles/packages/nginx b/config/rootfiles/packages/nginx
index 3560e45b92c040d964c9f78c831d2c6ae3f3193d..2ea271bd90a9dc7a43229600ca70965d074ca188 100644 (file)
--- a/config/rootfiles/packages/nginx
+++ b/config/rootfiles/packages/nginx
@@ -1,4 +1,4 @@
-etc/nginx
+#etc/nginx
 etc/nginx/fastcgi.conf
 etc/nginx/fastcgi.conf.default
 etc/nginx/fastcgi_params
@@ -16,8 +16,8 @@ etc/nginx/uwsgi_params.default
 etc/nginx/win-utf
 etc/rc.d/init.d/nginx
 usr/sbin/nginx
-usr/share/nginx
-usr/share/nginx/html
+#usr/share/nginx
+#usr/share/nginx/html
 usr/share/nginx/html/50x.html
 usr/share/nginx/html/index.html
 var/ipfire/backup/addons/includes/nginx

diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml
index 3b50157bf79fb6ac827915038d76156a8b9e2ba1..8580827a1157ed2d403a58c742268699c70d0be2 100644 (file)
--- a/config/suricata/suricata.yaml
+++ b/config/suricata/suricata.yaml
@@ -697,7 +697,7 @@ spm-algo: auto
 
 # Suricata is multi-threaded. Here the threading can be influenced.
 threading:
-  set-cpu-affinity: no
+  set-cpu-affinity: yes
   # Tune cpu affinity of threads. Each family of threads can be bound
   # on specific CPUs.
   #
@@ -717,18 +717,15 @@ threading:
     - worker-cpu-set:
         cpu: [ "all" ]
         mode: "exclusive"
-        # Use explicitely 3 threads and don't compute number by using
-        # detect-thread-ratio variable:
-        # threads: 3
         prio:
           low: [ 0 ]
           medium: [ "1-2" ]
           high: [ 3 ]
           default: "medium"
-    #- verdict-cpu-set:
-    #    cpu: [ 0 ]
-    #    prio:
-    #      default: "high"
+    - verdict-cpu-set:
+        cpu: [ 0 ]
+        prio:
+          default: "high"
   #
   # By default Suricata creates one "detect" thread per available CPU/CPU core.
   # This setting allows controlling this behaviour. A ratio setting of 2 will

diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge
index 54cd8135ba9fea2192b03a8266b0b61402f3bf1f..a8cd837bbfbf17b08cf03cd77eb5c11f7b56233d 100644 (file)
--- a/config/unbound/unbound-dhcp-leases-bridge
+++ b/config/unbound/unbound-dhcp-leases-bridge
@@ -25,9 +25,11 @@ import daemon
 import ipaddress
 import logging
 import logging.handlers
+import os
 import re
 import signal
 import subprocess
+import tempfile
 
 import inotify.adapters
 
@@ -519,11 +521,15 @@ class UnboundConfigWriter(object):
                                self._cached_leases.append(l)
 
        def write_dhcp_leases(self, leases):
-               with open(self.path, "w") as f:
+               with tempfile.NamedTemporaryFile(mode="w", delete=False) as f:
+                       filename = f.name
+
                        for l in leases:
                                for rr in l.rrset:
                                        f.write("local-data: \"%s\"\n" % " ".join(rr))
 
+               os.rename(filename, self.path)
+
        def _control(self, *args):
                command = ["unbound-control"]
                command.extend(args)

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 76afb98d0baf1609ae40e54700e3e24be2819650..9ce978908e8e7beb4baf362fde51e574b5b7e1aa 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -576,10 +576,10 @@ WARNING: untranslated string: dhcp allow bootp = Allow bootp clients
 WARNING: untranslated string: dhcp bootp pxe data = Enter optional bootp pxe data for this fixed lease
 WARNING: untranslated string: dhcp configuration = DHCP configuration
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
-WARNING: untranslated string: dhcp dns key name = Key Name:
+WARNING: untranslated string: dhcp dns key name = Key Name
 WARNING: untranslated string: dhcp dns update = DNS Update
-WARNING: untranslated string: dhcp dns update algo = Algorithm:
-WARNING: untranslated string: dhcp dns update secret = Secret:
+WARNING: untranslated string: dhcp dns update algo = Algorithm
+WARNING: untranslated string: dhcp dns update secret = Secret
 WARNING: untranslated string: dhcp server = DHCP Server
 WARNING: untranslated string: dhcp server disabled = DHCP server disabled.  Stopped.
 WARNING: untranslated string: dhcp server enabled = DHCP server enabled.  Restarting.
@@ -624,6 +624,7 @@ WARNING: untranslated string: dns title = Domain Name System
 WARNING: untranslated string: dnsforward = DNS Forwarding
 WARNING: untranslated string: dnsforward add a new entry = Add a new entry
 WARNING: untranslated string: dnsforward configuration = DNS forward configuration
+WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry
 WARNING: untranslated string: dnsforward entries = Current entries
 WARNING: untranslated string: dnsforward forward_servers = Nameservers

diff --git a/doc/language_issues.es b/doc/language_issues.es
index fe919bf136bef27548488ecf876ce3c30f3ab722..690416af73c4e85a0e7bba71463ccdf5fc7b37fd 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -783,10 +783,10 @@ WARNING: untranslated string: dh key warn = Creating DH-parameters with a length
 WARNING: untranslated string: dh key warn1 = For weak systems or systems with little entropy, it is recommended to upload long Diffie-Hellman parameters by usage of the upload function.
 WARNING: untranslated string: dh parameter = Diffie-Hellman parameters
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
-WARNING: untranslated string: dhcp dns key name = Key Name:
+WARNING: untranslated string: dhcp dns key name = Key Name
 WARNING: untranslated string: dhcp dns update = DNS Update
-WARNING: untranslated string: dhcp dns update algo = Algorithm:
-WARNING: untranslated string: dhcp dns update secret = Secret:
+WARNING: untranslated string: dhcp dns update algo = Algorithm
+WARNING: untranslated string: dhcp dns update secret = Secret
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dnat address = Firewall Interface
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
@@ -795,6 +795,7 @@ WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dnsforward = DNS Forwarding
 WARNING: untranslated string: dnsforward add a new entry = Add a new entry
 WARNING: untranslated string: dnsforward configuration = DNS forward configuration
+WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry
 WARNING: untranslated string: dnsforward entries = Current entries
 WARNING: untranslated string: dnsforward forward_servers = Nameservers

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index cb5319ed7ffbc8bb0ac3c24d3b1b13fd49b66b3d..8f8b8d39f9249c56ff970a6a2ee60a33609e9af8 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -785,6 +785,7 @@ WARNING: untranslated string: bytes = unknown string
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
+WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
 WARNING: untranslated string: fwhost cust geoipgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 9105e4d8dda37b4a4243740794028f2f44e51e03..f8a3f6ac1a0848ff361d2373e0b475f654801d01 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -804,13 +804,14 @@ WARNING: untranslated string: crypto error = Cryptographic error
 WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
-WARNING: untranslated string: dhcp dns key name = Key Name:
+WARNING: untranslated string: dhcp dns key name = Key Name
 WARNING: untranslated string: dhcp dns update = DNS Update
-WARNING: untranslated string: dhcp dns update algo = Algorithm:
-WARNING: untranslated string: dhcp dns update secret = Secret:
+WARNING: untranslated string: dhcp dns update algo = Algorithm
+WARNING: untranslated string: dhcp dns update secret = Secret
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
+WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsforward forward_servers = Nameservers
 WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
 WARNING: untranslated string: eight hours = 8 Hours

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 33c1626ebcf7d642c165f6e7514432713c53b4bf..2a1a0877c6ce96b19b562405421f3cb34ca9eccb 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -807,14 +807,15 @@ WARNING: untranslated string: dh key warn = Creating DH-parameters with a length
 WARNING: untranslated string: dh key warn1 = For weak systems or systems with little entropy, it is recommended to upload long Diffie-Hellman parameters by usage of the upload function.
 WARNING: untranslated string: dh parameter = Diffie-Hellman parameters
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
-WARNING: untranslated string: dhcp dns key name = Key Name:
+WARNING: untranslated string: dhcp dns key name = Key Name
 WARNING: untranslated string: dhcp dns update = DNS Update
-WARNING: untranslated string: dhcp dns update algo = Algorithm:
-WARNING: untranslated string: dhcp dns update secret = Secret:
+WARNING: untranslated string: dhcp dns update algo = Algorithm
+WARNING: untranslated string: dhcp dns update secret = Secret
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns servers = DNS Servers
+WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsforward forward_servers = Nameservers
 WARNING: untranslated string: dnssec aware = DNSSEC Aware
 WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index fe919bf136bef27548488ecf876ce3c30f3ab722..690416af73c4e85a0e7bba71463ccdf5fc7b37fd 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -783,10 +783,10 @@ WARNING: untranslated string: dh key warn = Creating DH-parameters with a length
 WARNING: untranslated string: dh key warn1 = For weak systems or systems with little entropy, it is recommended to upload long Diffie-Hellman parameters by usage of the upload function.
 WARNING: untranslated string: dh parameter = Diffie-Hellman parameters
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
-WARNING: untranslated string: dhcp dns key name = Key Name:
+WARNING: untranslated string: dhcp dns key name = Key Name
 WARNING: untranslated string: dhcp dns update = DNS Update
-WARNING: untranslated string: dhcp dns update algo = Algorithm:
-WARNING: untranslated string: dhcp dns update secret = Secret:
+WARNING: untranslated string: dhcp dns update algo = Algorithm
+WARNING: untranslated string: dhcp dns update secret = Secret
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dnat address = Firewall Interface
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
@@ -795,6 +795,7 @@ WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dnsforward = DNS Forwarding
 WARNING: untranslated string: dnsforward add a new entry = Add a new entry
 WARNING: untranslated string: dnsforward configuration = DNS forward configuration
+WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry
 WARNING: untranslated string: dnsforward entries = Current entries
 WARNING: untranslated string: dnsforward forward_servers = Nameservers

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index cbea3c0aa0de9fa2b1c230bfc197a8f4d8ea092e..c67a931255fa759d3b3d853ff3b29cd438234665 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -786,10 +786,10 @@ WARNING: untranslated string: dh key warn = Creating DH-parameters with a length
 WARNING: untranslated string: dh key warn1 = For weak systems or systems with little entropy, it is recommended to upload long Diffie-Hellman parameters by usage of the upload function.
 WARNING: untranslated string: dh parameter = Diffie-Hellman parameters
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
-WARNING: untranslated string: dhcp dns key name = Key Name:
+WARNING: untranslated string: dhcp dns key name = Key Name
 WARNING: untranslated string: dhcp dns update = DNS Update
-WARNING: untranslated string: dhcp dns update algo = Algorithm:
-WARNING: untranslated string: dhcp dns update secret = Secret:
+WARNING: untranslated string: dhcp dns update algo = Algorithm
+WARNING: untranslated string: dhcp dns update secret = Secret
 WARNING: untranslated string: disk access per = Disk Access per
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dnat address = Firewall Interface
@@ -799,6 +799,7 @@ WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dnsforward = DNS Forwarding
 WARNING: untranslated string: dnsforward add a new entry = Add a new entry
 WARNING: untranslated string: dnsforward configuration = DNS forward configuration
+WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry
 WARNING: untranslated string: dnsforward entries = Current entries
 WARNING: untranslated string: dnsforward forward_servers = Nameservers

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index dff15f55a708b1718480c540b42acc4479e01740..7ebb4d0e7d08b800e912fd1d721f135607b57d8c 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -788,6 +788,7 @@ WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
+WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsforward forward_servers = Nameservers
 WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
 WARNING: untranslated string: fwdfw all subnets = All subnets

diff --git a/doc/language_missings b/doc/language_missings
index 24fee275406d3b95b55bab4803bd3f362aafa228..07813f2527b388b684e97d3748e8b68445484129 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -217,6 +217,7 @@
 < dnsforward add a new entry
 < dnsforward configuration
 < dns forward disable dnssec
+< dnsforward dnssec disabled
 < dnsforward edit an entry
 < dnsforward entries
 < dnsforward forward_servers
@@ -837,6 +838,7 @@
 < default IP address
 < Disabled
 < dns forward disable dnssec
+< dnsforward dnssec disabled
 < dns forwarding dnssec disabled notice
 < emerging pro rules
 < ids apply
@@ -959,6 +961,7 @@
 < Disabled
 < dl client arch insecure
 < dns forward disable dnssec
+< dnsforward dnssec disabled
 < dnsforward forward_servers
 < dns forwarding dnssec disabled notice
 < dnssec disabled warning
@@ -1229,6 +1232,7 @@
 < Disabled
 < dl client arch insecure
 < dns forward disable dnssec
+< dnsforward dnssec disabled
 < dnsforward forward_servers
 < dns forwarding dnssec disabled notice
 < dnssec aware
@@ -1616,6 +1620,7 @@
 < dnsforward add a new entry
 < dnsforward configuration
 < dns forward disable dnssec
+< dnsforward dnssec disabled
 < dnsforward edit an entry
 < dnsforward entries
 < dnsforward forward_servers
@@ -2377,6 +2382,7 @@
 < dnsforward add a new entry
 < dnsforward configuration
 < dns forward disable dnssec
+< dnsforward dnssec disabled
 < dnsforward edit an entry
 < dnsforward entries
 < dnsforward forward_servers
@@ -2989,6 +2995,7 @@
 < default IP address
 < Disabled
 < dns forward disable dnssec
+< dnsforward dnssec disabled
 < dnsforward forward_servers
 < dns forwarding dnssec disabled notice
 < emerging pro rules

diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi
index d9807c90e6599c721bb3cbc29089f05a4049b627..626b664fda11ae2ec598f68510bfdb4b581bcf6b 100644 (file)
--- a/html/cgi-bin/dnsforward.cgi
+++ b/html/cgi-bin/dnsforward.cgi
@@ -189,7 +189,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'})
                        $cgiparams{'ZONE'} = $temp[1];
                        $cgiparams{'FORWARD_SERVERS'} = join(",", split(/\|/, $temp[2]));
                        $cgiparams{'REMARK'} = $temp[3];
-                       $cgiparams{'DISABLE_DNSSEC'} = $temp[4];
+                       $cgiparams{'DISABLE_DNSSEC'} = ($temp[4] eq "on") ? "on" : "off";
                }
        }
 }
@@ -250,7 +250,7 @@ print <<END
        </tr>
        <tr>
                <td width ='20%' class='base'>$Lang::tr{'dns forward disable dnssec'}:</td>
-               <td><input type='checkbox' name='DISABLE_DNSSEC' $checked{'DISABLE_DNSSEC'}' /></td>
+               <td><input type='checkbox' name='DISABLE_DNSSEC' $checked{'DISABLE_DNSSEC'}{'on'} /></td>
        </tr>
 </table>
 <br>
@@ -392,6 +392,8 @@ print <<END
                <td class='base'>$Lang::tr{'edit'}</td>
                <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
                <td class='base'>$Lang::tr{'remove'}</td>
+               <td>&nbsp; &nbsp; <span style="background-color: $Header::colourred">&nbsp; &nbsp;</span></td>
+               <td class='base'>$Lang::tr{'dnsforward dnssec disabled'}</td>
        </tr>
 </table>
 END

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 4fb2349956f538739767e689d3a79a01e783b3c8..812680328c27c44b2f4890911f229d123485bc68 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -469,10 +469,7 @@ sub addccdnet
                $errormessage=$Lang::tr{'ccd err invalidnet'};
                return;
        }
-       
-       $errormessage=&General::checksubnets($ccdname,$ccdnet);
-       
-               
+
        if (!$errormessage) {
                my %ccdconfhash=();
                $baseaddress=&General::getnetworkip($ccdip,$subcidr);

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 919783b8c0743418cdc153435a854297f11c5e73..c300aa2c99a03aaa31fcf30debc5df8dc3000297 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -824,6 +824,7 @@
 'dnsforward' => 'DNS-Weiterleitung',
 'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen',
 'dnsforward configuration' => 'Einstellungen für DNS Weiterleitung',
+'dnsforward dnssec disabled' => 'DNSSEC-Validierung deaktiviert',
 'dnsforward edit an entry' => 'Existierenden Eintrag bearbeiten',
 'dnsforward entries' => 'Aktuelle Einträge',
 'dnsforward forward_servers' => 'DNS-Server',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index ec0eca6a3c6fc818fe7f9dea95a72953b6af4b8a..ee087c32a02bfb25d4daebe55104595131b4103c 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -786,10 +786,10 @@
 'dhcp configuration' => 'DHCP configuration',
 'dhcp create fixed leases' => 'Create fixed leases',
 'dhcp dns enable update' => 'Enable DNS Update (RFC2136):',
-'dhcp dns key name' => 'Key Name:',
+'dhcp dns key name' => 'Key Name',
 'dhcp dns update' => 'DNS Update',
-'dhcp dns update algo' => 'Algorithm:',
-'dhcp dns update secret' => 'Secret:',
+'dhcp dns update algo' => 'Algorithm',
+'dhcp dns update secret' => 'Secret',
 'dhcp fixed lease err1' => 'For a fix lease you have to enter the MAC address or the hostname, or you enter both.',
 'dhcp fixed lease help1' => 'IP Addresses might be entered as FQDN',
 'dhcp mode' => 'DHCP',
@@ -851,6 +851,7 @@
 'dnsforward' => 'DNS Forwarding',
 'dnsforward add a new entry' => 'Add a new entry',
 'dnsforward configuration' => 'DNS forward configuration',
+'dnsforward dnssec disabled' => 'DNSSEC Validation is disabled',
 'dnsforward edit an entry' => 'Edit an existing entry',
 'dnsforward entries' => 'Current entries',
 'dnsforward forward_servers' => 'Nameservers',

diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index 114d0a2976cad10d40336f721a2e9be2e4baaa28..1917b82416172db29b9ba030dab66ad10451f28b 100644 (file)
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -779,10 +779,10 @@
 'dhcp configuration' => 'DHCP yapılandırması',
 'dhcp create fixed leases' => 'Sabit kiralama oluştur',
 'dhcp dns enable update' => 'DNS güncelleştirmesini aktifleştir (RFC2136):',
-'dhcp dns key name' => 'Anahtar adı:',
+'dhcp dns key name' => 'Anahtar adı',
 'dhcp dns update' => 'DNS güncelleme',
-'dhcp dns update algo' => 'Algoritma:',
-'dhcp dns update secret' => 'Gizli:',
+'dhcp dns update algo' => 'Algoritma',
+'dhcp dns update secret' => 'Gizli',
 'dhcp fixed lease err1' => 'Bu düzeltme için MAC adresini, ana bilgisayar adını veya her ikisinide girmeniz gerekir',
 'dhcp fixed lease help1' => 'IP adresleri tam tanımlanmış alan adları (FQDN) şeklinde girilmelidir.',
 'dhcp mode' => 'DHCP',

diff --git a/lfs/clamav b/lfs/clamav
index a6e44ebf20b5ece0bf263d6960a63aef295d5d69..6406914081937a0b59afa358ec680d7447809d73 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.101.1
+VER        = 0.101.2
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 43
+PAK_VER    = 44
 
 DEPS       = ""
 
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9c137d6172f6e132e08e61fe25b636f8
+$(DL_FILE)_MD5 = faeb0e286e76c2a26e2e10845e4b68db
 
 install : $(TARGET)
 

diff --git a/lfs/dnsdist b/lfs/dnsdist
index 3e10c9eb2ae63f2e93a67236aeaef00ff99626db..5963c5acd501635f2ac5611e768d1e70c06923fc 100644 (file)
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.0.498gac688af
+VER        = 1.3.3
 
 THISAPP    = dnsdist-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -33,11 +33,11 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 i586
 PROG       = dnsdist
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
-MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 512)))
+MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 1024)))
 
 ###############################################################################
 # Top-level Rules
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b1bc53b3a35aef7006b74086919847bf
+$(DL_FILE)_MD5 = 6bbcdf5296ac5303e88d779d1d57a4df
 
 install : $(TARGET)
 
@@ -80,13 +80,23 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --sysconfdir=/etc \
+               --enable-openssl \
+               --disable-gnutls \
+               --with-lua \
+               --without-net-snmp
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
        #install initscripts
        $(call INSTALL_INITSCRIPT,dnsdist)
 
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/dnsdist \
+                /var/ipfire/backup/addons/includes/dnsdist
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
 

diff --git a/lfs/freeradius b/lfs/freeradius
index 8435684df8de8bebe5c2ce0fd0f515565c398311..96669c7d57045c5b604ebe644f1f5d4d9daa57f0 100644 (file)
--- a/lfs/freeradius
+++ b/lfs/freeradius
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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        #
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 3.0.14
+VER        = 3.0.18
 
 THISAPP    = freeradius-server-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = freeradius
-PAK_VER    = 3
+PAK_VER    = 5
 
 DEPS       = "samba"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 71f0593f68e6d4dd2efc47a61219643d
+$(DL_FILE)_MD5 = 05f0c8c7ac79659f808ff31751daa857
 
 install : $(TARGET)
 
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        $(UPDATE_AUTOMAKE)
        cd $(DIR_APP) && \
                ./configure \

diff --git a/lfs/lua b/lfs/lua
index 9217e8bac43a686e23dbf9d21934621cf9675761..e70b9cd002f21488617445e9097cc3b68d39d020 100644 (file)
--- a/lfs/lua
+++ b/lfs/lua
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.3.0
+VER        = 5.3.5
 
 THISAPP    = lua-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a1b0a7e92d0c85bbff7a8d27bf29f8af
+$(DL_FILE)_MD5 = 4f4b4f323fd3514a68e0ab3da8ce3455
 
 install : $(TARGET)
 
@@ -71,7 +71,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && cp -v src/luaconf.h src/luaconf.h.template.in
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.3.0-autotoolize.patch
+
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua/lua-5.3.5-autotoolize.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua/lua-5.3.5-shared_library-1.patch
+
        cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)

diff --git a/lfs/nginx b/lfs/nginx
index f6496196c211d95dde8370d5877cc49ac77c5879..5a24678c831dba59757e08e5943b164a3dde2e7e 100644 (file)
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.15.1
+VER        = 1.15.9
 
 THISAPP    = nginx-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG      = nginx
-PAK_VER           = 8
+PAK_VER           = 9
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2dd5a265c54a76b699443931d80a61b9
+$(DL_FILE)_MD5 = 00dde20d4d2cc65bdaf8950a5bd3e14b
 
 install : $(TARGET)
 
@@ -99,7 +99,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --with-http_stub_status_module \
                --with-http_dav_module \
                --with-http_sub_module \
+               --with-http_v2_module \
                --with-pcre
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        mkdir -p /var/log/nginx /var/spool/nginx

diff --git a/lfs/rrdtool b/lfs/rrdtool
index 36d373d2c4b4718f80cf14fd7858e8f1e852103a..9244bc75a2b709cdad8aa52fda39ad521226fdf0 100644 (file)
--- a/lfs/rrdtool
+++ b/lfs/rrdtool
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.6.0
+VER        = 1.7.1
 
 THISAPP    = rrdtool-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4ff52cc44b935b02d2742e6875094da5
+$(DL_FILE)_MD5 = 5f6133630324efe82c8dcefab2056818
 
 install : $(TARGET)
 
@@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --disable-rrdcgi \
                --enable-perl \
                --enable-perl-site-install \
+               --disable-lua \
                --disable-tcl \
                --disable-ruby \
                --disable-python

diff --git a/make.sh b/make.sh
index bb4269d5d5fe56837adf1cc18356cffb507b4667..c05e4b59082c1253ef4494e1408d414182c78766 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1084,6 +1084,7 @@ buildipfire() {
   lfsmake2 openssl
   [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
   lfsmake2 popt
+  lfsmake2 libedit
   lfsmake2 libusb
   lfsmake2 libusb-compat
   lfsmake2 libpcap
@@ -1587,7 +1588,6 @@ buildipfire() {
   lfsmake2 dehydrated
   lfsmake2 shairport-sync
   lfsmake2 borgbackup
-  lfsmake2 libedit
   lfsmake2 knot
   lfsmake2 spectre-meltdown-checker
   lfsmake2 zabbix_agentd

diff --git a/src/initscripts/packages/dnsdist b/src/initscripts/packages/dnsdist
index 03e6ab81bd79c14bdef13abe7101faa2037212ab..a70bd38067c258a24778b3e00c3752ff35d55a44 100644 (file)
--- a/src/initscripts/packages/dnsdist
+++ b/src/initscripts/packages/dnsdist
@@ -14,7 +14,8 @@
 case "${1}" in
        start)
                boot_mesg "Starting dnsdist..."
-               loadproc /usr/bin/dnsdist -d ${ARGS}
+               /usr/bin/dnsdist --supervised ${ARGS} >/dev/null &
+               evaluate_retval
                ;;
 
        stop)

diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata
index ae434df65c994cc853c880a35e5b161893de294c..16548753e9960bc98d45e77a5822da8368c1af4c 100644 (file)
--- a/src/initscripts/system/suricata
+++ b/src/initscripts/system/suricata
@@ -75,8 +75,8 @@ function generate_fw_rules {
                        # Check if there are multiple cpu cores available.
                        if [ "$cpu_count" -gt "1" ]; then
                                # Balance beetween all queues.
-                               NFQ_OPTIONS+="--queue-balance 0:"
-                               NFQ_OPTIONS+=$(($cpu_count-1))
+                               NFQ_OPTIONS+="--queue-balance 0:$(($cpu_count-1))"
+                               NFQ_OPTIONS+=" --queue-cpu-fanout"
                        else
                                # Send all packets to queue 0.
                                NFQ_OPTIONS+="--queue-num 0"

diff --git a/src/paks/dnsdist/install.sh b/src/paks/dnsdist/install.sh
new file mode 100644 (file)
index 0000000..74966d6
--- /dev/null
+++ b/src/paks/dnsdist/install.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+extract_files
+
+restore_backup "${NAME}"
+
+start_service "${NAME}"
+
+# Enable autostart
+ln -sf  ../init.d/dnsdist /etc/rc.d/rc0.d/K25dnsdist
+ln -sf  ../init.d/dnsdist /etc/rc.d/rc3.d/S35dnsdist
+ln -sf  ../init.d/dnsdist /etc/rc.d/rc6.d/K25dnsdist

diff --git a/src/paks/dnsdist/uninstall.sh b/src/paks/dnsdist/uninstall.sh
new file mode 100644 (file)
index 0000000..966c525
--- /dev/null
+++ b/src/paks/dnsdist/uninstall.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+extract_backup_includes
+
+stop_service ${NAME}
+
+make_backup ${NAME}
+
+remove_files
+
+rm -rfv /etc/rc.d/rc*.d/*dnsdist

diff --git a/src/paks/dnsdist/update.sh b/src/paks/dnsdist/update.sh
new file mode 100644 (file)
index 0000000..89c40d0
--- /dev/null
+++ b/src/paks/dnsdist/update.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh

diff --git a/src/patches/lua-5.3.0-autotoolize.patch b/src/patches/lua/lua-5.3.5-autotoolize.patch
similarity index 99%
rename from src/patches/lua-5.3.0-autotoolize.patch
rename to src/patches/lua/lua-5.3.5-autotoolize.patch
index 3e4723a57b537cb6f9d11291cb8195022f9d97cf..76747923a207230a8ef95c7af55e9305c751f2aa 100644 (file)
--- a/src/patches/lua-5.3.0-autotoolize.patch
+++ b/src/patches/lua/lua-5.3.5-autotoolize.patch
@@ -110,7 +110,7 @@ diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/src/luaconf.h.tem
  
  /*
  ** ===================================================================
-@@ -175,9 +180,9 @@
+@@ -200,9 +205,9 @@
  
  #else                 /* }{ */
  

diff --git a/src/patches/lua/lua-5.3.5-shared_library-1.patch b/src/patches/lua/lua-5.3.5-shared_library-1.patch
new file mode 100644 (file)
index 0000000..857fddc
--- /dev/null
+++ b/src/patches/lua/lua-5.3.5-shared_library-1.patch
@@ -0,0 +1,61 @@
+Submitted By:            Igor Živković <contact@igor-zivkovic.from.hr>
+Date:                    2013-06-19
+Initial Package Version: 5.2.2
+Upstream Status:         Rejected
+Origin:                  Arch Linux packages repository
+Description:             Adds the compilation of a shared library.
+
+diff -Naur lua-5.3.0.orig/Makefile lua-5.3.0/Makefile
+--- lua-5.3.0.orig/Makefile    2014-10-30 00:14:41.000000000 +0100
++++ lua-5.3.0/Makefile 2015-01-19 22:14:09.822290828 +0100
+@@ -52,7 +52,7 @@
+ all:  $(PLAT)
+ 
+ $(PLATS) clean:
+-      cd src && $(MAKE) $@
++      cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
+ test: dummy
+       src/lua -v
+diff -Naur lua-5.3.0.orig/src/Makefile lua-5.3.0/src/Makefile
+--- lua-5.3.0.orig/src/Makefile        2015-01-05 17:04:52.000000000 +0100
++++ lua-5.3.0/src/Makefile     2015-01-19 22:14:52.559378543 +0100
+@@ -7,7 +7,7 @@
+ PLAT= none
+ 
+ CC= gcc -std=gnu99
+-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
++CFLAGS= -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
+ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+ LIBS= -lm $(SYSLIBS) $(MYLIBS)
+ 
+@@ -29,6 +29,7 @@
+ PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
+ 
+ LUA_A=        liblua.a
++LUA_SO= liblua.so
+ CORE_O=       lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+       lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
+       ltm.o lundump.o lvm.o lzio.o
+@@ -43,7 +44,7 @@
+ LUAC_O=       luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+ 
+ # Targets start here.
+@@ -59,6 +60,12 @@
+       $(AR) $@ $(BASE_O)
+       $(RANLIB) $@
+ 
++$(LUA_SO): $(CORE_O) $(LIB_O)
++      $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++      ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++      ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+       $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 

diff --git a/src/scripts/ipsec-interfaces b/src/scripts/ipsec-interfaces
index 0e43fccbc828cd0f820dc7ababee0b8612c533f8..cb55fdf795411f79543ef2b661ab143766b993df 100644 (file)
--- a/src/scripts/ipsec-interfaces
+++ b/src/scripts/ipsec-interfaces
@@ -167,6 +167,9 @@ main() {
                log "Deleting interface ${intf}"
                ip link del "${intf}" &>/dev/null
        done
+
+       # (Re-)Apply all static routes
+       /etc/init.d/static-routes start
 }
 
 main || exit $?