Sun Jan 21 16:03:29 2018 UTC ()
Update to keychain-2.8.4:
  Uses id instead of whoami for better portability.
  GPG2 support, support for busybox ps and various optimizations.


(roy)
diff -r1.37 -r1.38 pkgsrc/security/keychain/Makefile
diff -r1.21 -r1.22 pkgsrc/security/keychain/distinfo
diff -r0 -r1.3 pkgsrc/security/keychain/patches/patch-keychain
cvs diff -r1.37 -r1.38 pkgsrc/security/keychain/Makefile (expand / switch to unified diff)

--- pkgsrc/security/keychain/Makefile 2017/11/06 13:27:21 1.37
+++ pkgsrc/security/keychain/Makefile 2018/01/21 16:03:29 1.38
@@ -1,33 +1,28 @@ @@ -1,33 +1,28 @@
1# $NetBSD: Makefile,v 1.37 2017/11/06 13:27:21 wiz Exp $ 1# $NetBSD: Makefile,v 1.38 2018/01/21 16:03:29 roy Exp $
2 2
3DISTNAME= keychain-2.8.3 3DISTNAME= keychain-2.8.4
4PKGREVISION= 1 
5CATEGORIES= security 4CATEGORIES= security
6MASTER_SITES= https://www.funtoo.org/archive/keychain/ 5MASTER_SITES= https://www.funtoo.org/archive/keychain/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.funtoo.org/Keychain 9HOMEPAGE= https://www.funtoo.org/Keychain
11COMMENT= Nice ssh-agent front-end 10COMMENT= Nice ssh-agent front-end
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14.if !exists(/usr/bin/ssh-agent) 13.if !exists(/usr/bin/ssh-agent)
15DEPENDS+= openssh-[0-9]*:../../security/openssh 14DEPENDS+= openssh-[0-9]*:../../security/openssh
16.endif 15.endif
17 16
18USE_TOOLS+= bash:run 
19NO_BUILD= yes 17NO_BUILD= yes
20 18
21# Uses the "local" keyword which is not supported by ksh. 
22REPLACE_BASH+= keychain 
23 
24INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/${PKGBASE} 19INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/${PKGBASE}
25 20
26do-install: 21do-install:
27 ${INSTALL_SCRIPT} ${WRKSRC}/keychain ${DESTDIR}${PREFIX}/bin 22 ${INSTALL_SCRIPT} ${WRKSRC}/keychain ${DESTDIR}${PREFIX}/bin
28 ${INSTALL_MAN} ${WRKSRC}/keychain.1 \ 23 ${INSTALL_MAN} ${WRKSRC}/keychain.1 \
29 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 24 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
30 ${INSTALL_DATA} ${WRKSRC}/README.md \ 25 ${INSTALL_DATA} ${WRKSRC}/README.md \
31 ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 26 ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
32 27
33.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.21 -r1.22 pkgsrc/security/keychain/distinfo (expand / switch to unified diff)

--- pkgsrc/security/keychain/distinfo 2016/09/20 12:36:09 1.21
+++ pkgsrc/security/keychain/distinfo 2018/01/21 16:03:29 1.22
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.21 2016/09/20 12:36:09 mef Exp $ 1$NetBSD: distinfo,v 1.22 2018/01/21 16:03:29 roy Exp $
2 2
3SHA1 (keychain-2.8.3.tar.bz2) = 590a69fb82a70af5d206d8ad84d848fe0b299f3c 3SHA1 (keychain-2.8.4.tar.bz2) = b201a8b51677c472fae61a69b6a150b2734d141e
4RMD160 (keychain-2.8.3.tar.bz2) = 29befca1c9eba7b18694b5076bc4f828fd31d69b 4RMD160 (keychain-2.8.4.tar.bz2) = a3732750fe075bc29fef35489ebd74e894c27b45
5SHA512 (keychain-2.8.3.tar.bz2) = f3893383c7ca2bf169c052a9760118fa677669603fad953ca2448aefc3cdda53078ea9f6a865cb31b71c6f30b678b78f600c960f189aeb1a7cb08cd0421ee9e9 5SHA512 (keychain-2.8.4.tar.bz2) = 9c2ab488d8c35bd1b8ffc432189f07bdb62964a86b5431a118a31a8471417ea85551542d937a774cb44a45803e188a6fc75367adda28cd17c731bf00fc62487f
6Size (keychain-2.8.3.tar.bz2) = 34170 bytes 6Size (keychain-2.8.4.tar.bz2) = 34368 bytes
 7SHA1 (patch-keychain) = 78651f65794557486ceb78c3b7413bcf1143330c
File Added: pkgsrc/security/keychain/patches/Attic/patch-keychain
$NetBSD: patch-keychain,v 1.3 2018/01/21 16:03:29 roy Exp $

local is not required by POSIX shells.

--- keychain.orig	2017-11-11 04:54:46.000000000 +0000
+++ keychain
@@ -357,7 +357,7 @@ lockfile() {
 	# it returns 0. If it fails, it returns 1. This function retuns immediately
 	# and only tries to acquire the lock once.
 
-		local tmpfile="$lockf.$$"
+		tmpfile="$lockf.$$"
 
 		echo $$ >"$tmpfile" 2>/dev/null || exit
 		if ln "$tmpfile" "$lockf" 2>/dev/null; then
@@ -386,7 +386,7 @@ takelock() {
 	# First attempt:
 	lockfile && return 0
 
-	local counter=0
+	counter=0
 	mesg "Waiting $lockwait seconds for lock..."
 	while [ "$counter" -lt "$(( $lockwait * 2 ))" ]
 	do