From patchwork Wed Oct 16 16:50:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8190 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4XTH5g06H7z3wmx for ; Wed, 16 Oct 2024 16:50:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4XTH5b6cLCz4S4; Wed, 16 Oct 2024 16:50:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4XTH5b66BCz340V; Wed, 16 Oct 2024 16:50:27 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4XTH5X6D8Qz32mJ for ; Wed, 16 Oct 2024 16:50:24 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4XTH5X4mH6z3qt; Wed, 16 Oct 2024 16:50:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1729097424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e+ugVG3MeILWzgI4h7aLQ/1CFrgkGEcbhRR5gMzchK8=; b=f1+CAjdq5eIK5imiAgy2xtWffNklEZxx9EOYByleW2FOFQo2X+llriP81iXivicRIzmJVu niei0kYxyDPyFmDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1729097424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e+ugVG3MeILWzgI4h7aLQ/1CFrgkGEcbhRR5gMzchK8=; b=qp3PegzU4SRYZtQ1qjgKUmq2Fj73SeaRmfndGz4F0mIXyiE5J5UCR8zGDaAuW8nmEVPakn B+15/ltTxGSOsDftXY6UE7pEOoxd5fv4qlsK+8cVxVo8cVLltDOtbGvTkKF5HyltN56qN4 xkbUqzRpFe+cY9hHdLpLZXXQ6kPmJGR56Zr77f8S8iy0UKkJ/sLCuKZWr6p9LK9DFBIioI 7K2P43h8USapi9pHweh1iiREIF7gClD/1PAD3JrwLJo7kYWZbr/hRvjFwqKxMHiYzehmvJ 8YsHl49+lcyEYtA5Zd9xBz18cWcLINFF582V/mVDSKR+zIq9/HTG/t6W2rMHfw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] update.sh: Remove existing entries for the three FEODO_ tracker lists Date: Wed, 16 Oct 2024 18:50:20 +0200 Message-ID: <20241016165020.9287-2-adolf.belka@ipfire.org> In-Reply-To: <20241016165020.9287-1-adolf.belka@ipfire.org> References: <20241016165020.9287-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 6QQAAFBWN6V4DECHMCT647COGDCFSACJ X-Message-ID-Hash: 6QQAAFBWN6V4DECHMCT647COGDCFSACJ X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - 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 --- config/rootfiles/core/190/update.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/config/rootfiles/core/190/update.sh b/config/rootfiles/core/190/update.sh index 16ef608e2..cec9492eb 100644 --- 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