mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-29 01:13:08 +00:00
Update to 2.8.0
PR: 199300 (based on) Submitted by: adamw@
This commit is contained in:
parent
101ee53ebf
commit
1dc7fddbd9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=384682
@ -2,8 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= keychain
|
||||
PORTVERSION= 2.7.1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 2.8.0
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= http://www.funtoo.org/archive/keychain/ \
|
||||
GENTOO/distfiles
|
||||
@ -17,10 +16,12 @@ USES= gmake perl5 tar:bzip2
|
||||
USE_PERL5= build
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
NO_BUILD= yes
|
||||
|
||||
PLIST_FILES= bin/${PORTNAME} \
|
||||
man/man1/keychain.1.gz
|
||||
|
||||
PORTDOCS= ChangeLog README.rst
|
||||
PORTDOCS= ChangeLog README.md
|
||||
|
||||
.if !exists(${LOCALBASE}/bin/ssh-agent) && !exists(/usr/bin/ssh-agent)
|
||||
RUN_DEPENDS+= ssh-agent:${PORTSDIR}/security/openssh-portable
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (keychain-2.7.1.tar.bz2) = 1107fe3f78f6429d4861d64c5666f068f159326d22ab80a8ed0948cb25375191
|
||||
SIZE (keychain-2.7.1.tar.bz2) = 51379
|
||||
SHA256 (keychain-2.8.0.tar.bz2) = 411bfe6a3ac9daca1c35f9a56828f03cc8474e8a668e122773397deb8f7a0799
|
||||
SIZE (keychain-2.8.0.tar.bz2) = 33727
|
||||
|
@ -1,30 +0,0 @@
|
||||
From c24ec771cf991b9a2db8a087222460cbc04d9387 Mon Sep 17 00:00:00 2001
|
||||
From: Tyler Cipriani <tyler@tylercipriani.com>
|
||||
Date: Fri, 9 Jan 2015 21:58:57 -0700
|
||||
Subject: [PATCH] Update inheritagents for GnuPG v.2.1+
|
||||
|
||||
$GPG_AGENT_INFO doesn't exist as of GnuPG 2.1.0.
|
||||
|
||||
From c1b33e953fabd657e6b323f5b0b307de6b37a4aa Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Robbins <drobbins@funtoo.org>
|
||||
Date: Wed, 18 Mar 2015 19:06:49 -0600
|
||||
Subject: [PATCH] FL-1999: Typo fix for inheritagents GPG patch.
|
||||
|
||||
From 4e62e8bb41b6deabe2038ff9688801c6e0be1c91 Mon Sep 17 00:00:00 2001
|
||||
From: Bryan Drewery <bryan@shatow.net>
|
||||
Date: Wed, 1 Apr 2015 16:13:58 -0500
|
||||
Subject: [PATCH] Use findpids() function to fix on non-GNU ps(1).
|
||||
|
||||
--- keychain.sh.orig 2010-05-07 17:24:14 UTC
|
||||
+++ keychain.sh
|
||||
@@ -369,6 +369,10 @@ inheritagents() {
|
||||
if [ -n "$GPG_AGENT_INFO" ]; then
|
||||
inherit_gpg_agent_info="$GPG_AGENT_INFO"
|
||||
inherit_gpg_agent_pid=`echo "$GPG_AGENT_INFO" | cut -f2 -d:`
|
||||
+ # GnuPG v.2.1+ removes $GPG_AGENT_INFO
|
||||
+ elif [ -S "${GNUPGHOME:=$HOME/.gnupg}/S.gpg-agent" ]; then
|
||||
+ inherit_gpg_agent_pid=$(findpids gpg)
|
||||
+ inherit_gpg_agent_info="$GNUPGHOME/S.gpg-agent:${inherit_gpg_agent_pid}:1"
|
||||
fi
|
||||
fi
|
||||
fi
|
Loading…
Reference in New Issue
Block a user