diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index b24cc14a6b..044c0d9e43 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls -PKG_VERSION:=3.8.5 +PKG_VERSION:=3.8.9 PKG_RELEASE:=1 PKG_BUILD_FLAGS:=no-mips16 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8 -PKG_HASH:=66269a2cfe0e1c2dabec87bdbbd8ab656f396edd9a40dd006978e003cfa52bfc +PKG_HASH:=69e113d802d1670c4d5ac1b99040b1f2d5c7c05daec5003813c049b5184820ed PKG_MAINTAINER:=Nikos Mavrogiannopoulos PKG_LICENSE:=LGPL-2.1-or-later diff --git a/libs/gnutls/patches/010-m4.patch b/libs/gnutls/patches/010-m4.patch index 447580f782..7212047bab 100644 --- a/libs/gnutls/patches/010-m4.patch +++ b/libs/gnutls/patches/010-m4.patch @@ -1,6 +1,6 @@ --- a/m4/stdint.m4 +++ b/m4/stdint.m4 -@@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H], +@@ -17,7 +17,7 @@ AC_DEFUN_ONCE([gl_STDINT_H], AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_REQUIRE([gl_LIMITS_H]) @@ -11,47 +11,47 @@ dnl macros. --- a/m4/vasnprintf.m4 +++ b/m4/vasnprintf.m4 -@@ -33,7 +33,7 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF], +@@ -75,7 +75,7 @@ AC_DEFUN([gl_FUNC_VASNWPRINTF], + # Prerequisites of lib/printf-args.h, lib/printf-args.c. AC_DEFUN([gl_PREREQ_PRINTF_ARGS], [ - AC_REQUIRE([gt_TYPE_WCHAR_T]) - AC_REQUIRE([gt_TYPE_WINT_T]) + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) ]) # Prerequisites of lib/printf-parse.h, lib/printf-parse.c. -@@ -41,7 +41,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE], +@@ -83,7 +83,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_ARGS], + AC_DEFUN([gl_PREREQ_PRINTF_PARSE], [ AC_REQUIRE([gl_FEATURES_H]) - AC_REQUIRE([gt_TYPE_WCHAR_T]) - AC_REQUIRE([gt_TYPE_WINT_T]) + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) AC_REQUIRE([AC_TYPE_SIZE_T]) AC_CHECK_TYPE([ptrdiff_t], , [AC_DEFINE([ptrdiff_t], [long], -@@ -55,7 +55,7 @@ AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF], +@@ -216,7 +216,7 @@ int main() + AC_DEFUN_ONCE([gl_PREREQ_VASNXPRINTF], [ AC_REQUIRE([AC_FUNC_ALLOCA]) - AC_REQUIRE([gt_TYPE_WCHAR_T]) - AC_REQUIRE([gt_TYPE_WINT_T]) + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) - AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb]) - dnl Use the _snprintf function only if it is declared (because on NetBSD it - dnl is defined as a weak alias of snprintf; we prefer to use the latter). ---- a/m4/wchar_t.m4 -+++ b/m4/wchar_t.m4 -@@ -8,7 +8,7 @@ dnl From Bruno Haible. - dnl Test whether has the 'wchar_t' type. - dnl Prerequisite: AC_PROG_CC + AC_CHECK_FUNCS([wcslen]) + dnl Knowing DBL_EXPBIT0_WORD and DBL_EXPBIT0_BIT enables an optimization + dnl in the code for NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE. +--- a/m4/wchar_h.m4 ++++ b/m4/wchar_h.m4 +@@ -28,7 +28,7 @@ AC_DEFUN_ONCE([gl_WCHAR_H], --AC_DEFUN([gt_TYPE_WCHAR_T], -+AC_DEFUN([gt_TYPE_WCHAR_T_GNUTLS], - [ - AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t], - [AC_COMPILE_IFELSE( + AC_REQUIRE([gl_FEATURES_H]) + +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else --- a/m4/wint_t.m4 +++ b/m4/wint_t.m4 -@@ -9,7 +9,7 @@ dnl Test whether has the 'wint +@@ -11,7 +11,7 @@ dnl Test whether has the 'wint dnl or would, if present, override 'wint_t'. dnl Prerequisite: AC_PROG_CC @@ -62,12 +62,12 @@ [AC_COMPILE_IFELSE( --- a/src/gl/m4/gnulib-comp.m4 +++ b/src/gl/m4/gnulib-comp.m4 -@@ -1268,7 +1268,7 @@ changequote([, ])dnl - gl_UNISTD_MODULE_INDICATOR([sleep]) +@@ -1440,7 +1440,7 @@ changequote([, ])dnl AC_CHECK_DECLS_ONCE([alarm]) - AC_REQUIRE([gt_TYPE_WCHAR_T]) + gl_SNAN + gl_NAN_MIPS - AC_REQUIRE([gt_TYPE_WINT_T]) + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) - gl_FUNC_STRERROR_R - AS_IF([test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1], [ - AC_LIBOBJ([strerror_r]) + gl_DOUBLE_EXPONENT_LOCATION + gl_STRING_MODULE_INDICATOR([str_endswith]) + gl_STRING_MODULE_INDICATOR([str_startswith]) diff --git a/libs/gnutls/patches/020-dont-install-m4-files.patch b/libs/gnutls/patches/020-dont-install-m4-files.patch index 6caeabc488..96ca41c5c6 100644 --- a/libs/gnutls/patches/020-dont-install-m4-files.patch +++ b/libs/gnutls/patches/020-dont-install-m4-files.patch @@ -21,5 +21,5 @@ Signed-off-by: Eneas U de Queiroz -ACLOCAL_AMFLAGS = -I m4 -I src/gl/m4 -I lib/unistring/m4 --install +ACLOCAL_AMFLAGS = -I m4 -I src/gl/m4 -I lib/unistring/m4 - EXTRA_DIST = cfg.mk maint.mk CONTRIBUTING.md README.md LICENSE AUTHORS NEWS \ + EXTRA_DIST = cfg.mk maint.mk CONTRIBUTING.md README.md COPYING.LESSERv2 COPYING AUTHORS NEWS \ ChangeLog THANKS INSTALL.md RELEASES.md .mailmap diff --git a/libs/gnutls/patches/030-unistring-optional.patch b/libs/gnutls/patches/030-unistring-optional.patch index 4e9de330be..b041fe028b 100644 --- a/libs/gnutls/patches/030-unistring-optional.patch +++ b/libs/gnutls/patches/030-unistring-optional.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -508,6 +508,8 @@ DEFAULT_VALGRINDFLAGS='-q --error-exitco +@@ -540,6 +540,8 @@ DEFAULT_VALGRINDFLAGS='-q --error-exitco gl_VALGRIND_TESTS_DEFAULT_NO