From patchwork Sun May 4 08:56:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42280 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 BF7BA27BC4B; Sun, 4 May 2025 09:58:41 +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 3C6EE27BC49 for ; Sun, 4 May 2025 09:58:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBVAr-0001em-4E; Sun, 04 May 2025 04:58:13 -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 1uBVAp-0001eJ-ES for guix-patches@gnu.org; Sun, 04 May 2025 04:58:12 -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 1uBVAp-00042c-4e for guix-patches@gnu.org; Sun, 04 May 2025 04:58:11 -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=oJvWlY81aQRdMEPIHPuAcwK6RQSDjLAP0XdlJXdGzLE=; b=X8I2tjXIJsLrNx3m0zRCxJPrNyi2qfIGs7a3INvDiKyWY0+byRVSrgumtvfHaKhl94xmWEJx93iDVP4XDGcgVRxSxHuBe44QerG1FNejdWS00Jm6mE22yl2qnZUsMsFz6qwMXBqgmk0eSLm4GIsndpUI/VgEXEs2kHfs85IDk9piUGXEWnbt2FlMYZ0zP4kUW3Mp1Djjta5wePyJuzqv/VV9bBKXUpUfOwtnYDY8Pcsaffy6DM6+25rVZxoN8lkFh4ulBFn3ebBnA7cdfIkd2/Hgc4rwoWCcOePyevaxgzXc52UlP4y3MsaGRO2/fGR6+V7Hu/kGBuRoqq0/pv0fnQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBVAp-0000PN-0U for guix-patches@gnu.org; Sun, 04 May 2025 04:58:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78066] [PATCH v3 1/6] 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, 04 May 2025 08:58:10 +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.17463490831460 (code B ref 78066); Sun, 04 May 2025 08:58:10 +0000 Received: (at 78066) by debbugs.gnu.org; 4 May 2025 08:58:03 +0000 Received: from localhost ([127.0.0.1]:51330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBVAe-0000Mv-CG for submit@debbugs.gnu.org; Sun, 04 May 2025 04:58:01 -0400 Received: from 1.mo562.mail-out.ovh.net ([178.33.109.175]:56941) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uBVAX-0000Lw-5n for 78066@debbugs.gnu.org; Sun, 04 May 2025 04:57:57 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4Zqz7z3Nhyz1VwY; Sun, 4 May 2025 08:57:51 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78066@debbugs.gnu.org>; Sun, 4 May 2025 08:57:51 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.176.114]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4Zqz7z2D1Qz6252; Sun, 4 May 2025 08:57:51 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.0]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id DC3CCC3AB0; Sun, 4 May 2025 08:57:50 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-101G004d7036f4b-8b5f-434c-958f-ca844d776698, 8CD8A0E5D230CF78A323F194FBE8D47D3072D94D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 4 May 2025 10:56:21 +0200 Message-ID: <20250504085747.6387-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250504085747.6387-1-ngraves@ngraves.fr> References: <20250504085747.6387-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 3174756266389594850 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvjeejjeekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdekuedujeeukeelfeevheeiueeuhedttdfhfeefudekhedujeehleeiffehjeelnecuffhomhgrihhnpehsvghtuhhprdhphienucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeektdeiieesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=oJvWlY81aQRdMEPIHPuAcwK6RQSDjLAP0XdlJXdGzLE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1746349071; v=1; b=C7x7pToP4853bzGNV535c2JmaCJGhcJoSKdRiiokoU1hWfDqOuCEIGsvB/MhBmNAJuJBrrsO 6n2F0fMgNwopag7yvxubjXfJa8SaSKIuanVdBD24MXMrSVTMF+DxkPvzaye+2B8l3LwOsy5zfK8 K+atKR47aGjoJ2T7BJqjeWYF4teyCmmrZJoFLrKiKvfGzffb1xb2hH4eXRouXONurxsk5V244Y9 7ddDcdJrIHVUBrsLLoFM3kcsNqsk2gCEUWgcPCN7WXMZZ7tloYtJsRjhsK2AIDuzoW2gn3un7wJ kks2xbqH3VjyYlm0QEcCl1Pp9BaVKqDx/2iqLn8yAQ+SQ== 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 | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1d0ec121ff..216776e62c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -6185,6 +6185,15 @@ (define-public fail2ban (modules '((guix build utils))) (snippet '(begin + ;; Replacing those by our own paths-guix.conf + (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"))) ;; Get rid of absolute file names. (substitute* "setup.py" (("/etc/fail2ban") @@ -6248,14 +6257,6 @@ (define-public fail2ban (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"