From b2ca4a8b1407c7de83dcf8ae27611ddd852b0c5d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 16:07:46 +0000 Subject: import pcsc-lite-ccid-1.4.10-10.el7 --- diff --git a/SOURCES/ccid-1.4.10-maxreaders.patch b/SOURCES/ccid-1.4.10-maxreaders.patch new file mode 100644 index 0000000..14e4aa7 --- /dev/null +++ b/SOURCES/ccid-1.4.10-maxreaders.patch @@ -0,0 +1,12 @@ +diff -up ./src/ccid_ifdhandler.h.maxreaders ./src/ccid_ifdhandler.h +--- ./src/ccid_ifdhandler.h.maxreaders 2015-07-06 16:01:10.922054803 -0700 ++++ ./src/ccid_ifdhandler.h 2015-07-06 16:01:17.811926253 -0700 +@@ -51,7 +51,7 @@ extern int DriverOptions; + * The maximum number of readers is also limited in pcsc-lite (16 by default) + * see the definition of PCSCLITE_MAX_READERS_CONTEXTS in src/PCSC/pcsclite.h + */ +-#define CCID_DRIVER_MAX_READERS 16 ++#define CCID_DRIVER_MAX_READERS 32 + + /* + * CCID driver specific functions diff --git a/SOURCES/ccid-1.4.10-yubikey.patch b/SOURCES/ccid-1.4.10-yubikey.patch new file mode 100644 index 0000000..077b283 --- /dev/null +++ b/SOURCES/ccid-1.4.10-yubikey.patch @@ -0,0 +1,20 @@ +diff -up ./readers/supported_readers.txt.yubikey ./readers/supported_readers.txt +--- ./readers/supported_readers.txt.yubikey 2015-07-06 14:31:02.772908416 -0700 ++++ ./readers/supported_readers.txt 2015-07-06 14:31:25.783479307 -0700 +@@ -437,6 +437,7 @@ + # Yubico + 0x1050:0x0111:Yubico Yubikey NEO OTP+CCID + 0x1050:0x0112:Yubico Yubikey NEO CCID ++0x1050:0x0115:Yubico Yubikey NEO U2F+CCID + + ########################## + # section: unsupported +@@ -466,6 +467,8 @@ + # Hewlett-Packard Company + 0x03F0:0x0036:Hewlett-Packard Company HP USB CCID Smartcard Keyboard + 0x03F0:0x1024:Hewlett-Packard Company HP USB Smart Card Keyboard ++0x03F0:0x104A:Hewlett-Packard Company HP Smart Card Terminal KUS1206 ++0x03F0:0x164A:Hewlett-Packard Company HP Smart Card Terminal SK-2027 + + # KOBIL Systems + 0x0D46:0x4000:KOBIL Systems mIDentity M diff --git a/SPECS/pcsc-lite-ccid.spec b/SPECS/pcsc-lite-ccid.spec index 50e9f47..9cc7ddf 100644 --- a/SPECS/pcsc-lite-ccid.spec +++ b/SPECS/pcsc-lite-ccid.spec @@ -4,7 +4,7 @@ Name: pcsc-lite-ccid Version: 1.4.10 -Release: 7%{?dist} +Release: 10%{?dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -13,6 +13,8 @@ URL: http://pcsclite.alioth.debian.org/ccid.html Source0: http://alioth.debian.org/download.php/%{upstream_build}/ccid-%{version}.tar.bz2 Patch1: ccid-1.4.10-voltage.patch Patch2: ccid-1.4.10-omnikey-3121.patch +Patch3: ccid-1.4.10-maxreaders.patch +Patch4: ccid-1.4.10-yubikey.patch BuildRequires: libusb1-devel BuildRequires: pcsc-lite-devel >= %{pcsc_lite_ver} @@ -33,6 +35,8 @@ PC/SC Lite daemon. %setup -q -n ccid-%{version} %patch1 -b .voltage %patch2 -b .omnikey +%patch3 -b .maxreaders +%patch4 -b .yubikey %build @@ -60,6 +64,15 @@ rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/reader.conf.d %changelog +* Mon Jul 6 2015 Robert Relyea