Date: Wed, 1 Apr 2015 21:17:17 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382956 - in head/security/keychain: . files Message-ID: <201504012117.t31LHHKB009751@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Apr 1 21:17:16 2015 New Revision: 382956 URL: https://svnweb.freebsd.org/changeset/ports/382956 Log: Fix support with GnuPG 2.1+ by not showing a warning when gpg-agent already running. Obtained from: https://github.com/funtoo/keychain MFH: 2015Q2 Added: head/security/keychain/files/ head/security/keychain/files/patch-keychain.sh (contents, props changed) Modified: head/security/keychain/Makefile Modified: head/security/keychain/Makefile ============================================================================== --- head/security/keychain/Makefile Wed Apr 1 21:15:37 2015 (r382955) +++ head/security/keychain/Makefile Wed Apr 1 21:17:16 2015 (r382956) @@ -3,6 +3,7 @@ PORTNAME= keychain PORTVERSION= 2.7.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.funtoo.org/archive/keychain/ \ GENTOO/distfiles Added: head/security/keychain/files/patch-keychain.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/keychain/files/patch-keychain.sh Wed Apr 1 21:17:16 2015 (r382956) @@ -0,0 +1,30 @@ +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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504012117.t31LHHKB009751>