CVS commit: pkgsrc/security/keychain

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Jun  1 09:50:26 UTC 2025

Modified Files:
        pkgsrc/security/keychain: Makefile distinfo
Added Files:
        pkgsrc/security/keychain/patches: patch-Makefile patch-keychain.sh

Log Message:
security/keychain: handle unset SSH_ASKPASS


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/security/keychain/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/security/keychain/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/keychain/patches/patch-Makefile \
    pkgsrc/security/keychain/patches/patch-keychain.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/keychain/Makefile
diff -u pkgsrc/security/keychain/Makefile:1.42 pkgsrc/security/keychain/Makefile:1.43
--- pkgsrc/security/keychain/Makefile:1.42      Fri May 23 17:47:05 2025
+++ pkgsrc/security/keychain/Makefile   Sun Jun  1 09:50:26 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2025/05/23 17:47:05 vins Exp $
+# $NetBSD: Makefile,v 1.43 2025/06/01 09:50:26 vins Exp $
 
 DISTNAME=      keychain-2.9.5
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=funtoo/}
 
@@ -9,11 +10,20 @@ HOMEPAGE=    https://www.funtoo.org/Keychai
 COMMENT=       Nice ssh-agent front-end
 LICENSE=       gnu-gpl-v2
 
-.if !exists(/usr/bin/ssh-agent)
-DEPENDS+=      openssh-[0-9]*:../../security/openssh
+USE_TOOLS+=    groff perl:build pod2man
+
+.include "../../mk/bsd.prefs.mk"
+
+.if exists(${X11BASE}/bin/ssh-askpass)
+ASKPASS_PROGRAM=       ${X11BASE}/bin/ssh-askpass
+.elif exists(/usr/libexec/ssh-askpass)
+ASKPASS_PROGRAM=       /usr/libexec/ssh-askpass
+.else
+DEPENDS+=              ssh-askpass-[0-9]*:../../security/ssh-askpass
+ASKPASS_PROGRAM=       ${PREFIX}/bin/ssh-askpass
 .endif
 
-USE_TOOLS+=    groff perl:build pod2man
+MAKE_ENV+=     ASKPASS=${ASKPASS_PROGRAM:Q}
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/doc/${PKGBASE}
 
@@ -24,4 +34,5 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/README.md     \
                ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
+.include "../../security/openssh/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/keychain/distinfo
diff -u pkgsrc/security/keychain/distinfo:1.28 pkgsrc/security/keychain/distinfo:1.29
--- pkgsrc/security/keychain/distinfo:1.28      Fri May 23 17:47:05 2025
+++ pkgsrc/security/keychain/distinfo   Sun Jun  1 09:50:26 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.28 2025/05/23 17:47:05 vins Exp $
+$NetBSD: distinfo,v 1.29 2025/06/01 09:50:26 vins Exp $
 
 BLAKE2s (keychain-2.9.5.tar.gz) = 2137b9315bcda59d83fdf6f4870164de42cf39b850d82354f0444399a6050029
 SHA512 (keychain-2.9.5.tar.gz) = 4241a16449062b3365e1119788ab1e56eaadd7c239b5a5af03f644fb44494cc415774c1ba4d2a9ad1e6341892ddcbe4573cda6f986ecc8e5857cfbb2066ac5ac
 Size (keychain-2.9.5.tar.gz) = 42685 bytes
+SHA1 (patch-Makefile) = 3d41a10a50c360c1fb63dba4265ba369f6b4a772
+SHA1 (patch-keychain.sh) = 792bb3cd82e36a4b9d4ee48440333917c5ccfe4f

Added files:

Index: pkgsrc/security/keychain/patches/patch-Makefile
diff -u /dev/null pkgsrc/security/keychain/patches/patch-Makefile:1.1
--- /dev/null   Sun Jun  1 09:50:26 2025
+++ pkgsrc/security/keychain/patches/patch-Makefile     Sun Jun  1 09:50:26 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-Makefile,v 1.1 2025/06/01 09:50:26 vins Exp $
+
+Support pkgsrc defined SSH_ASKPASS.
+
+--- Makefile.orig      2025-06-01 08:56:17.504384226 +0000
++++ Makefile
+@@ -52,7 +52,10 @@ GENKEYCHAINPL = open P, "keychain.txt" o
+               print
+ 
+ keychain: keychain.sh keychain.txt VERSION MAINTAINERS.txt
+-      perl -e '$(GENKEYCHAINPL)' | sed -e 's/##CUR_YEAR##/$(Y)/g' >keychain || rm -f keychain
++      perl -e '$(GENKEYCHAINPL)' | sed \
++              -e 's:##CUR_YEAR##:$(Y):g' \
++              -e 's:##ASKPASS##:$(ASKPASS):' \
++              >keychain || rm -f keychain
+       chmod +x keychain
+ 
+ keychain.txt: keychain.pod
Index: pkgsrc/security/keychain/patches/patch-keychain.sh
diff -u /dev/null pkgsrc/security/keychain/patches/patch-keychain.sh:1.1
--- /dev/null   Sun Jun  1 09:50:26 2025
+++ pkgsrc/security/keychain/patches/patch-keychain.sh  Sun Jun  1 09:50:26 2025
@@ -0,0 +1,21 @@
+$NetBSD: patch-keychain.sh,v 1.1 2025/06/01 09:50:26 vins Exp $
+
+Handle an empty (or unset) SSH_ASKPASS variable.
+
+--- keychain.sh.orig   2025-05-16 14:58:02.000000000 +0000
++++ keychain.sh
+@@ -1040,6 +1040,7 @@ load_ssh_keys() {
+       IFS="$IFS_BAK"
+       [ $# -eq 0 ] && return
+       mesg "Adding ${CYANN}$#${OFF} ssh key(s): ${CYANN}$*${OFF}"
++      [ -z "${SSH_ASKPASS++}" ] && SSH_ASKPASS="##ASKPASS##"
+       if $noguiopt || [ -z "$SSH_ASKPASS" ] || [ -z "$DISPLAY" ]; then
+               unset DISPLAY           # DISPLAY="" can cause problems
+               unset SSH_ASKPASS       # make sure ssh-add doesn't try SSH_ASKPASS
+@@ -1084,4 +1085,4 @@ if wantagent gpg; then
+       load_gpg_keys $(echo "${gpgkeys}" | gpg_listmissing)
+ fi
+ 
+-qprint        # trailing newline
+\ No newline at end of file
++qprint        # trailing newline