Hello community, here is the log from the commit of package pcsc-ccid for openSUSE:Factory checked in at 2013-10-11 09:00:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcsc-ccid (Old) and /work/SRC/openSUSE:Factory/.pcsc-ccid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcsc-ccid" Changes: -------- --- /work/SRC/openSUSE:Factory/pcsc-ccid/pcsc-ccid.changes 2013-08-23 11:06:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pcsc-ccid.new/pcsc-ccid.changes 2013-10-11 09:00:10.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Oct 10 10:54:29 UTC 2013 - w...@rosenauer.org + +- Updated to version 1.4.13 + * Add support of + Access IS ePassport Reader + Planeta RC700-NFC CCID + * Add support of Windows value for CM_IOCTL_GET_FEATURE_REQUEST + Windows uses 0x313520 for SCARD_CTL_CODE(3400) + pcsc-lite uses 0x42000D48 for SCARD_CTL_CODE(3400) + RDP aplications (like rdesktop) will convert SCardControl() + commands from a Windows application (so using 0x313520) to pcsc-lite. + * fix multi-slot support for card movement notification + * some minor bugs removed + +------------------------------------------------------------------- Old: ---- ccid-1.4.12.tar.bz2 ccid-1.4.12.tar.bz2.asc New: ---- ccid-1.4.13.tar.bz2 ccid-1.4.13.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-ccid.spec ++++++ --- /var/tmp/diff_new_pack.6VPOOu/_old 2013-10-11 09:00:15.000000000 +0200 +++ /var/tmp/diff_new_pack.6VPOOu/_new 2013-10-11 09:00:15.000000000 +0200 @@ -32,7 +32,7 @@ %if %suse_version > 1220 BuildRequires: gpg-offline %endif -Version: 1.4.12 +Version: 1.4.13 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.12.tar.bz2 -> ccid-1.4.13.tar.bz2 ++++++ ++++ 1978 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ccid-1.4.12/README new/ccid-1.4.13/README --- old/ccid-1.4.12/README 2013-08-12 23:44:09.000000000 +0200 +++ new/ccid-1.4.13/README 2013-10-09 12:02:34.000000000 +0200 @@ -118,6 +118,23 @@ History: ======== +1.4.13 - 9 October 2013, Ludovic Rousseau + - Add support of + . Access IS ePassport Reader + . Planeta RC700-NFC CCID + - Add support of Windows value for CM_IOCTL_GET_FEATURE_REQUEST + Windows uses 0x313520 for SCARD_CTL_CODE(3400) pcsc-lite uses + 0x42000D48 for SCARD_CTL_CODE(3400) + RDP aplications (like rdesktop) will convert SCardControl() + commands from a Windows application (so using 0x313520) to + pcsc-lite. + - fix multi-slot support for card movement notification (introduced + in 1.4.12) + - Mac OS X: differentiate each libccid library by the dynamic linker + using --prefix=/fake/$BUNDLE_ID + - some minor bugs removed + + 1.4.12 - 12 August 2013, Ludovic Rousseau - Add support of . HID OMNIKEY 5127 CK @@ -833,6 +850,6 @@ - First public release -$Id: README 6729 2013-08-12 21:43:09Z rousseau $ +$Id: README 6766 2013-10-09 10:00:52Z rousseau $ vim:ts=20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ccid-1.4.12/config.h.in new/ccid-1.4.13/config.h.in --- old/ccid-1.4.12/config.h.in 2013-08-12 23:45:32.000000000 +0200 +++ new/ccid-1.4.13/config.h.in 2013-10-09 12:02:51.000000000 +0200 @@ -85,9 +85,6 @@ /* Disable logging support */ #undef NO_LOG -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ccid-1.4.12/configure.ac new/ccid-1.4.13/configure.ac --- old/ccid-1.4.12/configure.ac 2013-08-12 23:44:09.000000000 +0200 +++ new/ccid-1.4.13/configure.ac 2013-10-09 12:02:34.000000000 +0200 @@ -1,15 +1,15 @@ # Process this file with autoconf to produce a configure script. # You may need to use autoconf 2.56 or newer -# $Id: configure.ac 6729 2013-08-12 21:43:09Z rousseau $ +# $Id: configure.ac 6766 2013-10-09 10:00:52Z rousseau $ # Require autoconf 2.61 AC_PREREQ([2.69]) -AC_INIT([ccid],[1.4.12]) +AC_INIT([ccid],[1.4.13]) AC_CONFIG_SRCDIR(src/ifdhandler.c) AC_CONFIG_AUX_DIR([.]) -AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip) +AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip subdir-objects) AC_CONFIG_MACRO_DIR([m4]) # silent build by default @@ -107,6 +107,7 @@ PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= $LIBUSB_NEEDED_VERSION, [], [ AC_MSG_WARN([install libusb $LIBUSB_NEEDED_VERSION or later]) + PKG_CHECK_MODULES(LIBUSB, libusb-1.0) ]) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ccid-1.4.12/readers/supported_readers.txt new/ccid-1.4.13/readers/supported_readers.txt --- old/ccid-1.4.12/readers/supported_readers.txt 2013-08-12 23:33:38.000000000 +0200 +++ new/ccid-1.4.13/readers/supported_readers.txt 2013-10-06 12:25:18.000000000 +0200 @@ -1,6 +1,6 @@ # # List of readers supported by the CCID driver -# Generated: 2013-08-12 +# Generated: 2013-09-23 # # DO NOT EDIT BY HAND @@ -117,6 +117,9 @@ # section: shouldwork ########################## +# Access IS +0x0DB5:0x0138:Access IS ePassport Reader + # ACS 0x072F:0x1204:ACS ACR101 ICC Reader 0x072F:0x8201:ACS APG8201 PINhandy 1 @@ -337,6 +340,9 @@ 0x0471:0x040F:Philips Semiconductors JCOP41V221 0x04B9:0x1400:Philips Semiconductors SmartMX Sample +# Planeta +0x21AB:0x0010:Planeta RC700-NFC CCID + # Raritan 0x14DD:0x1006:Raritan D2CIM-DVUSB VM/CCID diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ccid-1.4.12/src/Makefile.am new/ccid-1.4.13/src/Makefile.am --- old/ccid-1.4.12/src/Makefile.am 2013-06-29 19:51:45.000000000 +0200 +++ new/ccid-1.4.13/src/Makefile.am 2013-10-06 12:25:18.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 6664 2013-06-18 09:07:58Z rousseau $ +# $Id: Makefile.am 6752 2013-09-16 18:27:04Z rousseau $ CCID_BUNDLE = $(bundle) CCID_LIB = libccid.$(DYN_LIB_EXT) @@ -8,14 +8,17 @@ lib_LTLIBRARIES = LIBS_TO_INSTALL = +LIBS_TO_UNINSTALL = if WITH_LIBUSB lib_LTLIBRARIES += libccid.la LIBS_TO_INSTALL += install_ccid +LIBS_TO_UNINSTALL += uninstall_ccid noinst_PROGRAMS = parse endif if WITH_TWIN_SERIAL lib_LTLIBRARIES += libccidtwin.la LIBS_TO_INSTALL += install_ccidtwin +LIBS_TO_UNINSTALL += uninstall_ccidtwin endif COMMON = ccid.c \ @@ -73,6 +76,8 @@ towitoko/COPYING towitoko/README openct/LICENSE \ convert_version.pl 92_pcscd_ccid.rules +# We can't use install-exec-local since we want to overwrite the install +# rule. We do not want to _add_ files to install install: $(LIBS_TO_INSTALL) INSTALL_UDEV_RULE_FILE=@/bin/echo -e "\n\33[01;31m***************\n" ; echo "copy the src/92_pcscd_ccid.rules file in udev directory (/etc/udev/rules.d/)" ; /bin/echo -e "\n***************\n\33[0m" @@ -96,11 +101,12 @@ # do not uninstall the serial driver by default # use explicitely 'make uninstall_ccidtwin' -uninstall: uninstall_ccid +uninstall: $(LIBS_TO_UNINSTALL) uninstall_ccid: rm -rf $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE) uninstall_ccidtwin: - rm -f $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB).$(VERSION) + rm -f $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB) + rm -f $(DESTDIR)/$(serialconfdir)/libccidtwin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ccid-1.4.12/src/ccid_usb.c new/ccid-1.4.13/src/ccid_usb.c --- old/ccid-1.4.12/src/ccid_usb.c 2013-07-31 19:13:55.000000000 +0200 +++ new/ccid-1.4.13/src/ccid_usb.c 2013-10-06 12:25:18.000000000 +0200 @@ -18,7 +18,7 @@ */ /* - * $Id: ccid_usb.c 6682 2013-07-01 08:56:09Z rousseau $ + * $Id: ccid_usb.c 6760 2013-10-01 12:57:50Z rousseau $ */ #define __CCID_USB__ @@ -839,6 +839,9 @@ /* Deallocate the extension itself */ free(msExt); + + /* Stop the slot */ + usbDevice[reader_index].multislot_extension = NULL; } if (usbDevice[reader_index].ccid.gemalto_firmware_features) @@ -1014,7 +1017,7 @@ { unsigned int i; - for (i=0; i<sizeof(Bogus_firmwares)/sizeof(Bogus_firmwares[0]); i++) + for (i=0; i<COUNT_OF(Bogus_firmwares); i++) { if (desc->idVendor != Bogus_firmwares[i].vendor) continue; @@ -1055,7 +1058,7 @@ { int n, i, len; unsigned char buffer[256*sizeof(int)]; /* maximum is 256 records */ - unsigned int *int_array; + unsigned int *uint_array; /* See CCID 3.7.3 page 25 */ n = ControlUSB(reader_index, @@ -1092,8 +1095,8 @@ n = len; } - int_array = calloc(n+1, sizeof(int)); - if (NULL == int_array) + uint_array = calloc(n+1, sizeof(uint_array[0])); + if (NULL == uint_array) { DEBUG_CRITICAL("Memory allocation failed"); return NULL; @@ -1102,14 +1105,14 @@ /* convert in correct endianess */ for (i=0; i<n; i++) { - int_array[i] = dw2i(buffer, i*4); - DEBUG_INFO2("declared: %d bps", int_array[i]); + uint_array[i] = dw2i(buffer, i*4); + DEBUG_INFO2("declared: %d bps", uint_array[i]); } /* end of array marker */ - int_array[i] = 0; + uint_array[i] = 0; - return int_array; + return uint_array; } /* get_data_rates */ @@ -1577,9 +1580,6 @@ DEBUG_PERIODIC2("Stop (%d)", reader_index); - /* Stop the slot */ - usbDevice[reader_index].multislot_extension = NULL; - interrupt_byte = (usbDevice[reader_index].ccid.bCurrentSlotIndex / 4) + 1; interrupt_mask = 0x02 << (2 * (usbDevice[reader_index].ccid.bCurrentSlotIndex % 4)); @@ -1588,6 +1588,7 @@ /* Broacast an interrupt to wake-up the slot's thread */ msExt->buffer[interrupt_byte] |= interrupt_mask; pthread_cond_broadcast(&msExt->condition); + pthread_mutex_unlock(&msExt->mutex); } /* Multi_InterruptStop */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ccid-1.4.12/src/commands.c new/ccid-1.4.13/src/commands.c --- old/ccid-1.4.12/src/commands.c 2013-05-11 14:05:49.000000000 +0200 +++ new/ccid-1.4.13/src/commands.c 2013-10-06 12:25:18.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - * $Id: commands.c 6617 2013-05-04 15:50:40Z rousseau $ + * $Id: commands.c 6738 2013-08-23 08:43:37Z rousseau $ */ #include <string.h> @@ -1929,6 +1929,7 @@ return return_value; /* wait for ready */ + pcbuffer[0] = 0; return_value = CmdGetSlotStatus(reader_index, pcbuffer); if (return_value != IFD_SUCCESS) return return_value; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ccid-1.4.12/src/debug.c new/ccid-1.4.13/src/debug.c --- old/ccid-1.4.12/src/debug.c 2013-06-12 13:56:24.000000000 +0200 +++ new/ccid-1.4.13/src/debug.c 2013-10-06 12:25:18.000000000 +0200 @@ -18,11 +18,12 @@ */ /* - * $Id: debug.c 6646 2013-06-03 08:58:01Z rousseau $ + * $Id: debug.c 6760 2013-10-01 12:57:50Z rousseau $ */ #include "config.h" +#include "misc.h" #include "debug.h" #include <stdarg.h> @@ -66,7 +67,7 @@ unsigned int i; /* for each known color terminal */ - for (i = 0; i < sizeof(terms) / sizeof(terms[0]); i++) + for (i = 0; i < COUNT_OF(terms); i++) { /* we found a supported term? */ if (0 == strcmp(terms[i], term)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ccid-1.4.12/src/ifdhandler.c new/ccid-1.4.13/src/ifdhandler.c --- old/ccid-1.4.12/src/ifdhandler.c 2013-07-31 19:13:55.000000000 +0200 +++ new/ccid-1.4.13/src/ifdhandler.c 2013-10-06 12:25:18.000000000 +0200 @@ -17,7 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: ifdhandler.c 6685 2013-07-05 07:17:05Z rousseau $ */ +/* $Id: ifdhandler.c 6753 2013-09-21 14:16:17Z rousseau $ */ #include <stdio.h> #include <string.h> @@ -160,9 +160,6 @@ } else { - /* set back the old timeout */ - ccid_descriptor->readTimeout = oldReadTimeout; - /* Maybe we have a special treatment for this reader */ return_value = ccid_open_hack_post(reader_index); if (return_value != IFD_SUCCESS) @@ -170,6 +167,9 @@ DEBUG_CRITICAL("failed"); } } + + /* set back the old timeout */ + ccid_descriptor->readTimeout = oldReadTimeout; } error: @@ -1405,7 +1405,10 @@ /* Implement the PC/SC v2.02.07 Part 10 IOCTL mechanism */ /* Query for features */ - if (CM_IOCTL_GET_FEATURE_REQUEST == dwControlCode) + /* 0x313520 is the Windows value for SCARD_CTL_CODE(3400) + * This hack is needed for RDP applications */ + if ((CM_IOCTL_GET_FEATURE_REQUEST == dwControlCode) + || (0x313520 == dwControlCode)) { unsigned int iBytesReturned = 0; PCSC_TLV_STRUCTURE *pcsc_tlv = (PCSC_TLV_STRUCTURE *)RxBuffer; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ccid-1.4.12/src/misc.h new/ccid-1.4.13/src/misc.h --- old/ccid-1.4.12/src/misc.h 2010-12-11 14:40:35.000000000 +0100 +++ new/ccid-1.4.13/src/misc.h 2013-10-06 12:25:18.000000000 +0200 @@ -6,7 +6,7 @@ * Copyright (C) 2005-2010 * Ludovic Rousseau <ludovic.rouss...@free.fr> * - * $Id: misc.h 5434 2010-12-08 14:13:21Z rousseau $ + * $Id: misc.h 6758 2013-10-01 12:55:58Z rousseau $ */ #ifndef __misc_h__ @@ -55,4 +55,8 @@ #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif +#ifndef COUNT_OF +#define COUNT_OF(arr) (sizeof(arr)/sizeof(arr[0])) +#endif + #endif /* __misc_h__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ccid-1.4.12/ylwrap new/ccid-1.4.13/ylwrap --- old/ccid-1.4.12/ylwrap 2013-08-12 23:40:47.000000000 +0200 +++ new/ccid-1.4.13/ylwrap 2013-10-06 12:25:18.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2012-12-21.17; # UTC +scriptversion=2013-01-12.17; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # @@ -40,7 +40,7 @@ # guard FILE # ---------- # The CPP macro used to guard inclusion of FILE. -guard() +guard () { printf '%s\n' "$1" \ | sed \ @@ -96,17 +96,17 @@ # The input. -input="$1" +input=$1 shift # We'll later need for a correct munging of "#line" directives. input_sub_rx=`get_dirname "$input" | quote_for_sed` -case "$input" in +case $input in [\\/]* | ?:[\\/]*) # Absolute path; do nothing. ;; *) # Relative path. Make it absolute. - input="`pwd`/$input" + input=`pwd`/$input ;; esac input_rx=`get_dirname "$input" | quote_for_sed` @@ -132,8 +132,8 @@ # guard in its implementation file. sed_fix_header_guards= -while test "$#" -ne 0; do - if test "$1" = "--"; then +while test $# -ne 0; do + if test x"$1" = x"--"; then shift break fi @@ -153,16 +153,14 @@ done # The program to run. -prog="$1" +prog=$1 shift # Make any relative path in $prog absolute. -case "$prog" in +case $prog in [\\/]* | ?:[\\/]*) ;; - *[\\/]*) prog="`pwd`/$prog" ;; + *[\\/]*) prog=`pwd`/$prog ;; esac -# FIXME: add hostname here for parallel makes that run commands on -# other machines. But that might take us over the 14-char limit. dirname=ylwrap$$ do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret' trap "ret=129; $do_exit" 1 @@ -188,7 +186,7 @@ # otherwise prepend '../'. case $to in [\\/]* | ?:[\\/]*) target=$to;; - *) target="../$to";; + *) target=../$to;; esac # Do not overwrite unchanged header files to avoid useless @@ -197,7 +195,7 @@ # output of all other files to a temporary file so we can # compare them to existing versions. if test $from != $parser; then - realtarget="$target" + realtarget=$target target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'` fi -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
