Fixed gpg-agent-info being ignored

(Portage version: 2.1.2-r4)

2 files changed, 18 insertions, 0 deletions

diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.1-r3 b/app-crypt/gnupg/files/digest-gnupg-2.0.1-r3
new file mode 100644
index 000000000000..8adb116e6cf6
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-2.0.1-r3
@@ -0,0 +1,3 @@
+MD5 eb24e258db73f4cb53a3ce18375efa21 gnupg-2.0.1.tar.bz2 3923924
+RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 gnupg-2.0.1.tar.bz2 3923924
+SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d gnupg-2.0.1.tar.bz2 3923924
diff --git a/app-crypt/gnupg/files/gnupg-2.0.1-agent.patch b/app-crypt/gnupg/files/gnupg-2.0.1-agent.patch
new file mode 100644
index 000000000000..8639ae26261a
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.1-agent.patch
@@ -0,0 +1,15 @@
+diff -urNp gnupg-2.0.1.org/g10/call-agent.c gnupg-2.0.1/g10/call-agent.c
+--- gnupg-2.0.1.org/g10/call-agent.c	2006-10-04 16:49:27.000000000 +0200
++++ gnupg-2.0.1/g10/call-agent.c	2007-01-29 21:46:57.000000000 +0200
+@@ -87,7 +87,10 @@ start_agent (void)
+     return 0; /* fixme: We need a context for each thread or serialize
+                  the access to the agent. */
+ 
+-  infostr = force_pipe_server? NULL : getenv ("GPG_AGENT_INFO");
++  if (opt.gpg_agent_info != NULL)
++    infostr = opt.gpg_agent_info;
++  else
++    infostr = force_pipe_server? NULL : getenv ("GPG_AGENT_INFO");
+   if (!infostr || !*infostr)
+     {
+       const char *pgmname;