Remove vulnerable version bug #364191

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 6 insertions, 293 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index a2b086f8135a..5c0675aec2e7 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/rdesktop
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.128 2011/04/26 12:16:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.129 2011/04/26 12:46:05 voyageur Exp $
+
+  26 Apr 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  -rdesktop-1.6.0-r4.ebuild, -files/rdesktop-1.6.0+pcsc-lite-1.6.6.patch,
+  metadata.xml:
+  Remove vulnerable version bug #364191
 
   26 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> rdesktop-1.7.0.ebuild:
   ppc64 stable wrt #364191
diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0+pcsc-lite-1.6.6.patch b/net-misc/rdesktop/files/rdesktop-1.6.0+pcsc-lite-1.6.6.patch
deleted file mode 100644
index 963a870a314b..000000000000
--- a/net-misc/rdesktop/files/rdesktop-1.6.0+pcsc-lite-1.6.6.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-Index: rdesktop-1.6.0/scard.c
-===================================================================
---- rdesktop-1.6.0.orig/scard.c
-+++ rdesktop-1.6.0/scard.c
-@@ -935,12 +935,12 @@ TS_SCardDisconnect(STREAM in, STREAM out
- }
- 
- static int
--needStatusRecheck(MYPCSC_DWORD rv, MYPCSC_LPSCARD_READERSTATE_A rsArray, SERVER_DWORD dwCount)
-+needStatusRecheck(MYPCSC_DWORD rv, MYPCSC_LPSCARD_READERSTATE rsArray, SERVER_DWORD dwCount)
- {
- 	int i, recall = 0;
- 	if (rv == SCARD_S_SUCCESS)
- 	{
--		MYPCSC_LPSCARD_READERSTATE_A cur;
-+		MYPCSC_LPSCARD_READERSTATE cur;
- 		for (i = 0, cur = rsArray; i < dwCount; i++, cur++)
- 		{
- 			if (cur->dwEventState & SCARD_STATE_UNKNOWN)
-@@ -977,11 +977,11 @@ incStatus(MYPCSC_DWORD code, RD_BOOL map
- }
- 
- static void
--copyReaderState_MyPCSCToServer(MYPCSC_LPSCARD_READERSTATE_A src, SERVER_LPSCARD_READERSTATE_A dst,
-+copyReaderState_MyPCSCToServer(MYPCSC_LPSCARD_READERSTATE src, SERVER_LPSCARD_READERSTATE dst,
- 			       MYPCSC_DWORD readerCount)
- {
--	MYPCSC_LPSCARD_READERSTATE_A srcIter;
--	SERVER_LPSCARD_READERSTATE_A dstIter;
-+	MYPCSC_LPSCARD_READERSTATE srcIter;
-+	SERVER_LPSCARD_READERSTATE dstIter;
- 	MYPCSC_DWORD i;
- 
- 	for (i = 0, srcIter = src, dstIter = dst; i < readerCount; i++, srcIter++, dstIter++)
-@@ -996,11 +996,11 @@ copyReaderState_MyPCSCToServer(MYPCSC_LP
- }
- 
- static void
--copyReaderState_ServerToMyPCSC(SERVER_LPSCARD_READERSTATE_A src, MYPCSC_LPSCARD_READERSTATE_A dst,
-+copyReaderState_ServerToMyPCSC(SERVER_LPSCARD_READERSTATE src, MYPCSC_LPSCARD_READERSTATE dst,
- 			       SERVER_DWORD readerCount)
- {
--	SERVER_LPSCARD_READERSTATE_A srcIter;
--	MYPCSC_LPSCARD_READERSTATE_A dstIter;
-+	SERVER_LPSCARD_READERSTATE srcIter;
-+	MYPCSC_LPSCARD_READERSTATE dstIter;
- 	SERVER_DWORD i;
- 
- 	for (i = 0, srcIter = src, dstIter = dst; i < readerCount; i++, srcIter++, dstIter++)
-@@ -1022,9 +1022,9 @@ TS_SCardGetStatusChange(STREAM in, STREA
- 	SERVER_SCARDCONTEXT hContext;
- 	SERVER_DWORD dwTimeout;
- 	SERVER_DWORD dwCount;
--	SERVER_LPSCARD_READERSTATE_A rsArray, cur;
-+	SERVER_LPSCARD_READERSTATE rsArray, cur;
- 	SERVER_DWORD *stateArray = NULL, *curState;
--	MYPCSC_LPSCARD_READERSTATE_A myRsArray;
-+	MYPCSC_LPSCARD_READERSTATE myRsArray;
- 	long i;
- 	PMEM_HANDLE lcHandle = NULL;
- #if 0
-@@ -1043,15 +1043,15 @@ TS_SCardGetStatusChange(STREAM in, STREA
- 
- 	if (dwCount > 0)
- 	{
--		rsArray = SC_xmalloc(&lcHandle, dwCount * sizeof(SERVER_SCARD_READERSTATE_A));
-+		rsArray = SC_xmalloc(&lcHandle, dwCount * sizeof(SERVER_SCARD_READERSTATE));
- 		if (!rsArray)
- 			return SC_returnNoMemoryError(&lcHandle, in, out);
--		memset(rsArray, 0, dwCount * sizeof(SERVER_SCARD_READERSTATE_A));
-+		memset(rsArray, 0, dwCount * sizeof(SERVER_SCARD_READERSTATE));
- 		stateArray = SC_xmalloc(&lcHandle, dwCount * sizeof(MYPCSC_DWORD));
- 		if (!stateArray)
- 			return SC_returnNoMemoryError(&lcHandle, in, out);
- 		/* skip two pointers at beginning of struct */
--		for (i = 0, cur = (SERVER_LPSCARD_READERSTATE_A) ((unsigned char **) rsArray + 2);
-+		for (i = 0, cur = (SERVER_LPSCARD_READERSTATE) ((unsigned char **) rsArray + 2);
- 		     i < dwCount; i++, cur++)
- 		{
- 			in->p += 0x04;
-@@ -1116,10 +1116,10 @@ TS_SCardGetStatusChange(STREAM in, STREA
- 		stateArray = NULL;
- 	}
- 
--	myRsArray = SC_xmalloc(&lcHandle, dwCount * sizeof(MYPCSC_SCARD_READERSTATE_A));
-+	myRsArray = SC_xmalloc(&lcHandle, dwCount * sizeof(MYPCSC_SCARD_READERSTATE));
- 	if (!rsArray)
- 		return SC_returnNoMemoryError(&lcHandle, in, out);
--	memset(myRsArray, 0, dwCount * sizeof(SERVER_SCARD_READERSTATE_A));
-+	memset(myRsArray, 0, dwCount * sizeof(SERVER_SCARD_READERSTATE));
- 	copyReaderState_ServerToMyPCSC(rsArray, myRsArray, (SERVER_DWORD) dwCount);
- 
- 	rv = SCardGetStatusChange((MYPCSC_SCARDCONTEXT) hContext, (MYPCSC_DWORD) dwTimeout,
-@@ -1181,7 +1181,7 @@ TS_SCardGetStatusChange(STREAM in, STREA
- 		cur->cbAtr = swap32(cur->cbAtr);
- 
- 		out_uint8p(out, (void *) ((unsigned char **) cur + 2),
--			   sizeof(SERVER_SCARD_READERSTATE_A) - 2 * sizeof(unsigned char *));
-+			   sizeof(SERVER_SCARD_READERSTATE) - 2 * sizeof(unsigned char *));
- 	}
- 	outForceAlignment(out, 8);
- 	SC_xfreeallmemory(&lcHandle);
-@@ -1222,8 +1222,8 @@ TS_SCardLocateCardsByATR(STREAM in, STRE
- 	LPSCARD_ATRMASK_L pAtrMasks, cur;
- 	SERVER_DWORD atrMaskCount = 0;
- 	SERVER_DWORD readerCount = 0;
--	SERVER_LPSCARD_READERSTATE_A rsArray, ResArray, rsCur;
--	MYPCSC_LPSCARD_READERSTATE_A myRsArray;
-+	SERVER_LPSCARD_READERSTATE rsArray, ResArray, rsCur;
-+	MYPCSC_LPSCARD_READERSTATE myRsArray;
- 	PMEM_HANDLE lcHandle = NULL;
- 
- 	in->p += 0x2C;
-@@ -1235,10 +1235,10 @@ TS_SCardLocateCardsByATR(STREAM in, STRE
- 	in_uint8a(in, pAtrMasks, atrMaskCount * sizeof(SCARD_ATRMASK_L));
- 
- 	in_uint32_le(in, readerCount);
--	rsArray = SC_xmalloc(&lcHandle, readerCount * sizeof(SCARD_READERSTATE_A));
-+	rsArray = SC_xmalloc(&lcHandle, readerCount * sizeof(SCARD_READERSTATE));
- 	if (!rsArray)
- 		return SC_returnNoMemoryError(&lcHandle, in, out);
--	memset(rsArray, 0, readerCount * sizeof(SCARD_READERSTATE_A));
-+	memset(rsArray, 0, readerCount * sizeof(SCARD_READERSTATE));
- 
- 	DEBUG_SCARD(("SCARD: SCardLocateCardsByATR(context: 0x%08x, atrs: %d, readers: %d)\n",
- 		     (unsigned) hContext, (int) atrMaskCount, (int) readerCount));
-@@ -1263,14 +1263,14 @@ TS_SCardLocateCardsByATR(STREAM in, STRE
- 		DEBUG_SCARD(("\n"));
- 	}
- 
--	for (i = 0, rsCur = (SERVER_LPSCARD_READERSTATE_A) ((unsigned char **) rsArray + 2);
-+	for (i = 0, rsCur = (SERVER_LPSCARD_READERSTATE) ((unsigned char **) rsArray + 2);
- 	     i < readerCount; i++, rsCur++)
- 	{
- 		in_uint8s(in, 4);
- 		in_uint8a(in, rsCur, SERVER_SCARDSTATESIZE);
- 	}
- 
--	ResArray = SC_xmalloc(&lcHandle, readerCount * sizeof(SERVER_SCARD_READERSTATE_A));
-+	ResArray = SC_xmalloc(&lcHandle, readerCount * sizeof(SERVER_SCARD_READERSTATE));
- 	if (!ResArray)
- 		return SC_returnNoMemoryError(&lcHandle, in, out);
- 
-@@ -1287,10 +1287,10 @@ TS_SCardLocateCardsByATR(STREAM in, STRE
- 			     (unsigned) rsCur->pvUserData, (unsigned) rsCur->dwCurrentState,
- 			     (unsigned) rsCur->dwEventState));
- 	}
--	memcpy(ResArray, rsArray, readerCount * sizeof(SERVER_SCARD_READERSTATE_A));
-+	memcpy(ResArray, rsArray, readerCount * sizeof(SERVER_SCARD_READERSTATE));
- 
- 	/* FIXME segfault here. */
--	myRsArray = SC_xmalloc(&lcHandle, readerCount * sizeof(MYPCSC_SCARD_READERSTATE_A));
-+	myRsArray = SC_xmalloc(&lcHandle, readerCount * sizeof(MYPCSC_SCARD_READERSTATE));
- 	if (!myRsArray)
- 		return SC_returnNoMemoryError(&lcHandle, in, out);
- 	copyReaderState_ServerToMyPCSC(rsArray, myRsArray, readerCount);
-@@ -1323,7 +1323,7 @@ TS_SCardLocateCardsByATR(STREAM in, STRE
- 				if (equal)
- 				{
- 					rsCur->dwEventState |= 0x00000040;	/* SCARD_STATE_ATRMATCH 0x00000040 */
--					memcpy(ResArray + j, rsCur, sizeof(SCARD_READERSTATE_A));
-+					memcpy(ResArray + j, rsCur, sizeof(SCARD_READERSTATE));
- 					DEBUG_SCARD(("SCARD:    \"%s\"\n",
- 						     rsCur->szReader ? rsCur->szReader : "NULL"));
- 					DEBUG_SCARD(("SCARD:        user: 0x%08x, state: 0x%08x, event: 0x%08x\n", (unsigned) rsCur->pvUserData, (unsigned) rsCur->dwCurrentState, (unsigned) rsCur->dwEventState));
-@@ -1344,7 +1344,7 @@ TS_SCardLocateCardsByATR(STREAM in, STRE
- 		rsCur->cbAtr = swap32(rsCur->cbAtr);
- 
- 		out_uint8p(out, (void *) ((unsigned char **) rsCur + 2),
--			   sizeof(SCARD_READERSTATE_A) - 2 * sizeof(unsigned char *));
-+			   sizeof(SCARD_READERSTATE) - 2 * sizeof(unsigned char *));
- 	}
- 
- 	outForceAlignment(out, 8);
-Index: rdesktop-1.6.0/scard.h
-===================================================================
---- rdesktop-1.6.0.orig/scard.h
-+++ rdesktop-1.6.0/scard.h
-@@ -51,8 +51,8 @@ typedef SCARDHANDLE MYPCSC_SCARDHANDLE;
- typedef uint32_t SERVER_SCARDCONTEXT;
- typedef uint32_t SERVER_SCARDHANDLE;
- 
--typedef SCARD_READERSTATE_A MYPCSC_SCARD_READERSTATE_A;
--typedef LPSCARD_READERSTATE_A MYPCSC_LPSCARD_READERSTATE_A;
-+typedef SCARD_READERSTATE MYPCSC_SCARD_READERSTATE;
-+typedef SCARD_READERSTATE *MYPCSC_LPSCARD_READERSTATE;
- 
- typedef struct
- {
-@@ -63,12 +63,12 @@ typedef struct
- 	SERVER_DWORD cbAtr;
- 	unsigned char rgbAtr[MAX_ATR_SIZE];
- }
--SERVER_SCARD_READERSTATE_A;
-+SERVER_SCARD_READERSTATE;
- 
--typedef SERVER_SCARD_READERSTATE_A *SERVER_LPSCARD_READERSTATE_A;
-+typedef SERVER_SCARD_READERSTATE *SERVER_LPSCARD_READERSTATE;
- 
--#define SERVER_SCARDSTATESIZE              (sizeof(SERVER_SCARD_READERSTATE_A) - sizeof(const char *) - sizeof(void *))
--#define MYPCSC_SCARDSTATESIZE              (sizeof(MYPCSC_SCARD_READERSTATE_A) - sizeof(const char *) - sizeof(void *))
-+#define SERVER_SCARDSTATESIZE              (sizeof(SERVER_SCARD_READERSTATE) - sizeof(const char *) - sizeof(void *))
-+#define MYPCSC_SCARDSTATESIZE              (sizeof(MYPCSC_SCARD_READERSTATE) - sizeof(const char *) - sizeof(void *))
- 
- typedef struct _SERVER_SCARD_IO_REQUEST
- {
diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
index 8157f237fb48..27b6f3f8320e 100644
--- a/net-misc/rdesktop/metadata.xml
+++ b/net-misc/rdesktop/metadata.xml
@@ -11,6 +11,5 @@ An open source client for Windows NT Terminal Server and Windows 2000/2003 Termi
 </longdescription>
   <use>
 	  <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag>
-	  <flag name="rdpusb">Enable USB redirection support for <pkg>app-emulation/virtualbox-bin</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/net-misc/rdesktop/rdesktop-1.6.0-r4.ebuild b/net-misc/rdesktop/rdesktop-1.6.0-r4.ebuild
deleted file mode 100644
index 873a61f88e54..000000000000
--- a/net-misc/rdesktop/rdesktop-1.6.0-r4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.6.0-r4.ebuild,v 1.7 2011/01/10 11:13:16 xarthisius Exp $
-
-EAPI=2
-
-inherit autotools 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
-	rdpusb? ( mirror://gentoo/${P}-rdpusb.patch.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="alsa ao debug ipv6 libsamplerate oss pcsc-lite rdpusb"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND=">=dev-libs/openssl-0.9.6b
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.6 )
-	libsamplerate? ( media-libs/libsamplerate )
-	pcsc-lite? ( sys-apps/pcsc-lite )"
-DEPEND="${RDEPEND}
-	x11-libs/libXt"
-
-src_prepare() {
-	# Prevent automatic stripping
-	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
-	sed -i -e "s:${strip}::" Makefile.in \
-		|| die "sed failed in Makefile.in"
-
-	# Automagic dependency on libsamplerate
-	epatch "${FILESDIR}"/${P}-sound_configure.patch
-	# Fix --enable-smartcard logic
-	epatch "${FILESDIR}"/${P}-smartcard_configure.patch
-	# USB redirection support from virtualbox
-	use rdpusb && epatch "${WORKDIR}"/${P}-rdpusb.patch
-	# bug #349813
-	epatch "${FILESDIR}"/${P}+pcsc-lite-1.6.6.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	if use ao; then
-		sound_conf=$(use_with ao sound libao)
-	else if use alsa; then
-			sound_conf=$(use_with alsa sound alsa)
-		else
-			sound_conf=$(use_with oss sound oss)
-		fi
-	fi
-
-	econf \
-		--with-openssl=/usr \
-		$(use_with debug) \
-		$(use_with ipv6) \
-		$(use_with libsamplerate) \
-		$(use_enable pcsc-lite smartcard) \
-		${sound_conf} \
-		|| die "configuration failed"
-}
-
-src_install() {
-	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
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1725634&group_id=24366&atid=381349
-	# check for next version to see if this needs to be removed
-	insinto /usr/share/rdesktop/keymaps
-	newins "${FILESDIR}/rdesktop-keymap-additional" additional
-	newins "${FILESDIR}/rdesktop-keymap-cs" cs
-	newins "${FILESDIR}/rdesktop-keymap-sk" sk
-}