push to 2.1.11

3 files changed, 35 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a28c738fa01..56550dc83d5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# 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.10
+	pkgver = 2.1.11
 	pkgrel = 1
 	url = http://www.gnupg.org/
 	install = install
@@ -23,20 +21,24 @@ pkgbase = gnupg-large-rsa
 	optdepends = libldap: gpg2keys_ldap
 	optdepends = libusb-compat: scdaemon
 	provides = dirmngr
-	provides = gnupg2=2.1.10
-	provides = gnupg=2.1.10
+	provides = gnupg2=2.1.11
+	provides = gnupg=2.1.11
 	conflicts = dirmngr
 	conflicts = gnupg2
 	conflicts = gnupg
 	replaces = dirmngr
 	replaces = gnupg2
 	replaces = gnupg
-	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
+	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.11.tar.bz2
+	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.11.tar.bz2.sig
+	source = gnupg-large-rsa-2.1.11.patch
+	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
+	validpgpkeys = 46CC730865BB5C78EBABADCF04376F3EE0856959
+	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
+	validpgpkeys = D238EA65D64C67ED4C3073F28A861B1C7EFD60D9
+	sha1sums = 4af2032a60ff22e322b1c5b270d6d2228f59a3a
 	sha1sums = SKIP
-	sha1sums = 30085cda67ae46528bc51373bae1e46d105191c7
+	sha1sums = be64ecc1d3ff9c6ef4e58cf82825f39e23816b9
 
 pkgname = gnupg-large-rsa
 
diff --git a/PKGBUILD b/PKGBUILD
index d0d01875040e..28e2237a5f8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=gnupg-large-rsa
 _pkgname=gnupg
-pkgver=2.1.10
+pkgver=2.1.11
 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,9 @@ validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
               '031EC2536E580D8EA286A9F22071B08A33BD3F06'
               'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 source=("ftp://ftp.gnupg.org/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig} "${pkgname}-${pkgver}.patch")
-sha1sums=('4aa2594d2d364fe7708a9739ae7cebd251e536c4'
+sha1sums=('4af2032a60ff22e322b1c5b270d6d2228f59a3a'
           'SKIP'
-          '30085cda67ae46528bc51373bae1e46d105191c7'
+          'be64ecc1d3ff9c6ef4e58cf82825f39e23816b9'
          )
 
 install=install
@@ -46,10 +46,8 @@ build() {
 		--sysconfdir=/etc \
 		--sbindir=/usr/bin \
 		--libexecdir=/usr/lib/gnupg \
-		--enable-maintainer-mode \
         --enable-symcryptrun \
         --enable-large-secmem
-
 	make
 }
 
diff --git a/gnupg-large-rsa-2.1.10.patch b/gnupg-large-rsa-2.1.11.patch
index 01819b826b07..ae2f472ff979 100644
--- a/gnupg-large-rsa-2.1.10.patch
+++ b/gnupg-large-rsa-2.1.11.patch
@@ -1,6 +1,6 @@
-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
+diff -ru gnupg-2.1.11/configure gnupg-2.1.11-patched/configure
+--- gnupg-2.1.11/configure	2016-01-26 13:54:50.000000000 +0100
++++ gnupg-2.1.11-patched/configure	2016-03-06 18:34:29.190228228 +0100
 @@ -2861,7 +2861,7 @@
  
  ac_config_headers="$ac_config_headers config.h"
@@ -10,9 +10,9 @@ diff -ru gnupg-2.1.10/configure gnupg-2.1.10-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.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
+diff -ru gnupg-2.1.11/configure.ac gnupg-2.1.11-patched/configure.ac
+--- gnupg-2.1.11/configure.ac	2016-01-26 10:36:37.000000000 +0100
++++ gnupg-2.1.11-patched/configure.ac	2016-03-06 18:34:29.190228228 +0100
 @@ -19,7 +19,7 @@
  
  # Process this file with autoconf to produce a configure script.
@@ -22,7 +22,7 @@ diff -ru gnupg-2.1.10/configure.ac gnupg-2.1.10-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
-@@ -234,7 +234,7 @@
+@@ -241,7 +241,7 @@
                large_secmem=$enableval, large_secmem=no)
  AC_MSG_RESULT($large_secmem)
  if test "$large_secmem" = yes ; then
@@ -31,10 +31,11 @@ diff -ru gnupg-2.1.10/configure.ac gnupg-2.1.10-patched/configure.ac
  else
     SECMEM_BUFFER_SIZE=32768
  fi
-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 @@
+Only in gnupg-2.1.11-patched: configure.ac.orig
+diff -ru gnupg-2.1.11/g10/keygen.c gnupg-2.1.11-patched/g10/keygen.c
+--- gnupg-2.1.11/g10/keygen.c	2016-01-26 10:36:37.000000000 +0100
++++ gnupg-2.1.11-patched/g10/keygen.c	2016-03-06 18:38:32.848387838 +0100
+@@ -1557,7 +1557,7 @@
    int err;
    char *keyparms;
    char nbitsstr[35];
@@ -43,11 +44,14 @@ diff -ru gnupg-2.1.10/g10/keygen.c gnupg-2.1.10-patched/g10/keygen.c
  
    assert (is_RSA(algo));
  
-@@ -2054,6 +2054,7 @@
- 
-     case PUBKEY_ALGO_RSA:
-       min=1024;
-+      max = (opt.flags.large_rsa ? 14336 : 4096);
+@@ -2048,6 +2048,10 @@
+       def=255;
+       max=441;
        break;
++
++    case PUBKEY_ALGO_RSA:
++      max=(opt.flags.large_rsa?14336:4096);
++      break;
      }
  
+   tty_printf(_("%s keys may be between %u and %u bits long.\n"),