[git.ipfire.org] IPFire 2.x development tree branch, master, updated. dd2b2a07d2e7fe67016fae5e3cedc50764bb53ee

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. dd2b2a07d2e7fe67016fae5e3cedc50764bb53ee

[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, master has been updated
       via  dd2b2a07d2e7fe67016fae5e3cedc50764bb53ee (commit)
       via  302a3565a26a141a9a80a89a3ec9705e13aa8a4c (commit)
       via  0ba18609bde216ef9ad8c485a8852e5080e32e34 (commit)
       via  5579862bfd16ed128fbcd85f111632dc4f0b56a0 (commit)
       via  823149495e8ee9f3ac28699d57b0a4d41f2a4670 (commit)
       via  9a9f4dabb7abfa47c2de86664e1f6c67a5cdbb28 (commit)
      from  336b389fb89eb5d182e85be5c10b26c825e8ae5f (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 dd2b2a07d2e7fe67016fae5e3cedc50764bb53ee
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Feb 23 11:29:08 2026 +0000

    core200: Ship ids.cgi
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 302a3565a26a141a9a80a89a3ec9705e13aa8a4c
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Feb 23 11:28:12 2026 +0000

    suricata: Support separating email addresses by semicolon
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 0ba18609bde216ef9ad8c485a8852e5080e32e34
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Feb 23 11:22:15 2026 +0000

    autoupdate.pl: Don't remove any custom lists
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 5579862bfd16ed128fbcd85f111632dc4f0b56a0
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Feb 23 10:51:22 2026 +0000

    core200: Ship autoupdate.pl
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 823149495e8ee9f3ac28699d57b0a4d41f2a4670
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date:   Sun Feb 22 20:07:53 2026 +0100

    urlfilter: Fix syntax when calling chown
    
    Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 9a9f4dabb7abfa47c2de86664e1f6c67a5cdbb28
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date:   Sun Feb 22 20:07:52 2026 +0100

    urlfiler: Cleanup list directory during update
    
    Cleanup the directory which contains the downloaded blocklists during
    the update process. As the same code is used for sheduled and manual
    updates/list installs this also cleans up old lists when switching the
    lists provider.
    
    Fixes #13820.
    
    Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 config/rootfiles/core/200/filelists/files |  2 ++
 config/suricata/suricata-report-cron      |  2 +-
 config/urlfilter/autoupdate.pl            | 33 +++++++++++++++++++++++++++++--
 html/cgi-bin/ids.cgi                      |  2 +-
 4 files changed, 35 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/200/filelists/files b/config/rootfiles/core/200/filelists/files
index d36e32626..08cac66cd 100644
--- a/config/rootfiles/core/200/filelists/files
+++ b/config/rootfiles/core/200/filelists/files
@@ -2,9 +2,11 @@ etc/rc.d/init.d/functions
 etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/unbound
 srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 usr/local/bin/filesystem-cleanup
 var/ipfire/backup/exclude
 var/ipfire/general-functions.pl
 var/ipfire/ids-functions.pl
 var/ipfire/urlfilter/autoupdate/autoupdate.urls
+var/ipfire/urlfilter/bin/autoupdate.pl
diff --git a/config/suricata/suricata-report-cron b/config/suricata/suricata-report-cron
index 3aa4cc8f8..335f315e1 100644
--- a/config/suricata/suricata-report-cron
+++ b/config/suricata/suricata-report-cron
@@ -39,7 +39,7 @@ send_report() {
 		return 2
 	fi
 
-	local IFS=','
+	local IFS=',;'
 
 	# Append the email recipients
 	for address in ${CONFIG[EMAIL_RECIPIENTS]}; do
diff --git a/config/urlfilter/autoupdate.pl b/config/urlfilter/autoupdate.pl
index 39b9b4f0b..ea79c329b 100644
--- a/config/urlfilter/autoupdate.pl
+++ b/config/urlfilter/autoupdate.pl
@@ -7,6 +7,7 @@
 # $Id: autoupdate.pl,v 1.1 2007/03/14 00:00:00 marco.s Exp $
 #
 use strict;
+use File::Path;
 
 require "/var/ipfire/general-functions.pl";
 
@@ -115,14 +116,15 @@ unless ($blacklist_url eq '')
 
 			system("/usr/bin/squidGuard -d -c $target/update.conf -C all");
 
+			&cleanupdbdir();
 			system("cp -r $target/blacklists/* $dbdir");
 
-			system("chown -R nobody.nobody $dbdir");
+			system("chown -R nobody:nobody $dbdir");
 
 			&setpermissions ($dbdir);
 
 			system("touch $updflagfile");
-			system("chown nobody.nobody $updflagfile");
+			system("chown nobody:nobody $updflagfile");
 
 			system("/etc/init.d/squid restart");
 
@@ -214,3 +216,30 @@ sub setpermissions
 }
 
 # -------------------------------------------------------------------
+
+sub cleanupdbdir {
+	# Open the database directory and do a directory listing.
+	opendir(DIR, "$dbdir") or die "Cannot open $dbdir. $!\n";
+
+	# Loop through the directory.
+	while (my $item = readdir(DIR)) {
+		# Skip . and ..
+		next if ($item eq ".");
+		next if ($item eq "..");
+
+		# Keep custom lists
+		next if ($item eq "custom");
+
+		# Generate absolute path.
+		my $abs_path = "$dbdir/$item";
+
+		# Skip anything which is not a directory.
+		next unless (-d "$abs_path");
+
+		# Remove the directory and the content.
+		&File::Path::remove_tree($abs_path);
+	}
+
+	# Close directory handle.
+	closedir(DIR);
+}
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 9685b37d0..45923ce5c 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -2227,7 +2227,7 @@ sub _validate_mail_address($) {
 
 	# Split the string of mail addresses into single pieces and
 	# store them into the temporary array.
-	@temp = split(/\,/, $address);
+	@temp = split(/[,;]/, $address);
 
 	# Loop through the array of mail addresses.
 	foreach my $addr (@temp) {


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