From owner-svn-ports-all@FreeBSD.ORG Wed Apr 1 21:17:18 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4C892942; Wed, 1 Apr 2015 21:17:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1BC52B87; Wed, 1 Apr 2015 21:17:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t31LHHEi009753; Wed, 1 Apr 2015 21:17:17 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t31LHHKB009751; Wed, 1 Apr 2015 21:17:17 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201504012117.t31LHHKB009751@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 1 Apr 2015 21:17:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382956 - in head/security/keychain: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2015 21:17:18 -0000 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 +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 +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 +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