From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:43019) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4kBY-0006r9-Rt for guix-patches@gnu.org; Thu, 20 Feb 2020 06:40:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4kBX-0000ZD-Lq for guix-patches@gnu.org; Thu, 20 Feb 2020 06:40:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37932) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j4kBW-0000YJ-Bk for guix-patches@gnu.org; Thu, 20 Feb 2020 06:40:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j4kBW-0001hz-8o for guix-patches@gnu.org; Thu, 20 Feb 2020 06:40:02 -0500 Subject: [bug#38541] [PATCH] ssh: Add Kerberos-support to ssh:// daemon URLs Resent-Message-ID: Date: Thu, 20 Feb 2020 12:39:10 +0100 From: Lars-Dominik Braun Message-ID: <20200220113910.GD15953@zpidnp36> References: <20191209083737.GA10190@zpidnp36> <87a77uwkh1.fsf@gnu.org> <20200219125251.GC2938@zpidnp36> <87h7zlblqk.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b5gNqxB1S1yM7hjW" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87h7zlblqk.fsf@gnu.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 38541-done@debbugs.gnu.org --b5gNqxB1S1yM7hjW Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Hi Ludo, > Note that someone running this with an older Guile-SSH will get an > unbound variable error. > We should probably document the 0.12.0 requirement in the manual, at > least. you’re right, attached patch fixes that. Lars --b5gNqxB1S1yM7hjW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-build-Depend-on-guile-ssh-0.12.0.patch" >From 0e2898c26f26ec5871bae9fd2b5d15047e38075c Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 20 Feb 2020 12:36:10 +0100 Subject: [PATCH] build: Depend on guile-ssh 0.12.0 * m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Check for userauth-gssapi! * doc/guix.texi: Document version requirement --- doc/guix.texi | 4 ++-- m4/guix.m4 | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index f1ca285a25..df52d24155 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -772,11 +772,11 @@ The following dependencies are optional: @itemize @item -@c Note: We need at least 0.10.2 for 'channel-send-eof'. +@c Note: We need at least 0.12.0 for 'userauth-gssapi!'. Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, -version 0.10.2 or later. +version 0.12.0 or later. @item When @url{https://www.nongnu.org/lzip/lzlib.html, lzlib} is available, lzlib diff --git a/m4/guix.m4 b/m4/guix.m4 index 8be7cca54f..961ce838ac 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -142,13 +142,14 @@ dnl GUIX_CHECK_GUILE_SSH dnl dnl Check whether a recent-enough Guile-SSH is available. AC_DEFUN([GUIX_CHECK_GUILE_SSH], [ - dnl Check whether 'channel-send-eof' (introduced in 0.10.2) is present. + dnl Check whether 'userauth-gssapi!' (introduced in 0.12.0) is present. AC_CACHE_CHECK([whether Guile-SSH is available and recent enough], [guix_cv_have_recent_guile_ssh], [GUILE_CHECK([retval], [(and (@ (ssh channel) channel-send-eof) (@ (ssh popen) open-remote-pipe) - (@ (ssh dist node) node-eval))]) + (@ (ssh dist node) node-eval) + (@ (ssh auth) userauth-gssapi!))]) if test "$retval" = 0; then guix_cv_have_recent_guile_ssh="yes" else -- 2.20.1 --b5gNqxB1S1yM7hjW--