diff options
| author | roy <roy@pkgsrc.org> | 2018-01-21 16:03:29 +0000 |
|---|---|---|
| committer | roy <roy@pkgsrc.org> | 2018-01-21 16:03:29 +0000 |
| commit | b387f639bb898f4f06eb986ca7ad7e2a687b54dc (patch) | |
| tree | f35cae760977457109cb12bfb67408e928b95363 /security | |
| parent | 7fb2b13ac8b0d1c6731134e75fdb3b1123643616 (diff) | |
| download | pkgsrc-b387f639bb898f4f06eb986ca7ad7e2a687b54dc.tar.gz | |
Update to keychain-2.8.4:
Uses id instead of whoami for better portability.
GPG2 support, support for busybox ps and various optimizations.
Diffstat (limited to 'security')
| -rw-r--r-- | security/keychain/Makefile | 9 | ||||
| -rw-r--r-- | security/keychain/distinfo | 11 | ||||
| -rw-r--r-- | security/keychain/patches/patch-keychain | 24 |
3 files changed, 32 insertions, 12 deletions
diff --git a/security/keychain/Makefile b/security/keychain/Makefile index e7e2472d179..e3f50f15cdc 100644 --- a/security/keychain/Makefile +++ b/security/keychain/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.37 2017/11/06 13:27:21 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2018/01/21 16:03:29 roy Exp $ -DISTNAME= keychain-2.8.3 -PKGREVISION= 1 +DISTNAME= keychain-2.8.4 CATEGORIES= security MASTER_SITES= https://www.funtoo.org/archive/keychain/ EXTRACT_SUFX= .tar.bz2 @@ -15,12 +14,8 @@ LICENSE= gnu-gpl-v2 DEPENDS+= openssh-[0-9]*:../../security/openssh .endif -USE_TOOLS+= bash:run NO_BUILD= yes -# Uses the "local" keyword which is not supported by ksh. -REPLACE_BASH+= keychain - INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/${PKGBASE} do-install: diff --git a/security/keychain/distinfo b/security/keychain/distinfo index aafbbdc0c3d..55a092978f0 100644 --- a/security/keychain/distinfo +++ b/security/keychain/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.21 2016/09/20 12:36:09 mef Exp $ +$NetBSD: distinfo,v 1.22 2018/01/21 16:03:29 roy Exp $ -SHA1 (keychain-2.8.3.tar.bz2) = 590a69fb82a70af5d206d8ad84d848fe0b299f3c -RMD160 (keychain-2.8.3.tar.bz2) = 29befca1c9eba7b18694b5076bc4f828fd31d69b -SHA512 (keychain-2.8.3.tar.bz2) = f3893383c7ca2bf169c052a9760118fa677669603fad953ca2448aefc3cdda53078ea9f6a865cb31b71c6f30b678b78f600c960f189aeb1a7cb08cd0421ee9e9 -Size (keychain-2.8.3.tar.bz2) = 34170 bytes +SHA1 (keychain-2.8.4.tar.bz2) = b201a8b51677c472fae61a69b6a150b2734d141e +RMD160 (keychain-2.8.4.tar.bz2) = a3732750fe075bc29fef35489ebd74e894c27b45 +SHA512 (keychain-2.8.4.tar.bz2) = 9c2ab488d8c35bd1b8ffc432189f07bdb62964a86b5431a118a31a8471417ea85551542d937a774cb44a45803e188a6fc75367adda28cd17c731bf00fc62487f +Size (keychain-2.8.4.tar.bz2) = 34368 bytes +SHA1 (patch-keychain) = 78651f65794557486ceb78c3b7413bcf1143330c diff --git a/security/keychain/patches/patch-keychain b/security/keychain/patches/patch-keychain new file mode 100644 index 00000000000..015fb0d6f37 --- /dev/null +++ b/security/keychain/patches/patch-keychain @@ -0,0 +1,24 @@ +$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 |