From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id CEYpOI4O1ma4/gAAe85BDQ:P1 (envelope-from ) for ; Mon, 02 Sep 2024 19:14:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id CEYpOI4O1ma4/gAAe85BDQ (envelope-from ) for ; Mon, 02 Sep 2024 21:14:23 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="PLZjhek/"; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=iusbxk5L; dmarc=pass (policy=none) header.from=gnu.org; 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=1725304462; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=T3KpmDNxpKYNsYE5LfqvK49RyLhvwmq6re+QM8dOgy4=; b=SRyVeCKoqN2a0JnAIbMf7gChlQJyWD846QQZlqCSC88zc1Vy9FP6EskR0cwb6v9WfPgJ5U 9aUmdhK0By/XyyhHjxYk6JKLSUi1nygmNfDV6DT4Kgot7EBK3fVjo8gAEGbuiNsprVAT56 nHbDxWLRa2HQBpX/5ZhnH/ne/7nBtYZTNtL2Owc8NOAKYASnR4UTOQN9sVrLXz/C77YfSW TZ8ye4g/5qemQtPHjKVTX71dajzpjJDcjI6wUSCVm8PNJx370Aomzh/P1BSX0Nt7Y3K9tC l87kg+QGIdDv1g3hWmjzGQnXR+Kjh02BoHnGMTVPhtLUIvCeb2OCxtTJ4RcNew== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725304462; a=rsa-sha256; cv=none; b=aboNVvtHWuJoXuEeSHlvNqIAhUSVi3NR6lJas3AfwwN9QqxwGPlSbD3xAtKxOm0/X6TBpE ujine+bHKddJ7+UfszQC3oQZ/XYpWmpMF1Bvuv8Q5KuCHaNzQsaoCP16za6w6ppFz2dOsF +/3El4Tw1oSNGKFAEk/RzssEr7FDhBRMi/waaB45cD72/HQQ4NVfH4K8am+D3g5tUdHH44 DRRT3gbqLiiFdYuj/Ih2zvz1eg0W9vgtwtD+iwBASfKoPQq+hpYnwv/Bom6HIsDljpC5tu h8VljCqawTiXX7o+punNPRa//SjocCVdFgFl0de+27CIUeYA5QyXh1x9PtCjpA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="PLZjhek/"; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=iusbxk5L; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 8D77970775 for ; Mon, 02 Sep 2024 21:14:22 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1slCV0-00008L-Ug; Mon, 02 Sep 2024 15:14:02 -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 1slCUz-000089-Ku for guix-patches@gnu.org; Mon, 02 Sep 2024 15:14:01 -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 1slCUz-0002VH-6p for guix-patches@gnu.org; Mon, 02 Sep 2024 15:14:01 -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:Subject; bh=T3KpmDNxpKYNsYE5LfqvK49RyLhvwmq6re+QM8dOgy4=; b=PLZjhek/bIPWlCsLOldnxXIKtralU95MkQv253AMyanj/CqfezicH5hNtV7jg/OcidvXYD/SxFcirfMcp7vqUbAY1DXkZ8M10/HJhnBp3w06KI92MhSOMiaS0gdQQonUHxZP8Hi1KMLPGv8HqG1yIzW7DYil9+vAaMOVF8vl9sFOXNfc2b0VyCGO1sWL6tHfdWfmVNvC66Cg71K4tGe8JcEvYx2+79WiqBcFbPq2HcMrso+PTIAXDz4IXBngiU9grj7uulX04AUFZ+WQAOX8p+DT44tE3AKV6XmsZF9g0LaW8an/YEgP/i1+ZqN+CI2WQqn6W5Bu8dyyc+dyqhKYsw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1slCVx-0002KM-SR for guix-patches@gnu.org; Mon, 02 Sep 2024 15:15:01 -0400 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) 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-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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via 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-Spam-Score: -0.88 X-Spam-Score: -0.88 X-Migadu-Queue-Id: 8D77970775 X-Migadu-Scanner: mx11.migadu.com X-TUID: XYdHpIAzb+pg * 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