diff options
| author | root <root@rshg054.dnsready.net> | 2013-08-12 01:42:52 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-08-12 01:42:52 -0700 |
| commit | 60da6abff6c9577a783d72865f11de7a585e912e (patch) | |
| tree | 5e301a95d49ee3ed01a70833b7b8f39d098c5835 /extra/rdesktop | |
| parent | 18a41d682d6e91e0d28fce23eb75292f477bd620 (diff) | |
Mon Aug 12 01:40:44 PDT 2013
Diffstat (limited to 'extra/rdesktop')
| -rw-r--r-- | extra/rdesktop/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/rdesktop/rdesktop-tcp.patch | 11 |
2 files changed, 19 insertions, 4 deletions
diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD index 204591f4d..f3cb15605 100644 --- a/extra/rdesktop/PKGBUILD +++ b/extra/rdesktop/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 192288 2013-08-09 18:43:55Z eric $ +# $Id: PKGBUILD 192435 2013-08-11 19:09:27Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> 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 @@ prepare() { # Fix libao segfault, from Fedora patch -i "${srcdir}/rdesktop-libao.patch" + + # FS#36488 + patch -i "${srcdir}/rdesktop-tcp.patch" } build() { diff --git a/extra/rdesktop/rdesktop-tcp.patch b/extra/rdesktop/rdesktop-tcp.patch new file mode 100644 index 000000000..f20182978 --- /dev/null +++ b/extra/rdesktop/rdesktop-tcp.patch @@ -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) + { |