From patchwork Sat May 3 13:59:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42262 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 7D76227BC4C; Sat, 3 May 2025 15:03:50 +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=unavailable 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 8073827BC49 for ; Sat, 3 May 2025 15:03:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBDSa-0001Be-Dh; Sat, 03 May 2025 10:03:27 -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 1uBDSJ-00019b-67 for guix-patches@gnu.org; Sat, 03 May 2025 10:03:04 -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 1uBDSI-00074G-SM for guix-patches@gnu.org; Sat, 03 May 2025 10:03:02 -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=WO0v83oHUnrLaGqRZWAxoBX82v5dSbdf7IwgzpliMLs=; b=SwDhiZz9hivHCNR80dzp5Oz1pl9D04MddDCAJsfk/Pa9v5yEeD5JSIvYQ38KSlWX2bnKlyt6yjCL7EQWf5Ons+9nz6o1U74LlBJ6k8Y5RcKWuos2Hd/p3zi9Wim79tLg00iXG+pB3Vwox0byHZW4HJPUa34mewn7YQzY5czqS4/tEABK56cYs4EilZr7g0Yru/tIcZKDsXhxwHHEWVSoJbsknlbcNivWYlu4kBxkKmK3pDIRxGxjsbpovfUBksDJ+5zrpza0Udjv67WGeoy/WDnUdCEQ3TrH1oEVPE5BWEnfrFcC0N2glalb7beMk3/9lR5j/00T/hjeuFIIfzKCzQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBDSI-0000kb-Dl for guix-patches@gnu.org; Sat, 03 May 2025 10:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78066] [PATCH v2 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: Sat, 03 May 2025 14:03: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.17462809682837 (code B ref 78066); Sat, 03 May 2025 14:03:02 +0000 Received: (at 78066) by debbugs.gnu.org; 3 May 2025 14:02:48 +0000 Received: from localhost ([127.0.0.1]:41859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBDS4-0000jf-0o for submit@debbugs.gnu.org; Sat, 03 May 2025 10:02:48 -0400 Received: from 9.mo562.mail-out.ovh.net ([46.105.72.114]:34215) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uBDRx-0000j6-PL for 78066@debbugs.gnu.org; Sat, 03 May 2025 10:02:44 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZqTy75VfPz1dFX; Sat, 3 May 2025 14:02:39 +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>; Sat, 3 May 2025 14:02:39 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.140.34]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZqTy74BPnz2D4B; Sat, 3 May 2025 14:02:39 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.3]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 2647FC3AA5; Sat, 3 May 2025 14:02:39 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-106R00644a54a16-0a2f-46b9-b404-c07d854159ba, 2C797D8F94FD4BAB69F3C297EB7FEDCEB15A77A0) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 89.207.175.193 Date: Sat, 3 May 2025 15:59:57 +0200 Message-ID: <20250503140234.9752-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503140234.9752-1-ngraves@ngraves.fr> References: <20250503140234.9752-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 2449676724201251554 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvjeehhedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdekuedujeeukeelfeevheeiueeuhedttdfhfeefudekhedujeehleeiffehjeelnecuffhomhgrihhnpehsvghtuhhprdhphienucfkphepuddvjedrtddrtddruddpkeelrddvtdejrddujeehrdduleefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedtieeiseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=WO0v83oHUnrLaGqRZWAxoBX82v5dSbdf7IwgzpliMLs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1746280959; v=1; b=fXKQNIV5J0wFkAx32FYAacvtSXaDCF1OgXM4udK00C7Y6EkmtYDlOkZONG1xGjBj1dz0GlL1 O61DF0vcU0sbgzBbSE/xh3orOby0WJ3n0CCbIRhwblw2epR7lAVqU3k8ZQkT+FnrzeB28MfSAhQ L1v4I4b8dqMioaPVWoLy/Uv952TRBZf9fFMz7PI0PEhq001Uz5wygpk/jD4bdJTPo0sShmr/NYb uB59gc6EmhXfIaj+9nhma3hlgT8by5MIWz3zbHmsDtcW9cKdpuACPV0MY8yNcTY5zwrRnPBOZS2 uqA0mRhIbQc7n92wP7XWYhsHIB58v29frAGJGRJ/5sGrQ== 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 d7ae926809..bd07a73c99 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -6244,6 +6244,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") @@ -6307,14 +6316,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"