aboutsummaryrefslogtreecommitdiff
path: root/tools/depends/target/gnutls
diff options
context:
space:
mode:
authorphunkyfish <phunkyfish@gmail.com>2020-07-17 11:38:19 +0100
committerphunkyfish <phunkyfish@gmail.com>2020-07-19 14:10:07 +0100
commitd4761ab7cd12a100168aa8c40c8062ac080832eb (patch)
tree0f8b12a1e98ae7fb7a43413f4fd7b85e13e7b9b9 /tools/depends/target/gnutls
parent17c1db2cae71ee832f05a924d81991ab6def8855 (diff)
[depends] gnutls 3.6.14 and nettle 3.6 bump
Diffstat (limited to 'tools/depends/target/gnutls')
-rw-r--r--tools/depends/target/gnutls/03-support-correct-cisdigit.patch10
-rw-r--r--tools/depends/target/gnutls/Makefile5
-rw-r--r--tools/depends/target/gnutls/add-dl-as-private-lib.patch8
3 files changed, 17 insertions, 6 deletions
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}