diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-11 16:54:49 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-11 16:54:49 +0100 |
| commit | 6767b6bbf9829a692c85c3dcd5ee0280982bd252 (patch) | |
| tree | 10bdbab736fb8e6abe1e99f4d1293b8e634c852a /core | |
| parent | 422ddbe135468a35d04170922ea3d25d18246aca (diff) | |
| parent | ab94338181959432cf0046ce0a9643307dab9366 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/libwebp/PKGBUILD
extra/totem/PKGBUILD
extra/webkitgtk/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/gnupg/PKGBUILD | 16 | ||||
| -rw-r--r-- | core/gnupg/protect-tool-env.patch | 28 |
2 files changed, 37 insertions, 7 deletions
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index e62ba7ebb..3ad7f8ef5 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156582 2012-04-21 09:42:46Z bisson $ +# $Id: PKGBUILD 173102 2012-12-11 00:42:05Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -6,20 +6,21 @@ 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') arch=('i686' 'x86_64' 'mips64el') optdepends=('curl: gpg2keys_curl' 'libldap: gpg2keys_ldap' - 'libusb-compat: scdaemon' - 'texinfo: documentation') -makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo') + '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 @@ -29,6 +30,7 @@ replaces=('gnupg2') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../protect-tool-env.patch # FS#31900 ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg make } diff --git a/core/gnupg/protect-tool-env.patch b/core/gnupg/protect-tool-env.patch new file mode 100644 index 000000000..132791fdd --- /dev/null +++ b/core/gnupg/protect-tool-env.patch @@ -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); |