summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/gnutls/Config.in1
-rw-r--r--package/gnutls/gnutls.hash2
-rw-r--r--package/gnutls/gnutls.mk13
3 files changed, 7 insertions, 9 deletions
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index 998e213c7d..cfb7cb3f3b 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_GNUTLS
bool "gnutls"
select BR2_PACKAGE_LIBTASN1
+ select BR2_PACKAGE_LIBUNISTRING
select BR2_PACKAGE_NETTLE
select BR2_PACKAGE_PCRE
depends on BR2_USE_WCHAR
diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash
index 897562b770..121f75a702 100644
--- a/package/gnutls/gnutls.hash
+++ b/package/gnutls/gnutls.hash
@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
-sha256 9b50e8a670d5e950425d96935c7ddd415eb6f8079615a36df425f09a3143172e gnutls-3.4.17.tar.xz
+sha256 0e97f243ae72b70307d684b84c7fe679385aa7a7a0e37e5be810193dcc17d4ff gnutls-3.5.8.tar.xz
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index af7621c724..4fab812819 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,17 +4,13 @@
#
################################################################################
-GNUTLS_VERSION_MAJOR = 3.4
-GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).17
+GNUTLS_VERSION_MAJOR = 3.5
+GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8
GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
-# README says that the core library is under LGPLv2.1+, but a few
-# files in libdane specify LGPLv3+. It seems to be a mistake, and we
-# therefore trust the README file here. A bug was reported upstream at
-# https://gitlab.com/gnutls/gnutls/issues/109.
GNUTLS_LICENSE = LGPLv2.1+ (core library), GPLv3+ (gnutls-openssl library)
-GNUTLS_LICENSE_FILES = COPYING COPYING.LESSER README
-GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre
+GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER
+GNUTLS_DEPENDENCIES = host-pkgconf libunistring libtasn1 nettle pcre
GNUTLS_CONF_OPTS = \
--disable-doc \
--disable-guile \
@@ -23,6 +19,7 @@ GNUTLS_CONF_OPTS = \
--enable-local-libopts \
--enable-openssl-compatibility \
--with-libnettle-prefix=$(STAGING_DIR)/usr \
+ --with-libunistring-prefix=$(STAGING_DIR)/usr \
--with-librt-prefix=$(STAGING_DIR) \
--without-tpm \
$(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools)
OpenPOWER on IntegriCloud