From patchwork Wed Apr 30 21:42:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashish SHUKLA X-Patchwork-Id: 42192 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 7FDD627BC49; Wed, 30 Apr 2025 22:46:25 +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 35B3C27BC4A for ; Wed, 30 Apr 2025 22:46:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAFFm-00057o-HT; Wed, 30 Apr 2025 17:46:06 -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 1uAFFi-00057O-TI for guix-patches@gnu.org; Wed, 30 Apr 2025 17:46: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 1uAFFi-0000Ci-0y for guix-patches@gnu.org; Wed, 30 Apr 2025 17:46: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=SPClNydY/46HT3D/xwJRLWqxDy+5p1L3+jzB0AZQeZ0=; b=IujXlLL8B9j47m0ouSCE0BUuQ14Pw6l2R19BHrL5JwNDzLMKM2Bo8/QaWLdneabrfkeO1F00zhuPKo4FDkZX+DHmnRiaoAMaYhs8xHRISkP0/yu62aLBcQL8VYDDSesgPCRk10MDOb7grn+oY4HL1C82Hcme2UylBIcvoQcSKFB63eTFngHln3SPCXNXxLaIa3WfEBGO3gdnc9TQvg6Fc6LHc6TcIxoX6O3mvXCn0oIQCROA+rqCrAGitdF+Fs6DM/MBjBL0v/NXup26/JzFs7nYiJUTuOb+0mFxfqUZJPS+FVivdGuYJvFcy2PN1zioFezHtpmOEfBs4mwxgJpu5A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uAFFh-0000SM-M1; Wed, 30 Apr 2025 17:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78090] [PATCH v3] gnu: sshguard: Fix sshguard. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 30 Apr 2025 21:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78090 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Artyom V . Poptsov" Cc: 78090@debbugs.gnu.org, Ashish SHUKLA , Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 78090-submit@debbugs.gnu.org id=B78090.17460495141676 (code B ref 78090); Wed, 30 Apr 2025 21:46:01 +0000 Received: (at 78090) by debbugs.gnu.org; 30 Apr 2025 21:45:14 +0000 Received: from localhost ([127.0.0.1]:46126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uAFEr-0000OW-0k for submit@debbugs.gnu.org; Wed, 30 Apr 2025 17:45:14 -0400 Received: from anamika.lostca.se ([2a01:4f9:3b:505c::2]:37246) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uAFEl-0000Jf-8Z for 78090@debbugs.gnu.org; Wed, 30 Apr 2025 17:45:07 -0400 Received: from localhost.localdomain (2a02-9140-3881-2e00-6b85-af25-6e1e-0689.red-2a02-914.customerbaf.ipv6.rima-tde.net [IPv6:2a02:9140:3881:2e00:6b85:af25:6e1e:689]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 20F8E1E1BC; Wed, 30 Apr 2025 21:44:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1746049495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SPClNydY/46HT3D/xwJRLWqxDy+5p1L3+jzB0AZQeZ0=; b=qdKeMFxz5G0a/Z+8HPJwaSqwx5q0j0hBh9yZ8MHNRGlPf25HpzxC2VvKkZgGBCCcUgP6GH N7Hxn3EjXp9ga9ULtguXM8MPfw2aB9f6l367+SDmXI6KkMsgY0875fgYf7cMhadSfP/c8h iVpJRrGRaApRSwJDS8jvYqLljwa6q8g= Date: Wed, 30 Apr 2025 23:42:28 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <0e0986c096c4c9eb27864c0c05165a2714e3f280.1745760682.git.ashish.is@lostca.se> References: <0e0986c096c4c9eb27864c0c05165a2714e3f280.1745760682.git.ashish.is@lostca.se> 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: , Reply-to: Ashish SHUKLA X-ACL-Warn: , Ashish SHUKLA via Guix-patches X-Patchwork-Original-From: Ashish SHUKLA via Guix-patches via From: Ashish SHUKLA 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 Patch sshguard to accept configuration file from an environment variable. * gnu/packages/admin.scm (sshguard)[arguments]: Add phases. Change-Id: Ifd1cee18787b2623e5c32801e20e5837ce94c88c --- Hi Artyom, Thanks for updating it to 2.5.1. Running it atm yields: ============================================================================= % /gnu/store/xna4knzy4a4qw0hfna292p89ybvzbrxy-sshguard-2.5.1/sbin/sshguard sshguard: Could not read '/gnu/store/xna4knzy4a4qw0hfna292p89ybvzbrxy-sshguard-2.5.1/etc/sshguard.conf' sshguard: Please configure SSHGuard. ============================================================================= AFAICT, it's fairly useless as the check can not be bypassed. If you're running it in a different way, please share. I've a patch that I'm using it while waiting for this patch to be committed. I've rebased it on top of your commit. Thanks! Ashish gnu/packages/admin.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) base-commit: 5bf15734c869ecb9103832cae56198eb8a9adf89 diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 160c8a562d..9530c2253b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -72,7 +72,7 @@ ;;; Copyright © 2024 nathan ;;; Copyright © 2024 Nikita Domnitskii ;;; Copyright © 2024 Roman Scherer -;;; Copyright © 2024 Ashish SHUKLA +;;; Copyright © 2024, 2025 Ashish SHUKLA ;;; Copyright © 2024 Ashvith Shetty ;;; Copyright © 2025 Dariqq ;;; Copyright © 2024 nik gaffney @@ -6781,6 +6781,16 @@ (define-public sshguard (build-system gnu-build-system) (native-inputs (list autoconf automake bison flex python-docutils)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + ;; patch sshguard to find configuration through + ;; environment variable + (add-after 'unpack 'patch-sshguard + (lambda _ + (substitute* "src/sshguard.in" + (("^config=.*$") + "config=${SSHGUARD_CONFIG_FILE:-@sysconfdir@/sshguard.conf}\n"))))))) (home-page "https://sshguard.net/") (synopsis "Daemon to blocks SSH brute-force attacks") (description