Hello community, here is the log from the commit of package pcsc-acsccid for openSUSE:Factory checked in at 2014-06-17 11:23:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-23 20:36:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pcsc-acsccid.new/pcsc-acsccid.changes 2014-06-17 11:23:27.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 17 02:06:55 UTC 2014 - [email protected] + +- Updated to version 1.0.7. + +------------------------------------------------------------------- Old: ---- acsccid-1.0.6.tar.bz2 New: ---- acsccid-1.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-acsccid.spec ++++++ --- /var/tmp/diff_new_pack.PZWnJB/_old 2014-06-17 11:23:28.000000000 +0200 +++ /var/tmp/diff_new_pack.PZWnJB/_new 2014-06-17 11:23:28.000000000 +0200 @@ -34,7 +34,7 @@ %if 0%{?suse_version} >= 1140 BuildRequires: udev %endif -Version: 1.0.6 +Version: 1.0.7 Release: 0 Url: http://acsccid.sourceforge.net/ Summary: PCSC Driver for ACS CCID Based Smart Card Readers @@ -84,6 +84,7 @@ Enhances: modalias(usb:v072fp2218d*dc*dsc*dp*ic*isc*ip*) Enhances: modalias(usb:v072fp221bd*dc*dsc*dp*ic*isc*ip*) Enhances: modalias(usb:v072fp2232d*dc*dsc*dp*ic*isc*ip*) +Enhances: modalias(usb:v072fp2242d*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*) Enhances: modalias(usb:v072fp223dd*dc*dsc*dp*ic*isc*ip*) @@ -110,6 +111,8 @@ Enhances: modalias(usb:v072fp8201d*dc*dsc*dp*ic*isc*ip*) Enhances: modalias(usb:v072fp8202d*dc*dsc*dp*ic*isc*ip*) Enhances: modalias(usb:v072fp90dbd*dc*dsc*dp*ic*isc*ip*) +Enhances: modalias(usb:v072fpb200d*dc*dsc*dp*ic*isc*ip*) +Enhances: modalias(usb:v072fpb106d*dc*dsc*dp*ic*isc*ip*) Enhances: modalias(usb:v072fp9000d*dc*dsc*dp*ic*isc*ip*) Enhances: modalias(usb:v072fp90cfd*dc*dsc*dp*ic*isc*ip*) Enhances: modalias(usb:v072fp0101d*dc*dsc*dp*ic*isc*ip*) ++++++ acsccid-1.0.6.tar.bz2 -> acsccid-1.0.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.6/ChangeLog new/acsccid-1.0.7/ChangeLog --- old/acsccid-1.0.6/ChangeLog 2014-04-17 09:56:25.000000000 +0200 +++ new/acsccid-1.0.7/ChangeLog 2014-06-16 07:53:24.000000000 +0200 @@ -1,3 +1,30 @@ +2014-06-16 Godfrey Chung <[email protected]> + + * README: Update README for v1.0.7. + +2014-06-16 Godfrey Chung <[email protected]> + + * Makefile.am: Remove ChangeLog from DISTCLEANFILES in Makefile.am. + +2014-06-16 Godfrey Chung <[email protected]> + + * configure.ac: Update the version to 1.0.7 in configure.ac. + +2014-06-16 Godfrey Chung <[email protected]> + + * src/ccid.c, src/ccid.h, src/ccid_usb.c: Patch ACR1251 1S Dual + Reader. + +2014-06-11 Godfrey Chung <[email protected]> + + * src/92_pcscd_acsccid_group.rules, src/pcscd_acsccid.rules, + src/supported_readers.txt: Add supported readers. ACR1251 1S Dual Reader, CryptoMate (T1) and CryptoMate (T2). + +2014-06-05 Godfrey Chung <[email protected]> + + * src/ifdhandler.c: Fix ACR39U card power on problem in + IFDHPowerICC(). + 2014-04-17 Godfrey Chung <[email protected]> * README: Update README for v1.0.6. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.6/Makefile.am new/acsccid-1.0.7/Makefile.am --- old/acsccid-1.0.6/Makefile.am 2014-04-17 09:42:57.000000000 +0200 +++ new/acsccid-1.0.7/Makefile.am 2014-06-16 07:51:03.000000000 +0200 @@ -14,8 +14,6 @@ MacOSX/winscard.h \ MacOSX/wintypes.h -DISTCLEANFILES = ChangeLog - # Automatically update the libtool script if it becomes out-of-date. LIBTOOL_DEPS = @LIBTOOL_DEPS@ libtool: $(LIBTOOL_DEPS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.6/Makefile.in new/acsccid-1.0.7/Makefile.in --- old/acsccid-1.0.6/Makefile.in 2014-04-17 09:55:39.000000000 +0200 +++ new/acsccid-1.0.7/Makefile.in 2014-06-16 07:52:51.000000000 +0200 @@ -353,7 +353,6 @@ MacOSX/winscard.h \ MacOSX/wintypes.h -DISTCLEANFILES = ChangeLog all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -741,7 +740,6 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.6/README new/acsccid-1.0.7/README --- old/acsccid-1.0.6/README 2014-04-17 09:52:27.000000000 +0200 +++ new/acsccid-1.0.7/README 2014-06-16 07:51:03.000000000 +0200 @@ -76,6 +76,7 @@ 072F 2218 ACR1251U-C (SAM) ACS ACR1251U-C Smart Card Reader 072F 221B ACR1251U-C ACS ACR1251U-C Smart Card Reader 072F 2232 ACR1251UK ACS ACR1251K Dual Reader +072F 2242 ACR1251U-C1 ACS ACR1251 1S Dual Reader 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 @@ -102,6 +103,8 @@ 072F 8201 APG8201-A1 ACS APG8201 072F 8202 [OEM Reader] [OEM Reader Name] 072F 90DB CryptoMate64 ACS CryptoMate64 +072F B200 ACOS5T1 ACS CryptoMate (T1) +072F B106 ACOS5T2 ACS CryptoMate (T2) non-CCID Readers @@ -118,6 +121,14 @@ History ------- +v1.0.7 (16/6/2014) +- Fix ACR39U card power on problem. +- Add the following readers support: + ACR1251 1S Dual Reader + CryptoMate (T1) + CryptoMate (T2) +- Remove ChangeLog from DISTCLEANFILES. + v1.0.6 (17/4/2014) - Add the following readers support: ACR32 ICC Reader diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.6/aclocal.m4 new/acsccid-1.0.7/aclocal.m4 --- old/acsccid-1.0.6/aclocal.m4 2014-04-17 09:55:38.000000000 +0200 +++ new/acsccid-1.0.7/aclocal.m4 2014-06-16 07:52:49.000000000 +0200 @@ -180,6 +180,61 @@ fi[]dnl ])# PKG_CHECK_MODULES + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.6/config/config.guess new/acsccid-1.0.7/config/config.guess --- old/acsccid-1.0.6/config/config.guess 2014-04-17 09:55:39.000000000 +0200 +++ new/acsccid-1.0.7/config/config.guess 2014-06-16 07:52:51.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -826,7 +826,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,16 +1260,26 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1361,154 +1371,6 @@ exit ;; esac -eval $set_cc_for_build -cat >$dummy.c <<EOF -#ifdef _SEQUENT_ -# include <sys/types.h> -# include <sys/utsname.h> -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include <sys/param.h> - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include <sys/param.h> -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <<EOF $0: unable to guess system type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.6/config/config.sub new/acsccid-1.0.7/config/config.sub --- old/acsccid-1.0.6/config/config.sub 2014-04-17 09:55:39.000000000 +0200 +++ new/acsccid-1.0.7/config/config.sub 2014-06-16 07:52:51.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-08-10' +timestamp='2014-05-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -265,6 +265,7 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -282,8 +283,10 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -295,8 +298,7 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -324,7 +326,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -381,6 +383,7 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -400,8 +403,10 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -413,6 +418,7 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -1374,7 +1380,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1592,9 +1598,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.6/configure new/acsccid-1.0.7/configure --- old/acsccid-1.0.6/configure 2014-04-17 09:55:38.000000000 +0200 +++ new/acsccid-1.0.7/configure 2014-06-16 07:52:50.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.6. +# Generated by GNU Autoconf 2.69 for acsccid 1.0.7. # # # 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.6' -PACKAGE_STRING='acsccid 1.0.6' +PACKAGE_VERSION='1.0.7' +PACKAGE_STRING='acsccid 1.0.7' 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.6 to adapt to many kinds of systems. +\`configure' configures acsccid 1.0.7 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.6:";; + short | recursive ) echo "Configuration of acsccid 1.0.7:";; 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.6 +acsccid configure 1.0.7 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.6, which was +It was created by acsccid $as_me 1.0.7, 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.6' + VERSION='1.0.7' 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.6, which was +This file was extended by acsccid $as_me 1.0.7, 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.6 +acsccid config.status 1.0.7 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.6/configure.ac new/acsccid-1.0.7/configure.ac --- old/acsccid-1.0.6/configure.ac 2014-04-17 09:42:57.000000000 +0200 +++ new/acsccid-1.0.7/configure.ac 2014-06-16 07:51:03.000000000 +0200 @@ -4,7 +4,7 @@ # Require autoconf 2.61 AC_PREREQ(2.61) -AC_INIT(acsccid, 1.0.6) +AC_INIT([acsccid], [1.0.7]) 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.6/src/92_pcscd_acsccid_group.rules new/acsccid-1.0.7/src/92_pcscd_acsccid_group.rules --- old/acsccid-1.0.6/src/92_pcscd_acsccid_group.rules 2012-05-18 09:57:46.000000000 +0200 +++ new/acsccid-1.0.7/src/92_pcscd_acsccid_group.rules 2014-06-16 07:51:03.000000000 +0200 @@ -19,6 +19,9 @@ # ACS ACR88U ATTRS{idVendor}=="072f", ATTRS{idProduct}=="2011", GROUP="pcscd" +# ACS ACR1251 1S Dual Reader +ATTRS{idVendor}=="072f", ATTRS{idProduct}=="2242", 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.6/src/ccid.c new/acsccid-1.0.7/src/ccid.c --- old/acsccid-1.0.6/src/ccid.c 2014-04-17 09:26:31.000000000 +0200 +++ new/acsccid-1.0.7/src/ccid.c 2014-06-16 07:51:03.000000000 +0200 @@ -566,6 +566,7 @@ } break; + case ACS_ACR1251_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.6/src/ccid.h new/acsccid-1.0.7/src/ccid.h --- old/acsccid-1.0.6/src/ccid.h 2014-04-17 09:42:57.000000000 +0200 +++ new/acsccid-1.0.7/src/ccid.h 2014-06-16 07:51:03.000000000 +0200 @@ -242,6 +242,7 @@ #define ACS_ACR1251_1S_CL_READER 0x072f221a #define ACS_ACR1251U_C 0x072f2218 #define ACS_ACR1251K_DUAL_READER 0x072f2232 +#define ACS_ACR1251_1S_DUAL_READER 0x072f2242 #define ACS_ACR1252_1S_CL_READER 0x072f223b #define ACS_ACR128U 0x072f2100 #define ACS_ACR1281_DUAL_READER_QPBOC 0x072f2208 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.6/src/ccid_usb.c new/acsccid-1.0.7/src/ccid_usb.c --- old/acsccid-1.0.6/src/ccid_usb.c 2014-04-17 09:42:57.000000000 +0200 +++ new/acsccid-1.0.7/src/ccid_usb.c 2014-06-16 07:51:03.000000000 +0200 @@ -764,7 +764,8 @@ usbDevice[reader_index].ccid.dwSlotStatus = IFD_ICC_PRESENT; usbDevice[reader_index].ccid.bVoltageSupport = 0x03; } - else if ((readerID == ACS_ACR1281_1S_DUAL_READER) || + else if ((readerID == ACS_ACR1251_1S_DUAL_READER) || + (readerID == ACS_ACR1281_1S_DUAL_READER) || (readerID == ACS_ACR1281_2S_CL_READER)) { usbDevice[reader_index].ccid.dwFeatures = 0x000204BA; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.6/src/ifdhandler.c new/acsccid-1.0.7/src/ifdhandler.c --- old/acsccid-1.0.6/src/ifdhandler.c 2014-04-17 09:42:57.000000000 +0200 +++ new/acsccid-1.0.7/src/ifdhandler.c 2014-06-16 05:30:46.000000000 +0200 @@ -1398,6 +1398,14 @@ return_value = CcidSlots[reader_index].pPowerOn(reader_index, &nlength, pcbuffer, PowerOnVoltage); + // Fix ACR39U card power on problem. + if (return_value != IFD_SUCCESS) + { + nlength = sizeof(pcbuffer); + return_value = CcidSlots[reader_index].pPowerOn(reader_index, &nlength, pcbuffer, + PowerOnVoltage); + } + // Enable/Disable PICC if (DriverOptions & DRIVER_OPTION_DISABLE_PICC) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.6/src/pcscd_acsccid.rules new/acsccid-1.0.7/src/pcscd_acsccid.rules --- old/acsccid-1.0.6/src/pcscd_acsccid.rules 2014-04-17 09:42:57.000000000 +0200 +++ new/acsccid-1.0.7/src/pcscd_acsccid.rules 2014-06-16 07:51:03.000000000 +0200 @@ -16,6 +16,9 @@ # ACS ACR88U SUBSYSTEMS=="usb", ATTRS{idVendor}=="072f", ATTRS{idProduct}=="2011", RUN+="/usr/sbin/pcscd --hotplug" +# ACS ACR1251 1S Dual Reader +SUBSYSTEMS=="usb", ATTRS{idVendor}=="072f", ATTRS{idProduct}=="2242", 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.6/src/supported_readers.txt new/acsccid-1.0.7/src/supported_readers.txt --- old/acsccid-1.0.6/src/supported_readers.txt 2014-04-17 09:42:21.000000000 +0200 +++ new/acsccid-1.0.7/src/supported_readers.txt 2014-06-16 07:51:03.000000000 +0200 @@ -114,6 +114,9 @@ # ACR1251UK 0x072f:0x2232:ACS ACR1251K Dual Reader +# ACR1251U-C1 +0x072f:0x2242:ACS ACR1251 1S Dual Reader + # ACR1252U-A1 0x072f:0x223b:ACS ACR1252 1S CL Reader @@ -184,6 +187,12 @@ # CryptoMate64 0x072f:0x90db:ACS CryptoMate64 +# CryptoMate T1 +0x072f:0xb200:ACS CryptoMate (T1) + +# CryptoMate T2 +0x072f:0xb106:ACS CryptoMate (T2) + # # non-CCID readers # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acsccid-1.0.6/src/tokenparser.c new/acsccid-1.0.7/src/tokenparser.c --- old/acsccid-1.0.6/src/tokenparser.c 2014-04-17 09:56:26.000000000 +0200 +++ new/acsccid-1.0.7/src/tokenparser.c 2014-06-16 07:53:24.000000000 +0200 @@ -8,7 +8,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_SUBMINOR_VERSION 39 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -161,7 +161,12 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -extern int yyleng; +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +extern yy_size_t yyleng; extern FILE *yyin, *yyout; @@ -170,6 +175,7 @@ #define EOB_ACT_LAST_MATCH 2 #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -187,11 +193,6 @@ #define unput(c) yyunput( c, (yytext_ptr) ) -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -209,7 +210,7 @@ /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + yy_size_t yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -279,8 +280,8 @@ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int yyleng; +static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ +yy_size_t yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -308,7 +309,7 @@ YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); void *yyalloc (yy_size_t ); void *yyrealloc (void *,yy_size_t ); @@ -340,7 +341,7 @@ /* Begin user sect3 */ -#define yywrap(n) 1 +#define yywrap() 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -520,7 +521,7 @@ void tperrorCheck (char *pcToken_error); -#line 524 "tokenparser.c" +#line 525 "tokenparser.c" #define INITIAL 0 @@ -559,7 +560,7 @@ void yyset_out (FILE * out_str ); -int yyget_leng (void ); +yy_size_t yyget_leng (void ); char *yyget_text (void ); @@ -705,11 +706,6 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 47 "tokenparser.l" - - -#line 712 "tokenparser.c" - if ( !(yy_init) ) { (yy_init) = 1; @@ -736,6 +732,12 @@ yy_load_buffer_state( ); } + { +#line 47 "tokenparser.l" + + +#line 740 "tokenparser.c" + while ( 1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -752,7 +754,7 @@ yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -827,7 +829,7 @@ #line 55 "tokenparser.l" ECHO; YY_BREAK -#line 831 "tokenparser.c" +#line 833 "tokenparser.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -958,6 +960,7 @@ "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ + } /* end of user's declarations */ } /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer @@ -1013,21 +1016,21 @@ else { - int num_to_read = + yy_size_t num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { - int new_size = b->yy_buf_size * 2; + yy_size_t new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1058,7 +1061,7 @@ /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), (size_t) num_to_read ); + (yy_n_chars), num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -1153,7 +1156,7 @@ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_is_jam = (yy_current_state == 38); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } #ifndef YY_NO_INPUT @@ -1180,7 +1183,7 @@ else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); + yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -1340,10 +1343,6 @@ yyfree((void *) b ); } -#ifndef __cplusplus -extern int isatty (int ); -#endif /* __cplusplus */ - /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -1456,7 +1455,7 @@ */ static void yyensure_buffer_stack (void) { - int num_to_alloc; + yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { @@ -1553,12 +1552,12 @@ * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - int i; + yy_size_t i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -1640,7 +1639,7 @@ /** Get the length of the current token. * */ -int yyget_leng (void) +yy_size_t yyget_leng (void) { return yyleng; } @@ -1788,7 +1787,7 @@ #define YYTABLES_NAME "yytables" -#line 55 "tokenparser.l" +#line 54 "tokenparser.l" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
