From patchwork Thu Jan 26 22:24:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Streit X-Patchwork-Id: 46432 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 1602827BBED; Thu, 26 Jan 2023 22:25:47 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 EBBB527BBE9 for ; Thu, 26 Jan 2023 22:25:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLAg4-0003Fp-93; Thu, 26 Jan 2023 17:25:04 -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 1pLAg2-0003FQ-Sf for guix-patches@gnu.org; Thu, 26 Jan 2023 17:25:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pLAg2-0005dY-HW for guix-patches@gnu.org; Thu, 26 Jan 2023 17:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLAg1-0007xA-UO for guix-patches@gnu.org; Thu, 26 Jan 2023 17:25:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61087] [PATCH] gnu: Add x11-ssh-askpass. Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Jan 2023 22:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61087 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61087@debbugs.gnu.org Cc: Simon Streit X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167477190030559 (code B ref -1); Thu, 26 Jan 2023 22:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jan 2023 22:25:00 +0000 Received: from localhost ([127.0.0.1]:36380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLAfw-0007wl-2l for submit@debbugs.gnu.org; Thu, 26 Jan 2023 17:24:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:42212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLAfq-0007wX-F7 for submit@debbugs.gnu.org; Thu, 26 Jan 2023 17:24:54 -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 1pLAfq-0003Cx-6Z for guix-patches@gnu.org; Thu, 26 Jan 2023 17:24:50 -0500 Received: from smtprelay01.ispgateway.de ([80.67.31.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLAfi-0005cR-7w for guix-patches@gnu.org; Thu, 26 Jan 2023 17:24:47 -0500 Received: from [79.252.146.201] (helo=motorball.tsis.home.arpa) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1pLAiA-0001mi-8O; Thu, 26 Jan 2023 23:27:14 +0100 From: Simon Streit Date: Thu, 26 Jan 2023 23:24:32 +0100 Message-Id: <20230126222432.10812-1-simon@netpanic.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn Received-SPF: none client-ip=80.67.31.28; envelope-from=simon@netpanic.org; helo=smtprelay01.ispgateway.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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+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 (x11-ssh-askpass): New variable. --- gnu/packages/ssh.scm | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 2f6874f811..bd2f024689 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2023 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -940,3 +941,61 @@ (define-public webssh @item Modern browsers are supported. @end itemize") (license license:expat))) + +(define-public x11-ssh-askpass + (package + (name "x11-ssh-askpass") + (version "1.2.4.1") + (source + (origin + (method url-fetch) + ;; The project home page seams to be offline. + (uri (string-append "https://pkgs.fedoraproject.org/repo/pkgs/openssh/" + name "-" version ".tar.gz" + "/8f2e41f3f7eaa8543a2440454637f3c3/" + name "-" version ".tar.gz")) + (sha256 + (base32 "124c1frwvdmg4nv8xqv435ibjhj2y8xc1bmfr6i8a8g75b1y63b2")))) + (build-system gnu-build-system) + (native-inputs (list imake)) + (inputs (list libxt)) + (arguments + `(#:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "BINDIR=" out "/libexec") + (string-append "MANDIR=" out "/share/man"))) + #:tests? #f + #:configure-flags (list (string-append "--mandir=" + "/usr/share/man/test") + (string-append "--libexecdir=" + "/usr/lib/ssh/test") + (string-append "--with-app-defaults-dir=" + "/usr/share/X11/app-defaults/test")) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'xmkmf + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((imake (assoc-ref inputs "imake")) + (out (assoc-ref outputs "out"))) + (invoke "xmkmf") + (substitute* "Makefile" + ;; These imake variables somehow remain undefined + (("DefaultGcc2[[:graph:]]*Opt") "-O2") + ;; Reset a few variable defaults that are set in imake templates + ((imake) out) + (("(MANPATH = )[[:graph:]]*" _ front) + (string-append front out "/share/man")))))) + (add-after 'xmkmf 'make-includes + (lambda _ + (invoke "make" "includes"))) + (add-after 'install 'install/doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (lambda _ + (invoke "make" + (string-append "MANDIR=" out "/share/man") + "install.man")))))))) + (home-page "http://www.jmknoble.net/software/x11-ssh-askpass/") + (synopsis "Lightweight passphrase dialog for SSH") + (description "An X11-based pass-phrase dialog for use with OpenSSH.") + (license license:gpl2+)))