From patchwork Fri Mar 21 18:27:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Buck X-Patchwork-Id: 40567 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 D139827BBEA; Fri, 21 Mar 2025 18:29:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 CA52827BBE2 for ; Fri, 21 Mar 2025 18:29:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvh7E-0005mv-9x; Fri, 21 Mar 2025 14:29:08 -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 1tvh79-0005lt-Rc for guix-patches@gnu.org; Fri, 21 Mar 2025 14:29: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 1tvh79-0005Bl-Hl for guix-patches@gnu.org; Fri, 21 Mar 2025 14:29: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=uhhEhIkIGcsCjQFCWw7qQbWPTpFHU7bwBrxHuy/EEmw=; b=hoq093WDW53sTD60IgWOvGe4xu2k5j7MlkfhkOy7sxJ8xwe5mYrYO0KHkdH9dghv8MF3AyVaqkyxwPsZVTVZYGHfgCb5eW6zNUevfrWgm5YkpSG9KOfA/t/i1D4xbvHdKZ/Y7Z+5zNTz1z/HhwHK0E4HhtXYecQScAsjyc96Yij/CmDCWDTLSQR3BT9c6D859/3yTXu8ONj+9KerEgj7g9pH1NVVeCMYbcQFTKqy6Ngq9i0UQQaySzJSZM/B9rFksthFxxtDcqgL+ZQUBzL+xdFWC9OA39oOG0sVn75u1BxX7yorE5mu4XFS94/CTjmxnancXcEVzVssRtTravdl7Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tvh78-0004pg-CW for guix-patches@gnu.org; Fri, 21 Mar 2025 14:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77154] [PATCH 1/2] gnu: libssh2: Update to 1.11.1 Resent-From: Christoph Buck Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Mar 2025 18:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77154 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77154@debbugs.gnu.org Cc: Christoph Buck Received: via spool by 77154-submit@debbugs.gnu.org id=B77154.174258169318496 (code B ref 77154); Fri, 21 Mar 2025 18:29:02 +0000 Received: (at 77154) by debbugs.gnu.org; 21 Mar 2025 18:28:13 +0000 Received: from localhost ([127.0.0.1]:39498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvh6K-0004oE-Q7 for submit@debbugs.gnu.org; Fri, 21 Mar 2025 14:28:13 -0400 Received: from mail-108-mta157.mxroute.com ([136.175.108.157]:35749) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tvh6B-0004nf-V7 for 77154@debbugs.gnu.org; Fri, 21 Mar 2025 14:28:05 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta157.mxroute.com (ZoneMTA) with ESMTPSA id 195b9f64fbf00067b0.001 for <77154@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Fri, 21 Mar 2025 18:28:02 +0000 X-Zone-Loop: e8069ba240efa43637f2a0cbd819704d9622a1358a97 X-Originating-IP: [136.175.111.3] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=icepic.de; s=x; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: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=uhhEhIkIGcsCjQFCWw7qQbWPTpFHU7bwBrxHuy/EEmw=; b=HVVX7IiR3utCjqdZILqgj8xAPl K5j4Dz/LNghcMSYoZPKjTl3cygVsHZCUZ3fkyBwPWZBeE/pWpsthLtvngnqywNWE+L2SuwDz6LAZ8 1D9zhm2wzusgam0/IQZY28RRbOnUQ33Ag9TtqVhINGGX/EvhFbpj/T13JYozfmfWM59ZmuMJfuqsp kqxDcHLbqCyarn0hN952iAir88ILGM3eWTcbc8lgqgiHMVeFpJVzCZOYBG68QhmZxUh+GMqITxKXh Y1BhTKtno4m+hg3j/Qsv9oVZ50om7xsEfZzpj+90M2Y4/+OGsjObP2HeIcrGmWaW0AWSnO0hgHGjq 8JAirwFw==; From: Christoph Buck Date: Fri, 21 Mar 2025 19:27:43 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Authenticated-Id: dev@icepic.de 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ssh.scm (libssh2): Update to 1.11.1 [arguments]: Disable tests which requires docker Change-Id: I1bfd8f2db82c190f2b036b3e2e722ded90d07435 --- gnu/packages/ssh.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index fecb3a2559..66d9656caf 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -181,7 +181,7 @@ (define-public libssh (define-public libssh2 (package (name "libssh2") - (version "1.10.0") + (version "1.11.1") (source (origin (method url-fetch) (uri (string-append @@ -189,14 +189,15 @@ (define-public libssh2 version ".tar.gz")) (sha256 (base32 - "0l8xwhhscvss7q007vpbkbv7jh9s43579rx2sf8lnfgd7l7yjr1d")))) + "1xsqysmrq40gdfjndd1yrcvwic16kn4jrzir6pn8xfadwg5pdv6r")))) (build-system gnu-build-system) ;; The installed libssh2.pc file does not include paths to libgcrypt and ;; zlib libraries, so we need to propagate the inputs. (propagated-inputs (list libgcrypt zlib)) (arguments (list #:configure-flags #~'("--with-libgcrypt" - "--disable-static"))) + "--disable-static" + "--disable-docker-tests" ))) (synopsis "Client-side C library implementing the SSH2 protocol") (description "libssh2 is a library intended to allow software developers access to From patchwork Fri Mar 21 18:27:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Buck X-Patchwork-Id: 40568 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 34E7F27BBEA; Fri, 21 Mar 2025 18:29:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 ED14D27BBE2 for ; Fri, 21 Mar 2025 18:29:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvh7F-0005n4-Vv; Fri, 21 Mar 2025 14:29:10 -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 1tvh79-0005ls-K2 for guix-patches@gnu.org; Fri, 21 Mar 2025 14:29: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 1tvh79-0005Bs-2R for guix-patches@gnu.org; Fri, 21 Mar 2025 14:29: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=W/kUTfFQwwWOpFeu8QlhXUG38pjZMM3V7i6yDgtDGv4=; b=trJQ6hbE2N5noATVHfQTIu3gVmkyPd2PD76hxV0xDHeXf3eGyMQPbwn/gZ4Z6fas3g3w4V90HAZBCBZSGCNwUb8iEnqrFaQihGBZO/ILYowJ37f3tE7WgL57R/399tUgrFKJ5ShKG/R7/NG7zmBwmeVk914bSbG4HwprkeqZ4gojrtFm/vmXSMKMeCQxIn+V0NR90jupemJztfJ38HiqEm03+VpkvuxE1wUH1uhXkgW1KSawrqony8hZ3Pu5ojhC+LxJJb09gFJg4t7B6a13BQxRr3XrcxNpUxRS60JeVOojTVnZiSshc2n4vKc2e3ce0UVJpRO5cmNnCyM7Agz6IQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tvh78-0004po-T0 for guix-patches@gnu.org; Fri, 21 Mar 2025 14:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77154] [PATCH 2/2] gnu: libssh2: Change crypto backend to openssl Resent-From: Christoph Buck Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Mar 2025 18:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77154 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77154@debbugs.gnu.org Cc: Christoph Buck Received: via spool by 77154-submit@debbugs.gnu.org id=B77154.174258169318502 (code B ref 77154); Fri, 21 Mar 2025 18:29:02 +0000 Received: (at 77154) by debbugs.gnu.org; 21 Mar 2025 18:28:13 +0000 Received: from localhost ([127.0.0.1]:39500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvh6L-0004oH-5g for submit@debbugs.gnu.org; Fri, 21 Mar 2025 14:28:13 -0400 Received: from mail-108-mta110.mxroute.com ([136.175.108.110]:37277) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tvh6G-0004o2-PW for 77154@debbugs.gnu.org; Fri, 21 Mar 2025 14:28:09 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta110.mxroute.com (ZoneMTA) with ESMTPSA id 195b9f6551600067b0.001 for <77154@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Fri, 21 Mar 2025 18:28:03 +0000 X-Zone-Loop: bc90247fb3b164bdb298d32a2eeba23b4f7e03c9d8ea X-Originating-IP: [136.175.111.3] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=icepic.de; s=x; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: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=W/kUTfFQwwWOpFeu8QlhXUG38pjZMM3V7i6yDgtDGv4=; b=HlfIbsT/prIVD7FzMjn40WSqJs r49+uSz/xyrQdAKrs5iYg1OjPLpvDxX9kQkB8qEypeJ6yMkefeOD5Xinx96pDBzrQTVz7TO8vHTtI 5/nAa9dQx/u4e/uWZhjTqbpS6D8wYt9qVbwg3y+gs4r4dUAdsIIFGPfJmFCvLXnqMWU/WLmiW5O0R plkLdjUZ3lFl7HXctNpaMD5RCs0lTbUUnbUU9bWflFU5g8Erpu7zJ1xxxEFkeT4HMxP1AFfSqjJuE naxFruiSKwWg7hhIQeH2RxKX6UwMvOvrRYgE6rwhWC0NiRFUnyB1eD3j5U+2XSEyPdvqn/mIoqyix hNNrG5ng==; From: Christoph Buck Date: Fri, 21 Mar 2025 19:27:44 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Authenticated-Id: dev@icepic.de 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ssh.scm (libssh2): Change crypto backend to openssl [arguments]: Replace libgcrypt with openssl [propagated-inputs]: Replace libgcrypt with openssl Change crypto backend to openssl to support ed25119 hostkeys. Change-Id: I7603149d6e3a3c251bdc6c3238769a63b6a04d26 --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 66d9656caf..9a6f79bb30 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -193,9 +193,9 @@ (define-public libssh2 (build-system gnu-build-system) ;; The installed libssh2.pc file does not include paths to libgcrypt and ;; zlib libraries, so we need to propagate the inputs. - (propagated-inputs (list libgcrypt zlib)) + (propagated-inputs (list openssl zlib)) (arguments - (list #:configure-flags #~'("--with-libgcrypt" + (list #:configure-flags #~'("--with-crypto=openssl" "--disable-static" "--disable-docker-tests" ))) (synopsis "Client-side C library implementing the SSH2 protocol")