From patchwork Sun Apr 27 13:31:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashish SHUKLA X-Patchwork-Id: 42055 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 7057A27BC4B; Sun, 27 Apr 2025 14:34:22 +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 1DD5427BC49 for ; Sun, 27 Apr 2025 14:34:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u928z-0007dn-Ts; Sun, 27 Apr 2025 09:34: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 1u928y-0007Vr-1y for guix-patches@gnu.org; Sun, 27 Apr 2025 09:34: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 1u928x-0001Oj-OK for guix-patches@gnu.org; Sun, 27 Apr 2025 09:34:03 -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=ctKzzuWk61C421ZLjIalZrjtI6cQLSAaYaTIBky9Z+I=; b=iM5vnjq6yC++z/N6oYiSyFwSaUHabfq8jKsUcrlYAeNCE0rF+5JIQdA0AZdahXKw9lj4+52AH5WmQNDNl5L98Qvn/dQ7QPmabwoIg3tFJuitYIlJzpzNu4uJy1sMHaKnc2NIdcPhFs0wnE45pt2/UxrqOtUbl9gnJbFu4LpGlxUO5S1mdtsloRbpw1/1mwxbQCQWu7ChgRCREfuF50FRUhXMTSM/3rD2zj8v1s0ylkOSxwahRMtWg6e+fWN0/eWcMMm1lX/4aPzamuYX3ZcTie/hzh8YU5HoX3FYivKnq+UddD1QOZ6VS7gRwCQ7Lnc/uF6piKwQV5uDhI1HKyBhNg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u928w-0008Tt-VR; Sun, 27 Apr 2025 09:34:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78090] [PATCH v2] gnu: sshguard: Update to 2.5.0. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 27 Apr 2025 13:34:02 +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: 78090@debbugs.gnu.org Cc: Ashish SHUKLA , Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 78090-submit@debbugs.gnu.org id=B78090.174576078432498 (code B ref 78090); Sun, 27 Apr 2025 13:34:02 +0000 Received: (at 78090) by debbugs.gnu.org; 27 Apr 2025 13:33:04 +0000 Received: from localhost ([127.0.0.1]:40487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u927w-0008Rn-RM for submit@debbugs.gnu.org; Sun, 27 Apr 2025 09:33:04 -0400 Received: from anamika.lostca.se ([65.21.75.227]:43402) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u927r-0008RN-41 for 78090@debbugs.gnu.org; Sun, 27 Apr 2025 09:32:58 -0400 Received: from localhost.localdomain (2a02-9140-3881-2000-cee6-ce06-2809-174f.red-2a02-914.customerbaf.ipv6.rima-tde.net [IPv6:2a02:9140:3881:2000:cee6:ce06:2809:174f]) (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 001851CF3A; Sun, 27 Apr 2025 13:32:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1745760765; 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=ctKzzuWk61C421ZLjIalZrjtI6cQLSAaYaTIBky9Z+I=; b=HIinPLNxBbFeByzzxwFxV+JGzR6NjuV1JWseac+NWPxaBCeJj54QQZ9JIAJaJ7+1t86OiE xWDccwuqO2cVwc4fLsWeGwp7Uqgq4Xudc8JQ2xBX553mTBTIgeXNDRN/CaXJfybbFiMIY6 jex2VRfrvXZkO/re4Nus0c7Y/nisF/k= Date: Sun, 27 Apr 2025 15:31:23 +0200 Message-ID: <0e0986c096c4c9eb27864c0c05165a2714e3f280.1745760682.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.49.0 In-Reply-To: <8d519fae82a63a1decc318242056b66a40bfb62d.1745753237.git.ashish.is@lostca.se> References: <8d519fae82a63a1decc318242056b66a40bfb62d.1745753237.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 * 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(-) base-commit: 97ea59b846c5267098a019f36c84dcaa55fb123e 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 ;;; 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 @@ -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