Date: Thursday, April 19, 2018 @ 21:54:05
Author: eworm
Revision: 322476
upgpkg: gpgme 1.11.0-1
new upstream release
Added:
gpgme/trunk/0001-tests-Fix-t-verify-test-for-GnuPG-before-2.2.7.patch
Modified:
gpgme/trunk/PKGBUILD
-----------------------------------------------------------+
0001-tests-Fix-t-verify-test-for-GnuPG-before-2.2.7.patch | 46 ++++++++++++
PKGBUILD | 19 +++-
2 files changed, 60 insertions(+), 5 deletions(-)
Added: 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
(rev 0)
+++ 0001-tests-Fix-t-verify-test-for-GnuPG-before-2.2.7.patch 2018-04-19
21:54:05 UTC (rev 322476)
@@ -0,0 +1,46 @@
+From 3d8e5c07511938a0b30b4626530822338abd9ec0 Mon Sep 17 00:00:00 2001
+From: Werner Koch <w...@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 <w...@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-19 21:40:54 UTC (rev 322475)
+++ PKGBUILD 2018-04-19 21:54:05 UTC (rev 322476)
@@ -5,18 +5,27 @@
pkgbase=gpgme
pkgname=(gpgme qgpgme python-gpgme python2-gpgme)
-pkgver=1.10.0
-pkgrel=2
+pkgver=1.11.0
+pkgrel=1
pkgdesc="A C wrapper library for GnuPG"
arch=('x86_64')
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})
-sha256sums=('1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693'
- 'SKIP')
+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')
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 \
