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

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

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 3403 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  68725035744de0253f19e0b3550799799a44f80d (commit)
      from  4d4f5df0c8b4e212cec1fd1206616308584df18e (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 68725035744de0253f19e0b3550799799a44f80d
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Thu May 5 16:21:23 2022 +0000

    Core Update 168: Ship and apply IDSv4 changes
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/{oldcore/158 => core/168}/filelists/backup |  0
 config/rootfiles/core/168/filelists/files                   |  5 +++++
 config/rootfiles/core/168/update.sh                         | 10 ++++++++++
 3 files changed, 15 insertions(+)
 copy config/rootfiles/{oldcore/158 => core/168}/filelists/backup (100%)

Difference in files:
diff --git a/config/rootfiles/core/168/filelists/backup b/config/rootfiles/core/168/filelists/backup
new file mode 120000
index 000000000..38e28a8b4
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/backup
@@ -0,0 +1 @@
+../../../common/backup
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/files b/config/rootfiles/core/168/filelists/files
index e0883a7db..c0030ebb5 100644
--- a/config/rootfiles/core/168/filelists/files
+++ b/config/rootfiles/core/168/filelists/files
@@ -391,10 +391,15 @@ lib/firmware/rtw88/rtw8821c_fw.bin
 lib/firmware/rtw88/rtw8822c_fw.bin
 lib/firmware/rtw89/rtw8852a_fw.bin
 lib/firmware/wfx/wfm_wf200_C0.sec
+usr/bin/fcrontab
 usr/lib/firewall/rules.pl
+usr/local/bin/update-ids-ruleset
+usr/sbin/convert-ids-backend-files
+srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/media.cgi
 srv/web/ipfire/cgi-bin/wakeonlan.cgi
 srv/web/ipfire/html/themes/ipfire/include/functions.pl
 var/ipfire/header.pl
+var/ipfire/ids-functions.pl
 var/ipfire/menu.d/20-status.menu
 var/ipfire/menu.d/30-network.menu
diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh
index 45b530c90..4b525170b 100644
--- a/config/rootfiles/core/168/update.sh
+++ b/config/rootfiles/core/168/update.sh
@@ -78,12 +78,21 @@ extract_files
 # update linker config
 ldconfig
 
+# Run IDSv4 converter
+convert-ids-backend-files
+
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Delete orphaned Oinkmaster and Suricata default ruleset
+rm -vf \
+	/usr/local/bin/oinkmaster.pl \
+	/var/ipfire/suricata/oinkmaster.conf \
+	/var/ipfire/suricata/suricata-default-rules.yaml
+
 # Apply local configuration to sshd_config
 /usr/local/bin/sshctrl
 
@@ -95,6 +104,7 @@ chmod -v 750 /etc/sudoers.d
 chmod -v 640 /etc/sudoers.d/*
 
 # Start services
+/etc/init.d/fcron restart
 /etc/init.d/sshd restart
 /etc/init.d/vnstatd restart
 /etc/init.d/squid start


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