From unknown Fri Aug 08 19:14:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72988] [PATCH] guile-ssh: Update to 0.17.0 and use patch. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2024 19:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72988 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72988@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17253044978922 (code B ref -1); Mon, 02 Sep 2024 19:15:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Sep 2024 19:14:57 +0000 Received: from localhost ([127.0.0.1]:52485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slCVt-0002Jn-76 for submit@debbugs.gnu.org; Mon, 02 Sep 2024 15:14:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:47096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slCVr-0002Ja-2w for submit@debbugs.gnu.org; Mon, 02 Sep 2024 15:14:56 -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 1slCUr-00004t-KC for guix-patches@gnu.org; Mon, 02 Sep 2024 15:13:53 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1slCUp-0002UW-KN for guix-patches@gnu.org; Mon, 02 Sep 2024 15:13:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1725304424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=T3KpmDNxpKYNsYE5LfqvK49RyLhvwmq6re+QM8dOgy4=; b=iusbxk5L9+71CS3XWpcoFBjwH9qKUhpAj1tjbrCyZTNCQdCHMA+YD/aqbP895pTeE3Zu3d s6g14SSDh/R5qRzREKI8voO3CYWj8KlKX45IOj2X3lGNfwxC7Y5H6JvOVVuq08anW5+57F nYRO7DZ5Uwb3QB1yv+7TQVVXh5dhFL0k3FZJV5qYpGe88SLhaFpQK4Hou/YWaGJJa3aam/ lynKikCnxBeFpoSZxzVfBwdtntlKGdCoSOSPXwZlW9+DH5rmwOZQgy2SP4TNdZwXrhRrUk dCGn8dZ7ZdLVtfD617TBWVtIEcUYfPZ6IJIRPTWzQSdqNrj5D5s/XdUi4sUnlw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 26d295d7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Mon, 2 Sep 2024 19:13:44 +0000 (UTC) From: Herman Rimm Date: Mon, 2 Sep 2024 21:13:01 +0200 Message-ID: <20240902191301.21985-1-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_PBL=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * gnu/packages/ssh.scm (guile-ssh): Update to 0.17.0 and apply patch. * gnu/packages/patches/guile-ssh-rename-bool.patch: Add file. * gnu/local.mk (dist_patch_DATA): Register patch. --- gnu/local.mk | 1 + .../patches/guile-ssh-rename-bool.patch | 40 +++++++++++++++++++ gnu/packages/ssh.scm | 5 ++- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/guile-ssh-rename-bool.patch diff --git a/gnu/local.mk b/gnu/local.mk index d674acd7ca..cb328a85cc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1463,6 +1463,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-hurd-posix-spawn.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ + %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/packages/patches/guile-ssh-rename-bool.patch new file mode 100644 index 0000000000..17697dacb2 --- /dev/null +++ b/gnu/packages/patches/guile-ssh-rename-bool.patch @@ -0,0 +1,40 @@ +From ad0af631250ce3399127d42995cc0bef6ad3ee5e Mon Sep 17 00:00:00 2001 +From: Herman Rimm +Date: Sun, 18 Aug 2024 16:05:44 +0200 +Subject: [PATCH] libguile-ssh/session-func: Fix variable name + +* libguile-ssh/session-func.c (set_bool_opt): Rename bool to boolean. +--- + libguile-ssh/session-func.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libguile-ssh/session-func.c b/libguile-ssh/session-func.c +index 7006b62..b379472 100644 +--- a/libguile-ssh/session-func.c ++++ b/libguile-ssh/session-func.c +@@ -228,18 +228,18 @@ set_int32_opt (ssh_session session, int type, SCM value) + return ssh_options_set (session, type, &c_value); + } + +-/* Convert VALUE to integer that represents a boolan value (0 ++/* Convert VALUE to integer that represents a boolean value (0 + considered as false, any other value is true), and pass it to + ssh_options_set */ + static inline int + set_bool_opt (ssh_session session, int type, SCM value) + { +- int32_t bool; ++ int32_t boolean; + + SCM_ASSERT (scm_is_bool (value), value, SCM_ARG3, "session-set!"); + +- bool = scm_to_bool (value); +- return ssh_options_set (session, type, &bool); ++ boolean = scm_to_bool (value); ++ return ssh_options_set (session, type, &boolean); + } + + /* Convert VALUE to a socket file descriptor and pass it to +-- +2.45.2 + diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index b45885ff87..237d731883 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -325,7 +325,7 @@ (define-public openssh-sans-x (define-public guile-ssh (package (name "guile-ssh") - (version "0.16.4") + (version "0.17.0") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -333,9 +333,10 @@ (define-public guile-ssh (url home-page) (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches "guile-ssh-rename-bool.patch")) (sha256 (base32 - "127yhjaywais3h2g3cxhqmhdmqgxf9j1jwb6wzx92j0z7asrjqwr")))) + "1lkhpgbzvh6i1sc4nmdc9rx9yzrdyjxxjb8x6nvq2zif8xy9y9vg")))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments -- 2.45.2 From unknown Fri Aug 08 19:14:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72988] [PATCH] guile-ssh: Update to 0.17.0 and use patch. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Sep 2024 15:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72988 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Herman Rimm , "Artyom V. Poptsov" Cc: 72988@debbugs.gnu.org Received: via spool by 72988-submit@debbugs.gnu.org id=B72988.172676096326679 (code B ref 72988); Thu, 19 Sep 2024 15:50:02 +0000 Received: (at 72988) by debbugs.gnu.org; 19 Sep 2024 15:49:23 +0000 Received: from localhost ([127.0.0.1]:33296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srJPH-0006wE-HS for submit@debbugs.gnu.org; Thu, 19 Sep 2024 11:49:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srJPE-0006vv-NE for 72988@debbugs.gnu.org; Thu, 19 Sep 2024 11:49:21 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srJOp-0003vy-Gm; Thu, 19 Sep 2024 11:48:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=J+F10i1xiWRenhde1ha9gtnfjbRzV0qg5ggqWHw+LSA=; b=N0KFNW7R9OhcfYBL/c9W rihlqB6b8EDooYoteOifqveyRMQP+NUeQYyN27O/kl41pqFY98oqprZTCOeH7ygFYb0S6kCW1m6YX IHYEGQm3wGH80d5Q6rfNxHbau//zpEWmf3yg4T2RMtYDFiDdiO9LN0l2+UUY4sPGnxVnrjmNgkf4F rWWMunUm296shJO+Mztc/UcctATO5DFqJOx1pPC7d6a250kSSNJOLZxvJdJXDdBOnWDbbN/2FtlVX 2FmDA2n2y/ZS/ZRh/Sdfy3/sfxOllxBGDuxGiIlS0QUEni83x441MSAKfisovtOCr9dZkWhc+JaMI +Qxw7b1j0DphZg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <20240902191301.21985-1-herman@rimm.ee> (Herman Rimm's message of "Mon, 2 Sep 2024 21:13:01 +0200") References: <20240902191301.21985-1-herman@rimm.ee> Date: Thu, 19 Sep 2024 17:48:53 +0200 Message-ID: <875xqr63ve.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hey Artyom, Herman Rimm skribis: > * gnu/packages/ssh.scm (guile-ssh): Update to 0.17.0 and apply patch. > * gnu/packages/patches/guile-ssh-rename-bool.patch: Add file. > * gnu/local.mk (dist_patch_DATA): Register patch. I=E2=80=99ll let you handle this patch, given that you=E2=80=99re both upst= ream and downstream now. :-) Cheers, Ludo=E2=80=99. From unknown Fri Aug 08 19:14:59 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Herman Rimm Subject: bug#72988: closed (Re: [PATCH] guile-ssh: Update to 0.17.0 and use patch.) Message-ID: References: <877cacjqqh.fsf@gmail.com> <20240902191301.21985-1-herman@rimm.ee> X-Gnu-PR-Message: they-closed 72988 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 72988@debbugs.gnu.org Date: Sun, 13 Oct 2024 09:31:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1728811863-24419-1" This is a multi-part message in MIME format... ------------=_1728811863-24419-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #72988: [PATCH] guile-ssh: Update to 0.17.0 and use patch. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 72988@debbugs.gnu.org. --=20 72988: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D72988 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1728811863-24419-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 72988-done) by debbugs.gnu.org; 13 Oct 2024 09:30:44 +0000 Received: from localhost ([127.0.0.1]:50231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szuw0-0006LB-Fc for submit@debbugs.gnu.org; Sun, 13 Oct 2024 05:30:44 -0400 Received: from mail-lf1-f45.google.com ([209.85.167.45]:38726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szuvy-0006Ku-Di for 72988-done@debbugs.gnu.org; Sun, 13 Oct 2024 05:30:43 -0400 Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-539e4824917so129979e87.3 for <72988-done@debbugs.gnu.org>; Sun, 13 Oct 2024 02:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728811761; x=1729416561; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=jgxIoPckP1vrXXSWlpvuYcjbpaBVJL0pjtJ8VcADA9s=; b=Udz48K0WbfUEtyqs/5lxiXO0Y6CvLitz/XJvarOtvzpFbphmG/T3YaCidxhDqh4TN8 x7hEWkdvIAzMSZKAivRAo7YuEPCqZTRpZPQ97Cv0dO5Vo/nRsUKsYs3l1sS9+/kzkfh7 NT1IkktMeBCNu+vzi59dOqhG3I4eCLYKBtg0H11RZD/q+I5gAXO4nxmHR2b+ENnuVxky NhzEIH/bc3HVaNy8V00vGyFNQQxN94GDyX8rcOIp6Z/WCytbDs2aiwJ/UISH3FWly+Y1 K9g+ax73Rj6uO/7h6T/QHijNgL/0W8mn6DUYrXbctiB02MOZZCSvf/orTw9kdjHcKRHO uc+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728811761; x=1729416561; h=mime-version:user-agent:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jgxIoPckP1vrXXSWlpvuYcjbpaBVJL0pjtJ8VcADA9s=; b=KrjR038QxD7TcfhirmmjIbiUoncl68I8J56dWq+wGAjRAgdjWTwWCIUOU4x5BFEIvS nMu/NaQ1J8yKed30gDJXqnC1zxnDxkADDaVKjDKebTqeZXaqk85cjMJroUJGZi/W+2d1 ZlTYiaGWSe5ASeAY1JpCrT5oKGf5oyUPm+kNnUGPuvll21ax1q31b+KZ2HfL4UDWdT6P P8JA1t9RvC5lNIqVb3KDn+uCQYfqNUQSYlQMTVeMVkp9S8wdP4cO/Bh3FG5Hxy5D9F+U hYQmSw8ln+Sss3/ofhVZ+YpGYbj4pmWOJ2l1MfFMWlShctN4ciOb+Yx/6GSmMWU3UXnj mHig== X-Gm-Message-State: AOJu0YwpSfQyaEbqbhH/mBUS3X4anHFYmWKu8QTAJ7fiLIzJJbBO1rjh CfhOuip2TFMoH6lQ8bgu1ARCSLkAfUT3ZzQJebB7iJ1Fv3jlVJN/ X-Google-Smtp-Source: AGHT+IEvGfwSuJocEsBdKqUZWHVFGNBsb2gAObwlJFiaHAfn8l0DX16VLU6ZopBgEAznSlDAFTkJ3g== X-Received: by 2002:a2e:a991:0:b0:2fa:d950:24d3 with SMTP id 38308e7fff4ca-2fb3270af71mr12839511fa.5.1728811760252; Sun, 13 Oct 2024 02:29:20 -0700 (PDT) Received: from elephant ([95.79.12.162]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2fb4b4731f5sm1394231fa.43.2024.10.13.02.29.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Oct 2024 02:29:18 -0700 (PDT) From: "Artyom V. Poptsov" To: 72988-done@debbugs.gnu.org Subject: Re: [PATCH] guile-ssh: Update to 0.17.0 and use patch. Date: Sun, 13 Oct 2024 12:29:10 +0300 Message-ID: <877cacjqqh.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72988-done Cc: Herman Rimm , guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Pushed to the "master" as 36c794c0ed058ee414cbb90c577f6ade5170470a. Thanks! =2D avp =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEEAf2F9Bp7f4IFgwalk16+BzbchX4FAmcLkukZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRCTXr4HNtyFftNFEACZAPGuzCzxQLgCRSr+gpoM e/I/QUwKugFs1oVM0yuTe6pGu43PaNXLIDWRWwliiiknd9l+6PR50KwqcEZ10ahV B07H3YVDTcSOtqMdLYcL5ZbkG0VSELjJ5mEBp1opMrKONoeoRlHGX+gEXiO0+xL6 X/Kfx53q2o/KHhz40ltskCWTsP13xrddvR503OxoJWtxDd1gB5pc0MtWuQ8XISMd lhpiJwP0b0l4UrmilRuCw+1/bXALvfPwRukykOpCRE0+Iziw3XZW7vDsWtjgNb+x oYPVh3YhcccV29qnI/dEe5Unbxi7bk99Spx6cklj+mpoquhNL8TkA2286eH5EOuE tj75nYlXWBnAie6Eg4U2QrHP3Y2z4mH5LaXMOPNN1CSw2Sg5yn0g09aWmnNd5ow5 yzle9zzrV03qCfyon3MWHnoV+9xpIVky3znDH/PZ00THu+ebu0HriWBzePRxRwX4 K1Yn4Vhy38aH8lKZcXQ88fBifs2jVrSO6KXLuEiWU1ljY4QHyNqSUtHehwX7JJB0 90pJEtOmHCY9Z31KJAMfrBBnrsZPXPNZF21O95oGNLJ3P1J0aJ0XbaXqLc1WpST2 WDDNWlvOReJfKT1T6CxrsAT7ae/SFt6o/8HS3HzQi1Tj33akYqzl+nD8RMhOAGMJ yTO6SGuMlJ/t0jj5NaccDw== =d3xt -----END PGP SIGNATURE----- --=-=-=-- ------------=_1728811863-24419-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 2 Sep 2024 19:14:57 +0000 Received: from localhost ([127.0.0.1]:52485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slCVt-0002Jn-76 for submit@debbugs.gnu.org; Mon, 02 Sep 2024 15:14:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:47096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slCVr-0002Ja-2w for submit@debbugs.gnu.org; Mon, 02 Sep 2024 15:14:56 -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 1slCUr-00004t-KC for guix-patches@gnu.org; Mon, 02 Sep 2024 15:13:53 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1slCUp-0002UW-KN for guix-patches@gnu.org; Mon, 02 Sep 2024 15:13:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1725304424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=T3KpmDNxpKYNsYE5LfqvK49RyLhvwmq6re+QM8dOgy4=; b=iusbxk5L9+71CS3XWpcoFBjwH9qKUhpAj1tjbrCyZTNCQdCHMA+YD/aqbP895pTeE3Zu3d s6g14SSDh/R5qRzREKI8voO3CYWj8KlKX45IOj2X3lGNfwxC7Y5H6JvOVVuq08anW5+57F nYRO7DZ5Uwb3QB1yv+7TQVVXh5dhFL0k3FZJV5qYpGe88SLhaFpQK4Hou/YWaGJJa3aam/ lynKikCnxBeFpoSZxzVfBwdtntlKGdCoSOSPXwZlW9+DH5rmwOZQgy2SP4TNdZwXrhRrUk dCGn8dZ7ZdLVtfD617TBWVtIEcUYfPZ6IJIRPTWzQSdqNrj5D5s/XdUi4sUnlw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 26d295d7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Mon, 2 Sep 2024 19:13:44 +0000 (UTC) From: Herman Rimm To: guix-patches@gnu.org Subject: [PATCH] guile-ssh: Update to 0.17.0 and use patch. Date: Mon, 2 Sep 2024 21:13:01 +0200 Message-ID: <20240902191301.21985-1-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_PBL=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * gnu/packages/ssh.scm (guile-ssh): Update to 0.17.0 and apply patch. * gnu/packages/patches/guile-ssh-rename-bool.patch: Add file. * gnu/local.mk (dist_patch_DATA): Register patch. --- gnu/local.mk | 1 + .../patches/guile-ssh-rename-bool.patch | 40 +++++++++++++++++++ gnu/packages/ssh.scm | 5 ++- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/guile-ssh-rename-bool.patch diff --git a/gnu/local.mk b/gnu/local.mk index d674acd7ca..cb328a85cc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1463,6 +1463,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-hurd-posix-spawn.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ + %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/packages/patches/guile-ssh-rename-bool.patch new file mode 100644 index 0000000000..17697dacb2 --- /dev/null +++ b/gnu/packages/patches/guile-ssh-rename-bool.patch @@ -0,0 +1,40 @@ +From ad0af631250ce3399127d42995cc0bef6ad3ee5e Mon Sep 17 00:00:00 2001 +From: Herman Rimm +Date: Sun, 18 Aug 2024 16:05:44 +0200 +Subject: [PATCH] libguile-ssh/session-func: Fix variable name + +* libguile-ssh/session-func.c (set_bool_opt): Rename bool to boolean. +--- + libguile-ssh/session-func.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libguile-ssh/session-func.c b/libguile-ssh/session-func.c +index 7006b62..b379472 100644 +--- a/libguile-ssh/session-func.c ++++ b/libguile-ssh/session-func.c +@@ -228,18 +228,18 @@ set_int32_opt (ssh_session session, int type, SCM value) + return ssh_options_set (session, type, &c_value); + } + +-/* Convert VALUE to integer that represents a boolan value (0 ++/* Convert VALUE to integer that represents a boolean value (0 + considered as false, any other value is true), and pass it to + ssh_options_set */ + static inline int + set_bool_opt (ssh_session session, int type, SCM value) + { +- int32_t bool; ++ int32_t boolean; + + SCM_ASSERT (scm_is_bool (value), value, SCM_ARG3, "session-set!"); + +- bool = scm_to_bool (value); +- return ssh_options_set (session, type, &bool); ++ boolean = scm_to_bool (value); ++ return ssh_options_set (session, type, &boolean); + } + + /* Convert VALUE to a socket file descriptor and pass it to +-- +2.45.2 + diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index b45885ff87..237d731883 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -325,7 +325,7 @@ (define-public openssh-sans-x (define-public guile-ssh (package (name "guile-ssh") - (version "0.16.4") + (version "0.17.0") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -333,9 +333,10 @@ (define-public guile-ssh (url home-page) (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches "guile-ssh-rename-bool.patch")) (sha256 (base32 - "127yhjaywais3h2g3cxhqmhdmqgxf9j1jwb6wzx92j0z7asrjqwr")))) + "1lkhpgbzvh6i1sc4nmdc9rx9yzrdyjxxjb8x6nvq2zif8xy9y9vg")))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments -- 2.45.2 ------------=_1728811863-24419-1--