From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id aH/3JaJJTmfliAAAe85BDQ:P1 (envelope-from ) for ; Mon, 02 Dec 2024 23:58:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id aH/3JaJJTmfliAAAe85BDQ (envelope-from ) for ; Tue, 03 Dec 2024 00:58:26 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=BHwynF4t; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=C47TJs77; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733183906; a=rsa-sha256; cv=none; b=PONPrsMccsgyqAi0VMY5q+sIjNS6zXhXdG4MaeptdGQ7iJmwkrtzH9akAzTMZ4mKhAY58u eMJyL9I9EdqAMuVZXrYS1T9GlCSKFsh9aT/6twTCGIrtZwOEEMlL+j7x0g9rvhDAz9mdIx O1NGIukMGPPdJQg+kSgaouANgyZEU44vmGKI8EunZ5axtiRQ2hfZzzHmEBqIQpNUN9bXNK pWvWhDxodOrEd77bGGyhy5ttsdObbfw0oR5O8W9E74b9ZEMs5r2/YxWbIQAvmzn52/x4VV DzdXtLDwNzNy3ytwIivelFeA63STrqKsATaDtiSBVywnqignfLRZp1GDwq43+A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=BHwynF4t; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=C47TJs77; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733183906; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=VHO+nxhnh2KsDbAzH0IP5Z4p+gJz/v5X4tRJks1Li+c=; b=I6YC1NwoFmcrrfGc5IcH+hLI6vRS3gWLJIaxsxQrUB0zuvMHeC35Cb+7QUQcY1n0fAw3Yr TurLEra6mhRHTQvduASF136rY5Tlrb3hujN6xnP4wN8dIJktk5/aSSUYanl3DJctPHURq1 QE16azRno5U3NnqNCUZgIB7IBftFWlp6a/VtjspeEfvlURo0Fi0SrFgzag53JLzUf4Pigq +IzRBU3dqXAqh7nQGPFC2sp4Mqngbzi7qRiD1GU/mlUJHGYyK+qlNR3NBUAcrPlke3/Rym mU//g+E2IVK7sc8+zGIo5ppTjSc71hHWrgMFSdStGdqYYnPUVB7tFbOh+w8dlg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AAD097B90 for ; Tue, 03 Dec 2024 00:58:25 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIGIm-0000uJ-Sw; Mon, 02 Dec 2024 18:58:05 -0500 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 1tIGIk-0000tv-PG for guix-patches@gnu.org; Mon, 02 Dec 2024 18:58:03 -0500 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 1tIGIk-0004YO-GS for guix-patches@gnu.org; Mon, 02 Dec 2024 18:58:02 -0500 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:Subject; bh=VHO+nxhnh2KsDbAzH0IP5Z4p+gJz/v5X4tRJks1Li+c=; b=BHwynF4t33SwbI5kTv/DBaGxlRqcWZhcYZ97V221OXBbhnn2ql2K0ig/FqFcVYu0nOrO34z2CVoCVi6G13h1o6zS2msVhlICr3ET8amiTxsWyXbZjxxCtOFHjxdZQpigvyA/KEnGdRw/D9RQ2X7PIEOyJwxXU2IjWLanYulbwXf0d0A5UHRUCDU3z2jt/NzJwbs91l26z8WbIl0QdgUyvmWsZXNo7MBoyqv5zdoxRDBboYI2LHPsgiX+4aKngrhUAj4WTnVjMrTPs3E1fCc5uC2eycFzyS7OeKb5HM63b1xxAkZ7GeKCGa2Eg7eMZUjrpaPFL9BaJtyG0kztAMrrIA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIGIk-000813-2D for guix-patches@gnu.org; Mon, 02 Dec 2024 18:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74659] Update guile-ssh to 0.18.0 Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Dec 2024 23:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74659 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 74659@debbugs.gnu.org Cc: Josselin Poiret , Simon Tournier , Mathieu Othacehe , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Tobias Geerinckx-Rice , Christopher Baines , "Artyom V. Poptsov" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173318385430761 (code B ref -1); Mon, 02 Dec 2024 23:58:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Dec 2024 23:57:34 +0000 Received: from localhost ([127.0.0.1]:57024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIGII-000804-6O for submit@debbugs.gnu.org; Mon, 02 Dec 2024 18:57:34 -0500 Received: from lists.gnu.org ([209.51.188.17]:32886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIGIF-0007zu-Gb for submit@debbugs.gnu.org; Mon, 02 Dec 2024 18:57:32 -0500 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 1tIGIF-0000kF-AW for guix-patches@gnu.org; Mon, 02 Dec 2024 18:57:31 -0500 Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tIGIC-0004Mv-5I; Mon, 02 Dec 2024 18:57:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1733183828; bh=nJveuZKd+qaquf/TkTublzjqNcKthXBuyo/rNFiFC64=; h=From:To:Cc:Subject:Date:From; b=C47TJs77x6feYv2GHNKBhooWFvwcGkH7VaCoH2ffNv+5F6GlJ3XS6Kvq2elpbE0HE 65qIUjovkwekxHRSCg9HXFILZzLq3KD7dgeTa5TGPO7RhboPhPX6ELCPIc8bXK5KQT jlP36Ib91fgafUxlVkvPXdjYwkwDrgJUkg1iRfXonbvn5mJfJDxmiJsUfkXU7UTfXZ w6zaG2lglYblXWjTWmJbznVyLzS+WDc6bF0m6T2Mb7CoiHCLpXhoFrs9BRboV4ETpK BAVqodzw8YCuA0Sej4aK6tEIzsMHflAANNfcQovV4HhoGJpNVpro94sG8um4ah4Y2R h33hFaNGyXupw== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) by cascadia.aikidev.net (Postfix) with ESMTPSA id 6D85A217A; Mon, 2 Dec 2024 15:57:08 -0800 (PST) From: Vagrant Cascadian Date: Mon, 02 Dec 2024 15:57:00 -0800 Message-ID: <877c8hprjn.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: none client-ip=2600:3c01:e000:267:0:a171:de7:c; envelope-from=vagrant@debian.org; helo=cascadia.aikidev.net X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: AAD097B90 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -5.59 X-Spam-Score: -5.59 X-TUID: SoSkPHUHK16Q --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain The attached patch updates guile-ssh to 0.18.0. This allows it to build successfully with libssh 0.11.x, which is not yet in guix master but paves the way for an easier upgrade of libssh. I have not yet tested all other dependents. live well, vagrant --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-guile-ssh-Update-to-0.18.0.patch Content-Transfer-Encoding: quoted-printable From=201630e401c11aa956e459a5320951935e80602511 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 2 Dec 2024 13:38:06 -0800 Subject: [PATCH] gnu: guile-ssh: Update to 0.18.0. * gnu/packages/ssh.scm (guile-ssh): Update to 0.18.0. [source]: Drop patch, fixed upstream. * gnu/packages/patches/guile-ssh-rename-bool.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Update with removed patch. =2D-- gnu/local.mk | 1 - .../patches/guile-ssh-rename-bool.patch | 40 ------------------- gnu/packages/ssh.scm | 5 +-- 3 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 gnu/packages/patches/guile-ssh-rename-bool.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1b699af259a..25ba0e2bf02 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1511,7 +1511,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/guile-hurd-posix-spawn.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ =2D %D%/packages/patches/guile-ssh-rename-bool.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ %D%/packages/patches/gtk2-fix-builder-test.patch \ %D%/packages/patches/gtk2-harden-list-store.patch \ diff --git a/gnu/packages/patches/guile-ssh-rename-bool.patch b/gnu/package= s/patches/guile-ssh-rename-bool.patch deleted file mode 100644 index 17697dacb22..00000000000 =2D-- a/gnu/packages/patches/guile-ssh-rename-bool.patch +++ /dev/null @@ -1,40 +0,0 @@ =2DFrom ad0af631250ce3399127d42995cc0bef6ad3ee5e Mon Sep 17 00:00:00 2001 =2DFrom: Herman Rimm =2DDate: Sun, 18 Aug 2024 16:05:44 +0200 =2DSubject: [PATCH] libguile-ssh/session-func: Fix variable name =2D =2D* libguile-ssh/session-func.c (set_bool_opt): Rename bool to boolean. =2D--- =2D libguile-ssh/session-func.c | 8 ++++---- =2D 1 file changed, 4 insertions(+), 4 deletions(-) =2D =2Ddiff --git a/libguile-ssh/session-func.c b/libguile-ssh/session-func.c =2Dindex 7006b62..b379472 100644 =2D--- a/libguile-ssh/session-func.c =2D+++ b/libguile-ssh/session-func.c =2D@@ -228,18 +228,18 @@ set_int32_opt (ssh_session session, int type, SCM = value) =2D return ssh_options_set (session, type, &c_value); =2D } =2D=20 =2D-/* Convert VALUE to integer that represents a boolan value (0 =2D+/* Convert VALUE to integer that represents a boolean value (0 =2D considered as false, any other value is true), and pass it to =2D ssh_options_set */ =2D static inline int =2D set_bool_opt (ssh_session session, int type, SCM value) =2D { =2D- int32_t bool; =2D+ int32_t boolean; =2D=20 =2D SCM_ASSERT (scm_is_bool (value), value, SCM_ARG3, "session-set!"); =2D=20 =2D- bool =3D scm_to_bool (value); =2D- return ssh_options_set (session, type, &bool); =2D+ boolean =3D scm_to_bool (value); =2D+ return ssh_options_set (session, type, &boolean); =2D } =2D=20 =2D /* Convert VALUE to a socket file descriptor and pass it to =2D--=20 =2D2.45.2 =2D diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index a29a10e954b..0204d148cd5 100644 =2D-- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -327,7 +327,7 @@ (define-public openssh-sans-x (define-public guile-ssh (package (name "guile-ssh") =2D (version "0.17.0") + (version "0.18.0") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -335,10 +335,9 @@ (define-public guile-ssh (url home-page) (commit (string-append "v" version)))) (file-name (git-file-name name version)) =2D (patches (search-patches "guile-ssh-rename-bool.patch")) (sha256 (base32 =2D "1lkhpgbzvh6i1sc4nmdc9rx9yzrdyjxxjb8x6nvq2zif8xy9y9vg"))= )) + "0zh1spkjl5q778y4rd6ml68fvz1r62xmk03khi4kp74z2rxgzcxb")))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments =2D-=20 2.39.5 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ05JTQAKCRDcUY/If5cW qp60AQCIVhV+clZsM434aFCgrvNJ9OtzN4aBatz7kr0WayNz4AD/UM/do9wxGC5D YoVq28GPfNcKUKkAPgqbP98xekXtgQ4= =y+pu -----END PGP SIGNATURE----- --==-=-=--