From patchwork Sun May 4 08:56:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42285 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 50B3127BC4B; Sun, 4 May 2025 10:00:04 +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 C4CC027BC49 for ; Sun, 4 May 2025 10:00:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBVC5-0001ra-Qb; Sun, 04 May 2025 04:59:29 -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 1uBVBy-0001oj-64 for guix-patches@gnu.org; Sun, 04 May 2025 04:59:22 -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 1uBVBf-000453-96 for guix-patches@gnu.org; Sun, 04 May 2025 04:59:08 -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=7DqOXXhPNgAzuO4/S/ZQz3pDdaV30dgMFewJn/U75Xo=; b=uoZqnbPguhZMupHSjh+ApKB/aAnobzxJZdmdFrgE359oHpSeVKuttzPutruCLDm5xfnVgUlw0STHsnpKuiO/remwHXr+nh8VX0Om963GYfRrEZuLnZhFNb/ALzaG4RVHKhg4Vly0561zjnLBWvt+sfaBpW82LyehuzQ/fh52fjJg6Su8hUziy7GaZGU2cyMKyvAqXmfMKxUJSnaRt2vW2u4EnHWIelgC4FNkYPwFeiGDEK1Nx7izRJmc5QN4wF/OzqRbcWxl2Yneoxu0DRtRx0AZ/7Gghv/lHZwawDkZ99PHNuNxRG4skj621g+7uORGprw3WhypTyn6uJ9lEN6U/A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBVBf-0000WU-3w for guix-patches@gnu.org; Sun, 04 May 2025 04:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78066] [PATCH v3 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: Sun, 04 May 2025 08:59:03 +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.17463490931612 (code B ref 78066); Sun, 04 May 2025 08:59:03 +0000 Received: (at 78066) by debbugs.gnu.org; 4 May 2025 08:58:13 +0000 Received: from localhost ([127.0.0.1]:51336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBVAq-0000Pp-PA for submit@debbugs.gnu.org; Sun, 04 May 2025 04:58:13 -0400 Received: from 5.mo562.mail-out.ovh.net ([46.105.48.192]:39411) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uBVAX-0000M2-Pw for 78066@debbugs.gnu.org; Sun, 04 May 2025 04:57:59 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4Zqz803QLQz184j; Sun, 4 May 2025 08:57:52 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78066@debbugs.gnu.org>; Sun, 4 May 2025 08:57:52 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.188.244]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4Zqz802FRlz2cHd; Sun, 4 May 2025 08:57:52 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.3]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 008C0BA3FD0; Sun, 4 May 2025 08:57:51 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-111S0057f14ee90-dfbd-4ae8-89fb-4f5f675df78c, 8CD8A0E5D230CF78A323F194FBE8D47D3072D94D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 4 May 2025 10:56:22 +0200 Message-ID: <20250504085747.6387-3-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: 3175037739246805730 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvjeejjeekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedtieeiseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=7DqOXXhPNgAzuO4/S/ZQz3pDdaV30dgMFewJn/U75Xo=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1746349072; v=1; b=tjAeeWtRDalECX07czbrVhGbR+fC0aryG2RXB83TIqslZb/8D9i2ky6Hv6qCDPZa8O4HFznn z4OT88Yt0aroT2YJYld3OARu3UII4VJMMM/TTo5++HaoDha+u9zRulOSFLSHvx9al2cAPtFuE01 l5CFeN69Eo1TTKCjKrpdZrTcj9MvNgkSB0rAgZhtRb09XXUVEfWH+DkzAMdDmhTIyzvWptZpinE XkKnWxZ2VwcHzyKYC0rVkrVvgDlDkYuXZ5accBKWaRHVjVaG1rTUQMdJojoayI7btNn7iLC22QP PAvC2E3xnmB6C7C5lujvl0dC/rmZycI44b0mIhiuhdP1A== 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 216776e62c..d47a1935c3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -6193,42 +6193,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" @@ -6243,6 +6208,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"