summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorIdo Rosen2014-12-06 15:02:54 -0500
committerIdo Rosen2014-12-29 04:06:50 -0500
commitf982e9aefefbbd6081ed3ae0231dea10a74874b9 (patch)
treebdf6f59566859b570d2fe8f287caa25227560e76 /PKGBUILD
parent3c939d04d223d47fac1e23d273b74888e5f1c216 (diff)
downloadaur-f982e9aefefbbd6081ed3ae0231dea10a74874b9.tar.gz
Upstream changes to gnupg.
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD47
1 files changed, 29 insertions, 18 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 8a196b5a7896..987471b85619 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,35 +11,47 @@
#
pkgname=gnupg-largekeys
-pkgver=2.0.26
-pkgrel=1
+pkgver=2.1.0
+pkgrel=6
pkgdesc='Complete and free implementation of the OpenPGP standard'
url='http://www.gnupg.org/'
license=('GPL')
arch=('i686' 'x86_64')
-optdepends=('curl: gpg2keys_curl'
- 'libldap: gpg2keys_ldap'
+optdepends=('libldap: gpg2keys_ldap'
'libusb-compat: scdaemon')
-makedepends=('curl' 'libldap' 'libusb-compat')
-depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline')
source=("ftp://ftp.gnupg.org/gcrypt/${pkgname%%-largekeys}/${pkgname%%-largekeys}-${pkgver}.tar.bz2"{,.sig}
- 'gnupg2-large-keys.patch'{,.sig}
- 'install'{,.sig}
- 'PKGBUILD.sig')
-sha1sums=('3ff5b38152c919724fd09cf2f17df704272ba192' 'SKIP'
- '5932d322a6d4ec5eeafa4ac472f19c07bf4502af' 'SKIP'
- 'ff80fc79329cfa631c19ae1ea6fc4a390ab851f7' 'SKIP'
- 'SKIP')
+ 'oid2str-overflow.patch'
+ 'subpacket-off.patch'
+ 'refresh-keys.patch'
+ 'hash-ecdsa.patch')
+ #'gnupg2-large-keys.patch'{,.sig}
+ #'install'{,.sig}
+ #'PKGBUILD.sig')
+sha1sums=('2fcd0ca6889ef6cb59e3275e8411f8b7778c2f33' 'SKIP'
+ '774f7fe541428f45ee145c763cf5634264e3bc69'
+ '1a86b834904c7d18d932ad1bb44d3642990d3cbd'
+ '246bea8776882f4c0293685482558f6ead1cf902'
+ 'b9bd644276aa1c1a3fcaed82e65eecccfd1f36ed')
+ #'5932d322a6d4ec5eeafa4ac472f19c07bf4502af' 'SKIP'
+ #'9409c0fab2ae8e580f4b00bd15b4a590f097a9a9' 'SKIP'
+ #'SKIP')
install=install
-conflicts=('gnupg2' 'gnupg')
-provides=("gnupg2=${pkgver}" "gnupg=${pkgver}")
-replaces=('gnupg2' 'gnupg')
+conflicts=('dirmngr' 'gnupg2' 'gnupg')
+provides=('dirmngr' "gnupg2=${pkgver}" "gnupg=${pkgver}")
+replaces=('dirmngr' 'gnupg2' 'gnupg')
prepare() {
cd "${srcdir}/${pkgname%%-largekeys}-${pkgver}"
- patch -p1 -i ../gnupg2-large-keys.patch
+ patch -p1 -i ../oid2str-overflow.patch
+ patch -p1 -i ../subpacket-off.patch
+ patch -p1 -i ../refresh-keys.patch
+ patch -p1 -i ../hash-ecdsa.patch
+ #patch -p1 -i ../gnupg2-large-keys.patch
}
build() {
@@ -50,7 +62,6 @@ build() {
--sbindir=/usr/bin \
--libexecdir=/usr/lib/gnupg \
--enable-maintainer-mode \
- --enable-standard-socket \
--enable-symcryptrun \
--enable-gpgtar \