Bump libgcrypt to v1.9.2

Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

2 files changed, 51 insertions, 37 deletions

diff --git a/patches/libgcrypt/1.8.7/libgcrypt-1.8.4-ac_cv_sys_symbol_underscore.patch b/patches/libgcrypt/1.8.7/libgcrypt-1.8.4-ac_cv_sys_symbol_underscore.patch
deleted file mode 100644
index d2bb5d1..0000000
--- a/patches/libgcrypt/1.8.7/libgcrypt-1.8.4-ac_cv_sys_symbol_underscore.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-fix incorrect setting of $ac_cv_sys_symbol_underscore.
-There is no reason not to AC_COMPILE and use the set cross-nm to look for
-the symbol mangling scheme. Thus it is incorrect to check for cross compilation
-in the GNUPG_SYS_SYMBOL_UNDERSCORE check.
-
-Origin:
-
-aldot at uclibc.org aldot at uclibc.org
-Wed Sep 19 12:20:53 UTC 2007
-
-http://lists.uclibc.org/pipermail/buildroot/2007-September/017322.html
-
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -76,13 +76,14 @@ case "${host}" in
-     i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp)
-         ac_cv_sys_symbol_underscore=yes
-         ;;
--    *)
--      if test "$cross_compiling" = yes; then
--        if test "x$ac_cv_sys_symbol_underscore" = x ; then
--           ac_cv_sys_symbol_underscore=yes
--        fi
--      else
--         tmp_do_check="yes"
-+    *) if test -z "$ac_cv_sys_symbol_underscore"; then
-+         if test "$cross_compiling" = yes; then
-+           if test "x$ac_cv_sys_symbol_underscore" = x ; then
-+              ac_cv_sys_symbol_underscore=yes
-+           fi
-+         else
-+            tmp_do_check="yes"
-+         fi
-       fi
-        ;;
- esac
- 
diff --git a/patches/libgcrypt/1.9.2/libgcrypt-1.92-use-pkg-config.patch b/patches/libgcrypt/1.9.2/libgcrypt-1.92-use-pkg-config.patch
new file mode 100644
index 0000000..c6b9c39
--- /dev/null
+++ b/patches/libgcrypt/1.9.2/libgcrypt-1.92-use-pkg-config.patch
@@ -0,0 +1,51 @@
+https://lists.gnupg.org/pipermail/gnupg-devel/2018-October/033985.html
+
+--- a/m4/gpg-error.m4
++++ b/m4/gpg-error.m4
+@@ -26,6 +26,7 @@ dnl is added to the gpg_config_script_warn variable.
+ dnl
+ AC_DEFUN([AM_PATH_GPG_ERROR],
+ [ AC_REQUIRE([AC_CANONICAL_HOST])
++  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+   gpg_error_config_prefix=""
+   dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
+   dnl since that is consistent with how our three siblings use the directory/
+@@ -41,6 +42,23 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
+   AC_ARG_WITH(gpg-error-prefix,,
+               [gpg_error_config_prefix="$withval"])
+ 
++  min_gpg_error_version=ifelse([$1], ,1.33,$1)
++
++  gpg_error_use_config=yes
++  if test x"${enable_pkg_config}" = xyes; then
++    PKG_CHECK_MODULES(
++      [GPG_ERROR],
++      [gpg-error >= $min_gpg_error_version],
++      [
++        gpg_error_use_config=no
++        PKG_CHECK_VAR([GPG_ERROR_MT_CFLAGS], [gpg-error], [mtcflags])
++        PKG_CHECK_VAR([GPG_ERROR_MT_LIBS], [gpg-error], [mtlibs])
++      ],
++      [:]
++    )
++  fi
++
++  if test x"${gpg_error_use_config}" = xyes; then
+   if test x"${GPG_ERROR_CONFIG}" = x ; then
+      if test x"${gpg_error_config_prefix}" != x ; then
+         GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
+@@ -61,7 +79,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
+   fi
+ 
+   AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
+-  min_gpg_error_version=ifelse([$1], ,1.33,$1)
+   ok=no
+ 
+   if test "$prefix" = NONE ; then
+@@ -185,4 +202,5 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
+   AC_SUBST(GPG_ERROR_LIBS)
+   AC_SUBST(GPG_ERROR_MT_CFLAGS)
+   AC_SUBST(GPG_ERROR_MT_LIBS)
++  fi
+ ])
+