[arch-commits] Commit in rdesktop/trunk (PKGBUILD rdesktop-tcp.patch)

[Eric Bélanger]

    Date: Sunday, August 11, 2013 @ 21:08:34
  Author: eric
Revision: 192434

upgpkg: rdesktop 1.8.0-2

Fix issues with RDP session (close FS#36488)

Added:
  rdesktop/trunk/rdesktop-tcp.patch
Modified:
  rdesktop/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   10 +++++++---
 rdesktop-tcp.patch |   11 +++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-11 16:50:46 UTC (rev 192433)
+++ PKGBUILD	2013-08-11 19:08:34 UTC (rev 192434)
@@ -5,17 +5,18 @@
 
 pkgname=rdesktop
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source client for Windows Remote Desktop Services"
 arch=('i686' 'x86_64')
 url="http://www.rdesktop.org/"
 license=('GPL3')
 depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch')
+        'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch' 'rdesktop-tcp.patch')
 md5sums=('203d662ac20b22250bbbd525a9f29f3a'
          'cbfb12729e7f28e497afb883cc42022b'
-         '6514f31dc879a0a66c955e4e3348c143')
+         '6514f31dc879a0a66c955e4e3348c143'
+         'f204fd8a40b16ca10d4962d4eaeca4db')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -25,6 +26,9 @@
 
   # Fix libao segfault, from Fedora
   patch -i "${srcdir}/rdesktop-libao.patch"
+
+  # FS#36488
+  patch -i "${srcdir}/rdesktop-tcp.patch"
 }
 
 build() {

Added: rdesktop-tcp.patch
===================================================================
--- rdesktop-tcp.patch	                        (rev 0)
+++ rdesktop-tcp.patch	2013-08-11 19:08:34 UTC (rev 192434)
@@ -0,0 +1,11 @@
+--- a/rdesktop/trunk/tcp.c
++++ b/rdesktop/trunk/tcp.c
+@@ -193,7 +193,7 @@
+ 	int rcvd = 0, ssl_err;
+ 
+ 	if (g_network_error == True)
+-		return;
++		return NULL;
+ 
+ 	if (s == NULL)
+ 	{