GNU bug report logs - #78090
[PATCH v3] gnu: sshguard: Fix sshguard.

Previous Next

To reply to this bug, email your comments to 78090 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: guix-patches <at> gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH] gnu: sshguard: Update to 2.5.0.
Date: Sun, 27 Apr 2025 13:27:17 +0200

* gnu/packages/admin.scm (sshguard): Update to 2.5.0.

Change-Id: Iadcb0dbb5f7c622d6cb02aff983d88d46cbd5719
---
 gnu/packages/admin.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d7ae926809..877553f9f7 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -72,7 +72,7 @@
 ;;; Copyright © 2024 nathan <nathan_mail <at> nborghese.com>
 ;;; Copyright © 2024 Nikita Domnitskii <nikita <at> domnitskii.me>
 ;;; Copyright © 2024 Roman Scherer <roman <at> burningswell.com>
-;;; Copyright © 2024 Ashish SHUKLA <ashish.is <at> lostca.se>
+;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is <at> lostca.se>
 ;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10 <at> gmail.com>
 ;;; Copyright © 2025 Dariqq <dariqq <at> posteo.net>
 ;;; Copyright © 2024 nik gaffney <nik <at> fo.am>
@@ -6770,7 +6770,7 @@ (define-public rdfind
 (define-public sshguard
   (package
     (name "sshguard")
-    (version "2.4.3")
+    (version "2.5.0")
     (source
      (origin
        (method git-fetch)
@@ -6779,7 +6779,7 @@ (define-public sshguard
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1dkijr287zpwdz1bjdchxzmwf1sk6vzpkycz1skm25lkaba6nd9r"))))
+        (base32 "07hwbc6p29nnc5pgcdd3x5x0mry3l7d8ls8zq4yjpy35whs3l29f"))))
     (build-system gnu-build-system)
     (native-inputs
      (list autoconf automake bison flex python-docutils))

base-commit: 7e5913f90df916d8d9f5c509354d62324f54f481
-- 
2.49.0

Message #8 received at 78090 <at> debbugs.gnu.org (full text, mbox):

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: 78090 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v2] gnu: sshguard: Update to 2.5.0.
Date: Sun, 27 Apr 2025 15:31:23 +0200

* gnu/packages/admin.scm (sshguard): Update to 2.5.0.
[arguments]: Add a phase.

Change-Id: I774ef37069ded85412e55a9d83f76bc989ff8ec3
---
Hi,

This revision adds support for specifying configuration through an
environment variable, as right now configuration path is hardcoded,
making it unusable.

 gnu/packages/admin.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index bd4c9c1c3c..d74f973eaf 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -72,7 +72,7 @@
 ;;; Copyright © 2024 nathan <nathan_mail <at> nborghese.com>
 ;;; Copyright © 2024 Nikita Domnitskii <nikita <at> domnitskii.me>
 ;;; Copyright © 2024 Roman Scherer <roman <at> burningswell.com>
-;;; Copyright © 2024 Ashish SHUKLA <ashish.is <at> lostca.se>
+;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is <at> lostca.se>
 ;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10 <at> gmail.com>
 ;;; Copyright © 2025 Dariqq <dariqq <at> posteo.net>
 ;;; Copyright © 2024 nik gaffney <nik <at> fo.am>
@@ -6770,7 +6770,7 @@ (define-public rdfind
 (define-public sshguard
   (package
     (name "sshguard")
-    (version "2.4.3")
+    (version "2.5.0")
     (source
      (origin
        (method git-fetch)
@@ -6779,10 +6779,20 @@ (define-public sshguard
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1dkijr287zpwdz1bjdchxzmwf1sk6vzpkycz1skm25lkaba6nd9r"))))
+        (base32 "07hwbc6p29nnc5pgcdd3x5x0mry3l7d8ls8zq4yjpy35whs3l29f"))))
     (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

base-commit: 97ea59b846c5267098a019f36c84dcaa55fb123e
-- 
2.49.0

Message #11 received at 78090 <at> debbugs.gnu.org (full text, mbox):

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: "Artyom V . Poptsov" <poptsov.artyom <at> gmail.com>
Cc: 78090 <at> debbugs.gnu.org, Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v3] gnu: sshguard: Fix sshguard.
Date: Wed, 30 Apr 2025 23:42:28 +0200

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(-)

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 <nathan_mail <at> nborghese.com>
 ;;; Copyright © 2024 Nikita Domnitskii <nikita <at> domnitskii.me>
 ;;; Copyright © 2024 Roman Scherer <roman <at> burningswell.com>
-;;; Copyright © 2024 Ashish SHUKLA <ashish.is <at> lostca.se>
+;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is <at> lostca.se>
 ;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10 <at> gmail.com>
 ;;; Copyright © 2025 Dariqq <dariqq <at> posteo.net>
 ;;; Copyright © 2024 nik gaffney <nik <at> fo.am>
@@ -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

base-commit: 5bf15734c869ecb9103832cae56198eb8a9adf89
-- 
2.49.0

Message #18 received at 78090-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludovic.courtes <at> inria.fr>
To: Ashish SHUKLA <ashish.is <at> lostca.se>
Cc: "Artyom V . Poptsov" <poptsov.artyom <at> gmail.com>,
 Sharlatan Hellseher <sharlatanus <at> gmail.com>, 78090-done <at> debbugs.gnu.org
Subject: Re: bug#78090: [PATCH v3] gnu: sshguard: Fix sshguard.
Date: Mon, 02 Jun 2025 10:54:07 +0200

Ashish SHUKLA <ashish.is <at> lostca.se> writes:

> Patch sshguard to accept configuration file from an environment variable.
>
> * gnu/packages/admin.scm (sshguard)[arguments]: Add phases.
>
> Change-Id: Ifd1cee18787b2623e5c32801e20e5837ce94c88c

Applied, thanks!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.