From 5145a15421070ac6533d62cfda47404b414cf484 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 05 2015 13:25:58 +0000 Subject: import coolkey-1.1.0-28.el7 --- diff --git a/SOURCES/coolkey-1.1.0-fix-spurious-event.patch b/SOURCES/coolkey-1.1.0-fix-spurious-event.patch new file mode 100644 index 0000000..739901a --- /dev/null +++ b/SOURCES/coolkey-1.1.0-fix-spurious-event.patch @@ -0,0 +1,11 @@ +diff -up ./src/coolkey/slot.cpp.fix-spurious ./src/coolkey/slot.cpp +--- ./src/coolkey/slot.cpp.fix-spurious 2014-09-26 15:31:17.277958895 -0700 ++++ ./src/coolkey/slot.cpp 2014-09-26 15:34:33.218313227 -0700 +@@ -1412,6 +1412,7 @@ SlotList::waitForSlotEvent(CK_FLAGS flag + #endif + } while ((status == CKYSUCCESS) || + (CKYCardContext_GetLastError(context) == SCARD_E_TIMEOUT) || ++ (CKYCardContext_GetLastError(context) == SCARD_E_UNKNOWN_READER) || + (CKYCardContext_GetLastError(context) == SCARD_E_READER_UNAVAILABLE) || + (CKYCardContext_GetLastError(context) == SCARD_E_NO_SERVICE) || + (CKYCardContext_GetLastError(context) == SCARD_E_SERVICE_STOPPED) ); diff --git a/SPECS/coolkey.spec b/SPECS/coolkey.spec index e5ce824..862acb1 100644 --- a/SPECS/coolkey.spec +++ b/SPECS/coolkey.spec @@ -22,7 +22,7 @@ Name: coolkey Version: 1.1.0 -Release: 27%{?dist} +Release: 28%{?dist} Summary: CoolKey PKCS #11 module License: LGPLv2 URL: http://directory.fedora.redhat.com/wiki/CoolKey @@ -38,6 +38,7 @@ Patch8: coolkey-pcsc-lite-fix.patch Patch9: coolkey-fix-token-removal-failure.patch Patch10: coolkey-piv-ecc-el7.patch Patch20: coolkey-1.1.0-noapplet.patch +Patch21: coolkey-1.1.0-fix-spurious-event.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +79,7 @@ Linux Driver support to access the CoolKey applet. %patch9 -p1 -b .fix-token-removal-failure %patch10 -b .piv-ecc %patch20 -b .noapplet +%patch21 -b .fix-spurious %build autoconf @@ -131,6 +133,10 @@ fi %changelog +* Fri Sep 26 2014 Robert Relyea - 1.1.0-28 +- update coolkey to handle the new error ccid/pcsc-lite returns on reader + removal. + * Fri Dec 27 2013 Daniel Mach - 1.1.0-27 - Mass rebuild 2013-12-27