[vlc-commits] contrib: gnutls: update to 3.6.15

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Oct 14 09:39:19 2020 +0200| [7f58842ea4638f7fc760e8020dbdd81dd2429a71] | committer: Steve Lhomme

contrib: gnutls: update to 3.6.15

The macOS fix has been merged upstream.

(cherry picked from commit ea93b80c14f2a582d910f91fa805aa7b7c42a5ab)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=7f58842ea4638f7fc760e8020dbdd81dd2429a71
---

 ...connectx-not-available-on-older-macOS-SDK.patch | 46 ----------------------
 contrib/src/gnutls/SHA512SUMS                      |  2 +-
 contrib/src/gnutls/rules.mak                       |  4 +-
 3 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/contrib/src/gnutls/0001-fix-connectx-not-available-on-older-macOS-SDK.patch b/contrib/src/gnutls/0001-fix-connectx-not-available-on-older-macOS-SDK.patch
deleted file mode 100644
index 300437a232..0000000000
--- a/contrib/src/gnutls/0001-fix-connectx-not-available-on-older-macOS-SDK.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 3faffe77fd5cb15cb132ebaf4bfef6dc579f25e2 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Fri, 19 Jun 2020 15:11:00 +0200
-Subject: [PATCH] fix connectx not available on older macOS SDK
-
-Fixes this compilation error:
-system/fastopen.c:134:9: error: 'connectx' is only available on macOS 10.11 or newer [-Werror,-Wunguarded-availability]
-                ret = connectx(fd, &endpoints, SAE_ASSOCID_ANY, CONNECT_RESUME_ON_READ_WRITE | CONNECT_DATA_IDEMPOTENT, NULL, 0, NULL, NULL);
-                      ^~~~~~~~
-/Applications/Xcode9.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/include/sys/socket.h:713:5: note: 'connectx' has been marked as being introduced in macOS 10.11 here, but the deployment target is macOS 10.7.0
-
-The detection is the same as found in curl [1].
-
-If HAVE_BUILTIN_AVAILABLE is not available we fallback to the code without
-TCP_FASTOPEN_OSX.
-
-[1] https://github.com/curl/curl/commit/870d849d48a26b8eeb0d4bb1f4655367a4a191ca
----
- lib/system/fastopen.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/lib/system/fastopen.c b/lib/system/fastopen.c
-index 8d8409e48..b816decff 100644
---- a/lib/system/fastopen.c
-+++ b/lib/system/fastopen.c
-@@ -129,9 +129,15 @@ tfo_writev(gnutls_transport_ptr_t ptr, const giovec_t * iovec, int iovec_cnt)
- 	}
- # elif defined(TCP_FASTOPEN_OSX)
- 	{
--		sa_endpoints_t endpoints = { .sae_dstaddr = (struct sockaddr*)&p->connect_addr, .sae_dstaddrlen = p->connect_addrlen };
-+		if(__builtin_available(macOS 10.11, iOS 9.0, tvOS 9.0, watchOS 2.0, *)) {
-+			sa_endpoints_t endpoints = { .sae_dstaddr = (struct sockaddr*)&p->connect_addr, .sae_dstaddrlen = p->connect_addrlen };
- 
--		ret = connectx(fd, &endpoints, SAE_ASSOCID_ANY, CONNECT_RESUME_ON_READ_WRITE | CONNECT_DATA_IDEMPOTENT, NULL, 0, NULL, NULL);
-+			ret = connectx(fd, &endpoints, SAE_ASSOCID_ANY, CONNECT_RESUME_ON_READ_WRITE | CONNECT_DATA_IDEMPOTENT, NULL, 0, NULL, NULL);
-+		}
-+		else
-+		{
-+			ret = connect(fd, (struct sockaddr*)&p->connect_addr, p->connect_addrlen);
-+		}
- 		if (errno == ENOTCONN || errno == EINPROGRESS) {
- 			gnutls_assert();
- 			errno = EAGAIN;
--- 
-2.26.0.windows.1
-
diff --git a/contrib/src/gnutls/SHA512SUMS b/contrib/src/gnutls/SHA512SUMS
index 9d3bff8a5a..226f945ab9 100644
--- a/contrib/src/gnutls/SHA512SUMS
+++ b/contrib/src/gnutls/SHA512SUMS
@@ -1 +1 @@
-b2d427b5542a4679117c011dffa8efb0e0bffa3ce9cebc319f8998d03f80f4168d08f9fda35df18dbeaaada59e479d325a6c1c77d5ca7f8ce221b44e42bfe604  gnutls-3.6.14.tar.xz
+f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c  gnutls-3.6.15.tar.xz
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index d22e63a168..b85a986d7d 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -1,6 +1,6 @@
 # GnuTLS
 
-GNUTLS_VERSION := 3.6.14
+GNUTLS_VERSION := 3.6.15
 GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-$(GNUTLS_VERSION).tar.xz
 
 ifdef BUILD_NETWORK
@@ -34,8 +34,6 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
 	# disable the dllimport in static linking (pkg-config --static doesn't handle Cflags.private)
 	cd $(UNPACK_DIR) && sed -i.orig -e s/"_SYM_EXPORT __declspec(dllimport)"/"_SYM_EXPORT"/g lib/includes/gnutls/gnutls.h.in
 
-	# don't use connectx on macOS versions where it's not available
-	$(APPLY) $(SRC)/gnutls/0001-fix-connectx-not-available-on-older-macOS-SDK.patch
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/gnutls/no-create-time-h.patch
 endif