From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 009cd67f19c3620da6bc13bb5acb08bd87e5616b
Date: Fri, 20 Sep 2024 12:54:54 +0000 [thread overview]
Message-ID: <4X9C5p5kV3z2xW0@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3645 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, master has been updated
via 009cd67f19c3620da6bc13bb5acb08bd87e5616b (commit)
via 4284d8b0eef956569cd9e1bf1a8ca48683daf5af (commit)
via 18cbaaeb59fe1053d444118aeaa96fa4c18e6587 (commit)
via e6dcf1a9dc52194f1c617a10cdb81b40f474cb55 (commit)
from cc51ff1468a6ee595fcf425a60ea3da9beac9c3d (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 009cd67f19c3620da6bc13bb5acb08bd87e5616b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Sep 20 12:54:37 2024 +0000
core189: Fix IPS rule files again for c188
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4284d8b0eef956569cd9e1bf1a8ca48683daf5af
Merge: cc51ff1468 18cbaaeb59
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Sep 20 12:53:51 2024 +0000
Merge branch 'core188'
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/189/filelists/files | 1 +
config/rootfiles/core/189/update.sh | 2 +-
config/rootfiles/oldcore/188/filelists/files | 1 +
config/rootfiles/oldcore/188/update.sh | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/189/filelists/files b/config/rootfiles/core/189/filelists/files
index e2bd83e7e..30ed2da82 100644
--- a/config/rootfiles/core/189/filelists/files
+++ b/config/rootfiles/core/189/filelists/files
@@ -1,2 +1,3 @@
etc/rc.d/init.d/functions
var/ipfire/header.pl
+var/ipfire/ids-functions.pl
diff --git a/config/rootfiles/core/189/update.sh b/config/rootfiles/core/189/update.sh
index 3bcbcb3bb..f2c8863d6 100644
--- a/config/rootfiles/core/189/update.sh
+++ b/config/rootfiles/core/189/update.sh
@@ -353,7 +353,7 @@ telinit u
/usr/local/bin/openvpnctrl -sn2n
# Regenerate Suricata rule files
-perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::write_used_rulefiles_file();"t
+perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::write_used_rulefiles_file(&IDS::get_enabled_providers());"
/etc/init.d/suricata reload
# Build initial ramdisks
diff --git a/config/rootfiles/oldcore/188/filelists/files b/config/rootfiles/oldcore/188/filelists/files
index 05235c2f4..7de78d2a6 100644
--- a/config/rootfiles/oldcore/188/filelists/files
+++ b/config/rootfiles/oldcore/188/filelists/files
@@ -13,5 +13,6 @@ var/ipfire/backup/bin/backup.pl
var/ipfire/general-functions.pl
var/ipfire/graphs.pl
var/ipfire/header.pl
+var/ipfire/ids-functions.pl
var/ipfire/lang.pl
var/ipfire/network-functions.pl
diff --git a/config/rootfiles/oldcore/188/update.sh b/config/rootfiles/oldcore/188/update.sh
index d15ca9674..8c93857aa 100644
--- a/config/rootfiles/oldcore/188/update.sh
+++ b/config/rootfiles/oldcore/188/update.sh
@@ -122,7 +122,7 @@ ldconfig
/etc/init.d/unbound restart
# Regenerate Suricata rule files
-perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::write_used_rulefiles_file();"t
+perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::write_used_rulefiles_file(&IDS::get_enabled_providers());"
/etc/init.d/suricata reload
# Build initial ramdisks
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2024-09-20 12:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4X9C5p5kV3z2xW0@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox