update.sh: Remove existing entries for the three FEODO_ tracker lists

- This removes any time entries in the modified file for either FEODO_RECOMMENDED,
   FEODO_IP or FEODO_AGGRESSIVE.
- This also removes any blocklists for any of these sources from the /var/lib/ipblocklist
   directory.
- This patch will ensure that any reference to any of these sources is removed from the
   ipblocklist files.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/core/190/update.sh b/config/rootfiles/core/190/update.sh
index 16ef608e2d50d70856112ac8a8ba763bc0b8f202..cec9492ebea7be7c3acec05695b75d7eaf63ef63 100644 (file)
--- a/config/rootfiles/core/190/update.sh
+++ b/config/rootfiles/core/190/update.sh
@@ -145,6 +145,21 @@ if [ -e /boot/pakfire-kernel-update ]; then
     /boot/pakfire-kernel-update ${KVER}
 fi
 
+# Remove any entry for FEODO_RECOMMENDED, FEODO_IP or FEODO_AGGRESSIVE from the ipblocklist
+# modified file and the associated ipblocklist files from the /var/lib/ipblocklist directory
+sed -i '/FEODO_RECOMMENDED=/d' /var/ipfire/ipblocklist/modified
+sed -i '/FEODO_IP=/d' /var/ipfire/ipblocklist/modified
+sed -i '/FEODO_AGGRESSIVE=/d' /var/ipfire/ipblocklist/modified
+if [ -e /var/lib/ipblocklist/FEODO_RECOMMENDED.conf ]; then
+       rm /var/lib/ipblocklist/FEODO_RECOMMENDED.conf
+fi
+if [ -e /var/lib/ipblocklist/FEODO_IP.conf ]; then
+       rm /var/lib/ipblocklist/FEODO_IP.conf
+fi
+if [ -e /var/lib/ipblocklist/FEODO_AGGRESSIVE.conf ]; then
+       rm /var/lib/ipblocklist/FEODO_AGGRESSIVE.conf
+fi
+
 # This update needs a reboot...
 touch /var/run/need_reboot