[arch-commits] Commit in gnupg/trunk (PKGBUILD req_usage.patch)

[Gaëtan Bisson]

    Date: Tuesday, April 10, 2018 @ 17:28:21
  Author: bisson
Revision: 321491

upstream update

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/req_usage.patch

-----------------+
 PKGBUILD        |   15 +++++----------
 req_usage.patch |   12 ------------
 2 files changed, 5 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-10 17:22:09 UTC (rev 321490)
+++ PKGBUILD	2018-04-10 17:28:21 UTC (rev 321491)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=gnupg
-pkgver=2.2.5
-pkgrel=2
+pkgver=2.2.6
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -22,11 +22,9 @@
               '46CC730865BB5C78EBABADCF04376F3EE0856959'
               '031EC2536E580D8EA286A9F22071B08A33BD3F06'
               'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-        'req_usage.patch')
-sha256sums=('3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57'
-            'SKIP'
-            'f8bef4891c1b9f81f305753dac7780ad4cfd56ec853502ba1d9d6400c69a518e')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha256sums=('e64d8c5fa2d05938a5080cb784a98ac21be0812f2a26f844b18f0d6a0e711984'
+            'SKIP')
 
 install=install
 
@@ -37,9 +35,6 @@
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in
-
-	# See: https://dev.gnupg.org/rGa17d2d1f690ebe5d005b4589a5fe378b6487c657
-	patch -p1 -i ../req_usage.patch
 }
 
 build() {

Deleted: req_usage.patch
===================================================================
--- req_usage.patch	2018-04-10 17:22:09 UTC (rev 321490)
+++ req_usage.patch	2018-04-10 17:28:21 UTC (rev 321491)
@@ -1,12 +0,0 @@
-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);