OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18112 from graysky2/gnutls 

gnutls: Update to 3.7.4
This commit is contained in:
Stijn Tintel 2022-03-31 03:06:27 +03:00 committed by GitHub
parent 539f9d07a1 e305f1bcb9
commit 826029d763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/gnutls/Makefile
View File

@ -8,19 +8,20 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gnutls PKG_NAME:=gnutls
PKG_VERSION:=3.7.1 PKG_VERSION:=3.7.4
PKG_RELEASE:=2 PKG_RELEASE:=$(AUTORELEASE)
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7 PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7
PKG_HASH:=3777d7963eca5e06eb315686163b7b3f5045e2baac5e54e038ace9835e5cac6f PKG_HASH:=e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f
PKG_FIXUP:=autoreconf gettext-version PKG_FIXUP:=autoreconf gettext-version
PKG_MAINTAINER:=Nikos Mavrogiannopoulos <nmav@gnutls.org> PKG_MAINTAINER:=Nikos Mavrogiannopoulos <nmav@gnutls.org>
PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE:=LGPL-2.1-or-later
PKG_CPE_ID:=cpe:/a:gnu:gnutls PKG_CPE_ID:=cpe:/a:gnu:gnutls
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=gettext-full/host
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_LIBTOOL_PATHS:=. lib PKG_LIBTOOL_PATHS:=. lib
@ -133,7 +134,9 @@ CONFIGURE_ARGS+= \
--with-included-unistring \ --with-included-unistring \
--with-librt-prefix="$(LIBRT_ROOT_DIR)/" \ --with-librt-prefix="$(LIBRT_ROOT_DIR)/" \
--with-pic \ --with-pic \
--with-system-priority-file="" --with-system-priority-file="" \
--without-libzstd \
--without-zlib
ifneq ($(CONFIG_GNUTLS_EXT_LIBTASN1),y) ifneq ($(CONFIG_GNUTLS_EXT_LIBTASN1),y)
CONFIGURE_ARGS += --with-included-libtasn1 CONFIGURE_ARGS += --with-included-libtasn1

2
libs/gnutls/patches/010-m4.patch
View File

@ -62,7 +62,7 @@
[AC_COMPILE_IFELSE( [AC_COMPILE_IFELSE(
--- a/src/gl/m4/gnulib-comp.m4 --- a/src/gl/m4/gnulib-comp.m4
+++ b/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]) gl_UNISTD_MODULE_INDICATOR([sleep])
AC_CHECK_DECLS_ONCE([alarm]) AC_CHECK_DECLS_ONCE([alarm])
AC_REQUIRE([gt_TYPE_WCHAR_T]) AC_REQUIRE([gt_TYPE_WCHAR_T])

6
libs/gnutls/patches/020-dont-install-m4-files.patch
View File

@ -18,8 +18,8 @@ Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
SUBDIRS += doc SUBDIRS += doc
endif endif
-ACLOCAL_AMFLAGS = -I m4 -I src/libopts/m4 -I src/gl/m4 -I lib/unistring/m4 --install -ACLOCAL_AMFLAGS = -I 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
EXTRA_DIST = cfg.mk maint.mk CONTRIBUTING.md README.md LICENSE AUTHORS NEWS \ 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