[arch-commits] Commit in gnupg/trunk (PKGBUILD protect-tool-env.patch)

[Gaetan Bisson]

    Date: Friday, December 7, 2012 @ 22:14:58
  Author: bisson
Revision: 172986

fix FS#31900

Added:
  gnupg/trunk/protect-tool-env.patch
Modified:
  gnupg/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    9 ++++++---
 protect-tool-env.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-08 02:34:13 UTC (rev 172985)
+++ PKGBUILD	2012-12-08 03:14:58 UTC (rev 172986)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.0.19
-pkgrel=2
+pkgrel=3
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -16,9 +16,11 @@
             'libusb-compat: scdaemon')
 makedepends=('curl' 'libldap' 'libusb-compat')
 depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
-source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+        'protect-tool-env.patch')
 sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f'
-          'f6e6830610a8629b0aad69d789373bf8ca481733')
+          'f6e6830610a8629b0aad69d789373bf8ca481733'
+          '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
 
 install=install
 
@@ -28,6 +30,7 @@
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../protect-tool-env.patch # FS#31900
 	./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
 	make
 }

Added: protect-tool-env.patch
===================================================================
--- protect-tool-env.patch	                        (rev 0)
+++ protect-tool-env.patch	2012-12-08 03:14:58 UTC (rev 172986)
@@ -0,0 +1,28 @@
+diff -Naur old/agent/protect-tool.c new/agent/protect-tool.c
+--- old/agent/protect-tool.c	2012-12-08 13:53:17.067611957 +1100
++++ new/agent/protect-tool.c	2012-12-08 13:53:28.247633012 +1100
+@@ -102,6 +102,7 @@
+ static int opt_status_msg;
+ static const char *opt_p12_charset;
+ static const char *opt_agent_program; 
++static session_env_t opt_session_env;
+ 
+ static char *get_passphrase (int promptno);
+ static void release_passphrase (char *pw);
+@@ -1040,6 +1041,7 @@
+ 
+   opt_homedir = default_homedir ();
+ 
++  opt_session_env = session_env_new ();
+ 
+   pargs.argc = &argc;
+   pargs.argv = &argv;
+@@ -1091,7 +1093,7 @@
+                                 opt.verbose,
+                                 opt_homedir,
+                                 opt_agent_program,
+-                                NULL, NULL, NULL);
++                                NULL, NULL, opt_session_env);
+ 
+   if (opt_prompt)
+     opt_prompt = percent_plus_unescape (opt_prompt, 0);