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

diff --git a/config/rootfiles/core/167/filelists/misc-progs b/config/rootfiles/core/167/filelists/misc-progs
deleted file mode 120000 (symlink)
index 7223cad..0000000
--- a/config/rootfiles/core/167/filelists/misc-progs
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/misc-progs
\ No newline at end of file

diff --git a/lfs/whois b/lfs/whois
index 5dee31d4afa75528bcb8a7d56055cc6d85a9c45b..19989af369346d877b4538cec3efcd9901e87bb6 100644 (file)
--- a/lfs/whois
+++ b/lfs/whois
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  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.5.10
+VER        = 5.5.13
 
 THISAPP    = whois_$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = f3a2c6d0f46f2091ce8e201a1a670d144b4707cd6928a80da76c6b302fb105dab11d7bf90ac8473d40c0da0ad709956ab3d4b9a2db861b7111603b6037593cf3
+$(DL_FILE)_BLAKE2 = 6ce90ad907c4ea79301adbcda5a402344df9f283ac258a3186f5c405e0abfb97f603f3f163652f1cf03a1fc60290b8f9f54b509bf7d9fd3cec12189eeeaaffe5
 
 install : $(TARGET)
 

diff --git a/src/initscripts/networking/any b/src/initscripts/networking/any
index 0facf23d890264850e87c434e1ef2684ffcf3990..15197badb76664acd95511c0b479194b2e67aa28 100644 (file)
--- a/src/initscripts/networking/any
+++ b/src/initscripts/networking/any
@@ -83,9 +83,6 @@ case "${1}" in
                        fi
                fi
 
-               # Create & Enable vnstat data collection
-               /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
-
                if [ ! "${ADDRESS}" == "1.1.1.1" ]; then
                        boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..."
                        ip addr add ${args} dev ${DEVICE}
@@ -100,8 +97,6 @@ case "${1}" in
                        evaluate_retval
                fi
 
-               # Disable vnstat collection
-               /usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1
                exit 0;
                ;;
 esac

diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index 38129deeb10e47451bd81d0fe55a2782de737d6b..fc10e077abce37ef6af0bb4dbe40e362c3656e50 100644 (file)
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -103,9 +103,6 @@ case "${1}" in
                        fi
                fi
 
-               ## Create & Enable vnstat
-               /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
-
                if [ "${TYPE}" == "STATIC" ]; then
                        # Set the MTU
                        if [ -n "${MTU}" ]; then
@@ -176,9 +173,6 @@ case "${1}" in
                                dhcpcd_start "${DEVICE}"
                        fi
 
-                       ## Create & Enable vnstat
-                       /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
-
                elif [ "$TYPE" == "PPPOE" ]; then
 
                        if ( ps ax | grep -q [p]ppd ); then 
@@ -459,8 +453,7 @@ case "${1}" in
                                evaluate_retval
                                # echo PPP: /usr/sbin/pppd pty "$PPPOE_CMD" $PPP_STD_OPTIONS $DEBUG $DEMAND $PPPD_SYNC
                        fi
-                       ## Create & Enable vnstat
-                       /usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
+
                        /etc/rc.d/init.d/connectd start
                        # Add a NaN value to ppp0 rrd to supress spikes at reconnect
                        rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \
@@ -485,8 +478,6 @@ case "${1}" in
 
                elif [ "$TYPE" == "PPPOE" ]; then
                        boot_mesg "Bringing down the PPP interface ..."
-                       ## Disable vnstat collection
-                       /usr/bin/vnstat -u -i ppp0 -r --disable > /dev/null 2>&1
                        rm -f /var/ipfire/red/keepconnected
                        killall -w -s TERM /usr/sbin/pppd 2>/dev/null
                        evaluate_retval
@@ -533,9 +524,6 @@ case "${1}" in
                killall -w -s KILL pptp >/dev/null 2>&1
                killall -w -s KILL br2684ctl >/dev/null 2>&1
 
-               ## Disable vnstat collection
-               /usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1
-
                exit 0;
                ;;
 esac