public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] update.sh: Remove the lines related to FEODO_RECOMMENDED
Date: Mon, 09 Dec 2024 12:42:51 +0100	[thread overview]
Message-ID: <20241209114251.6249-2-adolf.belka@ipfire.org> (raw)
In-Reply-To: <20241209114251.6249-1-adolf.belka@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 1459 bytes --]

- This removes the lines related to removing any time entries in the modified file for
   FEODO_RECOMMENDED.
- This also removes the lines realted to removing the blocklists for the
   FEODO_RECOMMENDED sources from the /var/lib/ipblocklist directory.
- This patch will ensure that FEODO_RECOMMENDED stays in place if it was being used.

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/core/191/update.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/config/rootfiles/core/191/update.sh b/config/rootfiles/core/191/update.sh
index f1c254611..366239bdd 100644
--- a/config/rootfiles/core/191/update.sh
+++ b/config/rootfiles/core/191/update.sh
@@ -36,14 +36,10 @@ done
 # Extract files
 extract_files
 
-# Remove any entry for FEODO_RECOMMENDED, FEODO_IP or FEODO_AGGRESSIVE from the ipblocklist
+# Remove any entry for 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
-- 
2.47.1


      reply	other threads:[~2024-12-09 11:42 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-09 11:42 [PATCH 1/2] sources: Replacement of Feodo Recommended Tracker list to ipblocklist sources file Adolf Belka
2024-12-09 11:42 ` Adolf Belka [this message]

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=20241209114251.6249-2-adolf.belka@ipfire.org \
    --to=adolf.belka@ipfire.org \
    --cc=development@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