From patchwork Sat Mar 22 20:44:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Buck X-Patchwork-Id: 40687 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 B32CC27BBE2; Sat, 22 Mar 2025 20:46:43 +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 1B41027BBEA for ; Sat, 22 Mar 2025 20:46:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tw5jO-0005Eh-Kc; Sat, 22 Mar 2025 16:46: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 1tw5jG-0005DA-TN for guix-patches@gnu.org; Sat, 22 Mar 2025 16:46:05 -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 1tw5jG-00031P-Fn for guix-patches@gnu.org; Sat, 22 Mar 2025 16: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:Date:From:To:In-Reply-To:References:Subject; bh=y0vlEOmKhQAYw2ttwZeTlTV0p4JNoK+FhEXbMS9a+Kc=; b=hEgw0VjTQwXkkRuOuPvxIrm0PC5QDFPPOUyPNT2DwjX2knpbMCfuAQeiECT3d7gv3doIZ1TFAZhu/r3DxTLkGfGe7MQvMUWHtUf8mj91ngiV3PSdIaUuDPWKYQIL6VbkZ/Fxvds73e9KnuVgk/g2UUYeMI8VFt93LZ2UJAxh3JKckmF7IB0L2u2Mi42L+aM/fn9DFY53/NTn47RWoyE+hiHPkNqQFDTmnXcXpQE2fckjpXgL2foxpST3B1PBZjdEhZ6+haYvMqNiP5ncMrgcWDsulTWOjQSUDUfa/vkzvjs3aOoRJKzI3BCD8EmS2Pdj0PaMGkW4DbINGiHi4p3i3w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tw5jG-0001i6-9x for guix-patches@gnu.org; Sat, 22 Mar 2025 16:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77154] [PATCH v3 1/2] gnu: libssh2: Update to 1.11.1 References: In-Reply-To: Resent-From: Christoph Buck Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 20:46: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.17426763055913 (code B ref 77154); Sat, 22 Mar 2025 20:46:02 +0000 Received: (at 77154) by debbugs.gnu.org; 22 Mar 2025 20:45:05 +0000 Received: from localhost ([127.0.0.1]:45891 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw5iK-0001Wy-GC for submit@debbugs.gnu.org; Sat, 22 Mar 2025 16:45:05 -0400 Received: from mail-108-mta87.mxroute.com ([136.175.108.87]:42193) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tw5iH-0001Vk-AC for 77154@debbugs.gnu.org; Sat, 22 Mar 2025 16:45:02 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta87.mxroute.com (ZoneMTA) with ESMTPSA id 195bf9a108200067b0.001 for <77154@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sat, 22 Mar 2025 20:44:59 +0000 X-Zone-Loop: d94031a9b8cb979df2e0555220611895ef01aa5bb86e 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: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:In-Reply-To:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=y0vlEOmKhQAYw2ttwZeTlTV0p4JNoK+FhEXbMS9a+Kc=; b=ltCMWET4kLqt 51aBjKHsGHTqr4jw7maAClH/BU4INZSh5McoLbZf3garekVCrW9/pKOqKvJUkcJQtMyP4Vvd7/EXk 5PMdrALFi14Wf3mUuw//J5c7WUzF0H2ouxLAsvWWGu8exINoJKoEoSEz1b8Qhtnh/d72toWew6oe2 E0+L8xs0zOUzcc3xuzAbKlf2TxZfqRPR4/DuNXySonHHn9Uwx54SeHvrw9gcE1un2XobzhvbofO+x d9Z92YacsXBuGG1Wk/5npYggSQSwZRL6FYaun+wntFF3kUNksxTdYWOD7/VHGzh/as0VmDWjdmkqo j2MCmqEQ5/J+wJKOfyCsbQ==; From: Christoph Buck Date: Sat, 22 Mar 2025 21:44:09 +0100 Message-ID: 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(-) base-commit: efac1498c15198afc4f9a2bc700408bde1b3b3ed 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 Sat Mar 22 20:44:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Buck X-Patchwork-Id: 40686 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 4E44E27BBEC; Sat, 22 Mar 2025 20:46:43 +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 D144127BBE2 for ; Sat, 22 Mar 2025 20:46:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tw5jM-0005Dm-2Y; Sat, 22 Mar 2025 16:46: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 1tw5jH-0005DB-8D for guix-patches@gnu.org; Sat, 22 Mar 2025 16:46:05 -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 1tw5jG-00031Y-Ui for guix-patches@gnu.org; Sat, 22 Mar 2025 16: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=VuOPISmANlM58SgyGlcnJViVF/fq8rC/8+MCBkoVdcE=; b=G7pt54v6A2hzzj1Jc/OLQk9a77Rw0H3CuCGYCV1VfYz29s/o3uY/4RCwjXGbf1NxnMriCRzjtNHjG3lg64/0Mmg3fTU75xxqLl96SS3x2mHWYy7jrJfRPhxtOW/vWDiV/jB2N8J9GvcGMUIew/VNZiv9o/lR+mNZMAW322l5Zky3HIq0KvIUL1LuGYg/CA7alv4SR+roMRn3tYkV3Smuu48Tm5IaWhMlDoWRw8GCiFs9CRWvR8sZBin8K8HI6uuEjCT6jbJJMdz6go1PwPAYWrdFNgwVa+jmtHAljO7+oUWDfQsro/5BU+gATf9uC3PYNv4vEgI2RxI944r7Ym1bpA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tw5jG-0001iI-QJ for guix-patches@gnu.org; Sat, 22 Mar 2025 16:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77154] [PATCH v3 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: Sat, 22 Mar 2025 20:46: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.17426763246323 (code B ref 77154); Sat, 22 Mar 2025 20:46:02 +0000 Received: (at 77154) by debbugs.gnu.org; 22 Mar 2025 20:45:24 +0000 Received: from localhost ([127.0.0.1]:45897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw5id-0001dv-N6 for submit@debbugs.gnu.org; Sat, 22 Mar 2025 16:45:23 -0400 Received: from mail-108-mta144.mxroute.com ([136.175.108.144]:42639) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tw5iM-0001XR-2k for 77154@debbugs.gnu.org; Sat, 22 Mar 2025 16:45:07 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta144.mxroute.com (ZoneMTA) with ESMTPSA id 195bf9a222100067b0.001 for <77154@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sat, 22 Mar 2025 20:45:04 +0000 X-Zone-Loop: 143fd6597495c4f66aaf019b4db73fad551009c0a269 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=VuOPISmANlM58SgyGlcnJViVF/fq8rC/8+MCBkoVdcE=; b=myIdxnAbRMUN+3lDtmZ7e68+iH hLib31r/0obInAtnPWXFn3dA8iDolPDK9PYxfgK3/e8MHW+LMUL6jZkjUaffdEbUUwAnAW4omed6Z dbmLS2Ddl8NTRv+YQETvV5kqyTqFDsgwjHyXi732oV3oz9qFvRcwPNUhPgPg9H/9x9J+FimoTv0uX V7n1Lz7+Em2jQy1PnDw0681ELyb5S2d3Nd3aXyGJDytz4BWQfJaozlTJNyeBQxL5/gfZXzBsQV1ou Dcyu6oXCGCIxr06jUx1Xr1vrYAio0lOsCd5OEm+MXbv3jC9tVFfuE37Ghwme64I4jSoq8aRvsPuV4 jKMaJLWw==; From: Christoph Buck Date: Sat, 22 Mar 2025 21:44:10 +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 ed25519 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")