Apply fix for segfault with libX11-1.1.1-r1

(Portage version: 2.1.2.2)

5 files changed, 85 insertions, 3 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index 51189245e19a..69c29af079c5 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/rdesktop
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.80 2007/02/06 21:27:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.81 2007/04/26 23:30:59 mjolnir Exp $
+
+*rdesktop-1.5.0-r2 (26 Apr 2007)
+
+  26 Apr 2007; Martin Jackson <mjolnir@gentoo.org>
+  +files/rdesktop-1.5.0-libX11-segfault-fix.patch, metadata.xml,
+  +rdesktop-1.5.0-r2.ebuild:
+  Apply fix for segfault with libX11-1.1.1-r1; take maintainership
 
   06 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   rdesktop-1.5.0-r1.ebuild:
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.5.0-r2 b/net-misc/rdesktop/files/digest-rdesktop-1.5.0-r2
new file mode 100644
index 000000000000..81d1b244f847
--- /dev/null
+++ b/net-misc/rdesktop/files/digest-rdesktop-1.5.0-r2
@@ -0,0 +1,3 @@
+MD5 433546f60fc0f201e99307ba188369ed rdesktop-1.5.0.tar.gz 245137
+RMD160 350e08166d0b7620b4ed9c6594addae7ec53d15a rdesktop-1.5.0.tar.gz 245137
+SHA256 5ead17c3d29cb1028aeca485ee7a8c65694c1b02a1b7014c3da920b265a438aa rdesktop-1.5.0.tar.gz 245137
diff --git a/net-misc/rdesktop/files/rdesktop-1.5.0-libX11-segfault-fix.patch b/net-misc/rdesktop/files/rdesktop-1.5.0-libX11-segfault-fix.patch
new file mode 100644
index 000000000000..8b550b543fa4
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.5.0-libX11-segfault-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur rdesktop-1.5.0.orig/xwin.c rdesktop-1.5.0/xwin.c
+--- rdesktop-1.5.0.orig/xwin.c	2006-08-07 07:45:44.000000000 -0400
++++ rdesktop-1.5.0/xwin.c	2007-04-16 14:31:44.020671046 -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, cx * g_bpp / 8);
+ 
+ 	if (g_ownbackstore)
+ 	{
diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
index 613f8d1ff5aa..242202863007 100644
--- a/net-misc/rdesktop/metadata.xml
+++ b/net-misc/rdesktop/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>wolf31o2@gentoo.org</email>
-  <name>Chris Gianelloni</name>
+  <email>mjolnir@gentoo.org</email>
+  <name>Martin Jackson</name>
 </maintainer>
 <longdescription>
 an open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required.
diff --git a/net-misc/rdesktop/rdesktop-1.5.0-r2.ebuild b/net-misc/rdesktop/rdesktop-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..66be89fc7cf3
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.5.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.5.0-r2.ebuild,v 1.1 2007/04/26 23:30:59 mjolnir Exp $
+
+inherit eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ao debug ipv6 oss"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND=">=dev-libs/openssl-0.9.6b
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	ao? ( >=media-libs/libao-0.8.6 )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	
+	epatch "${FILESDIR}/${P}-libX11-segfault-fix.patch"
+}
+
+src_compile() {
+	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
+	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
+	sed -i -e "s:${strip}::" Makefile.in \
+		|| die "sed failed in Makefile.in"
+
+	if use oss; then
+		extra_conf=`use_with oss sound`
+	else
+		extra_conf=`use_with ao sound libao`
+	fi
+
+	econf \
+		--with-openssl=/usr \
+		`use_with debug` \
+		`use_with ipv6` \
+		${extra_conf} \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install
+	dodoc COPYING doc/HACKING doc/TODO doc/keymapping.txt
+}