Update gnupg, libgpg-error, libkleo
authorAndre Heinecke <aheinecke@intevation.de>
Thu, 12 Apr 2018 07:14:55 +0000 (09:14 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Thu, 12 Apr 2018 07:14:55 +0000 (09:14 +0200)
* Makefile.am (EXTRA_DIST): Remove obsolete patches.
* packages/packages.current: Update.
* patches/: Remove gpgex and libgpg-error patches

--
This also fixes the checksum for gpgex which was taken
from the swdb.lst

Makefile.am
packages/packages.current
patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch [deleted file]
patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch [deleted file]
patches/libgpg-error-1.28/0001-core-Fix-building-on-W64.patch [deleted file]

index 53bdf5b..5e4e822 100644 (file)
@@ -44,9 +44,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
         patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
         patches/kleopatra/fix-qt5.6-build.patch \
-        patches/libgpg-error-1.28/0001-core-Fix-building-on-W64.patch \
-        patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch \
-        patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch \
         patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
         patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch
 
index 3a55d41..e0951a9 100644 (file)
@@ -256,7 +256,7 @@ server http://files.gpg4win.org/src
 # by: ah
 # verified: Sig 5B80 C575 4298 F0CB  55D8 ED6A BCEF 7E29 4B09 2E28
 file gpgex/gpgex-1.0.6.tar.bz2
-chk  8cb429bfcf1e938fa4ef8953e0eb2eff88848d883afcf66fdf5fa67ef01ed424
+chk  d69898d1022400bd09bb684080edc95be554af736ae9c014df73543f34f7481b
 
 #
 # Pth emulation
@@ -286,25 +286,25 @@ chk  c2a9b3aec1a38d34b66106116a39f64b01d84f475fef75c40ea0bda0ea67ed07
 # D869 2123 C406 5DEA 5E0F  3AB5 249B 39D2 4F25 E3B6
 server ftp://ftp.gnupg.org/gcrypt
 
-# last-changed: 2018-03-15
+# last-changed: 2018-04-12
 # by: ah
-file libgpg-error/libgpg-error-1.28.tar.bz2
-chk  3edb957744905412f30de3e25da18682cbe509541e18cd3b8f9df695a075da49
+file libgpg-error/libgpg-error-1.29.tar.bz2
+chk  ece926fa5719d17a7ad8da618712cfa2f8a796ab2f2af9d544c5bb093383b1ea
 
 # last-changed: 2017-12-07
 # by: ah
 file libassuan/libassuan-2.5.1.tar.bz2
 chk  47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449
 
-# last changed: 2018-03-06
+# last changed: 2018-04-12
 # by: ah
-name gnupg-w32-2.2.5-20180222-bin.exe
-file binary/gnupg-w32-2.2.5_20180222.exe
-chk  9fea4add738a373b3c1a304f74eec2d24a8f5fe7ccdf1d8ee090d99de8f51257
+name gnupg-w32-2.2.6-20180409-bin.exe
+file binary/gnupg-w32-2.2.6_20180409.exe
+chk  5d426b19d9cc3d7d3c0db0dfb58af1b6a36f4ea1cfd55901bb6864e865fcccc6
 
-name gnupg-w32-2.2.5-20180222-src.tar.xz
-file binary/gnupg-w32-2.2.5_20180222.tar.xz
-chk  9afdeb9790aaa5b55bca44b837efbe971eeea19dc40a78ff53c62de0f3e9e10a
+name gnupg-w32-2.2.6-20180409-src.tar.xz
+file binary/gnupg-w32-2.2.6_20180409.tar.xz
+chk  559262de070e3b58dd031ce6becc164147009c3676fb8155bcb693ed26db8556
 
 # TODO back to stable
 # last changed: 2017-12-05
@@ -542,8 +542,8 @@ chk  89d6696ce5cc513de2fc42972411df94eb4e6d8c77b579634dc3737e274bac51
 # last changed: see package date.
 # by: ah
 # verified: Tarball created by ah.
-file libkleo/libkleo-201804051435.tar.gz
-chk 7367201211e9f2026cf42370ab9445c3ce40ae53b888c46735878e493cd2eac0
+file libkleo/libkleo-201804120859.tar.gz
+chk caa04fd3fee76d772f4186df8ab358e59ed95d16556679326101d32335f7b63e
 
 # KDE-L10n
 # last changed: see package date.
diff --git a/patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch b/patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch
deleted file mode 100755 (executable)
index 9052ed3..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 5c19ffe9d71d6e6763d6e47a67f1ca0a1651e39f Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@intevation.de>
-Date: Tue, 28 Jun 2016 11:00:53 +0200
-Subject: [PATCH] Prefer kleowrapped / gpgwrapped binaries
-
-* src/client.cc (default_uiserver_cmdline): Prefer non "bin" prefixed
-paths.
-
---
-With Gpg4win-2.x we need to start the "wrapped" binaries if they
-don't exist we are probably in gpg4win-3.x and can fall back to
-the binaries in the bin subdirectory.
----
- src/client.cc | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/client.cc b/src/client.cc
-index ebf82a8..6f27175 100644
---- a/src/client.cc
-+++ b/src/client.cc
-@@ -111,12 +111,12 @@ default_uiserver_cmdline (void)
-       const char *dir, *tmp;
-       char *uiserver, *p;
-       int extra_arglen = 9;
--      const char * server_names[] = {"bin\\kleopatra.exe",
--                                     "kleopatra.exe",
--                                     "bin\\launch-gpa.exe",
-+      const char * server_names[] = {"kleopatra.exe",
-+                                     "bin\\kleopatra.exe",
-                                      "launch-gpa.exe",
--                                     "bin\\gpa.exe",
-+                                     "bin\\launch-gpa.exe",
-                                      "gpa.exe",
-+                                     "bin\\gpa.exe",
-                                      NULL};
-
-       dir = gpgex_server::root_dir;
---
-2.1.4
diff --git a/patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch b/patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch
deleted file mode 100755 (executable)
index 66d2484..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 3dddfb2546b839e104286767f504e456ae91df45 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@intevation.de>
-Date: Thu, 11 Aug 2016 15:45:49 +0200
-Subject: [PATCH] Fix loop logic error in new server name detection
-
-* src/client.cc (default_uiserver_cmdline): Iterate over server_names
-array and not over the first server name itself.
----
- src/client.cc | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/client.cc b/src/client.cc
-index 6f27175..ccfa0ac 100644
---- a/src/client.cc
-+++ b/src/client.cc
-@@ -108,7 +108,7 @@ default_uiserver_cmdline (void)
-     }
- #else /*!ENABLE_GPA_ONLY*/
-     {
--      const char *dir, *tmp;
-+      const char *dir, **tmp;
-       char *uiserver, *p;
-       int extra_arglen = 9;
-       const char * server_names[] = {"kleopatra.exe",
-@@ -163,16 +163,16 @@ default_uiserver_cmdline (void)
-           return name;
-         }
-       /* Fallbacks */
--      for (tmp = *server_names; *tmp; tmp++)
-+      for (tmp = server_names; *tmp; tmp++)
-         {
-           if (name)
-             {
-               free (name);
-             }
--          name = (char*) malloc (strlen (dir) + strlen (tmp) + extra_arglen + 2);
-+          name = (char*) malloc (strlen (dir) + strlen (*tmp) + extra_arglen + 2);
-           if (!name)
-             return NULL;
--          strcpy (stpcpy (stpcpy (name, dir), "\\"), tmp);
-+          strcpy (stpcpy (stpcpy (name, dir), "\\"), *tmp);
-           for (p = name; *p; p++)
-             if (*p == '/')
-               *p = '\\';
---
-2.1.4
diff --git a/patches/libgpg-error-1.28/0001-core-Fix-building-on-W64.patch b/patches/libgpg-error-1.28/0001-core-Fix-building-on-W64.patch
deleted file mode 100755 (executable)
index 553ea4b..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From c36a60687976d98b54dac17f699dfca4918a737c Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Wed, 14 Mar 2018 10:07:42 +0100
-Subject: [PATCH Libgpg-error] core: Fix building on W64
-
-* src/w32-add.h: Remove hack to define pid_t.
-* src/gpg-error.h.in: Eval macro to define pid_t.
-* src/mkheader.c (have_sys_types_h, sys_types_h_included): New.
-(parse_config_h): Test for sys/types.h.
-(write_special): Protect inclusion of sys/types.h.  Define new macro
-'define:pid_t'.
---
-
-Regression-due-to: 1865c0ba1769b407a3c504f1ab0a4278704a9fc1
-Signed-off-by: Werner Koch <wk@gnupg.org>
----
- src/gpg-error.h.in |  1 +
- src/mkheader.c     | 36 ++++++++++++++++++++++++++++++++++--
- src/w32-add.h      |  4 ----
- 3 files changed, 35 insertions(+), 6 deletions(-)
-
-diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in
-index f942098..cc2e361 100644
---- a/src/gpg-error.h.in
-+++ b/src/gpg-error.h.in
-@@ -405,6 +405,7 @@ const char *gpgrt_check_version (const char *req_version);
- const char *gpg_error_check_version (const char *req_version);
-
- /* System specific type definitions.  */
-+@define:pid_t@
- @define:gpgrt_ssize_t@
- @define:gpgrt_off_t@
-
-diff --git a/src/mkheader.c b/src/mkheader.c
-index 997cab5..2fc5fad 100644
---- a/src/mkheader.c
-+++ b/src/mkheader.c
-@@ -30,6 +30,7 @@ static const char *hdr_version_number;
-
- /* Values take from the supplied config.h.  */
- static int have_stdint_h;
-+static int have_sys_types_h;
- static int have_w32_system;
- static int have_w64_system;
- static char *replacement_for_off_type;
-@@ -37,6 +38,7 @@ static int use_posix_threads;
-
- /* Various state flags.  */
- static int stdint_h_included;
-+static int sys_types_h_included;
-
-
- /* The usual free wrapper.  */
-@@ -151,6 +153,8 @@ parse_config_h (const char *fname)
-         continue; /* oops */
-       if (!strcmp (p1, "HAVE_STDINT_H"))
-         have_stdint_h = 1;
-+      else if (!strcmp (p1, "HAVE_SYS_TYPES_H"))
-+        have_sys_types_h = 1;
-       else if (!strcmp (p1, "HAVE_W32_SYSTEM"))
-         have_w32_system = 1;
-       else if (!strcmp (p1, "HAVE_W64_SYSTEM"))
-@@ -474,8 +478,12 @@ write_special (const char *fname, int lnr, const char *tag)
-         }
-       else
-         {
--          fputs ("#include <sys/types.h>\n"
--                 "typedef ssize_t gpgrt_ssize_t;\n", stdout);
-+          if (!sys_types_h_included)
-+            {
-+              fputs ("#include <sys/types.h>\n", stdout);
-+              sys_types_h_included = 1;
-+            }
-+          fputs ("typedef ssize_t gpgrt_ssize_t;\n", stdout);
-         }
-     }
-   else if (!strcmp (tag, "api_ssize_t"))
-@@ -485,6 +493,30 @@ write_special (const char *fname, int lnr, const char *tag)
-       else
-         fputs ("ssize_t", stdout);
-     }
-+  else if (!strcmp (tag, "define:pid_t"))
-+    {
-+      if (have_sys_types_h)
-+        {
-+          if (!sys_types_h_included)
-+            {
-+              fputs ("#include <sys/types.h>\n", stdout);
-+              sys_types_h_included = 1;
-+            }
-+        }
-+      else if (have_w64_system)
-+        {
-+          if (!stdint_h_included && have_stdint_h)
-+            {
-+              fputs ("#include <stdint.h>\n", stdout);
-+              stdint_h_included = 1;
-+            }
-+          fputs ("typedef int64_t pid_t\n", stdout);
-+        }
-+      else
-+        {
-+          fputs ("typedef int     pid_t\n", stdout);
-+        }
-+    }
-   else if (!strcmp (tag, "include:err-sources"))
-     {
-       write_sources_or_codes (NULL);
-diff --git a/src/w32-add.h b/src/w32-add.h
-index 6f9f12a..07e3c7d 100644
---- a/src/w32-add.h
-+++ b/src/w32-add.h
-@@ -3,10 +3,6 @@
- ## peculiarity of the script the first used line must not
- ## start with a hash mark.
-
--/* Fixme: This is a quick hack.  We need to check whether the compiler
-- * actually in use already knows that type.  */
--typedef int pid_t;
--
- /* Decide whether to use the format_arg attribute.  */
- #if _GPG_ERR_GCC_VERSION > 20800
- # define _GPG_ERR_ATTR_FORMAT_ARG(a)  __attribute__ ((__format_arg__ (a)))
---
-2.11.0