From patchwork Sat May 3 13:59:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42264 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 E33E027BC4B; Sat, 3 May 2025 15:04:00 +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 51BAF27BC49 for ; Sat, 3 May 2025 15:04:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBDSs-0001Em-HQ; Sat, 03 May 2025 10:03:38 -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-00019c-H9 for guix-patches@gnu.org; Sat, 03 May 2025 10:03:06 -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 1uBDSJ-00074M-5M for guix-patches@gnu.org; Sat, 03 May 2025 10:03: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=9d4SjUzfmKcY163Y1UfPpC27+BapLBPEq/UFnBnLK4A=; b=DMpe9AewJB8kCfOHLVfoE8mgABqf128mknEt1++3yh+7Fd0F/awNe9hO1Yk4Wze2MUtlxpYXzFTmmEB/dptiBy23N1cWnKhmYjcvN8uMycoC8CW5oxEiFoZmpFv/+m58YlCBNZE3+6dNNfZ4d53TaWSH+OcruonBl/ijBoh/q5empyUjNFoCc9O/G8DBUpIItvHeL3G0xLoewWPPznEKW8musNXVDuLTmtfJxmEzsGmV4w6RtidbE2Hb47CRLPTYv8O5wZBZxoXp93N3yb+rudW8Gjxq2IKZzJDtSsIPZu/wpVdAzC4o3uaIVu7wxnoFVoqOoRGDU0BdEMYzMu+GHQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBDSI-0000kl-UV for guix-patches@gnu.org; Sat, 03 May 2025 10:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78066] [PATCH v2 2/6] gnu: fail2ban: Move setup and test patches to phases. 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.17462809692849 (code B ref 78066); Sat, 03 May 2025 14:03:02 +0000 Received: (at 78066) by debbugs.gnu.org; 3 May 2025 14:02:49 +0000 Received: from localhost ([127.0.0.1]:41861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBDS4-0000jk-Hy for submit@debbugs.gnu.org; Sat, 03 May 2025 10:02:49 -0400 Received: from 8.mo563.mail-out.ovh.net ([46.105.60.197]:42489) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uBDS0-0000jH-Em for 78066@debbugs.gnu.org; Sat, 03 May 2025 10:02:45 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZqTyB2Cwtz1cXj; Sat, 3 May 2025 14:02:42 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78066@debbugs.gnu.org>; Sat, 3 May 2025 14:02:42 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.139.133]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZqTy96Y9wz61s1; Sat, 3 May 2025 14:02:41 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.1]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 12289263AA5; Sat, 3 May 2025 14:02:40 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-110S004773decb6-5422-4b46-a174-48aa70ee0505, 2C797D8F94FD4BAB69F3C297EB7FEDCEB15A77A0) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 89.207.175.193 Date: Sat, 3 May 2025 15:59:58 +0200 Message-ID: <20250503140234.9752-3-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: 2450239676423004898 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvjeehhedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekledrvddtjedrudejhedrudelfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeektdeiieesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=9d4SjUzfmKcY163Y1UfPpC27+BapLBPEq/UFnBnLK4A=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1746280962; v=1; b=QMr67LnT9LvgELWJg/o2p1ztLY2nyQfRwttIM4ArOCp37OvShbFHi9ZcusfWBg4lnr42xEg4 mo5hSb5FFhYF9tXkHCA9yDp7dUf9CzOn8ya4RePai+ZtiVWxijmHOuTuHXuZYmsoDxSnPiorMYb mPpXUiO5HOmL6n/FPT5lgLrKd7Q5aceL6PWfDTiW+aOVHy5bPu++sH69nkADH3WunjqGeX78S+3 zIAJnbxKyrWHaHskjjvJU5FK6ritop/Yz9B/g1BcS0IFAs7hXGJndmQ/EBMYs3mfunupBQV1JBj OOpXU4t1WYyQNZ12w5OpZAsvdzsmlhJqXk6xb0NWNLddA== 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) [source]: Move setup and test substitutions... [arguments]: ...to phases 'patch-setup.py and 'disable-some-tests. --- gnu/packages/admin.scm | 71 +++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bd07a73c99..ee428c00df 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -6252,42 +6252,7 @@ (define-public fail2ban "paths-fedora.conf" "paths-freebsd.conf" "paths-opensuse.conf" - "paths-osx.conf"))) - ;; Get rid of absolute file names. - (substitute* "setup.py" - (("/etc/fail2ban") - "etc/fail2ban") - (("/var/lib/fail2ban") - "var/lib/fail2ban") - (("\"/usr/bin/\"") - "\"usr/bin/\"") - (("\"/usr/lib/fail2ban/\"") - "\"usr/lib/fail2ban/\"") - (("'/usr/share/doc/fail2ban'") - "'usr/share/doc/fail2ban'")) - ;; disable tests performing unacceptable side-effects - (let ((make-suite (lambda (t) - (string-append - "tests.addTest.unittest.makeSuite." - t "..")))) - (substitute* "fail2ban/tests/utils.py" - (((make-suite "actiontestcase.CommandActionTest")) - "") - (((make-suite "misctestcase.SetupTest")) - "") - (((make-suite - "filtertestcase.DNSUtilsNetworkTests")) - "") - (((make-suite "filtertestcase.IgnoreIPDNS")) - "") - (((make-suite "filtertestcase.GetFailures")) - "") - (((make-suite - "fail2banclienttestcase.Fail2banServerTest")) - "") - (((make-suite - "servertestcase.ServerConfigReaderTests")) - ""))))) + "paths-osx.conf"))))) (patches (search-patches "fail2ban-0.11.2_fix-setuptools-drop-2to3.patch" "fail2ban-python310-server-action.patch" @@ -6302,6 +6267,40 @@ (define-public fail2ban (add-before 'build 'invoke-2to3 (lambda _ (invoke "./fail2ban-2to3"))) + (add-after 'unpack 'patch-setup.py + (lambda _ + ;; Get rid of absolute file names. + (substitute* "setup.py" + (("/etc/fail2ban") + "etc/fail2ban") + (("/var/lib/fail2ban") + "var/lib/fail2ban") + (("\"/usr/bin/\"") + "\"usr/bin/\"") + (("\"/usr/lib/fail2ban/\"") + "\"usr/lib/fail2ban/\"") + (("'/usr/share/doc/fail2ban'") + "'usr/share/doc/fail2ban'")))) + (add-after 'unpack 'disable-some-tests + (lambda _ + (define (make-suite str) + (string-append "tests.addTest.unittest.makeSuite." str "..")) + ;; disable tests performing unacceptable side-effects + (substitute* "fail2ban/tests/utils.py" + (((make-suite "actiontestcase.CommandActionTest")) + "") + (((make-suite "misctestcase.SetupTest")) + "") + (((make-suite "filtertestcase.DNSUtilsNetworkTests")) + "") + (((make-suite "filtertestcase.IgnoreIPDNS")) + "") + (((make-suite "filtertestcase.GetFailures")) + "") + (((make-suite "fail2banclienttestcase.Fail2banServerTest")) + "") + (((make-suite "servertestcase.ServerConfigReaderTests")) + "")))) (add-before 'install 'fix-default-config (lambda* (#:key outputs #:allow-other-keys) (substitute* '("config/paths-common.conf"