Push to 2.2.5

3 files changed, 33 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2b3549b3f1e..e684a759a1a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 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.4
-	pkgrel = 1
+	pkgver = 2.2.5
+	pkgrel = 2
 	url = http://www.gnupg.org/
 	install = install
 	arch = i686
@@ -22,24 +22,26 @@ pkgbase = gnupg-large-rsa
 	optdepends = libldap: gpg2keys_ldap
 	optdepends = libusb-compat: scdaemon
 	provides = dirmngr
-	provides = gnupg2=2.2.4
-	provides = gnupg=2.2.4
+	provides = gnupg2=2.2.5
+	provides = gnupg=2.2.5
 	conflicts = dirmngr
 	conflicts = gnupg2
 	conflicts = gnupg
 	replaces = dirmngr
 	replaces = gnupg2
 	replaces = gnupg
-	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 = 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 = gnupg-large-rsa.patch
+	source = req_usage.patch
 	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
 	validpgpkeys = 46CC730865BB5C78EBABADCF04376F3EE0856959
 	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
 	validpgpkeys = D238EA65D64C67ED4C3073F28A861B1C7EFD60D9
-	sha256sums = 401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec
+	sha256sums = 3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57
 	sha256sums = SKIP
 	sha256sums = 2fb51506b247d047986596cce6c93d0a031830ea225b71b65d8f2b09234e348c
+	sha256sums = f8bef4891c1b9f81f305753dac7780ad4cfd56ec853502ba1d9d6400c69a518e
 
 pkgname = gnupg-large-rsa
 
diff --git a/PKGBUILD b/PKGBUILD
index ebf499fe8813..e3747a3e1cec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=gnupg-large-rsa
 _pkgname=gnupg
-pkgver=2.2.4
-pkgrel=1
+pkgver=2.2.5
+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/'
 license=('GPL')
@@ -23,10 +23,12 @@ validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
               'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 source=("https://www.gnupg.org/ftp/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig} 
         "${pkgname}.patch"
+        "req_usage.patch"
        )
-sha256sums=('401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec'
+sha256sums=('3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57'
             'SKIP'
-            '2fb51506b247d047986596cce6c93d0a031830ea225b71b65d8f2b09234e348c')
+            '2fb51506b247d047986596cce6c93d0a031830ea225b71b65d8f2b09234e348c'
+            'f8bef4891c1b9f81f305753dac7780ad4cfd56ec853502ba1d9d6400c69a518e')
 
 install=install
 
@@ -37,7 +39,11 @@ replaces=('dirmngr' 'gnupg2' 'gnupg')
 prepare() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
     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() {
@@ -62,9 +68,6 @@ check() {
 package() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
-
-    cd doc/examples/systemd-user
-    for i in *.*; do
-        install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
-    done
+	ln -s gpg "${pkgdir}"/usr/bin/gpg2
+	ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
 }
diff --git a/req_usage.patch b/req_usage.patch
new file mode 100644
index 000000000000..93d693574444
--- /dev/null
+++ b/req_usage.patch
@@ -0,0 +1,12 @@
+diff -Naur old/g10/getkey.c new/g10/getkey.c
+--- old/g10/getkey.c	2018-02-21 23:42:42.000000000 -1000
++++ new/g10/getkey.c	2018-04-05 10:15:14.642119429 -1000
+@@ -1810,6 +1810,8 @@
+       ctx.items[0].mode = fprint_len == 16 ? KEYDB_SEARCH_MODE_FPR16
+ 	: KEYDB_SEARCH_MODE_FPR20;
+       memcpy (ctx.items[0].u.fpr, fprint, fprint_len);
++      if (pk)
++        ctx.req_usage = pk->req_usage;
+       rc = lookup (ctrl, &ctx, 0, &kb, &found_key);
+       if (!rc && pk)
+ 	pk_from_block (pk, kb, found_key);