rpms/rdesktop/devel rdesktop-fix-segfault.patch, NONE, 1.1 rdesktop.spec, 1.24, 1.25

[fedora-cvs-commits at redhat.com]

Author: davidz

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

Modified Files:
	rdesktop.spec 
Added Files:
	rdesktop-fix-segfault.patch 
Log Message:
* Thu Apr 26 2007 David Zeuthen <davidz at redhat.com> - 1.5.0-2
- Fix segfault triggered by X11 update (#238032)



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/devel/rdesktop.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rdesktop.spec	19 Nov 2006 06:26:54 -0000	1.24
+++ rdesktop.spec	26 Apr 2007 16:40:14 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           rdesktop
 Version:        1.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 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 .fix-segfault
 
 %build
 %configure --with-ipv6
@@ -38,6 +41,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 26 2007 David Zeuthen <davidz at redhat.com> - 1.5.0-2
+- Fix segfault triggered by X11 update (#238032)
+
 * Sun Nov 19 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0-1
 - Update to 1.5.0