Hello community,
here is the log from the commit of package pcsc-acsccid for openSUSE:Factory checked in at 2014-07-04 09:34:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pcsc-acsccid (Old)
and /work/SRC/openSUSE:Factory/.pcsc-acsccid.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcsc-acsccid"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pcsc-acsccid/pcsc-acsccid.changes 2014-06-17 11:23:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pcsc-acsccid.new/pcsc-acsccid.changes 2014-07-04 09:34:52.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 3 07:58:55 UTC 2014 - godfrey.chung@acs.com.hk
+
+- Updated to version 1.0.8.
+
+-------------------------------------------------------------------
Old:
----
acsccid-1.0.7.tar.bz2
New:
----
acsccid-1.0.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcsc-acsccid.spec ++++++
--- /var/tmp/diff_new_pack.X8Jfot/_old 2014-07-04 09:34:54.000000000 +0200
+++ /var/tmp/diff_new_pack.X8Jfot/_new 2014-07-04 09:34:54.000000000 +0200
@@ -34,7 +34,7 @@
%if 0%{?suse_version} >= 1140
BuildRequires: udev
%endif
-Version: 1.0.7
+Version: 1.0.8
Release: 0
Url: http://acsccid.sourceforge.net/
Summary: PCSC Driver for ACS CCID Based Smart Card Readers
@@ -88,7 +88,9 @@
Enhances: modalias(usb:v072fp223bd*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072fp223ed*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072fp223dd*dc*dsc*dp*ic*isc*ip*)
+Enhances: modalias(usb:v072fp2244d*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072fp2239d*dc*dsc*dp*ic*isc*ip*)
+Enhances: modalias(usb:v072fp2211d*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072fp2100d*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072fp2224d*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072fp220fd*dc*dsc*dp*ic*isc*ip*)
++++++ acsccid-1.0.7.tar.bz2 -> acsccid-1.0.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.7/ChangeLog new/acsccid-1.0.8/ChangeLog
--- old/acsccid-1.0.7/ChangeLog 2014-06-16 07:53:24.000000000 +0200
+++ new/acsccid-1.0.8/ChangeLog 2014-07-03 04:09:51.000000000 +0200
@@ -1,3 +1,41 @@
+2014-07-03 Godfrey Chung
+
+ * README: Update README for v1.0.8.
+
+2014-07-03 Godfrey Chung
+
+ * configure.ac: Update the version to 1.0.8 in configure.ac.
+
+2014-07-02 Godfrey Chung
+
+ * src/acr38cmd.c: Change the delay of cold reset in
+ ACR38_CmdPowerOn().
+
+2014-07-02 Godfrey Chung
+
+ * src/ifdhandler.c: Change the delay of cold reset to 10 ms in
+ IFDHPowerICC().
+
+2014-07-02 Godfrey Chung
+
+ * src/ifdhandler.c: Change the delay of cold reset to 10 ms in
+ IFDHSetProtocolParameters().
+
+2014-07-02 Godfrey Chung
+
+ * src/ifdhandler.c: Remove the checking of specific mode in
+ IFDHSetProtocolParameters().
+
+2014-06-23 Godfrey Chung
+
+ * src/ccid.c, src/ccid.h, src/ccid_usb.c: Patch ACR1261 1S Dual
+ Reader.
+
+2014-06-23 Godfrey Chung
+
+ * src/92_pcscd_acsccid_group.rules, src/pcscd_acsccid.rules,
+ src/supported_readers.txt: Add supported readers. ACR1261 1S Dual Reader and ACR1252U BADANAMU MAGIC READER.
+
2014-06-16 Godfrey Chung
* README: Update README for v1.0.7.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.7/README new/acsccid-1.0.8/README
--- old/acsccid-1.0.7/README 2014-06-16 07:51:03.000000000 +0200
+++ new/acsccid-1.0.8/README 2014-07-03 04:06:08.000000000 +0200
@@ -80,7 +80,9 @@
072F 223B ACR1252U-A1 ACS ACR1252 1S CL Reader
072F 223E ACR1252U-A2 ACS ACR1252 CL Reader
072F 223D ACR1252U BL ACS ACR1252 USB FW_Upgrade v100
+072F 2244 ACR1252U-A1 (PICC) ACS ACR1252 BADANAMU MAGIC READER
072F 2239 ACR1256U ACS ACR1256U PICC Reader
+072F 2211 ACR1261U-C1 ACS ACR1261 1S Dual Reader
072F 2100 ACR128U ACS ACR128U
072F 2224 ACR1281U-C1 ACS ACR1281 1S Dual Reader
072F 220F ACR1281U-C2 (qPBOC) ACS ACR1281 CL Reader
@@ -121,6 +123,13 @@
History
-------
+v1.0.8 (3/7/2014)
+- Add the following readers support:
+ ACS ACR1252 BADANAMU MAGIC READER
+ ACS ACR1261 1S Dual Reader
+- Change the delay of cold reset to 10 ms.
+- Remove the checking of specific mode before setting the parameters.
+
v1.0.7 (16/6/2014)
- Fix ACR39U card power on problem.
- Add the following readers support:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.7/configure new/acsccid-1.0.8/configure
--- old/acsccid-1.0.7/configure 2014-06-16 07:52:50.000000000 +0200
+++ new/acsccid-1.0.8/configure 2014-07-03 04:07:53.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for acsccid 1.0.7.
+# Generated by GNU Autoconf 2.69 for acsccid 1.0.8.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='acsccid'
PACKAGE_TARNAME='acsccid'
-PACKAGE_VERSION='1.0.7'
-PACKAGE_STRING='acsccid 1.0.7'
+PACKAGE_VERSION='1.0.8'
+PACKAGE_STRING='acsccid 1.0.8'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1352,7 +1352,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures acsccid 1.0.7 to adapt to many kinds of systems.
+\`configure' configures acsccid 1.0.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1422,7 +1422,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of acsccid 1.0.7:";;
+ short | recursive ) echo "Configuration of acsccid 1.0.8:";;
esac
cat <<\_ACEOF
@@ -1549,7 +1549,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-acsccid configure 1.0.7
+acsccid configure 1.0.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1968,7 +1968,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by acsccid $as_me 1.0.7, which was
+It was created by acsccid $as_me 1.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2832,7 +2832,7 @@
# Define the identity of the package.
PACKAGE='acsccid'
- VERSION='1.0.7'
+ VERSION='1.0.8'
cat >>confdefs.h <<_ACEOF
@@ -13777,7 +13777,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by acsccid $as_me 1.0.7, which was
+This file was extended by acsccid $as_me 1.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13843,7 +13843,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-acsccid config.status 1.0.7
+acsccid config.status 1.0.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.7/configure.ac new/acsccid-1.0.8/configure.ac
--- old/acsccid-1.0.7/configure.ac 2014-06-16 07:51:03.000000000 +0200
+++ new/acsccid-1.0.8/configure.ac 2014-07-03 04:06:08.000000000 +0200
@@ -4,7 +4,7 @@
# Require autoconf 2.61
AC_PREREQ(2.61)
-AC_INIT([acsccid], [1.0.7])
+AC_INIT([acsccid], [1.0.8])
AC_CONFIG_SRCDIR(src/ifdhandler.c)
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip foreign subdir-objects)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.7/src/92_pcscd_acsccid_group.rules new/acsccid-1.0.8/src/92_pcscd_acsccid_group.rules
--- old/acsccid-1.0.7/src/92_pcscd_acsccid_group.rules 2014-06-16 07:51:03.000000000 +0200
+++ new/acsccid-1.0.8/src/92_pcscd_acsccid_group.rules 2014-07-03 04:06:08.000000000 +0200
@@ -22,6 +22,9 @@
# ACS ACR1251 1S Dual Reader
ATTRS{idVendor}=="072f", ATTRS{idProduct}=="2242", GROUP="pcscd"
+# ACS ACR1261 1S Dual Reader
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="2211", GROUP="pcscd"
+
# ACS ACR128U
ATTRS{idVendor}=="072f", ATTRS{idProduct}=="2100", GROUP="pcscd"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.7/src/acr38cmd.c new/acsccid-1.0.8/src/acr38cmd.c
--- old/acsccid-1.0.7/src/acr38cmd.c 2014-04-17 09:26:31.000000000 +0200
+++ new/acsccid-1.0.8/src/acr38cmd.c 2014-07-03 04:06:08.000000000 +0200
@@ -145,7 +145,7 @@
{
// Power off SAM
(void)ACR38_CmdPowerOff(reader_index);
- usleep(100 * 1000);
+ usleep(10 * 1000);
// RESET_WITH_5_VOLTS_DEFAULT_SAM
cmd[0] = 0x01;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.7/src/ccid.c new/acsccid-1.0.8/src/ccid.c
--- old/acsccid-1.0.7/src/ccid.c 2014-06-16 07:51:03.000000000 +0200
+++ new/acsccid-1.0.8/src/ccid.c 2014-07-03 04:06:08.000000000 +0200
@@ -567,6 +567,7 @@
break;
case ACS_ACR1251_1S_DUAL_READER:
+ case ACS_ACR1261_1S_DUAL_READER:
case ACS_ACR1281_1S_DUAL_READER:
// Adjust features and maximum data rate
if (ccid_descriptor->bCurrentSlotIndex == 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.7/src/ccid.h new/acsccid-1.0.8/src/ccid.h
--- old/acsccid-1.0.7/src/ccid.h 2014-06-16 07:51:03.000000000 +0200
+++ new/acsccid-1.0.8/src/ccid.h 2014-07-03 04:06:08.000000000 +0200
@@ -244,6 +244,7 @@
#define ACS_ACR1251K_DUAL_READER 0x072f2232
#define ACS_ACR1251_1S_DUAL_READER 0x072f2242
#define ACS_ACR1252_1S_CL_READER 0x072f223b
+#define ACS_ACR1261_1S_DUAL_READER 0x072f2211
#define ACS_ACR128U 0x072f2100
#define ACS_ACR1281_DUAL_READER_QPBOC 0x072f2208
#define ACS_ACR1281_PICC_READER_BSI 0x072f0901
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.7/src/ccid_usb.c new/acsccid-1.0.8/src/ccid_usb.c
--- old/acsccid-1.0.7/src/ccid_usb.c 2014-06-16 07:51:03.000000000 +0200
+++ new/acsccid-1.0.8/src/ccid_usb.c 2014-07-03 04:06:08.000000000 +0200
@@ -765,6 +765,7 @@
usbDevice[reader_index].ccid.bVoltageSupport = 0x03;
}
else if ((readerID == ACS_ACR1251_1S_DUAL_READER) ||
+ (readerID == ACS_ACR1261_1S_DUAL_READER) ||
(readerID == ACS_ACR1281_1S_DUAL_READER) ||
(readerID == ACS_ACR1281_2S_CL_READER))
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.7/src/ifdhandler.c new/acsccid-1.0.8/src/ifdhandler.c
--- old/acsccid-1.0.7/src/ifdhandler.c 2014-06-16 05:30:46.000000000 +0200
+++ new/acsccid-1.0.8/src/ifdhandler.c 2014-07-03 04:06:08.000000000 +0200
@@ -1065,7 +1065,7 @@
// Cold reset
atrLen = sizeof(atrBuffer);
(void)IFDHPowerICC(Lun, IFD_POWER_DOWN, atrBuffer, &atrLen);
- usleep(100 * 1000);
+ usleep(10 * 1000);
atrLen = sizeof(atrBuffer);
ret = IFDHPowerICC(Lun, IFD_POWER_UP, atrBuffer, &atrLen);
if (ret != IFD_SUCCESS)
@@ -1168,32 +1168,28 @@
DEBUG_COMM2("Timeout: %d seconds", ccid_desc->readTimeout);
- // Set parameters if not specific mode
- if (!specificMode)
+ ret = ccid_slot->pSetParameters(reader_index, 1, sizeof(param), param);
+ if (IFD_SUCCESS != ret)
{
- ret = ccid_slot->pSetParameters(reader_index, 1, sizeof(param), param);
- if (IFD_SUCCESS != ret)
- {
- DEBUG_INFO("SetParameters (T1) Failed");
+ DEBUG_INFO("SetParameters (T1) Failed");
- if (param[0] != 0x11)
- {
- // Cold reset
- atrLen = sizeof(atrBuffer);
- (void)IFDHPowerICC(Lun, IFD_POWER_DOWN, atrBuffer, &atrLen);
- usleep(100 * 1000);
- atrLen = sizeof(atrBuffer);
- ret = IFDHPowerICC(Lun, IFD_POWER_UP, atrBuffer, &atrLen);
- if (ret != IFD_SUCCESS)
- return ret;
-
- // Try default Fl/Dl
- pps[2] = 0x11;
- goto again;
- }
- else
+ if (param[0] != 0x11)
+ {
+ // Cold reset
+ atrLen = sizeof(atrBuffer);
+ (void)IFDHPowerICC(Lun, IFD_POWER_DOWN, atrBuffer, &atrLen);
+ usleep(10 * 1000);
+ atrLen = sizeof(atrBuffer);
+ ret = IFDHPowerICC(Lun, IFD_POWER_UP, atrBuffer, &atrLen);
+ if (ret != IFD_SUCCESS)
return ret;
+
+ // Try default Fl/Dl
+ pps[2] = 0x11;
+ goto again;
}
+ else
+ return ret;
}
}
else
@@ -1234,32 +1230,28 @@
DEBUG_COMM2("Communication timeout: %d seconds",
ccid_desc->readTimeout);
- // Set parameters if not specific mode
- if (!specificMode)
+ ret = ccid_slot->pSetParameters(reader_index, 0, sizeof(param), param);
+ if (IFD_SUCCESS != ret)
{
- ret = ccid_slot->pSetParameters(reader_index, 0, sizeof(param), param);
- if (IFD_SUCCESS != ret)
- {
- DEBUG_INFO("SetParameters (T0) Failed");
+ DEBUG_INFO("SetParameters (T0) Failed");
- if (param[0] != 0x11)
- {
- // Cold reset
- atrLen = sizeof(atrBuffer);
- (void)IFDHPowerICC(Lun, IFD_POWER_DOWN, atrBuffer, &atrLen);
- usleep(100 * 1000);
- atrLen = sizeof(atrBuffer);
- ret = IFDHPowerICC(Lun, IFD_POWER_UP, atrBuffer, &atrLen);
- if (ret != IFD_SUCCESS)
- return ret;
-
- // Try default Fl/Dl
- pps[2] = 0x11;
- goto again;
- }
- else
+ if (param[0] != 0x11)
+ {
+ // Cold reset
+ atrLen = sizeof(atrBuffer);
+ (void)IFDHPowerICC(Lun, IFD_POWER_DOWN, atrBuffer, &atrLen);
+ usleep(10 * 1000);
+ atrLen = sizeof(atrBuffer);
+ ret = IFDHPowerICC(Lun, IFD_POWER_UP, atrBuffer, &atrLen);
+ if (ret != IFD_SUCCESS)
return ret;
+
+ // Try default Fl/Dl
+ pps[2] = 0x11;
+ goto again;
}
+ else
+ return ret;
}
}
@@ -1421,7 +1413,7 @@
while ((return_value != IFD_SUCCESS) || (nlength == 0))
{
(void)CcidSlots[reader_index].pPowerOff(reader_index);
- usleep(100 * 1000);
+ usleep(10 * 1000);
nlength = sizeof(pcbuffer);
return_value = CcidSlots[reader_index].pPowerOn(reader_index, &nlength, pcbuffer,
PowerOnVoltage);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.7/src/pcscd_acsccid.rules new/acsccid-1.0.8/src/pcscd_acsccid.rules
--- old/acsccid-1.0.7/src/pcscd_acsccid.rules 2014-06-16 07:51:03.000000000 +0200
+++ new/acsccid-1.0.8/src/pcscd_acsccid.rules 2014-07-03 04:06:08.000000000 +0200
@@ -19,6 +19,9 @@
# ACS ACR1251 1S Dual Reader
SUBSYSTEMS=="usb", ATTRS{idVendor}=="072f", ATTRS{idProduct}=="2242", RUN+="/usr/sbin/pcscd --hotplug"
+# ACS ACR1261 1S Dual Reader
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="072f", ATTRS{idProduct}=="2211", RUN+="/usr/sbin/pcscd --hotplug"
+
# ACS ACR128U
SUBSYSTEMS=="usb", ATTRS{idVendor}=="072f", ATTRS{idProduct}=="2100", RUN+="/usr/sbin/pcscd --hotplug"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.7/src/supported_readers.txt new/acsccid-1.0.8/src/supported_readers.txt
--- old/acsccid-1.0.7/src/supported_readers.txt 2014-06-16 07:51:03.000000000 +0200
+++ new/acsccid-1.0.8/src/supported_readers.txt 2014-07-03 04:06:08.000000000 +0200
@@ -126,9 +126,15 @@
# ACR1252U BL
0x072f:0x223d:ACS ACR1252 USB FW_Upgrade v100
+# ACR1252U-A1 (PICC)
+0x072f:0x2244:ACS ACR1252U BADANAMU MAGIC READER
+
# ACR1256U
0x072f:0x2239:ACS ACR1256U PICC Reader
+# ACR1261U-C1
+0x072f:0x2211:ACS ACR1261 1S Dual Reader
+
# ACR128U
0x072f:0x2100:ACS ACR128U
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
