| 1 |
flameeyes 10/11/29 13:43:03 |
| 2 |
|
| 3 |
Added: opensc-0.11.13+pcsc-lite-1.6.2.patch |
| 4 |
Log: |
| 5 |
Fix build with recent pcsc-lite (backport from upstream); closes bug #341371; add dependency over libtool (needed for ltdl), and over readline (it was automagic before). In r1 instead add USE flag for readline, OpenSSL and zlib, and rebuild autotools with modern versions to fix bug #317295. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: opensc-0.11.13+pcsc-lite-1.6.2.patch |
| 16 |
=================================================================== |
| 17 |
Index: opensc-0.11.13/src/libopensc/internal-winscard.h |
| 18 |
=================================================================== |
| 19 |
--- opensc-0.11.13.orig/src/libopensc/internal-winscard.h |
| 20 |
+++ opensc-0.11.13/src/libopensc/internal-winscard.h |
| 21 |
@@ -77,7 +77,7 @@ typedef struct |
| 22 |
unsigned long cbAtr; |
| 23 |
unsigned char rgbAtr[MAX_ATR_SIZE]; |
| 24 |
} |
| 25 |
-SCARD_READERSTATE_A; |
| 26 |
+SCARD_READERSTATE; |
| 27 |
|
| 28 |
typedef struct _SCARD_IO_REQUEST |
| 29 |
{ |
| 30 |
@@ -87,8 +87,8 @@ typedef struct _SCARD_IO_REQUEST |
| 31 |
SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST; |
| 32 |
|
| 33 |
typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST; |
| 34 |
-typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A, |
| 35 |
- *LPSCARD_READERSTATE_A; |
| 36 |
+typedef SCARD_READERSTATE SCARD_READERSTATE, *PSCARD_READERSTATE, |
| 37 |
+ *SCARD_READERSTATE; |
| 38 |
|
| 39 |
#endif /* HAVE_SCARD_H */ |
| 40 |
|
| 41 |
@@ -113,7 +113,7 @@ typedef LONG (PCSC_API *SCardEndTransact |
| 42 |
typedef LONG (PCSC_API *SCardStatus_t)(SCARDHANDLE hCard, LPSTR mszReaderNames, LPDWORD pcchReaderLen, |
| 43 |
LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen); |
| 44 |
typedef LONG (PCSC_API *SCardGetStatusChange_t)(SCARDCONTEXT hContext, DWORD dwTimeout, |
| 45 |
- LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders); |
| 46 |
+ SCARD_READERSTATE *rgReaderStates, DWORD cReaders); |
| 47 |
typedef LONG (PCSC_API *SCardControlOLD_t)(SCARDHANDLE hCard, LPCVOID pbSendBuffer, DWORD cbSendLength, |
| 48 |
LPVOID pbRecvBuffer, LPDWORD lpBytesReturned); |
| 49 |
typedef LONG (PCSC_API *SCardControl_t)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID pbSendBuffer, |
| 50 |
Index: opensc-0.11.13/src/libopensc/reader-pcsc.c |
| 51 |
=================================================================== |
| 52 |
--- opensc-0.11.13.orig/src/libopensc/reader-pcsc.c |
| 53 |
+++ opensc-0.11.13/src/libopensc/reader-pcsc.c |
| 54 |
@@ -80,7 +80,7 @@ struct pcsc_private_data { |
| 55 |
|
| 56 |
struct pcsc_slot_data { |
| 57 |
SCARDHANDLE pcsc_card; |
| 58 |
- SCARD_READERSTATE_A reader_state; |
| 59 |
+ SCARD_READERSTATE reader_state; |
| 60 |
DWORD verify_ioctl; |
| 61 |
DWORD verify_ioctl_start; |
| 62 |
DWORD verify_ioctl_finish; |
| 63 |
@@ -353,7 +353,7 @@ static int pcsc_wait_for_event(sc_reader |
| 64 |
sc_context_t *ctx; |
| 65 |
SCARDCONTEXT pcsc_ctx; |
| 66 |
LONG ret; |
| 67 |
- SCARD_READERSTATE_A rgReaderStates[SC_MAX_READERS]; |
| 68 |
+ SCARD_READERSTATE rgReaderStates[SC_MAX_READERS]; |
| 69 |
unsigned long on_bits, off_bits; |
| 70 |
time_t end_time, now, delta; |
| 71 |
size_t i; |
| 72 |
@@ -401,7 +401,7 @@ static int pcsc_wait_for_event(sc_reader |
| 73 |
/* Wait for a status change and return if it's a card insert/removal |
| 74 |
*/ |
| 75 |
for( ; ; ) { |
| 76 |
- SCARD_READERSTATE_A *rsp; |
| 77 |
+ SCARD_READERSTATE *rsp; |
| 78 |
|
| 79 |
/* Scan the current state of all readers to see if they |
| 80 |
* match any of the events we're polling for */ |
Archives