From: Adolf Belka Date: Fri, 19 Apr 2024 13:39:40 +0000 (+0200) Subject: update.sh: Remove existing entries for ALIENVAULT & SPAMHAUS_EDROP X-Git-Tag: v2.29-core186~69 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6408ff8d6a952cd88927a7ba6a7aece6cdfb04c0;p=ipfire-2.x.git update.sh: Remove existing entries for ALIENVAULT & SPAMHAUS_EDROP - This removes any time entries in the modified file for either ALIENVAULT or SPAMHAUS_EDROP. - This also removes any blocklists for either of these sources from the /var/lib/ipblocklist directory. - This patch will ensure that any reference to either of these sources is removed from the ipblocklist files. Tested-by: Adolf Belka Signed-off-by: Adolf Belka Signed-off-by: Arne Fitzenreiter --- diff --git a/config/rootfiles/core/186/update.sh b/config/rootfiles/core/186/update.sh index 80510b9342..33e253804b 100644 --- a/config/rootfiles/core/186/update.sh +++ b/config/rootfiles/core/186/update.sh @@ -137,6 +137,17 @@ if [ -e /boot/pakfire-kernel-update ]; then /boot/pakfire-kernel-update ${KVER} fi +# Remove any entry for ALIENVAULT or SPAMHAUS_EDROP from the ipblocklist modified file +# and the associated ipblocklist files from the /var/lib/ipblocklist directory +sed -i '/ALIENVAULT=/d' /var/ipfire/ipblocklist/modified +sed -i '/SPAMHAUS_EDROP=/d' /var/ipfire/ipblocklist/modified +if [ -e /var/lib/ipblocklist/ALIENVAULT.conf ]; then + rm /var/lib/ipblocklist/ALIENVAULT.conf +fi +if [ -e /var/lib/ipblocklist/SPAMHAUS_EDROP.conf ]; then + rm /var/lib/ipblocklist/SPAMHAUS_EDROP.conf +fi + # This update needs a reboot... touch /var/run/need_reboot