[libgnutls] Update to 3.8.7.1 (#40472)

ports/libgnutls/compression-libs.diff

@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+index 95ec4c1..67fa771 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1157,6 +1157,8 @@ if test x$ac_brotli != xno; then
+     fi
+ else
+     AC_MSG_RESULT(no)
++    with_libbrotlienc=no
++    with_libbrotlidec=no
+ fi
+ AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" != "no" && test "$with_libbrotlidec" != "no")
+ 
+@@ -1202,6 +1204,7 @@ if test x$ac_zstd != xno; then
+     fi
+ else
+     AC_MSG_RESULT(no)
++    with_libzstd=no
+ fi
+ AM_CONDITIONAL(HAVE_LIBZSTD, test "$with_libzstd" != "no")
+ 

ports/libgnutls/link-zlib.patch

@@ -1,48 +0,0 @@
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index a50d311..0a8b711 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -158,6 +158,7 @@ libgnutls_la_LIBADD = ../gl/libgnu.la x509/libgnutls_x509.la \
- 	extras/libgnutls_extras.la
- thirdparty_libadd = $(LTLIBINTL) $(LIBSOCKET) $(LTLIBNSL) \
- 	$(P11_KIT_LIBS) $(LIB_SELECT) $(GNUTLS_LIBS_PRIVATE)
-+thirdparty_libadd += $(LTLIBZ)
- 
- if HAVE_LIBIDN2
- thirdparty_libadd += $(LIBIDN2_LIBS)
-diff --git a/lib/compress.c b/lib/compress.c
-index a0a7c69..ed2c743 100644
---- a/lib/compress.c
-+++ b/lib/compress.c
-@@ -59,16 +59,19 @@ static int (*_gnutls_zlib_uncompress)(Bytef *dest, uLongf *destLen,
- 
- static void zlib_deinit(void)
- {
-+#if 0 // using libdl
- #ifndef _WIN32
- 	if (_zlib_handle != NULL) {
- 		dlclose(_zlib_handle);
- 		_zlib_handle = NULL;
- 	}
- #endif /* _WIN32 */
-+#endif // using libdl
- }
- 
- static int zlib_init(void)
- {
-+#if 0 // using libdl
- #ifndef _WIN32
- 	if (_zlib_handle != NULL)
- 		return 0;
-@@ -90,6 +93,11 @@ error:
- #else
- 	return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
- #endif /* _WIN32 */
-+#else  // ^ using libdl | v not using libdl
-+	_gnutls_zlib_compressBound = &compressBound;
-+	_gnutls_zlib_compress = &compress;
-+	_gnutls_zlib_uncompress = &uncompress;
-+#endif // using libdl
- }
- #endif /* HAVE_LIBZ */
- 

ports/libgnutls/portfile.cmake

@@ -5,7 +5,7 @@ vcpkg_download_distfile(tarball
         "https://mirrors.dotsrc.org/gcrypt/gnutls/v${GNUTLS_BRANCH}/gnutls-${VERSION}.tar.xz"
         "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnutls/v${GNUTLS_BRANCH}/gnutls-${VERSION}.tar.xz"
     FILENAME "gnutls-${VERSION}.tar.xz"
-    SHA512 4bac1aa7ec1dce9b3445cc515cc287a5af032d34c207399aa9722e3dc53ed652f8a57cfbc9c5e40ccc4a2631245d89ab676e3ba2be9563f60ba855aaacb8e23c
+    SHA512 429cea78e227d838105791b28a18270c3d2418bfb951c322771e6323d5f712204d63d66a6606ce9604a92d236a8dd07d651232c717264472d27eb6de26ddc733
 )
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${tarball}"
@@ -13,7 +13,7 @@ vcpkg_extract_source_archive(SOURCE_PATH
     PATCHES
         ccasflags.patch
         use-gmp-pkgconfig.patch
-        link-zlib.patch   # directly as before 3.8.4
+        compression-libs.diff
 )
 
 vcpkg_list(SET options)
@@ -32,6 +32,10 @@ if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_list(APPEND options "LIBS=\$LIBS -liconv -lcharset") # for libunistring
 endif()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_list(APPEND options "ac_cv_dlopen_soname_works=no") # ensure vcpkg libs
+endif()
+
 set(ENV{GTKDOCIZE} true) # true, the program
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"

ports/libgnutls/use-gmp-pkgconfig.patch

@@ -1,8 +1,8 @@
 diff --git a/m4/hooks.m4 b/m4/hooks.m4
-index e1248c7..4656c3a 100644
+index e026dd1..cf6064c 100644
 --- a/m4/hooks.m4
 +++ b/m4/hooks.m4
-@@ -91,13 +91,14 @@ AC_MSG_ERROR([[
+@@ -91,6 +91,7 @@ AC_MSG_ERROR([[
        mini_nettle=$withval,
        mini_nettle=no)
  
@@ -10,11 +10,3 @@ index e1248c7..4656c3a 100644
    AC_ARG_VAR(GMP_CFLAGS, [C compiler flags for gmp])
    AC_ARG_VAR(GMP_LIBS, [linker flags for gmp])
    if test "$mini_nettle" != no;then
-     GMP_CFLAGS=""
-     GMP_LIBS=""
-   else
--    if test x$GMP_LIBS = x; then
-+    if test "x$GMP_LIBS" = "x"; then
- 	AC_CHECK_LIB(gmp, __gmpz_cmp, [GMP_LIBS="-lgmp"], [AC_MSG_ERROR([[
- ***
- *** gmp was not found.

ports/libgnutls/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "libgnutls",
-  "version": "3.8.5",
+  "version": "3.8.7.1",
-  "port-version": 1,
   "description": "A secure communications library implementing the SSL, TLS and DTLS protocols.",
   "homepage": "https://www.gnutls.org/",
   "license": null,

versions/baseline.json

@@ -4509,8 +4509,8 @@
       "port-version": 0
     },
     "libgnutls": {
-      "baseline": "3.8.5",
+      "baseline": "3.8.7.1",
-      "port-version": 1
+      "port-version": 0
     },
     "libgo": {
       "baseline": "3.1",

versions/l-/libgnutls.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ba7c9b755cc48b6ed880a9fc16a7c8d559a4894e",
+      "version": "3.8.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "d3b0c3c8e603b2cb67040ee657a859ac63dcce1a",
       "version": "3.8.5",