pushed to 2.1.10

3 files changed, 28 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a288d6c9fe28..5a28c738fa01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Tue Jan 26 14:46:07 UTC 2016
 pkgbase = gnupg-large-rsa
 	pkgdesc = Complete and free implementation of the OpenPGP standard - with fixes to make large RSA keys really work (and even bigger keys)
-	pkgver = 2.1.7
+	pkgver = 2.1.10
 	pkgrel = 1
 	url = http://www.gnupg.org/
 	install = install
@@ -21,20 +23,20 @@ pkgbase = gnupg-large-rsa
 	optdepends = libldap: gpg2keys_ldap
 	optdepends = libusb-compat: scdaemon
 	provides = dirmngr
-	provides = gnupg2=2.1.7
-	provides = gnupg=2.1.7
+	provides = gnupg2=2.1.10
+	provides = gnupg=2.1.10
 	conflicts = dirmngr
 	conflicts = gnupg2
 	conflicts = gnupg
 	replaces = dirmngr
 	replaces = gnupg2
 	replaces = gnupg
-	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.7.tar.bz2
-	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.7.tar.bz2.sig
-	source = gnupg-large-rsa-2.1.7.patch
-	sha1sums = 1a345804f34a2acd05c1555e40ddfa297f38438b
+	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.10.tar.bz2
+	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.10.tar.bz2.sig
+	source = gnupg-large-rsa-2.1.10.patch
+	sha1sums = 4aa2594d2d364fe7708a9739ae7cebd251e536c4
 	sha1sums = SKIP
-	sha1sums = 4132fdf829d34f9fb81b00945bdde89b6198452d
+	sha1sums = 30085cda67ae46528bc51373bae1e46d105191c7
 
 pkgname = gnupg-large-rsa
 
diff --git a/PKGBUILD b/PKGBUILD
index 3785d68f7bfb..d0d01875040e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=gnupg-large-rsa
 _pkgname=gnupg
-pkgver=2.1.7
+pkgver=2.1.10
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard - with fixes to make large RSA keys really work (and even bigger keys)'
 url='http://www.gnupg.org/'
@@ -22,9 +22,10 @@ validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
               '031EC2536E580D8EA286A9F22071B08A33BD3F06'
               'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 source=("ftp://ftp.gnupg.org/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig} "${pkgname}-${pkgver}.patch")
-sha1sums=('1a345804f34a2acd05c1555e40ddfa297f38438b'
+sha1sums=('4aa2594d2d364fe7708a9739ae7cebd251e536c4'
           'SKIP'
-          '4132fdf829d34f9fb81b00945bdde89b6198452d')
+          '30085cda67ae46528bc51373bae1e46d105191c7'
+         )
 
 install=install
 
@@ -45,8 +46,8 @@ build() {
 		--sysconfdir=/etc \
 		--sbindir=/usr/bin \
 		--libexecdir=/usr/lib/gnupg \
-		--enable-symcryptrun \
-		--enable-gpgtar \
+		--enable-maintainer-mode \
+        --enable-symcryptrun \
         --enable-large-secmem
 
 	make
@@ -65,3 +66,4 @@ package() {
 	ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
 	rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059
 }
+
diff --git a/gnupg-large-rsa-2.1.7.patch b/gnupg-large-rsa-2.1.10.patch
index 5ce7b5f2b2fb..01819b826b07 100644
--- a/gnupg-large-rsa-2.1.7.patch
+++ b/gnupg-large-rsa-2.1.10.patch
@@ -1,7 +1,7 @@
-diff -ru gnupg-2.1.5/configure gnupg-2.1.5-patched/configure
---- gnupg-2.1.5/configure	2015-06-11 14:44:30.000000000 +0200
-+++ gnupg-2.1.5-patched/configure	2015-06-27 02:34:10.326765711 +0200
-@@ -2840,7 +2840,7 @@
+diff -ru gnupg-2.1.10/configure gnupg-2.1.10-patched/configure
+--- gnupg-2.1.10/configure	2015-12-04 10:57:06.000000000 +0100
++++ gnupg-2.1.10-patched/configure	2016-01-26 14:55:11.000000000 +0100
+@@ -2861,7 +2861,7 @@
  
  ac_config_headers="$ac_config_headers config.h"
  
@@ -10,9 +10,9 @@ diff -ru gnupg-2.1.5/configure gnupg-2.1.5-patched/configure
  
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
-diff -ru gnupg-2.1.5/configure.ac gnupg-2.1.5-patched/configure.ac
---- gnupg-2.1.5/configure.ac	2015-06-09 13:38:14.000000000 +0200
-+++ gnupg-2.1.5-patched/configure.ac	2015-06-27 02:34:10.326765711 +0200
+diff -ru gnupg-2.1.10/configure.ac gnupg-2.1.10-patched/configure.ac
+--- gnupg-2.1.10/configure.ac	2015-12-04 10:55:19.000000000 +0100
++++ gnupg-2.1.10-patched/configure.ac	2016-01-26 14:55:11.000000000 +0100
 @@ -19,7 +19,7 @@
  
  # Process this file with autoconf to produce a configure script.
@@ -22,7 +22,7 @@ diff -ru gnupg-2.1.5/configure.ac gnupg-2.1.5-patched/configure.ac
  
  # To build a release you need to create a tag with the version number
  # (git tag -s gnupg-2.n.m) and run "./autogen.sh --force".  Please
-@@ -229,7 +229,7 @@
+@@ -234,7 +234,7 @@
                large_secmem=$enableval, large_secmem=no)
  AC_MSG_RESULT($large_secmem)
  if test "$large_secmem" = yes ; then
@@ -31,9 +31,9 @@ diff -ru gnupg-2.1.5/configure.ac gnupg-2.1.5-patched/configure.ac
  else
     SECMEM_BUFFER_SIZE=32768
  fi
-diff -ru gnupg-2.1.5/g10/keygen.c gnupg-2.1.5-patched/g10/keygen.c
---- gnupg-2.1.5/g10/keygen.c	2015-06-02 17:47:50.000000000 +0200
-+++ gnupg-2.1.5-patched/g10/keygen.c	2015-06-27 02:34:10.326765711 +0200
+diff -ru gnupg-2.1.10/g10/keygen.c gnupg-2.1.10-patched/g10/keygen.c
+--- gnupg-2.1.10/g10/keygen.c	2015-12-04 10:53:27.000000000 +0100
++++ gnupg-2.1.10-patched/g10/keygen.c	2016-01-26 14:55:11.000000000 +0100
 @@ -1560,7 +1560,7 @@
    int err;
    char *keyparms;