diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2013-11-19 09:44:43 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2013-11-19 09:44:43 +0000 |
| commit | 11f244fa947617bece53e5120dcf412b2fdd3511 (patch) | |
| tree | 9b7936a91a055ea973681d897ac72599848d7152 /net-misc/rdesktop/files | |
| parent | Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El Lazkan... (diff) | |
| download | gentoo-2-11f244fa947617bece53e5120dcf412b2fdd3511.tar.gz gentoo-2-11f244fa947617bece53e5120dcf412b2fdd3511.tar.bz2 gentoo-2-11f244fa947617bece53e5120dcf412b2fdd3511.zip | |
Version bump, bugfix release. Drop 1.7.0 versions
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C74525F2)
Diffstat (limited to 'net-misc/rdesktop/files')
| -rw-r--r-- | net-misc/rdesktop/files/rdesktop-1.7.0+pcsc-lite-1.6.6.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/net-misc/rdesktop/files/rdesktop-1.7.0+pcsc-lite-1.6.6.patch b/net-misc/rdesktop/files/rdesktop-1.7.0+pcsc-lite-1.6.6.patch deleted file mode 100644 index 9b8d3aa5b600..000000000000 --- a/net-misc/rdesktop/files/rdesktop-1.7.0+pcsc-lite-1.6.6.patch +++ /dev/null @@ -1,50 +0,0 @@ -Index: scard.c -=================================================================== ---- scard.c (revision 1609) -+++ scard.c (working copy) -@@ -1165,10 +1165,10 @@ - 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)); -@@ -1253,7 +1253,7 @@ - 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)); -@@ -1274,7 +1274,7 @@ - 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: scard.h -=================================================================== ---- scard.h (revision 1609) -+++ scard.h (working copy) -@@ -50,8 +50,8 @@ - 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_A; -+typedef LPSCARD_READERSTATE MYPCSC_LPSCARD_READERSTATE_A; - - typedef struct - { |