From c5d92fd9ca86f98c239355d4a03a3f6800c24b90 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Fri, 25 Mar 2022 14:30:56 +0200 Subject: [PATCH 1/4] gnutls: enable AUTORELEASE Enable AUTORELEASE in a separate commit so that the next commit can be reverted without having to manually re-introduce it. Signed-off-by: Stijn Tintel --- libs/gnutls/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 5fef6568c..353cc6ea4 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls PKG_VERSION:=3.7.1 -PKG_RELEASE:=2 +PKG_RELEASE:=$(AUTORELEASE) PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz From 757e53b9aa7ce92e8b269bc3d2b46f5c6b4d76d5 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Fri, 25 Mar 2022 14:40:37 +0200 Subject: [PATCH 2/4] gnutls: add build dependency on gettext-full/host The gnutls package uses the gettext-version fixup, which is only available if gettext-full/host has been built. Add the missing build dependency to fix these errors: bash: line 1: /home/stijn/Development/OpenWrt/openwrt/staging_dir/hostpkg/bin/gettext: No such file or directory bash: line 1: /home/stijn/Development/OpenWrt/openwrt/staging_dir/hostpkg/bin/autopoint: No such file or directory It also prevents configure from using host gettext: checking for msgfmt... /usr/bin/msgfmt checking for gmsgfmt... /usr/bin/gmsgfmt checking for xgettext... /usr/bin/xgettext checking for msgmerge... /usr/bin/msgmerge vs: checking for msgfmt... /home/stijn/Development/OpenWrt/openwrt/staging_dir/hostpkg/bin/msgfmt checking for gmsgfmt... /home/stijn/Development/OpenWrt/openwrt/staging_dir/hostpkg/bin/gmsgfmt checking for xgettext... /home/stijn/Development/OpenWrt/openwrt/staging_dir/hostpkg/bin/xgettext checking for msgmerge... /home/stijn/Development/OpenWrt/openwrt/staging_dir/hostpkg/bin/msgmerge Signed-off-by: Stijn Tintel --- libs/gnutls/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 353cc6ea4..4396d7cd7 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -21,6 +21,7 @@ PKG_LICENSE:=LGPL-2.1-or-later PKG_CPE_ID:=cpe:/a:gnu:gnutls PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=gettext-full/host PKG_BUILD_PARALLEL:=1 PKG_LIBTOOL_PATHS:=. lib From 7fe4a663d3530cad6eaca8f639972111c6fc6b4f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 1 Jun 2021 19:28:22 -0700 Subject: [PATCH 3/4] gnutls: update to 3.7.2 Signed-off-by: Rosen Penev --- libs/gnutls/Makefile | 4 ++-- libs/gnutls/patches/010-m4.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 4396d7cd7..90ca24c72 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls -PKG_VERSION:=3.7.1 +PKG_VERSION:=3.7.2 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:=3777d7963eca5e06eb315686163b7b3f5045e2baac5e54e038ace9835e5cac6f +PKG_HASH:=646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752 PKG_FIXUP:=autoreconf gettext-version 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 eb5d83c56..a1f38bb07 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 -@@ -1064,7 +1064,7 @@ changequote([, ])dnl +@@ -1164,7 +1164,7 @@ changequote([, ])dnl gl_UNISTD_MODULE_INDICATOR([sleep]) AC_CHECK_DECLS_ONCE([alarm]) AC_REQUIRE([gt_TYPE_WCHAR_T]) From e305f1bcb9ea2be387b6ea096e006399d7f22f5a Mon Sep 17 00:00:00 2001 From: John Audia Date: Sun, 20 Mar 2022 11:55:22 -0400 Subject: [PATCH 4/4] 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 --- libs/gnutls/Makefile | 8 +++++--- libs/gnutls/patches/010-m4.patch | 2 +- libs/gnutls/patches/020-dont-install-m4-files.patch | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 90ca24c72..1fe5915b0 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 a1f38bb07..59ce29ee2 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 79f4170c5..28d5fc0ff 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