From patchwork Sun Apr 27 09:08:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42037 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3ED6A27BC4F; Sun, 27 Apr 2025 10:10:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 04CBC27BC49 for ; Sun, 27 Apr 2025 10:10:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8y1X-00042t-77; Sun, 27 Apr 2025 05:10:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u8y1T-000420-9S for guix-patches@gnu.org; Sun, 27 Apr 2025 05:10:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8y1S-0002lR-V6 for guix-patches@gnu.org; Sun, 27 Apr 2025 05:10:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=nDbvoCksDmasOTv5WU4+0A7TbCU1f3S80Gs6WYeoO0Y=; b=AoFgmgAKTEUde64/0x3/3EggTKF7DA3sNBSvF3Dr/tnT6qzOuZ+sbw1puuSCLkSitMDY+soG1BrGrtqPw6kpjMVkBr192UaCdjaTn2scX4hYCZjz91Gz8eZ3xINN2XfgCQX2xcT5gJENwnfMKjGfRnbqsYBZB0zyGXZIs6t+AXHhsccIbJzsSAzvC+M9I1C14rKUT83DLow8PtHBr6/xtgcHTaSZl+EJvs57N4xA9mP08G5KqKKfCvoVL4obrC6L70H3SFPKLKK2wc9UvVSPvvE1gQJgeum1qFMrMtZCDF9h57GOtcZLL1Qpf1bfX24tjD/mkkQON4IzjY/Y1echFg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u8y1S-0002JS-Lo for guix-patches@gnu.org; Sun, 27 Apr 2025 05:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78066] [PATCH v2 1/5] gnu: fail2ban: Move file deletion to source snippet. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Apr 2025 09:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78066 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78066@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78066-submit@debbugs.gnu.org id=B78066.17457449818783 (code B ref 78066); Sun, 27 Apr 2025 09:10:02 +0000 Received: (at 78066) by debbugs.gnu.org; 27 Apr 2025 09:09:41 +0000 Received: from localhost ([127.0.0.1]:38987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u8y16-0002HO-JR for submit@debbugs.gnu.org; Sun, 27 Apr 2025 05:09:41 -0400 Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:35625) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u8y12-0002Gx-SN for 78066@debbugs.gnu.org; Sun, 27 Apr 2025 05:09:37 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4Zlgkl14MZz1Rjp; Sun, 27 Apr 2025 09:09:35 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78066@debbugs.gnu.org>; Sun, 27 Apr 2025 09:09:35 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.25.205]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4Zlgkl0Zb7zy5M; Sun, 27 Apr 2025 09:09:35 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.0]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 3E1D0C3A63; Sun, 27 Apr 2025 09:09:34 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-110S0042205ee18-eeef-4970-9e84-ecda164ae0c7, 9AB25D737CCC7858AAE0948041C432A519AE1DDE) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 89.207.171.153 Date: Sun, 27 Apr 2025 11:08:08 +0200 Message-ID: <20250427090915.11846-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250427090915.11846-1-ngraves@ngraves.fr> References: <20250427090915.11846-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17604289468518884066 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvheejieekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdekuedujeeukeelfeevheeiueeuhedttdfhfeefudekhedujeehleeiffehjeelnecuffhomhgrihhnpehsvghtuhhprdhphienucfkphepuddvjedrtddrtddruddpkeelrddvtdejrddujedurdduheefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedtieeiseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=nDbvoCksDmasOTv5WU4+0A7TbCU1f3S80Gs6WYeoO0Y=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745744975; v=1; b=by+UgpDtyOELt/oef+5TY0MSbDHBdVlGbHjrmKR8clz28VoZNEE7EcmBeVWXGew509BozXqS yQ207obTzHNmLKcun5Cftb5npEu9jz4qnuYEY9R2qZtA9BLE/Cg7SEJ0HgHl2Lio+tZMVoQB3Rb 1d5GY+x70whe8VXo6g1wHGkTUtDxZQlJZe+2tVRx3nHGVUnJn4BBQRI44bsxmlQwIG6S81EmDLg /h/q7SDXWrmpzFFcKy3/gcXkMv/73H8+8oJBzv5a5SCOeMftlW13/VjrnMdtc+/TB5xvlGHqJ/A xUSMOZdtHUZXY8CHIScT7+7Bjdr7G2V6SH4q+i+qSwzsQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/admin.scm (fail2ban) [arguments]: Move multiple file deletion from here... [source]: ...to here. --- gnu/packages/admin.scm | 64 +++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d7ae926809..c6c5188d81 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -6244,6 +6244,38 @@ (define-public fail2ban (modules '((guix build utils))) (snippet '(begin + ;; deleting things that are not feasible to fix + ;; or won't be used any way + (with-directory-excursion "config" + (for-each delete-file + '("paths-arch.conf" + "paths-debian.conf" + "paths-fedora.conf" + "paths-freebsd.conf" + "paths-opensuse.conf" + "paths-osx.conf"))) + (with-directory-excursion "config/action.d" + (for-each delete-file + '("apf.conf" + "bsd-ipfw.conf" + "dshield.conf" + "ipfilter.conf" + "ipfw.conf" + "firewallcmd-allports.conf" + "firewallcmd-common.conf" + "firewallcmd-ipset.conf" + "firewallcmd-multiport.conf" + "firewallcmd-new.conf" + "firewallcmd-rich-logging.conf" + "firewallcmd-rich-rules.conf" + "osx-afctl.conf" + "osx-ipfw.conf" + "pf.conf" + "nginx-block-map.conf" + "npf.conf" + "shorewall.conf" + "shorewall-ipset-proto6.conf" + "ufw.conf"))) ;; Get rid of absolute file names. (substitute* "setup.py" (("/etc/fail2ban") @@ -6305,38 +6337,6 @@ (define-public fail2ban "/etc/fail2ban"))))) (add-after 'fix-default-config 'set-action-dependencies (lambda* (#:key inputs #:allow-other-keys) - ;; deleting things that are not feasible to fix - ;; or won't be used any way - (with-directory-excursion "config" - (for-each delete-file - '("paths-arch.conf" - "paths-debian.conf" - "paths-fedora.conf" - "paths-freebsd.conf" - "paths-opensuse.conf" - "paths-osx.conf"))) - (with-directory-excursion "config/action.d" - (for-each delete-file - '("apf.conf" - "bsd-ipfw.conf" - "dshield.conf" - "ipfilter.conf" - "ipfw.conf" - "firewallcmd-allports.conf" - "firewallcmd-common.conf" - "firewallcmd-ipset.conf" - "firewallcmd-multiport.conf" - "firewallcmd-new.conf" - "firewallcmd-rich-logging.conf" - "firewallcmd-rich-rules.conf" - "osx-afctl.conf" - "osx-ipfw.conf" - "pf.conf" - "nginx-block-map.conf" - "npf.conf" - "shorewall.conf" - "shorewall-ipset-proto6.conf" - "ufw.conf"))) (let* ((lookup-cmd (lambda (i) (search-input-file inputs i))) (bin (lambda (i)