cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix update rdesktop to 1.7.1

Browse Source 
Key changes:
* Fix clipboard issue when not building with unicode support
* Fix compilation against newer PCSC lite versions
* Fix for per-device license mode on Windows 2008 R2 terminal server
* Fix building 64bit version with static openssl linkage
* Rewrite of smartcard handling for 64bit support, fixes several bugs

from Gonzalo L. R. via ports@ with tweaks by sthen@
works for weerd@ rfreeman@ and myself

OK giovanni@
This commit is contained in:
gsoares 2012-03-14 18:36:04 +00:00
parent 039663a06c
commit b09afec1a3
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/rdesktop/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.36 2011/10/27 17:47:48 gsoares Exp $
# $OpenBSD: Makefile,v 1.37 2012/03/14 18:36:04 gsoares Exp $
COMMENT= open source client for Windows Terminal Server
DISTNAME= rdesktop-1.7.0
REVISION = 1
DISTNAME= rdesktop-1.7.1
CATEGORIES= x11 net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rdesktop/}

10
x11/rdesktop/distinfo
View File

@ -1,5 +1,5 @@
MD5 (rdesktop-1.7.0.tar.gz) = d/qTshqjiDeoXoHADnVyKA==
RMD160 (rdesktop-1.7.0.tar.gz) = CGDTAnsZ67O1ye+R18a6R7cw4vE=
SHA1 (rdesktop-1.7.0.tar.gz) = TyGo+yN5zgWFnn+xPvpgBxEl0n8=
SHA256 (rdesktop-1.7.0.tar.gz) = O+BCDX81iH7A8D07abGQF7LU/67EImGjVbZqUPe3UHQ=
SIZE (rdesktop-1.7.0.tar.gz) = 297239
MD5 (rdesktop-1.7.1.tar.gz) = xLORFZUcSm109RHJmxj8+Q==
RMD160 (rdesktop-1.7.1.tar.gz) = 2fOct1qxPXvoRvYepAJ2zdy8tVA=
SHA1 (rdesktop-1.7.1.tar.gz) = xxjQ9JlIqWTH74QkuK3nPszjq6M=
SHA256 (rdesktop-1.7.1.tar.gz) = 0epDresj7xukJZg2cDcqh811YLr4yUujQhUQXtLvhHk=
SIZE (rdesktop-1.7.1.tar.gz) = 298808

12
x11/rdesktop/patches/patch-configure
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.7 2011/04/21 11:07:33 jasper Exp $
$OpenBSD: patch-configure,v 1.8 2012/03/14 18:36:04 gsoares Exp $
Don't pickup libsamplerate if that's installed.
--- configure.orig Mon Apr 18 08:27:30 2011
+++ configure Tue Apr 19 12:25:07 2011
@@ -5559,6 +5559,7 @@ $as_echo "yes" >&6; }
--- configure.orig Mon Jan 9 11:11:57 2012
+++ configure Tue Mar 13 13:53:08 2012
@@ -5757,6 +5757,7 @@ $as_echo "yes" >&6; }
HAVE_ALSA=1
fi
@ -12,9 +12,9 @@ Don't pickup libsamplerate if that's installed.
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSAMPLERATE" >&5
$as_echo_n "checking for LIBSAMPLERATE... " >&6; }
@@ -5636,6 +5637,8 @@ fi
@@ -5834,6 +5835,8 @@ fi
LIBSAMPLERATE_LIBS="$LIBSAMPLERATE_LIBS -lm"
fi
LIBSAMPLERATE_LIBS="$LIBSAMPLERATE_LIBS -lm"
fi
+fi
+

14
x11/rdesktop/patches/patch-rdesktop_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-rdesktop_c,v 1.1 2011/06/23 15:17:13 sebastia Exp $
$OpenBSD: patch-rdesktop_c,v 1.2 2012/03/14 18:36:04 gsoares Exp $
fix build with gcc-2.95
--- rdesktop.c.orig Wed Jun 22 16:10:33 2011
+++ rdesktop.c Wed Jun 22 16:11:31 2011
@@ -465,6 +465,7 @@ main(int argc, char *argv[])
--- rdesktop.c.orig Fri Nov 25 08:03:03 2011
+++ rdesktop.c Tue Mar 13 13:53:08 2012
@@ -473,6 +473,7 @@ main(int argc, char *argv[])
char *locale = NULL;
int username_option = 0;
RD_BOOL geometry_option = False;
@ -12,7 +12,7 @@ fix build with gcc-2.95
#ifdef WITH_RDPSND
char *rdpsnd_optarg = NULL;
#endif
@@ -480,7 +481,6 @@ main(int argc, char *argv[])
@@ -488,7 +489,6 @@ main(int argc, char *argv[])
#endif
/* Ignore SIGPIPE, since we are using popen() */
@ -20,7 +20,7 @@ fix build with gcc-2.95
memset(&act, 0, sizeof(act));
act.sa_handler = SIG_IGN;
sigemptyset(&act.sa_mask);
@@ -893,6 +893,7 @@ main(int argc, char *argv[])
@@ -901,6 +901,7 @@ main(int argc, char *argv[])
if (!username_option)
{
@ -28,7 +28,7 @@ fix build with gcc-2.95
pw = getpwuid(getuid());
if ((pw == NULL) || (pw->pw_name == NULL))
{
@@ -900,7 +901,7 @@ main(int argc, char *argv[])
@@ -908,7 +909,7 @@ main(int argc, char *argv[])
return EX_OSERR;
}
/* +1 for trailing \0 */