diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-07-03 03:35:01 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-07-03 03:35:01 +0000 |
| commit | 92723c41135cfb106d37d4343603e63dc99922ca (patch) | |
| tree | 6190f189700c2e68570eefbfded247965b1bde5a /core/gnupg | |
| parent | 35f5198d4a73e45c4e9e22d638f5bfd5b9b4bc62 (diff) | |
Thu Jul 3 03:30:43 UTC 2014
Diffstat (limited to 'core/gnupg')
| -rw-r--r-- | core/gnupg/PKGBUILD | 16 | ||||
| -rw-r--r-- | core/gnupg/protect-tool-env.patch | 28 |
2 files changed, 5 insertions, 39 deletions
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index 8bcda0399..c66d877fb 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 214306 2014-06-05 17:24:35Z bisson $ +# $Id: PKGBUILD 216180 2014-07-02 00:13:52Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=gnupg -pkgver=2.0.23 +pkgver=2.0.25 pkgrel=1 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' @@ -16,10 +16,8 @@ optdepends=('curl: gpg2keys_curl' '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} - 'protect-tool-env.patch') -sha1sums=('c90e47ab95a40dd070fd75faef0a05c7b679553b' 'SKIP' - '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db') +source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}) +sha1sums=('890d77d89f2d187382f95e83e386f2f7ba789436' 'SKIP') install=install @@ -27,11 +25,6 @@ conflicts=('gnupg2') provides=("gnupg2=${pkgver}") replaces=('gnupg2') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../protect-tool-env.patch # FS#31900 -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ @@ -40,6 +33,7 @@ build() { --sbindir=/usr/bin \ --libexecdir=/usr/lib/gnupg \ --enable-maintainer-mode \ + --enable-standard-socket \ --enable-symcryptrun \ --enable-gpgtar \ diff --git a/core/gnupg/protect-tool-env.patch b/core/gnupg/protect-tool-env.patch deleted file mode 100644 index 132791fdd..000000000 --- a/core/gnupg/protect-tool-env.patch +++ /dev/null @@ -1,28 +0,0 @@ -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); |