diff options
| -rw-r--r-- | groups/241.native_packages_inet.group | 4 | ||||
| -rw-r--r-- | patches/gnupg-2.3.8.local.patch | 13 | ||||
| -rw-r--r-- | patches/gnupg-2.3.8_pre.local.patch | 21 |
3 files changed, 36 insertions, 2 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index 860ce3f7..c6b68bf0 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -75,8 +75,8 @@ ac_cv_snprintf_returns_bogus=0"}; : ${PKG_GIT_MAKEFLAGS_INSTALL:="CFLAGS=-std=gnu99 CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config CURLDIR=${PREFIX_NATIVE} HAVE_DEV_TTY=yes NO_GETTEXT=yes NO_REGEX=yes NO_PERL=yes NO_PYTHON=yes NO_TCLTK=yes"}; : ${PKG_GIT_SUBDIR:=git-${PKG_GIT_VERSION}}; : ${PKG_GNUPG_DEPENDS:="libassuan libgcrypt libgpg_error libksba npth sqlite3"}; -: ${PKG_GNUPG_SHA256SUM:=ee163a5fb9ec99ffc1b18e65faef8d086800c5713d15a672ab57d3799da83669}; -: ${PKG_GNUPG_VERSION:=2.3.7}; +: ${PKG_GNUPG_SHA256SUM:=540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed}; +: ${PKG_GNUPG_VERSION:=2.3.8}; : ${PKG_GNUPG_URL:=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${PKG_GNUPG_VERSION}.tar.bz2}; : ${PKG_GNUPG_CONFIGURE_ARGS_EXTRA:="--with-libgpg-error-prefix=${PREFIX_NATIVE} --with-libgcrypt-prefix=${PREFIX_NATIVE} --with-libassuan-prefix=${PREFIX_NATIVE} --with-ksba-prefix=${PREFIX_NATIVE} --with-npth-prefix=${PREFIX_NATIVE}"}; : ${PKG_GPGME_DEPENDS:="libassuan libgpg_error"}; diff --git a/patches/gnupg-2.3.8.local.patch b/patches/gnupg-2.3.8.local.patch new file mode 100644 index 00000000..7e2d9617 --- /dev/null +++ b/patches/gnupg-2.3.8.local.patch @@ -0,0 +1,13 @@ +diff -ru gnupg-2.3.8.orig/dirmngr/server.c gnupg-2.3.8/dirmngr/server.c +--- gnupg-2.3.8.orig/dirmngr/server.c 2022-10-07 15:23:50.000000000 +0200 ++++ gnupg-2.3.8/dirmngr/server.c 2022-10-22 15:52:13.224088828 +0200 +@@ -3137,7 +3137,9 @@ + ctrl->refcount); + else + { ++#if USE_LDAP + ks_ldap_free_state (ctrl->ks_get_state); ++#endif + ctrl->ks_get_state = NULL; + release_ctrl_ocsp_certs (ctrl); + xfree (ctrl->server_local); diff --git a/patches/gnupg-2.3.8_pre.local.patch b/patches/gnupg-2.3.8_pre.local.patch new file mode 100644 index 00000000..947bce1b --- /dev/null +++ b/patches/gnupg-2.3.8_pre.local.patch @@ -0,0 +1,21 @@ +diff -ru gnupg-2.3.8.orig/configure gnupg-2.3.8/configure +--- gnupg-2.3.8.orig/configure 2022-10-13 17:56:41.000000000 +0200 ++++ gnupg-2.3.8/configure 2022-10-22 15:45:44.541933579 +0200 +@@ -9004,7 +9004,7 @@ + + if test $ok = yes; then + LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags` +- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs` ++ LIBASSUAN_LIBS="-lassuan -lgpg-error" + have_libassuan=yes + else + LIBASSUAN_CFLAGS="" +@@ -9183,7 +9183,7 @@ + fi + if test $ok = yes; then + KSBA_CFLAGS=`$KSBA_CONFIG --cflags` +- KSBA_LIBS=`$KSBA_CONFIG --libs` ++ KSBA_LIBS="-lksba -lgpg-error -lnpth" + have_ksba=yes + if test -z "$use_gpgrt_config"; then + libksba_config_host=`$KSBA_CONFIG --host 2>/dev/null || echo none` |