Remove vulnerbale version, bug #220911; add pcsc-lite smartcard support, bug #222215

Package-Manager: portage-2.1.5.2

4 files changed, 31 insertions, 36 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index 26481e600f36..d5fe8221630a 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/rdesktop
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.110 2008/05/20 13:13:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.111 2008/05/21 14:13:19 voyageur Exp $
+
+*rdesktop-1.6.0-r1 (21 May 2008)
+
+  21 May 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/rdesktop-1.5.0-libX11-segfault-fix.patch,
+  -rdesktop-1.5.0-r3.ebuild, +rdesktop-1.6.0-r1.ebuild:
+  Remove vulnerable version, bug #220911
+  Add pcsc-lite smartcard support, bug #222215, also clean ebuild a bit
 
   20 May 2008; Bernard Cafarelli <voyageur@gentoo.org> metadata.xml:
   Taking over maintainership
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 6a976bd74dea..70b26f29efd8 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,10 +1,8 @@
-AUX rdesktop-1.5.0-libX11-segfault-fix.patch 444 RMD160 a20a41b2ee302b40065efb338112e3c0c452d1a3 SHA1 36a6142a18af08dbacbf1a63b0d2ac91ba1fa160 SHA256 07a41cbf405ea992954b2691e5d9e4360ee64aace28f39e85a081b700a3ec1c3
 AUX rdesktop-keymap-additional 1568 RMD160 002873aa8c51fd8bb16357a57d90148c9a64c130 SHA1 6b84deeee4fc368459fcee897f90328be1f3c1db SHA256 3642f38bff8902fa1b5093001ce8e076dcfeddf906b745173dec4ce61da42196
 AUX rdesktop-keymap-cs 1536 RMD160 bd529b2b5f4adffd4f6914d6067ac23b0edb30da SHA1 d6cdae7769e22fbdf5cc13c4ef447e6ffe5def15 SHA256 91bd229fdb7fb1f0d9e6d0dcf35a429a2c51afa1fb8e2b3414852dc528218b6e
 AUX rdesktop-keymap-sk 1561 RMD160 0f8378b6eadd549ef735d92887d1c51003bbfbdf SHA1 117cf53e7c914f698cdd6cb77881bf2e580afbf4 SHA256 33024ca566d97b5c041d3ca45634d3baa075b456389140bd5991e3927fd37b07
-DIST rdesktop-1.5.0.tar.gz 245137 RMD160 350e08166d0b7620b4ed9c6594addae7ec53d15a SHA1 e3086bf865191eed41631813125f482e279c7f3d SHA256 5ead17c3d29cb1028aeca485ee7a8c65694c1b02a1b7014c3da920b265a438aa
 DIST rdesktop-1.6.0.tar.gz 284728 RMD160 cf604cd1bc0707b485deb653efa3e47e21fabc4c SHA1 b8bfd03d4640d285a0aee5b3fb199a47cb4225f2 SHA256 35026eaa8e14ca8bd0ba3730926f14222f8452f2ac662623bbf1909d8b060979
-EBUILD rdesktop-1.5.0-r3.ebuild 1783 RMD160 4791d17927c0183285c50bdf6068be3e9ce21228 SHA1 57993a663c6012095915206fef182ae803b3bc41 SHA256 9feb43424214f14bf5512682a5233537d09430c2dfb4a7b833f1186ff51b9f5f
+EBUILD rdesktop-1.6.0-r1.ebuild 1860 RMD160 69380ecb6e43e40d7928621d04a14a2510e2fd2d SHA1 89be7e22b0c14f6a73febbb1c69b54e0ebc1e735 SHA256 2a327df8e05fc4190f301ca2060962c8a8cf05b1fcf63b64d662764a740ee30c
 EBUILD rdesktop-1.6.0.ebuild 1678 RMD160 587f79c6d9a6f7523395d316d4712732838b72ed SHA1 676b25d0a45cc22777fe385670cacd5a4051e299 SHA256 5b2fbaa11c63ac80657f1aed9f9b1d36d90bb0258ed0208cd417b7bfe4f33119
-MISC ChangeLog 14676 RMD160 03e56818f63edad9494fcaf84542ee3cc25218ef SHA1 d3490d02251412fd3d47829431799765df2630ee SHA256 c1ee479c95741ac9c49e2637b06a1f18012a476c93cb7409b71ed349922e5dca
+MISC ChangeLog 14986 RMD160 b93dfeec7ffa391d03276e4874cfb3ca6a11964b SHA1 885e423ce6f4d6111297cf47b857361d9c9253f9 SHA256 9d834eabbcf5353ef2ff5f92d326434c946693f87645fc09275da93b7d30e8cd
 MISC metadata.xml 546 RMD160 0d48eb9787d86ce074304e9df2b56d20964c987c SHA1 af5b472ca5480a97dfcf16faba114c69db308077 SHA256 c62c986ccc8eec6ea00798a069af6a9757c5296da76be5e5852305a1c1c66a0d
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
deleted file mode 100644
index 8b550b543fa4..000000000000
--- a/net-misc/rdesktop/files/rdesktop-1.5.0-libX11-segfault-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/rdesktop-1.5.0-r3.ebuild b/net-misc/rdesktop/rdesktop-1.6.0-r1.ebuild
index a2b2903b83c8..1bc8f472b677 100644
--- a/net-misc/rdesktop/rdesktop-1.5.0-r3.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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-r3.ebuild,v 1.9 2007/09/27 14:03:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.6.0-r1.ebuild,v 1.1 2008/05/21 14:13:19 voyageur Exp $
 
 inherit eutils
 
@@ -12,8 +12,8 @@ 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ao debug ipv6 oss pcsc-lite"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
@@ -22,41 +22,42 @@ RDEPEND=">=dev-libs/openssl-0.9.6b
 	x11-libs/libXext
 	x11-libs/libXau
 	x11-libs/libXdmcp
-	ao? ( >=media-libs/libao-0.8.6 )"
+	ao? ( >=media-libs/libao-0.8.6 )
+	pcsc-lite? ( sys-apps/pcsc-lite )"
 DEPEND="${RDEPEND}
 	x11-libs/libXt"
 
 src_unpack() {
-	unpack ${A} && cd "${S}"
+	unpack ${A}
+	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-libX11-segfault-fix.patch"
-}
-
-src_compile() {
-	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
+	# Prevent automatic stripping
 	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
 	sed -i -e "s:${strip}::" Makefile.in \
 		|| die "sed failed in Makefile.in"
+}
 
+src_compile() {
 	if use oss; then
-		extra_conf=`use_with oss sound`
+		extra_conf=$(use_with oss sound)
 	else
-		extra_conf=`use_with ao sound libao`
+		extra_conf=$(use_with ao sound libao)
 	fi
 
 	econf \
 		--with-openssl=/usr \
-		`use_with debug` \
-		`use_with ipv6` \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_enable pcsc-lite smartcard) \
 		${extra_conf} \
-		|| die
+		|| die "configuration failed"
 
-	emake || die
+	emake || die "compilation failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install
-	dodoc COPYING doc/HACKING doc/TODO doc/keymapping.txt
+	emake DESTDIR="${D}" install || die "installation failed"
+	dodoc doc/HACKING doc/TODO doc/keymapping.txt
 
 	# For #180313 - applies to versions >= 1.5.0
 	# Fixes sf.net bug