Add patch to allow building against modern pcsc-lite (bug #349813 by me).

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

4 files changed, 227 insertions, 4 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index 0a295e8efb7a..9d3214692cfe 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/rdesktop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.114 2010/03/09 10:21:43 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.115 2010/12/26 18:30:11 flameeyes Exp $
+
+  26 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  rdesktop-1.6.0-r4.ebuild, +files/rdesktop-1.6.0+pcsc-lite-1.6.6.patch:
+  Add patch to allow building against modern pcsc-lite (bug #349813 by me).
 
 *rdesktop-1.6.0-r4 (09 Mar 2010)
 
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index bdedeb59b54f..bf6308b27e28 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX rdesktop-1.6.0+pcsc-lite-1.6.6.patch 8776 RMD160 1f3aca960e80049b968e284e1016265a58d19d3b SHA1 1241b12c12475094de0887cfae66813748dc7915 SHA256 41a192bd8a3c34f8d12d5e33faff08773eab55f50a839d29f08066a9e0e9b02c
 AUX rdesktop-1.6.0-smartcard_configure.patch 616 RMD160 1d5a67fd22426fbe2167cb8c7b4812590b7615d5 SHA1 7071e6ae1de7a8b6d9431288765bb20dd26ac2ef SHA256 04130d39c0472eda28600fd24592cf46ca0c222ef6c40d3bdd141670e388f365
 AUX rdesktop-1.6.0-sound_configure.patch 799 RMD160 1c44e9b87505454c2e5b135b36328a38c45e9dd7 SHA1 00a78abf151f7aa280b282fc0607550149bf3d6b SHA256 71db62d88e3c3bf5cbfceeddeb33958b2f24980ab3d7734511f13fd48a43e119
 AUX rdesktop-keymap-additional 1568 RMD160 002873aa8c51fd8bb16357a57d90148c9a64c130 SHA1 6b84deeee4fc368459fcee897f90328be1f3c1db SHA256 3642f38bff8902fa1b5093001ce8e076dcfeddf906b745173dec4ce61da42196
@@ -6,7 +10,14 @@ AUX rdesktop-keymap-sk 1561 RMD160 0f8378b6eadd549ef735d92887d1c51003bbfbdf SHA1
 DIST rdesktop-1.6.0-rdpusb.patch.bz2 20547 RMD160 a6a33432e8bc0cc2cb09bc5d5d650f534eebc690 SHA1 e67308ab1e94a2239d885b944290836074b4d094 SHA256 c090acd39e02bebfa5d3045ec661939db3df5a0d66c3124a0e1109e5bb143a3b
 DIST rdesktop-1.6.0.tar.gz 284728 RMD160 cf604cd1bc0707b485deb653efa3e47e21fabc4c SHA1 b8bfd03d4640d285a0aee5b3fb199a47cb4225f2 SHA256 35026eaa8e14ca8bd0ba3730926f14222f8452f2ac662623bbf1909d8b060979
 EBUILD rdesktop-1.6.0-r3.ebuild 2210 RMD160 a880280606855b1945282e7be60ddd3814cadbd2 SHA1 45d8061022da5e3bd2fb341975e36eca94a4a7c4 SHA256 5d41443b192cec7f9d17706aaec354a215bf026614fc2d98ccaba7ccf1da6da5
-EBUILD rdesktop-1.6.0-r4.ebuild 2365 RMD160 9156c0a4d3505047bcb96bc4130fa0cfb9f957b2 SHA1 56c7a2553f4f476057aff79ab030487c20595adc SHA256 d5853df3dac9233075584f4f21244e70dbf8c735e33683fb2b458fa27c0b6ec6
+EBUILD rdesktop-1.6.0-r4.ebuild 2430 RMD160 6ac7d63bcb8590797101a337bd01b899c5638785 SHA1 689d2e1dadb690aa99475d2f669f9363847e983a SHA256 e99b803553ea8d5e79de9202c6cb89e472504ebd70c1978b7b5464923eb91ba7
 EBUILD rdesktop-1.6.0.ebuild 1678 RMD160 587f79c6d9a6f7523395d316d4712732838b72ed SHA1 676b25d0a45cc22777fe385670cacd5a4051e299 SHA256 5b2fbaa11c63ac80657f1aed9f9b1d36d90bb0258ed0208cd417b7bfe4f33119
-MISC ChangeLog 15752 RMD160 b7a8d0caeb45cb1cb398a841f61acd7980962d51 SHA1 b26578377b4dc52f723209b355379770a19033f6 SHA256 e8cf0f16d14fbf45a8660edc95752a48420a4df77dd7091db547c923d23280b2
+MISC ChangeLog 15959 RMD160 561c486b13416469ddc48c056f28a090b1d2c936 SHA1 ef5f284c8230327a1ef092cc8cd7925054aa71f5 SHA256 49171ffc49d796234531e902fc030798ea95bb81ede90afd2cc657529dc9eda3
 MISC metadata.xml 778 RMD160 309d776677ddd6688597175f76b5d2ee42ffb81b SHA1 a80d6d83c7b1bc8662f076ba14f0f28f49d05c58 SHA256 e146ff3079693d17c8602d895b0a85f0b857a722c99f8477706a927f21962a0b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0XiZIACgkQAiZjviIA2XgdyACcDKKxTTpRnUPrAD/qxrlHuUYO
+zKQAoLnkcMEexCSV/Qs/tDB286cNxruN
+=zGZn
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..963a870a314b
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.6.0+pcsc-lite-1.6.6.patch
@@ -0,0 +1,206 @@
+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/rdesktop-1.6.0-r4.ebuild b/net-misc/rdesktop/rdesktop-1.6.0-r4.ebuild
index d866eb04f73b..75bf5786b4f7 100644
--- a/net-misc/rdesktop/rdesktop-1.6.0-r4.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.6.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.1 2010/03/09 10:21:43 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.6.0-r4.ebuild,v 1.2 2010/12/26 18:30:11 flameeyes Exp $
 
 EAPI=2
 
@@ -44,6 +44,8 @@ src_prepare() {
 	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
 }