Merge remote-tracking branch 'origin/next'

diff --git a/config/ipblocklist/sources b/config/ipblocklist/sources
index c750dcd58501336295335634c3f34f50a788e6fe..a6f82354cffa5cfd782718bb41375b708da2f190 100644 (file)
--- a/config/ipblocklist/sources
+++ b/config/ipblocklist/sources
@@ -93,14 +93,14 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name'     => 'Emerging Threats Blocklis
                                     'parser'   => 'ip-or-net-list',
                                     'rate'     => '15m',
                                     'category' => 'reputation' },
-             'TOR_ALL'         => { 'name'     => 'Known TOR Nodes',
+             'TOR_ALL'         => { 'name'     => 'Known Tor Nodes',
                                     'url'      => 'https://www.dan.me.uk/torlist',
                                     'info'     => 'https://www.dan.me.uk/tornodes',
                                     'parser'   => 'ip-or-net-list',
                                     'rate'     => '1h',
                                     'category' => 'application',
                                     'disable'  => 'TOR_EXIT' },
-             'TOR_EXIT'        => { 'name'     => 'Known TOR Exit Nodes',
+             'TOR_EXIT'        => { 'name'     => 'Known Tor Exit Nodes',
                                     'url'      => 'https://www.dan.me.uk/torlist/?exit',
                                     'info'     => 'https://www.dan.me.uk/tornodes',
                                     'parser'   => 'ip-or-net-list',,

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 088e87f5b868a51d112faa5eecd32f28f095c898..4d631cea59e715e78d3f4458c4e03a84b9456d1f 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -83,6 +83,7 @@ var/ipfire/location-functions.pl
 var/ipfire/ids-functions.pl
 var/ipfire/ipblocklist-functions.pl
 var/ipfire/ipblocklist
+#var/ipfire/ipblocklist/modified
 #var/ipfire/ipblocklist/settings
 var/ipfire/isdn
 #var/ipfire/isdn/settings

diff --git a/config/rootfiles/core/170/filelists/files b/config/rootfiles/core/170/filelists/files
index 01b02c2abe7b58a0d01385823c8d0baa616cfe1a..df8020847ac1f2a91c7e17970a722ae14607f5d9 100644 (file)
--- a/config/rootfiles/core/170/filelists/files
+++ b/config/rootfiles/core/170/filelists/files
@@ -14,6 +14,7 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromblocklist.dat
 srv/web/ipfire/html/themes/ipfire/include/functions.pl
 usr/lib/firewall/rules.pl
+usr/local/bin/getipstat
 usr/local/bin/setaliases
 usr/local/bin/update-ipblocklists
 usr/share/terminfo/t/tmux

diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh
index b6b66f3f13e6025502cbe6dd7198828f09d0833e..9d16f4a32014640a14668875ec63a01bac2d2771 100644 (file)
--- a/config/rootfiles/core/170/update.sh
+++ b/config/rootfiles/core/170/update.sh
@@ -164,6 +164,10 @@ ldconfig
 mkdir -pv /var/lib/ipblocklist
 chown nobody:nobody /var/lib/ipblocklist
 
+# Create necessary files for IPBlocklist and set their ownership accordingly (#12917)
+touch /var/ipfire/ipblocklist/{settings,modified}
+chown nobody:nobody /var/ipfire/ipblocklist/{settings,modified}
+
 # Rebuild fcrontab from scratch
 /usr/bin/fcrontab -z
 

diff --git a/lfs/configroot b/lfs/configroot
index 5565bd344c246c26fa155dca9dfd4f2c65139f41..31b9a946389409fae349a79886eb05c19a29b760 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  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        #
@@ -65,8 +65,8 @@ $(TARGET) :
            captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhcp/settings \
            dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
            ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/locationblock firewall/input firewall/outgoing \
-           fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/settings \
-           isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
+           fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/modified \
+           ipblocklist/settings isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
            ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
            ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
            qos/tosconfig suricata/settings vpn/config vpn/settings vpn/ipsec.conf \

diff --git a/lfs/dbus b/lfs/dbus
index c816b2c07b6b1887701ddb4870cd821929ec4b6c..fdb2e2f21a50ff24b9fd9eb9bc2f4d00d7b771c7 100644 (file)
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -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        #
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = dbus
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       =
 

diff --git a/lfs/netatalk b/lfs/netatalk
index 7a91fa948c2c6efa30e07c6aa76f119516255fb8..e93dede98162c79e90b2fb09669ca64c6a319eeb 100644 (file)
--- a/lfs/netatalk
+++ b/lfs/netatalk
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = AppleShare file server
 
-VER        = 3.1.13
+VER        = 3.1.12
 
 THISAPP    = netatalk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = netatalk
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = avahi dbus
 
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 2849e2a5b436f9965e0dd2aedf5078c560c78f45c1c86fbdea39228266b8fbcc096a3a62a08bd626b8b700fde4dd65d99f71f04478e129f6ec61c2ed7184780d
+$(DL_FILE)_BLAKE2 = 912bb85045952202becc42899f87ada33427ded987de6c7a6b56c061c1eb6d1a96d95a1700522bfe2119c6db8bbec94eeb4c64c480f59ff7d406542390705efc
 
 install : $(TARGET)
 

diff --git a/lfs/qemu b/lfs/qemu
index 1edab05d19b36104b69d01ba25aa4b45250cab7e..cf31c46225f6fa77b13f7d994a88edfac6fa0591 100644 (file)
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -35,9 +35,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = qemu
-PAK_VER    = 33
+PAK_VER    = 34
 
-DEPS       = libusbredir spice libseccomp
+DEPS       = alsa libusbredir spice libseccomp
 
 SERVICES   =
 

diff --git a/src/initscripts/packages/messagebus b/src/initscripts/packages/messagebus
index 399b4c041f206855654a993f052df8e7a2b876c6..c6dec8dd3a250fde0b7f8056aaf414772c105c40 100644 (file)
--- a/src/initscripts/packages/messagebus
+++ b/src/initscripts/packages/messagebus
@@ -50,7 +50,7 @@ case "$1" in
                ;;
 
        status)
-                statusproc -p $pidfile /usr/bin/dbus-daemon
+                statusproc /usr/bin/dbus-daemon
                 ;;
 
         *)

diff --git a/src/misc-progs/getipstat.c b/src/misc-progs/getipstat.c
index 66d5b5a92554737607da380f17f93e11a5d8ab48..c4c7faf75d0ef395215f1532a30663020d4168fb 100644 (file)
--- a/src/misc-progs/getipstat.c
+++ b/src/misc-progs/getipstat.c
@@ -29,7 +29,7 @@ int main(int argc, char** argv)
        // argument.
        char *args[] = {"--list", "--verbose", "--numeric", "--wait", "5", NULL, NULL, NULL, NULL};
        char *usage = "getipstat [-x][-f|-n|-m]";
-       unsigned int pcount = 6;
+       unsigned int pcount = 5;
        unsigned int table_set = 0;
 
        int opt;