[vlc-commits] Contribs: vncclient, correctly compile against newer GNUTLS versions

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Mar 20 20:39:43 2016 +0100| [7da603e95167c2e5e591502cdd1c0a6671fb8e81] | committer: Jean-Baptiste Kempf

Contribs: vncclient, correctly compile against newer GNUTLS versions

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

 contrib/src/vncserver/gnutls-recent.patch |   42 +++++++++++++++++++++++++++++
 contrib/src/vncserver/rules.mak           |    1 +
 2 files changed, 43 insertions(+)

diff --git a/contrib/src/vncserver/gnutls-recent.patch b/contrib/src/vncserver/gnutls-recent.patch
new file mode 100644
index 0000000..c4c0616
--- /dev/null
+++ b/contrib/src/vncserver/gnutls-recent.patch
@@ -0,0 +1,42 @@
+--- vncserver/libvncclient/tls_gnutls.c	2014-10-21 17:57:11.000000000 +0200
++++ vncserver.new/libvncclient/tls_gnutls.c	2016-03-20 20:56:31.769384909 +0100
+@@ -67,17 +67,17 @@
+  * libvncclient are linked to different versions of msvcrt.dll.
+  */
+ #ifdef WIN32
+-static void WSAtoTLSErrno()
++static void WSAtoTLSErrno(rfbClient *client)
+ {
+   switch(WSAGetLastError()) {
+   case WSAEWOULDBLOCK:
+-    gnutls_transport_set_global_errno(EAGAIN);
++    gnutls_transport_set_errno(client->tlsSession, EAGAIN);
+     break;
+   case WSAEINTR:
+-    gnutls_transport_set_global_errno(EINTR);
++    gnutls_transport_set_errno(client->tlsSession, EINTR);
+     break;
+   default:
+-    gnutls_transport_set_global_errno(EIO);
++    gnutls_transport_set_errno(client->tlsSession, EIO);
+     break;
+   }
+ }
+@@ -96,7 +96,7 @@
+     if (ret < 0)
+     {
+ #ifdef WIN32
+-      WSAtoTLSErrno();
++      WSAtoTLSErrno(client);
+ #endif
+       if (errno == EINTR) continue;
+       return -1;
+@@ -118,7 +118,7 @@
+     if (ret < 0)
+     {
+ #ifdef WIN32
+-      WSAtoTLSErrno();
++      WSAtoTLSErrno(client);
+ #endif
+       if (errno == EINTR) continue;
+       return -1;
diff --git a/contrib/src/vncserver/rules.mak b/contrib/src/vncserver/rules.mak
index f1a97ed..e5accd1 100644
--- a/contrib/src/vncserver/rules.mak
+++ b/contrib/src/vncserver/rules.mak
@@ -22,6 +22,7 @@ vncserver: LibVNCServer-$(VNCSERVER_VERSION).tar.gz .sum-vncserver
 	$(APPLY) $(SRC)/vncserver/rfbproto.patch
 	$(APPLY) $(SRC)/vncserver/png-detection.patch
 	$(APPLY) $(SRC)/vncserver/vnc-gnutls-pkg.patch
+	$(APPLY) $(SRC)/vncserver/gnutls-recent.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)