Hello community, here is the log from the commit of package pcsc-ccid for openSUSE:Factory checked in at 2013-01-17 09:54:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcsc-ccid (Old) and /work/SRC/openSUSE:Factory/.pcsc-ccid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcsc-ccid", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/pcsc-ccid/pcsc-ccid.changes 2013-01-10 15:51:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pcsc-ccid.new/pcsc-ccid.changes 2013-01-17 09:54:16.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Jan 16 18:13:59 UTC 2013 - [email protected] + +- Updated to version 1.4.9 + * Add support of + Aktiv Rutoken PINPad In + Aktiv Rutoken PINPad Ex + REINER SCT cyberJack go + * Info.plist: Correctly handle reader names containing & + +------------------------------------------------------------------- Old: ---- ccid-1.4.8.tar.bz2 ccid-1.4.8.tar.bz2.asc New: ---- ccid-1.4.9.tar.bz2 ccid-1.4.9.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-ccid.spec ++++++ --- /var/tmp/diff_new_pack.Dfh44G/_old 2013-01-17 09:54:17.000000000 +0100 +++ /var/tmp/diff_new_pack.Dfh44G/_new 2013-01-17 09:54:17.000000000 +0100 @@ -29,10 +29,10 @@ BuildRequires: pcsc-lite-devel BuildRequires: pkg-config BuildRequires: udev -%if %suse_version >= 1220 +%if %suse_version > 1220 BuildRequires: gpg-offline %endif -Version: 1.4.8 +Version: 1.4.9 Release: 0 Url: http://pcsclite.alioth.debian.org/ccid.html Summary: PCSC Driver for CCID Based Smart Card Readers and GemPC Twin Serial Reader ++++++ ccid-1.4.8.tar.bz2 -> ccid-1.4.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.8/README new/ccid-1.4.9/README --- old/ccid-1.4.8/README 2012-10-07 13:45:35.000000000 +0200 +++ new/ccid-1.4.9/README 2013-01-16 16:14:20.000000000 +0100 @@ -118,8 +118,16 @@ History: ======== +1.4.9 - 16 January 2013, Ludovic Rousseau + - Add support of + . Aktiv Rutoken PINPad In + . Aktiv Rutoken PINPad Ex + . REINER SCT cyberJack go + - Info.plist: Correctly handle reader names containing & + + 1.4.8 - 22 June 2012, Ludovic Rousseau - -Add support of + - Add support of . SCR3310-NTTCom USB (was removed in version 1.4.6) . Inside Secure VaultIC 420 Smart Object . Inside Secure VaultIC 440 Smart Object @@ -133,7 +141,7 @@ 1.4.7 - 22 June 2012, Ludovic Rousseau - -Add support of + - Add support of . ACS ACR101 ICC Reader . ACS CryptoMate64 . Alcor Micro AU9522 @@ -164,7 +172,7 @@ 1.4.6 - 6 April 2012, Ludovic Rousseau - -Add support of + - Add support of . Avtor SC Reader 371 . Avtor SecureToken . DIGIPASS KEY 202 @@ -771,6 +779,6 @@ - First public release -$Id: README 6471 2012-10-07 11:45:35Z rousseau $ +$Id: README 6507 2013-01-16 15:11:53Z rousseau $ vim:ts=20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.8/configure new/ccid-1.4.9/configure --- old/ccid-1.4.8/configure 2012-10-07 13:36:55.000000000 +0200 +++ new/ccid-1.4.9/configure 2013-01-16 16:38:45.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ccid 1.4.8. +# Generated by GNU Autoconf 2.69 for ccid 1.4.9. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='ccid' PACKAGE_TARNAME='ccid' -PACKAGE_VERSION='1.4.8' -PACKAGE_STRING='ccid 1.4.8' +PACKAGE_VERSION='1.4.9' +PACKAGE_STRING='ccid 1.4.9' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1361,7 +1361,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 ccid 1.4.8 to adapt to many kinds of systems. +\`configure' configures ccid 1.4.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1431,7 +1431,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ccid 1.4.8:";; + short | recursive ) echo "Configuration of ccid 1.4.9:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ccid configure 1.4.8 +ccid configure 1.4.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1980,7 +1980,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ccid $as_me 1.4.8, which was +It was created by ccid $as_me 1.4.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2796,7 +2796,7 @@ # Define the identity of the package. PACKAGE='ccid' - VERSION='1.4.8' + VERSION='1.4.9' cat >>confdefs.h <<_ACEOF @@ -13980,7 +13980,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ccid $as_me 1.4.8, which was +This file was extended by ccid $as_me 1.4.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14046,7 +14046,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ccid config.status 1.4.8 +ccid config.status 1.4.9 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/ccid-1.4.8/configure.ac new/ccid-1.4.9/configure.ac --- old/ccid-1.4.8/configure.ac 2012-10-07 13:36:44.000000000 +0200 +++ new/ccid-1.4.9/configure.ac 2013-01-16 16:14:20.000000000 +0100 @@ -1,12 +1,12 @@ # Process this file with autoconf to produce a configure script. # You may need to use autoconf 2.56 or newer -# $Id: configure.ac 6470 2012-10-07 11:36:44Z rousseau $ +# $Id: configure.ac 6507 2013-01-16 15:11:53Z rousseau $ # Require autoconf 2.61 AC_PREREQ([2.69]) -AC_INIT([ccid],[1.4.8]) +AC_INIT([ccid],[1.4.9]) AC_CONFIG_SRCDIR(src/ifdhandler.c) AC_CONFIG_AUX_DIR([.]) AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.8/readers/supported_readers.txt new/ccid-1.4.9/readers/supported_readers.txt --- old/ccid-1.4.8/readers/supported_readers.txt 2012-10-07 12:05:10.000000000 +0200 +++ new/ccid-1.4.9/readers/supported_readers.txt 2012-11-28 18:24:45.000000000 +0100 @@ -1,6 +1,6 @@ # # List of readers supported by the CCID driver -# Generated: 2012-09-13 +# Generated: 2012-11-13 # # DO NOT EDIT BY HAND @@ -130,6 +130,8 @@ # Aktiv 0x0A89:0x0025:Aktiv Rutoken lite 0x0A89:0x0030:Aktiv Rutoken ECP +0x0A89:0x0080:Aktiv PINPad Ex +0x0A89:0x0081:Aktiv PINPad In # Aktiv Co., ProgramPark 0x0A89:0x0060:Aktiv Co., ProgramPark Rutoken Magistra @@ -152,7 +154,6 @@ 0x03EB:0x6011:ATMEL AT90SCR050 0x03EB:0x6012:ATMEL VaultIC420 Smart Object 0x03EB:0x6014:ATMEL VaultIC440 -0x03EB:0x6016:ATMEL VaultIC460 # Avtor 0x15CF:0x0019:Avtor SecureToken @@ -323,6 +324,7 @@ 0x14DD:0x1006:Raritan D2CIM-DVUSB VM/CCID # REINER SCT +0x0C4B:0x0504:REINER SCT cyberJack go 0x0C4B:0x9102:REINER SCT cyberJack RFID basis # SchlumbergerSema @@ -412,6 +414,9 @@ # Aladdin 0x0529:0x0620:Aladdin eToken PRO USB 72K Java +# ATMEL +0x03EB:0x6016:ATMEL VaultIC460 + # Broadcom Corp 0x0A5C:0x5801:Broadcom Corp 5880 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.8/src/ifdhandler.c new/ccid-1.4.9/src/ifdhandler.c --- old/ccid-1.4.8/src/ifdhandler.c 2012-08-05 10:37:37.000000000 +0200 +++ new/ccid-1.4.9/src/ifdhandler.c 2012-11-28 18:24:45.000000000 +0100 @@ -17,7 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: ifdhandler.c 6399 2012-08-02 18:06:38Z rousseau $ */ +/* $Id: ifdhandler.c 6478 2012-10-31 15:20:20Z rousseau $ */ #include <stdio.h> #include <string.h> @@ -678,7 +678,10 @@ /* Do not send CCID command SetParameters or PPS to the CCID * The CCID will do this himself */ if (ccid_desc->dwFeatures & CCID_CLASS_AUTO_PPS_PROP) + { + DEBUG_COMM2("Timeout: %d ms", ccid_desc->readTimeout); goto end; + } /* Get ATR of the card */ (void)ATR_InitFromArray(&atr, ccid_slot->pcATRBuffer, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.8/src/tokenparser.c new/ccid-1.4.9/src/tokenparser.c --- old/ccid-1.4.8/src/tokenparser.c 2012-06-22 10:35:01.000000000 +0200 +++ new/ccid-1.4.9/src/tokenparser.c 2013-01-16 16:38:55.000000000 +0100 @@ -491,7 +491,7 @@ * Copyright (C) 2003-2010 * Ludovic Rousseau <[email protected]> * - * $Id: tokenparser.l 6325 2012-06-06 11:54:48Z rousseau $ + * $Id: tokenparser.l 6504 2013-01-16 14:22:26Z rousseau $ */ /** * @file @@ -1845,9 +1845,9 @@ (void)strlcpy(value, &pcToken[8], len); - /* convert the firt & into & */ - amp = strstr(value, "&"); - if (amp) + /* for all & in the string */ + amp = value; + while ((amp = strstr(amp, "&")) != NULL) { char *p; @@ -1856,6 +1856,11 @@ { *p = *(p+4); } + /* terminate the now shorter string */ + *p = '\0'; + + /* skip the & and continue */ + amp++; } r = list_append(list_values, value); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.8/src/tokenparser.l new/ccid-1.4.9/src/tokenparser.l --- old/ccid-1.4.8/src/tokenparser.l 2012-06-08 16:17:11.000000000 +0200 +++ new/ccid-1.4.9/src/tokenparser.l 2013-01-16 15:31:51.000000000 +0100 @@ -8,7 +8,7 @@ * Copyright (C) 2003-2010 * Ludovic Rousseau <[email protected]> * - * $Id: tokenparser.l 6325 2012-06-06 11:54:48Z rousseau $ + * $Id: tokenparser.l 6504 2013-01-16 14:22:26Z rousseau $ */ /** @@ -107,9 +107,9 @@ (void)strlcpy(value, &pcToken[8], len); - /* convert the firt & into & */ - amp = strstr(value, "&"); - if (amp) + /* for all & in the string */ + amp = value; + while ((amp = strstr(amp, "&")) != NULL) { char *p; @@ -118,6 +118,11 @@ { *p = *(p+4); } + /* terminate the now shorter string */ + *p = '\0'; + + /* skip the & and continue */ + amp++; } r = list_append(list_values, value); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
