[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b96061d75d4c7bc1950f6732af4b9c8863eaadb6

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b96061d75d4c7bc1950f6732af4b9c8863eaadb6

[Michael Tremer]

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, next has been updated
       via  b96061d75d4c7bc1950f6732af4b9c8863eaadb6 (commit)
       via  0d5d825cfe1ad9b0eae663afc8682b807c0358b9 (commit)
       via  ad4a318b71ebdc9cea92de690cb19c351429c86e (commit)
      from  d319ec47f5a6b67406a332f9cff7fd7417d448e1 (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 b96061d75d4c7bc1950f6732af4b9c8863eaadb6
Author: Julio Lira <jul10l1r4@disroot.org>
Date:   Wed Jul 15 13:34:13 2026 +0000

    suricata: Change download URL for the Antiphishing ruleset
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 0d5d825cfe1ad9b0eae663afc8682b807c0358b9
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Jul 15 13:32:57 2026 +0000

    core204: Ship suricata-report-cron
    
    This should have been shipped in a previous update.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit ad4a318b71ebdc9cea92de690cb19c351429c86e
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Jul 15 13:31:28 2026 +0000

    avahi: Prevent the service from blocking the shutdown
    
    When the service is not running, the kill command will return an error
    which will not be caught and forwarded to the caller of the initscript.
    That way, the boot process might be paused which is fixed by this patch.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/204/filelists/files | 1 +
 config/suricata/ruleset-sources           | 4 ++--
 lfs/avahi                                 | 2 +-
 src/initscripts/packages/avahi            | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/204/filelists/files b/config/rootfiles/core/204/filelists/files
index f6cf5ee78..d0f77728a 100644
--- a/config/rootfiles/core/204/filelists/files
+++ b/config/rootfiles/core/204/filelists/files
@@ -1,3 +1,4 @@
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/sysklogd
+usr/bin/suricata-report-cron
 var/ipfire/wireguard-functions.pl
diff --git a/config/suricata/ruleset-sources b/config/suricata/ruleset-sources
index bbd9fa3b1..3cef7c657 100644
--- a/config/suricata/ruleset-sources
+++ b/config/suricata/ruleset-sources
@@ -166,8 +166,8 @@ our %Providers = (
 		website => "https://github.com/julioliraup/Antiphishing",
 		tr_string => "julioliraup/Antiphishing for protect against phishing attack",
 		requires_subscription => "False",
-		dl_url => "https://raw.githubusercontent.com/julioliraup/Antiphishing/refs/heads/main/antiphishing.rules",
-		dl_type => "plain",
+		dl_url => "https://raw.githubusercontent.com/julioliraup/Antiphishing/refs/heads/main/antiphishing.tar.gz",
+		dl_type => "archive",
 		sid_range => ["6000000", "6100000"],
 	},
 
diff --git a/lfs/avahi b/lfs/avahi
index 1df11c70e..d391b6511 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = avahi
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = dbus libdaemon
 
diff --git a/src/initscripts/packages/avahi b/src/initscripts/packages/avahi
index 9f1791121..d4d4a089c 100644
--- a/src/initscripts/packages/avahi
+++ b/src/initscripts/packages/avahi
@@ -30,7 +30,8 @@ case "$1" in
 
 	stop)
 		boot_mesg "Stopping avahi..."
-		/usr/sbin/avahi-daemon -k
+		/usr/sbin/avahi-daemon -k &>/dev/null
+		evaluate_retval
 		;;
 
 	reload)


hooks/post-receive
--
IPFire 2.x development tree