Hello community,
here is the log from the commit of package gpgme for openSUSE:Factory checked
in at 2018-04-17 11:15:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gpgme (Old)
and /work/SRC/openSUSE:Factory/.gpgme.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpgme"
Tue Apr 17 11:15:21 2018 rev:72 rq:597146 version:1.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gpgme/gpgme.changes 2018-01-16
09:30:37.522668131 +0100
+++ /work/SRC/openSUSE:Factory/.gpgme.new/gpgme.changes 2018-04-17
11:15:22.600433789 +0200
@@ -1,0 +2,7 @@
+Mon Apr 16 13:22:48 UTC 2018 - astie...@suse.com
+
+- bsc#1089497: Address failure handling issues when using gpg 2.2.6
+ via gpgme, as used by libzypp
+ Add 0001-core-Tweak-STATUS_FAILURE-handling.patch
+
+-------------------------------------------------------------------
New:
----
0001-core-Tweak-STATUS_FAILURE-handling.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gpgme.spec ++++++
--- /var/tmp/diff_new_pack.SV53dF/_old 2018-04-17 11:15:23.160407531 +0200
+++ /var/tmp/diff_new_pack.SV53dF/_new 2018-04-17 11:15:23.164407344 +0200
@@ -33,6 +33,8 @@
Source3: gpgme.keyring
# used to have a fixed timestamp
Source99: %{name}.changes
+# PATCH-FIX-UPSTREAM 0001-core-Tweak-STATUS_FAILURE-handling.patch bsc#1089497
+Patch0: 0001-core-Tweak-STATUS_FAILURE-handling.patch
BuildRequires: gcc-c++
BuildRequires: gpg2 >= 2.0.10
BuildRequires: libassuan-devel >= 2.4.2
@@ -175,6 +177,7 @@
%prep
%setup -q
+%patch0 -p1
%build
build_timestamp=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE99})
++++++ 0001-core-Tweak-STATUS_FAILURE-handling.patch ++++++
>From 9aa33a99701e189d7fc0ff7322fc9e21e35b73fa Mon Sep 17 00:00:00 2001
From: Werner Koch <w...@gnupg.org>
Date: Thu, 12 Apr 2018 20:36:30 +0200
Subject: [PATCH] core: Tweak STATUS_FAILURE handling.
* src/op-support.c (_gpgme_parse_failure): Ignore failures with
location "gpg-exit".
--
Signed-off-by: Werner Koch <w...@gnupg.org>
---
src/op-support.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/op-support.c b/src/op-support.c
index 817c5691..8269ce21 100644
--- a/src/op-support.c
+++ b/src/op-support.c
@@ -398,7 +398,13 @@ _gpgme_parse_plaintext (char *args, char **filenamep)
/* Parse a FAILURE status line and return the error code. ARGS is
- modified to contain the location part. */
+ * modified to contain the location part. Note that for now we ignore
+ * failure codes with a location of gpg-exit; they are too trouble
+ * some. Instead we should eventually record that error in the
+ * context and provide a function to return a fuller error
+ * description; this could then also show the location of the error
+ * (e.g. "option- parser") to make it easier for the user to detect
+ * the actual error. */
gpgme_error_t
_gpgme_parse_failure (char *args)
{
@@ -416,6 +422,8 @@ _gpgme_parse_failure (char *args)
*where = '\0';
where = args;
+ if (!strcmp (where, "gpg-exit"))
+ return 0;
return atoi (which);
}
--
2.16.3
