Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package pcsc-lite (explain the reason for the unblock here) A regression has been introduced in version 1.8.12 (24 september 2014) of the software. This regression has been fixed in upstream version 1.8.13 (7 November 2014). Debian bug is #767862 "Socket activation not working on first try" The bug severity is "important" only (I guess) because systemd is not yet installed by default. The problem is only present when you use systemd (then the pcscd daemon is started by pcscd). Since systemd will be the default for new installations of Debian it is important to have this bug fixed in Jessie. The debdiff patch is long because I (as upstream) updated the license of every source code file. The fix for the bug is in file src/hotplug_libudev.c Release 1.8.13 of pcsc-lite is a bug fix only release. You can also read the thread at http://lists.alioth.debian.org/pipermail/pcsclite-muscle/Week-of-Mon-20141103/000231.html to have more technical details. (include/attach the debdiff against the package in testing) unblock pcsc-lite/1.8.13-1 -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 3.16-3-amd64 (SMP w/4 CPU cores) Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru pcsc-lite-1.8.12/ChangeLog pcsc-lite-1.8.13/ChangeLog --- pcsc-lite-1.8.12/ChangeLog 2014-09-24 15:04:40.000000000 +0200 +++ pcsc-lite-1.8.13/ChangeLog 2014-11-07 13:19:23.000000000 +0100 @@ -1,3 +1,12 @@ +pcsc-lite-1.8.13: Ludovic Rousseau +7 November 2014 +- fix a systemd + libudev hotplug bug introduced in version 1.8.12. + The list of readers was not (yet) available just after the start of pcscd +- Make the license more 3-clause BSD like +- fix a rare race condition in the (non default) libusb hotplug +- Some other minor improvements and bug corrections + + pcsc-lite-1.8.12: Ludovic Rousseau 24 September 2014 - make hotplug using libudev (default) more robust diff -Nru pcsc-lite-1.8.12/ChangeLog.svn pcsc-lite-1.8.13/ChangeLog.svn --- pcsc-lite-1.8.12/ChangeLog.svn 2014-02-14 17:18:12.000000000 +0100 +++ pcsc-lite-1.8.13/ChangeLog.svn 2014-11-07 13:19:48.000000000 +0100 @@ -1,3 +1,382 @@ +2014-11-07 Ludovic Rousseau + + * [r7036] ChangeLog, configure.ac: Release 1.8.13 + * [r7035] src/auth.c: Fix compiler warnings + + auth.c: In function ‘IsClientAuthorized’: auth.c:151:33: warning: + unused parameter ‘socket’ [-Wunused-parameter] unsigned + IsClientAuthorized(int socket, const char* action, const char* + reader) ^ auth.c:151:53: warning: unused parameter ‘action’ + [-Wunused-parameter] unsigned IsClientAuthorized(int socket, + const char* action, const char* reader) ^ auth.c:151:73: warning: + unused parameter ‘reader’ [-Wunused-parameter] unsigned + IsClientAuthorized(int socket, const char* action, const char* + reader) + * [r7034] src/Makefile.am, src/auth.c: Fix compiler warning + + auth.c:150:10: warning: no previous prototype for + ‘IsClientAuthorized’ [-Wmissing-prototypes] unsigned + IsClientAuthorized(int socket, const char* action, const char* + reader) ^ + * [r7033] src/hotplug_libudev.c: Fix again libudev hotplug + + The change in revision 7028 broke the fix introduced in revision + 6951. + + Thanks again to Stefani Seibold for the new fix + http://lists.alioth.debian.org/pipermail/pcsclite-muscle/Week-of-Mon-20141103/000226.html + +2014-11-06 Ludovic Rousseau + + * [r7029] src/hotplug_libusb.c: Do not access pipefd[] after use + + It is NOT safe to pass to a thread a pointer to a locally + allocated array. When the caller exits the scope of the array + then the memory is reused. So any reference to the array becomes + illegal memory access. + + Thanks to Maximilian Stein for the patch + http://lists.alioth.debian.org/pipermail/pcsclite-muscle/Week-of-Mon-20141103/000218.html + * [r7028] src/hotplug_libudev.c: Scan the USB bus at least once + before accepting client connections + + The bug was introduced in pcsc-lite version 1.8.12 with revision + 6951. + + Closes Alioth bug [#314869] pcscd: Socket activation not working + on first try + https://alioth.debian.org/tracker/index.php?func=detail&aid=314869&group_id=30105&atid=410085 + * [r7027] src/spy/install_spy.sh, src/spy/uninstall_spy.sh: Use + ldconfig(8) to find the directory containing libpcsclite.so.1 + + On a Debian system (using multiarch) the directory is no more + /usr/lib but /usr/lib/x86_64-linux-gnu on a 64-bits Intel system. + * [r7026] src/pcscdaemon.c: Do not log an error when pcscd is + started by systemd + + If pcscd is started by systemd then /var/run/pcscd/pcscd.comm + exists but /var/run/pcscd/pcscd.pid do not exists yet. So an + error was logged: pcscd[2536]: 00000000 utils.c:87:GetDaemonPid() + Can't open /var/run/pcscd/pcscd.pid: No such file or directory + + Now /var/run/pcscd/pcscd.pid is used only if pcscd is NOT started + by systemd. + + Close Alioth bug [#314862] Should not log an error Can't open + /var/run/pcscd/pcscd.pid when started by systemd + https://alioth.debian.org/tracker/index.php?func=detail&aid=314862&group_id=30105&atid=410085 + +2014-10-22 Ludovic Rousseau + + * [r7016] doc/pcscd.8.in: Use \- for - + * [r7015] doc/pcscd.8.in: Add documentation for + --reader-name-no-interface + * [r7014] doc/pcscd.8.in: dd documentation for + --reader-name-no-serial + * [r7013] doc/pcscd.8.in: Add documentation for --auto-exit + +2014-10-02 Ludovic Rousseau + + * [r7007] COPYING: Add licenses for files from other projects + + src/auth.c and src/auth.h are from Red Hat src/sd-daemon.c and + src/sd-daemon.h are from systemd src/simclist.c and + src/simclist.h are from SimCList src/strlcpy.3, src/strlcat.c and + src/strlcpy.c are from OpenBSD + * [r7006] src/pcscd.h.in: Add missing 3-clause BSD license + * [r7005] COPYING: Add GNU GPL v3 license header + * [r7004] COPYING, UnitaryTests/SCardBlockingBehaviourTest.py, + UnitaryTests/SCardExclusiveBehaviour.py, src/PCSC/debuglog.h, + src/PCSC/ifdhandler.h, src/PCSC/pcsclite.h.in, src/PCSC/reader.h, + src/PCSC/winscard.h, src/PCSC/wintypes.h, src/atrhandler.c, + src/atrhandler.h, src/configfile.h, src/configfile.l, + src/debug.c, src/debuglog.c, src/dyn_generic.h, src/dyn_hpux.c, + src/dyn_macosx.c, src/dyn_unix.c, src/error.c, + src/eventhandler.c, src/eventhandler.h, src/hotplug.h, + src/hotplug_generic.c, src/hotplug_libudev.c, + src/hotplug_libusb.c, src/hotplug_linux.c, src/hotplug_macosx.c, + src/ifdwrapper.c, src/ifdwrapper.h, src/lassert.h, src/misc.h, + src/parser.h, src/pcsc-wirecheck-gen.c, src/pcscdaemon.c, + src/powermgt_generic.c, src/powermgt_generic.h, + src/prothandler.c, src/prothandler.h, src/readerfactory.c, + src/readerfactory.h, src/strlcpycat.h, src/sys_generic.h, + src/sys_unix.c, src/testpcsc.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: Make the license more 3-clause BSD like + + The line "Changes to this license can be made only by the + copyright author with explicit written consent." was present in + the pcsc-lite license from the origin of the project (at least + since the initial version of COPYING in the VCS in March 2002). + + This line is not present in the 3-clause BSD license + http://en.wikipedia.org/wiki/BSD_licenses + + The change has been approved by David Corcoran, initial author of + pcsc-lite. + + The change was requested by Oracle about the headers files + winscard.h and pcsclite.h " To include in OpenJDK, Oracle needs + the right to relicense under other terms." + +2014-09-24 Ludovic Rousseau + + * [r7001] Makefile.am, doc/example/Makefile.am: The GPL license has + been moved to the root directory + + And version is now 3.0 instead of 2. + * [r6999] ChangeLog, configure.ac: Release 1.8.12 + +2014-09-19 Ludovic Rousseau + + * [r6997] UnitaryTests/SCardConnect_DIRECT2.py: Fix pyflakes + warning + + SCardConnect_DIRECT2.py:36: 'sys' imported but unused + * [r6996] UnitaryTests/SCardGetAttrib.py: Fix pyflakes warning + + SCardGetAttrib.py:25: 'sys' imported but unused + * [r6995] UnitaryTests/SCardBlockingBehaviourTest.py: Fix pyflakes + warning + + SCardBlockingBehaviourTest.py:234: local variable 'hresult' is + assigned to but never used + * [r6994] UnitaryTests/SCardBlockingBehaviourTest.py: Fix pyflakes + warning + + SCardBlockingBehaviourTest.py:249: local variable 'hresult' is + assigned to but never useX + * [r6993] UnitaryTests/control_get_firmware.py: Fix stupid bug + +2014-09-17 Ludovic Rousseau + + * [r6991] doc/doxygen.conf.in: Do not use FreeSans.ttf anymore + + Warning: doxygen no longer ships with the FreeSans font. You may + want to clear or change DOT_FONTNAME. + * [r6990] doc/doxygen.conf.in: Update from Doxygen 1.8.1.1 to 1.8.7 + + Used "doxygen -u" + * [r6989] src/winscard_clnt.c: Fix Doxygen for + SCardGetStatusChange() + + A value of 0 for dwTimeout is not equivalent of INFINITE but of 0 + ms. + + Thanks to helpcrypto for the bug report. + http://lists.alioth.debian.org/pipermail/pcsclite-muscle/Week-of-Mon-20140915/000141.html + * [r6987] doc/pcscd.8.in: Update driver web page + + http://www.musclecard.com/drivers.html is no more available. A + copy is available at + http://pcsclite.alioth.debian.org/musclecard.com/drivers.html + +2014-09-15 Ludovic Rousseau + + * [r6986] src/strlcpy.c, src/tokenparser.l: Use <config.h> instead + of "config.h" + + https://www.gnu.org/software/autoconf/manual/autoconf-2.65/html_node/Configuration-Headers.html + With the appropriate -I option, you can use #include <config.h>. + Actually, it's a good habit to use it, because in the rare case + when the source directory contains another config.h, the build + directory should be searched first. + * [r6985] src/spy/pcsc-spy: Fix error reported by flake8 + + pcsc-spy:795:20: E711 comparison to None should be 'if cond is + None:' + +2014-09-09 Ludovic Rousseau + + * [r6979] UnitaryTests/Makefile, UnitaryTests/exec.c: Unitary Test + for change in revision 6978 + * [r6978] src/winscard_msg.c: Create the libpcsclite/pcscd socket + with the SOCK_CLOEXEC flag + + The communication socket between libpcsclite and pcscd is created + with the SOCK_CLOEXEC flag added so the socket is automatically + closed when the process (or its childs) calls exec(). + + The problem happens when an application does exec() without + cleaning its use of libpcsclite using SCardReleaseContext(). I + could not reproduce a real problem but it has been reported on + the field with a closed source application. + + Thanks to Stefani Seibold for the bug report and patch. + +2014-09-01 Ludovic Rousseau + + * [r6965] src/PCSC/debuglog.h, src/PCSC/ifdhandler.h, + src/PCSC/pcsclite.h.in, src/auth.h: Remove extra spaces at end of + lines + +2014-08-07 Ludovic Rousseau + + * [r6953] src/hotplug_libudev.c: Udev is a global variable + + Rename udev as Udev to make it more explicit it is a global + variable. + * [r6952] src/hotplug_libudev.c: Add a missing break; + + I removed the line when testing the code. This bug is mine, not + Stefani's + * [r6951] src/hotplug_libudev.c: Revamp libudev hotplug + + " Hi, + + this is a complete revamp of src/hotplug_libudev.c hotplug + handling. This patch fix a lot of race conditions and make the + code a bit cleaner. + + The following benefits will be achieved: + + - udev events will be handled seperatly, a "add" event will only + add a device and a "remove" will now only remove the device. So + the whole bookkeeping is now done by the udev daemon, there is no + more need to track the state of the device. Also it fix a race + where udev had yet not finished the plug event and the device is + not full accessible. + + - fix the race gap between the coldplug scan and the activating + of the monitoring hotplug events. Now the monitoring will be + first activated and the the coldplug scan will be done. So there + is a small change that a device will be added during the coldplug + scan. For this the HPAddDevice() function needs to check for + duplicate adds of a device. But that is common design of libudev + usage. + + - No more mutex needed since there is no more concurrency, + because the coldplug scan will be no done inside the thread. - Do + not start the thread detached since there is no way to do a + synchronized stop of the thread. The HPStopHotPluggables() will + now wait until the thread is gone. So it is save to free memory + of structures since no one is access them. + + - Remove the cooperative thread cancellation by AraKiriHotPlug. + Despite the non political correctness it will not work as + expected, because the select() system call will block infinitly. + Using the pthread_cancel() mechanism will do a better and safer + job. + + - Add signal safety to the select() system call. A EINTR should + not lead in a termination of the thread. + + - Fix a typo: pluggble > plugable + + - Make less error prone for unexpected libudev return values. + Check all return values of udev_...() functions against NULL. + + - Fix resource leak in hotplug thread. The udev_device_unref() + was never called on event "remove". + + - Cleanup HPStopHotPluggables() function, which release now all + allocated resources, including udev. It also will not crash when + in HPRegisterForHotplugEvents() was not able to acquire + resources. + + - Replace the prehistoric select() by poll(), which is faster and + consumes less memory. + + Changlog: + + V1 4-Aug-2014 first release V2 5-Aug-2014 Fix coding style. + Optimize HPRemoveDevice() Cleanup HPStopHotPluggables() Fix a + resource leak not calling udev_device_unref() in case of "add" or + "remove" event. V3 5-Aug-2014 Fix resource leak in + HPStopHotPluggables(), release udev Fix error handling in + HPRegisterForHotplugEvents() and HPStopHotPluggables() Revert + unneeded RFRemoveReader() in HPRegisterForHotplugEvents() + + - Stefani + + Signed-off-by: Stefani Seibold <stefani at seibold.net> " + + Thanks to Stefani Seibold for the patch + http://lists.alioth.debian.org/pipermail/pcsclite-muscle/Week-of-Mon-20140804/000093.html + +2014-08-06 Ludovic Rousseau + + * [r6950] src/utils.c: Adjust the thread stack size + + The size of 4 MB is not needed and too big (see revision 6948). + By default the thread stack size is: - 8 MB on Debian GNU/Linux - + 256 KB on Mac OS X 10.9 - 80 KB on musl, but it is not enough for + pcsc-lite + + 256 KB (like on Mac OS X 10.9) is enough for musl. + * [r6949] src/utils.c: Factorize error code + * [r6948] src/utils.c: Increase the thread stack size to at least 4 + MB + + " Recently I tried to run it on a non-glibc system using musl + instead. Turns out musl has a default stacksize of 80KB instead + of the multi-megabyte we are used to in glibc. This leads to + segfaults when pcscd tries to allocate buffers on the stack. To + fix this i applied the following patch: + https://github.com/stef/aports/blob/master/main/pcsc-lite/musl-stacksize.patch + + I would be very thankful if you would incorporate this "upstream" + so that other musl users can happily enjoy pcsc and friends. " + + Thanks to Stefan Marsiske for the patch + +2014-07-29 Ludovic Rousseau + + * [r6944] src/configfile.l: Add ReiserFS support (and maybe some + other strange file systems) + + "the attached patch fixes incorrect use of the dirent::d_type + field. As documented in readdir(3) d_type may be set to + DT_UNKNOWN, which applications must handle properly. + + The effect of the bug is that config files are skipped in case + the config directory is located on a file system that doesn't + support d_type (e.g. ReiserFS)." + + Thanks to Ingo Weinhold for the patch + +2014-06-13 Ludovic Rousseau + + * [r6918] src/auth.c: Change return value of IsClientAuthorized() + + The version of IsClientAuthorized() when PolicyKit is not used + was not similar to the other version. + + Fixes Debian bug #751517 + +2014-06-05 Ludovic Rousseau + + * [r6911] src/hotplug_libudev.c: Check udev functions for errors + + Prevent the crash reported at: + https://bugzilla.redhat.com/show_bug.cgi?id=1071243 + + Thanks to Nikos Mavrogiannopoulos for the patch + http://lists.alioth.debian.org/pipermail/pcsclite-muscle/Week-of-Mon-20140602/000039.html + +2014-04-18 Ludovic Rousseau + + * [r6888] GPL-3.0.txt, doc/example/GPL-3.0.txt: Move the GNU GPL v3 + license in the project root directory + * [r6887] COPYING: Some files are under GNU GPL v3+ license + * [r6886] doc/example/GPL-2, doc/example/GPL-3.0.txt: Replase GNU + GPL v2 by GPL v3 license text + + Since revision 6003 (2011-10-05) pcsc_demo.c moved from GNU GPL + v2+ to GNU GPL v3+ + +2014-02-26 Ludovic Rousseau + + * [r6861] NEWS: Remove reference about "new MuscleCard" applet + +2014-02-20 Ludovic Rousseau + + * [r6859] configure.ac: Make --disable-polkit + + Thanks to Diego Elio Pettenò for the bug report + 2014-02-14 Ludovic Rousseau * [r6853] ChangeLog, configure.ac: Release 1.8.11 diff -Nru pcsc-lite-1.8.12/configure.ac pcsc-lite-1.8.13/configure.ac --- pcsc-lite-1.8.12/configure.ac 2014-09-24 15:04:40.000000000 +0200 +++ pcsc-lite-1.8.13/configure.ac 2014-11-07 13:19:23.000000000 +0100 @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([pcsc-lite],[1.8.12]) +AC_INIT([pcsc-lite],[1.8.13]) AC_CONFIG_SRCDIR(src/pcscdaemon.c) AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip) AC_CONFIG_HEADERS([config.h]) diff -Nru pcsc-lite-1.8.12/COPYING pcsc-lite-1.8.13/COPYING --- pcsc-lite-1.8.12/COPYING 2014-05-14 14:36:02.000000000 +0200 +++ pcsc-lite-1.8.13/COPYING 2014-11-07 09:23:58.000000000 +0100 @@ -14,9 +14,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -33,3 +30,106 @@ - doc/example/pcsc_demo.c - the files in src/spy/ - the files in UnitaryTests/ + + Copyright (C) 2003-2014 Ludovic Rousseau + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + +Files src/auth.c and src/auth.h are: + * Copyright (C) 2013 Red Hat + * + * All rights reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * Author: Nikos Mavrogiannopoulos <n...@redhat.com> + + +Files src/sd-daemon.c and src/sd-daemon.h are: + Copyright 2010 Lennart Poettering + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + +Files src/simclist.c and src/simclist.h are: + * Copyright (c) 2007,2008,2009,2010,2011 Mij <m...@bitchx.it> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +File src/strlcpy.3, src/strlcat.c and src/strlcpy.c is: + * Copyright (c) 1998 Todd C. Miller <todd.mil...@courtesan.com> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + diff -Nru pcsc-lite-1.8.12/debian/changelog pcsc-lite-1.8.13/debian/changelog --- pcsc-lite-1.8.12/debian/changelog 2014-09-24 15:22:48.000000000 +0200 +++ pcsc-lite-1.8.13/debian/changelog 2014-11-07 13:36:58.000000000 +0100 @@ -1,3 +1,12 @@ +pcsc-lite (1.8.13-1) unstable; urgency=medium + + * New upstream release + * debian/control: Standards-Version: 3.9.5 -> 3.9.6. No change needed. + * Fix "Socket activation not working on first try". Fixed upstream + (Closes: #767862) + + -- Ludovic Rousseau <rouss...@debian.org> Fri, 07 Nov 2014 13:36:56 +0100 + pcsc-lite (1.8.12-1) unstable; urgency=medium * New upstream release diff -Nru pcsc-lite-1.8.12/debian/control pcsc-lite-1.8.13/debian/control --- pcsc-lite-1.8.12/debian/control 2014-05-18 17:32:28.000000000 +0200 +++ pcsc-lite-1.8.13/debian/control 2014-11-07 13:31:59.000000000 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ludovic Rousseau <rouss...@debian.org> Build-Depends: debhelper (>= 9), flex, dh-autoreconf, libudev-dev [linux-any], libusb2-dev [kfreebsd-any], pkg-config, dpkg-dev (>= 1.16.1~), dh-systemd (>= 1.4) -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Vcs-Svn: svn://anonscm.debian.org/collab-maint/deb-maint/pcsc-lite/trunk Vcs-Browser: http://anonscm.debian.org/viewvc/collab-maint/deb-maint/pcsc-lite/trunk/ Homepage: http://pcsclite.alioth.debian.org/ diff -Nru pcsc-lite-1.8.12/doc/pcscd.8.in pcsc-lite-1.8.13/doc/pcscd.8.in --- pcsc-lite-1.8.12/doc/pcscd.8.in 2014-09-17 15:06:57.000000000 +0200 +++ pcsc-lite-1.8.13/doc/pcscd.8.in 2014-11-07 09:23:57.000000000 +0100 @@ -40,22 +40,22 @@ The log levels are ordered as: debug < info < error < critical. Use a log level l will log this level and all the levels above it. .TP -.B --force-reader-polling +.B \-\-force\-reader\-polling ignore the IFD_GENERATE_HOTPLUG reader capability .TP -.BR \-t ", " \-\-max-thread +.BR \-t ", " \-\-max\-thread maximum number of threads (default 200). This is the maximum number of clients (SCardEstablishContext) that pcscd can handle. .TP -.BR \-s ", " \-\-max-card-handle-per-thread +.BR \-s ", " \-\-max\-card\-handle\-per\-thread maximum number of card handle per thread (default: 200). This is the maximum number of card handle (SCardConnect) per client (SCardEstablishContext). .TP -.BR \-r ", " \-\-max-card-handle-per-reader +.BR \-r ", " \-\-max\-card\-handle\-per\-reader maximum number of card handle per reader (default: 200) This is the maximum number of card handle (SCardConnect) per reader. @@ -72,6 +72,16 @@ .I @confdir_exp@/reader.conf file to detect added or removed non-USB readers (serial or PCMCIA). . +.TP +.BR \-x ", " \-\-auto\-exit +pcscd will quit after 60 seconds of inactivity. This is used when pcscd +os started on demand by systemd. +.TP +.BR \-S ", " \-\-reader\-name\-no\-serial +Do not include the USB serial number in the reader name. +.TP +.BR \-I ", " \-\-reader\-name\-no\-interface +Do not include the USB interface name in the reader name. .SH DESCRIPTION pcscd is the daemon program for pcsc-lite. It is a resource manager that coordinates communications with smart card readers and smart cards and diff -Nru pcsc-lite-1.8.12/src/atrhandler.c pcsc-lite-1.8.13/src/atrhandler.c --- pcsc-lite-1.8.12/src/atrhandler.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/atrhandler.c 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atrhandler.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: atrhandler.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/atrhandler.h pcsc-lite-1.8.13/src/atrhandler.h --- pcsc-lite-1.8.12/src/atrhandler.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/atrhandler.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atrhandler.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: atrhandler.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/auth.c pcsc-lite-1.8.13/src/auth.c --- pcsc-lite-1.8.12/src/auth.c 2014-08-06 15:57:33.000000000 +0200 +++ pcsc-lite-1.8.13/src/auth.c 2014-11-07 13:12:53.000000000 +0100 @@ -47,6 +47,7 @@ #include <sys/un.h> #include <stdio.h> #include "debuglog.h" +#include "auth.h" #include <errno.h> @@ -149,6 +150,10 @@ unsigned IsClientAuthorized(int socket, const char* action, const char* reader) { + (void)socket; + (void)action; + (void)reader; + return 1; } diff -Nru pcsc-lite-1.8.12/src/configfile.h pcsc-lite-1.8.13/src/configfile.h --- pcsc-lite-1.8.12/src/configfile.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/configfile.h 2014-11-07 09:23:58.000000000 +0100 @@ -20,9 +20,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,7 +31,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: configfile.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: configfile.h 7004 2014-10-02 09:26:36Z rousseau $ */ #ifndef __configfile_h__ diff -Nru pcsc-lite-1.8.12/src/configfile.l pcsc-lite-1.8.13/src/configfile.l --- pcsc-lite-1.8.12/src/configfile.l 2014-08-06 15:57:33.000000000 +0200 +++ pcsc-lite-1.8.13/src/configfile.l 2014-11-07 09:23:58.000000000 +0100 @@ -22,9 +22,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -36,7 +33,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: configfile.l 6944 2014-07-29 08:33:27Z rousseau $ + * $Id: configfile.l 7004 2014-10-02 09:26:36Z rousseau $ */ %{ diff -Nru pcsc-lite-1.8.12/src/debug.c pcsc-lite-1.8.13/src/debug.c --- pcsc-lite-1.8.12/src/debug.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/debug.c 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: debug.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: debug.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/debuglog.c pcsc-lite-1.8.13/src/debuglog.c --- pcsc-lite-1.8.12/src/debuglog.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/debuglog.c 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: debuglog.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: debuglog.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/dyn_generic.h pcsc-lite-1.8.13/src/dyn_generic.h --- pcsc-lite-1.8.12/src/dyn_generic.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/dyn_generic.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: dyn_generic.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: dyn_generic.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/dyn_hpux.c pcsc-lite-1.8.13/src/dyn_hpux.c --- pcsc-lite-1.8.12/src/dyn_hpux.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/dyn_hpux.c 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: dyn_hpux.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: dyn_hpux.c 7004 2014-10-02 09:26:36Z rousseau $ */ /* diff -Nru pcsc-lite-1.8.12/src/dyn_macosx.c pcsc-lite-1.8.13/src/dyn_macosx.c --- pcsc-lite-1.8.12/src/dyn_macosx.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/dyn_macosx.c 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: dyn_macosx.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: dyn_macosx.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/dyn_unix.c pcsc-lite-1.8.13/src/dyn_unix.c --- pcsc-lite-1.8.12/src/dyn_unix.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/dyn_unix.c 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: dyn_unix.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: dyn_unix.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/error.c pcsc-lite-1.8.13/src/error.c --- pcsc-lite-1.8.12/src/error.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/error.c 2014-11-07 09:23:58.000000000 +0100 @@ -22,9 +22,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -36,7 +33,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: error.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: error.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/eventhandler.c pcsc-lite-1.8.13/src/eventhandler.c --- pcsc-lite-1.8.12/src/eventhandler.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/eventhandler.c 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: eventhandler.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: eventhandler.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/eventhandler.h pcsc-lite-1.8.13/src/eventhandler.h --- pcsc-lite-1.8.12/src/eventhandler.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/eventhandler.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: eventhandler.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: eventhandler.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/hotplug_generic.c pcsc-lite-1.8.13/src/hotplug_generic.c --- pcsc-lite-1.8.12/src/hotplug_generic.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/hotplug_generic.c 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: hotplug_generic.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: hotplug_generic.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/hotplug.h pcsc-lite-1.8.13/src/hotplug.h --- pcsc-lite-1.8.12/src/hotplug.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/hotplug.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: hotplug.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: hotplug.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/hotplug_libudev.c pcsc-lite-1.8.13/src/hotplug_libudev.c --- pcsc-lite-1.8.12/src/hotplug_libudev.c 2014-08-08 18:57:27.000000000 +0200 +++ pcsc-lite-1.8.13/src/hotplug_libudev.c 2014-11-07 11:04:51.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: hotplug_libudev.c 6953 2014-08-07 12:59:33Z rousseau $ + * $Id: hotplug_libudev.c 7033 2014-11-07 10:04:52Z rousseau $ */ /** @@ -559,9 +556,9 @@ } -static void HPEstablishUSBNotifications(void *notused) +static void HPEstablishUSBNotifications(void *arg) { - struct udev_monitor *udev_monitor; + struct udev_monitor *udev_monitor = arg; int r; int fd; struct pollfd pfd; @@ -569,29 +566,6 @@ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL); - udev_monitor = udev_monitor_new_from_netlink(Udev, "udev"); - if (NULL == udev_monitor) - { - Log1(PCSC_LOG_ERROR, "udev_monitor_new_from_netlink() error"); - pthread_exit(NULL); - } - - /* filter only the interfaces */ - r = udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "usb", - "usb_interface"); - if (r) - { - Log2(PCSC_LOG_ERROR, "udev_monitor_filter_add_match_subsystem_devtype() error: %d\n", r); - pthread_exit(NULL); - } - - r = udev_monitor_enable_receiving(udev_monitor); - if (r) - { - Log2(PCSC_LOG_ERROR, "udev_monitor_enable_receiving() error: %d\n", r); - pthread_exit(NULL); - } - /* udev monitor file descriptor */ fd = udev_monitor_get_fd(udev_monitor); if (fd < 0) @@ -600,8 +574,6 @@ pthread_exit(NULL); } - HPScanUSB(Udev); - pfd.fd = fd; pfd.events = POLLIN; @@ -711,6 +683,9 @@ */ ULONG HPRegisterForHotplugEvents(void) { + struct udev_monitor *udev_monitor; + int r; + if (driverSize <= 0) { Log1(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: " @@ -727,8 +702,34 @@ return SCARD_F_INTERNAL_ERROR; } + udev_monitor = udev_monitor_new_from_netlink(Udev, "udev"); + if (NULL == udev_monitor) + { + Log1(PCSC_LOG_ERROR, "udev_monitor_new_from_netlink() error"); + pthread_exit(NULL); + } + + /* filter only the interfaces */ + r = udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "usb", + "usb_interface"); + if (r) + { + Log2(PCSC_LOG_ERROR, "udev_monitor_filter_add_match_subsystem_devtype() error: %d\n", r); + pthread_exit(NULL); + } + + r = udev_monitor_enable_receiving(udev_monitor); + if (r) + { + Log2(PCSC_LOG_ERROR, "udev_monitor_enable_receiving() error: %d\n", r); + pthread_exit(NULL); + } + + /* scan the USB bus at least once before accepting client connections */ + HPScanUSB(Udev); + if (ThreadCreate(&usbNotifyThread, 0, - (PCSCLITE_THREAD_FUNCTION( )) HPEstablishUSBNotifications, NULL)) + (PCSCLITE_THREAD_FUNCTION( )) HPEstablishUSBNotifications, udev_monitor)) { Log1(PCSC_LOG_ERROR, "ThreadCreate() failed"); return SCARD_F_INTERNAL_ERROR; diff -Nru pcsc-lite-1.8.12/src/hotplug_libusb.c pcsc-lite-1.8.13/src/hotplug_libusb.c --- pcsc-lite-1.8.12/src/hotplug_libusb.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/hotplug_libusb.c 2014-11-07 09:23:58.000000000 +0100 @@ -22,9 +22,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -36,7 +33,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: hotplug_libusb.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: hotplug_libusb.c 7029 2014-11-06 14:57:11Z rousseau $ */ /** @@ -435,7 +432,6 @@ /* signal that the initially connected readers are now visible */ write(pipefd[1], &c, 1); - close(pipefd[1]); /* if at least one driver do not have IFD_GENERATE_HOTPLUG */ do_polling = FALSE; @@ -512,7 +508,10 @@ /* Wait for initial readers to setup */ read(pipefd[0], &c, 1); + + /* cleanup pipe fd */ close(pipefd[0]); + close(pipefd[1]); } return 0; diff -Nru pcsc-lite-1.8.12/src/hotplug_linux.c pcsc-lite-1.8.13/src/hotplug_linux.c --- pcsc-lite-1.8.12/src/hotplug_linux.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/hotplug_linux.c 2014-11-07 09:23:58.000000000 +0100 @@ -21,9 +21,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -35,7 +32,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: hotplug_linux.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: hotplug_linux.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/hotplug_macosx.c pcsc-lite-1.8.13/src/hotplug_macosx.c --- pcsc-lite-1.8.12/src/hotplug_macosx.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/hotplug_macosx.c 2014-11-07 09:23:58.000000000 +0100 @@ -22,9 +22,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -36,7 +33,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: hotplug_macosx.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: hotplug_macosx.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/ifdwrapper.c pcsc-lite-1.8.13/src/ifdwrapper.c --- pcsc-lite-1.8.12/src/ifdwrapper.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/ifdwrapper.c 2014-11-07 09:23:58.000000000 +0100 @@ -20,9 +20,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,7 +31,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ifdwrapper.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: ifdwrapper.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/ifdwrapper.h pcsc-lite-1.8.13/src/ifdwrapper.h --- pcsc-lite-1.8.12/src/ifdwrapper.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/ifdwrapper.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ifdwrapper.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: ifdwrapper.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/lassert.h pcsc-lite-1.8.13/src/lassert.h --- pcsc-lite-1.8.12/src/lassert.h 2014-02-11 18:47:36.000000000 +0100 +++ pcsc-lite-1.8.13/src/lassert.h 2014-11-07 09:23:58.000000000 +0100 @@ -16,9 +16,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. diff -Nru pcsc-lite-1.8.12/src/Makefile.am pcsc-lite-1.8.13/src/Makefile.am --- pcsc-lite-1.8.12/src/Makefile.am 2014-02-11 18:47:36.000000000 +0100 +++ pcsc-lite-1.8.13/src/Makefile.am 2014-11-07 11:22:59.000000000 +0100 @@ -101,7 +101,7 @@ update-systemd: curl -O http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c - curl -O http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h + curl -O http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h testpcsc_SOURCES = testpcsc.c testpcsc_LDADD = libpcsclite.la diff -Nru pcsc-lite-1.8.12/src/Makefile.in pcsc-lite-1.8.13/src/Makefile.in --- pcsc-lite-1.8.12/src/Makefile.in 2014-09-24 15:04:47.000000000 +0200 +++ pcsc-lite-1.8.13/src/Makefile.in 2014-11-07 13:19:32.000000000 +0100 @@ -1641,7 +1641,7 @@ update-systemd: curl -O http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c - curl -O http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h + curl -O http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h # pcsc_wirecheck_CFLAGS := $(LIBPCSCLITE_CFLAGS) -DCOMPAT_64BIT_SERVER=1 diff -Nru pcsc-lite-1.8.12/src/misc.h pcsc-lite-1.8.13/src/misc.h --- pcsc-lite-1.8.12/src/misc.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/misc.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: misc.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: misc.h 7004 2014-10-02 09:26:36Z rousseau $ */ #ifndef __misc_h__ diff -Nru pcsc-lite-1.8.12/src/parser.h pcsc-lite-1.8.13/src/parser.h --- pcsc-lite-1.8.12/src/parser.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/parser.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: parser.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: parser.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/PCSC/debuglog.h pcsc-lite-1.8.13/src/PCSC/debuglog.h --- pcsc-lite-1.8.12/src/PCSC/debuglog.h 2014-09-17 15:06:57.000000000 +0200 +++ pcsc-lite-1.8.13/src/PCSC/debuglog.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: debuglog.h 6965 2014-09-01 14:52:42Z rousseau $ + * $Id: debuglog.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/PCSC/ifdhandler.h pcsc-lite-1.8.13/src/PCSC/ifdhandler.h --- pcsc-lite-1.8.12/src/PCSC/ifdhandler.h 2014-09-17 15:06:57.000000000 +0200 +++ pcsc-lite-1.8.13/src/PCSC/ifdhandler.h 2014-11-07 09:23:58.000000000 +0100 @@ -20,9 +20,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,7 +31,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ifdhandler.h 6965 2014-09-01 14:52:42Z rousseau $ + * $Id: ifdhandler.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/PCSC/pcsclite.h pcsc-lite-1.8.13/src/PCSC/pcsclite.h --- pcsc-lite-1.8.12/src/PCSC/pcsclite.h 2014-09-24 15:04:58.000000000 +0200 +++ pcsc-lite-1.8.13/src/PCSC/pcsclite.h 2014-11-07 13:19:40.000000000 +0100 @@ -20,9 +20,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,7 +31,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcsclite.h.in 6965 2014-09-01 14:52:42Z rousseau $ + * $Id: pcsclite.h.in 7004 2014-10-02 09:26:36Z rousseau $ */ /** @@ -216,7 +213,7 @@ #define INFINITE 0xFFFFFFFF /**< Infinite timeout */ #endif -#define PCSCLITE_VERSION_NUMBER "1.8.12" /**< Current version */ +#define PCSCLITE_VERSION_NUMBER "1.8.13" /**< Current version */ /** Maximum readers context (a slot is count as a reader) */ #define PCSCLITE_MAX_READERS_CONTEXTS 16 diff -Nru pcsc-lite-1.8.12/src/PCSC/pcsclite.h.in pcsc-lite-1.8.13/src/PCSC/pcsclite.h.in --- pcsc-lite-1.8.12/src/PCSC/pcsclite.h.in 2014-09-17 15:06:57.000000000 +0200 +++ pcsc-lite-1.8.13/src/PCSC/pcsclite.h.in 2014-11-07 09:23:58.000000000 +0100 @@ -20,9 +20,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,7 +31,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcsclite.h.in 6965 2014-09-01 14:52:42Z rousseau $ + * $Id: pcsclite.h.in 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/PCSC/reader.h pcsc-lite-1.8.13/src/PCSC/reader.h --- pcsc-lite-1.8.12/src/PCSC/reader.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/PCSC/reader.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: reader.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: reader.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/PCSC/winscard.h pcsc-lite-1.8.13/src/PCSC/winscard.h --- pcsc-lite-1.8.12/src/PCSC/winscard.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/PCSC/winscard.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: winscard.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: winscard.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/PCSC/wintypes.h pcsc-lite-1.8.13/src/PCSC/wintypes.h --- pcsc-lite-1.8.12/src/PCSC/wintypes.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/PCSC/wintypes.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: wintypes.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: wintypes.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/pcscdaemon.c pcsc-lite-1.8.13/src/pcscdaemon.c --- pcsc-lite-1.8.12/src/pcscdaemon.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/pcscdaemon.c 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcscdaemon.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: pcscdaemon.c 7026 2014-11-06 09:08:07Z rousseau $ */ /** @@ -384,7 +381,8 @@ rv = stat(PCSCLITE_CSOCK_NAME, &fStatBuf); - if (rv == 0) + /* if the file exist and pcscd was _not_ started by systemd */ + if (rv == 0 && !SocketActivated) { pid_t pid; diff -Nru pcsc-lite-1.8.12/src/pcscd.h pcsc-lite-1.8.13/src/pcscd.h --- pcsc-lite-1.8.12/src/pcscd.h 2014-09-24 15:04:58.000000000 +0200 +++ pcsc-lite-1.8.13/src/pcscd.h 2014-11-07 13:19:40.000000000 +0100 @@ -4,7 +4,30 @@ * Copyright (C) 2006-2011 * Ludovic Rousseau <ludovic.rouss...@free.fr> * - * $Id: pcscd.h.in 6851 2014-02-14 15:43:32Z rousseau $ + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $Id: pcscd.h.in 7006 2014-10-02 09:41:13Z rousseau $ */ /** @@ -30,7 +53,7 @@ #define PCSCLITE_CSOCK_NAME PCSCLITE_IPC_DIR "/pcscd.comm" -#define PCSCLITE_VERSION_NUMBER "1.8.12" /**< Current version */ +#define PCSCLITE_VERSION_NUMBER "1.8.13" /**< Current version */ #define PCSCLITE_STATUS_POLL_RATE 400000 /**< Status polling rate */ #define PCSCLITE_LOCK_POLL_RATE 100000 /**< Lock polling rate */ diff -Nru pcsc-lite-1.8.12/src/pcscd.h.in pcsc-lite-1.8.13/src/pcscd.h.in --- pcsc-lite-1.8.12/src/pcscd.h.in 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/pcscd.h.in 2014-11-07 11:01:11.000000000 +0100 @@ -4,7 +4,30 @@ * Copyright (C) 2006-2011 * Ludovic Rousseau <ludovic.rouss...@free.fr> * - * $Id: pcscd.h.in 6851 2014-02-14 15:43:32Z rousseau $ + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $Id: pcscd.h.in 7006 2014-10-02 09:41:13Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/pcsc-wirecheck-gen.c pcsc-lite-1.8.13/src/pcsc-wirecheck-gen.c --- pcsc-lite-1.8.12/src/pcsc-wirecheck-gen.c 2014-02-11 18:47:36.000000000 +0100 +++ pcsc-lite-1.8.13/src/pcsc-wirecheck-gen.c 2014-11-07 09:23:58.000000000 +0100 @@ -16,9 +16,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. diff -Nru pcsc-lite-1.8.12/src/powermgt_generic.c pcsc-lite-1.8.13/src/powermgt_generic.c --- pcsc-lite-1.8.12/src/powermgt_generic.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/powermgt_generic.c 2014-11-07 09:23:58.000000000 +0100 @@ -20,9 +20,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,7 +31,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: powermgt_generic.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: powermgt_generic.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/powermgt_generic.h pcsc-lite-1.8.13/src/powermgt_generic.h --- pcsc-lite-1.8.12/src/powermgt_generic.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/powermgt_generic.h 2014-11-07 09:23:58.000000000 +0100 @@ -16,9 +16,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -30,7 +27,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: powermgt_generic.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: powermgt_generic.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/prothandler.c pcsc-lite-1.8.13/src/prothandler.c --- pcsc-lite-1.8.12/src/prothandler.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/prothandler.c 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: prothandler.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: prothandler.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/prothandler.h pcsc-lite-1.8.13/src/prothandler.h --- pcsc-lite-1.8.12/src/prothandler.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/prothandler.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: prothandler.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: prothandler.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/readerfactory.c pcsc-lite-1.8.13/src/readerfactory.c --- pcsc-lite-1.8.12/src/readerfactory.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/readerfactory.c 2014-11-07 09:23:58.000000000 +0100 @@ -22,9 +22,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -36,7 +33,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: readerfactory.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: readerfactory.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/readerfactory.h pcsc-lite-1.8.13/src/readerfactory.h --- pcsc-lite-1.8.12/src/readerfactory.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/readerfactory.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: readerfactory.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: readerfactory.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/spy/install_spy.sh pcsc-lite-1.8.13/src/spy/install_spy.sh --- pcsc-lite-1.8.12/src/spy/install_spy.sh 2011-11-19 16:10:59.000000000 +0100 +++ pcsc-lite-1.8.13/src/spy/install_spy.sh 2014-11-07 09:34:33.000000000 +0100 @@ -3,7 +3,19 @@ # exit on the first error set -e -cd /usr/lib +# ldconfig --print-cache will return something like +# libpcsclite.so.1 (libc6,x86-64) => /usr/lib/x86_64-linux-gnu/libpcsclite.so.1 +DIR=$(ldconfig --print-cache | grep libpcsclite.so.1) + +# get the right part only: /usr/lib/x86_64-linux-gnu/libpcsclite.so.1 +DIR=$(echo $DIR | cut -d'=' -f2 | cut -d' ' -f2) + +# get the directory part only: /usr/lib/x86_64-linux-gnu +DIR=$(dirname $DIR) + +echo "Using directory:" $DIR + +cd $DIR NOSPY=libpcsclite_nospy.so.1 diff -Nru pcsc-lite-1.8.12/src/spy/uninstall_spy.sh pcsc-lite-1.8.13/src/spy/uninstall_spy.sh --- pcsc-lite-1.8.12/src/spy/uninstall_spy.sh 2011-10-22 10:30:37.000000000 +0200 +++ pcsc-lite-1.8.13/src/spy/uninstall_spy.sh 2014-11-07 09:23:58.000000000 +0100 @@ -3,7 +3,19 @@ # exit on the first error set -e -cd /usr/lib +# ldconfig --print-cache will return something like +# libpcsclite.so.1 (libc6,x86-64) => /usr/lib/x86_64-linux-gnu/libpcsclite.so.1 +DIR=$(ldconfig --print-cache | grep libpcsclite.so.1) + +# get the right part only: /usr/lib/x86_64-linux-gnu/libpcsclite.so.1 +DIR=$(echo $DIR | cut -d'=' -f2 | cut -d' ' -f2) + +# get the directory part only: /usr/lib/x86_64-linux-gnu +DIR=$(dirname $DIR) + +echo "Using directory:" $DIR + +cd $DIR # Use the real library again mv libpcsclite_nospy.so.1 libpcsclite.so.1.0.0 diff -Nru pcsc-lite-1.8.12/src/strlcpycat.h pcsc-lite-1.8.13/src/strlcpycat.h --- pcsc-lite-1.8.12/src/strlcpycat.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/strlcpycat.h 2014-11-07 09:23:58.000000000 +0100 @@ -16,9 +16,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -30,7 +27,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: strlcpycat.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: strlcpycat.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/sys_generic.h pcsc-lite-1.8.13/src/sys_generic.h --- pcsc-lite-1.8.12/src/sys_generic.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/sys_generic.h 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: sys_generic.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: sys_generic.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/sys_unix.c pcsc-lite-1.8.13/src/sys_unix.c --- pcsc-lite-1.8.12/src/sys_unix.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/sys_unix.c 2014-11-07 09:23:58.000000000 +0100 @@ -20,9 +20,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,7 +31,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: sys_unix.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: sys_unix.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/testpcsc.c pcsc-lite-1.8.13/src/testpcsc.c --- pcsc-lite-1.8.12/src/testpcsc.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/testpcsc.c 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: testpcsc.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: testpcsc.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/tokenparser.l pcsc-lite-1.8.13/src/tokenparser.l --- pcsc-lite-1.8.12/src/tokenparser.l 2014-09-17 15:06:57.000000000 +0200 +++ pcsc-lite-1.8.13/src/tokenparser.l 2014-11-07 09:23:58.000000000 +0100 @@ -20,9 +20,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,7 +31,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: tokenparser.l 6986 2014-09-15 08:04:47Z rousseau $ + * $Id: tokenparser.l 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/utils.c pcsc-lite-1.8.13/src/utils.c --- pcsc-lite-1.8.12/src/utils.c 2014-08-08 18:57:27.000000000 +0200 +++ pcsc-lite-1.8.13/src/utils.c 2014-11-07 09:23:58.000000000 +0100 @@ -16,9 +16,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -30,7 +27,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: utils.c 6950 2014-08-06 21:01:43Z rousseau $ + * $Id: utils.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/utils.h pcsc-lite-1.8.13/src/utils.h --- pcsc-lite-1.8.12/src/utils.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/utils.h 2014-11-07 09:23:58.000000000 +0100 @@ -16,9 +16,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -30,7 +27,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: utils.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: utils.h 7004 2014-10-02 09:26:36Z rousseau $ */ #ifndef __utils_h__ diff -Nru pcsc-lite-1.8.12/src/winscard.c pcsc-lite-1.8.13/src/winscard.c --- pcsc-lite-1.8.12/src/winscard.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/winscard.c 2014-11-07 09:23:58.000000000 +0100 @@ -18,9 +18,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -32,7 +29,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: winscard.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: winscard.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/winscard_clnt.c pcsc-lite-1.8.13/src/winscard_clnt.c --- pcsc-lite-1.8.12/src/winscard_clnt.c 2014-09-17 15:06:57.000000000 +0200 +++ pcsc-lite-1.8.13/src/winscard_clnt.c 2014-11-07 09:23:58.000000000 +0100 @@ -24,9 +24,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -38,7 +35,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: winscard_clnt.c 6989 2014-09-17 13:01:38Z rousseau $ + * $Id: winscard_clnt.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/winscard_msg.c pcsc-lite-1.8.13/src/winscard_msg.c --- pcsc-lite-1.8.12/src/winscard_msg.c 2014-09-17 15:06:57.000000000 +0200 +++ pcsc-lite-1.8.13/src/winscard_msg.c 2014-11-07 09:23:58.000000000 +0100 @@ -20,9 +20,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,7 +31,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: winscard_msg.c 6978 2014-09-09 09:18:06Z rousseau $ + * $Id: winscard_msg.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/winscard_msg.h pcsc-lite-1.8.13/src/winscard_msg.h --- pcsc-lite-1.8.12/src/winscard_msg.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/winscard_msg.h 2014-11-07 09:23:58.000000000 +0100 @@ -20,9 +20,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,7 +31,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: winscard_msg.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: winscard_msg.h 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/winscard_msg_srv.c pcsc-lite-1.8.13/src/winscard_msg_srv.c --- pcsc-lite-1.8.12/src/winscard_msg_srv.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/winscard_msg_srv.c 2014-11-07 09:23:58.000000000 +0100 @@ -20,9 +20,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,7 +31,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: winscard_msg_srv.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: winscard_msg_srv.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/winscard_svc.c pcsc-lite-1.8.13/src/winscard_svc.c --- pcsc-lite-1.8.12/src/winscard_svc.c 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/winscard_svc.c 2014-11-07 09:23:58.000000000 +0100 @@ -22,9 +22,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -36,7 +33,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: winscard_svc.c 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: winscard_svc.c 7004 2014-10-02 09:26:36Z rousseau $ */ /** diff -Nru pcsc-lite-1.8.12/src/winscard_svc.h pcsc-lite-1.8.13/src/winscard_svc.h --- pcsc-lite-1.8.12/src/winscard_svc.h 2014-02-14 17:15:44.000000000 +0100 +++ pcsc-lite-1.8.13/src/winscard_svc.h 2014-11-07 09:23:58.000000000 +0100 @@ -20,9 +20,6 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with -explicit written consent. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,7 +31,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: winscard_svc.h 6851 2014-02-14 15:43:32Z rousseau $ + * $Id: winscard_svc.h 7004 2014-10-02 09:26:36Z rousseau $ */ /**
