From 4615a1a283618f5357901347aae48c6724572959 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 03 2016 06:21:53 +0000
Subject: import pcsc-lite-ccid-1.4.10-12.el7


---

diff --git a/SOURCES/ccid-1.4.10-max-cpu-bug.patch b/SOURCES/ccid-1.4.10-max-cpu-bug.patch
new file mode 100644
index 0000000..c84ee0b
--- /dev/null
+++ b/SOURCES/ccid-1.4.10-max-cpu-bug.patch
@@ -0,0 +1,77 @@
+diff -up ./src/ccid_usb.c.max_cpu_bug ./src/ccid_usb.c
+--- ./src/ccid_usb.c.max_cpu_bug	2012-06-22 00:25:20.000000000 -0700
++++ ./src/ccid_usb.c	2016-06-29 17:17:11.284337349 -0700
+@@ -154,6 +154,36 @@ status_t OpenUSB(unsigned int reader_ind
+ } /* OpenUSB */
+ 
+ 
++ /*****************************************************************************
++  *
++  *                                      close_libusb_if_needed
++  *                                      (pulled from upstream ccid_usb)
++  *
++  ****************************************************************************/
++ static void close_libusb_if_needed(void)
++ {
++         int i, to_exit = TRUE;
++ 
++         if (NULL == ctx)
++                 return;
++ 
++         /* if at least 1 reader is still in use we do not exit libusb */
++         for (i=0; i<CCID_DRIVER_MAX_READERS; i++)
++         {
++                 if (usbDevice[i].dev_handle != NULL)
++                         to_exit = FALSE;
++         }
++ 
++         if (to_exit)
++         {
++                 DEBUG_INFO("libusb_exit");
++                 libusb_exit(ctx);
++                 ctx = NULL;
++         }
++} /* close_libusb_if_needed */
++ 
++
++
+ /*****************************************************************************
+  *
+  *					OpenUSBByName
+@@ -609,8 +639,8 @@ again:
+ end:
+ 	if (usbDevice[reader_index].dev_handle == NULL)
+ 	{
+-		/* does not work for libusb <= 1.0.8 */
+-		/* libusb_exit(ctx); */
++	    close_libusb_if_needed();
++
+ 		if (claim_failed)
+ 			return STATUS_COMM_ERROR;
+ 		return STATUS_NO_SUCH_DEVICE;
+@@ -628,6 +658,9 @@ end1:
+ 	/* free bundle list */
+ 	bundleRelease(&plist);
+ 
++	if (return_value != STATUS_SUCCESS)
++		close_libusb_if_needed();
++
+ 	return return_value;
+ } /* OpenUSBByName */
+ 
+@@ -776,13 +809,13 @@ status_t CloseUSB(unsigned int reader_in
+ 			usbDevice[reader_index].interface);
+ 		(void)libusb_close(usbDevice[reader_index].dev_handle);
+ 
+-		/* does not work for libusb <= 1.0.8 */
+-		/* libusb_exit(ctx); */
+ 	}
+ 
+ 	/* mark the resource unused */
+ 	usbDevice[reader_index].dev_handle = NULL;
+ 	usbDevice[reader_index].interface = 0;
++	
++	close_libusb_if_needed();
+ 
+ 	return STATUS_SUCCESS;
+ } /* CloseUSB */
diff --git a/SOURCES/ccid-readers-3.4.20.patch b/SOURCES/ccid-readers-3.4.20.patch
new file mode 100644
index 0000000..400e813
--- /dev/null
+++ b/SOURCES/ccid-readers-3.4.20.patch
@@ -0,0 +1,23 @@
+diff -up ./readers/supported_readers.txt.yubikey_2 ./readers/supported_readers.txt
+--- ./readers/supported_readers.txt.yubikey_2	2016-06-23 15:45:33.152338328 -0700
++++ ./readers/supported_readers.txt	2016-06-23 15:59:10.636954394 -0700
+@@ -87,6 +87,7 @@
+ 
+ # OMNIKEY AG
+ 0x076B:0x3021:OMNIKEY AG CardMan 3121
++0x076B:0x3022:OMNIKEY AG CardMan 3121-1
+ 
+ # Precise Biometrics
+ 0x076B:0xA022:Precise Biometrics Sense MC
+@@ -438,6 +439,11 @@
+ 0x1050:0x0111:Yubico Yubikey NEO OTP+CCID
+ 0x1050:0x0112:Yubico Yubikey NEO CCID
+ 0x1050:0x0115:Yubico Yubikey NEO U2F+CCID
++0x1050:0x0116:Yubico Yubikey NEO OTP+U2F+CCID
++0x1050:0x0404:Yubico Yubikey 4 CCID
++0x1050:0x0405:Yubico Yubikey 4 OTP+CCID
++0x1050:0x0406:Yubico Yubikey 4 U2F+CCID
++0x1050:0x0407:Yubico Yubikey 4 OTP+U2F+CCID
+ 
+ ##########################
+ # section: unsupported
diff --git a/SPECS/pcsc-lite-ccid.spec b/SPECS/pcsc-lite-ccid.spec
index 9cc7ddf..c000d37 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:        10%{?dist}
+Release:        12%{?dist}
 Summary:        Generic USB CCID smart card reader driver
 
 Group:          System Environment/Libraries
@@ -15,6 +15,9 @@ 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
+Patch5:		ccid-readers-3.4.20.patch
+Patch6:		ccid-1.4.10-max-cpu-bug.patch
+
 
 BuildRequires:  libusb1-devel
 BuildRequires:  pcsc-lite-devel >= %{pcsc_lite_ver}
@@ -37,6 +40,8 @@ PC/SC Lite daemon.
 %patch2 -b .omnikey
 %patch3 -b .maxreaders
 %patch4 -b .yubikey
+%patch5 -b .yubikey_2
+%patch6 -b .max_cpu_bug
 
 
 %build
@@ -64,6 +69,12 @@ rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/reader.conf.d
 
 
 %changelog
+* Thu Jun 23 2016 Robert Relyea <rrelyea@redhat.com - 1.4.10-12
+- Fix cpu busy waiting if the last USB device has been removed.
+
+* Thu Jun 23 2016 Robert Relyea <rrelyea@redhat.com - 1.4.10-11
+- Add support for missing readers (mostly yubikey 4)
+
 * Mon Jul 6 2015 Robert Relyea <rrelyea@redhat.com - 1.4.10-10
 - fix corrupted patch