From patchwork Fri Apr 19 13:39:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7744 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) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4VLbNs38szz3wkf for ; Fri, 19 Apr 2024 13:39:57 +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 ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4VLbNm0mhMz2Qx; Fri, 19 Apr 2024 13:39:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4VLbNl5HW2z32rq; Fri, 19 Apr 2024 13:39:51 +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) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4VLbNh31P3z2yvG for ; Fri, 19 Apr 2024 13:39:48 +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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4VLbNg74cDz2Kq; Fri, 19 Apr 2024 13:39:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1713533988; 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=WIZQJgLQuso8MtGJQEGSp3LPmH3JxhvBp1TBRgREMdc=; b=NSzUVL2s6yQT0n88ZF4cQ4W7Dar8knaXANpuEXVYW1GxCd9+CkPfUNUlX+ZH5NEYsw2qDp tTXMgkpDr3BOgZsWBNz2/gNOXMedYOfroMBL9qjUvfFi4EsqsCwWRZO7vcfjUt5u/8OjA3 0N9yBIyEF3Vrn/n3TlgNyqfLygj2AKyJ2tkSC/Txo6UI9QZZ7YD6GjHQmZPW5mgDOizE4c aCUrL4EG9APxg1GmVU0EiirYDKsggOMZJtWr1ixkgNec6uni8RC9JJkFkXW1yVQf6MdOkq kUCMjVIKy+YpLEOm1r0CC8mFparKtl8Fm7Se+Ik525obIesQVP0WqhDEfDUR4g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1713533988; 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=WIZQJgLQuso8MtGJQEGSp3LPmH3JxhvBp1TBRgREMdc=; b=l2fIWPtKuBcqZBNsu8M3wEl+jLtyoobgh41irJDkodb/ABA69xN7jHcMFIA3TjVSdcSf+2 2TDK7GCFSy95cqDA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/3] update.sh: Remove existing entries for ALIENVAULT & SPAMHAUS_EDROP Date: Fri, 19 Apr 2024 15:39:40 +0200 Message-ID: <20240419133941.3503396-2-adolf.belka@ipfire.org> In-Reply-To: <20240419133941.3503396-1-adolf.belka@ipfire.org> References: <20240419133941.3503396-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: TXR2VCJXMQXIQEZ37W22GDZEXOLJFZEQ X-Message-ID-Hash: TXR2VCJXMQXIQEZ37W22GDZEXOLJFZEQ 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 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 --- config/rootfiles/core/186/update.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config/rootfiles/core/186/update.sh b/config/rootfiles/core/186/update.sh index d79a35133..9a4bd7f2a 100644 --- a/config/rootfiles/core/186/update.sh +++ b/config/rootfiles/core/186/update.sh @@ -123,6 +123,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