From patchwork Mon Aug 29 09:42:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 42064 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 2C6AD27BBEA; Mon, 29 Aug 2022 10:43:24 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 E085F27BBE9 for ; Mon, 29 Aug 2022 10:43:23 +0100 (BST) Received: from localhost ([::1]:42446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oSbIg-0006xG-V3 for patchwork@mira.cbaines.net; Mon, 29 Aug 2022 05:43:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSbIM-0006ue-LK for guix-patches@gnu.org; Mon, 29 Aug 2022 05:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42183) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oSbIM-0001F9-CJ for guix-patches@gnu.org; Mon, 29 Aug 2022 05:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oSbIM-0006bB-7k for guix-patches@gnu.org; Mon, 29 Aug 2022 05:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57473] [PATCH] gnu: fail2ban-service-type: Fix field name serialization. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Aug 2022 09:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57473@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166176614025314 (code B ref -1); Mon, 29 Aug 2022 09:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Aug 2022 09:42:20 +0000 Received: from localhost ([127.0.0.1]:60165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSbHb-0006a9-DZ for submit@debbugs.gnu.org; Mon, 29 Aug 2022 05:42:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:57606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSbHZ-0006a0-Pz for submit@debbugs.gnu.org; Mon, 29 Aug 2022 05:42:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSbHZ-0006B5-JI for guix-patches@gnu.org; Mon, 29 Aug 2022 05:42:13 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:54788 helo=nomad-cl1.muradm.net) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSbHY-0001Ap-4c for guix-patches@gnu.org; Mon, 29 Aug 2022 05:42:13 -0400 Received: from localhost ([127.0.0.1]:41410) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1oSbHS-0000G5-16 for guix-patches@gnu.org; Mon, 29 Aug 2022 09:42:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=fmzznEIOmI1EzRoiqKKfEiAMj1uZWiC4aLWMoVslhbY=; b=g8uwUbtbsvM0AOcTw3G9Y+8M3N qgilBuODhJu0n6PsbSzlI+quAm6C7dpgxdgv2HMChAK7bqNPDszGJrgBZMEhDmoK8ZOtQkqHaDId5 nqZ5Bn3wL2/cZa63IcrI/6wMy+0H32NvVL9F37i4n5iRUbJjvHFAdCJhICrSay2gH0oUTPcaOow4q +YneIJSDe1tvI7DMdfujhb4msQ6DxVcxLEAp5RzIx1gkyEjw05evLh5kobspVSxYBNfhosNZLAKvJ jGwpvgYD5g2PIoqaHKAf9d9IPQzuP6ZxYPxcAsfQDd5WrZJQgLJGhiDP3Kew9CNddyrbDVXU3jtZZ xQxsj6pJ4yWap+KNgO6tSp+i8iLe9dqXbdkmnnDw3UrlWB+4PMEf0t09GLrkq9qlXPhAWhFUpizpb rGD75o2lFFVzoDUQjsTjC45ladXoYjEgP1qouNatnTodjxo8nLxaILqFJnCK7HRPoPeywj92kofuL G/aNQc/BMQZaZ3G90Hjrvxjv; Received: from muradm by localhost with local (Exim 4.96) (envelope-from ) id 1oSbHR-00043f-2Z for guix-patches@gnu.org; Mon, 29 Aug 2022 12:42:05 +0300 From: muradm Date: Mon, 29 Aug 2022 12:42:05 +0300 Message-Id: <20220829094205.15595-1-mail@muradm.net> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Received-SPF: pass client-ip=139.162.159.157; envelope-from=mail@muradm.net; helo=nomad-cl1.muradm.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/security.scm: Wrong condition in string-filter function in fail2ban-jail-configuration-serialize-field-name. --- gnu/services/security.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/security.scm b/gnu/services/security.scm index 1e0360c07f..9ab23ffb46 100644 --- a/gnu/services/security.scm +++ b/gnu/services/security.scm @@ -127,7 +127,7 @@ (define (fail2ban-jail-configuration-serialize-field-name name) (string-append "bantime." (substring name 9)))) ((string-contains name "-") (fail2ban-jail-configuration-serialize-field-name - (string-filter (lambda (c) (equal? c #\-)) name))) + (string-filter (lambda (c) (not (equal? c #\-))) name))) (else name))) (define (fail2ban-jail-configuration-serialize-string field-name value) From patchwork Mon Aug 29 13:51:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 42065 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 F2A5727BBEB; Mon, 29 Aug 2022 14:52:18 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 A7E8427BBE9 for ; Mon, 29 Aug 2022 14:52:18 +0100 (BST) Received: from localhost ([::1]:36220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oSfBZ-00041W-Qs for patchwork@mira.cbaines.net; Mon, 29 Aug 2022 09:52:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSfBK-000417-MN for guix-patches@gnu.org; Mon, 29 Aug 2022 09:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oSfBK-0003Nx-E7 for guix-patches@gnu.org; Mon, 29 Aug 2022 09:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oSfBK-0000jN-Ah for guix-patches@gnu.org; Mon, 29 Aug 2022 09:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57473] [PATCH v2 2/4] gnu: fail2ban-service-type: Improve jail configuration serialization. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Aug 2022 13:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57473@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 57473-submit@debbugs.gnu.org id=B57473.16617810962715 (code B ref 57473); Mon, 29 Aug 2022 13:52:02 +0000 Received: (at 57473) by debbugs.gnu.org; 29 Aug 2022 13:51:36 +0000 Received: from localhost ([127.0.0.1]:60454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSfAt-0000hX-Tv for submit@debbugs.gnu.org; Mon, 29 Aug 2022 09:51:36 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:32882 helo=nomad-cl1.muradm.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSfAs-0000gu-Ac for 57473@debbugs.gnu.org; Mon, 29 Aug 2022 09:51:34 -0400 Received: from localhost ([127.0.0.1]:46968) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1oSfAm-0000qh-1r; Mon, 29 Aug 2022 13:51:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=cw9E0j/fpFpXVt5nqcBPteMAbW0G8x4rekflCjE3OoU=; b=D8EQg5yZp16y3aAB9uYGGH8TZ1 DS06/gvjdfPFtdJbrj1ieGJo0uNDqF4GjUIlgXEzrc7LcpUYArDaYvSg+SQ4eehFAY4966prV9uEJ NGckfcl+g/JFbGC/GVY3x9Pd3pH19Wlpa3fL7qARZqsoDjigpcajyisTIZwD+a+nT9TWJK7pRo3Nk MG96+KZFMzd6OmJXSVxvGu5SntRTNWAyhE6qjFnpe29eJZDyB1v89ODDH5dAy3jyiYcwC3GWhUn+h yif4ZsLZ585C5ilMbOMsoId+hF3JrIpCd7RIlETxE/ZdFXxjOGP6N05tGbcoiUpSu67UBat8QkB/M 0GLSWvF3T/TeIQc8CCBc0Xhsi81GQcvI6Yjhau3v+Ms2coqqQHaa4Wy3aFKTe/u3k5SOA5ktJr7pJ unODQmerct2azw6knI2hQu5pqQINypyKxxGm5x55PGIYseTb0m7i/BpY9zx1mexZ4vNjEWCiXEOsA nQswihmu3JeWqytBWLfnr0tv; Received: from muradm by localhost with local (Exim 4.96) (envelope-from ) id 1oSfAm-00065W-1N; Mon, 29 Aug 2022 16:51:28 +0300 From: muradm Date: Mon, 29 Aug 2022 16:51:19 +0300 Message-Id: <20220829135121.23392-2-mail@muradm.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220829135121.23392-1-mail@muradm.net> References: <20220829094205.15595-1-mail@muradm.net> <20220829135121.23392-1-mail@muradm.net> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/security.scm (fail2ban-jail-configuration) [name]: Should use empty-serializer. --- gnu/services/security.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/services/security.scm b/gnu/services/security.scm index 9ab23ffb46..7f66c462f3 100644 --- a/gnu/services/security.scm +++ b/gnu/services/security.scm @@ -194,7 +194,8 @@ (define-maybe fail2ban-jail-filter-configuration (prefix fail2ban-jail-configura (define-configuration fail2ban-jail-configuration (name string - "Required name of this jail configuration.") + "Required name of this jail configuration." + empty-serializer) (enabled? (boolean #t) "Whether this jail is enabled.")