From bc1fb75ce993ae8a55d7c49fbddecc097436833c Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@fedoraproject.org>
Date: Apr 26 2007 16:40:14 +0000
Subject: - Fix segfault triggered by X11 update (#238032)


---

diff --git a/rdesktop-fix-segfault.patch b/rdesktop-fix-segfault.patch
new file mode 100644
index 0000000..8dd3b3c
--- /dev/null
+++ b/rdesktop-fix-segfault.patch
@@ -0,0 +1,11 @@
+--- 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)
+ 	{
diff --git a/rdesktop.spec b/rdesktop.spec
index 6c2a823..2fea515 100644
--- a/rdesktop.spec
+++ b/rdesktop.spec
@@ -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 @@ Source0:        %{name}-%{version}.tar.gz
 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 @@ desktop. Unlike Citrix ICA, no server extensions are required.
 
 %prep
 %setup -q
+%patch0 -p0 -b .fix-segfault
 
 %build
 %configure --with-ipv6
@@ -38,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 26 2007 David Zeuthen <davidz@redhat.com> - 1.5.0-2
+- Fix segfault triggered by X11 update (#238032)
+
 * Sun Nov 19 2006 Matthias Clasen <mclasen@redhat.com> - 1.5.0-1
 - Update to 1.5.0