From patchwork Sun May 4 08:56:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42282 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 7C82B27BC4B; Sun, 4 May 2025 09:59:45 +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 EF7D827BC49 for ; Sun, 4 May 2025 09:59:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBVC4-0001qd-0I; Sun, 04 May 2025 04:59:28 -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-0001oo-9R for guix-patches@gnu.org; Sun, 04 May 2025 04:59:24 -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 1uBVBe-000452-QR 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=tQ/tOhN/wClrGCdKG1t9s/+iJqK8uhQlqh+alDlBk+M=; b=mb6/RjGb4uUeJyhdZAP1XHHyTHa7j5W/pXSXB+biHo16hLApSMKsuX+sVKnshuQyPSjlMKtsTxp+mxLVP0B4kli6oL62rN/16G4KQpFZImT2OW4O/IbzGRJQGSHpXe642+jtzhw2FST8l1qgOr9EiWkzWQ/o+jHXFBLooL9oeWoc0gSou8X4ahp7JrGjQO2pPI7a7Edy3sTBIm3vOW4z/ijpR2lqKNn1+cvaMXi+pghQLFYpKVSWMkjdB9pVYh5qFyTrBOTzSZ24yoSDFy0uuHD+vSOxUsYMSlAojDEcwHvyA+DTfWVQ1N3arp5+G1BN6+qNoFX6xQimnil0Q4A7YQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBVBe-0000WN-KH for guix-patches@gnu.org; Sun, 04 May 2025 04:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78066] [PATCH v3 6/6] gnu: fail2ban: Improve snippet. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 May 2025 08:59: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.17463490921604 (code B ref 78066); Sun, 04 May 2025 08:59:02 +0000 Received: (at 78066) by debbugs.gnu.org; 4 May 2025 08:58:12 +0000 Received: from localhost ([127.0.0.1]:51334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBVAp-0000Pm-PP for submit@debbugs.gnu.org; Sun, 04 May 2025 04:58:12 -0400 Received: from 9.mo562.mail-out.ovh.net ([46.105.72.114]:43265) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uBVAa-0000MB-Vl for 78066@debbugs.gnu.org; Sun, 04 May 2025 04:57:58 -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 4Zqz840zP4z1W2l; Sun, 4 May 2025 08:57:56 +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:55 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.139.55]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4Zqz836fsfz61lp; Sun, 4 May 2025 08:57:55 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.3]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 694E3C3AB1; Sun, 4 May 2025 08:57:55 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-95G00182190a72-a616-4d4f-9ef3-dd899533d690, 8CD8A0E5D230CF78A323F194FBE8D47D3072D94D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 4 May 2025 10:56:26 +0200 Message-ID: <20250504085747.6387-7-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: 3175882162924544738 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvjeejjeekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedtieeiseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=tQ/tOhN/wClrGCdKG1t9s/+iJqK8uhQlqh+alDlBk+M=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1746349076; v=1; b=j1/DFSQI5mav+nYZVgSp8RE81vFGnNomUYtd2dxSwnhDJhvTcq/LiA05mrL9BTe533hOl7oF VDxRxfU/0Jh0wGtxPDnU2bHo5dugsEFH1gkc93A5SvQYL/S8Af1K70Jo/0n3n1HmByk9twWbBnU KIgiiuflMU2AlEwQefIc2ufJhyRja2m83nSIsnn89Pohbdv++S+ESS1Jc8Sx/7sJaV+BHflyJrQ SQ6LXontGC7sFCl2z4IWErsYKhm+16FBB01KPTMiPdQjZCIvyLXI5Jk19M+t83tdlGpuwSEiZTw 5SNomEu/bwZSizjQSMMAMkhE20+xZ2yjClCDqlw3VcEeA== 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]: Remove (srfi srfi-26). : Use gexp. Move substitute* patches... [arguments]: ...to phases 'patch-setup.py and 'disable-some-tests. --- gnu/packages/admin.scm | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e508340ef0..8fee710c7f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -6218,23 +6218,19 @@ (define-public fail2ban "'usr/share/doc/fail2ban'")))) (add-after 'unpack 'disable-some-tests (lambda _ - (define (make-suite str) - (string-append "tests.addTest\\(loadTests\\(" str "\\)\\)")) + (define (make-suite-regex tests) + (string-append "tests.addTest\\(loadTests\\((" + (string-join tests "|") + ")\\)\\)")) ;; 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")) + (((make-suite-regex (list "actiontestcase.CommandActionTest" + "misctestcase.SetupTest" + "filtertestcase.DNSUtilsNetworkTests" + "filtertestcase.IgnoreIPDNS" + "filtertestcase.GetFailures" + "fail2banclienttestcase.Fail2banServerTest" + "servertestcase.ServerConfigReaderTests"))) "")))) (add-before 'build 'fix-default-config (lambda _