File 0001-Update-inheritagents-for-GnuPG-v.2.1.patch of Package keychain

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Update-inheritagents-for-GnuPG-v.2.1.patch of Package keychain (Revision 939559406597638b8c31d00290d4770f)

Currently displaying revision 939559406597638b8c31d00290d4770f , Show latest

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.

Info available at:
https://www.gnupg.org/faq/whats-new-in-2.1.html#autostart
---
 keychain.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/keychain.sh b/keychain.sh
index 4c35622..30e83b2 100755
--- a/keychain.sh
+++ b/keychain.sh
@@ -374,6 +374,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=$(ps -u "$me" -o 'pid,comm' | grep gpg-agent | tr -dc '[:digit:]')
+                inherit_gpg_agent_info="$GNUPGHOME/S.gpg-agent:${inherit_gpg_agent_pid}:1"
             fi
         fi
     fi
-- 
2.1.4

Places

File 0001-Update-inheritagents-for-GnuPG-v.2.1.patch of Package keychain (Revision 939559406597638b8c31d00290d4770f)

Places