Hello community, here is the log from the commit of package gpgme for openSUSE:Factory checked in at 2020-07-09 17:48:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpgme (Old) and /work/SRC/openSUSE:Factory/.gpgme.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpgme" Thu Jul 9 17:48:55 2020 rev:81 rq:818961 version:1.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gpgme/gpgme.changes 2020-05-16 22:25:55.101221900 +0200 +++ /work/SRC/openSUSE:Factory/.gpgme.new.3060/gpgme.changes 2020-07-09 17:48:58.709427314 +0200 @@ -1,0 +2,12 @@ +Thu Jul 2 08:23:12 UTC 2020 - Dan Čermák <dcer...@suse.com> + +- Add 0001-gpg-Avoid-error-diagnostics-with-override-session-ke.patch + + This patch is a fix from + https://dev.gnupg.org/rMae4d7761a15b82eb98b0bcc72af2ae2e8973e1f9 which fixes + https://dev.gnupg.org/T3464 + The patch is required to make notmuch's testsuite pass with gpgme 1.13.0 and + 1.13.1. For further details, see id:87366av72u....@fifthhorseman.net on + notm...@notmuchmail.org + +------------------------------------------------------------------- New: ---- 0001-gpg-Avoid-error-diagnostics-with-override-session-ke.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpgme.spec ++++++ --- /var/tmp/diff_new_pack.tvOJc9/_old 2020-07-09 17:48:59.525429797 +0200 +++ /var/tmp/diff_new_pack.tvOJc9/_new 2020-07-09 17:48:59.525429797 +0200 @@ -43,6 +43,10 @@ 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 +# fix from https://dev.gnupg.org/rMae4d7761a15b82eb98b0bcc72af2ae2e8973e1f9 +# required to make notmuch's testsuite pass, see +# id:87366av72u....@fifthhorseman.net on notm...@notmuchmail.org +Patch3: 0001-gpg-Avoid-error-diagnostics-with-override-session-ke.patch BuildRequires: gcc-c++ BuildRequires: gpg2 >= 2.0.10 BuildRequires: libassuan-devel >= 2.4.2 @@ -184,9 +188,7 @@ This package contains the bindings to use the library in Qt C++ applications. %prep -%setup -q -n gpgme-%{version} -%patch1 -p1 -%patch2 -p1 +%autosetup -n gpgme-%{version} -p1 %ifarch %{ix86} sed -i -e '/t-callbacks.py/d' lang/python/tests/Makefile.{am,in} ++++++ 0001-gpg-Avoid-error-diagnostics-with-override-session-ke.patch ++++++ >From ae4d7761a15b82eb98b0bcc72af2ae2e8973e1f9 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor <d...@fifthhorseman.net> Date: Wed, 29 May 2019 17:56:01 -0400 Subject: [GPGME PATCH] gpg: Avoid error diagnostics with --override-session-key when verifying * src/engine-gpg.c (gpg_decrypt): only send --no-keyring when we are not verifying. -- Without this change, the signature verification would fail. This problem was introduced in bded8ebc59c7fdad2617f4c9232a58047656834c in an attempt to avoid an error when *not* verifying. Clearly more test suite coverage is needed to avoid introducing this sort of problem in the future. GnuPG-bug-id: 3464 Signed-off-by: Daniel Kahn Gillmor <d...@fifthhorseman.net> --- src/engine-gpg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/engine-gpg.c b/src/engine-gpg.c index 5c335cb2..223404ed 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -1717,12 +1717,15 @@ gpg_decrypt (void *engine, strlen (override_session_key), 1); if (!err) { - /* We add --no-keyring because a keyring is not required - * when we are overriding the session key. It would + /* When we are not trying to verify signatures as well, + * we add --no-keyring because a keyring is not required + * for decryption when overriding the session key. It would * work without that option but --no-keyring avoids that * gpg return a failure due to a missing key log_error() * diagnostic. --no-keyring is supported since 2.1.14. */ - err = add_arg (gpg, "--no-keyring"); + + if (!(flags & GPGME_DECRYPT_VERIFY)) + err = add_arg (gpg, "--no-keyring"); if (!err) err = add_arg (gpg, "--override-session-key-fd"); if (!err) -- 2.27.0
