Browse Source

n/gpgme: Applied patch for GnuPG >= 2.2.6.

slackware-14.2
Damien Goutte-Gattat 4 years ago
parent
commit
b947ffa260
  1. 45
      n/gpgme/gpgme-1.10.0-tweak-STATUS_FAILURE-handling.patch
  2. 5
      n/gpgme/gpgme.SlackBuild

45
n/gpgme/gpgme-1.10.0-tweak-STATUS_FAILURE-handling.patch

@ -0,0 +1,45 @@
From 9aa33a99701e189d7fc0ff7322fc9e21e35b73fa Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@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 <wk@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 817c569..8269ce2 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.8.1

5
n/gpgme/gpgme.SlackBuild

@ -34,7 +34,7 @@ WGET=${WGET:-https://www.gnupg.org/ftp/gcrypt/gpgme/$ARCHIVE}
# Build infos
NAMEPKG=${NAMEPKG:-gpgme}
BUILD=${BUILD:-2GGD}
BUILD=${BUILD:-3GGD}
ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
JOBS=${JOBS:-1}
EXT=${EXT:-txz}
@ -85,6 +85,9 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
# Apply wk's patch for GnuPG >= 2.2.6
# https://lists.gnupg.org/pipermail/gnupg-users/2018-April/060230.html
patch -p 1 < $CWD/gpgme-1.10.0-tweak-STATUS_FAILURE-handling.patch
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
./configure \

Loading…
Cancel
Save