Hello community,
here is the log from the commit of package pcsc-lite for openSUSE:Factory
checked in at 2012-12-05 14:02:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pcsc-lite (Old)
and /work/SRC/openSUSE:Factory/.pcsc-lite.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcsc-lite", Maintainer is "sbra...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pcsc-lite/pcsc-lite.changes 2012-11-17
07:26:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pcsc-lite.new/pcsc-lite.changes 2012-12-05
14:02:05.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Nov 30 08:34:00 UTC 2012 - w...@rosenauer.org
+
+- Updated to version 1.8.7
+ * Fix a problem when a reader is unplugged (and the reader is
+ still in use)
+
+-------------------------------------------------------------------
Old:
----
pcsc-lite-1.8.6.tar.bz2
New:
----
pcsc-lite-1.8.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcsc-lite.spec ++++++
--- /var/tmp/diff_new_pack.6YUh8q/_old 2012-12-05 14:02:06.000000000 +0100
+++ /var/tmp/diff_new_pack.6YUh8q/_new 2012-12-05 14:02:06.000000000 +0100
@@ -33,7 +33,7 @@
BuildRequires: systemd
%{?systemd_requires}
%endif
-Version: 1.8.6
+Version: 1.8.7
Release: 0
Requires(pre): pwdutils
Url: http://pcsclite.alioth.debian.org/
@@ -109,7 +109,7 @@
%package devel
Summary: Development package for the MUSCLE project SmartCards library
-License: BSD-3-Clause ; GPL-3.0+
+License: BSD-3-Clause and GPL-3.0+
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release}
Requires: glibc-devel
++++++ pcsc-lite-1.8.6.tar.bz2 -> pcsc-lite-1.8.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/ChangeLog
new/pcsc-lite-1.8.7/ChangeLog
--- old/pcsc-lite-1.8.6/ChangeLog 2012-08-30 18:19:13.000000000 +0200
+++ new/pcsc-lite-1.8.7/ChangeLog 2012-11-28 18:44:00.000000000 +0100
@@ -1,3 +1,8 @@
+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)
+
+
pcsc-lite-1.8.6: Ludovic Rousseau
30 August 2012
- Fix a problem when only serial drivers are used (no hotplug/USB
@@ -69,7 +74,7 @@
fork
- Add define of FEATURE_EXECUTE_PACE from PCSC v2 Part 10 Amendment 1
2011-06-03
-- Fix some memory leaks repoted by Coverity
+- Fix some memory leaks reported by Coverity
- Enable silent build by default
- log_line(): correctly calculate delta time when no color is used
The update of last_time was only done in case of colorization
@@ -223,7 +228,7 @@
driver polling function.
- Avoid a division by 0. Closes [#312555] "simclist bug in pcsc-lite"
- if pcscd is stared by libpcsclite then close all file handles except
- stdin, stdout and stderr so that pcscd does not confiscate ressources
+ stdin, stdout and stderr so that pcscd does not confiscate resources
allocated by the application
- in case of auto exit create a new session so that Ctrl-C on the
application will not also quit pcscd
@@ -264,7 +269,7 @@
Thanks to Patrice Angelini for the bug report
- SCardConnect() & SCardReconnect(): do not reset the cardProtocol in
SCARD_SHARE_DIRECT case since the card have _not_ been reseted. A new
- PPS negociation would fail.
+ PPS negotiation would fail.
- Do not install files in /etc any more. Serial drivers are rare now.
- Avoids a crash if a client sends a unknown command.
Thanks to Martin Vogt for the bug report
@@ -323,7 +328,7 @@
commands
- SCardStatus(): returns SCARD_E_SHARING_VIOLATION if the reader is
already used More conform to Windows
-- PCSC/reader.h: update sruct PIN_PROPERTIES_STRUCTURE to be conform
+- PCSC/reader.h: update struct PIN_PROPERTIES_STRUCTURE to be conform
with Revision 2.02.06, April 2009 of PCSCv2 part 10 Fields
wLcdMaxCharacters and wLcdMaxLines have been removed
. rename FEATURE_MCT_READERDIRECT in FEATURE_MCT_READER_DIRECT to be
@@ -682,7 +687,7 @@
3 March 2006
- new official stable version since 1.2.0 in October 2003. Many thanks
to all the bug reporters and bug fixers
-- libmusclecard is now in a independenant package
+- libmusclecard is now in a independent package
- (re)allow compilation on Solaris
- SCardReleaseContext(): do not check that the thread releasing the
context is the one that established it. This check is not performed on
@@ -896,7 +901,7 @@
- src/utils/Makefile.am:
. install bundleTool and installifd in [...]/sbin/ instead of [...]/bin/
- doc/example/Makefile.am:
- . do not install pcsc_demo since it is just a sample code for developpers
+ . do not install pcsc_demo since it is just a sample code for developers
that is not supposed (the code) to do anything useful
- doc/example/pcsc_demo.c:
. replace SCARD_PROTOCOL_ANY by SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1 since
@@ -1034,7 +1039,7 @@
link with libmusclecard.
- src/winscard_clnt.c: add a new function SCardUnload() to free allocated
resources. It is mandatory only if you use dlopen/dlclose to often
- load/unload the library. Otherwi se you will exhaust the ressources
+ load/unload the library. Otherwi se you will exhaust the resources
available and get a crash. Thanks to Guy Moreillon for the patch.
- src/muscletest.c: code cleaning
@@ -1282,7 +1287,7 @@
. corrected three %x to %lx for long arguments
- README
. add documentation for --enable-confdir and --enable-runpid
-- src/README_INTERNALS.txt: new file containing some documenation for source
+- src/README_INTERNALS.txt: new file containing some documentation for source
code hackers
- src/Makefile.am: add EXTRA_DIST = README_INTERNALS.txt
- src/pcscdaemon.c: the daemon now cleany stops the drivers before exiting
@@ -1319,7 +1324,7 @@
inspiration from Shell Hin-Lik Hung, OpenBSD pcsc-lite port
. add --enable-runpid=FILE to store the pcscd pid
inspiration from Carlos Prados, Debian package maintainer
-- many C source files includes <pcsclite.h> (or somilar). I changed to
+- many C source files includes <pcsclite.h> (or similar). I changed to
"pcsclite.h" since the local .h should be more recent and with less
bugs than the one in /usr/local/include/
- src/dyn_bsd.c, src/dyn_unix.c: in DYN_LoadLibrary() changed 0 to
@@ -1327,7 +1332,7 @@
- src/dyn_hpux.c: removed declared but unused variables
- src/ifdwrapper.c: initialize IFD_? functions pointer to NULL
- src/pcscdaemon.c:
- . removed declartion of errno (already made in errno.h)
+ . removed declaration of errno (already made in errno.h)
. exit with code value
. more explicit error message when /tmp/pcsc/ already exist
. test if VERSION and PCSCLITE_VERSION_NUMBER are the same
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/Makefile.in
new/pcsc-lite-1.8.7/Makefile.in
--- old/pcsc-lite-1.8.6/Makefile.in 2012-08-30 18:55:44.000000000 +0200
+++ new/pcsc-lite-1.8.7/Makefile.in 2012-11-28 18:44:06.000000000 +0100
@@ -62,7 +62,7 @@
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/config.h.in
new/pcsc-lite-1.8.7/config.h.in
--- old/pcsc-lite-1.8.6/config.h.in 2012-08-30 18:55:32.000000000 +0200
+++ new/pcsc-lite-1.8.7/config.h.in 2012-11-28 18:44:12.000000000 +0100
@@ -1,4 +1,4 @@
-/* config.h.in. Generated from configure.in by autoheader. */
+/* config.h.in. Generated from configure.ac by autoheader. */
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/configure
new/pcsc-lite-1.8.7/configure
--- old/pcsc-lite-1.8.6/configure 2012-08-30 18:55:31.000000000 +0200
+++ new/pcsc-lite-1.8.7/configure 2012-11-28 18:44:05.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.6.
+# Generated by GNU Autoconf 2.69 for pcsc-lite 1.8.7.
#
#
# 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.6'
-PACKAGE_STRING='pcsc-lite 1.8.6'
+PACKAGE_VERSION='1.8.7'
+PACKAGE_STRING='pcsc-lite 1.8.7'
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.6 to adapt to many kinds of systems.
+\`configure' configures pcsc-lite 1.8.7 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.6:";;
+ short | recursive ) echo "Configuration of pcsc-lite 1.8.7:";;
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.6
+pcsc-lite configure 1.8.7
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.6, which was
+It was created by pcsc-lite $as_me 1.8.7, 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.6'
+ VERSION='1.8.7'
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.6, which was
+This file was extended by pcsc-lite $as_me 1.8.7, 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.6
+pcsc-lite config.status 1.8.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/pcsc-lite-1.8.6/configure.ac
new/pcsc-lite-1.8.7/configure.ac
--- old/pcsc-lite-1.8.6/configure.ac 1970-01-01 01:00:00.000000000 +0100
+++ new/pcsc-lite-1.8.7/configure.ac 2012-11-28 18:44:00.000000000 +0100
@@ -0,0 +1,421 @@
+# -*- mode: m4; -*-
+# Process this file with autoconf to produce a configure script
+
+AC_PREREQ([2.69])
+
+AC_INIT([pcsc-lite],[1.8.7])
+AC_CONFIG_SRCDIR(src/pcscdaemon.c)
+AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip)
+AC_CONFIG_HEADERS([config.h])
+
+AC_CONFIG_MACRO_DIR(m4)
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+AC_CANONICAL_HOST
+AC_PROG_CC
+AC_C_BIGENDIAN
+
+# Check for some target-specific stuff
+case "$host" in
+*-*-hpux*)
+ CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED"
+ ;;
+*-*-solaris*)
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
+ need_dash_r=1
+ ;;
+*-*-sunos4*)
+ CPPFLAGS="$CPPFLAGS -DSUNOS4"
+ ;;
+*-*-aix*)
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
+ if (test "$LD" != "gcc" && test -z "$blibpath"); then
+ blibpath="/usr/lib:/lib:/usr/local/lib"
+ fi
+ ;;
+*-*-osf*)
+ CPPFLAGS="$CPPFLAGS -D_POSIX_PII_SOCKET"
+ ;;
+*-*-darwin*)
+ AC_SUBST(COREFOUNDATION)
+ COREFOUNDATION="-Wl,-framework,CoreFoundation"
+ AC_SUBST(IOKIT)
+ IOKIT="-Wl,-framework,IOKit"
+ if test "$GCC" = "yes"; then
+ CFLAGS="$CFLAGS -no-cpp-precomp"
+ fi
+ use_libusb=no
+ AC_MSG_WARN([libusb disabled on Darwin for pcsc-lite])
+ ;;
+esac
+
+# Options
+AM_MAINTAINER_MODE
+
+# Checks for programs
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AM_PROG_LEX
+PKG_PROG_PKG_CONFIG
+AM_PROG_CC_C_O
+AM_PROG_AR
+
+# Special check for pthread support
+AX_PTHREAD([
+ AC_DEFINE(HAVE_PTHREAD, 1,
+ [Define if you have POSIX threads libraries and header files.])
+],[
+ AC_MSG_ERROR([POSIX thread support required])
+])
+
+CC="$PTHREAD_CC"
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+
+# check for pthread_cancel()
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+AC_CHECK_FUNCS(pthread_cancel)
+CFLAGS="$saved_CFLAGS"
+
+# Add libtool support
+# Static lib is disabled by default. Use --enable-static if needed
+LT_INIT(disable-static)
+LT_INIT
+# Automatically update the libtool script if it becomes out-of-date
+#AC_SUBST(LIBTOOL_DEPS)
+
+# Checks for header files
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([getopt.h sys/filio.h syslog.h dl.h fcntl.h ])
+
+# Checks for typedefs, structures, and compiler characteristics
+AC_C_CONST
+AC_TYPE_UID_T
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+
+# Checks for library functions
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_STAT
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(daemon flock getopt_long nanosleep strerror vsnprintf)
+
+# strlcpy, strlcat from OpenBSD
+AC_CHECK_FUNCS(strlcpy strlcat)
+
+# C Compiler features
+AC_C_INLINE
+if test "$GCC" = "yes"; then
+ CFLAGS="-Wall -fno-common $CFLAGS"
+fi
+
+# check if the compiler support -fvisibility=hidden (GCC >= 4)
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -fvisibility=hidden"
+AC_MSG_CHECKING([for -fvisibility=hidden])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])],
+ [ AC_MSG_RESULT([yes])
+ SYMBOL_VISIBILITY="-fvisibility=hidden" ],
+ AC_MSG_RESULT([no]))
+CFLAGS="$saved_CFLAGS"
+AC_SUBST(SYMBOL_VISIBILITY)
+
+AC_SUBST(LIBDL)
+AC_CHECK_LIB(dl, dlopen, [LIBDL="$LIBDL -ldl" ac_cv_func_dlopen_ldl=yes],
ac_cv_func_dlopen_ldl=no)
+
+# Use 'uname' output as an architecture define
+PCSC_ARCH=`uname | sed -e s,/,_,`
+case "$PCSC_ARCH" in
+Darwin)
+ PCSC_ARCH=MacOS
+ ;;
+SunOS)
+ PCSC_ARCH=Solaris
+ ;;
+esac
+AC_DEFINE_UNQUOTED(PCSC_ARCH, "$PCSC_ARCH", [PC/SC target architecture])
+PCSCLITE_FEATURES="${PCSCLITE_FEATURES} $PCSC_ARCH $host"
+
+# See if socket() is found from libsocket
+AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
+
+# check for mq_getattr()
+AC_CHECK_LIB(rt, mq_getattr, [LIBS="$LIBS -lrt"])
+
+# --disable-serial
+AC_ARG_ENABLE(serial,
+ AS_HELP_STRING([--disable-serial],[do not use serial reader.conf file]),
+ [ use_serial="${enableval}" ], [ use_serial="yes" ] )
+AM_CONDITIONAL(ENABLE_SERIAL, test "$use_serial" != "no")
+if test "$use_serial" != "no"; then
+ AC_DEFINE(USE_SERIAL, 1, [Use serial conf file mechanism])
+ PCSCLITE_FEATURES="${PCSCLITE_FEATURES} serial"
+fi
+
+# --disable-usb
+AC_ARG_ENABLE(usb,
+ AS_HELP_STRING([--disable-usb],[do not use usb hotplug]),
+ [ use_usb="${enableval}" ], [ use_usb="yes" ] )
+AM_CONDITIONAL(ENABLE_USB, test "$use_usb" != "no")
+if test "$use_usb" != "no"; then
+ AC_DEFINE(USE_USB, 1, [Use USB hotplug mechanism])
+ PCSCLITE_FEATURES="${PCSCLITE_FEATURES} usb"
+fi
+
+# --enable-libudev
+AC_ARG_ENABLE(libudev,
+ AS_HELP_STRING([--disable-libudev],[do not use libudev]),
+ [ use_libudev="${enableval}" ],
+ [ if test "$PCSC_ARCH" != "Linux" ; then
+ use_libudev="no"
+ else
+ use_libudev="${use_libudev-yes}"
+ fi ])
+
+# disable libudev check is USB is not used
+if test "$use_usb" == "no"; then
+ use_libudev="no"
+fi
+
+# check if libudev is used
+if test "x$use_libudev" != xno ; then
+ PKG_CHECK_MODULES(LIBUDEV, libudev, [],
+ [ AC_MSG_ERROR([install libudev-dev or use --disable-libudev])
])
+
+ saved_CPPFLAGS="$CPPFLAGS"
+ saved_LIBS="$LIBS"
+
+ CPPFLAGS="$CPPFLAGS $LIBUDEV_CFLAGS"
+ LIBS="$LDFLAGS $LIBUDEV_LIBS"
+
+ AC_CHECK_HEADERS(libudev.h, [],
+ [ AC_MSG_ERROR([libudev.h not found, use ./configure
LIBUDEV_CFLAGS=...]) ])
+
+ LIBS="$LIBS $COREFOUNDATION $IOKIT"
+
+ AC_MSG_CHECKING([for udev_monitor_unref])
+ AC_TRY_LINK_FUNC(udev_monitor_unref, [ AC_MSG_RESULT([yes]) ],
+ [ AC_MSG_ERROR([udev_monitor_unref not found, use ./configure
LIBUDEV_LIBS=...]) ])
+
+ # everything needed for libudev support is present
+ use_libudev=yes
+
+ CPPFLAGS="$saved_CPPFLAGS"
+ LIBS="$saved_LIBS"
+fi
+AC_SUBST(LIBUDEV_CFLAGS)
+AC_SUBST(LIBUDEV_LIBS)
+
+if test x$use_libudev = xyes; then
+ AC_DEFINE(HAVE_LIBUDEV, 1, [Libudev is available])
+ PCSCLITE_FEATURES="${PCSCLITE_FEATURES} libudev"
+fi
+
+# --enable-libusb
+AC_ARG_ENABLE(libusb,
+ AS_HELP_STRING([--enable-libusb],[use libusb]),
+ [ use_libusb="${enableval}" ],
+ [ if test "x$use_libudev" = xyes ; then use_libusb="${use_libusb-no}" ;
+ else use_libusb="${use_libusb-yes}" ; fi ] )
+
+# disable libusb check is USB is not used
+if test "$use_usb" == "no"; then
+ use_libusb="no"
+fi
+
+# check if libusb is used
+if test "x$use_libusb" != xno ; then
+ if test "x$use_libudev" != xno ; then
+ AC_MSG_ERROR([You can't use libudev _and_ libusb. Select only
one.])
+ fi
+
+ PKG_CHECK_MODULES(LIBUSB, libusb-1.0, [],
+ [
+ AC_MSG_RESULT([no])
+ AC_CHECK_PROG([LIBUSBCONFIG], [libusb-config], [yes])
+
+ if test "$LIBUSBCONFIG" = "yes" ; then
+ LIBUSB_CFLAGS="$LIBUSB_CFLAGS `libusb-config
--cflags`"
+ LIBUSB_LIBS="$LIBUSB_LIBS `libusb-config
--libs`"
+ else
+ AC_MSG_WARN([libusb-config not found.])
+ fi
+ ])
+
+ saved_CPPFLAGS="$CPPFLAGS"
+ saved_LIBS="$LIBS"
+
+ CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS"
+ LIBS="$LDFLAGS $LIBUSB_LIBS"
+
+ AC_CHECK_HEADERS(libusb.h, [],
+ [ AC_MSG_ERROR([libusb.h not found, use ./configure
LIBUSB_CFLAGS=...]) ])
+
+ LIBS="$LIBS $COREFOUNDATION $IOKIT"
+
+ AC_MSG_CHECKING([for libusb_init])
+ AC_TRY_LINK_FUNC(libusb_init, [ AC_MSG_RESULT([yes]) ],
+ [ AC_MSG_ERROR([libusb not found, use ./configure
LIBUSB_LIBS=...]) ])
+
+ # everything needed for libusb support is present
+ use_libusb=yes
+
+ CPPFLAGS="$saved_CPPFLAGS"
+ LIBS="$saved_LIBS"
+fi
+AC_SUBST(LIBUSB_CFLAGS)
+AC_SUBST(LIBUSB_LIBS)
+
+if test x$use_libusb = xyes; then
+ AC_DEFINE(HAVE_LIBUSB, 1, [Libusb is available])
+ PCSCLITE_FEATURES="${PCSCLITE_FEATURES} libusb"
+fi
+
+# --with-systemdsystemunitdir=DIR
+AC_ARG_WITH([systemdsystemunitdir],
+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd
service files]),
+ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir
systemd)])
+if test "x$with_systemdsystemunitdir" != xno; then
+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a
"x$with_systemdsystemunitdir" != xno ])
+
+# --enable-embedded
+AC_ARG_ENABLE(embedded,
+ AS_HELP_STRING([--enable-embedded],[limit RAM and CPU ressources by
disabling features (log)]),
+ [ use_embedded="${enableval}" ])
+
+if test x$use_embedded = xyes; then
+ AC_DEFINE(NO_LOG, 1, [Disable logging support])
+ PCSCLITE_FEATURES="${PCSCLITE_FEATURES} nolog"
+fi
+
+# --enable-usbdropdir=DIR
+AC_ARG_ENABLE(usbdropdir,
+ AS_HELP_STRING([--enable-usbdropdir=DIR],[directory containing USB
+ drivers (default
/usr/local/lib/pcsc/drivers)]),
+[usbdropdir="${enableval}"], [usbdropdir=false])
+if test x${usbdropdir} = xfalse ; then
+ if test "x$libdir" != xNONE; then
+ usbdropdir="$libdir/pcsc/drivers"
+ else
+ usbdropdir="$ac_default_libdir/pcsc/drivers"
+ fi
+fi
+AS_AC_EXPAND(usbdropdir_exp,$usbdropdir)
+usbdropdir=$usbdropdir_exp
+AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR, "$usbdropdir", [directory containing
USB drivers])
+PCSCLITE_FEATURES="${PCSCLITE_FEATURES} usbdropdir=${usbdropdir}"
+
+# --enable-debugatr
+AC_ARG_ENABLE(debugatr,
+ AS_HELP_STRING([--enable-debugatr],[enable ATR debug messages from pcscd]),
+[ case "${enableval}" in
+ yes) debugatr=true ;;
+ no) debugatr=false ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-debugatr]) ;;
+esac], [debugatr=false])
+
+if test x${debugatr} = xtrue ; then
+ AC_DEFINE(ATR_DEBUG, 1, [display ATR parsing debug messages.])
+ PCSCLITE_FEATURES="${PCSCLITE_FEATURES} debugatr"
+fi
+
+# --enable-ipcdir=DIR
+AC_ARG_ENABLE(ipcdir,
+ AS_HELP_STRING([--enable-ipcdir=DIR],[directory containing IPC files
+ (default /var/run/pcscd)]),
+[ipcdir="${enableval}"], [ipcdir=false])
+
+if test x${ipcdir} = xfalse ; then
+ ipcdir="/var/run/pcscd"
+fi
+AC_DEFINE_UNQUOTED(USE_IPCDIR, "$ipcdir", [directory containing IPC files])
+PCSCLITE_FEATURES="${PCSCLITE_FEATURES} ipcdir=${ipcdir}"
+
+CPPFLAGS="-I\${top_srcdir}/src $CPPFLAGS"
+
+# --enable-confdir=DIR
+AC_ARG_ENABLE(confdir,
+AS_HELP_STRING([--enable-confdir=DIR],[directory containing reader
configurations (default /etc/reader.conf.d)]),
+ [confdir="${enableval}"],
+ [confdir="${sysconfdir}/reader.conf.d"])
+
+# Setup dist stuff
+AC_SUBST(usbdropdir)
+AC_SUBST(ipcdir)
+AC_SUBST(host_to_ccid_16)
+AC_SUBST(host_to_ccid_32)
+AS_AC_EXPAND(confdir_exp,$confdir)
+AS_AC_EXPAND(sbindir_exp,$sbindir)
+AS_AC_EXPAND(localstatedir_exp,$localstatedir)
+
+PCSCLITE_CONFIG_DIR="${confdir_exp}"
+AC_SUBST(PCSCLITE_CONFIG_DIR)
+PCSCLITE_FEATURES="${PCSCLITE_FEATURES} configdir=${PCSCLITE_CONFIG_DIR}"
+AC_DEFINE_UNQUOTED([PCSCLITE_FEATURES], ["${PCSCLITE_FEATURES}"], [Enabled
PC/SC lite features])
+PCSCD_BINARY="${sbindir_exp}/pcscd"
+AC_DEFINE_UNQUOTED([PCSCD_BINARY], ["$PCSCD_BINARY"], [pcscd filename])
+
+cat << EOF
+
+PC/SC lite has been configured with following options:
+
+Version: ${PACKAGE_VERSION}
+System binaries: $(eval eval eval echo "${sbindir_exp}")
+Configuration dir: ${PCSCLITE_CONFIG_DIR}
+
+
+Host: ${host}
+Compiler: ${CC}
+Preprocessor flags: ${CPPFLAGS}
+Compiler flags: ${CFLAGS}
+Preprocessor flags: ${CPPFLAGS}
+Linker flags: ${LDFLAGS}
+Libraries: ${LIBS}
+
+PTHREAD_CFLAGS: ${PTHREAD_CFLAGS}
+PTHREAD_LIBS: ${PTHREAD_LIBS}
+PCSC_ARCH: ${PCSC_ARCH}
+
+pcscd binary ${PCSCD_BINARY}
+libudev support: ${use_libudev}
+libusb support: ${use_libusb}
+USB drop directory: ${usbdropdir}
+ATR parsing messages: ${debugatr}
+ipcdir: ${ipcdir}
+use serial: ${use_serial}
+use usb: ${use_usb}
+systemd unit directory: ${with_systemdsystemunitdir}
+
+PCSCLITE_FEATURES: ${PCSCLITE_FEATURES}
+
+EOF
+
+# Write Makefiles
+AC_CONFIG_FILES([
+Makefile
+doc/Makefile
+doc/doxygen.conf
+doc/pcscd.8
+doc/reader.conf.5
+doc/example/Makefile
+etc/Makefile
+etc/pcscd.service
+etc/pcscd.socket
+src/Makefile
+src/libpcsclite.pc
+src/pcscd.h
+src/PCSC/pcsclite.h
+src/spy/Makefile
+])
+AC_OUTPUT
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/configure.in
new/pcsc-lite-1.8.7/configure.in
--- old/pcsc-lite-1.8.6/configure.in 2012-08-30 18:55:23.000000000 +0200
+++ new/pcsc-lite-1.8.7/configure.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,421 +0,0 @@
-# -*- mode: m4; -*-
-# Process this file with autoconf to produce a configure script
-
-AC_PREREQ([2.69])
-
-AC_INIT([pcsc-lite],[1.8.6])
-AC_CONFIG_SRCDIR(src/pcscdaemon.c)
-AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip)
-AC_CONFIG_HEADERS([config.h])
-
-AC_CONFIG_MACRO_DIR(m4)
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AC_CANONICAL_HOST
-AC_PROG_CC
-AC_C_BIGENDIAN
-
-# Check for some target-specific stuff
-case "$host" in
-*-*-hpux*)
- CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED"
- ;;
-*-*-solaris*)
- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
- need_dash_r=1
- ;;
-*-*-sunos4*)
- CPPFLAGS="$CPPFLAGS -DSUNOS4"
- ;;
-*-*-aix*)
- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- LDFLAGS="$LDFLAGS -L/usr/local/lib"
- if (test "$LD" != "gcc" && test -z "$blibpath"); then
- blibpath="/usr/lib:/lib:/usr/local/lib"
- fi
- ;;
-*-*-osf*)
- CPPFLAGS="$CPPFLAGS -D_POSIX_PII_SOCKET"
- ;;
-*-*-darwin*)
- AC_SUBST(COREFOUNDATION)
- COREFOUNDATION="-Wl,-framework,CoreFoundation"
- AC_SUBST(IOKIT)
- IOKIT="-Wl,-framework,IOKit"
- if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -no-cpp-precomp"
- fi
- use_libusb=no
- AC_MSG_WARN([libusb disabled on Darwin for pcsc-lite])
- ;;
-esac
-
-# Options
-AM_MAINTAINER_MODE
-
-# Checks for programs
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AM_PROG_LEX
-PKG_PROG_PKG_CONFIG
-AM_PROG_CC_C_O
-AM_PROG_AR
-
-# Special check for pthread support
-AX_PTHREAD([
- AC_DEFINE(HAVE_PTHREAD, 1,
- [Define if you have POSIX threads libraries and header files.])
-],[
- AC_MSG_ERROR([POSIX thread support required])
-])
-
-CC="$PTHREAD_CC"
-
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_CFLAGS)
-
-# check for pthread_cancel()
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-AC_CHECK_FUNCS(pthread_cancel)
-CFLAGS="$saved_CFLAGS"
-
-# Add libtool support
-# Static lib is disabled by default. Use --enable-static if needed
-LT_INIT(disable-static)
-LT_INIT
-# Automatically update the libtool script if it becomes out-of-date
-#AC_SUBST(LIBTOOL_DEPS)
-
-# Checks for header files
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([getopt.h sys/filio.h syslog.h dl.h fcntl.h ])
-
-# Checks for typedefs, structures, and compiler characteristics
-AC_C_CONST
-AC_TYPE_UID_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-
-# Checks for library functions
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_STAT
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(daemon flock getopt_long nanosleep strerror vsnprintf)
-
-# strlcpy, strlcat from OpenBSD
-AC_CHECK_FUNCS(strlcpy strlcat)
-
-# C Compiler features
-AC_C_INLINE
-if test "$GCC" = "yes"; then
- CFLAGS="-Wall -fno-common $CFLAGS"
-fi
-
-# check if the compiler support -fvisibility=hidden (GCC >= 4)
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -fvisibility=hidden"
-AC_MSG_CHECKING([for -fvisibility=hidden])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])],
- [ AC_MSG_RESULT([yes])
- SYMBOL_VISIBILITY="-fvisibility=hidden" ],
- AC_MSG_RESULT([no]))
-CFLAGS="$saved_CFLAGS"
-AC_SUBST(SYMBOL_VISIBILITY)
-
-AC_SUBST(LIBDL)
-AC_CHECK_LIB(dl, dlopen, [LIBDL="$LIBDL -ldl" ac_cv_func_dlopen_ldl=yes],
ac_cv_func_dlopen_ldl=no)
-
-# Use 'uname' output as an architecture define
-PCSC_ARCH=`uname | sed -e s,/,_,`
-case "$PCSC_ARCH" in
-Darwin)
- PCSC_ARCH=MacOS
- ;;
-SunOS)
- PCSC_ARCH=Solaris
- ;;
-esac
-AC_DEFINE_UNQUOTED(PCSC_ARCH, "$PCSC_ARCH", [PC/SC target architecture])
-PCSCLITE_FEATURES="${PCSCLITE_FEATURES} $PCSC_ARCH $host"
-
-# See if socket() is found from libsocket
-AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
-
-# check for mq_getattr()
-AC_CHECK_LIB(rt, mq_getattr, [LIBS="$LIBS -lrt"])
-
-# --disable-serial
-AC_ARG_ENABLE(serial,
- AS_HELP_STRING([--disable-serial],[do not use serial reader.conf file]),
- [ use_serial="${enableval}" ], [ use_serial="yes" ] )
-AM_CONDITIONAL(ENABLE_SERIAL, test "$use_serial" != "no")
-if test "$use_serial" != "no"; then
- AC_DEFINE(USE_SERIAL, 1, [Use serial conf file mechanism])
- PCSCLITE_FEATURES="${PCSCLITE_FEATURES} serial"
-fi
-
-# --disable-usb
-AC_ARG_ENABLE(usb,
- AS_HELP_STRING([--disable-usb],[do not use usb hotplug]),
- [ use_usb="${enableval}" ], [ use_usb="yes" ] )
-AM_CONDITIONAL(ENABLE_USB, test "$use_usb" != "no")
-if test "$use_usb" != "no"; then
- AC_DEFINE(USE_USB, 1, [Use USB hotplug mechanism])
- PCSCLITE_FEATURES="${PCSCLITE_FEATURES} usb"
-fi
-
-# --enable-libudev
-AC_ARG_ENABLE(libudev,
- AS_HELP_STRING([--disable-libudev],[do not use libudev]),
- [ use_libudev="${enableval}" ],
- [ if test "$PCSC_ARCH" != "Linux" ; then
- use_libudev="no"
- else
- use_libudev="${use_libudev-yes}"
- fi ])
-
-# disable libudev check is USB is not used
-if test "$use_usb" == "no"; then
- use_libudev="no"
-fi
-
-# check if libudev is used
-if test "x$use_libudev" != xno ; then
- PKG_CHECK_MODULES(LIBUDEV, libudev, [],
- [ AC_MSG_ERROR([install libudev-dev or use --disable-libudev])
])
-
- saved_CPPFLAGS="$CPPFLAGS"
- saved_LIBS="$LIBS"
-
- CPPFLAGS="$CPPFLAGS $LIBUDEV_CFLAGS"
- LIBS="$LDFLAGS $LIBUDEV_LIBS"
-
- AC_CHECK_HEADERS(libudev.h, [],
- [ AC_MSG_ERROR([libudev.h not found, use ./configure
LIBUDEV_CFLAGS=...]) ])
-
- LIBS="$LIBS $COREFOUNDATION $IOKIT"
-
- AC_MSG_CHECKING([for udev_monitor_unref])
- AC_TRY_LINK_FUNC(udev_monitor_unref, [ AC_MSG_RESULT([yes]) ],
- [ AC_MSG_ERROR([udev_monitor_unref not found, use ./configure
LIBUDEV_LIBS=...]) ])
-
- # everything needed for libudev support is present
- use_libudev=yes
-
- CPPFLAGS="$saved_CPPFLAGS"
- LIBS="$saved_LIBS"
-fi
-AC_SUBST(LIBUDEV_CFLAGS)
-AC_SUBST(LIBUDEV_LIBS)
-
-if test x$use_libudev = xyes; then
- AC_DEFINE(HAVE_LIBUDEV, 1, [Libudev is available])
- PCSCLITE_FEATURES="${PCSCLITE_FEATURES} libudev"
-fi
-
-# --enable-libusb
-AC_ARG_ENABLE(libusb,
- AS_HELP_STRING([--enable-libusb],[use libusb]),
- [ use_libusb="${enableval}" ],
- [ if test "x$use_libudev" = xyes ; then use_libusb="${use_libusb-no}" ;
- else use_libusb="${use_libusb-yes}" ; fi ] )
-
-# disable libusb check is USB is not used
-if test "$use_usb" == "no"; then
- use_libusb="no"
-fi
-
-# check if libusb is used
-if test "x$use_libusb" != xno ; then
- if test "x$use_libudev" != xno ; then
- AC_MSG_ERROR([You can't use libudev _and_ libusb. Select only
one.])
- fi
-
- PKG_CHECK_MODULES(LIBUSB, libusb-1.0, [],
- [
- AC_MSG_RESULT([no])
- AC_CHECK_PROG([LIBUSBCONFIG], [libusb-config], [yes])
-
- if test "$LIBUSBCONFIG" = "yes" ; then
- LIBUSB_CFLAGS="$LIBUSB_CFLAGS `libusb-config
--cflags`"
- LIBUSB_LIBS="$LIBUSB_LIBS `libusb-config
--libs`"
- else
- AC_MSG_WARN([libusb-config not found.])
- fi
- ])
-
- saved_CPPFLAGS="$CPPFLAGS"
- saved_LIBS="$LIBS"
-
- CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS"
- LIBS="$LDFLAGS $LIBUSB_LIBS"
-
- AC_CHECK_HEADERS(libusb.h, [],
- [ AC_MSG_ERROR([libusb.h not found, use ./configure
LIBUSB_CFLAGS=...]) ])
-
- LIBS="$LIBS $COREFOUNDATION $IOKIT"
-
- AC_MSG_CHECKING([for libusb_init])
- AC_TRY_LINK_FUNC(libusb_init, [ AC_MSG_RESULT([yes]) ],
- [ AC_MSG_ERROR([libusb not found, use ./configure
LIBUSB_LIBS=...]) ])
-
- # everything needed for libusb support is present
- use_libusb=yes
-
- CPPFLAGS="$saved_CPPFLAGS"
- LIBS="$saved_LIBS"
-fi
-AC_SUBST(LIBUSB_CFLAGS)
-AC_SUBST(LIBUSB_LIBS)
-
-if test x$use_libusb = xyes; then
- AC_DEFINE(HAVE_LIBUSB, 1, [Libusb is available])
- PCSCLITE_FEATURES="${PCSCLITE_FEATURES} libusb"
-fi
-
-# --with-systemdsystemunitdir=DIR
-AC_ARG_WITH([systemdsystemunitdir],
- AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd
service files]),
- [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir
systemd)])
-if test "x$with_systemdsystemunitdir" != xno; then
- AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-fi
-AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a
"x$with_systemdsystemunitdir" != xno ])
-
-# --enable-embedded
-AC_ARG_ENABLE(embedded,
- AS_HELP_STRING([--enable-embedded],[limit RAM and CPU ressources by
disabling features (log)]),
- [ use_embedded="${enableval}" ])
-
-if test x$use_embedded = xyes; then
- AC_DEFINE(NO_LOG, 1, [Disable logging support])
- PCSCLITE_FEATURES="${PCSCLITE_FEATURES} nolog"
-fi
-
-# --enable-usbdropdir=DIR
-AC_ARG_ENABLE(usbdropdir,
- AS_HELP_STRING([--enable-usbdropdir=DIR],[directory containing USB
- drivers (default
/usr/local/lib/pcsc/drivers)]),
-[usbdropdir="${enableval}"], [usbdropdir=false])
-if test x${usbdropdir} = xfalse ; then
- if test "x$libdir" != xNONE; then
- usbdropdir="$libdir/pcsc/drivers"
- else
- usbdropdir="$ac_default_libdir/pcsc/drivers"
- fi
-fi
-AS_AC_EXPAND(usbdropdir_exp,$usbdropdir)
-usbdropdir=$usbdropdir_exp
-AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR, "$usbdropdir", [directory containing
USB drivers])
-PCSCLITE_FEATURES="${PCSCLITE_FEATURES} usbdropdir=${usbdropdir}"
-
-# --enable-debugatr
-AC_ARG_ENABLE(debugatr,
- AS_HELP_STRING([--enable-debugatr],[enable ATR debug messages from pcscd]),
-[ case "${enableval}" in
- yes) debugatr=true ;;
- no) debugatr=false ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-debugatr]) ;;
-esac], [debugatr=false])
-
-if test x${debugatr} = xtrue ; then
- AC_DEFINE(ATR_DEBUG, 1, [display ATR parsing debug messages.])
- PCSCLITE_FEATURES="${PCSCLITE_FEATURES} debugatr"
-fi
-
-# --enable-ipcdir=DIR
-AC_ARG_ENABLE(ipcdir,
- AS_HELP_STRING([--enable-ipcdir=DIR],[directory containing IPC files
- (default /var/run/pcscd)]),
-[ipcdir="${enableval}"], [ipcdir=false])
-
-if test x${ipcdir} = xfalse ; then
- ipcdir="/var/run/pcscd"
-fi
-AC_DEFINE_UNQUOTED(USE_IPCDIR, "$ipcdir", [directory containing IPC files])
-PCSCLITE_FEATURES="${PCSCLITE_FEATURES} ipcdir=${ipcdir}"
-
-CPPFLAGS="-I\${top_srcdir}/src $CPPFLAGS"
-
-# --enable-confdir=DIR
-AC_ARG_ENABLE(confdir,
-AS_HELP_STRING([--enable-confdir=DIR],[directory containing reader
configurations (default /etc/reader.conf.d)]),
- [confdir="${enableval}"],
- [confdir="${sysconfdir}/reader.conf.d"])
-
-# Setup dist stuff
-AC_SUBST(usbdropdir)
-AC_SUBST(ipcdir)
-AC_SUBST(host_to_ccid_16)
-AC_SUBST(host_to_ccid_32)
-AS_AC_EXPAND(confdir_exp,$confdir)
-AS_AC_EXPAND(sbindir_exp,$sbindir)
-AS_AC_EXPAND(localstatedir_exp,$localstatedir)
-
-PCSCLITE_CONFIG_DIR="${confdir_exp}"
-AC_SUBST(PCSCLITE_CONFIG_DIR)
-PCSCLITE_FEATURES="${PCSCLITE_FEATURES} configdir=${PCSCLITE_CONFIG_DIR}"
-AC_DEFINE_UNQUOTED([PCSCLITE_FEATURES], ["${PCSCLITE_FEATURES}"], [Enabled
PC/SC lite features])
-PCSCD_BINARY="${sbindir_exp}/pcscd"
-AC_DEFINE_UNQUOTED([PCSCD_BINARY], ["$PCSCD_BINARY"], [pcscd filename])
-
-cat << EOF
-
-PC/SC lite has been configured with following options:
-
-Version: ${PACKAGE_VERSION}
-System binaries: $(eval eval eval echo "${sbindir_exp}")
-Configuration dir: ${PCSCLITE_CONFIG_DIR}
-
-
-Host: ${host}
-Compiler: ${CC}
-Preprocessor flags: ${CPPFLAGS}
-Compiler flags: ${CFLAGS}
-Preprocessor flags: ${CPPFLAGS}
-Linker flags: ${LDFLAGS}
-Libraries: ${LIBS}
-
-PTHREAD_CFLAGS: ${PTHREAD_CFLAGS}
-PTHREAD_LIBS: ${PTHREAD_LIBS}
-PCSC_ARCH: ${PCSC_ARCH}
-
-pcscd binary ${PCSCD_BINARY}
-libudev support: ${use_libudev}
-libusb support: ${use_libusb}
-USB drop directory: ${usbdropdir}
-ATR parsing messages: ${debugatr}
-ipcdir: ${ipcdir}
-use serial: ${use_serial}
-use usb: ${use_usb}
-systemd unit directory: ${with_systemdsystemunitdir}
-
-PCSCLITE_FEATURES: ${PCSCLITE_FEATURES}
-
-EOF
-
-# Write Makefiles
-AC_CONFIG_FILES([
-Makefile
-doc/Makefile
-doc/doxygen.conf
-doc/pcscd.8
-doc/reader.conf.5
-doc/example/Makefile
-etc/Makefile
-etc/pcscd.service
-etc/pcscd.socket
-src/Makefile
-src/libpcsclite.pc
-src/pcscd.h
-src/PCSC/pcsclite.h
-src/spy/Makefile
-])
-AC_OUTPUT
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/doc/Makefile.in
new/pcsc-lite-1.8.7/doc/Makefile.in
--- old/pcsc-lite-1.8.6/doc/Makefile.in 2012-08-30 18:55:32.000000000 +0200
+++ new/pcsc-lite-1.8.7/doc/Makefile.in 2012-11-28 18:44:06.000000000 +0100
@@ -62,7 +62,7 @@
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/doc/example/Makefile.in
new/pcsc-lite-1.8.7/doc/example/Makefile.in
--- old/pcsc-lite-1.8.6/doc/example/Makefile.in 2012-08-30 18:55:32.000000000
+0200
+++ new/pcsc-lite-1.8.7/doc/example/Makefile.in 2012-11-28 18:44:06.000000000
+0100
@@ -61,7 +61,7 @@
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/etc/Makefile.in
new/pcsc-lite-1.8.7/etc/Makefile.in
--- old/pcsc-lite-1.8.6/etc/Makefile.in 2012-08-30 18:55:32.000000000 +0200
+++ new/pcsc-lite-1.8.7/etc/Makefile.in 2012-11-28 18:44:06.000000000 +0100
@@ -59,7 +59,7 @@
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/src/Makefile.in
new/pcsc-lite-1.8.7/src/Makefile.in
--- old/pcsc-lite-1.8.6/src/Makefile.in 2012-08-30 18:55:32.000000000 +0200
+++ new/pcsc-lite-1.8.7/src/Makefile.in 2012-11-28 18:44:06.000000000 +0100
@@ -66,7 +66,7 @@
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/src/PCSC/pcsclite.h
new/pcsc-lite-1.8.7/src/PCSC/pcsclite.h
--- old/pcsc-lite-1.8.6/src/PCSC/pcsclite.h 2012-08-30 18:55:52.000000000
+0200
+++ new/pcsc-lite-1.8.7/src/PCSC/pcsclite.h 2012-11-28 18:44:12.000000000
+0100
@@ -190,7 +190,7 @@
#define INFINITE 0xFFFFFFFF /**< Infinite timeout */
#endif
-#define PCSCLITE_VERSION_NUMBER "1.8.6" /**< Current version */
+#define PCSCLITE_VERSION_NUMBER "1.8.7" /**< 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.6/src/pcscd.h
new/pcsc-lite-1.8.7/src/pcscd.h
--- old/pcsc-lite-1.8.6/src/pcscd.h 2012-08-30 18:55:52.000000000 +0200
+++ new/pcsc-lite-1.8.7/src/pcscd.h 2012-11-28 18:44:12.000000000 +0100
@@ -30,7 +30,7 @@
#define PCSCLITE_CSOCK_NAME PCSCLITE_IPC_DIR "/pcscd.comm"
-#define PCSCLITE_VERSION_NUMBER "1.8.6" /**< Current version */
+#define PCSCLITE_VERSION_NUMBER "1.8.7" /**< 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.6/src/readerfactory.c
new/pcsc-lite-1.8.7/src/readerfactory.c
--- old/pcsc-lite-1.8.6/src/readerfactory.c 2012-08-25 16:29:44.000000000
+0200
+++ new/pcsc-lite-1.8.7/src/readerfactory.c 2012-10-07 12:05:10.000000000
+0200
@@ -10,7 +10,7 @@
* Copyright (C) 2009
* Jean-Luc Giraud <jlgir...@googlemail.com>
*
- * $Id: readerfactory.c 6447 2012-08-24 15:39:52Z rousseau $
+ * $Id: readerfactory.c 6463 2012-09-13 17:16:41Z rousseau $
*/
/**
@@ -1054,13 +1054,14 @@
SCARDHANDLE RFCreateReaderHandle(READER_CONTEXT * rContext)
{
SCARDHANDLE randHandle;
- READER_CONTEXT *dummy_reader;
LONG ret;
(void)rContext;
do
{
+ READER_CONTEXT *dummy_reader;
+
/* Create a random handle with 32 bits check to see if it
already is
* used. */
/* FIXME: THIS IS NOT STRONG ENOUGH: A 128-bit token should be
@@ -1070,6 +1071,8 @@
/* do we already use this hCard somewhere? */
ret = RFReaderInfoById(randHandle, &dummy_reader);
+ if (SCARD_S_SUCCESS == ret)
+ UNREF_READER(dummy_reader)
}
while (SCARD_S_SUCCESS == ret);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/src/readerfactory.h
new/pcsc-lite-1.8.7/src/readerfactory.h
--- old/pcsc-lite-1.8.6/src/readerfactory.h 2012-08-05 10:37:37.000000000
+0200
+++ new/pcsc-lite-1.8.7/src/readerfactory.h 2012-10-07 12:05:10.000000000
+0200
@@ -6,7 +6,7 @@
* Copyright (C) 2002-2011
* Ludovic Rousseau <ludovic.rouss...@free.fr>
*
- * $Id: readerfactory.h 6397 2012-08-02 14:23:26Z rousseau $
+ * $Id: readerfactory.h 6458 2012-09-13 15:35:12Z rousseau $
*/
/**
@@ -102,7 +102,7 @@
int version; /**< IFD Handler version number
*/
int port; /**< Port ID */
int slot; /**< Current Reader
Slot */
- SCARDHANDLE hLockId; /**< Lock Id */
+ volatile SCARDHANDLE hLockId; /**< Lock Id */
int LockCount; /**< number of recursive locks
*/
int32_t contexts; /**< Number of open contexts */
int * pFeeds; /**< Number of shared client to
lib */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/src/spy/Makefile.in
new/pcsc-lite-1.8.7/src/spy/Makefile.in
--- old/pcsc-lite-1.8.6/src/spy/Makefile.in 2012-08-30 18:55:32.000000000
+0200
+++ new/pcsc-lite-1.8.7/src/spy/Makefile.in 2012-11-28 18:44:06.000000000
+0100
@@ -60,7 +60,7 @@
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcsc-lite-1.8.6/src/winscard_svc.c
new/pcsc-lite-1.8.7/src/winscard_svc.c
--- old/pcsc-lite-1.8.6/src/winscard_svc.c 2012-08-25 16:29:44.000000000
+0200
+++ new/pcsc-lite-1.8.7/src/winscard_svc.c 2012-10-07 12:05:10.000000000
+0200
@@ -10,7 +10,7 @@
* Copyright (C) 2009
* Jean-Luc Giraud <jlgir...@googlemail.com>
*
- * $Id: winscard_svc.c 6444 2012-08-24 08:10:23Z rousseau $
+ * $Id: winscard_svc.c 6462 2012-09-13 17:11:32Z rousseau $
*/
/**
@@ -811,6 +811,8 @@
if (lrv < 0)
Log2(PCSC_LOG_CRITICAL,
"list_delete_at failed with return value: %d",
lrv);
+
+ UNREF_READER(rContext)
}
(void)pthread_mutex_unlock(&threadContext->cardsList_lock);
list_destroy(&threadContext->cardsList);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
