Update gpgme to 1.5.3
authorAndre Heinecke <aheinecke@intevation.de>
Mon, 9 Mar 2015 10:21:36 +0000 (11:21 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Mon, 9 Mar 2015 10:21:36 +0000 (11:21 +0100)
* packages/packages.current (gpgme): Update.
* patches/gpgme-1.5.1: Removed patch included upstream.

Makefile.am
packages/packages.current
patches/gpgme-1.5.1/0001-Handle-modern-keyserver-output-which-may-emit-the-fi.patch [deleted file]

index 16f2984..6b05d6a 100644 (file)
@@ -56,7 +56,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/gpa-0.9.4/03-homedir-via-gpgconf.patch \
         patches/gpa-0.9.4/04-utf-clip-crash.patch \
         patches/gpa-0.9.4/05-event-done.patch \
-        patches/gpgme-1.5.1/0001-Handle-modern-keyserver-output-which-may-emit-the-fi.patch \
         patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build \
         patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch \
         patches/pthreads-w32-2-8-0-release/01-make.patch \
index 34be6df..0ec1943 100644 (file)
@@ -439,9 +439,11 @@ chk  f8e5c774c35fbb91d84e82559baf76f6b4513236
 file scute/scute-1.4.0.tar.bz2
 chk  e28141d2b03612c09512651795976c58ed3f8035
 
-# checked: 2014-11-21 ah - updated
-file gpgme/gpgme-1.5.1.tar.bz2
-chk  a91c258e79acf30ec86a667e07f835e5e79342d8
+# last changed: 2015-03-09
+# by: ah
+# verified: Sig D869 2123 C406 5DEA 5E0F  3AB5 249B 39D2 4F25 E3B6
+file gpgme/gpgme-1.5.3.tar.bz2
+chk  8dd7711a4de117994fe2d45879ef8a9900d50f6a
 
 # checked: 2014-11-21 ah - updated
 file gpa/gpa-0.9.6.tar.bz2
diff --git a/patches/gpgme-1.5.1/0001-Handle-modern-keyserver-output-which-may-emit-the-fi.patch b/patches/gpgme-1.5.1/0001-Handle-modern-keyserver-output-which-may-emit-the-fi.patch
deleted file mode 100755 (executable)
index ff5beb7..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /bin/sh
-patch -p1 -f -l $* < $0
-exit $?
-
-From 7a0e7f93f727e82d9404655b96abb0a8558cb2e5 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Tue, 12 Aug 2014 10:36:30 +0200
-Subject: [PATCH] Handle modern keyserver output which may emit the
- fingerprint.
-
-* src/engine-gpg.c (read_colon_line): Split preprocessed lines.
-(gpg_keylist_preprocess): Limit keyid field and print fingerprint.
----
- src/engine-gpg.c | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 44 insertions(+), 9 deletions(-)
-
-diff --git a/src/engine-gpg.c b/src/engine-gpg.c
-index 36f035a..924ba44 100644
---- a/src/engine-gpg.c
-+++ b/src/engine-gpg.c
-@@ -1237,10 +1237,26 @@ read_colon_line (engine_gpg_t gpg)
-                   }
-
-                 assert (gpg->colon.fnc);
--                gpg->colon.fnc (gpg->colon.fnc_value, line ? line : buffer);
--                if (line)
--                  free (line);
--              }
-+                  if (line)
-+                    {
-+                      char *linep = line;
-+                      char *endp;
-+
-+                      do
-+                        {
-+                          endp = strchr (linep, '\n');
-+                          if (endp)
-+                            *endp++ = 0;
-+                          gpg->colon.fnc (gpg->colon.fnc_value, linep);
-+                          linep = endp;
-+                        }
-+                      while (linep && *linep);
-+
-+                      free (line);
-+                    }
-+                  else
-+                    gpg->colon.fnc (gpg->colon.fnc_value, buffer);
-+                }
-
-             /* To reuse the buffer for the next line we have to
-                shift the remaining data to the buffer start and
-@@ -2059,6 +2075,7 @@ gpg_keylist_preprocess (char *line, char **r_line)
- #define NR_FIELDS 16
-   char *field[NR_FIELDS];
-   int fields = 0;
-+  size_t n;
-
-   *r_line = NULL;
-
-@@ -2094,16 +2111,34 @@ gpg_keylist_preprocess (char *line, char **r_line)
-        pub:<keyid>:<algo>:<keylen>:<creationdate>:<expirationdate>:<flags>
-
-        as defined in 5.2. Machine Readable Indexes of the OpenPGP
--       HTTP Keyserver Protocol (draft).
-+       HTTP Keyserver Protocol (draft).  Modern versions of the SKS
-+       keyserver return the fingerprint instead of the keyid.  We
-+       detect this here and use the v4 fingerprint format to convert
-+       it to a key id.
-
-        We want:
-        pub:o<flags>:<keylen>:<algo>:<keyid>:<creatdate>:<expdate>::::::::
-       */
-
--      if (asprintf (r_line, "pub:o%s:%s:%s:%s:%s:%s::::::::",
--                  field[6], field[3], field[2], field[1],
--                  field[4], field[5]) < 0)
--      return gpg_error_from_syserror ();
-+      n = strlen (field[1]);
-+      if (n > 16)
-+        {
-+          if (asprintf (r_line,
-+                        "pub:o%s:%s:%s:%s:%s:%s::::::::\n"
-+                        "fpr:::::::::%s:",
-+                        field[6], field[3], field[2], field[1] + n - 16,
-+                        field[4], field[5], field[1]) < 0)
-+            return gpg_error_from_syserror ();
-+        }
-+      else
-+        {
-+          if (asprintf (r_line,
-+                        "pub:o%s:%s:%s:%s:%s:%s::::::::",
-+                        field[6], field[3], field[2], field[1],
-+                        field[4], field[5]) < 0)
-+            return gpg_error_from_syserror ();
-+        }
-+
-       return 0;
-
-     case RT_UID:
---
-1.9.1