Push to 2.2.4

3 files changed, 24 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eefe980a47ba..e2b3549b3f1e 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.1.22
+	pkgver = 2.2.4
 	pkgrel = 1
 	url = http://www.gnupg.org/
 	install = install
@@ -22,24 +22,24 @@ pkgbase = gnupg-large-rsa
 	optdepends = libldap: gpg2keys_ldap
 	optdepends = libusb-compat: scdaemon
 	provides = dirmngr
-	provides = gnupg2=2.1.22
-	provides = gnupg=2.1.22
+	provides = gnupg2=2.2.4
+	provides = gnupg=2.2.4
 	conflicts = dirmngr
 	conflicts = gnupg2
 	conflicts = gnupg
 	replaces = dirmngr
 	replaces = gnupg2
 	replaces = gnupg
-	source = https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.1.22.tar.bz2
-	source = https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.1.22.tar.bz2.sig
+	source = https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.4.tar.bz2
+	source = https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.4.tar.bz2.sig
 	source = gnupg-large-rsa.patch
 	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
 	validpgpkeys = 46CC730865BB5C78EBABADCF04376F3EE0856959
 	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
 	validpgpkeys = D238EA65D64C67ED4C3073F28A861B1C7EFD60D9
-	sha256sums = 46716faf9e1b92cfca86609f3bfffbf5bb4b6804df90dc853ff7061cfcfb4ad7
+	sha256sums = 401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec
 	sha256sums = SKIP
-	sha256sums = 293e56dfd71ba2b51d9a2eeef20c4641bd15af7c384807466f385b87119b999c
+	sha256sums = 2fb51506b247d047986596cce6c93d0a031830ea225b71b65d8f2b09234e348c
 
 pkgname = gnupg-large-rsa
 
diff --git a/PKGBUILD b/PKGBUILD
index 6098dfd1b676..ebf499fe8813 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=gnupg-large-rsa
 _pkgname=gnupg
-pkgver=2.1.22
+pkgver=2.2.4
 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/'
@@ -24,9 +24,9 @@ validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
 source=("https://www.gnupg.org/ftp/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig} 
         "${pkgname}.patch"
        )
-sha256sums=('46716faf9e1b92cfca86609f3bfffbf5bb4b6804df90dc853ff7061cfcfb4ad7'
+sha256sums=('401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec'
             'SKIP'
-            '293e56dfd71ba2b51d9a2eeef20c4641bd15af7c384807466f385b87119b999c')
+            '2fb51506b247d047986596cce6c93d0a031830ea225b71b65d8f2b09234e348c')
 
 install=install
 
@@ -62,9 +62,6 @@ check() {
 package() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
-    ln -s gpg2 "${pkgdir}"/usr/bin/gpg
-    ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
-    ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
 
     cd doc/examples/systemd-user
     for i in *.*; do
diff --git a/gnupg-large-rsa.patch b/gnupg-large-rsa.patch
index 22297090bbaa..c04e7ced8ef2 100644
--- a/gnupg-large-rsa.patch
+++ b/gnupg-large-rsa.patch
@@ -1,7 +1,7 @@
-diff -ru a/configure b/configure
---- a/configure	2016-01-26 13:54:50.000000000 +0100
-+++ b/configure	2016-03-06 18:34:29.190228228 +0100
-@@ -2866,7 +2866,7 @@
+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 @@
  
  ac_config_headers="$ac_config_headers config.h"
  
@@ -10,10 +10,10 @@ diff -ru a/configure b/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 a/g10/keygen.c b/g10/keygen.c
---- a/g10/keygen.c	2016-01-26 10:36:37.000000000 +0100
-+++ b/g10/keygen.c	2017-03-01 15:00:00.000000000 +0100
-@@ -1612,7 +1612,7 @@
+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 @@
    int err;
    char *keyparms;
    char nbitsstr[35];
@@ -22,16 +22,16 @@ diff -ru a/g10/keygen.c b/g10/keygen.c
  
    log_assert (is_RSA(algo));
  
-@@ -2086,6 +2086,12 @@
-       *max=441;
+@@ -2107,6 +2107,12 @@
        def=255;
        break;
-+
+ 
 +    case PUBKEY_ALGO_RSA:
 +      *min = opt.compliance == CO_DE_VS ? 2048 : 1024;
 +      *max = (opt.flags.large_rsa?16384:4096);
 +      def = 2048;
 +      break;
-
-    default:
-      *min = opt.compliance == CO_DE_VS ? 2048 : 1024;
++
+     default:
+       *min = opt.compliance == CO_DE_VS ? 2048: 1024;
+       *max = 4096;