From 180399921181e1f0b4d6047263e9b77f0bba9d6a Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Dec 27 2013 18:54:33 +0000 Subject: import coolkey-1.1.0-27.el7.src.rpm --- diff --git a/SOURCES/coolkey-1.1.0-noapplet.patch b/SOURCES/coolkey-1.1.0-noapplet.patch new file mode 100644 index 0000000..dc931fe --- /dev/null +++ b/SOURCES/coolkey-1.1.0-noapplet.patch @@ -0,0 +1,18 @@ +diff -up ./src/coolkey/slot.cpp.noapplet ./src/coolkey/slot.cpp +--- ./src/coolkey/slot.cpp.noapplet 2013-09-30 14:30:40.069595018 -0700 ++++ ./src/coolkey/slot.cpp 2013-09-30 14:31:27.488595000 -0700 +@@ -762,13 +762,7 @@ Slot::connectToToken() + CKYCardConnection_GetLastError(conn)); + disconnect(); + } +- /* CARD is a PIV card */ +- state |= PIV_CARD | APPLET_SELECTABLE | APPLET_PERSONALIZED; +- isVersion1Key = 0; +- needLogin = 1; +- mCoolkey = 0; +- mOldCAC = 0; +- mCACLocalLogin = getPIVLoginType(); ++ /* CARD is unknown */ + return; + } + state |= CAC_CARD | APPLET_SELECTABLE | APPLET_PERSONALIZED; diff --git a/SPECS/coolkey.spec b/SPECS/coolkey.spec index 771f49a..e5ce824 100644 --- a/SPECS/coolkey.spec +++ b/SPECS/coolkey.spec @@ -22,7 +22,7 @@ Name: coolkey Version: 1.1.0 -Release: 25%{?dist} +Release: 27%{?dist} Summary: CoolKey PKCS #11 module License: LGPLv2 URL: http://directory.fedora.redhat.com/wiki/CoolKey @@ -37,6 +37,8 @@ Patch7: coolkey-cac-1.patch 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 + Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf @@ -75,6 +77,7 @@ Linux Driver support to access the CoolKey applet. %patch8 -b .reader-state-fix %patch9 -p1 -b .fix-token-removal-failure %patch10 -b .piv-ecc +%patch20 -b .noapplet %build autoconf @@ -128,6 +131,12 @@ fi %changelog +* Fri Dec 27 2013 Daniel Mach - 1.1.0-27 +- Mass rebuild 2013-12-27 + +* Tue Nov 26 2013 Robert Relyea - 1.1.0-26 +- delete coolkey from sql db as well as the old one. + * Wed Nov 6 2013 Robert Relyea - 1.1.0-25 - delete coolkey from sql db as well as the old one. @@ -168,7 +177,7 @@ fi * Tue Jan 5 2010 Robert Relyea - 1.1.0-13 - bump the release number to rebuild -* Wed Dec 18 2009 Robert Relyea - 1.1.0-12 +* Fri Dec 18 2009 Robert Relyea - 1.1.0-12 - Fix threading issue. Coolkey will now work with non-threaded applications - that don't link with libpthread. @@ -192,7 +201,7 @@ fi * Thu Sep 27 2007 Jack Magne - 1.1.0-5 - Include patch for moving the cache directory to a safe location. - Bug #299481. -* Fri Aug 20 2007 Bob Relyea - 1.1.0-4 +* Mon Aug 20 2007 Bob Relyea - 1.1.0-4 - Update License description to the new Fedora standard * Thu Jun 21 2007 Kai Engert - 1.1.0-3.1 @@ -235,10 +244,10 @@ fi * Mon Oct 09 2006 Bob Relyea - 1.0.1-8 - pcscd must be running in order to add coolkey. -* Thu Oct 4 2006 Bob Relyea - 1.0.1-7 +* Wed Oct 4 2006 Bob Relyea - 1.0.1-7 - silence modutil warnings -* Thu Sep 30 2006 Bob Relyea - 1.0.1-5 +* Fri Sep 29 2006 Bob Relyea - 1.0.1-5 - install and uninstall coolkey in the system secmod.db * Thu Sep 7 2006 Bob Relyea - 1.0.1-4