[arch-commits] Commit in gpgme/trunk (2 files)

[Christian Hesse]

    Date: Friday, April 20, 2018 @ 11:36:32
  Author: eworm
Revision: 322525

upgpkg: gpgme 1.11.1-1

new upstream release

Modified:
  gpgme/trunk/PKGBUILD
Deleted:
  gpgme/trunk/0001-tests-Fix-t-verify-test-for-GnuPG-before-2.2.7.patch

-----------------------------------------------------------+
 0001-tests-Fix-t-verify-test-for-GnuPG-before-2.2.7.patch |   46 ------------
 PKGBUILD                                                  |   17 +---
 2 files changed, 4 insertions(+), 59 deletions(-)

Deleted: 0001-tests-Fix-t-verify-test-for-GnuPG-before-2.2.7.patch
===================================================================
--- 0001-tests-Fix-t-verify-test-for-GnuPG-before-2.2.7.patch	2018-04-20 11:26:58 UTC (rev 322524)
+++ 0001-tests-Fix-t-verify-test-for-GnuPG-before-2.2.7.patch	2018-04-20 11:36:32 UTC (rev 322525)
@@ -1,46 +0,0 @@
-From 3d8e5c07511938a0b30b4626530822338abd9ec0 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk at gnupg.org>
-Date: Thu, 19 Apr 2018 10:29:30 +0200
-Subject: tests: Fix t-verify test for GnuPG < 2.2.7.
-
-* tests/gpg/t-verify.c (check_result): Tweak for gnupg < 2.2.7.
---
-
-The not yet releases 2.2.7-beta may print a full fingerprint in the
-ERRSIG status.  This is compliant with the dscription but the new
-t-verify test case did not took in account that older GnuPG versions
-print only a keyid.
-
-Fixes-commit: b99502274ae5efdf6df0d967900ec3d1e64373d7
-GnUPG-bug-id: 3920
-Signed-off-by: Werner Koch <wk at gnupg.org>
----
- tests/gpg/t-verify.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
-index 7c23406f..fa0164ac 100644
---- a/tests/gpg/t-verify.c
-+++ b/tests/gpg/t-verify.c
-@@ -126,9 +126,15 @@ check_result (gpgme_verify_result_t result, int no_of_sigs, int skip_sigs,
-     }
-   if (strcmp (sig->fpr, fpr))
-     {
--      fprintf (stderr, "%s:%i:sig-%d: Unexpected fingerprint: %s\n",
--	       PGM, __LINE__, skip_sigs, sig->fpr);
--      exit (1);
-+      if (strlen (sig->fpr) == 16 && strlen (fpr) == 40
-+          && !strncmp (sig->fpr, fpr + 24, 16))
-+        ; /* okay because gnupg < 2.2.6 only shows the keyid.  */
-+      else
-+        {
-+          fprintf (stderr, "%s:%i:sig-%d: Unexpected fingerprint: %s\n",
-+                   PGM, __LINE__, skip_sigs, sig->fpr);
-+          exit (1);
-+        }
-     }
-   if (gpgme_err_code (sig->status) != status)
-     {
--- 
-cgit v1.1-33-g03f6
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-20 11:26:58 UTC (rev 322524)
+++ PKGBUILD	2018-04-20 11:36:32 UTC (rev 322525)
@@ -5,7 +5,7 @@
 
 pkgbase=gpgme
 pkgname=(gpgme qgpgme python-gpgme python2-gpgme)
-pkgver=1.11.0
+pkgver=1.11.1
 pkgrel=1
 pkgdesc="A C wrapper library for GnuPG"
 arch=('x86_64')
@@ -12,20 +12,11 @@
 url="http://www.gnupg.org/related_software/gpgme/"
 license=('LGPL')
 makedepends=('libgpg-error' 'gnupg' 'qt5-base' 'python' 'python2' 'swig')
-source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
-        '0001-tests-Fix-t-verify-test-for-GnuPG-before-2.2.7.patch')
-sha256sums=('5b03adbafadab74474ded30b74c882de28d3c5c3b9ee3016ef24023d4c35d492'
-            'SKIP'
-            '7cd9d8385493351ce1372e967933c470617b59f7493bb35a2c148cb489f7c498')
+source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig})
+sha256sums=('2d1b111774d2e3dd26dcd7c251819ce4ef774ec5e566251eb9308fa7542fbd6f'
+            'SKIP')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6') # Werner Koch
 
-prepare() {
-  cd ${pkgbase}-${pkgver}
-
-  # tests: Fix t-verify test for GnuPG < 2.2.7.
-  patch -Np1 < ../0001-tests-Fix-t-verify-test-for-GnuPG-before-2.2.7.patch
-}
-
 build() {
   cd ${pkgbase}-${pkgver}
   ./configure \