- update rdesktop to 1.6.0

* includes SECURITY FIXES for several over-/underflows:
  CVE-2008-1801 CVE-2008-1802 CVE-2008-1803
- specify license marker
- prevent picking up libsamplerate if present
- regen PLIST

based on a diff by Devin Smith on ports@, with feedback from
brad@ and steven@ on ports@.

maintainer (ckuethe@) timed-out on this diff.

x11/rdesktop/Makefile

@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.25 2007/09/15 20:04:24 merdely Exp $
+# $OpenBSD: Makefile,v 1.26 2008/08/20 16:25:41 jasper Exp $
 
 COMMENT=	open source client for Windows Terminal Server
-DISTNAME=	rdesktop-1.5.0
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	rdesktop-1.6.0
 CATEGORIES=	x11 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
@@ -10,7 +9,7 @@ HOMEPAGE=	http://www.rdesktop.org/
 
 MAINTAINER=	Chris Kuethe <ckuethe@openbsd.org>
 
-# GPL
+# GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes

x11/rdesktop/distinfo

@@ -1,5 +1,5 @@
-MD5 (rdesktop-1.5.0.tar.gz) = QzVG9g/A8gHpkwe6GINp7Q==
-RMD160 (rdesktop-1.5.0.tar.gz) = NQ4IFm0LdiC07ZxllK3a5+xT0Vo=
-SHA1 (rdesktop-1.5.0.tar.gz) = 4whr+GUZHu1BYxgTEl9ILiecfz0=
-SHA256 (rdesktop-1.5.0.tar.gz) = Xq0Xw9KcsQKK7KSF7nqMZWlMGwKhtwFMPakgsmWkOKo=
-SIZE (rdesktop-1.5.0.tar.gz) = 245137
+MD5 (rdesktop-1.6.0.tar.gz) = xvy+1/CtfmCsX8stMk2LFg==
+RMD160 (rdesktop-1.6.0.tar.gz) = z2BM0bwHB7SF3rZT76PkfiH6vEw=
+SHA1 (rdesktop-1.6.0.tar.gz) = uL/QPUZA0oWgruWz+xmaR8tCJfI=
+SHA256 (rdesktop-1.6.0.tar.gz) = NQJuqo4UyovQujcwkm8UIi+EUvKsZiYju/GQnYsGCXk=
+SIZE (rdesktop-1.6.0.tar.gz) = 284728

x11/rdesktop/patches/patch-configure

@@ -0,0 +1,23 @@
+$OpenBSD: patch-configure,v 1.6 2008/08/20 16:25:41 jasper Exp $
+
+Don't pickup libsamplerate if that's installed.
+
+--- configure.orig	Sat Apr  5 07:43:32 2008
++++ configure	Tue Aug  5 14:02:00 2008
+@@ -7290,6 +7290,7 @@ echo "${ECHO_T}yes" >&6; }
+ 	HAVE_ALSA=1
+ fi
+ 
++if false; then
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for LIBSAMPLERATE" >&5
+ echo $ECHO_N "checking for LIBSAMPLERATE... $ECHO_C" >&6; }
+@@ -7371,6 +7372,8 @@ _ACEOF
+         fi
+         LIBSAMPLERATE_LIBS="$LIBSAMPLERATE_LIBS -lm"
+     fi
++fi
++
+ fi
+ 
+ if test "$sound" != "no"; then

x11/rdesktop/patches/patch-rdpsnd_sun_c

@@ -0,0 +1,40 @@
+$OpenBSD: patch-rdpsnd_sun_c,v 1.1 2008/08/20 16:25:41 jasper Exp $
+
+2 changes are here:
+- Change all uint_t to unsigned int.  On Linux a uint_t is just a typedef
+  to unsigned int.  We don't have a uint_t.
+
+- In sun_open rdesktop will also check that a device is in full duplex
+  mode before opening the device successfully. I didn't add code to check
+  if a device is in full duplex mode, I just removed the check.
+
+--- rdpsnd_sun.c.orig	Sat May 10 23:14:38 2008
++++ rdpsnd_sun.c	Tue Jun 17 16:08:59 2008
+@@ -54,7 +54,7 @@ static uint32 snd_rate;
+ static short samplewidth;
+ static char *dsp_dev;
+ 
+-static uint_t written_samples;
++static unsigned int written_samples;
+ 
+ void sun_play(void);
+ void sun_record(void);
+@@ -147,8 +147,7 @@ sun_open(int mode)
+ 	{
+ 		AUDIO_INITINFO(&info);
+ 
+-		if ((ioctl(dsp_fd, AUDIO_GETINFO, &info) == -1)
+-		    || !(info.hw_features & AUDIO_HWFEATURE_DUPLEX))
++		if (ioctl(dsp_fd, AUDIO_GETINFO, &info) == -1)
+ 		{
+ 			close(dsp_fd);
+ 			dsp_fd = -1;
+@@ -440,7 +439,7 @@ sun_play(void)
+ 	if (out->p == out->end)
+ 	{
+ 		audio_info_t info;
+-		uint_t delay_samples;
++		unsigned int delay_samples;
+ 		unsigned long delay_us;
+ 
+ 		if (ioctl(dsp_fd, AUDIO_GETINFO, &info) != -1)

x11/rdesktop/patches/patch-xwin_c

@@ -1,14 +0,0 @@
-$OpenBSD: patch-xwin_c,v 1.4 2007/05/17 17:31:33 ckuethe Exp $
---- xwin.c.orig	Wed Apr 25 12:03:29 2007
-+++ xwin.c	Wed Apr 25 12:04:54 2007
-@@ -3221,6 +3221,10 @@ ui_desktop_restore(uint32 offset, int x, int y, int cx
- 	image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
- 			     (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8);
- 
-+	if (image == NULL)
-+		image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
-+			     (char *) data, cx, cy, BitmapPad(g_display), 0);
-+
- 	if (g_ownbackstore)
- 	{
- 		XPutImage(g_display, g_backstore, g_gc, image, 0, 0, x, y, cx, cy);

x11/rdesktop/pkg/PLIST

@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.6 2007/03/25 19:38:39 aanriot Exp $
-bin/rdesktop
+@comment $OpenBSD: PLIST,v 1.7 2008/08/20 16:25:41 jasper Exp $
+@bin bin/rdesktop
 @man man/man1/rdesktop.1
 share/rdesktop/
 share/rdesktop/keymaps/