From 4df74acc09cf0a8a886068fbe3a28188bbfe7965 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 4 Jun 2015 11:06:55 +0200 Subject: update opensc to latest stable version --- package/opensc/patches/patch-etc_Makefile_am | 10 ------- .../patch-src_libopensc_internal-winscard_h | 31 ---------------------- .../patches/patch-src_libopensc_reader-pcsc_c | 29 -------------------- .../opensc/patches/patch-src_pkcs11_Makefile_am | 10 ------- .../opensc/patches/patch-src_tools_pkcs11-tool_c | 18 ------------- 5 files changed, 98 deletions(-) delete mode 100644 package/opensc/patches/patch-etc_Makefile_am delete mode 100644 package/opensc/patches/patch-src_libopensc_internal-winscard_h delete mode 100644 package/opensc/patches/patch-src_libopensc_reader-pcsc_c delete mode 100644 package/opensc/patches/patch-src_pkcs11_Makefile_am delete mode 100644 package/opensc/patches/patch-src_tools_pkcs11-tool_c (limited to 'package/opensc/patches') diff --git a/package/opensc/patches/patch-etc_Makefile_am b/package/opensc/patches/patch-etc_Makefile_am deleted file mode 100644 index 71d96fa42..000000000 --- a/package/opensc/patches/patch-etc_Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- opensc-0.11.13.orig/etc/Makefile.am 2009-12-13 10:14:28.000000000 +0100 -+++ opensc-0.11.13/etc/Makefile.am 2013-10-31 16:21:04.000000000 +0100 -@@ -20,6 +20,7 @@ opensc.conf: opensc.conf.in force - - sysconf_DATA=#required in order to create dir - install-exec-hook: install-sysconfDATA opensc.conf -+ $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" - if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \ - $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \ - else \ diff --git a/package/opensc/patches/patch-src_libopensc_internal-winscard_h b/package/opensc/patches/patch-src_libopensc_internal-winscard_h deleted file mode 100644 index 462100356..000000000 --- a/package/opensc/patches/patch-src_libopensc_internal-winscard_h +++ /dev/null @@ -1,31 +0,0 @@ ---- opensc-0.11.13.orig/src/libopensc/internal-winscard.h 2010-02-16 10:03:28.000000000 +0100 -+++ opensc-0.11.13/src/libopensc/internal-winscard.h 2010-12-15 21:47:38.000000000 +0100 -@@ -77,7 +77,7 @@ typedef struct - unsigned long cbAtr; - unsigned char rgbAtr[MAX_ATR_SIZE]; - } --SCARD_READERSTATE_A; -+SCARD_READERSTATE; - - typedef struct _SCARD_IO_REQUEST - { -@@ -87,8 +87,8 @@ typedef struct _SCARD_IO_REQUEST - SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST; - - typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST; --typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A, -- *LPSCARD_READERSTATE_A; -+typedef SCARD_READERSTATE SCARD_READERSTATE, *PSCARD_READERSTATE, -+ *SCARD_READERSTATE; - - #endif /* HAVE_SCARD_H */ - -@@ -113,7 +113,7 @@ typedef LONG (PCSC_API *SCardEndTransact - typedef LONG (PCSC_API *SCardStatus_t)(SCARDHANDLE hCard, LPSTR mszReaderNames, LPDWORD pcchReaderLen, - LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen); - typedef LONG (PCSC_API *SCardGetStatusChange_t)(SCARDCONTEXT hContext, DWORD dwTimeout, -- LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders); -+ SCARD_READERSTATE *rgReaderStates, DWORD cReaders); - typedef LONG (PCSC_API *SCardControlOLD_t)(SCARDHANDLE hCard, LPCVOID pbSendBuffer, DWORD cbSendLength, - LPVOID pbRecvBuffer, LPDWORD lpBytesReturned); - typedef LONG (PCSC_API *SCardControl_t)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID pbSendBuffer, diff --git a/package/opensc/patches/patch-src_libopensc_reader-pcsc_c b/package/opensc/patches/patch-src_libopensc_reader-pcsc_c deleted file mode 100644 index cd4123a16..000000000 --- a/package/opensc/patches/patch-src_libopensc_reader-pcsc_c +++ /dev/null @@ -1,29 +0,0 @@ ---- opensc-0.11.13.orig/src/libopensc/reader-pcsc.c 2010-02-16 10:03:28.000000000 +0100 -+++ opensc-0.11.13/src/libopensc/reader-pcsc.c 2010-12-15 21:44:53.000000000 +0100 -@@ -80,7 +80,7 @@ struct pcsc_private_data { - - struct pcsc_slot_data { - SCARDHANDLE pcsc_card; -- SCARD_READERSTATE_A reader_state; -+ SCARD_READERSTATE reader_state; - DWORD verify_ioctl; - DWORD verify_ioctl_start; - DWORD verify_ioctl_finish; -@@ -353,7 +353,7 @@ static int pcsc_wait_for_event(sc_reader - sc_context_t *ctx; - SCARDCONTEXT pcsc_ctx; - LONG ret; -- SCARD_READERSTATE_A rgReaderStates[SC_MAX_READERS]; -+ SCARD_READERSTATE rgReaderStates[SC_MAX_READERS]; - unsigned long on_bits, off_bits; - time_t end_time, now, delta; - size_t i; -@@ -401,7 +401,7 @@ static int pcsc_wait_for_event(sc_reader - /* Wait for a status change and return if it's a card insert/removal - */ - for( ; ; ) { -- SCARD_READERSTATE_A *rsp; -+ SCARD_READERSTATE *rsp; - - /* Scan the current state of all readers to see if they - * match any of the events we're polling for */ diff --git a/package/opensc/patches/patch-src_pkcs11_Makefile_am b/package/opensc/patches/patch-src_pkcs11_Makefile_am deleted file mode 100644 index b09de08c6..000000000 --- a/package/opensc/patches/patch-src_pkcs11_Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- opensc-0.11.13.orig/src/pkcs11/Makefile.am 2010-02-16 10:03:25.000000000 +0100 -+++ opensc-0.11.13/src/pkcs11/Makefile.am 2013-10-31 17:40:22.000000000 +0100 -@@ -73,6 +73,7 @@ else - PKCS11_SUFFIX=.so - endif - install-exec-hook: install-pkcs11DATA -+ $(MKDIR_P) "$(DESTDIR)$(pkcs11dir)" - for l in opensc-pkcs11$(PKCS11_SUFFIX) onepin-opensc-pkcs11$(PKCS11_SUFFIX) pkcs11-spy$(PKCS11_SUFFIX); do \ - rm -f "$(DESTDIR)$(pkcs11dir)/$$l"; \ - $(LN_S) ../$$l "$(DESTDIR)$(pkcs11dir)/$$l"; \ diff --git a/package/opensc/patches/patch-src_tools_pkcs11-tool_c b/package/opensc/patches/patch-src_tools_pkcs11-tool_c deleted file mode 100644 index aa83f09f7..000000000 --- a/package/opensc/patches/patch-src_tools_pkcs11-tool_c +++ /dev/null @@ -1,18 +0,0 @@ ---- opensc-0.11.13.orig/src/tools/pkcs11-tool.c 2010-02-16 10:03:25.000000000 +0100 -+++ opensc-0.11.13/src/tools/pkcs11-tool.c 2013-10-31 16:04:07.000000000 +0100 -@@ -2235,7 +2235,6 @@ static int sign_verify_openssl(CK_SLOT_I - EVP_sha1(), - EVP_sha1(), - EVP_md5(), -- EVP_ripemd160(), - }; - #endif - -@@ -2820,7 +2819,6 @@ static int test_unwrap(CK_SLOT_ID slot, - errors += wrap_unwrap(slot, sess, EVP_des_cbc(), privKeyObject); - errors += wrap_unwrap(slot, sess, EVP_des_ede3_cbc(), privKeyObject); - errors += wrap_unwrap(slot, sess, EVP_bf_cbc(), privKeyObject); -- errors += wrap_unwrap(slot, sess, EVP_cast5_cfb(), privKeyObject); - #endif - } - -- cgit v1.2.3