diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2022-03-31 03:06:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-31 03:06:27 +0300 |
| commit | 826029d7635779c41c2ed5a4a48837132fb82233 (patch) | |
| tree | cc5bba4ade4586900b353690b4c7d7c097993bb2 | |
| parent | 539f9d07a1a5fc3772f15348b47f3198a2fe34b2 (diff) | |
| parent | e305f1bcb9ea2be387b6ea096e006399d7f22f5a (diff) | |
Merge pull request #18112 from graysky2/gnutls
gnutls: Update to 3.7.4
| -rw-r--r-- | libs/gnutls/Makefile | 11 | ||||
| -rw-r--r-- | libs/gnutls/patches/010-m4.patch | 2 | ||||
| -rw-r--r-- | libs/gnutls/patches/020-dont-install-m4-files.patch | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 5fef6568c..1fe5915b0 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -8,19 +8,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls -PKG_VERSION:=3.7.1 -PKG_RELEASE:=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:=3777d7963eca5e06eb315686163b7b3f5045e2baac5e54e038ace9835e5cac6f +PKG_HASH:=e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f PKG_FIXUP:=autoreconf gettext-version PKG_MAINTAINER:=Nikos Mavrogiannopoulos <nmav@gnutls.org> 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 @@ -133,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 eb5d83c56..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 -@@ -1064,7 +1064,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 <cotequeiroz@gmail.com> 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 |