Hello community, here is the log from the commit of package pcsc-lite for openSUSE:Factory checked in at 2013-01-17 09:54:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcsc-lite (Old) and /work/SRC/openSUSE:Factory/.pcsc-lite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcsc-lite", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/pcsc-lite/pcsc-lite.changes 2013-01-10 15:54:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pcsc-lite.new/pcsc-lite.changes 2013-01-17 09:54:26.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Jan 16 18:05:38 UTC 2013 - [email protected] + +- Updated to version 1.8.8 + * /etc/reader.conf: handle FRIENDLYNAME with no " delimiters + (serial readers) + * Info.plist: Correctly handle reader names containing & (USB readers) + +------------------------------------------------------------------- Old: ---- pcsc-lite-1.8.7.tar.bz2 pcsc-lite-1.8.7.tar.bz2.asc New: ---- pcsc-lite-1.8.8.tar.bz2 pcsc-lite-1.8.8.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-lite.spec ++++++ --- /var/tmp/diff_new_pack.jCHh7H/_old 2013-01-17 09:54:27.000000000 +0100 +++ /var/tmp/diff_new_pack.jCHh7H/_new 2013-01-17 09:54:27.000000000 +0100 @@ -33,10 +33,10 @@ BuildRequires: systemd %{?systemd_requires} %endif -%if %suse_version >= 1220 +%if %suse_version > 1220 BuildRequires: gpg-offline %endif -Version: 1.8.7 +Version: 1.8.8 Release: 0 Requires(pre): pwdutils Url: http://pcsclite.alioth.debian.org/ ++++++ pcsc-lite-1.8.7.tar.bz2 -> pcsc-lite-1.8.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pcsc-lite-1.8.7/ChangeLog new/pcsc-lite-1.8.8/ChangeLog --- old/pcsc-lite-1.8.7/ChangeLog 2012-11-28 18:44:00.000000000 +0100 +++ new/pcsc-lite-1.8.8/ChangeLog 2013-01-16 16:14:16.000000000 +0100 @@ -1,3 +1,8 @@ +pcsc-lite-1.8.8: Ludovic Rousseau +16 January 2013 +- /etc/reader.conf: handle FRIENDLYNAME with no " delimiters (serial readers) +- Info.plist: Correctly handle reader names containing & (USB readers) + pcsc-lite-1.8.7: Ludovic Rousseau 28 November 2012 - Fix a problem when a reader is unplugged (and the reader is still in use) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pcsc-lite-1.8.7/configure new/pcsc-lite-1.8.8/configure --- old/pcsc-lite-1.8.7/configure 2012-11-28 18:44:05.000000000 +0100 +++ new/pcsc-lite-1.8.8/configure 2013-01-16 16:14:26.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pcsc-lite 1.8.7. +# Generated by GNU Autoconf 2.69 for pcsc-lite 1.8.8. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='pcsc-lite' PACKAGE_TARNAME='pcsc-lite' -PACKAGE_VERSION='1.8.7' -PACKAGE_STRING='pcsc-lite 1.8.7' +PACKAGE_VERSION='1.8.8' +PACKAGE_STRING='pcsc-lite 1.8.8' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1363,7 +1363,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 pcsc-lite 1.8.7 to adapt to many kinds of systems. +\`configure' configures pcsc-lite 1.8.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1433,7 +1433,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pcsc-lite 1.8.7:";; + short | recursive ) echo "Configuration of pcsc-lite 1.8.8:";; esac cat <<\_ACEOF @@ -1565,7 +1565,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pcsc-lite configure 1.8.7 +pcsc-lite configure 1.8.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1984,7 +1984,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pcsc-lite $as_me 1.8.7, which was +It was created by pcsc-lite $as_me 1.8.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2800,7 +2800,7 @@ # Define the identity of the package. PACKAGE='pcsc-lite' - VERSION='1.8.7' + VERSION='1.8.8' cat >>confdefs.h <<_ACEOF @@ -14876,7 +14876,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pcsc-lite $as_me 1.8.7, which was +This file was extended by pcsc-lite $as_me 1.8.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14942,7 +14942,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pcsc-lite config.status 1.8.7 +pcsc-lite config.status 1.8.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/pcsc-lite-1.8.7/configure.ac new/pcsc-lite-1.8.8/configure.ac --- old/pcsc-lite-1.8.7/configure.ac 2012-11-28 18:44:00.000000000 +0100 +++ new/pcsc-lite-1.8.8/configure.ac 2013-01-16 16:14:16.000000000 +0100 @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([pcsc-lite],[1.8.7]) +AC_INIT([pcsc-lite],[1.8.8]) AC_CONFIG_SRCDIR(src/pcscdaemon.c) AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pcsc-lite-1.8.7/src/PCSC/pcsclite.h new/pcsc-lite-1.8.8/src/PCSC/pcsclite.h --- old/pcsc-lite-1.8.7/src/PCSC/pcsclite.h 2012-11-28 18:44:12.000000000 +0100 +++ new/pcsc-lite-1.8.8/src/PCSC/pcsclite.h 2013-01-16 16:14:36.000000000 +0100 @@ -190,7 +190,7 @@ #define INFINITE 0xFFFFFFFF /**< Infinite timeout */ #endif -#define PCSCLITE_VERSION_NUMBER "1.8.7" /**< Current version */ +#define PCSCLITE_VERSION_NUMBER "1.8.8" /**< Current version */ /** Maximum readers context (a slot is count as a reader) */ #define PCSCLITE_MAX_READERS_CONTEXTS 16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pcsc-lite-1.8.7/src/configfile.c new/pcsc-lite-1.8.8/src/configfile.c --- old/pcsc-lite-1.8.7/src/configfile.c 2012-03-30 10:42:28.000000000 +0200 +++ new/pcsc-lite-1.8.8/src/configfile.c 2013-01-16 16:14:39.000000000 +0100 @@ -480,7 +480,7 @@ * Copyright (C) 2004-2010 * Ludovic Rousseau <[email protected]> * - * $Id: configfile.l 6215 2012-02-04 09:08:36Z rousseau $ + * $Id: configfile.l 6501 2013-01-15 19:28:04Z rousseau $ */ #line 17 "configfile.l" #include <dirent.h> @@ -1795,10 +1795,6 @@ int evaluatetoken(char *pcToken) { - int channelId = 0; - int p = 0; - unsigned int n = 0; - if (pcPrevious == NULL) { /* This is the key */ pcPrevious = strdup(pcToken); @@ -1820,8 +1816,10 @@ { if (pcFriendlyname == NULL) { - pcFriendlyname = malloc(strlen(pcCurrent) - 1); - for (n = 0; n < strlen(pcCurrent); n++) + size_t n, p; + + pcFriendlyname = malloc(strlen(pcCurrent) + 1); + for (n = 0, p = 0; n < strlen(pcCurrent); n++) { if (pcCurrent[n] != '"') { /* Strip off the quotes */ @@ -1910,6 +1908,8 @@ if (pcFriendlyname != NULL && pcLibpath != NULL && pcChannelid != NULL && badError != 1) { + int channelId; + if (0 == reader_list_size) { /* one real reader and one end marker */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pcsc-lite-1.8.7/src/configfile.l new/pcsc-lite-1.8.8/src/configfile.l --- old/pcsc-lite-1.8.7/src/configfile.l 2012-03-30 10:42:19.000000000 +0200 +++ new/pcsc-lite-1.8.8/src/configfile.l 2013-01-16 15:31:51.000000000 +0100 @@ -10,7 +10,7 @@ * Copyright (C) 2004-2010 * Ludovic Rousseau <[email protected]> * - * $Id: configfile.l 6215 2012-02-04 09:08:36Z rousseau $ + * $Id: configfile.l 6501 2013-01-15 19:28:04Z rousseau $ */ %{ @@ -68,10 +68,6 @@ int evaluatetoken(char *pcToken) { - int channelId = 0; - int p = 0; - unsigned int n = 0; - if (pcPrevious == NULL) { /* This is the key */ pcPrevious = strdup(pcToken); @@ -93,8 +89,10 @@ { if (pcFriendlyname == NULL) { - pcFriendlyname = malloc(strlen(pcCurrent) - 1); - for (n = 0; n < strlen(pcCurrent); n++) + size_t n, p; + + pcFriendlyname = malloc(strlen(pcCurrent) + 1); + for (n = 0, p = 0; n < strlen(pcCurrent); n++) { if (pcCurrent[n] != '"') { /* Strip off the quotes */ @@ -183,6 +181,8 @@ if (pcFriendlyname != NULL && pcLibpath != NULL && pcChannelid != NULL && badError != 1) { + int channelId; + if (0 == reader_list_size) { /* one real reader and one end marker */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pcsc-lite-1.8.7/src/pcscd.h new/pcsc-lite-1.8.8/src/pcscd.h --- old/pcsc-lite-1.8.7/src/pcscd.h 2012-11-28 18:44:12.000000000 +0100 +++ new/pcsc-lite-1.8.8/src/pcscd.h 2013-01-16 16:14:36.000000000 +0100 @@ -30,7 +30,7 @@ #define PCSCLITE_CSOCK_NAME PCSCLITE_IPC_DIR "/pcscd.comm" -#define PCSCLITE_VERSION_NUMBER "1.8.7" /**< Current version */ +#define PCSCLITE_VERSION_NUMBER "1.8.8" /**< Current version */ #define PCSCLITE_STATUS_POLL_RATE 400000 /**< Status polling rate */ #define PCSCLITE_LOCK_POLL_RATE 100000 /**< Lock polling rate */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pcsc-lite-1.8.7/src/tokenparser.c new/pcsc-lite-1.8.8/src/tokenparser.c --- old/pcsc-lite-1.8.7/src/tokenparser.c 2012-06-08 20:12:08.000000000 +0200 +++ new/pcsc-lite-1.8.8/src/tokenparser.c 2013-01-16 16:14:41.000000000 +0100 @@ -510,7 +510,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 @@ -1864,9 +1864,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; @@ -1875,6 +1875,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/pcsc-lite-1.8.7/src/tokenparser.l new/pcsc-lite-1.8.8/src/tokenparser.l --- old/pcsc-lite-1.8.7/src/tokenparser.l 2012-06-08 16:17:11.000000000 +0200 +++ new/pcsc-lite-1.8.8/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]
