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

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3286 bytes --]

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  b28f36faa526bc829a34509ec1703e466b374a6a (commit)
       via  f349c960e46876253e4bc9ea9aaf0f7b72b99ef0 (commit)
      from  f5c9297fd7d562291280f74f364d6ef01267ab0b (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 b28f36faa526bc829a34509ec1703e466b374a6a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Mar 14 15:54:04 2022 +0000

    core166: Rebuild IPS rules
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit f349c960e46876253e4bc9ea9aaf0f7b72b99ef0
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Mar 13 20:27:25 2022 +0100

    ids-functions.pl: Do not longer extract all rulefiles in archive.
    
    Only extract rulefiles which are located in a rules directory and/or in the archive
    root.
    
    This prevents us from extracting experimental or binary rules etc. which
    often are located in corresponding sub-directories.
    
    Reference: #12794.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/cfgroot/ids-functions.pl           | 3 +++
 config/rootfiles/core/166/filelists/files | 1 +
 config/rootfiles/core/166/update.sh       | 4 ++++
 3 files changed, 8 insertions(+)

Difference in files:
diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index 468efc668..c4edd968d 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -544,6 +544,9 @@ sub extractruleset ($) {
 
 			# Handle rules files.
 			} elsif ($file =~ m/\.rules$/) {
+				# Skip rule files which are not located in the rules directory or archive root.
+				next unless(($packed_file =~ /^rules\//) || ($packed_file !~ /\//));
+
 				my $rulesfilename;
 
 				# Splitt the filename into chunks.
diff --git a/config/rootfiles/core/166/filelists/files b/config/rootfiles/core/166/filelists/files
index 549d2fbcd..1ba79d4bb 100644
--- a/config/rootfiles/core/166/filelists/files
+++ b/config/rootfiles/core/166/filelists/files
@@ -1,3 +1,4 @@
 etc/rc.d/init.d/firewall
 srv/web/ipfire/cgi-bin/ids.cgi
 usr/lib/firewall/rules.pl
+var/ipfire/ids-functions.pl
diff --git a/config/rootfiles/core/166/update.sh b/config/rootfiles/core/166/update.sh
index ab31ee4f9..164f97b8e 100644
--- a/config/rootfiles/core/166/update.sh
+++ b/config/rootfiles/core/166/update.sh
@@ -55,6 +55,10 @@ ldconfig
 # Regenerate all initrds
 dracut --regenerate-all --force
 
+# Rebuild IPS rules
+perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::oinkmaster();"
+/etc/init.d/suricata reload
+
 # Start services
 /etc/init.d/sshd restart
 


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