rpms/rdesktop/FC-5 rdesktop-fix-segfault.patch, NONE, 1.1 rdesktop.spec, 1.21, 1.22

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/rdesktop/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29355

Modified Files:
	rdesktop.spec 
Added Files:
	rdesktop-fix-segfault.patch 
Log Message:
* Tue Jun 05 2007 Adam Jackson <ajax at redhat.com> 1.4.1-4
- Fix segfault with newer libX11. (#238580)


rdesktop-fix-segfault.patch:
 xwin.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rdesktop-fix-segfault.patch ---
--- xwin.c.fix-segfault	2007-04-26 12:37:28.000000000 -0400
+++ xwin.c	2007-04-26 12:37:50.000000000 -0400
@@ -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)
 	{


Index: rdesktop.spec
===================================================================
RCS file: /cvs/dist/rpms/rdesktop/FC-5/rdesktop.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rdesktop.spec	11 Feb 2006 05:28:53 -0000	1.21
+++ rdesktop.spec	5 Jun 2007 13:53:39 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           rdesktop
 Version:        1.4.1
-Release: 3.2.1
+Release: 4
 Summary:        X client for remote desktop into Windows Terminal Server
 
 Group:          User Interface/Desktops
@@ -10,6 +10,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel, libX11-devel
 
+Patch0: rdesktop-fix-segfault.patch
+
 %description
 rdesktop is an open source client for Windows NT Terminal Server and
 Windows 2000 & 2003 Terminal Services, capable of natively speaking 
@@ -18,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .segfault
 
 %build
 %configure
@@ -38,6 +41,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jun 05 2007 Adam Jackson <ajax at redhat.com> 1.4.1-4
+- Fix segfault with newer libX11. (#238580)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-3.2.1
 - bump again for double-long bug on ppc(64)