From: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu, 24 Apr 2025 14:20:40 +0000 (+0200)
Subject: update.sh: Core195 - remove any 3coresec ipblocklists during Core Update
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c9744bbcb0ab0b483884c914466f960287c0f9d;p=people%2Fstevee%2Fipfire-2.x.git

update.sh: Core195 - remove any 3coresec ipblocklists during Core Update

- This ensures that any existing 3coresec blocklists that might have been selected
   when they existed will be removed from users systems.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/195/update.sh b/config/rootfiles/core/195/update.sh
index 1895513b1..cc9a05aad 100644
--- a/config/rootfiles/core/195/update.sh
+++ b/config/rootfiles/core/195/update.sh
@@ -53,6 +53,21 @@ fi
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Remove any entry for 3CORESEC_SSH, 3CORESEC_SCAN or 3CORESEC_WEB from the ipblocklist modified file
+# and the associated ipblocklist files from the /var/lib/ipblocklist directory
+sed -i '/3CORESEC_SSH=/d' /var/ipfire/ipblocklist/modified
+if [ -e /var/lib/ipblocklist/3CORESEC_SSH.conf ]; then
+	rm /var/lib/ipblocklist/3CORESEC_SSH.conf
+fi
+sed -i '/3CORESEC_SCAN=/d' /var/ipfire/ipblocklist/modified
+if [ -e /var/lib/ipblocklist/3CORESEC_SCAN.conf ]; then
+	rm /var/lib/ipblocklist/3CORESEC_SCAN.conf
+fi
+sed -i '/3CORESEC_WEB=/d' /var/ipfire/ipblocklist/modified
+if [ -e /var/lib/ipblocklist/3CORESEC_WEB.conf ]; then
+	rm /var/lib/ipblocklist/3CORESEC_WEB.conf
+fi
+
 # Start services
 /etc/init.d/firewall restart