Apply fix for segfault with libX11-1.1.1-r1

Package-Manager: portage-2.1.2.2

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index 51189245e19ab9825babf0a4b185d3175f223007..69c29af079c559ce52e639486d258d7888b0bec7 100644 (file)
--- 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/Manifest b/net-misc/rdesktop/Manifest
index 1ae8ae039e3c0f772320bd5c46a2682dacaddc7f..2bfa69c5aafcb2f981f6dc6bfaed86766d4f78be 100644 (file)
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX rdesktop-1.5.0-libX11-segfault-fix.patch 444 RMD160 a20a41b2ee302b40065efb338112e3c0c452d1a3 SHA1 36a6142a18af08dbacbf1a63b0d2ac91ba1fa160 SHA256 07a41cbf405ea992954b2691e5d9e4360ee64aace28f39e85a081b700a3ec1c3
+MD5 0f155f65c31de653c777fa9cc6c73d0a files/rdesktop-1.5.0-libX11-segfault-fix.patch 444
+RMD160 a20a41b2ee302b40065efb338112e3c0c452d1a3 files/rdesktop-1.5.0-libX11-segfault-fix.patch 444
+SHA256 07a41cbf405ea992954b2691e5d9e4360ee64aace28f39e85a081b700a3ec1c3 files/rdesktop-1.5.0-libX11-segfault-fix.patch 444
 DIST rdesktop-1.4.1.tar.gz 216017 RMD160 c49a2425f1e00f5933d3873f6ea742b2ad4fea0c SHA1 412ffa06dc216cc7ce1082a8a4912778f82425d9 SHA256 db3da6016ceec07efda277adcb175b14c4e5255b0f85137f4a1dce79b0ee5144
 DIST rdesktop-1.5.0.tar.gz 245137 RMD160 350e08166d0b7620b4ed9c6594addae7ec53d15a SHA1 e3086bf865191eed41631813125f482e279c7f3d SHA256 5ead17c3d29cb1028aeca485ee7a8c65694c1b02a1b7014c3da920b265a438aa
 EBUILD rdesktop-1.4.1.ebuild 1028 RMD160 a63ea9aeec9bc8c14d328b43ed9305a7620030ac SHA1 1399632b5f513ade1a79d26324cf41d648b64cff SHA256 8744dea7a447823fc25b9ab1eca0b6137fe8bdd4102ec5b36edb20b37063559f
@@ -11,18 +12,22 @@ EBUILD rdesktop-1.5.0-r1.ebuild 1281 RMD160 021fc02792ae913a08f37f82699bdda2a117
 MD5 afeedbb79c5edc04823d115e77e9f8cc rdesktop-1.5.0-r1.ebuild 1281
 RMD160 021fc02792ae913a08f37f82699bdda2a117b16a rdesktop-1.5.0-r1.ebuild 1281
 SHA256 92be5f80889cc01f7d7580039e57985766a9542b187f7704513d462b85433b2c rdesktop-1.5.0-r1.ebuild 1281
+EBUILD rdesktop-1.5.0-r2.ebuild 1385 RMD160 d19374d0ca6007fcba4ad523628ba3798fcac8f9 SHA1 1ae8f5eeec4b51014b6035882999a45a7b0af128 SHA256 a104166b92f8d29c27c04ac004dfb907d353722b7cee0b021cf4e398d847e8b3
+MD5 c4b2d44c42b11f66f6cfdf9bc2fa532b rdesktop-1.5.0-r2.ebuild 1385
+RMD160 d19374d0ca6007fcba4ad523628ba3798fcac8f9 rdesktop-1.5.0-r2.ebuild 1385
+SHA256 a104166b92f8d29c27c04ac004dfb907d353722b7cee0b021cf4e398d847e8b3 rdesktop-1.5.0-r2.ebuild 1385
 EBUILD rdesktop-1.5.0.ebuild 1193 RMD160 0f6b1addcbd1a369d34b1582584735bfc0b2e68f SHA1 26feccc32c8eb5deef63ee02410e9f0ed32ee545 SHA256 b233e268c7eff84c17094742b5fab30bed1ac1f64670b0a6690ad3dc8ad70516
 MD5 c28cdb012f5a04c33879c458b114d6a8 rdesktop-1.5.0.ebuild 1193
 RMD160 0f6b1addcbd1a369d34b1582584735bfc0b2e68f rdesktop-1.5.0.ebuild 1193
 SHA256 b233e268c7eff84c17094742b5fab30bed1ac1f64670b0a6690ad3dc8ad70516 rdesktop-1.5.0.ebuild 1193
-MISC ChangeLog 10922 RMD160 7c2f2395960619765981a90863f5d22125938686 SHA1 4d4b42b7efa545fdf93e8f1572c0ce494938b7a3 SHA256 3a84f249646b025d7dca2803b43403f783d7c1c87300c7f514159d897ea71ca2
-MD5 5fe46765d8061e2f9eab9b705f22b5dd ChangeLog 10922
-RMD160 7c2f2395960619765981a90863f5d22125938686 ChangeLog 10922
-SHA256 3a84f249646b025d7dca2803b43403f783d7c1c87300c7f514159d897ea71ca2 ChangeLog 10922
-MISC metadata.xml 543 RMD160 2aa91456c5a5705c42206c18cfca41885d9cb153 SHA1 f19e483bb316fa4687c134ddc0d81c527b59868a SHA256 c5cb120fa3b7780c96c2dbfa21c0cd51fd94e7f7161b09109d370be29b68772a
-MD5 db9ae1405fdf7c4bc36e1f9580d41243 metadata.xml 543
-RMD160 2aa91456c5a5705c42206c18cfca41885d9cb153 metadata.xml 543
-SHA256 c5cb120fa3b7780c96c2dbfa21c0cd51fd94e7f7161b09109d370be29b68772a metadata.xml 543
+MISC ChangeLog 11168 RMD160 ad4d6ee2a021ab5df0277f519931a7aedc041279 SHA1 f720c0991ea8c2d5f05b6abccf9ac9451cfc52cc SHA256 130baf031f0ec9dce751f066a708c52047840368b0e5e9fb4f3e076342ed0857
+MD5 0c9493d3a6173b0e5805dbbae6e50d00 ChangeLog 11168
+RMD160 ad4d6ee2a021ab5df0277f519931a7aedc041279 ChangeLog 11168
+SHA256 130baf031f0ec9dce751f066a708c52047840368b0e5e9fb4f3e076342ed0857 ChangeLog 11168
+MISC metadata.xml 540 RMD160 fe15b82c0a18cea160e4557c7093d520f008eebf SHA1 b3f9ca285289591105fb84c49f7dde2d219fb67d SHA256 46dc788af304f60ad0bfb3502a81cdb6b91ac17a9ce39bc45a8b260acd5b0601
+MD5 a21bd9a928442cb85adefc24132719e6 metadata.xml 540
+RMD160 fe15b82c0a18cea160e4557c7093d520f008eebf metadata.xml 540
+SHA256 46dc788af304f60ad0bfb3502a81cdb6b91ac17a9ce39bc45a8b260acd5b0601 metadata.xml 540
 MD5 1af4fcad87d501fa03211d67e07ff9ef files/digest-rdesktop-1.4.1 244
 RMD160 810b3e1491899b422ef0e2556aa6b9a613af000e files/digest-rdesktop-1.4.1 244
 SHA256 b49b134cd35ff5323d927c7fe8aa3f3f2c3b0279233ae529dc159262b4a95290 files/digest-rdesktop-1.4.1 244
@@ -32,10 +37,6 @@ SHA256 2c6dadd4c4ceb7ac98766476972b6fff4f90c679175cf166a413c8b664daf9d8 files/di
 MD5 99b7c6bf42f60bd079994bd0e170cf70 files/digest-rdesktop-1.5.0-r1 244
 RMD160 c9c4ab4e28c401fcd21fd2f510eb4698f503dc3f files/digest-rdesktop-1.5.0-r1 244
 SHA256 2c6dadd4c4ceb7ac98766476972b6fff4f90c679175cf166a413c8b664daf9d8 files/digest-rdesktop-1.5.0-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFyPLBkT4lNIS36YERAopZAJ9zs2ATsOKubpiocWgebZ6kx3jJMQCcDHnB
-Anhp+yKajYBnGblmTv5TLqM=
-=FAId
------END PGP SIGNATURE-----
+MD5 99b7c6bf42f60bd079994bd0e170cf70 files/digest-rdesktop-1.5.0-r2 244
+RMD160 c9c4ab4e28c401fcd21fd2f510eb4698f503dc3f files/digest-rdesktop-1.5.0-r2 244
+SHA256 2c6dadd4c4ceb7ac98766476972b6fff4f90c679175cf166a413c8b664daf9d8 files/digest-rdesktop-1.5.0-r2 244

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 (file)
index 0000000..81d1b24
--- /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 (file)
index 0000000..8b550b5
--- /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 613f8d1ff5aac7de7a0ec241d46a762540f58149..24220286300776f8d480113ab3c4018926f2abc6 100644 (file)
--- 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 (file)
index 0000000..66be89f
--- /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
+}