From 3dd85f55c8aacfa0704849e7b6cf46d4970b747b Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jan 26 2014 20:06:09 +0000 Subject: import pcsc-lite-ccid-1.4.10-5.el7.src.rpm --- diff --git a/SOURCES/ccid-1.4.10-voltage.patch b/SOURCES/ccid-1.4.10-voltage.patch new file mode 100644 index 0000000..a0323fd --- /dev/null +++ b/SOURCES/ccid-1.4.10-voltage.patch @@ -0,0 +1,41 @@ +diff -up ./src/commands.c.voltage ./src/commands.c +--- ./src/commands.c.voltage 2013-03-16 06:52:33.000000000 -0700 ++++ ./src/commands.c 2013-11-26 15:44:13.533254750 -0800 +@@ -97,6 +97,7 @@ RESPONSECODE CmdPowerOn(unsigned int rea + status_t res; + int length, count = 1; + unsigned int atr_len; ++ int init_voltage = 0; + RESPONSECODE return_value = IFD_SUCCESS; + _ccid_descriptor *ccid_descriptor = get_ccid_descriptor(reader_index); + +@@ -207,6 +208,7 @@ RESPONSECODE CmdPowerOn(unsigned int rea + voltage = 0; /* auto */ + } + } ++ init_voltage = voltage; + + again: + cmd[0] = 0x62; /* IccPowerOn */ +@@ -256,14 +258,19 @@ again: + } + + /* continue with 3 volts and 5 volts */ +- if (voltage > 1) ++ if (voltage) + { + const char *voltage_code[] = { "auto", "5V", "3V", "1.8V" }; + + DEBUG_INFO3("Power up with %s failed. Try with %s.", + voltage_code[voltage], voltage_code[voltage-1]); + voltage--; +- goto again; ++ if (voltage == 0) { ++ voltage = 3; ++ } ++ if (voltage != init_voltage) { ++ goto again; ++ } + } + + return IFD_COMMUNICATION_ERROR; diff --git a/SPECS/pcsc-lite-ccid.spec b/SPECS/pcsc-lite-ccid.spec index 7f5c79a..14a41fa 100644 --- a/SPECS/pcsc-lite-ccid.spec +++ b/SPECS/pcsc-lite-ccid.spec @@ -4,13 +4,14 @@ Name: pcsc-lite-ccid Version: 1.4.10 -Release: 2%{?dist} +Release: 5%{?dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries License: LGPLv2+ 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 BuildRequires: libusb1-devel BuildRequires: pcsc-lite-devel >= %{pcsc_lite_ver} @@ -29,6 +30,7 @@ PC/SC Lite daemon. %prep %setup -q -n ccid-%{version} +%patch1 -b .voltage %build @@ -56,6 +58,15 @@ rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/reader.conf.d %changelog +* Fri Jan 24 2014 Daniel Mach - 1.4.10-5 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 1.4.10-4 +- Mass rebuild 2013-12-27 + +* Tue Nov 26 2013 Robert Relyea - 1.4.10-3 +- bring in voltage patch + * Thu Oct 24 2013 Robert Relyea - 1.4.10-2 - rpmdiff cleanups