Hello community,
here is the log from the commit of package pcsc-acsccid for openSUSE:Factory
checked in at 2020-01-08 17:57:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pcsc-acsccid (Old)
and /work/SRC/openSUSE:Factory/.pcsc-acsccid.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcsc-acsccid"
Wed Jan 8 17:57:06 2020 rev:28 rq:761788 version:1.1.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/pcsc-acsccid/pcsc-acsccid.changes
2019-07-26 12:40:52.797893710 +0200
+++ /work/SRC/openSUSE:Factory/.pcsc-acsccid.new.6675/pcsc-acsccid.changes
2020-01-08 17:57:43.709741111 +0100
@@ -1,0 +2,10 @@
+Wed Jan 8 09:26:37 UTC 2020 - Godfrey Chung <godfrey.ch...@acs.com.hk>
+
+- Updated to version 1.1.8.
+ * Add the following readers support:
+ ACR39U-W1 Top ICC Reader
+ ACR39U-W1 Edge ICC Reader
+ ACR1251T CL Reader
+ * Remove response timeout fix for APG8201 and APG8201Z.
+
+-------------------------------------------------------------------
Old:
----
acsccid-1.1.7.tar.bz2
New:
----
acsccid-1.1.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcsc-acsccid.spec ++++++
--- /var/tmp/diff_new_pack.Xaiy7P/_old 2020-01-08 17:57:44.433741492 +0100
+++ /var/tmp/diff_new_pack.Xaiy7P/_new 2020-01-08 17:57:44.433741492 +0100
@@ -1,8 +1,8 @@
#
# spec file for package pcsc-acsccid
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2019 Advanced Card Systems Ltd.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 Advanced Card Systems Ltd.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -42,7 +42,7 @@
%if 0%{?suse_version} >= 1140
BuildRequires: udev
%endif
-Version: 1.1.7
+Version: 1.1.8
Release: 0
Url: http://acsccid.sourceforge.net/
Summary: PCSC Driver for ACS CCID Based Smart Card Readers
@@ -79,6 +79,8 @@
Enhances: modalias(usb:v072FpB103d*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072FpB10Cd*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072FpB104d*dc*dsc*dp*ic*isc*ip*)
+Enhances: modalias(usb:v072FpB113d*dc*dsc*dp*ic*isc*ip*)
+Enhances: modalias(usb:v072FpB114d*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072FpB000d*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072Fp90D2d*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072Fp8306d*dc*dsc*dp*ic*isc*ip*)
@@ -107,6 +109,7 @@
Enhances: modalias(usb:v072Fp2232d*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072Fp2242d*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072Fp2238d*dc*dsc*dp*ic*isc*ip*)
+Enhances: modalias(usb:v072Fp225Fd*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072Fp224Fd*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072Fp223Bd*dc*dsc*dp*ic*isc*ip*)
Enhances: modalias(usb:v072Fp223Ed*dc*dsc*dp*ic*isc*ip*)
++++++ acsccid-1.1.7.tar.bz2 -> acsccid-1.1.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acsccid-1.1.7/ChangeLog new/acsccid-1.1.8/ChangeLog
--- old/acsccid-1.1.7/ChangeLog 2019-07-24 04:59:48.000000000 +0200
+++ new/acsccid-1.1.8/ChangeLog 2020-01-06 05:06:37.000000000 +0100
@@ -1,3 +1,33 @@
+2020-01-06 Godfrey Chung <godfrey.ch...@acs.com.hk>
+
+ * README: Update README for v1.1.8.
+
+2020-01-06 Godfrey Chung <godfrey.ch...@acs.com.hk>
+
+ * configure.ac: Update the version to 1.1.8 in configure.ac.
+
+2020-01-02 Godfrey Chung <godfrey.ch...@acs.com.hk>
+
+ * src/supported_readers.txt: Add supported readers. ACR1251T CL Reader
+
+2019-12-12 Godfrey Chung <godfrey.ch...@acs.com.hk>
+
+ * src/ccid_usb.c, src/ifdhandler.c: Remove response timeout fix for
+ APG8201 and APG8201Z. Some APG8201 firmware require interrupt endpoint
polling.
+
+2019-12-12 Godfrey Chung <godfrey.ch...@acs.com.hk>
+
+ * src/supported_readers.txt: Add supported readers. ACR39U-W1 Top ICC
Reader ACR39U-W1 Edge ICC Reader
+
+2019-08-21 Godfrey Chung <godfrey.ch...@acs.com.hk>
+
+ * src/ccid_usb.c: InterruptRead(): log the timeout used. Merge from
ccid 1.4.31.
+
+2019-08-21 Godfrey Chung <godfrey.ch...@acs.com.hk>
+
+ * MacOSX/ifdhandler.h, src/misc.h, src/simclist.c,
+ src/tokenparser.l: Import files from ccid 1.4.31.
+
2019-07-23 Godfrey Chung <godfrey.ch...@acs.com.hk>
* README: Update README for v1.1.7.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acsccid-1.1.7/MacOSX/ifdhandler.h
new/acsccid-1.1.8/MacOSX/ifdhandler.h
--- old/acsccid-1.1.7/MacOSX/ifdhandler.h 2018-10-29 04:15:12.000000000
+0100
+++ new/acsccid-1.1.8/MacOSX/ifdhandler.h 2020-01-06 05:01:23.000000000
+0100
@@ -40,7 +40,7 @@
The routines specified hereafter will allow you to write an IFD handler
for the PC/SC Lite resource manager. Please use the complement
developer's kit complete with headers and Makefile at:
-http://www.musclecard.com/drivers.html
+https://muscle.apdu.fr/musclecard.com/sourcedrivers.html
This gives a common API for communication to most readers in a
homogeneous fashion. This document assumes that the driver developer is
@@ -82,7 +82,7 @@
<string>0x04E6</string>
@endverbatim
-You may have an OEM of this reader in which an additional @c <string>
+You may have an OEM of this reader in which an additional @c \<string>
can be used like in the below example:
@verbatim
@@ -202,7 +202,7 @@
# Configuration file for pcsc-lite
# David Corcoran <corco...@musclecard.com>
-FRIENDLYNAME Generic Reader
+FRIENDLYNAME "Generic Reader"
DEVICENAME /dev/ttyS0
LIBPATH /usr/lib/pcsc/drivers/libgen_ifd.so
CHANNELID 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acsccid-1.1.7/README new/acsccid-1.1.8/README
--- old/acsccid-1.1.7/README 2019-07-24 04:54:58.000000000 +0200
+++ new/acsccid-1.1.8/README 2020-01-06 05:01:23.000000000 +0100
@@ -63,6 +63,8 @@
072F B103 ACR39F ACS ACR39F ICC Reader
072F B104 ACR39U-SAM ACS ACR39U-SAM ICC Reader
072F B10C ACR39U-U1 ACS ACR39U ID1 Card Reader
+072F B113 ACR39U-W1 ACS ACR39U-W1 Top ICC Reader
+072F B114 ACR39U-W1 ACS ACR39U-W1 Edge ICC Reader
072F B000 ACR3901U ACS ACR3901 ICC Reader
072F 90D2 ACR83U-A1 ACS ACR83U
072F 8306 ACR85 ACS ACR85 PINPad Reader
@@ -93,6 +95,7 @@
072F 2232 ACR1251UK ACS ACR1251K Dual Reader
072F 2242 ACR1251U-C3 ACS ACR1251 1S Dual Reader
072F 2238 ACR1251U-C9 ACS ACR1251 Reader
+072F 225F ACR1251T-E2 ACS ACR1251T CL Reader
072F 224F ACM1251U-Z2 ACS ACR1251 CL Reader
072F 223B ACR1252U-A1 ACS ACR1252 1S CL Reader
072F 223B ACR1252U-M1 ACS ACR1252 1S CL Reader
@@ -152,6 +155,16 @@
History
-------
+v1.1.8 (6/1/2020)
+- Add the following readers support:
+ ACR39U-W1 Top ICC Reader
+ ACR39U-W1 Edge ICC Reader
+ ACR1251T CL Reader
+- Import files from ccid 1.4.31.
+- Merge with ccid 1.4.31.
+ - InterruptRead(): log the timeout used.
+- Remove response timeout fix for APG8201 and APG8201Z.
+
v1.1.7 (24/7/2019)
- Add the following readers support:
ACR3201 ICC Reader
@@ -539,7 +552,7 @@
-------------------------------------------------------------------------------
-Copyright (C) 2009-2019 Advanced Card Systems Ltd.
+Copyright (C) 2009-2020 Advanced Card Systems Ltd.
Copyright (C) 2003-2011 Ludovic Rousseau
Copyright (C) 2000-2001 Carlos Prados
Copyright (C) 2003 Olaf Kirch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acsccid-1.1.7/config/ltmain.sh
new/acsccid-1.1.8/config/ltmain.sh
--- old/acsccid-1.1.7/config/ltmain.sh 2019-07-24 04:58:54.000000000 +0200
+++ new/acsccid-1.1.8/config/ltmain.sh 2020-01-06 05:02:27.000000000 +0100
@@ -31,7 +31,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-9"
+VERSION="2.4.6 Debian-2.4.6-11"
package_revision=2.4.6
@@ -2141,7 +2141,7 @@
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname $scriptversion Debian-2.4.6-9
+ version: $progname $scriptversion Debian-2.4.6-11
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acsccid-1.1.7/configure new/acsccid-1.1.8/configure
--- old/acsccid-1.1.7/configure 2019-07-24 04:58:57.000000000 +0200
+++ new/acsccid-1.1.8/configure 2020-01-06 05:02:30.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for acsccid 1.1.7.
+# Generated by GNU Autoconf 2.69 for acsccid 1.1.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.1.7'
-PACKAGE_STRING='acsccid 1.1.7'
+PACKAGE_VERSION='1.1.8'
+PACKAGE_STRING='acsccid 1.1.8'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1370,7 +1370,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.1.7 to adapt to many kinds of systems.
+\`configure' configures acsccid 1.1.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1441,7 +1441,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of acsccid 1.1.7:";;
+ short | recursive ) echo "Configuration of acsccid 1.1.8:";;
esac
cat <<\_ACEOF
@@ -1578,7 +1578,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-acsccid configure 1.1.7
+acsccid configure 1.1.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1997,7 +1997,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.1.7, which was
+It was created by acsccid $as_me 1.1.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2861,7 +2861,7 @@
# Define the identity of the package.
PACKAGE='acsccid'
- VERSION='1.1.7'
+ VERSION='1.1.8'
cat >>confdefs.h <<_ACEOF
@@ -9202,6 +9202,12 @@
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
+ # flang / f18. f95 an alias for gfortran or flang on Debian
+ flang* | f18* | f95*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
@@ -15562,7 +15568,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.1.7, which was
+This file was extended by acsccid $as_me 1.1.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15628,7 +15634,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.1.7
+acsccid config.status 1.1.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.1.7/configure.ac
new/acsccid-1.1.8/configure.ac
--- old/acsccid-1.1.7/configure.ac 2019-07-24 04:53:44.000000000 +0200
+++ new/acsccid-1.1.8/configure.ac 2020-01-06 05:01:23.000000000 +0100
@@ -4,7 +4,7 @@
# Require autoconf 2.61
AC_PREREQ([2.69])
-AC_INIT([acsccid], [1.1.7])
+AC_INIT([acsccid], [1.1.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.1.7/m4/libtool.m4
new/acsccid-1.1.8/m4/libtool.m4
--- old/acsccid-1.1.7/m4/libtool.m4 2019-07-24 04:58:54.000000000 +0200
+++ new/acsccid-1.1.8/m4/libtool.m4 2020-01-06 05:02:27.000000000 +0100
@@ -4704,6 +4704,12 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
+ # flang / f18. f95 an alias for gfortran or flang on Debian
+ flang* | f18* | f95*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acsccid-1.1.7/src/ccid_usb.c
new/acsccid-1.1.8/src/ccid_usb.c
--- old/acsccid-1.1.7/src/ccid_usb.c 2019-07-24 04:53:44.000000000 +0200
+++ new/acsccid-1.1.8/src/ccid_usb.c 2020-01-06 05:01:23.000000000 +0100
@@ -1067,11 +1067,8 @@
goto end2;
}
- /* Disable card detection thread for APG8201
series. */
- if ((usbDevice[reader_index].ccid.readerID ==
ACS_APG8201)
- ||
(usbDevice[reader_index].ccid.readerID == ACS_APG8201_B2)
- ||
(usbDevice[reader_index].ccid.readerID == ACS_APG8201Z)
- ||
(usbDevice[reader_index].ccid.readerID == ACS_APG8201Z2))
+ /* Disable card detection thread for
APG8201-B2. */
+ if (usbDevice[reader_index].ccid.readerID ==
ACS_APG8201_B2)
{
goto end;
}
@@ -1770,7 +1767,7 @@
if (usbDevice[reader_index].multislot_extension != NULL)
return Multi_InterruptRead(reader_index, timeout);
- DEBUG_PERIODIC2("before (%d)", reader_index);
+ DEBUG_PERIODIC3("before (%d), timeout: %d ms", reader_index, timeout);
transfer = libusb_alloc_transfer(0);
if (NULL == transfer)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acsccid-1.1.7/src/ifdhandler.c
new/acsccid-1.1.8/src/ifdhandler.c
--- old/acsccid-1.1.7/src/ifdhandler.c 2019-07-24 04:53:44.000000000 +0200
+++ new/acsccid-1.1.8/src/ifdhandler.c 2020-01-06 05:01:23.000000000 +0100
@@ -680,11 +680,8 @@
ccid_desc = get_ccid_descriptor(reader_index);
- /* Disable polling thread for APG8201 series. */
- if ((ccid_desc->readerID == ACS_APG8201)
- || (ccid_desc->readerID ==
ACS_APG8201_B2)
- || (ccid_desc->readerID == ACS_APG8201Z)
- || (ccid_desc->readerID ==
ACS_APG8201Z2))
+ /* Disable polling thread for APG8201-B2. */
+ if (ccid_desc->readerID == ACS_APG8201_B2)
{
break;
}
@@ -737,11 +734,8 @@
ccid_desc = get_ccid_descriptor(reader_index);
- /* Disable polling thread for APG8201 series. */
- if ((ccid_desc->readerID == ACS_APG8201)
- || (ccid_desc->readerID ==
ACS_APG8201_B2)
- || (ccid_desc->readerID == ACS_APG8201Z)
- || (ccid_desc->readerID ==
ACS_APG8201Z2))
+ /* Disable polling thread for APG8201-B2. */
+ if (ccid_desc->readerID == ACS_APG8201_B2)
{
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acsccid-1.1.7/src/misc.h new/acsccid-1.1.8/src/misc.h
--- old/acsccid-1.1.7/src/misc.h 2018-10-29 04:15:12.000000000 +0100
+++ new/acsccid-1.1.8/src/misc.h 2020-01-06 05:01:23.000000000 +0100
@@ -44,7 +44,9 @@
(__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) || \
defined(__SUNPRO_C) && __SUNPRO_C >= 0x590
#define INTERNAL __attribute__ ((visibility("hidden")))
+#ifndef PCSC_API
#define PCSC_API __attribute__ ((visibility("default")))
+#endif
#elif defined(__SUNPRO_C) && __SUNPRO_C >= 0x550
/*
http://wikis.sun.com/display/SunStudio/Macros+for+Shared+Library+Symbol+Visibility
*/
#define INTERNAL __hidden
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acsccid-1.1.7/src/simclist.c
new/acsccid-1.1.8/src/simclist.c
--- old/acsccid-1.1.7/src/simclist.c 2018-10-29 04:15:12.000000000 +0100
+++ new/acsccid-1.1.8/src/simclist.c 2020-01-06 05:01:23.000000000 +0100
@@ -44,8 +44,10 @@
/* disable asserts */
#ifndef SIMCLIST_DEBUG
+#ifndef NDEBUG
#define NDEBUG
#endif
+#endif
#include <assert.h>
@@ -1222,7 +1224,7 @@
/* speculation confirmed */
WRITE_ERRCHECK(fd, ser_buf, bufsize);
} else { /* speculation found broken */
- WRITE_ERRCHECK(fd, & bufsize, sizeof(size_t));
+ WRITE_ERRCHECK(fd, &bufsize, sizeof(bufsize));
WRITE_ERRCHECK(fd, ser_buf, bufsize);
}
free(ser_buf);
@@ -1245,7 +1247,7 @@
}
WRITE_ERRCHECK(fd, x->data, bufsize);
} else {
- WRITE_ERRCHECK(fd, &bufsize, sizeof(size_t));
+ WRITE_ERRCHECK(fd, &bufsize, sizeof(bufsize));
WRITE_ERRCHECK(fd, x->data, bufsize);
}
}
@@ -1337,7 +1339,7 @@
if (NULL == buf)
return -1;
for (cnt = 0; cnt < header.numels; cnt++) {
- READ_ERRCHECK(fd, buf, header.elemlen);
+ READ_ERRCHECK(fd, buf, (ssize_t) header.elemlen);
list_append(l, l->attrs.unserializer(buf, & elsize));
totmemorylen += elsize;
}
@@ -1347,7 +1349,7 @@
buf = malloc(header.elemlen);
if (NULL == buf)
return -1;
- READ_ERRCHECK(fd, buf, header.elemlen);
+ READ_ERRCHECK(fd, buf, (ssize_t) header.elemlen);
list_append(l, buf);
}
totmemorylen = header.numels * header.elemlen;
@@ -1362,7 +1364,7 @@
buf = malloc((size_t)elsize);
if (NULL == buf)
return -1;
- READ_ERRCHECK(fd, buf, elsize);
+ READ_ERRCHECK(fd, buf, (ssize_t) elsize);
totreadlen += elsize;
list_append(l, l->attrs.unserializer(buf, & elsize));
totmemorylen += elsize;
@@ -1374,7 +1376,7 @@
buf = malloc(elsize);
if (NULL == buf)
return -1;
- READ_ERRCHECK(fd, buf, elsize);
+ READ_ERRCHECK(fd, buf, (ssize_t) elsize);
totreadlen += elsize;
list_append(l, buf);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acsccid-1.1.7/src/supported_readers.txt
new/acsccid-1.1.8/src/supported_readers.txt
--- old/acsccid-1.1.7/src/supported_readers.txt 2019-07-24 04:53:44.000000000
+0200
+++ new/acsccid-1.1.8/src/supported_readers.txt 2020-01-06 05:01:24.000000000
+0100
@@ -49,6 +49,10 @@
# ACR39U-SAM
0x072f:0xb104:ACS ACR39U-SAM ICC Reader
+# ACR39U-W1
+0x072f:0xb113:ACS ACR39U-W1 Top ICC Reader
+0x072f:0xb114:ACS ACR39U-W1 Edge ICC Reader
+
# ACR3901U
0x072f:0xb000:ACS ACR3901 ICC Reader
@@ -129,6 +133,9 @@
# ACR1251U-C9
0x072f:0x2238:ACS ACR1251 Reader
+# ACR1251T
+0x072f:0x225f:ACS ACR1251T CL Reader
+
# ACM1251U-Z2
0x072f:0x224f:ACS ACR1251 CL Reader
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acsccid-1.1.7/src/tokenparser.c
new/acsccid-1.1.8/src/tokenparser.c
--- old/acsccid-1.1.7/src/tokenparser.c 2019-07-24 04:59:23.000000000 +0200
+++ new/acsccid-1.1.8/src/tokenparser.c 2020-01-06 05:03:30.000000000 +0100
@@ -508,7 +508,9 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
+#ifndef NDEBUG
#define NDEBUG
+#endif
#include <assert.h>
#include "simclist.h"
@@ -522,9 +524,9 @@
static list_t *ListKeys;
static list_t *ListValues;
-#line 526 "tokenparser.c"
-#define YY_NO_INPUT 1
#line 528 "tokenparser.c"
+#define YY_NO_INPUT 1
+#line 530 "tokenparser.c"
#define INITIAL 0
@@ -739,10 +741,10 @@
}
{
-#line 67 "tokenparser.l"
+#line 69 "tokenparser.l"
-#line 746 "tokenparser.c"
+#line 748 "tokenparser.c"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is
reached */
{
@@ -801,41 +803,41 @@
case 1:
YY_RULE_SETUP
-#line 69 "tokenparser.l"
+#line 71 "tokenparser.l"
{}
YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 70 "tokenparser.l"
+#line 72 "tokenparser.l"
{}
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 71 "tokenparser.l"
+#line 73 "tokenparser.l"
{ eval_key(yytext, ListKeys); }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 72 "tokenparser.l"
+#line 74 "tokenparser.l"
{}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 73 "tokenparser.l"
+#line 75 "tokenparser.l"
{ eval_value(yytext, ListValues); }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 74 "tokenparser.l"
+#line 76 "tokenparser.l"
{ tperrorCheck(yytext); }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 75 "tokenparser.l"
+#line 77 "tokenparser.l"
ECHO;
YY_BREAK
-#line 839 "tokenparser.c"
+#line 841 "tokenparser.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1803,7 +1805,7 @@
#define YYTABLES_NAME "yytables"
-#line 75 "tokenparser.l"
+#line 77 "tokenparser.l"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acsccid-1.1.7/src/tokenparser.l
new/acsccid-1.1.8/src/tokenparser.l
--- old/acsccid-1.1.7/src/tokenparser.l 2018-10-29 04:15:12.000000000 +0100
+++ new/acsccid-1.1.8/src/tokenparser.l 2020-01-06 05:01:24.000000000 +0100
@@ -44,7 +44,9 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
+#ifndef NDEBUG
#define NDEBUG
+#endif
#include <assert.h>
#include "simclist.h"
