Merge branch 'master' into next

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index a23e49c98093ff435b7b929df93f0a4abfe86ac8..96c6c26ead21eb9c5f7958bae3418f7c080f0c4a 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -13,7 +13,7 @@
 # This program 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.                                #
+# GNU General Public License for more details.                                #update.sh
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
@@ -676,84 +676,163 @@ sub updatevpnn2ngraph {
 
 sub updatefwhitsgraph {
        my $period    = $_[0];
-       RRDs::graph(
-               @GRAPH_ARGS,
-               "-",
-               "--start",
-               "-1".$period,
-               "-r",
-               "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"},
-               "-v ".$Lang::tr{'bytes per second'},
-               "--color=SHADEA".$color{"color19"},
-               "--color=SHADEB".$color{"color19"},
-               "--color=BACK".$color{"color21"},
-               "DEF:output=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYOUT/ipt_bytes-DROP_OUTPUT.rrd:value:AVERAGE",
-               "DEF:input=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYIN/ipt_bytes-DROP_INPUT.rrd:value:AVERAGE",
-               "DEF:forward=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYFWD/ipt_bytes-DROP_FORWARD.rrd:value:AVERAGE",
-               "DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE",
-               "DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE",
-               "DEF:spoofedmartian=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-SPOOFED_MARTIAN/ipt_bytes-DROP_SPOOFED_MARTIAN.rrd:value:AVERAGE",
-               "DEF:hostilein=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_IN/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
-               "DEF:hostileout=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_OUT/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
-               "DEF:hostilelegacy=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
-
-               # This creates a new combined hostile segment.
-               # Previously we did not split into incoming/outgoing, but we cannot go back in time. This CDEF will take the values
-               # from the old RRD database unless those are UNKNOWN (i.e. we started collected IN/OUT). If the values are unknown,
-               # we replace them with them sum of IN + OUT.
-               "CDEF:hostile=hostilelegacy,UN,hostilein,hostileout,+,hostilelegacy,IF",
-
-               "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}),
-               "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
-               "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
-               "COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
-               "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
-               "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"),
-               "GPRINT:output:MAX:%8.1lf %sBps",
-               "GPRINT:output:AVERAGE:%8.1lf %sBps",
-               "GPRINT:output:MIN:%8.1lf %sBps",
-               "GPRINT:output:LAST:%8.1lf %sBps\\j",
-               "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"),
-               "GPRINT:forward:MAX:%8.1lf %sBps",
-               "GPRINT:forward:AVERAGE:%8.1lf %sBps",
-               "GPRINT:forward:MIN:%8.1lf %sBps",
-               "GPRINT:forward:LAST:%8.1lf %sBps\\j",
-               "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"),
-               "GPRINT:input:MAX:%8.1lf %sBps",
-               "GPRINT:input:AVERAGE:%8.1lf %sBps",
-               "GPRINT:input:MIN:%8.1lf %sBps",
-               "GPRINT:input:LAST:%8.1lf %sBps\\j",
-               "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
-               "GPRINT:newnotsyn:MAX:%8.1lf %sBps",
-               "GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
-               "GPRINT:newnotsyn:MIN:%8.1lf %sBps",
-               "GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j",
-               "STACK:portscan".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}),
-               "GPRINT:portscan:MAX:%8.1lf %sBps",
-               "GPRINT:portscan:AVERAGE:%8.1lf %sBps",
-               "GPRINT:portscan:MIN:%8.1lf %sBps",
-               "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
-               "STACK:spoofedmartian".$color{"color12"}."A0:".sprintf("%-25s",$Lang::tr{'spoofed or martians'}),
-               "GPRINT:spoofedmartian:MAX:%8.1lf %sBps",
-               "GPRINT:spoofedmartian:AVERAGE:%8.1lf %sBps",
-               "GPRINT:spoofedmartian:MIN:%8.1lf %sBps",
-               "GPRINT:spoofedmartian:LAST:%8.1lf %sBps\\j",
-               "STACK:hostilein".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks in'}),
-               "GPRINT:hostilein:MAX:%8.1lf %sBps",
-               "GPRINT:hostilein:AVERAGE:%8.1lf %sBps",
-               "GPRINT:hostilein:MIN:%8.1lf %sBps",
-               "GPRINT:hostilein:LAST:%8.1lf %sBps\\j",
-               "STACK:hostileout".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks out'}),
-               "GPRINT:hostileout:MAX:%8.1lf %sBps",
-               "GPRINT:hostileout:AVERAGE:%8.1lf %sBps",
-               "GPRINT:hostileout:MIN:%8.1lf %sBps",
-               "GPRINT:hostileout:LAST:%8.1lf %sBps\\j",
-               "LINE:hostile#000000A0:".sprintf("%-25s",$Lang::tr{'hostile networks total'}),
-               "GPRINT:hostile:MAX:%8.1lf %sBps",
-               "GPRINT:hostile:AVERAGE:%8.1lf %sBps",
-               "GPRINT:hostile:MIN:%8.1lf %sBps",
-               "GPRINT:hostile:LAST:%8.1lf %sBps\\j",
-               );
+       if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/iptables-filter-HOSTILE_DROP/ipt_bytes-DROP_HOSTILE.rrd" ) {
+               RRDs::graph(
+                       @GRAPH_ARGS,
+                       "-",
+                       "--start",
+                       "-1".$period,
+                       "-r",
+                       "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"},
+                       "-v ".$Lang::tr{'bytes per second'},
+                       "--color=SHADEA".$color{"color19"},
+                       "--color=SHADEB".$color{"color19"},
+                       "--color=BACK".$color{"color21"},
+                       "DEF:output=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYOUT/ipt_bytes-DROP_OUTPUT.rrd:value:AVERAGE",
+                       "DEF:input=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYIN/ipt_bytes-DROP_INPUT.rrd:value:AVERAGE",
+                       "DEF:forward=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYFWD/ipt_bytes-DROP_FORWARD.rrd:value:AVERAGE",
+                       "DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE",
+                       "DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE",
+                       "DEF:spoofedmartian=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-SPOOFED_MARTIAN/ipt_bytes-DROP_SPOOFED_MARTIAN.rrd:value:AVERAGE",
+                       "DEF:hostilein=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_IN/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+                       "DEF:hostileout=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_OUT/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+                       "DEF:hostilelegacy=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+
+                       # This creates a new combined hostile segment.
+                       # Previously we did not split into incoming/outgoing, but we cannot go back in time. This CDEF will take the values
+                       # from the old RRD database if it exists and if those values are UNKNOWN (time period after Hostile was split into In and Out),
+                       # we replace them with the sum of IN + OUT.
+                       "CDEF:hostile=hostilelegacy,UN,hostilein,hostileout,+,hostilelegacy,IF",
+
+                       "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}),
+                       "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
+                       "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
+                       "COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
+                       "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
+                       "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"),
+                       "GPRINT:output:MAX:%8.1lf %sBps",
+                       "GPRINT:output:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:output:MIN:%8.1lf %sBps",
+                       "GPRINT:output:LAST:%8.1lf %sBps\\j",
+                       "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"),
+                       "GPRINT:forward:MAX:%8.1lf %sBps",
+                       "GPRINT:forward:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:forward:MIN:%8.1lf %sBps",
+                       "GPRINT:forward:LAST:%8.1lf %sBps\\j",
+                       "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"),
+                       "GPRINT:input:MAX:%8.1lf %sBps",
+                       "GPRINT:input:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:input:MIN:%8.1lf %sBps",
+                       "GPRINT:input:LAST:%8.1lf %sBps\\j",
+                       "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
+                       "GPRINT:newnotsyn:MAX:%8.1lf %sBps",
+                       "GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:newnotsyn:MIN:%8.1lf %sBps",
+                       "GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j",
+                       "STACK:portscan".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}),
+                       "GPRINT:portscan:MAX:%8.1lf %sBps",
+                       "GPRINT:portscan:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:portscan:MIN:%8.1lf %sBps",
+                       "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
+                       "STACK:spoofedmartian".$color{"color12"}."A0:".sprintf("%-25s",$Lang::tr{'spoofed or martians'}),
+                       "GPRINT:spoofedmartian:MAX:%8.1lf %sBps",
+                       "GPRINT:spoofedmartian:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:spoofedmartian:MIN:%8.1lf %sBps",
+                       "GPRINT:spoofedmartian:LAST:%8.1lf %sBps\\j",
+                       "STACK:hostilein".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks in'}),
+                       "GPRINT:hostilein:MAX:%8.1lf %sBps",
+                       "GPRINT:hostilein:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:hostilein:MIN:%8.1lf %sBps",
+                       "GPRINT:hostilein:LAST:%8.1lf %sBps\\j",
+                       "STACK:hostileout".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks out'}),
+                       "GPRINT:hostileout:MAX:%8.1lf %sBps",
+                       "GPRINT:hostileout:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:hostileout:MIN:%8.1lf %sBps",
+                       "GPRINT:hostileout:LAST:%8.1lf %sBps\\j",
+                       "LINE:hostile#000000A0:".sprintf("%-25s",$Lang::tr{'hostile networks total'}),
+                       "GPRINT:hostile:MAX:%8.1lf %sBps",
+                       "GPRINT:hostile:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:hostile:MIN:%8.1lf %sBps",
+                       "GPRINT:hostile:LAST:%8.1lf %sBps\\j",
+                       );
+       }else{
+               RRDs::graph(
+                       @GRAPH_ARGS,
+                       "-",
+                       "--start",
+                       "-1".$period,
+                       "-r",
+                       "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"},
+                       "-v ".$Lang::tr{'bytes per second'},
+                       "--color=SHADEA".$color{"color19"},
+                       "--color=SHADEB".$color{"color19"},
+                       "--color=BACK".$color{"color21"},
+                       "DEF:output=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYOUT/ipt_bytes-DROP_OUTPUT.rrd:value:AVERAGE",
+                       "DEF:input=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYIN/ipt_bytes-DROP_INPUT.rrd:value:AVERAGE",
+                       "DEF:forward=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYFWD/ipt_bytes-DROP_FORWARD.rrd:value:AVERAGE",
+                       "DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE",
+                       "DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE",
+                       "DEF:spoofedmartian=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-SPOOFED_MARTIAN/ipt_bytes-DROP_SPOOFED_MARTIAN.rrd:value:AVERAGE",
+                       "DEF:hostilein=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_IN/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+                       "DEF:hostileout=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_OUT/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+
+                       # This creates a new combined hostile segment.
+                       # If we started collecting IN/OUT, ie the old single Hostile RRD database is not available then this CDEF will take the values
+                       # from the sum of IN + OUT.
+                       "CDEF:hostile=hostilein,hostileout,+",
+
+                       "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}),
+                       "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
+                       "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
+                       "COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
+                       "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
+                       "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"),
+                       "GPRINT:output:MAX:%8.1lf %sBps",
+                       "GPRINT:output:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:output:MIN:%8.1lf %sBps",
+                       "GPRINT:output:LAST:%8.1lf %sBps\\j",
+                       "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"),
+                       "GPRINT:forward:MAX:%8.1lf %sBps",
+                       "GPRINT:forward:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:forward:MIN:%8.1lf %sBps",
+                       "GPRINT:forward:LAST:%8.1lf %sBps\\j",
+                       "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"),
+                       "GPRINT:input:MAX:%8.1lf %sBps",
+                       "GPRINT:input:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:input:MIN:%8.1lf %sBps",
+                       "GPRINT:input:LAST:%8.1lf %sBps\\j",
+                       "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
+                       "GPRINT:newnotsyn:MAX:%8.1lf %sBps",
+                       "GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:newnotsyn:MIN:%8.1lf %sBps",
+                       "GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j",
+                       "STACK:portscan".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}),
+                       "GPRINT:portscan:MAX:%8.1lf %sBps",
+                       "GPRINT:portscan:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:portscan:MIN:%8.1lf %sBps",
+                       "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
+                       "STACK:spoofedmartian".$color{"color12"}."A0:".sprintf("%-25s",$Lang::tr{'spoofed or martians'}),
+                       "GPRINT:spoofedmartian:MAX:%8.1lf %sBps",
+                       "GPRINT:spoofedmartian:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:spoofedmartian:MIN:%8.1lf %sBps",
+                       "GPRINT:spoofedmartian:LAST:%8.1lf %sBps\\j",
+                       "STACK:hostilein".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks in'}),
+                       "GPRINT:hostilein:MAX:%8.1lf %sBps",
+                       "GPRINT:hostilein:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:hostilein:MIN:%8.1lf %sBps",
+                       "GPRINT:hostilein:LAST:%8.1lf %sBps\\j",
+                       "STACK:hostileout".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks out'}),
+                       "GPRINT:hostileout:MAX:%8.1lf %sBps",
+                       "GPRINT:hostileout:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:hostileout:MIN:%8.1lf %sBps",
+                       "GPRINT:hostileout:LAST:%8.1lf %sBps\\j",
+                       "LINE:hostile#000000A0:".sprintf("%-25s",$Lang::tr{'hostile networks total'}),
+                       "GPRINT:hostile:MAX:%8.1lf %sBps",
+                       "GPRINT:hostile:AVERAGE:%8.1lf %sBps",
+                       "GPRINT:hostile:MIN:%8.1lf %sBps",
+                       "GPRINT:hostile:LAST:%8.1lf %sBps\\j",
+                       );
+       }
                $ERROR = RRDs::error;
                return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
 }

diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind
index 230b2e595fcc555fd97694a69afbb690d8bf0e61..96859c8db4f2c28e9e8b2b73ab4cf81fb66929a1 100644 (file)
--- a/config/rootfiles/common/bind
+++ b/config/rootfiles/common/bind
@@ -271,24 +271,24 @@ usr/bin/nsupdate
 #usr/include/pk11/site.h
 #usr/include/pkcs11
 #usr/include/pkcs11/pkcs11.h
-usr/lib/libbind9-9.16.45.so
+usr/lib/libbind9-9.16.48.so
 #usr/lib/libbind9.la
 #usr/lib/libbind9.so
-usr/lib/libdns-9.16.45.so
+usr/lib/libdns-9.16.48.so
 #usr/lib/libdns.la
 #usr/lib/libdns.so
-usr/lib/libirs-9.16.45.so
+usr/lib/libirs-9.16.48.so
 #usr/lib/libirs.la
 #usr/lib/libirs.so
-usr/lib/libisc-9.16.45.so
+usr/lib/libisc-9.16.48.so
 #usr/lib/libisc.la
 #usr/lib/libisc.so
-usr/lib/libisccc-9.16.45.so
+usr/lib/libisccc-9.16.48.so
 #usr/lib/libisccc.la
 #usr/lib/libisccc.so
-usr/lib/libisccfg-9.16.45.so
+usr/lib/libisccfg-9.16.48.so
 #usr/lib/libisccfg.la
 #usr/lib/libisccfg.so
-usr/lib/libns-9.16.45.so
+usr/lib/libns-9.16.48.so
 #usr/lib/libns.la
 #usr/lib/libns.so

diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound
index 78c5a31ae21c4ecc648c171aaf41a7f338b094b6..1badd605abfff14dc17630d7b5eb335cedaff427 100644 (file)
--- a/config/rootfiles/common/unbound
+++ b/config/rootfiles/common/unbound
@@ -11,7 +11,7 @@ etc/unbound/unbound.conf
 #usr/lib/libunbound.la
 #usr/lib/libunbound.so
 usr/lib/libunbound.so.8
-usr/lib/libunbound.so.8.1.23
+usr/lib/libunbound.so.8.1.24
 #usr/lib/pkgconfig/libunbound.pc
 usr/sbin/unbound
 usr/sbin/unbound-anchor

diff --git a/config/rootfiles/oldcore/183/filelists/aarch64/glibc b/config/rootfiles/oldcore/183/filelists/aarch64/glibc
new file mode 120000 (symlink)
index 0000000..d13849f
--- /dev/null
+++ b/config/rootfiles/oldcore/183/filelists/aarch64/glibc
@@ -0,0 +1 @@
+../../../../common/aarch64/glibc
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/183/filelists/libhtp b/config/rootfiles/oldcore/183/filelists/libhtp
new file mode 120000 (symlink)
index 0000000..676e2c5
--- /dev/null
+++ b/config/rootfiles/oldcore/183/filelists/libhtp
@@ -0,0 +1 @@
+../../../common/libhtp
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/183/filelists/riscv64/glibc b/config/rootfiles/oldcore/183/filelists/riscv64/glibc
new file mode 120000 (symlink)
index 0000000..36b731f
--- /dev/null
+++ b/config/rootfiles/oldcore/183/filelists/riscv64/glibc
@@ -0,0 +1 @@
+../../../../common/riscv64/glibc
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/183/filelists/suricata b/config/rootfiles/oldcore/183/filelists/suricata
new file mode 120000 (symlink)
index 0000000..f671f69
--- /dev/null
+++ b/config/rootfiles/oldcore/183/filelists/suricata
@@ -0,0 +1 @@
+../../../common/suricata
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/183/filelists/x86_64/glibc b/config/rootfiles/oldcore/183/filelists/x86_64/glibc
new file mode 120000 (symlink)
index 0000000..1119099
--- /dev/null
+++ b/config/rootfiles/oldcore/183/filelists/x86_64/glibc
@@ -0,0 +1 @@
+../../../../common/x86_64/glibc
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/183/update.sh b/config/rootfiles/oldcore/183/update.sh
index 77446311a00334500a6a1802412246852decd3a0..6d1e1fd2538a5d4115787cacb3dcbd14e4c28911 100644 (file)
--- a/config/rootfiles/oldcore/183/update.sh
+++ b/config/rootfiles/oldcore/183/update.sh
@@ -113,6 +113,9 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Relaunch init
+telinit u
+
 # Apply local configuration to sshd_config
 /usr/local/bin/sshctrl
 
@@ -143,7 +146,7 @@ fi
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
        /etc/rc.d/init.d/ipsec start
 fi
-
+/etc/init.d/suricata restart
 
 # Rebuild initial ramdisks
 dracut --regenerate-all --force

diff --git a/config/rootfiles/oldcore/184/filelists/bind b/config/rootfiles/oldcore/184/filelists/bind
new file mode 120000 (symlink)
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/oldcore/184/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/184/filelists/unbound b/config/rootfiles/oldcore/184/filelists/unbound
new file mode 120000 (symlink)
index 0000000..66adf09
--- /dev/null
+++ b/config/rootfiles/oldcore/184/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/184/update.sh b/config/rootfiles/oldcore/184/update.sh
index 024c44be7f812371cf200d6c4c3691368c81d877..3bf38ff8b2fd602a8ffaba4b92ac2e46f6ce7988 100644 (file)
--- a/config/rootfiles/oldcore/184/update.sh
+++ b/config/rootfiles/oldcore/184/update.sh
@@ -81,6 +81,7 @@ telinit u
 /etc/init.d/vnstat start
 /etc/init.d/collectd restart
 /etc/init.d/suricata restart
+/etc/init.d/unbound restart
 if [ -f /var/ipfire/proxy/enable ]; then
        /etc/init.d/squid start
 fi

diff --git a/lfs/bind b/lfs/bind
index 63e642ca890107f23e0fecde115b4f475b268269..271f8ab53bc612b29aeaa2f1f2844845ddaa3fa6 100644 (file)
--- a/lfs/bind
+++ b/lfs/bind
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  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        #
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 9.16.45
+VER        = 9.16.48
 
 THISAPP    = bind-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 2b6cea5e5b510780fb144cf9fce5fbec4adc6a2bb2186646f95afb4aa486edc326106519f149e600aec373238d55c06dfe7ac65f41016453a0967a28ec67ad7e
+$(DL_FILE)_BLAKE2 = 4a503b45df412c435cb0f75b54ee1270140cccce7ecc159cdf3e0e3cbd3c0a0866b7472782f20aacf130f57df12d20a102ac6979498138ce00a2655806d003e7
 
 install : $(TARGET)
 

diff --git a/lfs/unbound b/lfs/unbound
index 22bb2e1cebe86b04c980cee8434be91ce2219611..b852f75b9b569c3b768d87f2ede9b27d5a36698f 100644 (file)
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  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.19.0
+VER        = 1.19.1
 
 THISAPP    = unbound-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 66ec2b1cd32ac5930c088c73e884bc1fb4d35526a0c89bdbe209defd3e78326ce9b3c1a523fc1ab28b8fdf0e457280d5de7b300cf560c15d875f460bc361f5c7
+$(DL_FILE)_BLAKE2 = a48c5b9493eb0a9aa2171956e08677e1cfb7c49b53731c1b05f9192434c4d815eba972aab110ba0ee25fee1e7a57192c8b48e59bb21fb76ad7fd1c7d2d260012
 
 install : $(TARGET)