Update to 2.2.17

3 files changed, 11 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27c16137f6d9..36119c82314e 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.13
+	pkgver = 2.2.17
 	pkgrel = 2
 	url = http://www.gnupg.org/
 	install = install
@@ -22,26 +22,24 @@ pkgbase = gnupg-large-rsa
 	optdepends = libldap: gpg2keys_ldap
 	optdepends = libusb-compat: scdaemon
 	provides = dirmngr
-	provides = gnupg2=2.2.13
-	provides = gnupg=2.2.13
+	provides = gnupg2=2.2.17
+	provides = gnupg=2.2.17
 	conflicts = dirmngr
 	conflicts = gnupg2
 	conflicts = gnupg
 	replaces = dirmngr
 	replaces = gnupg2
 	replaces = gnupg
-	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 = https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.17.tar.bz2
+	source = https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.17.tar.bz2.sig
 	source = gnupg-large-rsa.patch
-	source = req_usage.patch
 	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
 	validpgpkeys = 46CC730865BB5C78EBABADCF04376F3EE0856959
 	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
 	validpgpkeys = D238EA65D64C67ED4C3073F28A861B1C7EFD60D9
-	sha256sums = 3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57
+	sha256sums = afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514
 	sha256sums = SKIP
-	sha256sums = 2fb51506b247d047986596cce6c93d0a031830ea225b71b65d8f2b09234e348c
-	sha256sums = f8bef4891c1b9f81f305753dac7780ad4cfd56ec853502ba1d9d6400c69a518e
+	sha256sums = c144a2dd23e5177e72733b42735a0dd002c8bdae20c9f7776b30f3319d9402aa
 
 pkgname = gnupg-large-rsa
 
diff --git a/PKGBUILD b/PKGBUILD
index ff4a6d47ebfd..ce9cf48450cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=gnupg-large-rsa
 _pkgname=gnupg
-pkgver=2.2.13
+pkgver=2.2.17
 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/'
@@ -26,10 +26,9 @@ validpgpkeys=(
 source=("https://www.gnupg.org/ftp/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig} 
         "${pkgname}.patch"
 )
-sha256sums=(
-  '76c787a955f9e6e0ead47c9be700bfb9d454f955a7b7c7e697aa719bac7b11d8'
-  'SKIP'
-  '17060a9cd0467dff344365a4a9569344d2aeb92cc8f4879e9bf52197b55a3cb4'
+sha256sums=('afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514'
+            'SKIP'
+            'c144a2dd23e5177e72733b42735a0dd002c8bdae20c9f7776b30f3319d9402aa'
 )
 
 install=install
diff --git a/gnupg-large-rsa.patch b/gnupg-large-rsa.patch
index 61aca415e71c..d164921e0f2e 100644
--- a/gnupg-large-rsa.patch
+++ b/gnupg-large-rsa.patch
@@ -1,15 +1,3 @@
-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.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 -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