Merge pull request #18178 from phunkyfish/gnutls-nettle-bump

[depends] gnutls 3.6.14 and nettle 3.6 bump

7 files changed, 34 insertions, 9 deletions

diff --git a/tools/depends/target/curl/Makefile b/tools/depends/target/curl/Makefile
index eb02fe99e9..cea0a5e3aa 100644
--- a/tools/depends/target/curl/Makefile
+++ b/tools/depends/target/curl/Makefile
@@ -10,7 +10,7 @@ ARCHIVE=$(SOURCE).tar.bz2
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
           ./configure --prefix=$(PREFIX) --disable-shared --disable-ldap \
           --without-libssh2 --disable-ntlm-wb --enable-ipv6 --without-librtmp \
-          --with-ca-fallback --with-ssl=$(PREFIX) --with-nghttp2=$(PREFIX)
+          --without-libidn2 --with-ca-fallback --with-ssl=$(PREFIX) --with-nghttp2=$(PREFIX)
 
 LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a
 
diff --git a/tools/depends/target/gnutls/03-support-correct-cisdigit.patch b/tools/depends/target/gnutls/03-support-correct-cisdigit.patch
new file mode 100644
index 0000000000..66e55be91f
--- /dev/null
+++ b/tools/depends/target/gnutls/03-support-correct-cisdigit.patch
@@ -0,0 +1,10 @@
+--- a/gl/c-ctype.h
++++ b/gl/c-ctype.h
+@@ -229,6 +229,7 @@
+     }
+ }
+
++__attribute__((always_inline))
+ C_CTYPE_INLINE bool
+ c_isdigit (int c)
+ {
diff --git a/tools/depends/target/gnutls/Makefile b/tools/depends/target/gnutls/Makefile
index 13b05289ae..f34eacbb2a 100644
--- a/tools/depends/target/gnutls/Makefile
+++ b/tools/depends/target/gnutls/Makefile
@@ -1,9 +1,9 @@
 include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile size-max.patch add-dl-as-private-lib.patch
+DEPS= ../../Makefile.include Makefile size-max.patch add-dl-as-private-lib.patch 03-support-correct-cisdigit.patch
 
 # lib name, version
 LIBNAME=gnutls
-VERSION=3.6.11.1
+VERSION=3.6.14
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.xz
 
@@ -28,6 +28,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
 	cd $(PLATFORM); patch -p1 -i ../size-max.patch
 	cd $(PLATFORM); patch -p1 -i ../add-dl-as-private-lib.patch
+	cd $(PLATFORM); patch -p1 -i ../03-support-correct-cisdigit.patch
 	cd $(PLATFORM); $(AUTORECONF) -vif
 	cd $(PLATFORM); $(CONFIGURE)
 
diff --git a/tools/depends/target/gnutls/add-dl-as-private-lib.patch b/tools/depends/target/gnutls/add-dl-as-private-lib.patch
index 65d88657ad..d55e092026 100644
--- a/tools/depends/target/gnutls/add-dl-as-private-lib.patch
+++ b/tools/depends/target/gnutls/add-dl-as-private-lib.patch
@@ -1,11 +1,11 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -512,6 +512,9 @@
+@@ -547,6 +547,9 @@
  
  
  AC_LIB_HAVE_LINKFLAGS(dl,, [#include <dlfcn.h>], [dladdr (0, 0);])
 +if test "x$HAVE_LIBDL" = "xyes"; then
-+      AC_SUBST([LIBDL], [-ldl])
++  AC_SUBST([LIBDL], [-ldl])
 +fi
  
  AC_ARG_ENABLE(fips140-mode,
@@ -16,7 +16,7 @@
  URL: https://www.gnutls.org/
  Version: @VERSION@
  Libs: -L${libdir} -lgnutls
--Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@
-+Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ @LIBDL@
+-Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @LIB_CRYPT32@ @LIBNCRYPT@ @LIBBCRYPT@
++Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @LIB_CRYPT32@ @LIBNCRYPT@ @LIBBCRYPT@ @LIBDL@
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}
diff --git a/tools/depends/target/mariadb/02-symbol_rename-gnutls_clash.patch b/tools/depends/target/mariadb/02-symbol_rename-gnutls_clash.patch
new file mode 100644
index 0000000000..6919ac4d8b
--- /dev/null
+++ b/tools/depends/target/mariadb/02-symbol_rename-gnutls_clash.patch
@@ -0,0 +1,13 @@
+--- a/include/ma_hash.h
++++ b/include/ma_hash.h
+@@ -33,6 +33,10 @@
+   /* flags for hash_init */
+ #define HASH_CASE_INSENSITIVE	1
+
++#define hash_free libmariadb_hash_free
++#define hash_insert libmariadb_hash_insert
++#define hash_delete libmariadb_hash_delete
++
+ typedef struct st_hash_info {
+   uint next;					/* index to next key */
+   uchar *data;					/* data for current entry */
diff --git a/tools/depends/target/mariadb/Makefile b/tools/depends/target/mariadb/Makefile
index a161249323..c55e13a598 100644
--- a/tools/depends/target/mariadb/Makefile
+++ b/tools/depends/target/mariadb/Makefile
@@ -1,5 +1,5 @@
 include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile 01-android.patch
+DEPS= ../../Makefile.include Makefile 01-android.patch 02-symbol_rename-gnutls_clash.patch
 
 LIBNAME=mariadb
 VERSION=3.1.9
@@ -22,6 +22,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	rm -rf $(PLATFORM); mkdir -p $(PLATFORM)/build
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
 	cd $(PLATFORM); patch -p1 -i ../01-android.patch
+	cd $(PLATFORM); patch -p1 -i ../02-symbol_rename-gnutls_clash.patch
 	cd $(PLATFORM)/build; $(CMAKE) $(PLUGIN_BUILD_FLAGS) -DWITH_UNIT_TESTS:BOOL=OFF -DWITH_EXTERNAL_ZLIB:BOOL=ON -DWITH_CURL:BOOL=OFF ..
 
 $(LIBDYLIB): $(PLATFORM)
diff --git a/tools/depends/target/nettle/Makefile b/tools/depends/target/nettle/Makefile
index 52459fc82a..9e1a7339d2 100644
--- a/tools/depends/target/nettle/Makefile
+++ b/tools/depends/target/nettle/Makefile
@@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile 01-disable_testsuite.patch
 
 # lib name, version
 LIBNAME=nettle
-VERSION=3.5.1
+VERSION=3.6
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz