net/rdesktop segfault

[Thomas Spreng]

Hi,

> after clean install xorg7.2 rdesktop segfault at login.

same problem here, after upgrading xorg to v7.2 rdesktop segfaults on
each login attempt. This seems to be a known problem with rdesktop.
Based on a PR from Ubuntu, I've created a patch which should resolve
this problem (see attachment).

I'll send it in as a PR tonight.

PS: apply with
(cd /usr/ports/net/rdesktop && patch -p1 < /path/to/patch)

PPS: forgot to cc: to list.

cheers,

tom.

-------------- next part --------------
diff -ruN rdesktop.bak/Makefile rdesktop/Makefile
--- rdesktop.bak/Makefile	Sat May 19 22:18:54 2007
+++ rdesktop/Makefile	Fri Jun  1 11:30:39 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	rdesktop
 PORTVERSION=	1.5.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	net comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -ruN rdesktop.bak/files/patch-xwin.c rdesktop/files/patch-xwin.c
--- rdesktop.bak/files/patch-xwin.c	Thu Jan  1 01:00:00 1970
+++ rdesktop/files/patch-xwin.c	Fri Jun  1 11:30:39 2007
@@ -0,0 +1,11 @@
+--- xwin.c.orig	Fri Jun  1 10:27:15 2007
++++ xwin.c	Fri Jun  1 10:28:26 2007
+@@ -3219,7 +3219,7 @@
+ 		return;
+ 
+ 	image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
+-			     (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8);
++			     (char *) data, cx, cy, g_bpp, 0);
+ 
+ 	if (g_ownbackstore)
+ 	{