Update to GnuPG 2.4.3

7 files changed, 92 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45e8ab5fdf11..12d69d96b6b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = gnupg-largekeys
 	pkgdesc = Complete and free implementation of the OpenPGP standard
-	pkgver = 2.3.0
+	pkgver = 2.4.3
 	pkgrel = 1
-	url = https://www.gnupg.org/
+	url = https://www.gnupg.org
 	install = gnupg.install
 	arch = i686
 	arch = x86_64
@@ -24,24 +24,27 @@ pkgbase = gnupg-largekeys
 	optdepends = libldap: gpg2keys_ldap
 	optdepends = libusb-compat: scdaemon
 	optdepends = pcsclite: scdaemon
-	provides = gnupg2=2.3.0
-	provides = gnupg=2.3.0
+	provides = gnupg2=2.4.3
+	provides = gnupg=2.4.3
 	conflicts = gnupg2
 	conflicts = gnupg
 	replaces = gnupg2
 	replaces = gnupg
-	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.0.tar.bz2
-	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.0.tar.bz2.sig
+	source = https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.3.tar.bz2
+	source = https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.3.tar.bz2.sig
 	source = gnupg2-large-keys.patch
+	source = avoid-beta-warning.patch
+	source = max-mpi-bits.patch
 	source = gnupg.install
-	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
-	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
+	validpgpkeys = AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD
 	validpgpkeys = 5B80C5754298F0CB55D8ED6ABCEF7E294B092E28
 	validpgpkeys = 6DAA6E64A76D2840571B4902528897B826403ADA
-	sha256sums = 84c1ef39e8621cfb70f31463a5d1d8edeab44332bc1e0e1af9b78b6f9ed05bb4
+	validpgpkeys = 02F38DFF731FF97CB039A1DA549E695E905BA208
+	sha256sums = a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d
 	sha256sums = SKIP
-	sha256sums = fa6a7a3daec793b3c6cd95538eb0bc5682ffb1ad0227b86cf89c8a552a7a7fd3
-	sha256sums = ab1406c54804692dcc8144fc01a90ffd27250a3b53a89b0ab8a5cb2807fe6423
+	sha256sums = 6ac90c4e8ad7cb2e3ae37b328449efac7b0c3a8b30dbbf9d3650ab679244f768
+	sha256sums = 2e0d0ae24027b8f21cac442b9a67ee6cf153caf304cde5e0447b6071d1ac543c
+	sha256sums = 3731e116bd604c8ac630fe565a1d1dc8dbb41d1eaadd8aa39ab4a5933a1a0bc4
+	sha256sums = 95a41dd1b6a76d7eabcd40c42e2fd24902c6f0b50cea91d2e2beb97911bb2821
 
 pkgname = gnupg-largekeys
-
diff --git a/.gitignore b/.gitignore
index af00eea91b44..187266fb6665 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/gnupg-*.tar.bz2
-/gnupg-largekeys-*.pkg.tar.xz
+/gnupg-*.tar.bz2*
+/gnupg-largekeys-*.pkg.tar.*
 /pkg/
 /src/
diff --git a/PKGBUILD b/PKGBUILD
index 0b22c80db88d..e834fffa1da7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,10 +8,11 @@
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=gnupg-largekeys
-pkgver=2.3.0
+_base_name=${pkgname%%-largekeys}
+pkgver=2.4.3
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
-url='https://www.gnupg.org/'
+url='https://www.gnupg.org'
 license=('GPL')
 arch=('i686' 'x86_64')
 checkdepends=('openssh')
@@ -21,17 +22,21 @@ depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
 optdepends=('libldap: gpg2keys_ldap'
             'libusb-compat: scdaemon'
             'pcsclite: scdaemon')
-validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
-              '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+validpgpkeys=('AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD'
               '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28'
-	      '6DAA6E64A76D2840571B4902528897B826403ADA')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname%%-largekeys}/${pkgname%%-largekeys}-${pkgver}.tar.bz2"{,.sig}
+	      '6DAA6E64A76D2840571B4902528897B826403ADA'
+	      '02F38DFF731FF97CB039A1DA549E695E905BA208')
+source=("${url}/ftp/gcrypt/${_base_name}/${_base_name}-${pkgver}.tar.bz2"{,.sig}
         'gnupg2-large-keys.patch'
+        'avoid-beta-warning.patch'
+        'max-mpi-bits.patch'
         'gnupg.install')
-sha256sums=('84c1ef39e8621cfb70f31463a5d1d8edeab44332bc1e0e1af9b78b6f9ed05bb4'
-	    'SKIP'
-            'fa6a7a3daec793b3c6cd95538eb0bc5682ffb1ad0227b86cf89c8a552a7a7fd3'
-            'ab1406c54804692dcc8144fc01a90ffd27250a3b53a89b0ab8a5cb2807fe6423')
+sha256sums=('a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d'
+            'SKIP'
+            '6ac90c4e8ad7cb2e3ae37b328449efac7b0c3a8b30dbbf9d3650ab679244f768'
+            '2e0d0ae24027b8f21cac442b9a67ee6cf153caf304cde5e0447b6071d1ac543c'
+            '3731e116bd604c8ac630fe565a1d1dc8dbb41d1eaadd8aa39ab4a5933a1a0bc4'
+            '95a41dd1b6a76d7eabcd40c42e2fd24902c6f0b50cea91d2e2beb97911bb2821')
 
 install=gnupg.install
 
@@ -43,6 +48,11 @@ prepare() {
 	cd "${srcdir}/${pkgname%%-largekeys}-${pkgver}"
 	sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in
 	patch -p1 -i ../gnupg2-large-keys.patch
+        patch -p1 -i ../avoid-beta-warning.patch
+#        patch -p1 -i ../drop-import-clean.patch
+	patch -p1 -i ../max-mpi-bits.patch
+
+        ./autogen.sh
 }
 
 build() {
@@ -72,7 +82,7 @@ package() {
 	ln -s gpg "${pkgdir}"/usr/bin/gpg2
 	ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
 
-	cd doc/examples/systemd-user
+	cd doc/examples
 	for i in *.*; do
 		install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
 	done
diff --git a/avoid-beta-warning.patch b/avoid-beta-warning.patch
new file mode 100644
index 000000000000..5829d9adb709
--- /dev/null
+++ b/avoid-beta-warning.patch
@@ -0,0 +1,24 @@
+diff --git a/autogen.sh b/autogen.sh
+index 4b511bf95..bc92cc322 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -229,7 +229,7 @@ if [ "$myhost" = "find-version" ]; then
+     esac
+ 
+     beta=no
+-    if [ -e .git ]; then
++    if false; then
+       ingit=yes
+       tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
+       tmp=$(echo "$tmp" | sed s/^"$package"//)
+@@ -245,8 +245,8 @@ if [ "$myhost" = "find-version" ]; then
+       rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
+     else
+       ingit=no
+-      beta=yes
+-      tmp="-unknown"
++      beta=no
++      tmp=""
+       rev="0000000"
+       rvd="0"
+     fi
diff --git a/gnupg.install b/gnupg.install
index 31ccfdf18b21..9759792242bc 100644
--- a/gnupg.install
+++ b/gnupg.install
@@ -6,12 +6,12 @@ post_install() {
   for f in ${info_files[@]}; do
     usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null
   done
-  echo -e "\e[1mNOTE: Keys larger than 16384 bits fail on unpatched gnupg versions!\e[0m"
+  echo -e "\e[1mNOTE: Keys larger than 65536 bits fail on unpatched gnupg versions!\e[0m"
 }
 
 post_upgrade() {
   post_install $1
-  echo -e "\e[1mNOTE: Keys larger than 16384 bits fail on unpatched gnupg versions!\e[0m"
+  echo -e "\e[1mNOTE: Keys larger than 65536 bits fail on unpatched gnupg versions!\e[0m"
 }
 
 pre_remove() {
diff --git a/gnupg2-large-keys.patch b/gnupg2-large-keys.patch
index 97059f211507..544d5703e0da 100644
--- a/gnupg2-large-keys.patch
+++ b/gnupg2-large-keys.patch
@@ -1,3 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+index 215a6535f..eeba4e584 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,7 +260,7 @@ AC_ARG_ENABLE(large-secmem,
+               large_secmem=$enableval, large_secmem=no)
+ AC_MSG_RESULT($large_secmem)
+ if test "$large_secmem" = yes ; then
+-   SECMEM_BUFFER_SIZE=65536
++   SECMEM_BUFFER_SIZE=1048576
+ else
+    SECMEM_BUFFER_SIZE=32768
+ fi
 diff --git a/g10/keygen.c b/g10/keygen.c
 index a4117cdd0..638a19cb2 100644
 --- a/g10/keygen.c
@@ -7,7 +20,7 @@ index a4117cdd0..638a19cb2 100644
    char *keyparms;
    char nbitsstr[35];
 -  const unsigned maxsize = (opt.flags.large_rsa ? 8192 : 4096);
-+  const unsigned maxsize = (opt.flags.large_rsa ? 16384 : 4096);
++  const unsigned maxsize = (opt.flags.large_rsa ? 65536 : 4096);
  
    log_assert (is_RSA(algo));
  
@@ -16,7 +29,7 @@ index a4117cdd0..638a19cb2 100644
      default:
        *min = opt.compliance == CO_DE_VS ? 2048: 1024;
 -      *max = 4096;
-+      *max = 16384;
++      *max = 65536;
        def = 3072;
        break;
      }
diff --git a/max-mpi-bits.patch b/max-mpi-bits.patch
new file mode 100644
index 000000000000..b99ed6a4b35e
--- /dev/null
+++ b/max-mpi-bits.patch
@@ -0,0 +1,13 @@
+diff --git a/g10/gpg.h b/g10/gpg.h
+index d4e66e72d..6b879271f 100644
+--- a/g10/gpg.h
++++ b/g10/gpg.h
+@@ -39,7 +39,7 @@
+ 
+ 
+ /* Number of bits we accept when reading or writing MPIs. */
+-#define MAX_EXTERN_MPI_BITS 16384
++#define MAX_EXTERN_MPI_BITS 65536
+ 
+ /* The maximum length of a binary fingerprints.  This is used to
+  * provide a static buffer and will be increased if we need to support