Merge lp:~kalon33/ubuntu/natty/pcsc-lite/merge-1.7.0-2-from-unstable into lp:ubuntu/natty/pcsc-lite

[Nicolas DERIVE]

Merge new upstream version from Debian Unstable.

New branch merging latest 1.7.0-2 version from Debian Unstable, as requested by Ludovic Rousseau (the upstream maintainer)

Builds fine, see:

https://launchpad.net/~kalon33/+archive/rfid/+buildjob/2327847

[Martin Pitt (pitti)]

Note that this merge moves libpcsclite.so.1.0.0 back from /lib/ to /usr/lib/, which we shouldn't do yet (before we also get a new wpasupplicant).

Also, why does this introduce all the flag mangling in debian/rules? The standard debhelper rules should handle nostrip, noopt, and parallel options just fine.

review: Needs Fixing

[Nicolas DERIVE (kalon33)]

@pitti: the libpcsclite1.install file is here, where should I change this?
For debian/rules: so there is no need to keep any change in our rules or I keep usbdrop, confdir and prefix?

Thanks for your help.

[Martin Pitt (pitti)]

> @pitti: the libpcsclite1.install file is here, where should I change this?

Same way as it was done before? The previous version did the moving in debian/rules:

       # move runtime libraries to /lib
       mv debian/libpcsclite1/usr/lib/libpcsclite.so.1* \
               debian/libpcsclite1/lib/
       rmdir -p --ignore-fail-on-non-empty debian/libpcsclite1/usr/lib
       ln -sf /lib/$$(readlink debian/libpcsclite-dev/usr/lib/libpcsclite.so) \
               debian/libpcsclite-dev/usr/lib/libpcsclite.so

So you might just do the same in an override_dh_install rule?

> For debian/rules: so there is no need to keep any change in our rules or I keep usbdrop, confdir and prefix?

If debian doesn't explicitly specify --enable-confdir=/var/lib/pcscd, then this might just be the default value? Likewise, --enable-usbdropdir=/usr/lib/pcsc/drivers might be the default as well?

The rest is not necessary.

[lp:~kalon33/ubuntu/natty/pcsc-lite/merge-1.7.0-2-from-unstable]

32. By Nicolas DERIVE on 2011-03-19

* Merge from Debian Unstable (FFe LP: #723016). Remaining changes:
* debian/rules: Keep moving runtime libraries to /lib, for the benefit of
  wpasupplicant.

[Nicolas DERIVE (kalon33)]

> > @pitti: the libpcsclite1.install file is here, where should I change this?
>
> Same way as it was done before? The previous version did the moving in
> debian/rules:
>
> # move runtime libraries to /lib
> mv debian/libpcsclite1/usr/lib/libpcsclite.so.1* \
> debian/libpcsclite1/lib/
> rmdir -p --ignore-fail-on-non-empty debian/libpcsclite1/usr/lib
> ln -sf /lib/$$(readlink debian/libpcsclite-dev/usr/lib/libpcsclite.so)
> \
> debian/libpcsclite-dev/usr/lib/libpcsclite.so
>
> So you might just do the same in an override_dh_install rule?

I think it's done, what do you think?
>
> > For debian/rules: so there is no need to keep any change in our rules or I
> keep usbdrop, confdir and prefix?
>
> If debian doesn't explicitly specify --enable-confdir=/var/lib/pcscd, then
> this might just be the default value? Likewise, --enable-
> usbdropdir=/usr/lib/pcsc/drivers might be the default as well?

It seems that it was the case indeed.
>
> The rest is not necessary.
I dropped the rest.

Should I change other things?

Thanks for your help.

Unmerged revisions

=== modified file 'ChangeLog'
--- ChangeLog	2010-07-10 11:15:59 +0000
+++ ChangeLog	2011-03-19 10:51:41 +0000
@@ -1,3 +1,249 @@
+pcsc-lite-1.7.0: Ludovic Rousseau
+9 March 2011
+- use libudev instead of (the deprecated) libhal
+
+
+pcsc-lite-1.6.7: Ludovic Rousseau
+22 February 2011
+- better Mac OS X support
+- Fix Alioth bug [#312960] SCardDisconnect when other context has transaction
+- add support of multi-interfaces readers with libusb and not just libhal
+- add a API tracing feature in the client side (#define DO_TRACE)
+- allow the use of tracing and profiling features from different
+  application threads
+- fix a problem with a multi-slots reader
+- fix minor problems detected by the clang tool
+- some other minor improvements and bug corrections
+
+
+pcsc-lite-1.6.6: Ludovic Rousseau
+12 December 2010
+- SCardGetStatusChange(): fix a bug on 64-bits systems
+- Fix another bug because of a regression in internal list manager
+
+
+pcsc-lite-1.6.5: Ludovic Rousseau
+3 December 2010
+- Power on the card _only_ if an application requests a connection.
+  You can disable the feature using DISABLE_ON_DEMAND_POWER_ON in
+  src/pcscd.h.in
+  If DISABLE_AUTO_POWER_ON is defined then do not automatically power on
+  the card. The card will be powered on on the first SCardConnect()
+  See http://ludovicrousseau.blogspot.com/2010/10/card-auto-power-on-and-off.html
+- SCardReconnect(): return SCARD_E_NO_SMARTCARD when card is removed and
+  SCARD_W_UNRESPONSIVE_CARD when card is unresponsive instead of
+  SCARD_E_PROTO_MISMATCH
+- Install pcscd as sgid pcscd instead of suid root
+  See http://ludovicrousseau.blogspot.com/2010/09/pcscd-auto-start.html
+- SCardSetTimeout() is no more provided. This function is not provided
+  by Microsoft and is deprecated since 2004 in pcsc-lite. 
+- SCardCancelTransaction() is no more provided. This function is not
+  provided by Microsoft and is deprecated since 2005 in pcsc-lite.
+- Parsing the CCID Info.plist (159 readers supported) was, on a i386
+  machine, done in 264306 µs and is now done 5547 µs => gain x47 or 4600%
+  See http://ludovicrousseau.blogspot.com/2010/08/ram-and-cpu-improvements-in-pcsc-lite.html
+- It is now possible to configure the local socket name to use using the
+  environment variable PCSCLITE_CSOCK_NAME
+  See http://ludovicrousseau.blogspot.com/2010/11/pcsc-client-and-server-on-two-different.html	  
+- Wait until all connected readers have a chance to power up a possibly
+  inserted card before accepting clients.
+- restrict pcscd features when not run by root (so using suid): APDU
+  logging or setting parameters are disabled for example
+- fix compilation problem on kfreebsd-* systems
+- PCSC/reader.h: HOST_TO_CCID_16() and HOST_TO_CCID_32() are now
+  identity functions
+  Since libccid 1.4.1 (revision 5252) the byte order is no more important
+- If you want to use IFDHCreateChannel() instead of
+  IFDHCreateChannelByName() then do not use any DEVICENAME line in the
+  configuration file. IFDHCreateChannel() will then be called with the
+  CHANNELID parameter.
+- the CHANNELID parameter can also be a decimal number.
+- Remove the support of IFDHandler v1 API. I don't know any driver using
+  this API.
+  See http://ludovicrousseau.blogspot.com/2010/10/ifdhandler-version-1-support-removed.html
+- avoids a buffer overflow with badly formed ATR
+- some other minor improvements and bug corrections
+
+
+pcsc-lite-1.6.4: Ludovic Rousseau
+15 August 2010
+- Do not use sysconfdir as configuration directory but
+  "${sysconfdir}/reader.conf.d" instead.
+  Use --enable-confdir=DIR if you want to set a specific value without
+  the "reader.conf.d" appended.
+
+
+pcsc-lite-1.6.3: Ludovic Rousseau
+15 August 2010
+- "/reader.conf.d" is only appended to sysconfdir if no value of
+  sysconfdir is provided
+- Define LPSCARD_READERSTATE since this is used in the MSDN prototype.
+  Use LPSCARD_READERSTATE in winscard.h instead of (SCARD_READERSTATE *)
+  to mimic the MSDN API.
+- fix a pcscd crash when the application uses a PCSC handle after a
+  fork. The crash was with openvpn.
+- some other minor improvements and bug corrections
+
+pcsc-lite-1.6.2: Ludovic Rousseau
+4 August 2010
+- implement a "Forced suicide" mechanism.
+  After 3 Ctrl-C without much reaction from pcscd (in fact the drivers)
+  we force the suicide. Sometimes libusb is blocked in a kind of
+  dead-lock and kill -9 was the only option.
+- Add support of TAG_IFD_STOP_POLLING_THREAD to request the stop of the
+  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
+  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
+- src/hotplug_libusb.c: port from libusb-0.1 to libusb-1.0
+- default configuration is now $sysconfdir/reader.conf.d
+- fix crash with empty config dir
+- src/PCSC/winscard.h: Remove definitions of SCARD_READERSTATE_A
+  PSCARD_READERSTATE_A and LPSCARD_READERSTATE_A types
+- some other minor improvements and bug corrections
+
+
+pcsc-lite-1.6.1: Ludovic Rousseau
+4 June 2010
+- SCardControl(): do not check for card events since we are talking to
+  the reader not the card. A smart card removal should not make
+  SCardControl() fail with SCARD_W_REMOVED_CARD
+- pcscd do not timeout any more after 2 minutes of inactivity. If the
+  other side of the socket dies we will get an error from the kernel.
+  The problem was that if a client does nothing during
+  PCSCLITE_READ_TIMEOUT (120 seconds by default) then pcscd considers it
+  as a dead client and closes the connection. I guess this problem was
+  present since the first version of pcsc-lite but nobody complained
+  before.
+- pcscd: do not return before most of the initialisation are done
+  correctly. The idea is that pcscd can return an error code if the
+  daemon fails to start correctly (hald not started for example).
+  Before the patch pcscd became a daemon, then returned 0 (success) and
+  then continued with the initialisation. If the initialisation failed
+  it was too late to return an error code. The /etc/init.d/pcscd script
+  was not aware of the failure.
+  Closes https://bugzilla.redhat.com/show_bug.cgi?id=580321
+  "/usr/sbin/pcscd exit codes broken"
+- src/hotplug_libusb.c: Add a synchronisation so that if pcscd is auto
+  started the initial reader list is available before the server takes
+  commands from clients.
+  Before the change early calls of SCardListReaders() returned an empty
+  list of readers even if a reader was connected.
+  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.
+- 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
+- some other minor improvements and bug corrections
+
+
+pcsc-lite-1.6.0: Ludovic Rousseau
+5 May 2010
+- redesign the client/server communication:
+  * no more shared memory used (allow pcscd and libpcsclite1.so to be on
+  different computer and talk over a network)
+  * no more difference between short and extended APDU
+  * no more use of a /var/run/pcscd/pcscd.events/ directory. events are
+  sent through the socket
+  * simpler command format between client and server
+  The side effect is that you are not able to mix an old pcscd with a
+  new libpcsclite1.so or the reverse. SCardEstablishContext() will fail
+  unless you update both sides of the communication.
+- Use lists instead of fixed size arrays to store handles.
+  It is now possible to have:
+  - 200 simultaneous PC/SC clients instead of 16
+  - 200 SCardConnect per client instead of 16
+  - 200 clients per reader instead of 16
+  The default value of 200 can be changed by giving an argument to pcscd
+  --max-thread --max-card-handle-per-thread --max-card-handle-per-reader
+  Thanks to Jean-Luc Giraud for the big patch
+- Make SCardReconnect(), SCardStatus() and SCardTransmit() block instead
+  of returning SCARD_E_SHARING_VIOLATION immediately. These functions
+  will then behave like on Windows.
+  This can happen if these functions are called when the reader is
+  locked by a PCSC transaction
+  (SCardBeginTransaction/SCardEndTransaction).
+  You can define the environment variable PCSCLITE_NO_BLOCKING to use
+  the old behavior.
+  Thanks to Jean-Luc Giraud for the patch.
+  http://archives.neohapsis.com/archives/dev/muscle/2010-q1/0041.html
+- SCardEstablishContext(): try to start the pcscd daemon if not already
+  running.
+  . pcscd will suicide itself after 60 seconds of inactivity if it is
+  started using --auto-exit. This is the default behavior when pcscd is
+  started by libpcsclite
+  . Set PCSCLITE_PCSCD_ARGS with the argument you want to pass to pcscd in
+  autostart Only one argument is passed. The space character is not a
+  separator. example: export PCSCLITE_PCSCD_ARGS=-dfa
+- SCardListReaders(): can use SCARD_AUTOALLOCATE
+- SCardGetAttrib(): return SCARD_E_INSUFFICIENT_BUFFER if the driver
+  returns IFD_ERROR_INSUFFICIENT_BUFFER
+  . add support of SCARD_ATTR_DEVICE_FRIENDLY_NAME as it is better
+  implemented in pcscd (it knows the friendly name)
+- SCardGetStatusChange(): Calling with cReaders == 0 will now just
+  return SCARD_S_SUCCESS
+  . Use the special reader name "\\?PnP?\Notification" to wait for a
+  reader event notification
+- SCardTransmit(): do not limit the minimum size of an APDU to 4 bytes.
+  non ISO 7816-4 compliant cards (like Mifare DESFIRE) may use shorter
+  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
+  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
+  conform with ch. 2.3 of PCSC v2 part 10
+  . add FEATURE_GET_TLV_PROPERTIES and FEATURE_CCID_ESC_COMMAND from
+  PC/SC part 10 v2.02.07 March 2010
+  . Add PCSCv2_PART10_PROPERTY_* defines
+- SCardControl() return SCARD_E_UNSUPPORTED_FEATURE if the driver
+  returned IFD_ERROR_NOT_SUPPORTED or IFD_NOT_SUPPORTED This is used to
+  separate an unsupported value of ControlCode from a general error
+- Use the standard --sysconfdir=DIR ($prefix/etc by default) instead of
+  --enable-confdir=DIR for defining the directory containing reader.conf
+- remove SCF support (PC/SC over Smart Card Framework). I never used
+  this feature and SCF is now dead and replaced by JSR 268
+  (javax.smartcardio)
+- Better handling of PCSCLITE_STATIC_DRIVER as can be used on platforms
+  using µClinux (without dynamic loader).  This is used to statically
+  link the reader driver to pcscd. Since the link is static you must
+  define the IFDHandler API version at compilation time. Either define
+  IFDHANDLERv1, IFDHANDLERv2 or IFDHANDLERv3
+- Use dynamic instead of static allocation for the driver library
+  filename. The filename is no more limited to 100 characters.
+  Closes: [#312332] MAX_LIBNAME too short?
+- force the return codes SCARD_* to be long since the SCard* functions
+  return a LONG type
+- Add the ability to parse all the configuration files of a directory
+  instead of just one configuration file. update-reader.conf is then now
+  obsolete.
+- Add --enable-embedded (default is no) to build pcsc-lite for an
+  embedded system. This will activate the NO_LOG option to disable
+  logging and limit RAM and disk consumption.
+- If NO_LOG is defined then no log are displayed. The idea is to limit
+  the binaries size on disk and RAM consumption at execution time.
+  With NO_LOG defined we gain 26% (17 kB) for the .text segment of pcscd
+  and 15% (4 kB) for the .text segment of libpcsclite.so (for i386)
+- Define a minimal pcsc_stringify_error() if NO_LOG is defined. Only the
+  error code in hex is displayed in this case.
+  Gain: 2kB of .text (10%) for libpcsclite
+- Add --disable-serial and --disable-usb options
+  --disable-serial removes support of /etc/reader.conf gain: 8.0kB of
+  .text (12%) and 160 bytes of .bss (4%) for pcscd
+  --disable-usb removes support of USB hotplug gain: 9.7kB of .text
+  (14%) and 960 bytes of .bss (23%) for pcscd
+  If you use both options (and use a static driver configuration) gain:
+  17.7kB of .text (26%) and 1152 bytes of .bss (28%) for pcscd
+- Better support of Android
+- some other minor improvements and bug corrections
+
+
 pcsc-lite-1.5.5: Ludovic Rousseau
 28 July 2009
 - add the reader interface name if provided by the device
@@ -40,7 +286,7 @@
 - reader.h: add PIN_PROPERTIES_STRUCTURE structure and FEATURE_IFD_PIN_PROPERTIES
   Thanks to Martin Paljak for the patch
 - remove powermgt_macosx.c since it is using APSL version 1.1 instead of
-  the BSD-like licence like the other files 
+  the BSD-like licence like the other files
   Thanks to Stanislav Brabec for the bug report
 - avoid a possible crash due to a race condition
   Thanks to Matheus Ribeiro for the patch
@@ -65,7 +311,7 @@
 - log TxBuffer and RxBuffer if the SCardControl() command failed.
   Closes: [#311376] PCSC_LOG_VERBOSE via -dd; print details of "Card not
   transacted"
-- add a mutex to avoid a race condition 
+- add a mutex to avoid a race condition
   Closes: [#311377] Race condition in SCardBeginTransaction
 - SCardGetStatusChange() may not return if the reader was removed.
 - some other minor improvements and bug corrections
@@ -105,7 +351,7 @@
 
 pcsc-lite-1.4.102: Ludovic Rousseau
 27 June 2008
-- pcscd -v now displays the enabled features 
+- pcscd -v now displays the enabled features
 - add support of SCARD_AUTOALLOCATE in SCardListReaders(),
   SCardListReaderGroups() and SCardGetAttrib
 - add SCardFreeMemory()
@@ -148,7 +394,7 @@
   in case of "PCSC Not Running" or "PCSC restarted" so that nothing is
   logged by default.  PCSCLITE_DEBUG can be defined to see the message.
   Programs linked with libpcsclite will not display anything if pcscd is
-  not running. Solves Red Hat bug 428299. 
+  not running. Solves Red Hat bug 428299.
 - default log level is PCSC_LOG_CRITICAL+1 so that NO log is sent to
   stderr by default. You need to explicitly set PCSCLITE_DEBUG to have
   logs. (in a library stderr(2) can be any file opened with fd=2 so
 
=== modified file 'ChangeLog.svn'
--- ChangeLog.svn	2010-07-10 11:15:59 +0000
+++ ChangeLog.svn	2011-03-19 10:51:41 +0000
@@ -1,3 +1,2619 @@
[phone]  Ludovic Rousseau
+
+	* [r5650] ChangeLog: Typo caused by autocompletion without check
+	* [r5649] ChangeLog, configure.in: release 1.7.0
+
[phone]  Ludovic Rousseau
+
+	* [r5638] configure.in, src/Makefile.am, src/PCSC/ifdhandler.h,
+	  src/hotplug_generic.c, src/hotplug_libhal.c,
+	  src/hotplug_libudev.c, src/hotplug_linux.c: Use libudev instead
+	  of (deprecated) libhal for the USB hotplug mechanism.
+
[phone]  Ludovic Rousseau
+
+	* [r5636] src/hotplug_libusb.c: Remove debug printf()
+
[phone]  Ludovic Rousseau
+
+	* [r5628] ChangeLog, configure.in: release 1.6.7
+
[phone]  Ludovic Rousseau
+
+	* [r5621] src/hotplug_libusb.c: If a device has more than one CCID
+	  interface the "libhal:" naming scheme (with the interface number
+	  included) is used instead of "libusb:".
+	  
+	  The new mechanism allows to use multi-interfaces devices like the
+	  Gemalto ProxDU also with hotplug_libusb. libhal is deprecated and
+	  may not be available everywhere.
+	  
+	  Thanks to Diego Elio Pettenò for the patch (for Gentoo)
+
[phone]  Ludovic Rousseau
+
+	* [r5589] src/winscard_clnt.c: Move the definition of DO_TRACE,
+	  DO_PROFILE, and DO_CHECK_SAME_PROCESS at the top of the file, and
+	  add documentation.
+
[phone]  Ludovic Rousseau
+
+	* [r5587] src/Makefile.am: Do not create empty directories
+	  .../pcsc/drivers and .../pcsc/services any more. The needed
+	  directory is created by the driver instead.
+
[phone]  Ludovic Rousseau
+
+	* [r5584] UnitaryTests/ThreadSafe.py, UnitaryTests/stress_apdu.py:
+	  Fix PEP8 warnings
+	* [r5583] UnitaryTests/ThreadSafe.py: Display the thread id and
+	  iterations
+	* [r5582] UnitaryTests/SCard_fork.py: Better documentation and
+	  debug
+	* [r5581] src/winscard_clnt.c: Add a missing variable declaration
+	  used if DO_CHECK_SAME_PROCESS is defined
+	* [r5580] UnitaryTests/SCardConnect_DIRECT.py: Test the behavior as
+	  documented in revision 5579
+	* [r5579] src/winscard_clnt.c: Doxygen: CardConnect() &
+	  SCardReconnect() pdwActiveProtocol is not set to
+	  SCARD_PROTOCOL_UNDEFINED if SCARD_SHARE_DIRECT is used but the
+	  card has already negociated its protocol
+
[phone]  Ludovic Rousseau
+
+	* [r5575] UnitaryTests/SCardBeginTransaction_ExclusiceMode.py:
+	  Unitary test for Alioth bug [#312960] SCardDisconnect when other
+	  context has transaction
+	* [r5574] src/winscard.c: SCardDisconnect(): RFUnlockAllSharing()
+	  may fail with SCARD_E_SHARING_VIOLATION if a transaction is on
+	  going on another card context and dwDisposition ==
+	  SCARD_LEAVE_CARD. We should not stop and continue disconnecting
+	  the card.
+	  
+	  Fixes Alioth bug [#312960] SCardDisconnect when other context has
+	  transaction
+	* [r5573] UnitaryTests/SCardConnect_DIRECT2.py: Use the protocol
+	  negociated by SCardConnect() instead of hard coding SCARD_PCI_T1
+	* [r5572] src/winscard_clnt.c: SCardDisconnect(): remove the card
+	  handle only if SCARD_DISCONNECT command succeeded on the server
+	  
+	  Related to alioth bug [#312960] SCardDisconnect when other
+	  context has transaction If a first SCardDisconnect() fails with
+	  SCARD_E_SHARING_VIOLATION it is now possible to try again
+	  SCardDisconnect(). Before the patch the second call to
+	  SCardDisconnect() returned SCARD_E_INVALID_HANDLE but the
+	  connection was still "in use".
+
[phone]  Ludovic Rousseau
+
+	* [r5569] src/PCSC/ifdhandler.h, src/readerfactory.h: Revert
+	  revision 5568 since it has side effect on driver compilation
+	  (like libccid fails to build)
+	* [r5568] src/PCSC/ifdhandler.h, src/readerfactory.h: Move #include
+	  "pcsclite.h" from PCSC/ifdhandler.h to readerfactory.h so that
+	  ifdhandler.h can be used as-is on Mac OS X (for handler_test.c)
+	* [r5567] src/eventhandler.c, src/ifdwrapper.c, src/prothandler.c,
+	  src/readerfactory.c: Remove useless #include "ifdhandler.h"
+
[phone]  Ludovic Rousseau
+
+	* [r5560] src/winscard_clnt.c: SCardSetAttrib(): add profiling
+	  calls
+	* [r5559] src/winscard_clnt.c: SCardGetSetAttrib(): remove a call
+	  to PROFILE_END() since this is already done in SCardGetAttrib()
+	* [r5558] src/winscard_clnt.c: profiling: compare threads using
+	  pthread_equal() instead of == to make the code more portable.
+	* [r5557] src/winscard_clnt.c: SCardGetAttrib(): Always exit from
+	  the same point so that profiling does work even in case of error
+	* [r5556] src/winscard_clnt.c: profile_end(): add a missing \n in
+	  the warning message
+	* [r5555] src/winscard_clnt.c: Send API traces do stderr instead of
+	  stdout
+
[phone]  Ludovic Rousseau
+
+	* [r5550] src/winscard_clnt.c: SCardReleaseContext(): Always exit
+	  from the same point so that profiling does work even in case of
+	  error
+	* [r5549] src/winscard_clnt.c: SCardCancel(): Always exit from the
+	  same point so that profiling does work even in case of error
+	* [r5548] src/winscard_clnt.c: Profiling: allow to support up to
+	  MAX_THREADS simultaneous calls
+	  
+	  For example SCardCancel() is called from another thread when
+	  SCardGetStatusChange() is running. This was not supported.
+	* [r5547] src/winscard_clnt.c: Use color names macros
+	* [r5546] src/winscard_clnt.c: Add API tracing with arguments
+	  display
+	* [r5545] src/winscard_clnt.c: SCardGetStatusChange(): Always exit
+	  from the same point so that profiling does work even in case of
+	  error
+	* [r5544] src/winscard_clnt.c: SCardDisconnect(): Always exit from
+	  the same point so that profiling does work even in case of error
+
[phone]  Ludovic Rousseau
+
+	* [r5543] src/configfile.l: Display the correct line number if
+	  garbage is found in the configuration file
+
[phone]  Ludovic Rousseau
+
+	* [r5539] src/winscard_svc.c: contextsListhContext_seeker(): avoid
+	  a potential crash if NULL values are used
+	  
+	  src/winscard_svc.c:90:22: warning: Dereference of null pointer if
+	  (currentContext->hContext == *(int32_t *)key) ^
+	  src/winscard_svc.c:90:34: warning: Dereference of null pointer if
+	  (currentContext->hContext == *(int32_t *)key) ^
+	* [r5538] src/winscard_clnt.c: SCardStatus(): initialize a dummy
+	  variable to avoid warnings
+	  
+	  src/winscard_clnt.c:1451:2: warning: Assigned value is garbage or
+	  undefined dwReaderLen = *pcchReaderLen; ^ ~~~~~~~~~~~~~~
+	  src/winscard_clnt.c:1452:2: warning: Assigned value is garbage or
+	  undefined dwAtrLen = *pcbAtrLen; ^ ~~~~~~~~~~
+	* [r5537] src/winscard_clnt.c: Avoid a potential crash if NULL
+	  values are used
+	  
+	  src/winscard_clnt.c:226:27: warning: Dereference of null pointer
+	  if (channelMap->hCard == *(SCARDHANDLE *)key) ^
+	  src/winscard_clnt.c:226:18: warning: Dereference of null pointer
+	  if (channelMap->hCard == *(SCARDHANDLE *)key) ^
+	  src/winscard_clnt.c:260:18: warning: Dereference of null pointer
+	  if (contextMap->hContext == *(SCARDCONTEXT *) key) ^
+	  src/winscard_clnt.c:260:30: warning: Dereference of null pointer
+	  if (contextMap->hContext == *(SCARDCONTEXT *) key) ^
+	* [r5536] src/winscard_clnt.c: SCardEstablishContext(): remove
+	  useless affectation
+	  
+	  src/winscard_clnt.c:439:5: warning: Value stored to 'ret' is
+	  never read ...ret = execl(PCSCD_BINARY, "pcscd", "--auto-exit",
+	  param, ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	* [r5535] src/winscard_clnt.c: SCardEndTransaction(): remove
+	  useless code
+	  
+	  src/winscard_clnt.c:1269:2: warning: Value stored to 'randnum' is
+	  never read randnum = 0; ^
+	* [r5534] src/winscard.c: remove unused affectations
+	  
+	  src/winscard.c:565:4: warning: Value stored to 'rv' is never read
+	  rv = IFDPowerICC(rContext, IFD_POWER_DOWN, NULL, NULL); ^
+	  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	  src/winscard.c:835:4: warning: Value stored to 'rv' is never read
+	  rv = IFDPowerICC(rContext, IFD_POWER_DOWN, NULL, NULL); ^
+	  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	  src/winscard.c:1095:4: warning: Value stored to 'rv' is never
+	  read rv = IFDPowerICC(rContext, IFD_POWER_DOWN, NULL, NULL); ^
+	  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	* [r5533] clang-analyze.sh: Do not analyze tokenparser.c since it
+	  is generated by flex
+	* [r5532] src/readerfactory.c: RDR_CLIHANDLES_seeker(): avoid a
+	  potential crash if NULL values are used
+	  
+	  src/readerfactory.c:72:30: warning: Dereference of null pointer
+	  if (rdrCliHandles->hCard == *(SCARDHANDLE *)key) ^
+	  src/readerfactory.c:72:21: warning: Dereference of null pointer
+	  if (rdrCliHandles->hCard == *(SCARDHANDLE *)key) ^
+	* [r5531] src/readerfactory.c: RFAddReader(): remove unused
+	  affectation
+	  
+	  src/readerfactory.c:344:4: warning: Value stored to 'rv' is never
+	  read rv = RFRemoveReader(readerName, port); ^
+	  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	* [r5530] src/readerfactory.c: RFAddReaderHandle(): return the
+	  error code if any
+	  
+	  src/readerfactory.c:1116:3: warning: Value stored to 'rv' is
+	  never read rv = SCARD_E_NO_MEMORY; ^ ~~~~~~~~~~~~~~~~~
+	  src/readerfactory.c:1103:3: warning: Value stored to 'rv' is
+	  never read rv = SCARD_E_NO_MEMORY; ^ ~~~~~~~~~~~~~~~~~
+	  src/readerfactory.c:1095:3: warning: Value stored to 'rv' is
+	  never read rv = SCARD_E_NO_MEMORY; ^ ~~~~~~~~~~~~~~~~~
+
[phone]  Ludovic Rousseau
+
+	* [r5525] src/pcscdaemon.c: Remove useless code
+	  
+	  src/pcscdaemon.c:85:2: warning: Value stored to 'rv' is never
+	  read rv = 0; ^ ~ src/pcscdaemon.c:175:2: warning: Value stored to
+	  'rv' is never read rv = 0; ^ ~
+	* [r5524] src/ifdwrapper.c: IFDPowerICC(): remove useless code
+	  
+	  src/ifdwrapper.c:294:2: warning: Value stored to 'ret' is never
+	  read ret = ATRDecodeAtr(&sSmartCard, pucAtr, *pdwAtrLen); ^
+	  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	  src/ifdwrapper.c:268:2: warning: Value stored to 'rv' is never
+	  read rv = IFD_SUCCESS; ^ ~~~~~~~~~~~
+	* [r5523] src/eventhandler.c: EHStatusHandlerThread(): check the
+	  return value of IFDStatusICC()
+	  
+	  Thanks to clang(1) for the warning src/eventhandler.c:235:2:
+	  warning: Value stored to 'rv' is never read rv =
+	  IFDStatusICC(rContext, &dwStatus); ^
+	  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	* [r5522] src/eventhandler.c: EHStatusHandlerThread(): remove
+	  unused code
+	  
+	  src/eventhandler.c:233:2: warning: Value stored to
+	  'dwCurrentState' is never read dwCurrentState = 0; ^ ~
+	  src/eventhandler.c:232:2: warning: Value stored to
+	  'readerSharing' is never read readerSharing = 0; ^ ~
+	* [r5521] src/atrhandler.c: ATRDecodeAtr(): remove unused code
+	  
+	  src/atrhandler.c:55:2: warning: Value stored to 'p' is never read
+	  p = K = TCK = Y1i = T = 0; ^ ~~~~~~~~~~~~~~~~~~~~~
+	  src/atrhandler.c:55:6: warning: Although the value stored to 'K'
+	  is used in the enclosing expression, the value is never actually
+	  read from 'K' p = K = TCK = Y1i = T = 0; ^ ~~~~~~~~~~~~~~~~~
+	  src/atrhandler.c:55:10: warning: Although the value stored to
+	  'TCK' is used in the enclosing expression, the value is never
+	  actually read from 'TCK' p = K = TCK = Y1i = T = 0; ^ ~~~~~~~~~~~
+	  src/atrhandler.c:55:16: warning: Although the value stored to
+	  'Y1i' is used in the enclosing expression, the value is never
+	  actually read from 'Y1i' p = K = TCK = Y1i = T = 0; ^ ~~~~~
+	  src/atrhandler.c:55:22: warning: Although the value stored to 'T'
+	  is used in the enclosing expression, the value is never actually
+	  read from 'T' p = K = TCK = Y1i = T = 0; ^ ~
+	* [r5520] clang-analyze.sh: script to call clang --analyze
+	* [r5519] splint.sh: No more scf files since revision 4486
+	* [r5518] src/winscard_clnt.c: SCardGetStatusChange(): avoids a
+	  compiler warning
+	  
+	  winscard_clnt.c:1875:33: warning: comparison of integers of
+	  different signs: 'uint32_t' (aka 'unsigned int') and 'int'
+	  [-Wsign-compare] ...if (rContext->eventCounter != currentCounter)
+	  ~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~
+	* [r5517] src/readerfactory.c: Add an explicit cast to avoid a
+	  compiler warning
+	  
+	  readerfactory.c:1033:45: warning: comparison of integers of
+	  different signs: 'unsigned long' and 'SCARDHANDLE' (aka 'long')
+	  [-Wsign-compare] if ((rContext->dwIdentity + randHandle) ==
+	  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
+
[phone]  Ludovic Rousseau
+
+	* [r5509]
+	  UnitaryTests/SCardGetStatusChange/SCardGetStatusChange_PnP.py:
+	  Also initialize the state of the PnP special reader (For Mac OS
+	  X)
+	* [r5508] src/hotplug_macosx.c: HPSearchHotPluggables(): use the
+	  same naming convention as used by Apple PC/SC layer on Leopard
+	  (and later). The reader friendly name is used instead of
+	  "usb:%04x/%04x" as documented in IFDHandler v3 API at
+	  http://pcsclite.alioth.debian.org/api/group__IFDHandler.html#gabb9fe35a68fa080ce9397f0b830b1e7e
+	  
+	  The same driver source code can be used by Apple PC/SC layer and
+	  by this pcsc-lite.
+	* [r5507] src/hotplug_macosx.c: Fix compiler warning
+	  
+	  hotplug_macosx.c: In function ‘HPDriversGetFromDirectory’:
+	  hotplug_macosx.c:150: warning: comparison between signed and
+	  unsigned
+	* [r5506] c.sh: Remove commented CFLAGS definition
+	* [r5505] src/PCSC/pcsclite.h.in, src/PCSC/wintypes.h: Mac OS X
+	  "port" - Define Windows types as they are defined on Mac OS X in
+	  /System/Library/Frameworks/PCSC.framework/Headers/wintypes.h -
+	  Pack structures as they are packed on Mac OS X in
+	  /System/Library/Frameworks/PCSC.framework/Headers/pcsclite.h
+	  
+	  With these changes it is possible to build this pcsc-lite on Mac
+	  OS X and use it with an application built using the PCSC
+	  Framework headers provided by Apple.
+	  
+	  One application is to temporarily replace the Apple PCSC layer by
+	  a better/working one.
+	* [r5504] src/PCSC/pcsclite.h.in: Use LONG instead of long for
+	  SCARDCONTEXT and SCARDHANDLE so that the exact type can be easily
+	  changed by editing PCSC/wintypes.h
+	  
+	  By default: typedef long LONG; so no change
+
[phone]  Ludovic Rousseau
+
+	* [r5501] doc/pcscd.8.in: Remove references to a init.d/pcscd
+	  script since pcscd is autostarted by default now.
+	* [r5500] doc/reader.conf.5.in: Use @confdir_exp@ instead of
+	  (removed) @confdir@
+
[phone]  Ludovic Rousseau
+
+	* [r5498] doc/pcscd.8.in: Use @confdir_exp@ instead of
+	  @sysconfdir_exp@
+	  
+	  Closes [#312929] @sysconfdir_exp@ not expanded in manual page
+
[phone]  Ludovic Rousseau
+
+	* [r5496] src/readerfactory.c: RFAddReader(): correctly initialize
+	  the pthCardEvent field for the other slots. The bug occured with
+	  a multi slot reader and a driver with no
+	  TAG_IFD_POLLING_THREAD_WITH_TIMEOUT function (as is the case with
+	  my CCID driver since revision 5495)
+
[phone]  Ludovic Rousseau
+
+	* [r5491] UnitaryTests/SCardConnect_DIRECT2.py: Add comments
+	* [r5490] src/winscard.c: SCardDisconnect(): Switch to
+	  POWER_STATE_GRACE_PERIOD unless the card was not powered
+	  
+	  In the previous implementation the state was changed to
+	  POWER_STATE_GRACE_PERIOD only if the previous state was
+	  POWER_STATE_INUSE. So if a SCARD_SHARE_DIRECT connection was used
+	  the card state was not set POWER_STATE_INUSE and a power off
+	  action was immediate at the SCardDisconnect(). Not nice if the
+	  card is reused just after.
+
[phone]  Ludovic Rousseau
+
+	* [r5478] src/winscard_svc.c: ContextThread(): in command
+	  CMD_GET_READERS_STATE, wait until all the readers are ready (ATR
+	  available) before sending the reader states.
+	  
+	  The problem arrives when you connect two readers at the same time
+	  (and one of them is slow to get the ATR). SCardGetStatusChange()
+	  must not exit with one reader in state READER_NOT_INITIALIZED (as
+	  implemented in revision 5217)
+
[phone]  Ludovic Rousseau
+
+	* [r5442] ChangeLog, configure.in: release 1.6.6
+	* [r5441] src/simclist.c: Reapply change in revision 4986 since the
+	  problem was not corrected in version 1.5 of simclist.
+
[phone]  Ludovic Rousseau
+
+	* [r5440] src/winscard_msg.c: Use LONG instead of int to store
+	  PC/SC return codes like SCARD_E_*
+	  
+	  The problem comes from sign extenstion from int to LONG int rv =
+	  SCARD_E_TIMEOUT; /* 0x8010000A */ is (sign) extended into a LONG
+	  = 0xFFFFFFFF8010000A
+	  
+	  So the line in winscard_clnt.c if (SCARD_E_TIMEOUT == rv) is
+	  never true on a 64-bits system because rv has been extended from
+	  int to LONG. The comparison is then between 0x8010000A and
+	  0xFFFFFFFF8010000A
+
[phone]  Ludovic Rousseau
+
+	* [r5434] src/PCSC/debuglog.h, src/PCSC/ifdhandler.h,
+	  src/atrhandler.h, src/dyn_generic.h, src/eventhandler.h,
+	  src/hotplug.h, src/ifdwrapper.h, src/misc.h, src/parser.h,
+	  src/powermgt_generic.h, src/prothandler.h, src/readerfactory.h,
+	  src/sys_generic.h, src/winscard_msg.h, src/winscard_svc.h: Do not
+	  use extern "C" since we are in C and not C++
+	  
+	  Follow rule 13 of "On C Library Implementation" by Rusty Russell
+	  http://rusty.ozlabs.org/?p=140
+
[phone]  Ludovic Rousseau
+
+	* [r5429] src/configfile.l: Fix configfile.l: In function
+	  'evaluatetoken': configfile.l:205: warning: assignment discards
+	  qualifiers from pointer target type
+	* [r5427] ChangeLog, configure.in: release 1.6.5
+
[phone]  Ludovic Rousseau
+
+	* [r5420] src/simclist.c: From SimCList version 1.5
+	  http://mij.oltrelinux.com/devel/simclist/
+
[phone]  Ludovic Rousseau
+
+	* [r5415] src/eventhandler.c, src/readerfactory.c,
+	  src/readerfactory.h, src/winscard.c: Add a mutex to make the test
+	  and set of the powerState field atomic.
+
[phone]  Ludovic Rousseau
+
+	* [r5414] src/eventhandler.c, src/winscard.c: Log the new
+	  powerState value at DEBUG level
+	* [r5412] src/readerfactory.c: Remove dead code
+
[phone]  Ludovic Rousseau
+
+	* [r5402] src/winscard.c: SCardDisconnect(): change powerState to
+	  POWER_STATE_GRACE_PERIOD only if the previous state was
+	  POWER_STATE_INUSE
+	  
+	  If the powerState was POWER_STATE_UNPOWERED then do NOT change to
+	  POWER_STATE_GRACE_PERIOD. POWER_STATE_GRACE_PERIOD indicates that
+	  the card is powered on. That is the case if mode is
+	  SCARD_SHARE_DIRECT at SCardConnect()
+	* [r5401] src/winscard.c: SCardConnect(): change the power state to
+	  POWER_STATE_INUSE only if the card has been powered on. The card
+	  is NOT powered on if mode is SCARD_SHARE_DIRECT
+	* [r5400] src/eventhandler.c, src/readerfactory.c: Move the zeroing
+	  of the reader context from EHDestroyEventHandler() to
+	  RFUnInitializeReader() where it is more appropriate.
+	  
+	  The reader context shall be valid until the reader is
+	  uninitialized in RFUnInitializeReader() and most importantly
+	  after IFDCloseIFD() is called.
+	* [r5399] src/readerfactory.c: RFInitializeReader(): if
+	  IFDOpenIFD() fails just mark the reader as "not correctly
+	  started". This will present a call to IFDCloseIFD() in
+	  RFUnInitializeReader() (revision 5393)
+
[phone]  Ludovic Rousseau
+
+	* [r5393] src/readerfactory.c: RFUnInitializeReader(): Do not close
+	  a reader if IFDOpenIFD() failed in RFInitializeReader()
+	* [r5392] src/readerfactory.c: RFRemoveReader(): destroy the event
+	  handler only if it exists already
+
[phone]  Ludovic Rousseau
+
+	* [r5391] src/winscard_msg_srv.c: ProcessCommonChannelRequest(): no
+	  need to define serv_adr as static. Free a few bytes of memory.
+	* [r5390] src/winscard_msg.c, src/winscard_msg.h,
+	  src/winscard_msg_srv.c: Remove CleanupSharedSegment() and do not
+	  call it anymore
+	  
+	  The function is not about shared segment any more The file
+	  PCSCLITE_CSOCK_NAME will be removed in clean_temp_files() at exit
+	  anyway
+	* [r5388] src/winscard_msg.c: MessageSend(): return
+	  SCARD_E_NO_SERVICE instead of SCARD_F_COMM_ERROR if the daemon
+	  died and we reveice a EPIPE error.
+	* [r5387] src/winscard_msg.c: MessageSendWithHeader(): do not send
+	  a 0 length buffer.
+	  
+	  Some commands only have a header and no data like
+	  CMD_GET_READERS_STATE
+	* [r5386] src/winscard_clnt.c, src/winscard_msg.c,
+	  src/winscard_msg.h, src/winscard_svc.c: MessageReceiveTimeout(),
+	  MessageSendWithHeader(), MessageSend() and MessageReceive() now
+	  returns a PC/SC error code instead of an internal value. So the
+	  callers can just return the error code to the application with no
+	  transcoding.
+	* [r5385] src/winscard_clnt.c: Move SCardInvalidateHandles() in the
+	  same #ifdef DO_CHECK_SAME_PROCESS as SCardCheckSameProcess()
+	  since it is only used in this case.
+	* [r5384] src/winscard_clnt.c: No need to check the server pid
+	  anymore. If the server is restarted the socket communication will
+	  fail and an "RPC transport error" SCARD_F_COMM_ERROR error will
+	  be returned
+	  
+	  This check was needed when the readers state was stored in
+	  /var/run/pcscd/pcscd.pub. But that is no more the case. Every
+	  command now uses the client/server Unix socket.
+
[phone]  Ludovic Rousseau
+
+	* [r5379] src/winscard_msg.h: InitializeSocket() and
+	  ProcessEventsServer() are used by the server side so must be
+	  declared in the #ifdef PCSCD part of the header file
+	* [r5378] src/winscard_msg.h: Add missing getSocketName()
+	  declaration used by winscard_clnt.c and winscard_msg.c
+	* [r5377] src/winscard_msg.h: Reorder the function definitions as
+	  they are in winscard_msg.c in revision 5371
+	* [r5376] src/readerfactory.h: Remove definition of FctMap_V1 now
+	  useless since revision 5321
+	* [r5375] src/atrhandler.c, src/atrhandler.h: Remove typedef of
+	  PSMARTCARD_EXTENSION and use SMARTCARD_EXTENSION * instead
+
[phone]  Ludovic Rousseau
+
+	* [r5373] src/winscard_clnt.c, src/winscard_msg.c: It is now
+	  possible to configure the local socket name to use using the
+	  environment variable PCSCLITE_CSOCK_NAME
+	  
+	  This is used by Estobuntu LTSP to redirect the smart card reader
+	  on the light terminal display to the application running on the
+	  server. They use a patched SSH version to redirect
+	  /var/run/pcscd/pcscd.comm on the client to ~/.pcscd.comm on the
+	  server.
+	* [r5372] src/winscard_msg.c: MessageReceiveTimeout(): remove pcscd
+	  specific code inside a function used only by libpcsclite
+	* [r5371] src/winscard_msg.c: reorganize the functions in 3
+	  categories: - functions used by pcscd only:
+	  CleanupSharedSegment() - functions used by libpcsclite only:
+	  ClientSetupSession(), ClientCloseSession(),
+	  MessageReceiveTimeout(), MessageSendWithHeader() - functions used
+	  by pcscd and libpcsclite: MessageSend(), MessageReceive()
+	  
+	  We gain on the code size: 1104 bytes for pcscd and 101 bytes for
+	  libpcsclite
+
[phone]  Ludovic Rousseau
+
+	* [r5370] src/atrhandler.c: ATRDecodeAtr(): avoids a buffer
+	  overflow with badly formed ATR like 3B FF 11 22 33 F0 11 22 33 F0
+	  11 22 33 F0 11 22 33 F0 11 22 33 F0 11 22 33 F0 11 22 33 00 11 22
+	  33
+	  
+	  Thanks to Rafael Dominguez Vega for the bug report
+
[phone]  Ludovic Rousseau
+
+	* [r5368] src/winscard.c: Move declaration of dwAtrLen closer to
+	  where it is used.
+	* [r5367] src/winscard.c: SCardConnect(): log the ATR in case of
+	  auto power on
+	  
+	  The ATR may be different from the previous one if the card has a
+	  cold and a warm ATR.
+
[phone]  Ludovic Rousseau
+
+	* [r5364] src/winscard.c: SCardDisconnect(): check for card removal
+	  in case DISABLE_AUTO_POWER_ON
+	* [r5359] src/winscard.c: Doxygen documentation is done on the
+	  client side (winscard_clnt.c) so remove documentation of
+	  SCardEstablishContext()
+	* [r5358] src/winscard.c: SCardTransmit(): do not check for NULL
+	  pointers since we are called from ContextThread() with correct
+	  values
+	* [r5357] src/winscard.c: SCardReconnect(): do not check for
+	  pdwActiveProtocol NULL pointer since we are called from
+	  ContextThread() with a correct value
+	* [r5356] src/winscard.c: SCardConnect(): do not check for NULL
+	  pointers since we are called from ContextThread() with correct
+	  values
+	* [r5355] src/winscard.c: SCardEstablishContext(): do not check for
+	  phContext NULL pointer since we are called from ContextThread()
+	  with a correct value
+
[phone]  Ludovic Rousseau
+
+	* [r5354] src/winscard.c: SCardConnect(): test for not
+	  SCARD_POWERED instead of SCARD_SWALLOWED
+	* [r5351] src/hotplug_linux.c: Use the new bundle parser code
+	* [r5350] src/winscard.c: SCardConnect(): log an error if auto
+	  power on failed
+	* [r5349] Makefile.am: Add a fix-rights rule at the top level to
+	  call the fix-rights rule in src/
+
[phone]  Ludovic Rousseau
+
+	* [r5348] src/winscard.c: SCardConnect(): check the returned value
+	  of IFDPowerICC() to change the readerState if power up succeeded
+	* [r5347] src/winscard.c: SCardConnect(): power up the card before
+	  checking for its SCARD_SWALLOWED state.
+	  
+	  If a card fails to power up on card insertion a new power up will
+	  be tried on SCardConnect().
+
[phone]  Ludovic Rousseau
+
+	* [r5346] src/winscard_clnt.c: Remove the "This function " in the
+	  Doxygen brief line
+	* [r5345] UnitaryTests/SCardCancel2.py: SCardCancel() should do
+	  nothing if no cancellable call is ongoing bug fixed in revision
+	  5344
+	* [r5344] src/winscard_clnt.c: Only SCardGetStatusChange() can be
+	  cancelled using SCardCancel()
+	  
+	  Thanks to Jan Rochat for the bug report
+	  https://bugs.launchpad.net/ubuntu/+source/pcsc-lite/+bug/647545
+	* [r5343] src/eventhandler.c, src/eventhandler.h,
+	  src/hotplug_libhal.c, src/hotplug_macosx.c, src/ifdwrapper.c,
+	  src/misc.h, src/pcscdaemon.c, src/winscard.c,
+	  src/winscard_clnt.c, src/winscard_msg.c: Remove spaces and tabs
+	  at end of line
+	* [r5342] src/winscard_svc.c: Reformat
+	* [r5341] src/PCSC/winscard.h, src/winscard.c, src/winscard_clnt.c,
+	  src/winscard_msg.h, src/winscard_svc.c: SCardCancelTransaction()
+	  is no more provided. This function is not provided by Microsoft
+	  and is deprecated since 2005 in pcsc-lite.
+	* [r5340] src/winscard.c: Reindent
+	* [r5339] src/winscard_clnt.c: Reformat
+	* [r5338] src/PCSC/winscard.h, src/winscard_clnt.c:
+	  SCardSetTimeout() is no more provided. This function is not
+	  provided by Microsoft and is deprecated since 2004 in pcsc-lite.
+	* [r5337] src/winscard.c: SCardSetTimeout() is implemented (and
+	  deprecated) on the client side
+	* [r5336] src/winscard.c: SCardListReaders() and SCardCancel() are
+	  implemented on the client side
+	* [r5335] src/winscard.c: SCardDisconnect(): if
+	  DISABLE_AUTO_POWER_ON is defined then do not power on the card if
+	  SCARD_UNPOWER_CARD is used.
+	* [r5334] src/eventhandler.c, src/pcscd.h.in: Move
+	  DISABLE_ON_DEMAND_POWER_ON and DISABLE_AUTO_POWER_ON defines from
+	  eventhandler.c to pcscd.h.in so they are visible by all the .c
+	  files
+	* [r5333] src/winscard.c: SCardConnect(): remove debug log
+
[phone]  Ludovic Rousseau
+
+	* [r5332] src/eventhandler.c: If DISABLE_AUTO_POWER_ON is defined
+	  then do not automatically power on the card. The card will be
+	  powered on on the first SCardConnect()
+	* [r5331] src/readerfactory.c: Remove extra parenthesis We are
+	  using C not Lisp :-)
+	* [r5328] TODO, src/PCSC/ifdhandler.h, src/eventhandler.c,
+	  src/eventhandler.h, src/pcscd.h.in, src/readerfactory.c,
+	  src/readerfactory.h, src/winscard.c: Power on the card _only_ if
+	  an application requests a connection see Alioth bug #301965
+	  
+	  You can disable the feature using DISABLE_ON_DEMAND_POWER_ON in
+	  src/eventhandler.c
+
[phone]  Ludovic Rousseau
+
+	* [r5324] src/Makefile.am: PCSC/reader.h is no more generated from
+	  PCSC/reader.h.in Directly use the filename in
+	  nobase_include_HEADERS
+
[phone]  Ludovic Rousseau
+
+	* [r5323] UnitaryTests/SCardStatus.py: Add a call to
+	  SCardDisconnect() before SCardReleaseContext()
+	* [r5322] src/eventhandler.h, src/winscard.c, src/winscard_clnt.c:
+	  Rename the sharing states unsing the PCSCLITE_SHARING_ prefix
+	  Doxygen: document the READER_STATE structure
+	* [r5321] src/PCSC/ifdhandler.h, src/eventhandler.c,
+	  src/ifdwrapper.c, src/ifdwrapper.h, src/readerfactory.c,
+	  src/readerfactory.h: Remove the support of IFDHandler v1 API. I
+	  don't know any driver using this API.
+	  
+	  We can now simplify the API of IFDStatusICC() and remove the ATR
+	  related parameters. These paremeters were only used by the
+	  IFDHandler v1 API.
+	  
+	  diffstat says: 6 files changed, 51 insertions(+), 335
+	  deletions(-)
+
[phone]  Ludovic Rousseau
+
+	* [r5317] src/hotplug_libhal.c: ifdCapabilities driver feature is
+	  not used with libhal (and has never been). Remove dead/unused
+	  code.
+
[phone]  Ludovic Rousseau
+
+	* [r5316] src/winscard.c: Reformat
+	* [r5315] src/readerfactory.c, src/winscard.c: Use the simpler form
+	  of IFDPowerICC(..., IFD_POWER_DOWN, ...) introduced in revision
+	  5314
+	* [r5314] src/ifdwrapper.c: IFDPowerICC(): allow to use NULL for
+	  pucAtr and pdwAtrLen to make power down easy with
+	  IFDPowerICC(rContext, IFD_POWER_DOWN, NULL, NULL);
+	* [r5313] src/winscard.c: Correctly set dwAtrLen to the sizeof the
+	  ATR array before calling IFDPowerICC().
+	  
+	  Some drivers do not write more that dwAtrLen bytes in cardAtr
+	  array.
+
[phone]  Ludovic Rousseau
+
+	* [r5308] src/winscard_msg.h: Doxygen: SCARD_GET_STATUS_CHANGE is
+	  not used anymore
+	* [r5307] src/winscard.c: Remove SCardStatus() (dead code) on the
+	  server side.
+	* [r5306] src/winscard.c: SCardEndTransaction(): use the same code
+	  to reset a card as in revision 5301
+	* [r5305] src/winscard.c: SCardReconnect(), SCardDisconnect() and
+	  SCardEndTransaction(): reset the value of dwAtrLen before the
+	  second call to IFDPowerICC() so that the driver gets a correct
+	  value if the first call to IFDPowerICC(IFD_POWER_DOWN) set
+	  dwAtrLen=0
+	  
+	  Thanks to Frank Morgner for the bug report Closes: [#312754]
+	  IFDHPowerICC is called with IFD_POWER_UP and *AtrLength==0
+	* [r5304] src/pcsc-wirecheck-gen.c, src/winscard.c,
+	  src/winscard_clnt.c, src/winscard_msg.h, src/winscard_svc.c: A
+	  large part of SCardStatus() is done on the client side using
+	  readerStates[]. So remove a few lines of dead code on the server
+	  side.
+	* [r5303] UnitaryTests/SCardStatus.py: Call SCardStatus() a second
+	  time after a keypress
+	* [r5302] UnitaryTests/SCardStatus.py: Unit test for SCardStatus()
+	* [r5301] src/winscard.c: SCardReconnect(): Reorganize the code to
+	  manage ATR and readerState after a power up. Remove a call to
+	  IFDStatusICC() to know if a card is present or not since
+	  IFDPowerICC() already gives us this information.
+	  
+	  SCardDisconnect(): Use the same code as above
+	* [r5300] src/eventhandler.c, src/winscard.c, src/winscard_clnt.c:
+	  Use uint32_t readerState instead of DWORD dwStatus to store the
+	  state of the reader. DWORD and uint32_t may be different.
+	* [r5299] src/winscard.c: SCardReconnect(): return
+	  SCARD_E_NO_SMARTCARD when card is removed and
+	  SCARD_W_UNRESPONSIVE_CARD when card is unresponsive instead of
+	  SCARD_E_PROTO_MISMATCH
+	* [r5298] src/winscard_msg.h: Increment minor version because of
+	  changes in revision 5290
+	* [r5297] doc/Makefile.am, doc/ifdhandler-3.tex: Remove the
+	  deprecated LaTeX version of IFDHandler documentation
+
[phone]  Ludovic Rousseau
+
+	* [r5296] src/configfile.l: evaluatetoken(): the CHANNELID
+	  parameter can also be a decimal number.
+	* [r5294] src/PCSC/ifdhandler.h, src/configfile.l: reader.conf
+	  configuration: If you want to use IFDHCreateChannel() instead of
+	  IFDHCreateChannelByName() then do not use any DEVICENAME line in
+	  the configuration file. IFDHCreateChannel() will then be called
+	  with the CHANNELID parameter.
+	  
+	  Closes: [#312749] Should call IFDHCreateChannel for serial driver
+	  with DEVICENAME /dev/null
+	* [r5293] src/readerfactory.c, src/winscard_clnt.c,
+	  src/winscard_svc.c: list_* functions return an decimal integer so
+	  use %d insteaf of %X to log the error value.
+	* [r5292] src/readerfactory.c: Add a "0x" before hex displays
+
[phone]  Ludovic Rousseau
+
+	* [r5291] src/winscard_clnt.c: Doxygen SCardStatus(): *pdwState
+	  also contains a number of events
+	* [r5290] src/eventhandler.c, src/eventhandler.h,
+	  src/winscard_clnt.c: Split the card event counter out of the card
+	  event state on the pcscd side to simplify the code in
+	  EHStatusHandlerThread()
+	  
+	  The two information are combined on the client side in
+	  SCardGetStatusChange() and SCardStatus()
+	* [r5289]
+	  UnitaryTests/SCardGetStatusChange/SCardGetStatusChange_loop.py:
+	  Exit the endless loop in case of error
+	* [r5288] src/PCSC/pcsclite.h.in: struct SCARD_READERSTATE: use
+	  "DWORD" instead of "unsigned long" type for the fields
+	  dwCurrentState, dwEventState and cbAtr
+	  
+	  This is compliant to the Windows definition and allows to
+	  redefine DWORD to something other than unsigned long, like
+	  uint32_t
+	* [r5287] src/PCSC/pcsclite.h.in, src/error.c:
+	  pcsc_stringify_error(): Use "LONG" instead of "long" as parameter
+	  type to reflect the return type from winscard.h
+	  
+	  The LONG type may be redefined in PCSC/wintypes.h to int32_t for
+	  example
+
[phone]  Ludovic Rousseau
+
+	* [r5281] src/winscard_clnt.c: Doxygen: do not document unused
+	  SCARD_STATE_ATRMATCH and SCARD_STATE_PRESENT states in
+	  SCardGetStatusChange()
+	  
+	  Thanks to Martin Paljak for the patch
+	* [r5280]
+	  UnitaryTests/SCardGetStatusChange/SCardGetStatusChange_loop.py:
+	  Call SCardGetStatusChange() in a endless loop
+	* [r5279] src/tokenparser.l: Doxygen: fix documentation of
+	  LTPBundleFindValueWithKey()
+	* [r5278] src/winscard_clnt.c: SCardGetStatusChange(): include the
+	  event counter in dwEventState even if dwCurrentState contains a
+	  counter at 0 (default).
+	* [r5277] doc/doxygen.conf.in: Update from Doxygen 1.5.5 to 1.7.1
+	  
+	  warning: Tag `DETAILS_AT_TOP' at line 163 of file
+	  doc/doxygen.conf has become obsolete. To avoid this warning
+	  please update your configuration file using "doxygen -u"
+
[phone]  Ludovic Rousseau
+
+	* [r5275] src/pcscdaemon.c: main(): do not limit rights if run as
+	  root
+
[phone]  Ludovic Rousseau
+
+	* [r5262] src/Makefile.am: Do not change the access rights of pcscd
+	  in the install rule but in another one. This is needed when
+	  building the package in a system without the pcscd group.
+
[phone]  Ludovic Rousseau
+
+	* [r5256] configure.in: Do not generate src/PCSC/reader.h from
+	  src/PCSC/reader.h.in any more
+	* [r5255] src/PCSC/reader.h: HOST_TO_CCID_16() and
+	  HOST_TO_CCID_32() are now identity functions
+	  
+	  Since CCID 1.4.1 (revision 5252) the byte order is no more
+	  important
+	* [r5254] src/PCSC/reader.h, src/PCSC/reader.h.in: Rename
+	  reader.h.in in reader.h
+
[phone]  Ludovic Rousseau
+
+	* [r5245] src/Makefile.am: Install pcscd as sgid pcscd instead of
+	  suid root
+	* [r5241] src/hotplug_libhal.c: HPReadBundleValues(): do not fail
+	  if the key "CFBundleName" is not found in a driver Info.plist.
+	  This key should only be defined for the CCID class driver.
+
[phone]  Ludovic Rousseau
+
+	* [r5231] src/winscard_msg.c: Doxygen: remove documentation about
+	  the (now removed) timeOut parameter of MessageSend() and
+	  MessageSendWithHeader()
+
[phone]  Ludovic Rousseau
+
+	* [r5227] src/winscard_clnt.c: Doxygen: clarify the use of one
+	  different SCARDCONTEXT per thread and the expection for
+	  SCardCancel()
+	* [r5226] src/winscard_svc.c: Remove protocol_major, protocol_minor
+	  fields from struct _psContext since they are not used.
+	* [r5225] src/winscard_msg.h: update PROTOCOL_VERSION_MINOR since
+	  struct pubReaderStatesList changed (readerID removed)
+	* [r5224] src/winscard_svc.c: ContextThread(): check that the
+	  procotol major.minor is the same for the daemon and lib. If not
+	  just fail. We are not backward compatible.
+	* [r5219] src/winscard_clnt.c: Complete change in revision 5212
+	  
+	  SCardGetStatusChange() and SCardListReaders() were broken.
+	* [r5218] src/ifdwrapper.c, src/readerfactory.c,
+	  src/readerfactory.h: Rename lpcLibrary in library and lpcDevice
+	  in device
+	* [r5217] src/eventhandler.c, src/eventhandler.h, src/pcscdaemon.c,
+	  src/readerfactory.c, src/readerfactory.h: Wait until all
+	  connected readers have a chance to power up a possibly inserted
+	  card.
+	  
+	  This is needed when auto start is used and a card is already
+	  present in a USB reader. The reader presence is correctly
+	  reported to libpcsclite but the power up has not yet happen. So
+	  the ATR is not yet available.
+	* [r5216] src/eventhandler.c, src/readerfactory.c,
+	  src/readerfactory.h, src/winscard_clnt.c: Rename lpcReaderName in
+	  readerName and use (char *) instead of LPSTR
+	* [r5215] src/eventhandler.c, src/readerfactory.c,
+	  src/readerfactory.h, src/winscard.c: Get rid of the lpcReader[]
+	  field in struct ReaderContext
+	  
+	  The reader name is already present in readerState->readerName
+	  linked from struct ReaderContext
+	  
+	  Gain: MAX_READERNAME*PCSCLITE_MAX_READERS_CONTEXTS = 100*16 =
+	  1600 bytes fo RAM on pcscd
+	* [r5214] src/winscard.c: SCardStatus(): remove a useless test
+	  
+	  lpcReader can't be larger than MAX_BUFFER_SIZE (264) since its
+	  buffer is only MAX_READERNAME (100) bytes long. And I don't see
+	  why we need this test anyway.
+	* [r5213] src/eventhandler.c, src/winscard.c: Complete change
+	  started in revision 5212
+	  
+	  rContext->readerState is never NULL now. So do not even check its
+	  value.
+	* [r5212] src/eventhandler.c, src/eventhandler.h,
+	  src/pcsc-wirecheck-gen.c, src/readerfactory.c,
+	  src/winscard_clnt.c: Get rid of the readerID field in struct
+	  pubReaderStatesList
+	* [r5211] src/readerfactory.c, src/readerfactory.h: Remove unused
+	  RFSuspendAllReaders() and RFAwakeAllReaders()
+
[phone]  Ludovic Rousseau
+
+	* [r5204] src/eventhandler.c: Reformat
+
[phone]  Ludovic Rousseau
+
+	* [r5202] src/winscard_msg_srv.c: InitializeSocket(): do not set
+	  the execution bit on the socket file. It is useless.
+
[phone]  Ludovic Rousseau
+
+	* [r5196] src/debug.c, src/error.c, src/utils.c, src/utils.h: svn
+	  propset svn:keywords 'Author Date Id Revision'
+	* [r5195] src/utils.c: GetDaemonPid(): use open(3) instead of
+	  fopen(3) to avoid an internal malloc() call and gain some CPU
+	  cycles
+	* [r5194] src/hotplug_libhal.c: HPAddDevice(): wait 1 millisecond
+	  instead of 1 second until the device is visible to libusb/etc.
+
[phone]  Ludovic Rousseau
+
+	* [r5183] src/winscard_clnt.c: Doxygen:
+	  SCardCheckDaemonAvailability() do not invalidate handles after a
+	  fork() any more
+
[phone]  Ludovic Rousseau
+
+	* [r5179] src/hotplug_libusb.c: HPReadBundleValues(): use the new
+	  Info.plist parsing API.
+	  
+	  Parsing the CCID Info.plist (159 readers supported) was on a ARM9
+	  machine 13193049 µs and is now 258262 µs => gain x51 or 5008%
+	* [r5178] src/readerfactory.c: RFBindFunctions(): rename rv in rvl
+	  to avoid warnings warning: declaration of ‘rv’ shadows a previous
+	  local
+	  
+	  Also change type from DWORD to int since DYN_GetAddress() returns
+	  an int
+	* [r5177] src/readerfactory.c: RFLoadReader(): optimize the
+	  detection of Ifd Handler version by checking for
+	  "IFDHCreateChannelByName", "IFDHCreateChannel" and then
+	  "IO_Create_Channel" instead of the 3 symbols at once.
+	  
+	  Also suppress the error message suppression. Ifd handler v2 or v1
+	  will display one or two errors for symbols not found.
+	* [r5175] src/hotplug_libhal.c: HPReadBundleValues(): duplicate the
+	  readerName and CFBundleName strings since the originals are
+	  destroyed by bundleRelease() later
+	  
+	  The reader names were corrupted.
+
[phone]  Ludovic Rousseau
+
+	* [r5160] ChangeLog: Fix typo
+
[phone]  Ludovic Rousseau
+
+	* [r5157] src/hotplug_libhal.c: HPReadBundleValues(): use the new
+	  Info.plist parsing API.
+	  
+	  Parsing the CCID Info.plist (159 readers supported) was on a i386
+	  machine 264306 µs and is now 5547 µs => gain x47 or 4600%
+	* [r5156] src/parser.h, src/tokenparser.l: parse the Info.plist
+	  file only once and generate a list of key/values
+	* [r5152] src/hotplug_libusb.c: HPSearchHotPluggables(): create the
+	  synchronisation pipe only if the HPEstablishUSBNotifications
+	  thread is created. Avoids to leak resources.
+	* [r5151] src/hotplug_libusb.c: HPSearchHotPluggables(): wait for
+	  initial readers to setup only if HPEstablishUSBNotifications is
+	  created. Otherwise the process is blocked for ever.
+	* [r5150] src/hotplug_libhal.c: HPRegisterForHotplugEvents():
+	  having no bundle for USB readers is not an error. USB
+	  support/hotplug is just disabled.
+	* [r5149] src/pcscdaemon.c: main(): Log a message if
+	  HPRegisterForHotplugEvents() fails
+	* [r5148] src/hotplug_libusb.c: Do not hardcode the libusb-1.0
+	  include header path (remove the libusb-1.0/ part)
+
[phone]  Ludovic Rousseau
+
+	* [r5147] configure.in: Do not hardcode the libusb.h path.
+	  
+	  See Debian bug #591782 ccid: FTBFS on kfreebsd-*: configure:
+	  error: libusb.h not found
+	* [r5146] c.sh: add --sysconfdir=/etc
+	* [r5145] src/pcscdaemon.c: Do not allow restricting defaults
+	  values of --max-thread, --max-card-handle-per-thread or
+	  --max-card-handle-per-reader when restricted
+	* [r5144] src/pcscdaemon.c: Do not allow APDU logging when
+	  restricted
+	* [r5143] src/pcscdaemon.c: If the process is setuid or setgid it
+	  may have some restrictions
+	  
+	  Do not allow to specify a configuration file when restricted
+
[phone]  Ludovic Rousseau
+
+	* [r5138] ChangeLog, configure.in: release 1.6.4
+	* [r5137] configure.in: Do not use sysconfdir as configuration
+	  directory but ${sysconfdir}/reader.conf.d instead.
+	  
+	  Use --enable-confdir=DIR if you want to set a specific value
+	  without the reader.conf.d appended.
+	  
+	  Thanks to Kalev Lember for the bug report
+	  http://archives.neohapsis.com/archives/dev/muscle/2010-q3/0150.html
+	* [r5135] ChangeLog, configure.in: release 1.6.3
+	* [r5134] src/PCSC/pcsclite.h.in, src/PCSC/winscard.h: Define
+	  LPSCARD_READERSTATE since this is used in the MSDN prototype.
+	  
+	  Use LPSCARD_READERSTATE in winscard.h instead of
+	  (SCARD_READERSTATE *) to mimic the MSDN API.
+	  
+	  This partly reverts changeset 5096
+
[phone]  Ludovic Rousseau
+
+	* [r5130] UnitaryTests/SCard_fork.py: Also call SCardDisconnect()
+	  and SCardReleaseContext() in the forked process
+	* [r5129] src/winscard_svc.c: ContextThread(): goto exit if
+	  MSGCheckHandleAssociation() fails instead of just returning no
+	  error.
+	  
+	  Something wrong happened on the client side (like a fork) and the
+	  client needs to call SCardEstablishContext() to create a new
+	  connection.
+	* [r5128] src/winscard_svc.c: ContextThread(): fix goto label when
+	  it _is_ an overflow
+	* [r5127] src/winscard_svc.c: ContextThread(): fix goto label when
+	  it is not an overflow
+	* [r5126] src/winscard_clnt.c: Revert changeset 5102 to add
+	  profiling on the client side again.
+	  
+	  ltrace(1) can't be used with a dynamically loaded (dlopen(3))
+	  library like it is the case with the majority of PKCS#11 client
+	  application.
+	* [r5125] src/simclist.c: Reset mid field when the list is empty to
+	  avoid assert() errors
+	* [r5124] src/winscard_svc.c: MSGCheckHandleAssociation(): check
+	  that the context handle is still valid. Calling a PC/SC function
+	  after SCardReleaseContext() is not supported.
+	* [r5123] src/eventhandler.c: Fix typo in comment
+
[phone]  Ludovic Rousseau
+
+	* [r5118] configure.in: remove debug line
+	* [r5117] configure.in: "/reader.conf.d" is only appended to
+	  sysconfdir if no value of sysconfdir is provided
+	  
+	  Thanks to Patrice Angelini for the bug report
+	* [r5114] src/hotplug_libusb.c: HPAddHotPluggable(): do not use
+	  libusb_strerror() since it is not yet available in current stable
+	  libusb (1.0.8)
+	* [r5113] src/ifdwrapper.c: Fix compilation warnings
+	  ifdwrapper.c:166:7: warning: "IFDHANDLERv2" is not defined
+	  ifdwrapper.c:589:7: warning: "IFDHANDLERv2" is not defined
+	  ifdwrapper.c:640:7: warning: "IFDHANDLERv3" is not defined
+	* [r5112] src/ifdwrapper.c: Check that either IFDHANDLERv1,
+	  IFDHANDLERv2 or IFDHANDLERv3 is defined if PCSCLITE_STATIC_DRIVER
+	  is used
+	* [r5111] c.sh: No need to use -D_REENTRANT. It was needed for
+	  LinuxThreads but we do not use LinuxThreads since a long time.
+	  
+	  See Debian bug #475101 "Remove obsolete -D_REENTRANT requirement"
+
[phone]  Ludovic Rousseau
+
+	* [r5107] ChangeLog, configure.in: release 1.6.2
+	* [r5106] src/Makefile.am: Remove useless $(COREFOUNDATION) from
+	  libpcsclite_la_LIBADD The library has no Mac OS X specific code.
+	* [r5105] src/Makefile.am: Remove undefined $(LIBSMARTCARD) from
+	  libpcsclite_la_LIBADD
+	* [r5104] src/Makefile.am: libpcsclite does not use dlopen() so no
+	  need to link with $(LIBDL)
+
[phone]  Ludovic Rousseau
+
+	* [r5102] src/winscard_clnt.c: Remove client side profiling since
+	  we can use ltrace(1) with better results
+	* [r5098] configure.in: Remove 2 debug traces
+
[phone]  Ludovic Rousseau
+
+	* [r5097] src/PCSC/winscard.h, src/winscard.c, src/winscard_clnt.c:
+	  Use "SCARD_IO_REQUEST *" instead of LPSCARD_IO_REQUEST and "const
+	  SCARD_IO_REQUEST *" instead of "LPCSCARD_IO_REQUEST
+	  
+	  Should make the code more easy to read
+	* [r5096] doc/example/pcsc_demo.c, src/PCSC/pcsclite.h.in,
+	  src/PCSC/winscard.h, src/testpcsc.c, src/utils/formaticc.c,
+	  src/winscard.c, src/winscard_clnt.c: Use SCARD_READERSTATE
+	  instead of SCARD_READERSTATE_A
+	  
+	  Remove definitions of SCARD_READERSTATE_A PSCARD_READERSTATE_A
+	  and LPSCARD_READERSTATE_A types
+	* [r5093] configure.in: Use $libdir instead of $prefix/lib to set
+	  the default value of usbdropdir
+	  
+	  " Fedora uses /usr/lib on 32 bit and /usr/lib64 on 64 bit
+	  multilib platforms. "
+	  
+	  Thanks to Kalev Lember for the idea.
+	  http://archives.neohapsis.com/archives/dev/muscle/2010-q3/0108.html
+	* [r5092] c.sh: sysconfdir=/etc by default if prefix=/usr so remove
+	  the --sysconfdir line
+	* [r5091] UnitaryTests/SCardBeginTransaction_Disconnect.py,
+	  UnitaryTests/SCardConnect_DIRECT.py,
+	  UnitaryTests/SCardConnect_DIRECT2.py,
+	  UnitaryTests/SCardExclusiveBehaviour.py,
+	  UnitaryTests/SCardReconnect.py, UnitaryTests/reset_card.py: Do
+	  not duplicate the reader index to avoids problems when I want to
+	  change it.
+
[phone]  Ludovic Rousseau
+
+	* [r5082] configure.in: Set sysconfdir to /etc if prefix=/usr
+	  
+	  You should have a default working configuration only with
+	  --prefix=/usr
+
[phone]  Ludovic Rousseau
+
+	* [r5081] c.sh: --enable-muscledropdir is no more supported by
+	  pcsc-lite since a long time. So remove the line.
+	* [r5080] c.sh: --enable-usbdropdir=/usr/lib/pcsc/drivers is now
+	  the default value. So remove the line.
+	* [r5079] configure.in: Default value of usbdropdir is now
+	  $prefix/lib/pcsc/drivers instead of $prefix/pcsc/drivers
+	  
+	  The new path is the path used on Debian (with prefix-/usr). So no
+	  need to change the default value.
+
[phone]  Ludovic Rousseau
+
+	* [r5073] src/Makefile.am: Create empty directories used by drivers
+	  
+	  Thanks to Kalev Lember for the patch
+	  http://archives.neohapsis.com/archives/dev/muscle/2010-q3/0065.html
+
[phone]  Ludovic Rousseau
+
+	* [r5071] src/hotplug_libhal.c, src/pcscdaemon.c, src/utils.c,
+	  src/winscard.c: Do not affect and check a variable on the same
+	  line
+	* [r5070] src/readerfactory.c: reformat
+	* [r5069] src/winscard.c: Get the value of rContext before its use.
+	  A simple call to SCardTransmit() crashed with a NULL pointer.
+
[phone]  Ludovic Rousseau
+
+	* [r5066] src/readerfactory.c: fix crash with empty config dir
+	  
+	  Thanks to Kalev Lember for the patch
+	  http://archives.neohapsis.com/archives/dev/muscle/2010-q3/0017.html
+	  
+	  pcscd attempts to read uninitialized memory and free an invalid
+	  pointer when its configuration directory is empty.
+	  
+	  The patch fixes this by initializing reader_list to NULL.
+	  
+	  ==2658== Conditional jump or move depends on uninitialised
+	  value(s) ==2658== at 0x40A2EF: RFStartSerialReaders
+	  (readerfactory.c:1324) ==2658== by 0x40743F: main
+	  (pcscdaemon.c:522) ==2658== ==2658== Use of uninitialised value
+	  of size 8 ==2658== at 0x40A2F5: RFStartSerialReaders
+	  (readerfactory.c:1327) ==2658== by 0x40743F: main
+	  (pcscdaemon.c:522) ==2658== ==2658== Conditional jump or move
+	  depends on uninitialised value(s) ==2658== at 0x4C26D25: free
+	  (vg_replace_malloc.c:325) ==2658== by 0x40A404:
+	  RFStartSerialReaders (readerfactory.c:1348) ==2658== by 0x40743F:
+	  main (pcscdaemon.c:522) ==2658== ==2658== Invalid free() / delete
+	  / delete[] ==2658== at 0x4C26D72: free (vg_replace_malloc.c:325)
+	  ==2658== by 0x40A404: RFStartSerialReaders (readerfactory.c:1348)
+	  ==2658== by 0x40743F: main (pcscdaemon.c:522) ==2658== Address
+	  0x4222148 is not stack'd, malloc'd or (recently) free'd
+	  
+	  --- pcsc-lite-1.6.1/src/readerfactory.c.orig2010-07-04
+	  23:42:14.000000000 +0300 +++
+	  pcsc-lite-1.6.1/src/readerfactory.configuration2010-07-04
+	  23:42:23.000000000 +0300 @@ -1312,7 +1312,7 @@ void
+	  RFCleanupReaders(void) #ifdef USE_SERIAL int
+	  RFStartSerialReaders(const char *readerconf) {
+	  -readerconfSerialReader *reader_list; +reader_listSerialReader
+	  *reader_list = NULL; int i, rv; /* remember the configuration
+	  filename for * RFReCheckReaderConf() */
+	* [r5065] c.sh, configure.in, src/pcscd.h.in: more idiomatic
+	  sysconfdir usage
+	  
+	  Thanks to Kalev Lember for the patch
+	  http://archives.neohapsis.com/archives/dev/muscle/2010-q3/0015.html
+	  
+	  > URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5060 > Log:
+	  set --sysconfdir=/etc/reader.conf.d so that we parse any file in
+	  > this directory > > [...] > - --sysconfdir=/etc \ > +
+	  --sysconfdir=/etc/reader.conf.d \
+	  
+	  It's more common to set sysconfdir to /etc and have configure
+	  script figure out the subdirectory. The configure script should
+	  always default to sane values when no arguments are specified.
+	  The default value for sysconfdir is /usr/local/etc; so the
+	  configure script should just append /reader.conf.d to that. Right
+	  now if the user doesn't override sysconfdir, pcsc will try to go
+	  through every .conf file in /usr/local/etc, and I don't think
+	  anything good will come out of that.
+	  
+	  I have a patch attached which should make it more idiomatic:
+	  default to $sysconfdir/reader.conf.d directory.
+
[phone]  Ludovic Rousseau
+
+	* [r5062] src/pcscd.h.in: remove PCSCLITE_READER_CONFIG now useless
+	* [r5061] src/pcscdaemon.c: main(): use PCSCLITE_CONFIG_DIR instead
+	  of PCSCLITE_READER_CONFIG to use the directory configured using
+	  --sysconfdir=...
+	* [r5060] c.sh: set --sysconfdir=/etc/reader.conf.d so that we
+	  parse any file in this directory
+	* [r5059] src/configfile.l: DBGetReaderListDir(): add a log line
+	  when parsing a directory (containing config files)
+	* [r5058] src/readerfactory.c, src/readerfactory.h, src/winscard.c:
+	  RFCheckSharing(), RFLockSharing(), RFUnlockSharing() &
+	  RFUnlockAllSharing(): add the READER_CONTEXT * rContext parameter
+	  to avoid recomputing it internally (gain a few CPU cycles)
+
[phone]  Ludovic Rousseau
+
+	* [r5047] src/configfile.h, src/configfile.l, src/debuglog.c,
+	  src/dyn_hpux.c, src/dyn_macosx.c, src/dyn_unix.c,
+	  src/eventhandler.c, src/eventhandler.h, src/hotplug_generic.c,
+	  src/hotplug_libhal.c, src/hotplug_libusb.c, src/hotplug_linux.c,
+	  src/hotplug_macosx.c, src/ifdwrapper.c, src/ifdwrapper.h,
+	  src/pcscdaemon.c, src/readerfactory.c, src/readerfactory.h,
+	  src/sys_generic.h, src/sys_unix.c, src/testpcsc.c,
+	  src/winscard.c, src/winscard_clnt.c, src/winscard_msg.h,
+	  src/winscard_svc.c, src/winscard_svc.h: update copyright date
+	* [r5046] src/hotplug_libusb.c: Remove declaration of 3 static
+	  functions since they are defined before use. Declaration is then
+	  useless.
+	* [r5045] configure.in: check for libusb-1.0 instead of libusb-0.1
+	* [r5044] src/hotplug_libusb.c: port from libusb-0.1 to libusb-1.0
+
[phone]  Ludovic Rousseau
+
+	* [r5040] UnitaryTests/MCT_ReaderDirect.py,
+	  UnitaryTests/control_get_firmware.py,
+	  UnitaryTests/control_switch_interface.py,
+	  UnitaryTests/stress_get_firmware.py: use readers() from
+	  smartcard.System instead of smartcard.pcsc.PCSCReader
+	  
+	  readers() method is now a staticmethod of the PCSCReader class
+	  since pyscard subversion revision 500.
+
[phone]  Ludovic Rousseau
+
+	* [r5039] src/pcscdaemon.c: signal_trap(): implement a "Forced
+	  suicide" mechanism.
+	  
+	  After 3 Ctrl-C without much reaction from pcscd (in fact the
+	  drivers) we force the suicide. Sometimes libusb is blocked in a
+	  kind of dead-lock and kill -9 was the only option.
+	* [r5038] UnitaryTests/stress_apdu.py,
+	  UnitaryTests/stress_get_firmware.py: - better display the list of
+	  available readers - display the command duration and log to
+	  stderr if the duration is more than 1 second indicating a problem
+	* [r5037] UnitaryTests/stress_get_firmware.py: get firmware version
+	  of Gemalto readers in loop
+	* [r5036] UnitaryTests/stress_apdu.py: send an apdu in loop
+
[phone]  Ludovic Rousseau
+
+	* [r5032] src/PCSC/debuglog.h: Add Log5() function
+	* [r5031] src/PCSC/ifdhandler.h: fix a comment
+	* [r5029] src/PCSC/ifdhandler.h, src/eventhandler.c: Add support of
+	  TAG_IFD_STOP_POLLING_THREAD to request the stop of the driver
+	  polling function.
+
[phone]  Ludovic Rousseau
+
+	* [r5023] configure.in: Use AC_CHECK_FUNCS() instead of
+	  AC_CHECK_FUNC() to have HAVE_PTHREAD_CANCEL defined when needed.
+	  
+	  AC_CHECK_FUNC() defined nothing so HAVE_PTHREAD_CANCEL was not
+	  defined even if pthread_cancel() was available.
+
[phone]  Ludovic Rousseau
+
+	* [r5009] src/pcscdaemon.c: main(): in case of auto exit create a
+	  new session so that Ctrl-C on the application will not also quit
+	  pcscd
+	  
+	  Thanks to Thierry Fabre for reporting the bug
+
[phone]  Ludovic Rousseau
+
+	* [r4992] src/winscard_msg.h: typo in comment
+
[phone]  Ludovic Rousseau
+
+	* [r4991] UnitaryTests/SCardBeginTransaction_Disconnect.py,
+	  UnitaryTests/SCardBlockingBehaviourTest.py,
+	  UnitaryTests/SCardCancel.py, UnitaryTests/SCardConnect_DIRECT.py,
+	  UnitaryTests/SCardConnect_DIRECT2.py,
+	  UnitaryTests/SCardExclusiveBehaviour.py,
+	  UnitaryTests/SCardGetAttrib.py, UnitaryTests/SCardReconnect.py,
+	  UnitaryTests/SCard_fork.py, UnitaryTests/ThreadSafe.py,
+	  UnitaryTests/ThreadSafeConnect.py, UnitaryTests/reset_card.py:
+	  return exception from smartcard.pcsc.PCSCExceptions when
+	  appropriate
+
[phone]  Ludovic Rousseau
+
+	* [r4986] src/simclist.c: Avoid a division by 0. Closes [#312555]
+	  simclist bug in pcsc-lite
+	* [r4985] src/simclist.c, src/simclist.h: update to version version
+	  1.4.4rc4 Apr 2010
+
[phone]  Ludovic Rousseau
+
+	* [r4983] src/winscard_clnt.c: SCardEstablishContext(): if pcscd is
+	  stared by libpcsclite then close all file handles except stdin,
+	  stdout and stderr so that pcscd does not confiscate ressources
+	  allocated by the application
+	  
+	  Thanks to Thierry Fabre for the bug report
+
[phone]  Ludovic Rousseau
+
+	* [r4978] configure.in: release 1.6.1
+	* [r4977] ChangeLog: release 1.6.1
+
[phone]  Ludovic Rousseau
+
+	* [r4974] src/misc.h, src/strlcpycat.h, src/tokenparser.l: update
+	  copyright date
+	* [r4969] src/pcscdaemon.c, src/sys_unix.c: pcscd: do not return
+	  before most of the initialisation are done correctly. The idea is
+	  that pcscd can return an error code if the daemon fails to start
+	  correctly (hald not started for example).
+	  
+	  Before the patch pcscd became a daemon, then returned 0 (success)
+	  and then continued with the initialisation. If the initialisation
+	  failed it was too late to return an error code. The
+	  /etc/init.d/pcscd script was not aware of the failure.
+	  
+	  Closes https://bugzilla.redhat.com/show_bug.cgi?id=580321
+	  "/usr/sbin/pcscd exit codes broken"
+
[phone]  Ludovic Rousseau
+
+	* [r4968] src/pcscdaemon.c: main(): return EXIT_FAILURE instead of
+	  EXIT_SUCCESS if a unknown argument is passed
+
[phone]  Ludovic Rousseau
+
+	* [r4967] src/winscard_msg.h, src/winscard_svc.c: Avoids a crash if
+	  a client sends a unknown command.
+	  
+	  Thanks to Martin Vogt for the bug report
+	  http://archives.neohapsis.com/archives/dev/muscle/2010-q2/0096.html
+
[phone]  Ludovic Rousseau
+
+	* [r4964] src/winscard.c: SCardControl(): do not check for card
+	  events since we are talking to the reader not the card. A smart
+	  card removal should not make SCardControl() fail with
+	  SCARD_W_REMOVED_CARD
+
[phone]  Ludovic Rousseau
+
+	* [r4957] UnitaryTests/SCardGetAttrib.py: get
+	  SCARD_ATTR_VENDOR_IFD_SERIAL_NO PC/SC attribute
+
[phone]  Ludovic Rousseau
+
+	* [r4954] src/PCSC/reader.h.in: Add
+	  PCSCv2_PART10_PROPERTY_bPPDUSupport
+	* [r4953]
+	  UnitaryTests/SCardGetStatusChange/SCardGetStatusChange.py,
+	  UnitaryTests/SCardGetStatusChange/SCardGetStatusChange_PnP.py:
+	  Also display the return value of SCardReleaseContext()
+	* [r4952] src/pcscd.h.in, src/winscard_clnt.c, src/winscard_msg.c,
+	  src/winscard_msg.h, src/winscard_svc.c: MessageSend(),
+	  MessageReceive() & MessageSendWithHeader() do not timeout any
+	  more. If the other side of the socket dies we will get an error
+	  from the kernel.
+	  
+	  Add a new MessageReceiveTimeout() to implement
+	  SCardGetStatusChange() with a timeout.
+	  
+	  The constants PCSCLITE_WRITE_TIMEOUT & PCSCLITE_READ_TIMEOUT are
+	  now also removed.
+	  
+	  The problem was that if a client does nothing during
+	  PCSCLITE_READ_TIMEOUT (120 seconds by default) then pcscd
+	  considers it as a dead client and closes the connection. I guess
+	  this problem was present since the first version of pcsc-lite but
+	  nobody complained before.
+	  
+	  Thanks to Thierry Fabre for the bug report.
+	* [r4951] src/pcscdaemon.c, src/winscard_clnt.c,
+	  src/winscard_msg.c, src/winscard_msg.h, src/winscard_msg_srv.c,
+	  src/winscard_svc.c: rename SHMfoobar() functions in foobar()
+	  since we do not use shared memory (SHM) anymore
+
[phone]  Ludovic Rousseau
+
+	* [r4949] src/hotplug_libusb.c: Add a synchronisation so that if
+	  pcscd is auto started the initial reader list is available before
+	  the server takes commands from clients.
+	  
+	  Before the change early calls of SCardListReaders() returned an
+	  empty list of readers even if a reader was connected.
+	  
+	  Thanks to Patrice Angelini for the bug report
+	* [r4948] etc: Remove etc directory completely - serial readers are
+	  rare => no need for /etc/reader.conf.d/ - pcscd now autostarts =>
+	  no need for /etc/init.d/pcscd script or equivalent
+	* [r4947] Makefile.am, configure.in: Do not install files in /etc
+	  any more. Serial drivers are rare now.
+	* [r4946] etc/Makefile.am: Use $(sysconfdir_exp) instead of
+	  (removed) $(confdir_exp)
+	  
+	  Fixes [#312498] Wrong installation path for reader.conf.d
+
[phone]  Ludovic Rousseau
+
+	* [r4941] UnitaryTests/SCardConnect_DIRECT2.py: Unitary test for
+	  bug fixed in revision 4940
+	* [r4940] src/winscard.c: 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.
+	  
+	  See SCardConnect_DIRECT2.py for a Unitary Test
+
[phone]  Ludovic Rousseau
+
+	* [r4921] ChangeLog: update date and release for 1.6.0
+	* [r4920] ChangeLog, configure.in: release 1.6.0
+
[phone]  Ludovic Rousseau
+
+	* [r4918] src/pcscdaemon.c: ExitValue default value is now
+	  EXIT_FAILURE instead of EXIT_SUCCESS
+	* [r4917] src/pcscdaemon.c: main(): remove dead code "used" when no
+	  reader.conf file is found
+
[phone]  Ludovic Rousseau
+
+	* [r4913] src/winscard_clnt.c: SCardEstablishContext(): also log
+	  the binary name if execl() fails
+	* [r4912] src/eventhandler.c: EHDestroyEventHandler(): use
+	  pthread_cancel() only if it is present (not the case on Android)
+	* [r4911] configure.in: Add a check for pthread_cancel() (not
+	  present on Android)
+	* [r4910] src/readerfactory.h: Add missing #include <pthread.h>
+	  
+	  Compilation failed on Android but not on my Debian as the libC is
+	  different on the two systems. On Debian sys/types.h defines
+	  pthread types
+
[phone]  Ludovic Rousseau
+
+	* [r4906] src/strlcpycat.h: #include <string.h> on plateform that
+	  have strlcpy() to avoid a warning (Mac OS X and Android)
+	  
+	  error.c: In function ‘pcsc_stringify_error’: error.c:64: warning:
+	  implicit declaration of function ‘strlcpy’ error.c:64: warning:
+	  nested extern declaration of ‘strlcpy’
+	* [r4905] src/hotplug_linux.c: #include <pthread.h>
+	  
+	  Declare pthread_mutex_* functions
+	* [r4904] src/hotplug_linux.c: #include "utils.h"
+	  
+	  Fix hotplug_linux.c:391: error: ‘THREAD_ATTR_DETACHED’ undeclared
+	  (first use in this function)
+	* [r4903] src/hotplug_libusb.c: HPEstablishUSBNotifications(): do
+	  not call RFReCheckReaderConf if USE_SERIAL is defined. The
+	  function is not defined in this case.
+	* [r4901] configure.in, src/Makefile.am, src/hotplug_libhal.c,
+	  src/pcscdaemon.c, src/readerfactory.c: Add --disable-serial and
+	  --disable-usb options
+	  
+	  --disable-serial removes support of /etc/reader.conf gain: 8.0kB
+	  of .text (12%) and 160 bytes of .bss (4%) for pcscd
+	  
+	  --disable-usb removes support of USB hotplug gain: 9.7kB of .text
+	  (14%) and 960 bytes of .bss (23%) for pcscd
+	  
+	  If you use both options (and use a static driver configuration)
+	  gain: 17.7kB of .text (26%) and 1152 bytes of .bss (28%) for
+	  pcscd
+	* [r4900] src/error.c: Define a minimal pcsc_stringify_error() if
+	  NO_LOG is defined. Only the error code in hex is displayed in
+	  this case.
+	  
+	  Gain: 2kB of .text (10%) for libpcsclite
+	* [r4899] src/pcscdaemon.c: main(): fork() only in case of auto
+	  exit to not detach from the terminal if launched in stand alone
+	  forground mode ("pcscd -fda" for example)
+
[phone]  Ludovic Rousseau
+
+	* [r4889] src/pcscdaemon.c: main(): always fork() so that pcscd
+	  always return in --auto-exit mode but do not close stdout yet
+	  since we may need to send logs
+	* [r4888] src/winscard_clnt.c: SCardEstablishContext(): call
+	  waitpid() to avoid having a defunct pcscd process when pcscd is
+	  auto started by the client.
+	  
+	  The process becomes defunct because pcscd calls daemon() and
+	  daemon() does fork() and exit() in the father. The father death
+	  must then be reclaimed by libpcsclite.
+	  
+	  Thanks to Patrice Angelini for the bug report
+
[phone]  Ludovic Rousseau
+
+	* [r4885] src/Makefile.am, src/eventhandler.c,
+	  src/hotplug_libhal.c, src/hotplug_libusb.c, src/hotplug_linux.c,
+	  src/ifdwrapper.c, src/pcscdaemon.c, src/readerfactory.c,
+	  src/readerfactory.h, src/thread_generic.h, src/thread_unix.c,
+	  src/winscard.c, src/winscard_clnt.c, src/winscard_svc.c: Directly
+	  use pthread_mutex_* fucntions instead of using wrappers Remove
+	  thread_unix.c and thread_generic.h now useless
+	* [r4884] src/hotplug_libhal.c, src/hotplug_libusb.c,
+	  src/hotplug_linux.c, src/hotplug_macosx.c, src/readerfactory.h,
+	  src/utils.c, src/winscard_svc.c: Use pthread_t instead of
+	  PCSCLITE_THREAD_T
+	* [r4883] src/thread_generic.h, src/utils.h: move thread related
+	  definition from thread_generic.h to utils.h
+	* [r4882] src/eventhandler.c, src/hotplug_libhal.c,
+	  src/hotplug_libusb.c, src/hotplug_linux.c, src/hotplug_macosx.c,
+	  src/thread_generic.h, src/thread_unix.c, src/utils.c,
+	  src/utils.h, src/winscard_svc.c: Directly use pthread_* instead
+	  of SYS_Thread* indirection
+	  
+	  Move SYS_ThreadCreate in utils.c. This function is not just one
+	  pthread_* call
+
[phone]  Ludovic Rousseau
+
+	* [r4877] src/thread_unix.c: SYS_ThreadExit(): remove dead code
+	  
+	  From Sun Studio CC "thread_unix.c", line 108: warning: statement
+	  not reached
+	* [r4875] bootstrap: update versions of autotools used
+
[phone]  Ludovic Rousseau
+
+	* [r4874] src/simclist.c: remove ; at end of a { } block defined by
+	  a macro. The Solaris compiler complains with: "simclist.c", line
+	  1317: warning: syntax error: empty declaration
+	  
+	  Thanks to Jörg Schilling for the bug report
+	* [r4873] src/sys_unix.c: use fork(), close() and chdir() instead
+	  of SYS_Fork(), SYS_CloseFile() and SYS_Chdir() in SYS_Daemon() if
+	  HAVE_DAEMON is not defined (Solaris)
+	  
+	  Thanks to Jörg Schilling for the bug report
+
[phone]  Ludovic Rousseau
+
+	* [r4867] src/winscard_svc.c: Log the command return code using
+	  DEBUG (SCARD_S_SUCCESS) or ERROR (every thing else) level
+
[phone]  Ludovic Rousseau
+
+	* [r4866] UnitaryTests/reset_card.py: reset a card using
+	  SCardDisconnect (default) or SCardReconnect (if an argument is
+	  passed)
+	* [r4865] UnitaryTests/transmit_loop.py: call SCardTransmit in an
+	  endless loop
+	* [r4864] src/winscard.c: SCardReconnect(): mimic the code from
+	  SCardDisconnect() regarding card event state notifications
+	  (changed in revision 4862).
+	* [r4863] UnitaryTests/Makefile: no more pcsc_demo target
+	* [r4862] src/winscard.c: SCardDisconnect(): Set the card event
+	  state to SCARD_RESET _before_ doing the reset.
+	  
+	  This will avoid an SCardTransmit from another application between
+	  the card reset and the card event state change. In the
+	  problematic case the SCardTransmit was sending an APDU in T=1 to
+	  a reseted card but not yet configured (IFDHSetProtocolParameters
+	  was not yet called) and still in T=0 (default)
+	* [r4861] src/winscard.c: SCardConnect() & SCardReconnect():
+	  correctly log SCARD_PROTOCOL_RAW protocol instead of "unknown"
+
[phone]  Ludovic Rousseau
+
+	* [r4859] src/winscard_msg.c, src/winscard_msg_srv.c: Fix copyright
+	  name and date
+	* [r4858] src/winscard_msg.c: Doxygen: document SHMMessageReceive()
+	  command argument added in revision 4718
+	* [r4857] src/winscard_clnt.c: Doxygen:
+	  SCARD_ATTR_DEVICE_FRIENDLY_NAME is implemented by
+	  SCardGetAttrib() if the IFD Handler (driver) returns
+	  IFD_ERROR_TAG. pcsc-lite then returns the same reader name as
+	  returned by SCardListReaders.
+
[phone]  Ludovic Rousseau
+
+	* [r4851] src/PCSC/reader.h.in: Add PCSCv2_PART10_PROPERTY_*
+	  defines
+
[phone]  Ludovic Rousseau
+
+	* [r4845] src/winscard_clnt.c: SCardEstablishContext(): try to
+	  relaunch pcscd if SCardCheckDaemonAvailability() succeeds but
+	  SCardEstablishContextTH() fails. This happens if pcscd crashed
+	  without cleaning /var/run/pcscd/pcscd.comm
+
[phone]  Ludovic Rousseau
+
+	* [r4843] src/PCSC/reader.h.in: add FEATURE_GET_TLV_PROPERTIES and
+	  FEATURE_CCID_ESC_COMMAND from PC/SC part 10 v2.02.07 March 2010
+
[phone]  Ludovic Rousseau
+
+	* [r4839] src/pcscdaemon.c: Call at_exit() instead of exit() since
+	  the libC of Android is bogus and atexit() does not work as it
+	  should.
+	  
+	  Thanks to Patrice Angelini for the bug report.
+	* [r4838] src/winscard_clnt.c: SCardCheckDaemonAvailability(): use
+	  stat(2) instead of the now removed SYS_Stat()
+
[phone]  Ludovic Rousseau
+
+	* [r4836] src/configfile.l, src/pcscdaemon.c, src/sys_generic.h,
+	  src/sys_unix.c, src/winscard_msg.c, src/winscard_msg_srv.c,
+	  src/winscard_svc.c: Remove the one line wrappers from sys_unix.c
+	  and use directly the POSIX functions instead.
+
[phone]  Ludovic Rousseau
+
+	* [r4825] src/Makefile.am: Install pcscd as suid so that autostart
+	  works correctly (as root)
+	* [r4824] TODO: done: remove as much text messages (logs) as
+	  possible
+	* [r4823] configure.in: Display PCSCLITE_FEATURES
+	* [r4822] configure.in: Add --enable-embedded (default is no) to
+	  build pcsc-lite for an embedded system. This will activate the
+	  NO_LOG option to disable logging and limit RAM and disk
+	  consumption.
+	* [r4821] src/PCSC/debuglog.h, src/debug.c, src/debuglog.c,
+	  src/hotplug_libhal.c, src/winscard_svc.c: If NO_LOG is defined
+	  then no log are displayed. The idea is to limit the binaries size
+	  on disk and RAM consumption at execution time.
+	  
+	  With NO_LOG defined we gain 26% (17 kB) for the .text segment of
+	  pcscd and 15% (4 kB) for the .text segment of libpcsclite.so (for
+	  i386)
+	* [r4820] src/utils.c: Include config.h before the other header
+	  files so the configuration set in config.h can be used in the
+	  other header files (NO_LOG for example)
+	* [r4819] src/configfile.l: Include config.h before the other
+	  header files so the configuration set in config.h can be used in
+	  the other header files (NO_LOG for example)
+	* [r4818] src/Makefile.am, src/debug.c, src/debug.h,
+	  src/dyn_hpux.c, src/dyn_macosx.c, src/dyn_unix.c, src/sys_unix.c,
+	  src/tokenparser.l, src/utils.c, src/winscard_clnt.c,
+	  src/winscard_msg.c: Remove debug.h and use debuglog.h instead.
+	  They both define the same log API.
+
[phone]  Ludovic Rousseau
+
+	* [r4813] UnitaryTests/ThreadSafe.py,
+	  UnitaryTests/ThreadSafeConnect.py: revert change in revision 4812
+	  since the problem is now solved in pyscard (revision 382)
+	* [r4812] UnitaryTests/ThreadSafe.py,
+	  UnitaryTests/ThreadSafeConnect.py: do not initialise the library
+	  in a thread as it crashed on Mac OS X
+
[phone]  Ludovic Rousseau
+
+	* [r4809] src/winscard_svc.c: read only accesses to contextsList
+	  list shall also be protected by a mutex
+	* [r4808] src/readerfactory.c: read only accesses to handlesList
+	  list shall also be protected by a mutex
+	* [r4807] src/readerfactory.c, src/readerfactory.h: manipulations
+	  of handlesList field of ReaderContext should now be thread safe
+	* [r4806] src/winscard_svc.c: MSGRemoveContext(): correctly indent
+	  a line
+	* [r4805] src/winscard_svc.c: manipulations of cardsList should now
+	  be thread safe
+	* [r4804] src/winscard_svc.c: remove extra tab
+	* [r4803] UnitaryTests/ThreadSafeConnect.py: add more logging
+	* [r4802] UnitaryTests/ThreadSafeConnect.py: stress thread safeness
+	  of SCardConnect/SCardDisconnect
+	* [r4801] src/winscard_svc.c: manipulations of contextsList should
+	  now be thread safe
+	* [r4800] UnitaryTests/ThreadSafe.py: stress thread safeness
+
[phone]  Ludovic Rousseau
+
+	* [r4793] UnitaryTests/SCardBlockingBehaviourTest.py,
+	  UnitaryTests/SCardExclusiveBehaviour.py: make pylint happier
+	* [r4792] UnitaryTests/MCT_ReaderDirect.py: make pylint happier
+	* [r4791] UnitaryTests/control_get_firmware.py: make pylint happy
+	* [r4790] UnitaryTests/control_get_firmware.py: remove useless
+	  import
+	* [r4789] UnitaryTests/MCT_ReaderDirect.py,
+	  UnitaryTests/control_get_firmware.py,
+	  UnitaryTests/control_switch_interface.py: use list comprehension
+	  instead of map() (more efficient and pylint does not like map())
+
[phone]  Ludovic Rousseau
+
+	* [r4788] UnitaryTests/control_switch_interface.py: make pylint
+	  happier
+
[phone]  Ludovic Rousseau
+
+	* [r4784] src/debuglog.c: debuglog.c is only used by pcscd. So no
+	  need to use #ifdef PCSCD
+
[phone]  Ludovic Rousseau
+
+	* [r4783] TODO: fix typo
+
[phone]  Ludovic Rousseau
+
+	* [r4779] configure.in, doc/Makefile.am,
+	  doc/update-reader.conf.8.in, etc/Makefile.am,
+	  etc/update-reader.conf.in, src/configfile.h, src/configfile.l,
+	  src/readerfactory.c: Add the ability to parse all the
+	  configuration files of a directory instead of just one
+	  configuration file. update-reader.conf is then now obsolete.
+	  
+	  See Debian bug #565896 http://bugs.debian.org/565896
+
[phone]  Ludovic Rousseau
+
+	* [r4778] src/pcscdaemon.c: update copyright
+
[phone]  Ludovic Rousseau
+
+	* [r4769] src/winscard_clnt.c: SCardEstablishContextTH() &
+	  SCardGetStatusChange(): completly initialize structures sent to
+	  the daemon to avoid a valgrind warning: Syscall param
+	  socketcall.send(msg) points to uninitialised byte(s)
+	* [r4768] UnitaryTests/SCardBlockingBehaviourTest.py: As of
+	  revision r4719 Linux is now Windows "compatible"
+
[phone]  Ludovic Rousseau
+
+	* [r4766] src/misc.h: " The gcc on Solaris 10 combined with the Sun
+	  loader appears to not handle the gcc visibility attribute
+	  correctly. The sparc version says it is ignored, the x86 version
+	  gives linker error. The attached patch sun.gcc.1.5.6-svn-477.txt
+	  tries to test for gcc on Sun and not use the visibility
+	  attribute. If on a sun and the compiler is not GCC, try and use
+	  the Sun __global and __hidden instead. (I did not try the Sun
+	  Studio compiler with this.) "
+	  
+	  Thanks to Douglas E. Engert for the patch
+	  http://archives.neohapsis.com/archives/dev/muscle/2010-q1/0127.html
+	* [r4765] doc/pcscd.8.in: use @sysconfdir_exp@ instead of (removed)
+	  @confdir@
+
[phone]  Ludovic Rousseau
+
+	* [r4758] src/readerfactory.c: RFStartSerialReaders(): typo in
+	  comment
+	* [r4756] src/configfile.l, src/tokenparser.l: Fix 2 compilation
+	  warnings
+	  
+	  configfile.c:1151: warning: ‘input’ defined but not used
+	  tokenparser.c:1167: warning: ‘input’ defined but not used
+	* [r4755] src/lassert.h: Fix splint error
+	  src/pcsc-wirecheck-dist.c:19:164: Body of if clause of if
+	  statement is empty
+	* [r4754] src/hotplug_libhal.c: HPAddDevice(): fix a memory leak
+	* [r4753] src/readerfactory.c: RFRemoveReader(): simplify/factorise
+	  the resources deallocation
+
[phone]  Ludovic Rousseau
+
+	* [r4751] etc/update-reader.conf.in: use @sysconfdir@ instead of
+	  (the now removed) @confdir@
+	  
+	  Thanks to Sébastien Lorquet for the bug report
+	  http://archives.neohapsis.com/archives/dev/muscle/2010-q1/0098.html
+
[phone]  Ludovic Rousseau
+
+	* [r4744] src/readerfactory.c, src/readerfactory.h: use a dynamic
+	  instead of static allocation for lpcDevice
+	* [r4743] src/readerfactory.c: RFAddReader(): allocate an int
+	  instead of a DWORD for pFeeds
+	  
+	  The patch in revision 4741 was not complete
+	* [r4742] src/readerfactory.c, src/readerfactory.h: In struct
+	  ReaderContext rename pdwMutex to pMutex and change type from
+	  PDWORD to int *
+	* [r4741] src/readerfactory.c, src/readerfactory.h: In struct
+	  ReaderContext rename pdwFeeds to pFeeds and change type from
+	  PDWORD to int *
+	* [r4740] src/readerfactory.c, src/readerfactory.h: In struct
+	  ReaderContext remove the now useless dwBlockStatus field
+	* [r4739] src/eventhandler.c, src/ifdwrapper.c,
+	  src/readerfactory.c, src/readerfactory.h, src/winscard.c: In
+	  struct ReaderContext rename dwSlot to slot and change type from
+	  DWORD to int
+	* [r4738] src/ifdwrapper.c, src/readerfactory.c,
+	  src/readerfactory.h, src/winscard.c: In struct ReaderContext
+	  rename dwVersion to version and change type from DWORD to int
+	* [r4737] src/ifdwrapper.c, src/readerfactory.c,
+	  src/readerfactory.h: In struct ReaderContext change dwPort from
+	  DWORD to int and rename it to port
+	  
+	  Fix a compiler warning readerfactory.c: In function
+	  ‘RFReCheckReaderConf’: readerfactory.c:1393: warning: comparison
+	  between signed and unsigned
+	* [r4736] src/tokenparser.l: Fix compiler warning
+	  
+	  tokenparser.l: In function ‘tperrorCheck’: tokenparser.l:102:
+	  warning: unused parameter ‘token_error’
+	* [r4735] src/configfile.l, src/readerfactory.c,
+	  src/readerfactory.h: In struct SerialReader rename dwChannelId in
+	  channelId since it is an int and no more a DWORD
+	* [r4734] src/eventhandler.c: Fix a compiler warning
+	  
+	  eventhandler.c: In function ‘EHStatusHandlerThread’:
+	  eventhandler.c:494: warning: comparison between signed and
+	  unsigned
+	* [r4733] src/winscard_clnt.c: do not use the uint32_t rv structure
+	  field but copy it into rv first to avoid a compiler warning
+	  
+	  winscard_clnt.c: In function ?SCardReconnect?:
+	  winscard_clnt.c:1035: warning: comparison between signed and
+	  unsigned winscard_clnt.c: In function ?SCardBeginTransaction?:
+	  winscard_clnt.c:1254: warning: comparison between signed and
+	  unsigned winscard_clnt.c: In function ?SCardStatus?:
+	  winscard_clnt.c:1657: warning: comparison between signed and
+	  unsigned winscard_clnt.c: In function ?SCardTransmit?:
+	  winscard_clnt.c:2939: warning: comparison between signed and
+	  unsigned
+	* [r4732] src/PCSC/pcsclite.h.in: force the return codes SCARD_* to
+	  be long since the SCard* functions return a LONG type
+	* [r4731] src/eventhandler.c, src/readerfactory.c,
+	  src/readerfactory.h, src/winscard.c, src/winscard_svc.c: In
+	  struct ReaderContext dwLockId is used to store a SCARDHANDLE so
+	  change its type from DWORD to SCARDHANDLE and rename the field to
+	  hLockId
+	  
+	  Fix 2 compiler warning: winscard.c: In function
+	  'SCardDisconnect': winscard.c:847: warning: comparison between
+	  signed and unsigned winscard_svc.c: In function
+	  'MSGRemoveContext': winscard_svc.c:807: warning: comparison
+	  between signed and unsigned
+	* [r4730] src/winscard_msg.c: fix a compilation warning
+	  
+	  winscard_msg.c: In function ‘SHMMessageReceive’:
+	  winscard_msg.c:252: warning: unused parameter ‘command’
+	* [r4729] src/winscard_svc.c: fix 2 compilation warnings
+	  
+	  winscard_svc.c: In function ‘MSGRemoveContext’:
+	  winscard_svc.c:776: warning: comparison between signed and
+	  unsigned winscard_svc.c: In function ‘MSGAddHandle’:
+	  winscard_svc.c:848: warning: comparison between signed and
+	  unsigned
+	* [r4728] src/eventhandler.h, src/winscard_clnt.c: Use READER_STATE
+	  * instead of PREADER_STATE to make it explicit it is a pointer
+	* [r4727] src/eventhandler.c, src/eventhandler.h, src/ifdwrapper.c,
+	  src/ifdwrapper.h, src/readerfactory.c, src/readerfactory.h,
+	  src/winscard.c, src/winscard_svc.c: Use READER_CONTEXT * instead
+	  of PREADER_CONTEXT to make it explicit it is a pointer
+	* [r4726] src/readerfactory.c: Fix a compilation warning
+	  
+	  readerfactory.c: In function ‘RFAddReaderHandle’:
+	  readerfactory.c:1125: warning: comparison between signed and
+	  unsigned
+	* [r4725] src/eventhandler.c, src/readerfactory.c,
+	  src/readerfactory.h, src/winscard.c: In struct ReaderContext
+	  rename "dwContexts" to "contexts" since it is no more a DWORD but
+	  a int32_t
+	* [r4724] src/winscard_clnt.c: Fix a compilation warning
+	  
+	  winscard_clnt.c: In function ‘SCardListReaderGroups’:
+	  winscard_clnt.c:3258: warning: comparison between signed and
+	  unsigned
+	* [r4723] src/pcscd.h.in, src/readerfactory.c, src/readerfactory.h:
+	  Use dynamic instead of static allocation for the driver library
+	  filename. The filename is no more limited to 100 characters.
+	  
+	  Closes: [#312332] MAX_LIBNAME too short?
+	* [r4722] src/pcscdaemon.c, src/winscard_svc.c, src/winscard_svc.h:
+	  use int instead of unsigned int for customMaxThreadCounter,
+	  customMaxReaderHandles and customMaxThreadCardHandles since
+	  list_size() returns an int and we compare the two values (avoid
+	  sign mismatch)
+	* [r4721] src/winscard_svc.c: fix 2 compilation warnings
+	  
+	  winscard_svc.c: In function ‘CreateContextThread’:
+	  winscard_svc.c:146: warning: comparison between signed and
+	  unsigned winscard_svc.c: In function ‘MSGAddHandle’:
+	  winscard_svc.c:856: warning: comparison between signed and
+	  unsigned
+
[phone]  Ludovic Rousseau
+
+	* [r4720] src/winscard_clnt.c: SCardGetStatusChange(): fix 4
+	  compilation warnings
+	  
+	  winscard_clnt.c: In function ‘SCardGetStatusChange’:
+	  winscard_clnt.c:1864: warning: comparison between signed and
+	  unsigned winscard_clnt.c:1875: warning: comparison between signed
+	  and unsigned winscard_clnt.c:1911: warning: comparison between
+	  signed and unsigned winscard_clnt.c:2189: warning: comparison
+	  between signed and unsigned
+	* [r4719] src/winscard_clnt.c: Make SCardReconnect(), SCardStatus()
+	  and SCardTransmit() block instead of returning
+	  SCARD_E_SHARING_VIOLATION immediately. These functions will then
+	  behave like on Windows.
+	  
+	  This can happen if these functions are called when the reader is
+	  locked by a PCSC transaction
+	  (SCardBeginTransaction/SCardEndTransaction).
+	  
+	  You can define the environment variable PCSCLITE_NO_BLOCKING to
+	  use the old behavior.
+	  
+	  Thanks to Jean-Luc Giraud for the patch.
+	  http://archives.neohapsis.com/archives/dev/muscle/2010-q1/0041.html
+	* [r4718] src/winscard_clnt.c, src/winscard_msg.c,
+	  src/winscard_msg.h, src/winscard_svc.c: add a command parameter
+	  to SHMMessageReceive() to be able log the ongoing command in case
+	  of problem
+
[phone]  Ludovic Rousseau
+
+	* [r4717] UnitaryTests/SCardExclusiveBehaviour.py: Check the return
+	  value of SCardConnect() on a reader already used in
+	  SCARD_SHARE_EXCLUSIVE mode
+	* [r4716] src/winscard.c: fix a bug introduced by the previous
+	  revision
+	* [r4715] src/winscard.c: SCardGetAttrib(): check for buffer
+	  overflow with SCARD_ATTR_DEVICE_FRIENDLY_NAME
+	  
+	  Thanks to Jean-Luc Giraud for complete
+	  SCARD_ATTR_DEVICE_FRIENDLY_NAME patch
+
[phone]  Ludovic Rousseau
+
+	* [r4710] src/PCSC/pcsclite.h.in, src/winscard_clnt.c: add a
+	  copyright for Martin Paljak
+
[phone]  Ludovic Rousseau
+
+	* [r4708] configure.in, src/pcscd.h.in: Use the standard
+	  --sysconfdir=DIR ($prefix/etc by default) instead of
+	  --enable-confdir=DIR for defining the directory containing
+	  reader.conf
+	* [r4707] configure.in: sysconfdir_exp is a configuration directory
+	  not configuration file
+
[phone]  Ludovic Rousseau
+
+	* [r4705] src/winscard.c: SCardStatus(): returns
+	  SCARD_E_SHARING_VIOLATION if the reader is already used More
+	  conform to Windows
+	* [r4704] UnitaryTests/SCardBlockingBehaviourTest.py: allow to use
+	  any reader and not just the first one
+	* [r4703] src/testpcsc.c: test SCARD_ATTR_DEVICE_FRIENDLY_NAME
+	* [r4702] src/winscard.c: SCardGetAttrib(): add support of
+	  SCARD_ATTR_DEVICE_FRIENDLY_NAME as it is better implemented in
+	  pcscd (it knows the friendly name)
+	* [r4701] src/winscard_clnt.c: SCardEstablishContext(): set
+	  PCSCLITE_PCSCD_ARGS with the argument you want to pass to pcscd
+	  in autostart Only one argument is passed. The space character is
+	  not a separator. example: export PCSCLITE_PCSCD_ARGS=-dfa
+	* [r4700] src/pcscd.h.in, src/pcscdaemon.c, src/winscard_clnt.c,
+	  src/winscard_svc.c: pcscd will suicide itself after 60 seconds of
+	  inactivity if it is started using --auto-exit This is the default
+	  behavior when pcscd is started by libpcsclite
+	* [r4699] src/pcscdaemon.c: do not ignore the SIGALRM signal any
+	  more since we need it for the auto exit feature
+
[phone]  Ludovic Rousseau
+
+	* [r4685] configure.in: add $host to the PCSCLITE_FEATURES
+	  definition (available with "pcscd -v") to display the CPU
+	  architecture host is something like x86_64-unknown-linux-gnu
+	* [r4683] configure.in: use LT_INIT(disable-static) instead of the
+	  deprecated AM_DISABLE_STATIC
+	  
+	  Thanks to Roumen Petrov
+
[phone]  Ludovic Rousseau
+
+	* [r4682] UnitaryTests/MCT_ReaderDirect.py,
+	  UnitaryTests/control_get_firmware.py,
+	  UnitaryTests/control_switch_interface.py: do not try to reset the
+	  card on exit. We are talking to the reader. A card may NOT be
+	  present.
+	* [r4681] configure.in, src/Makefile.am: Do not completely disable
+	  building the static version of the library but just disable it by
+	  default
+	  
+	  Use AM_DISABLE_STATIC in configure.in instead of -shared in
+	  Makefile.am
+
[phone]  Ludovic Rousseau
+
+	* [r4674] UnitaryTests/SCardBlockingBehaviourTest.py: Check the
+	  behavior of PCSC functions when a PCSC transaction is ongoing
+	  
+	  Thanks to Jean-Luc Giraud for the original code
+	* [r4673] src/Makefile.am: use -shared to only provide a shared
+	  library. If you need to use the static .a library you just need
+	  to remove -shared
+
[phone]  Ludovic Rousseau
+
+	* [r4672] UnitaryTests/control_switch_interface.py: parse error
+	  code
+	* [r4671] UnitaryTests/control_switch_interface.py: improve
+	  documentation and output
+	* [r4670] src/winscard_clnt.c: Only call SCardCheckSameProcess() if
+	  DO_CHECK_SAME_PROCESS is defined (default is not defined).
+	  
+	  Some thread libraries (on embedded systems for example) have a
+	  different pid for each thread of a same process. So the check
+	  using getpid() is wrong and handles are invalidated when they
+	  should not. The PC/SC function returned SCARD_E_INVALID_HANDLE
+	* [r4669] src/winscard_clnt.c: define and use the
+	  CHECK_SAME_PROCESS macro instead of calling
+	  SCardCheckSameProcess() directly
+
[phone]  Ludovic Rousseau
+
+	* [r4668] src/winscard_clnt.c: Doxygen: update
+	  SCardGetStatusChange() doc. The function returns on any events,
+	  not just those specified in dwCurrentState
+	* [r4667] TODO: For embedded/constained systems
+	  
+	  - remove as much text messages (logs) as possible to limit the
+	  size of the binaries (pcscd and libpcsclite)
+	  
+	  - use static driver instead of reader polling and dynamic driver
+	  loading
+
[phone]  Ludovic Rousseau
+
+	* [r4646] src/readerfactory.c: RFInitializeReader(): do not
+	  dynamically load the driver if PCSCLITE_STATIC_DRIVER is defined
+	* [r4645] src/ifdwrapper.c: better support of
+	  PCSCLITE_STATIC_DRIVER.
+	  
+	  This is used to statically link the reader driver to pcscd. Since
+	  the link is static you must define the IFDHandler API version at
+	  compilation time. Either define IFDHANDLERv1, IFDHANDLERv2 or
+	  IFDHANDLERv3
+	* [r4644] src/dyn_unix.c: fix a warning when compiling with
+	  PCSCLITE_STATIC_DRIVER defined
+	  
+	  dyn_unix.c: In function ‘DYN_CloseLibrary’: dyn_unix.c:47:
+	  warning: unused variable ‘ret’
+
[phone]  Ludovic Rousseau
+
+	* [r4635] src/hotplug_macosx.c: hotplug_macosx.c: In function
+	  ‘HPDeviceAppeared’: hotplug_macosx.c:70: warning: unused
+	  parameter ‘refCon’ hotplug_macosx.c: In function
+	  ‘HPDeviceDisappeared’: hotplug_macosx.c:85: warning: unused
+	  parameter ‘refCon’
+
[phone]  Ludovic Rousseau
+
+	* [r4634] src/simclist.c: fix a compilation warning
+	  simclist.c:1335: warning: unused parameter ‘el’
+	* [r4633] src/error.c: pcsc_stringify_error(): spelling error
+	  (detected by lintian(1))
+
[phone]  Ludovic Rousseau
+
+	* [r4630] src/ifdwrapper.c: add #include <unistd.h> to declare the
+	  timeval structure
+	  
+	  In file included from ifdwrapper.c:31: utils.h:26: warning:
+	  ‘struct timeval’ declared inside parameter list utils.h:26:
+	  warning: its scope is only this definition or declaration, which
+	  is probably not what you want
+	* [r4629] src/dyn_unix.c, src/ifdwrapper.c, src/pcscdaemon.c:
+	  better handling of PCSCLITE_STATIC_DRIVER as can be used on
+	  plateforms using µClinux (without dynamic loader)
+	  
+	  Thanks to Guo Wenxue for a proto-patch
+	* [r4628] src/hotplug_generic.c, src/hotplug_linux.c,
+	  src/hotplug_macosx.c: ReCheckSerialReaders variable is not used
+	  anymore
+	* [r4627] src/winscard_msg_srv.c: ReCheckSerialReaders variable
+	  from hotplug_* is not used anymore
+
[phone]  Ludovic Rousseau
+
+	* [r4621] src/winscard_svc.c: typo in log message
+
[phone]  Ludovic Rousseau
+
+	* [r4616] src/atrhandler.c: ATRDecodeAtr(): reformat
+	* [r4615] src/atrhandler.c: ATRDecodeAtr(): check for TA2 (specific
+	  mode) even if TD2 is not present "3F 80 10 01" was not parsed
+	  correctly for example and T=0 was used instead of T=1 (specific
+	  mode)
+	* [r4613] UnitaryTests/MCT_ReaderDirect.py: rename
+	  FEATURE_MCT_READERDIRECT in FEATURE_MCT_READER_DIRECT
+	* [r4612] src/PCSC/reader.h.in: rename FEATURE_MCT_READERDIRECT in
+	  FEATURE_MCT_READER_DIRECT to be conform with ch. 2.3 of PCSC v2
+	  part 10
+
[phone]  Ludovic Rousseau
+
+	* [r4611] UnitaryTests/SCard_fork.py: Unitary Test for fork()
+	  detection
+
[phone]  Ludovic Rousseau
+
+	* [r4608] src/winscard_clnt.c: Doxygen: add missing error codes
+	* [r4607] src/winscard_svc.c: ContextThread(): SCARD_CANCEL return
+	  SCARD_E_INVALID_HANDLE instead of SCARD_E_INVALID_VALUE if the
+	  handle is invalid
+	* [r4606] src/winscard_clnt.c: Doxygen: document 2 missing
+	  SCARD_F_COMM_ERROR possible return values
+	* [r4605] src/winscard_clnt.c: Doxygen: document 3 missing error
+	  codes for SCardConnect()
+	* [r4604] src/PCSC/pcsclite.h.in: reformat
+	* [r4603] src/winscard_clnt.c: use sizeof(SCARD_IO_REQUEST) instead
+	  of 8 for the .cbPciLength field This is the correct value on
+	  64-bit system.
+	* [r4602] src/pcscdaemon.c, src/winscard.c: g_rgSCard*Pci are not
+	  used on the server side
+	* [r4601] src/pcscdaemon.c: SIGHUP signal has already been set to
+	  SIG_IGN. No need to quit on SIGHUP.
+	* [r4600] src/pcscdaemon.c: revert revision 4599 and remove the
+	  second call to signal() instead of the first one. We need to
+	  clean-up as soon as we created the files.
+	* [r4599] src/pcscdaemon.c: remove duplicate calls to signal()
+
[phone]  Ludovic Rousseau
+
+	* [r4587] src/winscard_clnt.c: Doxygen: SCardConnect() value 0 for
+	  dwPreferredProtocols valid only if dwShareMode is
+	  SCARD_SHARE_DIRECT
+	* [r4585] src/winscard_clnt.c: use the more efficient
+	  SCardCheckSameProcess() instead of SCardCheckDaemonAvailability()
+	  to detect use of the API after a fork()
+
[phone]  Ludovic Rousseau
+
+	* [r4583] src/winscard_clnt.c: Doxygen: SCardEstablishContext()
+	  Each thread of an application shall use its own SCARDCONTEXT. On
+	  Windows the same SCARDCONTEXT can be shared by different threads
+	  of same application.
+
[phone]  Ludovic Rousseau
+
+	* [r4580] src/winscard_clnt.c: SCardEstablishContext(): try to
+	  start the pcscd daemon if not already running
+	* [r4579] configure.in: define PCSCD_BINARY
+	* [r4577] src/pcscdaemon.c: improve the checking of an already
+	  running pcscd
+	* [r4576] src/winscard_clnt.c: Doxygen: For historical reasons the
+	  value of SCARD_E_UNSUPPORTED_FEATURE is 0x8010001F in pcsc-lite
+	  but 0x80100022 in Windows WinSCard
+	* [r4575] src/PCSC/pcsclite.h.in: SCARD_E_UNSUPPORTED_FEATURE is
+	  not a PC/SC Lite specific extension, but its numerical value is
+	  different on Windows
+
[phone]  Ludovic Rousseau
+
+	* [r4574] src/PCSC/pcsclite.h.in, src/error.c: remove pcsc-lite
+	  specific SCARD_W_INSERTED_CARD code
+	  
+	  SCARD_W_INSERTED_CARD value 0x8010006A was also in collision with
+	  SCARD_W_SECURITY_VIOLATION
+	* [r4573] src/error.c: reorder error codes
+
[phone]  Ludovic Rousseau
+
+	* [r4570] src/winscard_clnt.c: do not declare the SCardUnload()
+	  function removed in revision 4435
+	* [r4569] src/winscard_clnt.c: create a SCardInvalidateHandles()
+	  function from SCardCheckDaemonAvailability() code
+	* [r4568] src/winscard_clnt.c: SCardCheckDaemonAvailability(): do
+	  not delete the context since it is already done by
+	  SCardCleanContext()
+	* [r4567] src/winscard_clnt.c: SCardCleanContext(): deallocate the
+	  context memory
+
[phone]  Ludovic Rousseau
+
+	* [r4566] src/winscard_clnt.c: Doxygen: update SCardControl() list
+	  of possible error codes partly revert revision 4558
+	  
+	  Thanks to Martin Paljak for the bug report
+	  http://archives.neohapsis.com/archives/dev/muscle/2009-q4/0079.html
+
[phone]  Ludovic Rousseau
+
+	* [r4562] src/eventhandler.c, src/readerfactory.c,
+	  src/winscard_clnt.c, src/winscard_svc.c: use list_delete()
+	  instead of list_locate() + list_delete_at()
+	* [r4561] src/simclist.c, src/simclist.h: add list_delete()
+	  "expunge the first found given element from the list"
+
[phone]  Ludovic Rousseau
+
+	* [r4560] UnitaryTests/MCT_ReaderDirect.py,
+	  UnitaryTests/SCardBeginTransaction_Disconnect.py,
+	  UnitaryTests/SCardCancel.py, UnitaryTests/SCardConnect_DIRECT.py,
+	  UnitaryTests/SCardGetStatusChange/SCardGetStatusChange.py,
+	  UnitaryTests/SCardGetStatusChange/SCardGetStatusChange_PnP.py,
+	  UnitaryTests/SCardReconnect.py,
+	  UnitaryTests/control_get_firmware.py,
+	  UnitaryTests/control_switch_interface.py: reformat to make
+	  pep8(1) happy
+	* [r4559] src/winscard_clnt.c: Doxygen improvement
+	* [r4558] src/winscard_clnt.c: Doxygen: update SCardControl() list
+	  of possible error codes
+	* [r4554] src/readerfactory.c, src/winscard_clnt.c,
+	  src/winscard_svc.c: add Jean-Luc Giraud in copyright holders
+	  because of his patch in revision 4553
+
[phone]  Ludovic Rousseau
+
+	* [r4553] src/Makefile.am, src/pcscd.h.in, src/pcscdaemon.c,
+	  src/readerfactory.c, src/readerfactory.h, src/winscard_clnt.c,
+	  src/winscard_svc.c, src/winscard_svc.h: Use lists instead of
+	  fixed size arrays to store handles.
+	  
+	  It is now possible to have: - 200 simultaneous PC/SC clients
+	  instead of 16 - 200 SCardConnect per client instead of 16 - 200
+	  clients per reader instead of 16
+	  
+	  The default value of 200 can be changed by giving an argument to
+	  pcscd --max-thread --max-card-handle-per-thread
+	  --max-card-handle-per-reader
+	  
+	  Thanks to Jean-Luc Giraud for the big patch
+	* [r4552] src/readerfactory.c: RFCreateReaderHandle(): add a
+	  comment that a 16-bit random is not secure enough
+
[phone]  Ludovic Rousseau
+
+	* [r4549] UnitaryTests/SCardReconnect.py: SCardReconnect() should
+	  block instead of returning SCARD_E_SHARING_VIOLATION
+	* [r4548] UnitaryTests/SCardConnect_DIRECT.py: typo in text
+	* [r4547] src/winscard_svc.c: remove printf() for debug from
+	  READ_BODY() macro
+
[phone]  Ludovic Rousseau
+
+	* [r4544] UnitaryTests/BufferOverflow.c, src/PCSC/ifdhandler.h,
+	  src/PCSC/pcsclite.h.in, src/PCSC/reader.h.in,
+	  src/PCSC/winscard.h, src/PCSC/wintypes.h, src/atrhandler.c,
+	  src/atrhandler.h, src/configfile.h, src/configfile.l,
+	  src/debug.c, src/debug.h, src/debuglog.c, src/dyn_generic.h,
+	  src/dyn_hpux.c, src/dyn_unix.c, src/error.c, src/eventhandler.c,
+	  src/eventhandler.h, src/hotplug.h, src/hotplug_libhal.c,
+	  src/hotplug_libusb.c, src/hotplug_linux.c, src/ifdwrapper.c,
+	  src/ifdwrapper.h, src/lassert.h, src/misc.h, src/parser.h,
+	  src/pcsc-wirecheck-gen.c, src/pcscd.h.in, src/pcscdaemon.c,
+	  src/powermgt_generic.c, src/readerfactory.c, src/readerfactory.h,
+	  src/strlcpycat.h, src/sys_generic.h, src/sys_unix.c,
+	  src/thread_generic.h, src/thread_unix.c, src/tokenparser.l,
+	  src/utils.c, src/utils.h, src/utils/formaticc.c,
+	  src/utils/installifd.c, src/winscard.c, src/winscard_clnt.c,
+	  src/winscard_msg.c, src/winscard_msg.h, src/winscard_msg_srv.c,
+	  src/winscard_svc.c, src/winscard_svc.h: update copyright dates
+
[phone]  Ludovic Rousseau
+
+	* [r4540] src/winscard_svc.c: remove ducplicate READ_BODY() and
+	  WRITE_BODY() macros
+
[phone]  Ludovic Rousseau
+
+	* [r4538] src/winscard_clnt.c: remove useless PCHANNEL_MAP type
+	  definition
+	* [r4537] src/winscard_clnt.c: remove extra spaces at end of line
+	* [r4536] src/hotplug_libusb.c: reindent
+	* [r4535] src/hotplug_linux.c: reindent
+	* [r4534] src/ifdwrapper.c: reindent
+	* [r4533] src/readerfactory.c: RFAddReader(): make comment more
+	  clear for TAG_IFD_SLOT_THREAD_SAFE
+	* [r4532] src/readerfactory.c: RFAddReader(): make comment more
+	  clear for TAG_IFD_THREAD_SAFE
+
[phone]  Ludovic Rousseau
+
+	* [r4531] src/winscard_msg.c, src/winscard_msg_srv.c: use PF_*
+	  instead of AF_* for socket(2) argument
+	  
+	  Thanks to Sébastien Lorquet for the bug report
+	  http://archives.neohapsis.com/archives/dev/muscle/2009-q4/0039.html
+	* [r4530] src/winscard_msg.c, src/winscard_msg_srv.c: Revert change
+	  in revision 4395. Solaris does not have (Posix) AF_LOCAL
+	  
+	  Thanks to Douglas E. Engert for the bug report
+	  http://archives.neohapsis.com/archives/dev/muscle/2009-q4/0038.html
+
[phone]  Ludovic Rousseau
+
+	* [r4529] src/readerfactory.h: remove useless pointer types
+
[phone]  Ludovic Rousseau
+
+	* [r4528] src/winscard_clnt.c: SCardConnect(), SCardDisconnect() &
+	  SCardReleaseContext(): correctly handle error cases profiling
+
[phone]  Ludovic Rousseau
+
+	* [r4527] src/readerfactory.h, src/thread_generic.h,
+	  src/thread_unix.c, src/winscard_clnt.c: remove the type
+	  PCSCLITE_MUTEX_T and use an explicit pointer type (PCSCLITE_MUTEX
+	  *) instead
+	  
+	  This should avoid bugs like the one corrected in revision 4525
+	* [r4525] src/eventhandler.c: correctly use the lock API for
+	  ClientsWaitingForEvent_lock
+	* [r4524] src/pcscdaemon.c, src/readerfactory.c,
+	  src/readerfactory.h: call exit() in SVCServiceRunLoop() instead
+	  of RFCleanupReaders() and remove the RFCleanupReaders() parameter
+	* [r4523] src/readerfactory.c: use return() instead of exit() if
+	  DYN_GetAddress() fails
+	* [r4522] src/eventhandler.c: explicitly use (void)fct() to ignore
+	  the returned value
+
[phone]  Ludovic Rousseau
+
+	* [r4520] src/eventhandler.c: EHStatusHandlerThread(): call
+	  EHSignalEventToClients() _after_ logging "Card inserted into ..."
+	* [r4519] src/winscard_svc.c: ContextThread(): add the client ID to
+	  the command log message
+	* [r4518] src/winscard_clnt.c: SCardGetStatusChange(): use
+	  SCARD_*_CONTEXT constants instead of numerical values
+	* [r4517] src/eventhandler.h, src/winscard.c: move SCARD_*_CONTEXT
+	  from winscard.c to eventhandler.h
+	* [r4516] src/winscard.c: remove useless SCARD_NO_LOCK define
+	* [r4515] src/eventhandler.c: update comment
+	* [r4514] src/winscard_clnt.c, src/winscard_msg.c,
+	  src/winscard_svc.c: SHMMessageReceive() now returns -2 in case of
+	  timeout and -1 in case of other error
+	  
+	  This is used to correctly handle timeouts in
+	  SCardGetStatusChange()
+	* [r4513] src/winscard_svc.c: ContextThread(): when a client dies
+	  call EHTryToUnregisterClientForEvent() to unregister it if needed
+	* [r4512] src/eventhandler.c, src/eventhandler.h: add
+	  EHTryToUnregisterClientForEvent()
+
[phone]  Ludovic Rousseau
+
+	* [r4497] src/winscard_msg.c: SHMMessageSend(): document the use of
+	  MSG_NOSIGNAL to ignore SIGPIPE signal
+
[phone]  Ludovic Rousseau
+
+	* [r4491] src/Makefile.am: do not use PCSC_CLIENT_SRC variable
+	  anymore since SCF support has been removed
+	* [r4490] src/Makefile.am: libpcsclite does not need to have
+	  dyn_hpux.c, dyn_macosx.c or dyn_unix.c. These files define
+	  DYN_LoadLibrary/DYN_CloseLibrary/DYN_GetAddress
+	* [r4489] pbx, pcsc.pbproj: remove Xcode files. Apple has its own
+	  version of pcsc-lite for Mac OS X
+	* [r4488] src/winscard_clnt.c: Doxygen(): better documentation for
+	  SCardCheckDaemonAvailability()
+	* [r4487] src/winscard_clnt.c: revert changeset 4485.
+	  SCardCheckDaemonAvailability() is also used to invalidate the
+	  PC/SC handles after a fork or a pcscd restart
+	* [r4486] configure.in, src/Makefile.am, src/winscard_scf.c: remove
+	  SCF support (PC/SC over Smart Card Framework). I never used this
+	  feature and SCF is now dead and replaced by JSR 268
+	  (javax.smartcardio)
+
[phone]  Ludovic Rousseau
+
+	* [r4485] src/winscard_clnt.c: SCardReleaseContext(),
+	  SCardConnect(), SCardReconnect(), SCardDisconnect(),
+	  SCardBeginTransaction(), SCardEndTransaction(),
+	  SCardCancelTransaction(), SCardStatus(), SCardGetStatusChange(),
+	  SCardControl(), SCardGetSetAttrib(), SCardTransmit(),
+	  SCardListReaders(), SCardFreeMemory()SCardListReaderGroups(),
+	  SCardIsValidContext(): do not SCardCheckDaemonAvailability()
+	  since we will try to talk to the server later. Any communication
+	  problem will be reported by SHMMessageSendWithHeader()
+	* [r4484] src/winscard_clnt.c: SCardDisconnect(): factorize exit
+	  code
+	* [r4483] src/winscard_clnt.c: SCardReconnect(): factorize exit
+	  code
+	* [r4482] src/winscard_clnt.c: SCardConnect(): factorize exit code
+	* [r4481] src/winscard_clnt.c: SCardReleaseContext(): release
+	  context even if communication with the server fails
+	* [r4480] src/winscard_msg.c: SHMMessageSend(): use send(...,
+	  MSG_NOSIGNAL) instead of write(...) to avoid receiving a SIGPIPE
+	  signal if pcscd has exited. We just get EPIPE as return value
+	* [r4479] src/winscard_clnt.c: SCardReconnect(),
+	  SCardBeginTransaction(), SCardEndTransaction(),
+	  SCardCancelTransaction(), SCardControl(), SCardGetSetAttrib() and
+	  SCardTransmit(): do not "synchronize reader states with daemon"
+	  since reader availability checks are done on the server side.
+
[phone]  Ludovic Rousseau
+
+	* [r4476] src/winscard_clnt.c: Doxygen improvement
+	* [r4474] src/PCSC/ifdhandler.h: Doxygen: define an IFDHandler
+	  group
+	* [r4473] src/PCSC/ifdhandler.h: Add Doxygen documentation of the
+	  IFD Handler API
+	* [r4472] src/PCSC/ifdhandler.h: remove IFD_Handler 1.0 functions
+	  prototypes
+	* [r4471] src/winscard_clnt.c: Doxygen: use @param[in,out] for in
+	  and out parameters
+
[phone]  Ludovic Rousseau
+
+	* [r4468] doc/example/pcsc_demo.c: cleanly exits in case of unknown
+	  protocol
+	* [r4467] doc/example/pcsc_demo.c: use SCARD_AUTOALLOCATE for
+	  SCardListReaders()
+	* [r4466] src/simclist.c, src/simclist.h: remove svn:executable
+	  property on source files
+	* [r4465] src/sys_generic.h, src/sys_unix.c: Define SYS_Fork() only
+	  if used (if HAVE_DAEMON is not set)
+	* [r4464] src/sys_generic.h, src/sys_unix.c: Remove useless
+	  SYS_GetPageSize(), SYS_MemoryMap(), SYS_PublicMemoryMap(),
+	  SYS_PublicMemoryUnmap() and SYS_MMapSynchronize()
+	* [r4463] src/sys_generic.h, src/sys_unix.c: Remove useless
+	  SYS_ReadFile()
+	* [r4462] src/sys_generic.h, src/sys_unix.c: Remove useless
+	  SYS_SeekFile()
+	* [r4461] src/sys_generic.h: Remove SYS_ChangePermissions()
+	  prototype (the function is NOT defined anywhere)
+	* [r4460] src/sys_generic.h, src/sys_unix.c: Remove useless
+	  SYS_GetUID() & SYS_GetGID()
+	* [r4459] src/sys_generic.h, src/sys_unix.c: Remove useless
+	  SYS_GetPID()
+	* [r4458] src/sys_generic.h, src/sys_unix.c, src/winscard_clnt.c:
+	  SYS_Initialize() does nothing. Remove it.
+	* [r4457] src/readerfactory.c: Comment out RFSuspendAllReaders()
+	  and RFAwakeAllReaders(). We do not yet support suspend/resume on
+	  Linux
+	* [r4456] src/readerfactory.c, src/readerfactory.h: remove useless
+	  RFListReaders()
+	* [r4455] src/readerfactory.c, src/readerfactory.h: remove useless
+	  RFUnblockContext()
+	* [r4454] src/readerfactory.c, src/readerfactory.h, src/winscard.c:
+	  remove useless RFUnblockReader()
+	* [r4453] src/pcscd.h.in, src/readerfactory.c, src/winscard_clnt.c:
+	  do not use contextBlockStatus tpo block/unblock a context. We now
+	  use SCardCancel() on the server side to unblock
+	  SCardGetStatusChange()
+	* [r4452] doc/Makefile.am, doc/pcsc-lite.bib, doc/pcsc-lite.tex:
+	  The .tex documentation is no more maintained. The reference
+	  WinSCard API documentation is from Doxygen now.
+	* [r4451] UnitaryTests/SCardConnect_DIRECT.py: add documentation
+	* [r4447] src/ifdwrapper.c: IFDControl(): return
+	  SCARD_E_INSUFFICIENT_BUFFER if the driver returns
+	  IFD_ERROR_INSUFFICIENT_BUFFER
+	* [r4445] src/winscard.c: SCardGetAttrib(): return
+	  SCARD_E_INSUFFICIENT_BUFFER if the driver returns
+	  IFD_ERROR_INSUFFICIENT_BUFFER
+	  
+	  Thanks to Emmanuel Deloget for the bug report
+	  http://archives.neohapsis.com/archives/dev/muscle/2009-q4/0003.html
+	* [r4444] src/PCSC/ifdhandler.h: add IFD_ERROR_INSUFFICIENT_BUFFER
+	* [r4443] src/winscard.c: SCardReconnect(): log the selected
+	  protocol (as done in SCardConnect())
+	* [r4442] src/winscard_clnt.c: SCardReconnect(): return
+	  SCARD_E_SHARING_VIOLATION instead of blocking if the reader
+	  cannot be shared.
+	  
+	  This change was made in revision 2475 but I don't remember why.
+	  
+	  Thanks to Paul Klissner for the bug report
+	  http://archives.neohapsis.com/archives/dev/muscle/2009-q3/0106.html
+
[phone]  Ludovic Rousseau
+
+	* [r4438] src/winscard_clnt.c, src/winscard_msg.h: remove typedefs
+	  and explicitly use struct for structures
+	* [r4437] src/pcsc-wirecheck-gen.c: update to the new client/server
+	  ABI
+	* [r4436] src/utils.c, src/utils.h: remove now useless
+	  StatSynchronize() and StatSynchronizeContext()
+	* [r4435] src/winscard_clnt.c: remove now useless SCardUnload()
+	* [r4434] src/eventhandler.c, src/pcscd.h.in, src/pcscdaemon.c,
+	  src/readerfactory.c, src/winscard.c, src/winscard_clnt.c,
+	  src/winscard_msg.c, src/winscard_msg.h, src/winscard_msg_srv.c,
+	  src/winscard_svc.c: redesign the client/server communication: -
+	  no more shared memory used (allow pcscd and libpcsclite1.so to be
+	  on different computer and talk over a network) - no more
+	  difference between short and extended APDU - no more use of a
+	  /var/run/pcscd/pcscd.events/ directory. events are sent through
+	  the socket - simpler command format between client and server
+	  
+	  The side effect is that you are not able to mix an old pcscd with
+	  a new libpcsclite1.so or the reverse. SCardEstablishContext()
+	  will fail unless you update both sides of the communication.
+	* [r4433] src/winscard_msg.c: reformat comment
+	* [r4432] src/winscard_svc.c, src/winscard_svc.h: add
+	  MSGSignalClient()
+	* [r4431] src/winscard_msg.h: add struct wait_reader_state_change
+	* [r4430] src/pcscd.h.in: add PCSCLITE_WRITE_TIMEOUT and
+	  PCSCLITE_READ_TIMEOUT
+	* [r4429] src/winscard_msg.c: reformat comments
+	* [r4428] src/eventhandler.c, src/eventhandler.h: add
+	  EHRegisterClientForEvent(), EHUnregisterClientForEvent() and
+	  EHSignalEventToClients()
+	* [r4427] src/Makefile.am: add simclist.{c,h} to pcscd dependencies
+	* [r4426] src/simclist.c, src/simclist.h: Library to manage lists
+	  Fetched from http://mij.oltrelinux.com/devel/simclist/
+
[phone]  Ludovic Rousseau
+
+	* [r4425] UnitaryTests/SCardCancel.py: display return values even
+	  if no error returned
+
[phone]  Ludovic Rousseau
+
+	* [r4419] src/winscard_clnt.c: Doxygen document SCardConnect()
+	  difference with Windows for SCARD_SHARE_DIRECT
+
[phone]  Ludovic Rousseau
+
+	* [r4418] src/winscard_clnt.c: add Doxygen section: Known
+	  differences with Microsoft Windows WinSCard implementation
+
[phone]  Ludovic Rousseau
+
+	* [r4408] src/pcscdaemon.c: main(): check RFAllocateReaderSpace()
+	  returned value
+	* [r4407] src/winscard_clnt.c: SCardGetStatusChange(): Calling with
+	  cReaders == 0 will now just return SCARD_S_SUCCESS
+	  
+	  Use the special reader name "\\?PnP?\Notification" to wait for a
+	  reader event notification
+	* [r4406] src/pcscd.h.in: remove comment about PCSCLITE_MAX_READERS
+	* [r4405] src/pcscd.h.in: remove useless PCSCLITE_MAX_THREADS
+	  definition
+	* [r4404] src/pcscd.h.in: remove useless
+	  PCSCLITE_TRANSACTION_TIMEOUT definition
+	* [r4403] src/utils.c, src/utils.h, src/winscard.c,
+	  src/winscard_clnt.c: move time_sub() in utils.c
+	* [r4402] src/pcsc-wirecheck-gen.c, src/pcscd.h.in,
+	  src/winscard_msg.c, src/winscard_msg.h: remove useless
+	  key[PCSCLITE_MSG_KEY_LEN] field
+
[phone]  Ludovic Rousseau
+
+	* [r4400] src/winscard.c: SCardTransmit(): do not limit the minimum
+	  size of an APDU to 4 bytes. non ISO 7816-4 compliant cards (like
+	  Mifare DESFIRE) may use shorter commands
+	  
+	  Thanks to Björn Kupfer for the bug report
+	* [r4399] src/winscard.c: SCardTransmit(): call IFDControl_v2
+	  instead of IFDTransmit only if dwProtocol == SCARD_PROTOCOL_RAW
+	  _and_ ifdhandler is v2.0
+	  
+	  Thanks to Björn Kupfer for the patch
+
[phone]  Ludovic Rousseau
+
+	* [r4395] src/winscard_msg.c, src/winscard_msg_srv.c: use the POSIX
+	  name AF_LOCAL instead of AF_UNIX
+
[phone]  Ludovic Rousseau
+
+	* [r4388] src/pcscd.h.in: remove unsuned #define
+	  PCSCLITE_RW_ATTEMPTS
+
[phone]  Ludovic Rousseau
+
+	* [r4387] src/winscard_clnt.c: typo in Doxygen comment
+
[phone]  Ludovic Rousseau
+
+	* [r4386] src/winscard_clnt.c: SCardReleaseContext(),
+	  SCardControl(), SCardTransmit() and SCardListReaders(): add a
+	  call to PROFILE_END() before exiting with SCARD_E_INVALID_HANDLE
+	  error code to have a better profiling output
+	* [r4385] src/winscard.c:
+	  SCardEstablishContext()/SCardReleaseContext(): log context value
+	  in hexadecimal instead of decimal
+	* [r4384] src/winscard_msg.c: rename argument blockAmount in
+	  timeOut to better reflect its function
+
[phone]  Ludovic Rousseau
+
+	* [r4378] src/PCSC/reader.h.in: update sruct
+	  PIN_PROPERTIES_STRUCTURE to be conform with Revision 2.02.06,
+	  April 2009 of PCSCv2 part 10
+	  
+	  Fields wLcdMaxCharacters and wLcdMaxLines have been removed
+
[phone]  Ludovic Rousseau
+
+	* [r4375] src/pcscdaemon.c: signal_reload(): reenable the signal
+	  handler. This is needed on Solaris and HPUX.
+	  
+	  Thanks to Douglas E. Engert for the patch
+	  http://archives.neohapsis.com/archives/dev/muscle/2009-q3/0061.html
+
[phone]  Ludovic Rousseau
+
+	* [r4374] src/ifdwrapper.c, src/winscard.c: typo in comments
+
[phone]  Ludovic Rousseau
+
+	* [r4371] src/hotplug_libhal.c, src/hotplug_libusb.c,
+	  src/hotplug_linux.c, src/pcscdaemon.c: move definition of
+	  usbNotifierMutex in the underlying layers where it is used
+
[phone]  Ludovic Rousseau
+
+	* [r4367] src/ifdwrapper.c: IFDControl(): return
+	  SCARD_E_UNSUPPORTED_FEATURE if the driver returned
+	  IFD_ERROR_NOT_SUPPORTED or IFD_NOT_SUPPORTED
+	  
+	  This is used to separate an unsupported value of ControlCode from
+	  a general error
+
[phone]  Ludovic Rousseau
+
+	* [r4359] UnitaryTests/control_switch_interface.py: switch
+	  interface on the GemProx DU
+	* [r4357] UnitaryTests/control_get_firmware.py: get firmware
+	  version of Gemalto readers
+
[phone]  Ludovic Rousseau
+
+	* [r4354] src/ifdwrapper.c: remove extra spaces at end of line
+	* [r4353] src/configfile.l: reformat
+	* [r4352] src/configfile.l: remove extra spaces
+
 2009-07-28  Ludovic Rousseau
 
 	* [r4349] ChangeLog, configure.in: release 1.5.5
 
=== modified file 'Makefile.am'
--- Makefile.am	2010-07-10 11:15:59 +0000
+++ Makefile.am	2011-03-19 10:51:41 +0000
@@ -1,4 +1,7 @@
-SUBDIRS = m4 src etc doc
+SUBDIRS = m4 src doc
+
+fix-rights:
+	$(MAKE) -C src $@
 
 ACLOCAL_AMFLAGS = -I m4
 
 
=== modified file 'Makefile.in'
--- Makefile.in	2010-07-10 11:15:59 +0000
+++ Makefile.in	2011-03-19 10:51:41 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -35,9 +37,9 @@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure $(top_srcdir)/src/PCSC/pcsclite.h.in \
-	$(top_srcdir)/src/PCSC/reader.h.in AUTHORS COPYING ChangeLog \
-	INSTALL NEWS TODO compile config.guess config.sub depcomp \
-	install-sh ltmain.sh missing ylwrap
+	AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \
+	config.guess config.sub depcomp install-sh ltmain.sh missing \
+	ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
 	$(top_srcdir)/m4/as-ac-expand.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -50,7 +52,8 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = src/PCSC/pcsclite.h src/PCSC/reader.h
+CONFIG_CLEAN_FILES = src/PCSC/pcsclite.h
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -62,6 +65,9 @@
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -69,9 +75,34 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 GZIP_ENV = --best
 DIST_ARCHIVES = $(distdir).tar.bz2
 distuninstallcheck_listfiles = find . -type f -print
@@ -113,12 +144,11 @@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBDL = @LIBDL@
-LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
-LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBSMARTCARD = @LIBSMARTCARD@
 LIBTOOL = @LIBTOOL@
+LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
+LIBUDEV_LIBS = @LIBUDEV_LIBS@
 LIBUSBCONFIG = @LIBUSBCONFIG@
 LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
 LIBUSB_LIBS = @LIBUSB_LIBS@
@@ -139,9 +169,13 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PCSCLITE_CONFIG_DIR = @PCSCLITE_CONFIG_DIR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -171,7 +205,6 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
-confdir = @confdir@
 confdir_exp = @confdir_exp@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -208,13 +241,13 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-sysconfdir_exp = @sysconfdir_exp@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 usbdropdir = @usbdropdir@
-SUBDIRS = m4 src etc doc
+usbdropdir_exp = @usbdropdir_exp@
+SUBDIRS = m4 src doc
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = DRIVERS SECURITY bootstrap HELP ChangeLog.svn
 DISTCLEANFILES = ChangeLog.svn
@@ -228,15 +261,15 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -252,9 +285,10 @@
 	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
@@ -266,7 +300,7 @@
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
 $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
 
@@ -274,8 +308,6 @@
 	-rm -f config.h stamp-h1
 src/PCSC/pcsclite.h: $(top_builddir)/config.status $(top_srcdir)/src/PCSC/pcsclite.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-src/PCSC/reader.h: $(top_builddir)/config.status $(top_srcdir)/src/PCSC/reader.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -293,7 +325,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -310,7 +342,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -318,7 +350,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -344,16 +376,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -368,7 +400,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -380,7 +412,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -389,36 +421,41 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -434,38 +471,55 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
+	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
@@ -477,6 +531,10 @@
 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(am__remove_distdir)
 
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -500,15 +558,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -516,9 +576,11 @@
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
@@ -540,13 +602,15 @@
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -588,6 +652,7 @@
 
 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:
@@ -609,6 +674,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -617,18 +684,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -651,25 +728,28 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
-
+	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am
+
+
+fix-rights:
+	$(MAKE) -C src $@
 
 ChangeLog.svn:
 	-svn2cl --group-by-day --stdout --include-rev --reparagraph | perl -pe \
@@ -683,6 +763,7 @@
 	s/  aet-guest/  Antti Tapaninen/; \
 	s/  sauveron-guest/  Damien Sauveron/; \
 	s+trunk/PCSC/++g;' > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
=== modified file 'TODO'
--- TODO	2009-06-02 16:58:01 +0000
+++ TODO	2011-03-19 10:51:41 +0000
@@ -1,10 +1,5 @@
 - include Apple patches and improvements (if possible/needed)
 
-- power on the card _only_ if an application requests a connection
-  see Alioth bug #301965
-  That could be implemented by polling the reader only if an application
-  requests it.
-
 - allow to have pcscd and libpcsclite on two different machines.
   That would be needed to support remote PAM login.
   Maybe use unix2tcp (http://dizzy.roedu.net/unix2tcp/)
@@ -25,4 +20,9 @@
   mode.
   http://www.opensc-project.org/pipermail/opensc-devel/2009-February/011801.html
 
-February 2009
+
+For embedded/constrained systems
+
+- use static driver instead of reader polling and dynamic driver loading
+
+October 2010
 
=== modified file 'aclocal.m4'
--- aclocal.m4	2010-07-10 11:15:59 +0000
+++ aclocal.m4	2011-03-19 10:51:41 +0000
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,13 +13,14 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
 # 
 # Copyright © 2004 Scott James Remnant <[e-mail]>.
 #
@@ -47,7 +48,10 @@
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
@@ -60,7 +64,6 @@
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
-		
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 
@@ -69,34 +72,31 @@
 # Check to see whether a particular set of modules exists.  Similar
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
+  m4_default([$2], [:])
 m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
-
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -138,16 +138,17 @@
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	ifelse([$4], , [AC_MSG_ERROR(dnl
+	m4_default([$4], [AC_MSG_ERROR(
 [Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -155,25 +156,24 @@
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
+_PKG_TEXT])[]dnl
+        ])
 elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
+	$3
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
@@ -189,10 +189,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
+[am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.2], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -208,7 +208,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -268,14 +268,14 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 9
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -288,6 +288,7 @@
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
 _AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -301,14 +302,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
+# serial 10
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -365,6 +366,16 @@
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -382,7 +393,17 @@
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -392,19 +413,23 @@
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
     none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -468,59 +493,61 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 4
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file.  Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*)   set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
 
@@ -552,13 +579,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 13
+# serial 16
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -575,7 +602,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
+[AC_PREREQ([2.62])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -626,8 +653,8 @@
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -635,23 +662,36 @@
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
 
 # When config.status generates a header, we must update the stamp-h file.
@@ -675,7 +715,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -686,7 +726,14 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -734,27 +781,38 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode  enable make rules and dependencies not useful
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
+      [USE_MAINTAINER_MODE=$enableval],
+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
+  AC_SUBST([MAINT])dnl
 ]
 )
 
@@ -762,13 +820,13 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -777,7 +835,7 @@
 [am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
@@ -787,24 +845,24 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
 # Now try BSD make style include.
 if test "$am__include" = "#"; then
    echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 AC_SUBST([am__include])
 AC_SUBST([am__quote])
@@ -849,14 +907,14 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# serial 6
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -873,7 +931,14 @@
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
@@ -944,14 +1009,14 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_SANITY_CHECK
 # ---------------
@@ -960,16 +1025,29 @@
 # Just in case
 sleep 1
 echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
    if test "$[*]" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -1022,18 +1100,25 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 2
+
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
=== modified file 'bootstrap'
--- bootstrap	2008-07-12 13:34:52 +0000
+++ bootstrap	2011-03-19 10:51:41 +0000
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # I use
-# - autoconf (GNU Autoconf) 2.59
-# - automake (GNU automake) 1.7.9
-# - libtool (GNU libtool) 1.5.6 (1.1220.2.95 2004/04/11 05:50:42)
+# - autoconf (GNU Autoconf) 2.64
+# - automake (GNU automake) 1.11
+# - libtool (GNU libtool) 2.2.6
 
 set -e
 set -x
 
=== modified file 'config.guess'
--- config.guess	2010-07-10 11:15:59 +0000
+++ config.guess	2011-03-19 10:51:41 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2009-12-30'
 
 # 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
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <[e-mail]>.
-# Please send patches to <[e-mail]>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <[e-mail]> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
@@ -170,7 +171,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -333,6 +334,9 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -656,7 +660,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -807,12 +811,12 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -822,6 +826,9 @@
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +858,20 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -873,6 +894,17 @@
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -882,78 +914,34 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -962,8 +950,11 @@
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -986,66 +977,6 @@
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1074,7 +1005,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1182,7 +1113,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1275,6 +1206,16 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		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
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 
=== modified file 'config.h.in'
--- config.h.in	2010-07-10 11:15:59 +0000
+++ config.h.in	2011-03-19 10:51:41 +0000
@@ -33,15 +33,18 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Libhal is available */
-#undef HAVE_LIBHAL
+/* Libudev is available */
+#undef HAVE_LIBUDEV
 
-/* Define to 1 if you have the <libhal.h> header file. */
-#undef HAVE_LIBHAL_H
+/* Define to 1 if you have the <libudev.h> header file. */
+#undef HAVE_LIBUDEV_H
 
 /* Libusb is available */
 #undef HAVE_LIBUSB
 
+/* Define to 1 if you have the <libusb.h> header file. */
+#undef HAVE_LIBUSB_H
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -51,6 +54,9 @@
 /* Define if you have POSIX threads libraries and header files. */
 #undef HAVE_PTHREAD
 
+/* Define to 1 if you have the `pthread_cancel' function. */
+#undef HAVE_PTHREAD_CANCEL
+
 /* Define to 1 if `stat' has the bug that it succeeds when given the
    zero-length file name argument. */
 #undef HAVE_STAT_EMPTY_STRING_BUG
@@ -94,9 +100,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if you have the <usb.h> header file. */
-#undef HAVE_USB_H
-
 /* Define to 1 if you have the `vprintf' function. */
 #undef HAVE_VPRINTF
 
@@ -111,6 +114,9 @@
    */
 #undef LT_OBJDIR
 
+/* 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
 
@@ -129,9 +135,15 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* pcscd filename */
+#undef PCSCD_BINARY
+
 /* Enabled PC/SC lite features */
 #undef PCSCLITE_FEATURES
 
@@ -154,6 +166,12 @@
 /* directory containing IPC files */
 #undef USE_IPCDIR
 
+/* Use serial conf file mechanism */
+#undef USE_SERIAL
+
+/* Use USB hotplug mechanism */
+#undef USE_USB
+
 /* Version number of package */
 #undef VERSION
 
 
=== modified file 'config.sub'
--- config.sub	2010-07-10 11:15:59 +0000
+++ config.sub	2011-03-19 10:51:41 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-17'
+timestamp='2010-01-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
 
 
 # Please send patches to <[e-mail]>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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,10 +153,13 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -281,6 +288,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -288,13 +296,14 @@
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -337,7 +346,7 @@
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -365,15 +374,17 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -467,6 +478,10 @@
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -719,6 +734,9 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1069,6 +1087,11 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
 	tile*)
 		basic_machine=tile-unknown
 		os=-linux-gnu
@@ -1240,6 +1263,9 @@
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1260,9 +1286,9 @@
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1283,7 +1309,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1416,6 +1442,8 @@
 	-dicos*)
 		os=-dicos
 		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
@@ -1613,7 +1641,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
 
=== modified file 'configure'
--- configure	2010-07-10 11:15:59 +0000
+++ configure	2011-03-19 10:51:41 +0000
@@ -1,18 +1,22 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for pcsc-lite 1.5.5.
+# Generated by GNU Autoconf 2.67 for pcsc-lite 1.7.0.
+#
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -20,23 +24,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -44,7 +40,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -55,7 +57,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -78,13 +80,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -94,15 +89,15 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done