Hello community,
here is the log from the commit of package gpgme for openSUSE:Factory checked
in at 2020-05-02 22:15:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gpgme (Old)
and /work/SRC/openSUSE:Factory/.gpgme.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpgme"
Sat May 2 22:15:41 2020 rev:79 rq:799285 version:1.13.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/gpgme/gpgme.changes 2019-10-23
15:38:13.053844772 +0200
+++ /work/SRC/openSUSE:Factory/.gpgme.new.2738/gpgme.changes 2020-05-02
22:15:55.336358171 +0200
@@ -1,0 +2,9 @@
+Wed Apr 29 11:09:33 UTC 2020 - Pedro Monreal Gonzalez
<pmonrealgonza...@suse.com>
+
+- Fix build: [bsc#1170811]
+ * Test t-json fails since the gpg-2.2.20 update
+- Add patches:
+ * gpgme-t-json-test-Bravo-key-no-secret-key-material.patch
+ * gpgme-t-json-test-with-keygrip-when-listing-keys.patch
+
+-------------------------------------------------------------------
New:
----
gpgme-t-json-test-Bravo-key-no-secret-key-material.patch
gpgme-t-json-test-with-keygrip-when-listing-keys.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gpgme.spec ++++++
--- /var/tmp/diff_new_pack.g9ufwf/_old 2020-05-02 22:15:56.372360341 +0200
+++ /var/tmp/diff_new_pack.g9ufwf/_new 2020-05-02 22:15:56.372360341 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gpgme
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -41,6 +41,8 @@
Source3: gpgme.keyring
# used to have a fixed timestamp
Source99: gpgme.changes
+Patch1: gpgme-t-json-test-Bravo-key-no-secret-key-material.patch
+Patch2: gpgme-t-json-test-with-keygrip-when-listing-keys.patch
BuildRequires: gcc-c++
BuildRequires: gpg2 >= 2.0.10
BuildRequires: libassuan-devel >= 2.4.2
@@ -183,6 +185,8 @@
%prep
%setup -q -n gpgme-%{version}
+%patch1 -p1
+%patch2 -p1
%ifarch %{ix86}
sed -i -e '/t-callbacks.py/d' lang/python/tests/Makefile.{am,in}
++++++ gpgme-t-json-test-Bravo-key-no-secret-key-material.patch ++++++
From: Daniel Kahn Gillmor <d...@fifthhorseman.net>
Date: Thu, 23 Jan 2020 16:43:13 -0500
Subject: tests/json: Bravo key does not have secret key material
* tests/json/t-keylist-secret.out.json: indicate correctly that the
"Bravo" test key does not have secret key material.
--
Some older versions of GnuPG are buggy, and will claim "secret: true"
for this key, even though the keyring in question has no secret key
material for it.
The underlying call to gpg looks something like:
gpg --with-colons --with-secret --list-keys -- \
al...@example.net br...@example.net
You can see the change in field 15 of the "pub" and "sub" output.
Signed-off-by: Daniel Kahn Gillmor <d...@fifthhorseman.net>
---
tests/json/t-keylist-secret.out.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/json/t-keylist-secret.out.json
b/tests/json/t-keylist-secret.out.json
index 5da20db..109eae3 100644
--- a/tests/json/t-keylist-secret.out.json
+++ b/tests/json/t-keylist-secret.out.json
@@ -91,7 +91,7 @@
"can_sign": true,
"can_certify": true,
"can_authenticate": true,
- "secret": true,
+ "secret": false,
"is_qualified": false,
"protocol": "OpenPGP",
"fingerprint": "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2",
++++++ gpgme-t-json-test-with-keygrip-when-listing-keys.patch ++++++
From: Daniel Kahn Gillmor <d...@fifthhorseman.net>
Date: Thu, 23 Jan 2020 17:04:43 -0500
Subject: gpg: Send --with-keygrip when listing keys
* src/engine-gpg.c (gpg_keylist_build_options): Always pass
--with-keygrip when listing keys.
--
Some older versions of GnuPG (at least gpg in version
2.2.12-1+deb10u1) appear to unilaterally emit the keygrip, and it's
certainly useful to know that programmatically it will always be
present in the output needed.
However, as of GnuPG 2.2.19-1, the following command does not emit the
keygrip for non-secret keys:
gpg --with-colons --with-secret --list-keys
This change fixes tests/json/t-json by making the output comply with
tests/json/t-keylist-secret.out.json correctly.
Signed-off-by: Daniel Kahn Gillmor <d...@fifthhorseman.net>
---
src/engine-gpg.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index 4f4a06a..fc52a5d 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -2922,6 +2922,7 @@ gpg_keylist_build_options (engine_gpg_t gpg, int
secret_only,
gpg_error_t err;
err = add_arg (gpg, "--with-colons");
+ err = add_arg (gpg, "--with-keygrip");
/* Since gpg 2.1.15 fingerprints are always printed, thus there is
* no more need to explicitly request them. */
