[coolkey/f14/master] pcsc-lite is now defining LPSCARD_READERSTATE where it didn't before. remove the hack in cky_card.c
Robert Relyea
rrelyea at fedoraproject.org
Wed Sep 8 21:44:24 UTC 2010
commit bc0b6cb226392bb09ac9266e04aa177d677556f8
Author: Robert Relyea <rrelyea at redhat.com>
Date: Wed Sep 8 14:43:30 2010 -0700
pcsc-lite is now defining LPSCARD_READERSTATE where it didn't before. remove
the hack in cky_card.c which was there to handle the lack.
coolkey-pcsc-lite-fix.patch | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/coolkey-pcsc-lite-fix.patch b/coolkey-pcsc-lite-fix.patch
index 8b1dcd8..f528676 100644
--- a/coolkey-pcsc-lite-fix.patch
+++ b/coolkey-pcsc-lite-fix.patch
@@ -1,6 +1,6 @@
-diff -up ./src/coolkey/slot.cpp.f14 ./src/coolkey/slot.cpp
---- ./src/coolkey/slot.cpp.f14 2010-09-08 13:14:46.498363000 -0700
-+++ ./src/coolkey/slot.cpp 2010-09-08 13:15:25.962285000 -0700
+diff -up ./src/coolkey/slot.cpp.reader-state-fix ./src/coolkey/slot.cpp
+--- ./src/coolkey/slot.cpp.reader-state-fix 2010-09-08 13:25:14.479109000 -0700
++++ ./src/coolkey/slot.cpp 2010-09-08 13:25:14.506109000 -0700
@@ -2185,6 +2185,7 @@ Slot::readCACCertificateFirst(CKYBuffer
{
CKYStatus status;
@@ -9,9 +9,20 @@ diff -up ./src/coolkey/slot.cpp.f14 ./src/coolkey/slot.cpp
if (mOldCAC) {
/* get the first 100 bytes of the cert */
-diff -up ./src/libckyapplet/cky_card.h.f14 ./src/libckyapplet/cky_card.h
---- ./src/libckyapplet/cky_card.h.f14 2010-09-08 13:17:14.393067000 -0700
-+++ ./src/libckyapplet/cky_card.h 2010-09-08 13:17:45.733005000 -0700
+diff -up ./src/libckyapplet/cky_card.c.reader-state-fix ./src/libckyapplet/cky_card.c
+--- ./src/libckyapplet/cky_card.c.reader-state-fix 2010-09-08 14:05:10.859321000 -0700
++++ ./src/libckyapplet/cky_card.c 2010-09-08 14:05:42.792257000 -0700
+@@ -27,7 +27,6 @@
+
+ #ifndef WINAPI
+ #define WINAPI
+-typedef SCARD_READERSTATE *LPSCARD_READERSTATE;
+ #endif
+
+ #ifndef SCARD_E_NO_READERS_AVAILABLE
+diff -up ./src/libckyapplet/cky_card.h.reader-state-fix ./src/libckyapplet/cky_card.h
+--- ./src/libckyapplet/cky_card.h.reader-state-fix 2006-06-09 11:44:17.000000000 -0700
++++ ./src/libckyapplet/cky_card.h 2010-09-08 13:25:14.518109000 -0700
@@ -41,23 +41,23 @@ CKYLIST_DECLARE(CKYReaderName, char *)
CKYLIST_DECLARE(CKYCardConnection, CKYCardConnection *)
More information about the scm-commits
mailing list