[pkgsrc/trunk]: pkgsrc/security/keychain Import keychain-2.8.5 with the follo...

[roy <roy%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d85271716d88
branches:  trunk
changeset: 374670:d85271716d88
user:      roy <roy%pkgsrc.org@localhost>
date:      Sat Jan 27 10:00:15 2018 +0000

description:
Import keychain-2.8.5 with the following improvements:
  *  gnupg socket support
  *  better portability

diffstat:

 security/keychain/Makefile               |  11 +++++++----
 security/keychain/distinfo               |  11 +++++------
 security/keychain/patches/patch-keychain |  24 ------------------------
 3 files changed, 12 insertions(+), 34 deletions(-)

diffs (64 lines):

diff -r 12d464a84d4c -r d85271716d88 security/keychain/Makefile
--- a/security/keychain/Makefile        Sat Jan 27 08:42:41 2018 +0000
+++ b/security/keychain/Makefile        Sat Jan 27 10:00:15 2018 +0000
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.38 2018/01/21 16:03:29 roy Exp $
+# $NetBSD: Makefile,v 1.39 2018/01/27 10:00:15 roy Exp $
 
-DISTNAME=      keychain-2.8.4
+DISTVERS=      2.8.5
+PKGNAME=       keychain-${DISTVERS}
 CATEGORIES=    security
-MASTER_SITES=  https://www.funtoo.org/archive/keychain/
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  https://github.com/funtoo/keychain/archive/
+DISTNAME=      ${DISTVERS}
+EXTRACT_SUFX=  .tar.gz
+WRKSRC=                ${WRKDIR}/keychain-${DISTVERS}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.funtoo.org/Keychain
diff -r 12d464a84d4c -r d85271716d88 security/keychain/distinfo
--- a/security/keychain/distinfo        Sat Jan 27 08:42:41 2018 +0000
+++ b/security/keychain/distinfo        Sat Jan 27 10:00:15 2018 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.22 2018/01/21 16:03:29 roy Exp $
+$NetBSD: distinfo,v 1.23 2018/01/27 10:00:15 roy Exp $
 
-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
+SHA1 (2.8.5.tar.gz) = 220d641ae959576ae95f6a3f42f3e2176ec097c0
+RMD160 (2.8.5.tar.gz) = 91c9c1dd0b5dd117b23184ba145b167e64ff5095
+SHA512 (2.8.5.tar.gz) = 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
+Size (2.8.5.tar.gz) = 66446 bytes
diff -r 12d464a84d4c -r d85271716d88 security/keychain/patches/patch-keychain
--- a/security/keychain/patches/patch-keychain  Sat Jan 27 08:42:41 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$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