Bump to lastest version

3 files changed, 28 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e684a759a1a2..27c16137f6d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 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.2.5
+	pkgver = 2.2.13
 	pkgrel = 2
 	url = http://www.gnupg.org/
 	install = install
@@ -22,16 +22,16 @@ pkgbase = gnupg-large-rsa
 	optdepends = libldap: gpg2keys_ldap
 	optdepends = libusb-compat: scdaemon
 	provides = dirmngr
-	provides = gnupg2=2.2.5
-	provides = gnupg=2.2.5
+	provides = gnupg2=2.2.13
+	provides = gnupg=2.2.13
 	conflicts = dirmngr
 	conflicts = gnupg2
 	conflicts = gnupg
 	replaces = dirmngr
 	replaces = gnupg2
 	replaces = gnupg
-	source = https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.5.tar.bz2
-	source = https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.5.tar.bz2.sig
+	source = https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.13.tar.bz2
+	source = https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.13.tar.bz2.sig
 	source = gnupg-large-rsa.patch
 	source = req_usage.patch
 	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
diff --git a/PKGBUILD b/PKGBUILD
index e3747a3e1cec..ff4a6d47ebfd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=gnupg-large-rsa
 _pkgname=gnupg
-pkgver=2.2.5
+pkgver=2.2.13
 pkgrel=2
 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/'
@@ -17,18 +17,20 @@ optdepends=('libldap: gpg2keys_ldap'
 makedepends=('libldap' 'libusb-compat')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
          'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
-validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+validpgpkeys=(
+              'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
               '46CC730865BB5C78EBABADCF04376F3EE0856959'
               '031EC2536E580D8EA286A9F22071B08A33BD3F06'
-              'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+              'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9'
+)
 source=("https://www.gnupg.org/ftp/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig} 
         "${pkgname}.patch"
-        "req_usage.patch"
-       )
-sha256sums=('3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57'
-            'SKIP'
-            '2fb51506b247d047986596cce6c93d0a031830ea225b71b65d8f2b09234e348c'
-            'f8bef4891c1b9f81f305753dac7780ad4cfd56ec853502ba1d9d6400c69a518e')
+)
+sha256sums=(
+  '76c787a955f9e6e0ead47c9be700bfb9d454f955a7b7c7e697aa719bac7b11d8'
+  'SKIP'
+  '17060a9cd0467dff344365a4a9569344d2aeb92cc8f4879e9bf52197b55a3cb4'
+)
 
 install=install
 
@@ -41,9 +43,6 @@ prepare() {
     patch -p1 -i ${srcdir}/${pkgname}.patch 
 
     sed '/noinst_SCRIPTS = gpg-zip/c bin_SCRIPTS += gpg-zip' -i tools/Makefile.in
-
-    # See: https://dev.gnupg.org/rGa17d2d1f690ebe5d005b4589a5fe378b6487c657
-	patch -p1 -i ../req_usage.patch
 }
 
 build() {
diff --git a/gnupg-large-rsa.patch b/gnupg-large-rsa.patch
index c04e7ced8ef2..61aca415e71c 100644
--- a/gnupg-large-rsa.patch
+++ b/gnupg-large-rsa.patch
@@ -1,19 +1,19 @@
-diff -ru gnupg-2.2.4.origin/configure gnupg-2.2.4/configure
---- gnupg-2.2.4.origin/configure	2017-12-20 09:12:57.000000000 +0100
-+++ gnupg-2.2.4/configure	2018-01-25 17:29:37.739860947 +0100
-@@ -2939,7 +2939,7 @@
+diff -aur old/configure new/configure
+--- old/configure	2019-02-27 14:33:09.773385526 +0100
++++ new/configure	2019-02-27 14:38:40.619816260 +0100
+@@ -2945,7 +2945,7 @@
  
  ac_config_headers="$ac_config_headers config.h"
  
--am__api_version='1.14'
-+am__api_version='1.15'
+-am__api_version='1.15'
++am__api_version='1.14'
  
  # 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.2.4.origin/g10/keygen.c gnupg-2.2.4/g10/keygen.c
---- gnupg-2.2.4.origin/g10/keygen.c	2017-12-13 10:15:01.000000000 +0100
-+++ gnupg-2.2.4/g10/keygen.c	2018-01-25 17:29:37.739860947 +0100
-@@ -1632,7 +1632,7 @@
+diff -aur old/g10/keygen.c new/g10/keygen.c
+--- old/g10/keygen.c	2019-02-27 14:33:09.533386670 +0100
++++ new/g10/keygen.c	2019-02-27 14:38:40.627816221 +0100
+@@ -1639,7 +1639,7 @@
    int err;
    char *keyparms;
    char nbitsstr[35];
@@ -22,13 +22,13 @@ diff -ru gnupg-2.2.4.origin/g10/keygen.c gnupg-2.2.4/g10/keygen.c
  
    log_assert (is_RSA(algo));
  
-@@ -2107,6 +2107,12 @@
+@@ -2114,6 +2114,12 @@
        def=255;
        break;
  
 +    case PUBKEY_ALGO_RSA:
 +      *min = opt.compliance == CO_DE_VS ? 2048 : 1024;
-+      *max = (opt.flags.large_rsa?16384:4096);
++      *max = (opt.flags.large_rsa ? 16384 : 4096);
 +      def = 2048;
 +      break;
 +