gpg4libre: update gpgme, libassuan and libgpg-error

seen upstream & removed here:

- external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch
- external/gpgmepp/version.patch
- external/libgpg-error/clang-cl.patch
- external/libgpg-error/libgpg-error_gawk5.patch

Change-Id: Iea2b681fa839ae55cb954c2ad3edf4291b149dbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/61322
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

10 files changed, 44 insertions, 58 deletions

diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk b/external/gpgmepp/ExternalPackage_gpgmepp.mk
index 8253f663e50c..f8d19f39a067 100644
--- a/external/gpgmepp/ExternalPackage_gpgmepp.mk
+++ b/external/gpgmepp/ExternalPackage_gpgmepp.mk
@@ -15,8 +15,8 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.4.0))
-$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.18.0))
+$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.10.0))
+$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.22.1))
 
 else ifeq ($(OS),MACOSX)
 
diff --git a/external/gpgmepp/Library_gpgmepp.mk b/external/gpgmepp/Library_gpgmepp.mk
index a7d0ba349c9b..f60301a4eb0d 100644
--- a/external/gpgmepp/Library_gpgmepp.mk
+++ b/external/gpgmepp/Library_gpgmepp.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Library_set_include,gpgmepp,\
     -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/interfaces \
     -I$(call gb_UnpackedTarball_get_dir,gpgmepp) \
     -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
+    -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/conf \
     -I$(call gb_UnpackedTarball_get_dir,libgpg-error)/src \
     $$(INCLUDE) \
 ))
diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
index 1b0468fc6f23..681731506f28 100644
--- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
+++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
@@ -13,10 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,gpgmepp,$(GPGME_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,gpgmepp,0))
 
-# * external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch upstreamed at
-#   <https://dev.gnupg.org/T4471> "No gpgmepp API to call gpgme_set_global_flag"
-# * external/gpgmepp/version.patch upstream at <https://dev.gnupg.org/T4168> "gpgme: `make dist`
-#   introduced VERSION can clash with new C++ <version>":
 $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
     external/gpgmepp/find-libgpg-error-libassuan.patch \
     external/gpgmepp/fix-autoconf-macros.patch \
@@ -27,11 +23,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
     $(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-libtool.patch.1) \
     $(if $(filter MSC,$(COM)),external/gpgmepp/w32-add-initializer.patch.1) \
     external/gpgmepp/w32-build-fixes-2.patch \
-    external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch \
     $(if $(filter LINUX,$(OS)),external/gpgmepp/asan.patch) \
     $(if $(filter LINUX,$(OS)),external/gpgmepp/rpath.patch) \
     external/gpgmepp/gcc9.patch \
-    external/gpgmepp/version.patch \
     external/gpgmepp/ubsan.patch \
 ))
 # vim: set noet sw=4 ts=4:
diff --git a/external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch b/external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch
deleted file mode 100644
index fade88a3e2b2..000000000000
--- a/external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur lang/cpp/src/context.cpp.old lang/cpp/src/context.cpp
---- lang/cpp/src/context.cpp.old	2019-04-20 16:03:09.575605300 +0300
-+++ lang/cpp/src/context.cpp	2019-04-20 16:06:43.078419700 +0300
-@@ -1656,6 +1656,11 @@
-     return Error(gpgme_engine_check_version(p));
- }
- 
-+int GpgME::setGlobalFlag(const char *name, const char *value)
-+{
-+    return gpgme_set_global_flag(name, value);
-+}
-+
- static const unsigned long supported_features = 0
-         | GpgME::ValidatingKeylistModeFeature
-         | GpgME::CancelOperationFeature
-diff -ur lang/cpp/src/global.h lang/cpp/src/global.h
---- lang/cpp/src/global.h.old	2016-09-07 09:48:44.000000000 +0300
-+++ lang/cpp/src/global.h	2019-04-20 16:06:41.918912600 +0300
-@@ -95,6 +95,8 @@
- GPGMEPP_EXPORT Error checkEngine(Protocol proto);
- GPGMEPP_EXPORT Error checkEngine(Engine engine);
- 
-+GPGMEPP_EXPORT int setGlobalFlag(const char *name, const char *value);
-+
- GPGMEPP_EXPORT GIOChannel *getGIOChannel(int fd);
- GPGMEPP_EXPORT QIODevice   *getQIODevice(int fd);
- 
diff --git a/external/gpgmepp/add-minimal-keyexport.patch b/external/gpgmepp/add-minimal-keyexport.patch
index abaeb15897fc..d163ef814917 100644
--- a/external/gpgmepp/add-minimal-keyexport.patch
+++ b/external/gpgmepp/add-minimal-keyexport.patch
@@ -26,8 +26,8 @@
  {
      d->lastop = Private::Export;
      Data::Private *const dp = keyData.impl();
--    return Error(d->lasterr = gpgme_op_export(d->ctx, pattern, 0, dp ? dp->data : 0));
-+    return Error(d->lasterr = gpgme_op_export(d->ctx, pattern, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : 0));
+-    return Error(d->lasterr = gpgme_op_export(d->ctx, pattern, 0, dp ? dp->data : nullptr));
++    return Error(d->lasterr = gpgme_op_export(d->ctx, pattern, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : nullptr));
  }
  
 -Error Context::exportPublicKeys(const char *patterns[], Data &keyData)
@@ -39,8 +39,8 @@
      }
  #endif
      Data::Private *const dp = keyData.impl();
--    return Error(d->lasterr = gpgme_op_export_ext(d->ctx, patterns, 0, dp ? dp->data : 0));
-+    return Error(d->lasterr = gpgme_op_export_ext(d->ctx, patterns, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : 0));
+-    return Error(d->lasterr = gpgme_op_export_ext(d->ctx, patterns, 0, dp ? dp->data : nullptr));
++    return Error(d->lasterr = gpgme_op_export_ext(d->ctx, patterns, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : nullptr));
  }
  
 -Error Context::startPublicKeyExport(const char *pattern, Data &keyData)
@@ -48,8 +48,8 @@
  {
      d->lastop = Private::Export;
      Data::Private *const dp = keyData.impl();
--    return Error(d->lasterr = gpgme_op_export_start(d->ctx, pattern, 0, dp ? dp->data : 0));
-+    return Error(d->lasterr = gpgme_op_export_start(d->ctx, pattern, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : 0));
+-    return Error(d->lasterr = gpgme_op_export_start(d->ctx, pattern, 0, dp ? dp->data : nullptr));
++    return Error(d->lasterr = gpgme_op_export_start(d->ctx, pattern, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : nullptr));
  }
  
 -Error Context::startPublicKeyExport(const char *patterns[], Data &keyData)
@@ -61,8 +61,8 @@
      }
  #endif
      Data::Private *const dp = keyData.impl();
--    return Error(d->lasterr = gpgme_op_export_ext_start(d->ctx, patterns, 0, dp ? dp->data : 0));
-+    return Error(d->lasterr = gpgme_op_export_ext_start(d->ctx, patterns, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : 0));
+-    return Error(d->lasterr = gpgme_op_export_ext_start(d->ctx, patterns, 0, dp ? dp->data : nullptr));
++    return Error(d->lasterr = gpgme_op_export_ext_start(d->ctx, patterns, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : nullptr));
  }
  
  ImportResult Context::importKeys(const Data &data)
diff --git a/external/gpgmepp/find-libgpg-error-libassuan.patch b/external/gpgmepp/find-libgpg-error-libassuan.patch
index 2ddd4d2f2e62..98e0941bb26a 100644
--- a/external/gpgmepp/find-libgpg-error-libassuan.patch
+++ b/external/gpgmepp/find-libgpg-error-libassuan.patch
@@ -44,15 +44,27 @@ diff --git a/src/Makefile.am b/src/Makefile.am
 index ce6f1d4..6b1d835 100644
 --- src/Makefile.am
 +++ src/Makefile.am
-@@ -97,10 +97,10 @@ endif
+@@ -26,7 +26,7 @@
+ m4data_DATA = gpgme.m4
+ nodist_include_HEADERS = gpgme.h
  
- # We use a global CFLAGS setting for all library
+-bin_PROGRAMS = gpgme-tool gpgme-json
++bin_PROGRAMS = gpgme-tool
+ 
+ if BUILD_W32_GLIB
+ ltlib_gpgme_glib = libgpgme-glib.la
+@@ -97,13 +97,10 @@
+ 
+ # We use a global CFLAGS setting for all libraries
  # versions, because then every object file is only compiled once.
 -AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GLIB_CFLAGS@
 +AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@ @GLIB_CFLAGS@
  
  gpgme_tool_SOURCES = gpgme-tool.c argparse.c argparse.h
 -gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
+-
+-gpgme_json_SOURCES = gpgme-json.c cJSON.c cJSON.h
+-gpgme_json_LDADD = -lm libgpgme.la $(GPG_ERROR_LIBS)
 +gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
  
  
diff --git a/external/gpgmepp/fix-autoconf-macros.patch b/external/gpgmepp/fix-autoconf-macros.patch
index 627c7b15247a..e333168b2b33 100644
--- a/external/gpgmepp/fix-autoconf-macros.patch
+++ b/external/gpgmepp/fix-autoconf-macros.patch
@@ -2,21 +2,21 @@ diff -ur gpgme.org/configure.ac gpgme/configure.ac
 --- configure.ac	2017-02-16 15:18:45.051417378 +0100
 +++ configure.ac~	2017-02-16 15:20:03.635059285 +0100
 @@ -35,6 +35,11 @@
- # decimalized short revision number, a beta version string, and a flag
- # indicating a development version (mym4_isgit). Note that the m4
- # processing is done by autoconf and not during the configure run.
+ # the decimalized short revision number, a beta version string and a
+ # flag indicating a development version (mym4_isbeta).  Note that the
+ # m4 processing is done by autoconf and not during the configure run.
 +m4_define([m4_chomp_all],
 +[m4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [
 +/], [/ ]), [/*$]), [$1])])
 +
 +m4_define([m4_esyscmd_s], [m4_chomp_all(m4_esyscmd([$1]))])
- m4_define(mym4_version,
-           [mym4_version_major.mym4_version_minor.mym4_version_micro])
- m4_define([mym4_revision],
+ m4_define([mym4_verslist], m4_split(m4_esyscmd([./autogen.sh --find-version] \
+                            mym4_package mym4_major mym4_minor mym4_micro),[:]))
+ m4_define([mym4_isbeta],       m4_argn(2, mym4_verslist))
 @@ -90,7 +90,22 @@
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_SRCDIR(src/gpgme.h.in)
- AC_CONFIG_HEADER(config.h)
+ AC_CONFIG_HEADER(conf/config.h)
 -AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
 +
 +dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
diff --git a/external/gpgmepp/version.patch b/external/gpgmepp/version.patch
deleted file mode 100644
index 21d3b680c2ac..000000000000
--- a/external/gpgmepp/version.patch
+++ /dev/null
@@ -1,4 +0,0 @@
---- VERSION
-+++ /dev/null
-@@ -1,1 +0,0 @@
--1.9.0
diff --git a/external/gpgmepp/w32-build-fixes-2.patch b/external/gpgmepp/w32-build-fixes-2.patch
index 062c14409cbc..09c23c0649d5 100644
--- a/external/gpgmepp/w32-build-fixes-2.patch
+++ b/external/gpgmepp/w32-build-fixes-2.patch
@@ -10,3 +10,13 @@ Avoid MFC dependency - can go with very basic includes instead
  
  
  VS_VERSION_INFO VERSIONINFO
+--- lang/cpp/src/importresult.cpp~	2020-06-11 16:00:46.410830500 +0200
++++ lang/cpp/src/importresult.cpp	2020-06-11 16:00:25.987900000 +0200
+@@ -35,7 +35,6 @@
+ #include <cstring>
+ 
+ #include <string.h>
+-#include <strings.h>
+ #include <istream>
+ #include <iterator>
+ 
diff --git a/external/gpgmepp/w32-disable-docs.patch.1 b/external/gpgmepp/w32-disable-docs.patch.1
index 603122131ea3..2c307f502b63 100644
--- a/external/gpgmepp/w32-disable-docs.patch.1
+++ b/external/gpgmepp/w32-disable-docs.patch.1
@@ -11,5 +11,5 @@ diff -ur gpgmepp.org/Makefile.am gpgmepp/Makefile.am
 -SUBDIRS = src ${tests} doc lang
 +SUBDIRS = src ${tests} lang
  
- # Fix the version of the spec file and create a file named VERSION
- # to be used for patch's Prereq: feature.
+ # Fix the version of the spec file.
+ dist-hook: gen-ChangeLog