From: John Audia Date: Sun, 20 Mar 2022 15:55:22 +0000 (-0400) Subject: gnutls: Update to 3.7.4 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e305f1bcb9ea2be387b6ea096e006399d7f22f5a;p=feed%2Fpackages.git gnutls: Update to 3.7.4 Bump to latest upstream release. Rebased existing patches. This version introduces certificate compression support, and with that, optional dependencies on zlib and zstd. When configure picks them up, build will fail due to missing dependencies: Package libgnutls is missing dependencies for the following libraries: libz.so.1 libzstd.so.1 Disable zlib and zstd support to avoid that. Signed-off-by: John Audia [disable zlib and zstd] Signed-off-by: Stijn Tintel --- diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 90ca24c722..1fe5915b0e 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls -PKG_VERSION:=3.7.2 +PKG_VERSION:=3.7.4 PKG_RELEASE:=$(AUTORELEASE) PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7 -PKG_HASH:=646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752 +PKG_HASH:=e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f PKG_FIXUP:=autoreconf gettext-version PKG_MAINTAINER:=Nikos Mavrogiannopoulos PKG_LICENSE:=LGPL-2.1-or-later @@ -134,7 +134,9 @@ CONFIGURE_ARGS+= \ --with-included-unistring \ --with-librt-prefix="$(LIBRT_ROOT_DIR)/" \ --with-pic \ - --with-system-priority-file="" + --with-system-priority-file="" \ + --without-libzstd \ + --without-zlib ifneq ($(CONFIG_GNUTLS_EXT_LIBTASN1),y) CONFIGURE_ARGS += --with-included-libtasn1 diff --git a/libs/gnutls/patches/010-m4.patch b/libs/gnutls/patches/010-m4.patch index a1f38bb074..59ce29ee25 100644 --- a/libs/gnutls/patches/010-m4.patch +++ b/libs/gnutls/patches/010-m4.patch @@ -62,7 +62,7 @@ [AC_COMPILE_IFELSE( --- a/src/gl/m4/gnulib-comp.m4 +++ b/src/gl/m4/gnulib-comp.m4 -@@ -1164,7 +1164,7 @@ changequote([, ])dnl +@@ -1188,7 +1188,7 @@ changequote([, ])dnl gl_UNISTD_MODULE_INDICATOR([sleep]) AC_CHECK_DECLS_ONCE([alarm]) AC_REQUIRE([gt_TYPE_WCHAR_T]) diff --git a/libs/gnutls/patches/020-dont-install-m4-files.patch b/libs/gnutls/patches/020-dont-install-m4-files.patch index 79f4170c5a..28d5fc0ff3 100644 --- a/libs/gnutls/patches/020-dont-install-m4-files.patch +++ b/libs/gnutls/patches/020-dont-install-m4-files.patch @@ -18,8 +18,8 @@ Signed-off-by: Eneas U de Queiroz SUBDIRS += doc endif --ACLOCAL_AMFLAGS = -I m4 -I src/libopts/m4 -I src/gl/m4 -I lib/unistring/m4 --install -+ACLOCAL_AMFLAGS = -I m4 -I src/libopts/m4 -I src/gl/m4 -I lib/unistring/m4 +-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 \ - ChangeLog THANKS INSTALL.md RELEASES.md + ChangeLog THANKS INSTALL.md RELEASES.md .mailmap