This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 48a19ee575b2268ce9e3e6b623d48c880fb6fede (commit) via 763efaf672a27297e274fbe526a3c49ea96904ee (commit) via 336a2a2e25340b038a79eb7699875875ccb18692 (commit) via 532c31c52933035e3fdacf668efdc2892e8715ca (commit) via 11c6186102c3b1f604d2fe9ea308fc69183e97a5 (commit) via 04aed06489bc9f1ebc30059ab0f6353063b7c856 (commit) via 0e8a17b2d1a7e61ebb1e25b384526c44acc1f7a0 (commit) via 694b0f05280bc452f3ea00f473d598a05f82024b (commit) via 85bfecc0bae35ffe176d7c20dde7188594477787 (commit) via 149d8e83e5f547241a450ea0a68d8afac1e107fa (commit) from ef7d41ef9ea09efd48b934319deb9742e7e41ea1 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 48a19ee575b2268ce9e3e6b623d48c880fb6fede Merge: ef7d41ef9 763efaf67 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Sep 5 10:07:45 2022 +0000
Merge remote-tracking branch 'origin/next'
-----------------------------------------------------------------------
Summary of changes: config/ipblocklist/sources | 4 ++-- config/rootfiles/common/configroot | 1 + config/rootfiles/core/170/filelists/files | 1 + config/rootfiles/core/170/update.sh | 4 ++++ lfs/configroot | 6 +++--- lfs/dbus | 4 ++-- lfs/netatalk | 6 +++--- lfs/qemu | 4 ++-- src/initscripts/packages/messagebus | 2 +- src/misc-progs/getipstat.c | 2 +- 10 files changed, 20 insertions(+), 14 deletions(-)
Difference in files: diff --git a/config/ipblocklist/sources b/config/ipblocklist/sources index c750dcd58..a6f82354c 100644 --- 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 088e87f5b..4d631cea5 100644 --- 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 01b02c2ab..df8020847 100644 --- 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 b6b66f3f1..9d16f4a32 100644 --- 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 5565bd344..31b9a9463 100644 --- 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 c816b2c07..fdb2e2f21 100644 --- 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 7a91fa948..e93dede98 100644 --- 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 1edab05d1..cf31c4622 100644 --- 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 399b4c041..c6dec8dd3 100644 --- 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 66d5b5a92..c4c7faf75 100644 --- 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;
hooks/post-receive -- IPFire 2.x development tree