From cc04592ed6324e04032d774dfda1281c54225873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Fri, 1 Feb 2019 15:07:00 +0000
Subject: vars/build.vars:gnutls: updated to v3.6.6 (via Redfoxmoon.)
 vars/gnutls.vars: updated (via Redfoxmoon.)
 patches/gnutls-3.6.[26].local.patch: updated (via Redfoxmoon.)

---
 patches/gnutls-3.6.2.local.patch | 14 --------------
 patches/gnutls-3.6.6.local.patch | 14 ++++++++++++++
 vars/build.vars                  |  4 ++--
 vars/gnutls.vars                 |  3 ++-
 4 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100644 patches/gnutls-3.6.2.local.patch
 create mode 100644 patches/gnutls-3.6.6.local.patch

diff --git a/patches/gnutls-3.6.2.local.patch b/patches/gnutls-3.6.2.local.patch
deleted file mode 100644
index d36d75ee..00000000
--- a/patches/gnutls-3.6.2.local.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru gnutls-3.6.2.orig/lib/random.c gnutls-3.6.2/lib/random.c
---- gnutls-3.6.2.orig/lib/random.c	2018-02-11 10:49:13.000000000 +0100
-+++ gnutls-3.6.2/lib/random.c	2018-04-05 00:48:31.928381221 +0200
-@@ -42,8 +42,8 @@
- #endif
- 
- /* Per thread context of random generator, and a flag to indicate initialization */
--static _Thread_local void *gnutls_rnd_ctx;
--static _Thread_local unsigned rnd_initialized = 0;
-+static __thread void *gnutls_rnd_ctx;
-+static __thread unsigned rnd_initialized = 0;
- 
- struct rnd_ctx_list_st {
- 	void *ctx;
diff --git a/patches/gnutls-3.6.6.local.patch b/patches/gnutls-3.6.6.local.patch
new file mode 100644
index 00000000..599a52d5
--- /dev/null
+++ b/patches/gnutls-3.6.6.local.patch
@@ -0,0 +1,14 @@
+diff -ru gnutls-3.6.6.orig/lib/random.c gnutls-3.6.6/lib/random.c
+--- gnutls-3.6.6.orig/lib/random.c	2018-04-01 13:56:13.000000000 +0200
++++ gnutls-3.6.6/lib/random.c	2019-01-31 20:38:57.815274977 +0100
+@@ -36,8 +36,8 @@
+ #endif
+ 
+ /* Per thread context of random generator, and a flag to indicate initialization */
+-static _Thread_local void *gnutls_rnd_ctx;
+-static _Thread_local unsigned rnd_initialized = 0;
++static __thread void *gnutls_rnd_ctx;
++static __thread unsigned rnd_initialized = 0;
+ 
+ struct rnd_ctx_list_st {
+ 	void *ctx;
diff --git a/vars/build.vars b/vars/build.vars
index 06066a5c..2ea30f78 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -525,8 +525,8 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_LIBUNISTRING_SHA256SUM:=a4d993ecfce16cf503ff7579f5da64619cee66226fb3b998dafb706190d9a833};
 : ${PKG_LIBUNISTRING_VERSION:=0.9.9};
 : ${PKG_LIBUNISTRING_URL:=https://ftp.gnu.org/gnu/libunistring/libunistring-${PKG_LIBUNISTRING_VERSION}.tar.xz};
-: ${PKG_GNUTLS_SHA256SUM:=bcd5db7b234e02267f36b5d13cf5214baac232b7056a506252b7574ea7738d1f};
-: ${PKG_GNUTLS_VERSION:=3.6.2};
+: ${PKG_GNUTLS_SHA256SUM:=bb9acab8af2ac430edf45faaaa4ed2c51f86e57cb57689be6701aceef4732ca7};
+: ${PKG_GNUTLS_VERSION:=3.6.6};
 : ${PKG_GNUTLS_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKG_GNUTLS_VERSION%.*}/gnutls-${PKG_GNUTLS_VERSION}.tar.xz};
 : ${PKG_GNUTLS_CONFIGURE_ARGS_EXTRA:="--disable-ssl3-support --disable-ssl2-support --disable-cxx --disable-tools --enable-local-libopts --with-included-libtasn1 --without-p11-kit --disable-hardware-acceleration"};
 : ${PKG_GNUTLS_LIBTOOL:=slibtool-shared};
diff --git a/vars/gnutls.vars b/vars/gnutls.vars
index facb60a7..b1675ac1 100644
--- a/vars/gnutls.vars
+++ b/vars/gnutls.vars
@@ -3,6 +3,7 @@
 #
 
 : ${PKG_GNUTLS_CONFIG_CACHE_EXTRA:="
-gl_cv_ld_output_def=no"};
+gl_cv_ld_output_def=no
+gl_cv_func_working_getdelim=yes"};
 
 # vim:filetype=sh
-- 
cgit v1.2.3