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

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

[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  a393fad6fb2e0ed829d1b9dc1791e2db375031af (commit)
       via  dd2b2a07d2e7fe67016fae5e3cedc50764bb53ee (commit)
       via  302a3565a26a141a9a80a89a3ec9705e13aa8a4c (commit)
       via  0ba18609bde216ef9ad8c485a8852e5080e32e34 (commit)
       via  5579862bfd16ed128fbcd85f111632dc4f0b56a0 (commit)
       via  823149495e8ee9f3ac28699d57b0a4d41f2a4670 (commit)
       via  9a9f4dabb7abfa47c2de86664e1f6c67a5cdbb28 (commit)
      from  093843686eeb69f41112bdf380e49461676794cc (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 a393fad6fb2e0ed829d1b9dc1791e2db375031af
Merge: 093843686 dd2b2a07d
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Feb 23 11:30:59 2026 +0000

    Merge branch 'master' into next

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

Summary of changes:
 config/rootfiles/oldcore/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/oldcore/200/filelists/files b/config/rootfiles/oldcore/200/filelists/files
index d36e32626..08cac66cd 100644
--- a/config/rootfiles/oldcore/200/filelists/files
+++ b/config/rootfiles/oldcore/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 eb802a8cb..e14b7a147 100644
--- a/config/suricata/suricata-report-cron
+++ b/config/suricata/suricata-report-cron
@@ -108,7 +108,7 @@ fetch_recipients() {
 	local recipients="${CONFIG[EMAIL_RECIPIENTS_REPORT_${interval^^}]:-${CONFIG[EMAIL_RECIPIENTS]}}"
 
 	# Parse this as an array
-	read -ra recipients <<< "${recipients//,/ }"
+	IFS=',;' read -ra recipients <<< "${recipients}"
 
 	# Return all recipients
 	local recipient
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 d615b8db2..192c71ec6 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -2309,7 +2309,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