From a8201d4230ef66cd768e185189162453a86fb033 Mon Sep 17 00:00:00 2001 From: Ludovic Rousseau Date: Fri, 6 Aug 2021 22:17:18 +0200 Subject: [PATCH] New upstream version 1.9.3 --- ChangeLog | 5 ++ ChangeLog.git | 180 +++++++++++++++++++++++++--------------- Makefile.in | 1 + bootstrap | 1 + configure | 22 ++--- configure.ac | 3 +- doc/Makefile.in | 1 + doc/example/Makefile.in | 1 + etc/Makefile.in | 1 + src/Makefile.in | 1 + src/PCSC/pcsclite.h | 2 +- src/debug.c | 4 - src/pcscd.h | 2 +- src/spy/Makefile.in | 1 + 14 files changed, 141 insertions(+), 84 deletions(-) diff --git a/ChangeLog b/ChangeLog index 805ab76..d691b92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1.9.3: Ludovic Rousseau +6 August 2021 +- fix a stupid regression with systemd introduced in the previous version + + 1.9.2: Ludovic Rousseau 3 August 2021 - improve NetBSD support diff --git a/ChangeLog.git b/ChangeLog.git index d07cfe3..c9c666d 100644 --- a/ChangeLog.git +++ b/ChangeLog.git @@ -1,4 +1,50 @@ -commit 7afcaf630e2ce6d3d8079c0e59d52653e9f0f811 (HEAD -> master, tag: 1.9.2, zotac/master, origin/master, origin/HEAD, github/master) +commit 6a62e0b5c956ee5a27a00083ee795220ed2fc4d6 (HEAD -> master, tag: 1.9.3, zotac/master, origin/master, origin/HEAD, github/master) +Author: Ludovic Rousseau +Date: Fri Aug 6 22:03:15 2021 +0200 + + Release 1.9.3 + + Signed-off-by: Ludovic Rousseau + + ChangeLog | 5 +++++ + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 7b19311caed2249aedde59db5465f63f9d70b840 +Author: Christian Hesse +Date: Fri Aug 6 15:41:43 2021 +0200 + + Mention autoconf-archive for bootstrap + + ... which is now required. + + bootstrap | 1 + + 1 file changed, 1 insertion(+) + +commit 9330cd7c8a7d07ab082e684575973b6f0602fe70 +Author: Christian Hesse +Date: Fri Aug 6 15:35:11 2021 +0200 + + Fix substitution of sbindir_exp + + ... which is required for the systemd service file. + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit c19a8f200f753ea786b751584c9f11149b8f6c9b +Author: Ludovic Rousseau +Date: Wed Aug 4 15:52:44 2021 +0200 + + debug.c: remove MUSCLECARD_DEBUG use + + The MuscleCard project is now dead since a long time. + Remove unused code. + + src/debug.c | 4 ---- + 1 file changed, 4 deletions(-) + +commit 7afcaf630e2ce6d3d8079c0e59d52653e9f0f811 (tag: 1.9.2) Author: Ludovic Rousseau Date: Tue Aug 3 18:55:23 2021 +0200 @@ -1335,7 +1381,7 @@ Date: Sun Jun 14 16:58:24 2020 +0200 doc/README.DAEMON | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) -commit e796a0f12fbefa459bff0d25e27089615fa91f21 (tag: 1.9.0) +commit e796a0f12fbefa459bff0d25e27089615fa91f21 (tag: pcsc-1.9.0, tag: 1.9.0) Author: Ludovic Rousseau Date: Sun Jun 14 15:26:31 2020 +0200 @@ -1519,7 +1565,7 @@ Date: Wed Jan 8 22:29:49 2020 +0100 configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit b0c2f30c2bfe7f22fe1b985e647c6cb61cc66275 (tag: 1.8.26) +commit b0c2f30c2bfe7f22fe1b985e647c6cb61cc66275 (tag: pcsc-1.8.26, tag: 1.8.26) Author: Ludovic Rousseau Date: Fri Jan 3 17:29:44 2020 +0100 @@ -2000,7 +2046,7 @@ Date: Fri May 17 15:48:35 2019 +0200 src/spy/Makefile.am | 2 ++ 2 files changed, 9 insertions(+) -commit efc56971cb8f8bf9cb44090bb3851d8c1d2a00f7 (tag: 1.8.25) +commit efc56971cb8f8bf9cb44090bb3851d8c1d2a00f7 (tag: pcsc-1.8.25, tag: 1.8.25) Author: Ludovic Rousseau Date: Mon Mar 25 20:56:43 2019 +0100 @@ -2181,7 +2227,7 @@ Date: Thu Nov 15 11:54:31 2018 +0100 src/winscard_clnt.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) -commit 73d95ada3221c060cbd7b6aa2375453f9d0e359b (tag: 1.8.24) +commit 73d95ada3221c060cbd7b6aa2375453f9d0e359b (tag: pcsc-1.8.24, tag: 1.8.24) Author: Ludovic Rousseau Date: Fri Oct 12 10:43:51 2018 +0200 @@ -2816,7 +2862,7 @@ Date: Tue Dec 19 16:13:42 2017 +0100 etc/pcscd.service.in | 1 + 1 file changed, 1 insertion(+) -commit 09f0f85b86e7488cf26642dd17150f76bed5300c (tag: 1.8.23) +commit 09f0f85b86e7488cf26642dd17150f76bed5300c (tag: pcsc-1.8.23, tag: 1.8.23) Author: Ludovic Rousseau Date: Mon Dec 18 19:56:49 2017 +0100 @@ -3048,7 +3094,7 @@ Date: Thu Jul 13 17:52:13 2017 +0200 src/winscard_msg_srv.c | 6 +- 6 files changed, 26 insertions(+), 813 deletions(-) -commit 696023944649e0c52802e20994fb78d6b24d4efd (tag: 1.8.22) +commit 696023944649e0c52802e20994fb78d6b24d4efd (tag: pcsc-1.8.22, tag: 1.8.22) Author: Ludovic Rousseau Date: Sat Jun 17 08:56:54 2017 +0200 @@ -3133,7 +3179,7 @@ Date: Wed May 3 15:29:45 2017 +0200 src/pcscdaemon.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -commit f47cccffcb534a7bd3528790d55d7ce5a71d70de (tag: 1.8.21) +commit f47cccffcb534a7bd3528790d55d7ce5a71d70de (tag: pcsc-1.8.21, tag: 1.8.21) Author: Ludovic Rousseau Date: Sat May 20 17:11:50 2017 +0200 @@ -4071,7 +4117,7 @@ Date: Wed Jan 18 16:58:29 2017 +0100 src/error.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -commit 980fdc357bc36e3f608462a1d7bcb182b1bacdae (tag: 1.8.20) +commit 980fdc357bc36e3f608462a1d7bcb182b1bacdae (tag: pcsc-1.8.20, tag: 1.8.20) Author: Ludovic Rousseau Date: Fri Dec 30 18:10:07 2016 +0100 @@ -4113,7 +4159,7 @@ Date: Sun Dec 25 23:31:24 2016 +0100 src/winscard_svc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -commit c10dac9ce97ed3fda204fd73ef1f19ac4446426d (tag: 1.8.19) +commit c10dac9ce97ed3fda204fd73ef1f19ac4446426d (tag: pcsc-1.8.19, tag: 1.8.19) Author: Ludovic Rousseau Date: Fri Dec 9 10:07:52 2016 +0100 @@ -4406,7 +4452,7 @@ Date: Thu Aug 25 10:11:25 2016 +0200 UnitaryTests/stress_get_firmware.py | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) -commit 12ed49c6130da8e0365db02b289feb99b54d1d96 (tag: 1.8.18) +commit 12ed49c6130da8e0365db02b289feb99b54d1d96 (tag: pcsc-1.8.18, tag: 1.8.18) Author: Ludovic Rousseau Date: Wed Aug 10 20:33:07 2016 +0200 @@ -4643,7 +4689,7 @@ Date: Tue May 31 20:17:10 2016 +0200 src/readerfactory.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) -commit f74dc1feea4c7a2345abb3e1861b350d46946c86 (tag: 1.8.17) +commit f74dc1feea4c7a2345abb3e1861b350d46946c86 (tag: pcsc-1.8.17, tag: 1.8.17) Author: Ludovic Rousseau Date: Sun May 29 14:11:21 2016 +0200 @@ -5024,7 +5070,7 @@ Date: Thu Mar 31 11:42:39 2016 +0200 src/winscard_clnt.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) -commit 55fa57fc691b732535fc3384a214b1daa133a127 (tag: 1.8.16) +commit 55fa57fc691b732535fc3384a214b1daa133a127 (tag: pcsc-1.8.16, tag: 1.8.16) Author: Ludovic Rousseau Date: Sun Mar 20 16:57:30 2016 +0100 @@ -5329,7 +5375,7 @@ Date: Fri Jan 29 18:02:20 2016 +0100 src/pcscdaemon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit f4354e5b1293173fa3dc14aa28471193a29e36ea (tag: 1.8.15) +commit f4354e5b1293173fa3dc14aa28471193a29e36ea (tag: pcsc-1.8.15, tag: 1.8.15) Author: Ludovic Rousseau Date: Fri Dec 25 21:24:27 2015 +0100 @@ -5611,7 +5657,7 @@ Date: Fri Aug 7 15:04:12 2015 +0200 src/tokenparser.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 2891196bc817619c465920651d342a856d0551a3 (tag: 1.8.14) +commit 2891196bc817619c465920651d342a856d0551a3 (tag: pcsc-1.8.14, tag: 1.8.14) Author: Ludovic Rousseau Date: Wed Aug 5 12:55:15 2015 +0200 @@ -6370,7 +6416,7 @@ Date: Fri Nov 14 09:08:41 2014 +0000 src/winscard_clnt.c | 3 +++ 2 files changed, 5 insertions(+) -commit aa3058d6f848c8c5bb446713b17f0c48a6713f70 (tag: 1.8.13) +commit aa3058d6f848c8c5bb446713b17f0c48a6713f70 (tag: pcsc-1.8.13, tag: 1.8.13) Author: Ludovic Rousseau Date: Fri Nov 7 12:18:04 2014 +0000 @@ -6700,7 +6746,7 @@ Date: Wed Sep 24 13:08:09 2014 +0000 doc/example/Makefile.am | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) -commit 0842328655f97d7b00be25619df407b8d1589f51 (tag: 1.8.12) +commit 0842328655f97d7b00be25619df407b8d1589f51 (tag: pcsc-1.8.12, tag: 1.8.12) Author: Ludovic Rousseau Date: Wed Sep 24 13:03:57 2014 +0000 @@ -7217,7 +7263,7 @@ Date: Thu Feb 20 14:02:47 2014 +0000 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit b8a328f5275792032b86fe965a6a4bb561fa7bf1 (tag: 1.8.11) +commit b8a328f5275792032b86fe965a6a4bb561fa7bf1 (tag: pcsc-1.8.11, tag: 1.8.11) Author: Ludovic Rousseau Date: Fri Feb 14 16:14:37 2014 +0000 @@ -7543,7 +7589,7 @@ Date: Thu Oct 24 14:04:14 2013 +0000 src/configfile.l | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) -commit 9e409c17cee98b335ff81561686486dbff07fea3 (tag: 1.8.10) +commit 9e409c17cee98b335ff81561686486dbff07fea3 (tag: pcsc-1.8.10, tag: 1.8.10) Author: Ludovic Rousseau Date: Sat Oct 19 16:36:57 2013 +0000 @@ -7622,7 +7668,7 @@ Date: Thu Oct 17 13:02:41 2013 +0000 src/debug.c | 2 ++ 1 file changed, 2 insertions(+) -commit 190ff98475471aebae1ab1cebf2c30ca3ca43c8e (tag: 1.8.9) +commit 190ff98475471aebae1ab1cebf2c30ca3ca43c8e (tag: pcsc-1.8.9, tag: 1.8.9) Author: Ludovic Rousseau Date: Wed Oct 16 14:28:36 2013 +0000 @@ -8809,7 +8855,7 @@ Date: Mon Jan 21 10:54:41 2013 +0000 src/spy/libpcscspy.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -commit 38efc7204e71c5aa1ececb5af610008ffdae0e3b (tag: 1.8.8) +commit 38efc7204e71c5aa1ececb5af610008ffdae0e3b (tag: pcsc-1.8.8, tag: 1.8.8) Author: Ludovic Rousseau Date: Wed Jan 16 14:51:12 2013 +0000 @@ -8899,7 +8945,7 @@ Date: Tue Jan 15 17:42:13 2013 +0000 src/configfile.l | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -commit a34bd69e5ae45cc65722d181126661ca31e6fe5e (tag: 1.8.7) +commit a34bd69e5ae45cc65722d181126661ca31e6fe5e (tag: pcsc-1.8.7, tag: 1.8.7) Author: Ludovic Rousseau Date: Wed Nov 28 17:41:48 2012 +0000 @@ -9086,7 +9132,7 @@ Date: Thu Aug 30 16:55:11 2012 +0000 m4/{acx_pthread.m4 => ax_pthread.m4} | 142 ++++++++++++++++++++++------------- 3 files changed, 91 insertions(+), 58 deletions(-) -commit c7c140d327adf07ab477eedd2fee38781bce35e5 (tag: 1.8.6) +commit c7c140d327adf07ab477eedd2fee38781bce35e5 (tag: pcsc-1.8.6, tag: 1.8.6) Author: Ludovic Rousseau Date: Thu Aug 30 16:25:19 2012 +0000 @@ -9350,7 +9396,7 @@ Date: Sun Aug 5 07:57:53 2012 +0000 src/pcscdaemon.c | 2 ++ 1 file changed, 2 insertions(+) -commit 1694ebff70f596242f2e20e3e3bceeb6efa2ebee (tag: 1.8.5) +commit 1694ebff70f596242f2e20e3e3bceeb6efa2ebee (tag: pcsc-1.8.5, tag: 1.8.5) Author: Ludovic Rousseau Date: Sat Aug 4 13:48:06 2012 +0000 @@ -9759,7 +9805,7 @@ Date: Tue Jun 26 19:35:15 2012 +0000 doc/doxygen.conf.in | 220 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 148 insertions(+), 72 deletions(-) -commit 9b81a380be1a917b29c167e7f6146f0f9a67e0a5 (tag: 1.8.4) +commit 9b81a380be1a917b29c167e7f6146f0f9a67e0a5 (tag: pcsc-1.8.4, tag: 1.8.4) Author: Ludovic Rousseau Date: Tue Jun 26 18:57:54 2012 +0000 @@ -10213,7 +10259,7 @@ Date: Wed Apr 4 20:05:12 2012 +0000 UnitaryTests/FEATURE_CCID_ESC_COMMAND_Gemalto_features.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -commit 72212038f302f3c6c442bbaa85595d7b070e39bc (tag: 1.8.3) +commit 72212038f302f3c6c442bbaa85595d7b070e39bc (tag: pcsc-1.8.3, tag: 1.8.3) Author: Ludovic Rousseau Date: Fri Mar 30 12:11:41 2012 +0000 @@ -10531,7 +10577,7 @@ Date: Tue Jan 24 09:51:59 2012 +0000 src/spy/libpcscspy.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -commit f3f74aa9b780ec91a0c463dd7a5e04cfa3545d31 (tag: 1.8.2) +commit f3f74aa9b780ec91a0c463dd7a5e04cfa3545d31 (tag: pcsc-1.8.2, tag: 1.8.2) Author: Ludovic Rousseau Date: Wed Jan 18 15:49:24 2012 +0000 @@ -10837,7 +10883,7 @@ Date: Sat Nov 26 10:37:50 2011 +0000 etc/pcscd.service.in | 1 - 1 file changed, 1 deletion(-) -commit 42bb772738528069732c30fd338e9a74014b69f4 (tag: 1.8.1) +commit 42bb772738528069732c30fd338e9a74014b69f4 (tag: pcsc-1.8.1, tag: 1.8.1) Author: Ludovic Rousseau Date: Fri Nov 25 14:06:09 2011 +0000 @@ -10862,7 +10908,7 @@ Date: Fri Nov 25 14:04:07 2011 +0000 src/spy/Makefile.am | 1 + 1 file changed, 1 insertion(+) -commit 0e0642477e0faf21ccf19015ac9c589df9e75c4c (tag: 1.8.0) +commit 0e0642477e0faf21ccf19015ac9c589df9e75c4c (tag: pcsc-1.8.0, tag: 1.8.0) Author: Ludovic Rousseau Date: Sat Nov 19 15:53:45 2011 +0000 @@ -13574,7 +13620,7 @@ Date: Tue Jun 28 12:39:13 2011 +0000 src/prothandler.c | 22 ++++--------- 3 files changed, 28 insertions(+), 117 deletions(-) -commit 9a3315e4702f85b748bf39e321325d9e8a8df592 (tag: 1.7.4) +commit 9a3315e4702f85b748bf39e321325d9e8a8df592 (tag: pcsc-1.7.4, tag: 1.7.4) Author: Ludovic Rousseau Date: Thu Jun 23 16:13:53 2011 +0000 @@ -13601,7 +13647,7 @@ Date: Thu Jun 23 15:45:35 2011 +0000 src/atrhandler.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) -commit af6168d730893c4e02741272f90f003e01a6ceda (tag: 1.7.3) +commit af6168d730893c4e02741272f90f003e01a6ceda (tag: pcsc-1.7.3, tag: 1.7.3) Author: Ludovic Rousseau Date: Wed Jun 22 07:27:34 2011 +0000 @@ -14167,7 +14213,7 @@ Date: Tue Apr 5 08:11:13 2011 +0000 src/pcscdaemon.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -commit 97be735f2b511ec94ec565f3a76e1ebb7b6db488 (tag: 1.7.2) +commit 97be735f2b511ec94ec565f3a76e1ebb7b6db488 (tag: pcsc-1.7.2, tag: 1.7.2) Author: Ludovic Rousseau Date: Thu Mar 31 19:47:14 2011 +0000 @@ -14195,7 +14241,7 @@ Date: Thu Mar 31 19:01:51 2011 +0000 src/hotplug_libudev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit facfaf377bd10005b22f3cc964b36adc8976be2a (tag: 1.7.1) +commit facfaf377bd10005b22f3cc964b36adc8976be2a (tag: pcsc-1.7.1, tag: 1.7.1) Author: Ludovic Rousseau Date: Wed Mar 30 08:16:28 2011 +0000 @@ -14322,7 +14368,7 @@ Date: Wed Mar 9 13:23:56 2011 +0000 ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit eec58d4ae7d0893c85ae7bce28214443892397c5 (tag: 1.7.0) +commit eec58d4ae7d0893c85ae7bce28214443892397c5 (tag: pcsc-1.7.0, tag: 1.7.0) Author: Ludovic Rousseau Date: Wed Mar 9 13:14:27 2011 +0000 @@ -14364,7 +14410,7 @@ Date: Thu Feb 24 19:34:58 2011 +0000 src/hotplug_libusb.c | 1 - 1 file changed, 1 deletion(-) -commit e026fd39ca90571e6d29324f4b8aac81c142f735 (tag: 1.6.7) +commit e026fd39ca90571e6d29324f4b8aac81c142f735 (tag: pcsc-1.6.7, tag: 1.6.7) Author: Ludovic Rousseau Date: Tue Feb 22 22:16:54 2011 +0000 @@ -15337,7 +15383,7 @@ Date: Tue Jan 4 14:25:03 2011 +0000 src/winscard_svc.c | 3 +++ 1 file changed, 3 insertions(+) -commit ceb3a81bae0db60d97b1cdd58747388b04237fe9 (tag: 1.6.6) +commit ceb3a81bae0db60d97b1cdd58747388b04237fe9 (tag: pcsc-1.6.6, tag: 1.6.6) Author: Ludovic Rousseau Date: Sun Dec 12 10:07:45 2010 +0000 @@ -15427,7 +15473,7 @@ Date: Fri Dec 3 14:40:08 2010 +0000 src/configfile.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 81093c8f92ed57c75fa98c4960e3b759f8ec926a (tag: 1.6.5) +commit 81093c8f92ed57c75fa98c4960e3b759f8ec926a (tag: pcsc-1.6.5, tag: 1.6.5) Author: Ludovic Rousseau Date: Fri Dec 3 14:19:49 2010 +0000 @@ -17361,7 +17407,7 @@ Date: Mon Aug 16 09:45:15 2010 +0000 src/pcscdaemon.c | 9 +++++++++ 1 file changed, 9 insertions(+) -commit 3b8038645ba31ba976221a83bc06daa0663e0772 (tag: 1.6.4) +commit 3b8038645ba31ba976221a83bc06daa0663e0772 (tag: pcsc-1.6.4, tag: 1.6.4) Author: Ludovic Rousseau Date: Sun Aug 15 18:48:26 2010 +0000 @@ -17393,7 +17439,7 @@ Date: Sun Aug 15 18:43:10 2010 +0000 configure.in | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) -commit b3b3286e080d940501d442e7977b1f2af2d37f90 (tag: 1.6.3) +commit b3b3286e080d940501d442e7977b1f2af2d37f90 (tag: pcsc-1.6.3, tag: 1.6.3) Author: Ludovic Rousseau Date: Sun Aug 15 15:39:38 2010 +0000 @@ -17613,7 +17659,7 @@ Date: Thu Aug 5 07:28:19 2010 +0000 c.sh | 2 -- 1 file changed, 2 deletions(-) -commit 13899db1aa8ab846599c59fd157936e96848a33e (tag: 1.6.2) +commit 13899db1aa8ab846599c59fd157936e96848a33e (tag: pcsc-1.6.2, tag: 1.6.2) Author: Ludovic Rousseau Date: Wed Aug 4 07:35:53 2010 +0000 @@ -18334,7 +18380,7 @@ Date: Mon Jun 7 11:46:29 2010 +0000 src/winscard_clnt.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -commit 645c81262684e4b2228b880426bbb283875a475c (tag: 1.6.1) +commit 645c81262684e4b2228b880426bbb283875a475c (tag: pcsc-1.6.1, tag: 1.6.1) Author: Ludovic Rousseau Date: Fri Jun 4 12:33:29 2010 +0000 @@ -18618,7 +18664,7 @@ Date: Tue May 11 13:16:00 2010 +0000 src/winscard.c | 4 ---- 1 file changed, 4 deletions(-) -commit 22ce041ad371cecadaf17155cce2d3cb48ef9691 (tag: 1.6.0) +commit 22ce041ad371cecadaf17155cce2d3cb48ef9691 (tag: pcsc-1.6.0, tag: 1.6.0) Author: Ludovic Rousseau Date: Wed May 5 09:53:51 2010 +0000 @@ -22782,7 +22828,7 @@ Date: Thu Jul 30 08:29:45 2009 +0000 src/configfile.l | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -commit f600b3d2ff2ed70caac6555157d35ed37305f6cd (tag: 1.5.5) +commit f600b3d2ff2ed70caac6555157d35ed37305f6cd (tag: pcsc-1.5.5, tag: 1.5.5) Author: Ludovic Rousseau Date: Tue Jul 28 21:44:42 2009 +0000 @@ -23092,7 +23138,7 @@ Date: Fri Jun 26 15:18:26 2009 +0000 UnitaryTests/MCT_ReaderDirect.py | 77 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) -commit c65f5fe58a9add484f9cd38ccf10397cead18f57 (tag: 1.5.4) +commit c65f5fe58a9add484f9cd38ccf10397cead18f57 (tag: pcsc-1.5.4, tag: 1.5.4) Author: Ludovic Rousseau Date: Wed Jun 24 06:28:47 2009 +0000 @@ -23471,7 +23517,7 @@ Date: Fri May 8 13:58:00 2009 +0000 src/winscard_clnt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -commit e6bea6ca4d8abcd2b00feed6bf2d1162c79b3542 (tag: 1.5.3) +commit e6bea6ca4d8abcd2b00feed6bf2d1162c79b3542 (tag: pcsc-1.5.3, tag: 1.5.3) Author: Ludovic Rousseau Date: Wed Apr 29 12:31:43 2009 +0000 @@ -23768,7 +23814,7 @@ Date: Mon Feb 9 13:53:52 2009 +0000 src/winscard_clnt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -commit 06c4cb7709bdd91546ce8ba216c1b12c00ef5406 (tag: 1.5.2) +commit 06c4cb7709bdd91546ce8ba216c1b12c00ef5406 (tag: pcsc-1.5.2, tag: 1.5.2) Author: Ludovic Rousseau Date: Fri Feb 6 13:21:21 2009 +0000 @@ -24017,7 +24063,7 @@ Date: Fri Jan 9 16:50:53 2009 +0000 src/winscard_clnt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -commit 48a6832a717639d2713f85f69d1abb00ef4ec640 (tag: 1.5.1) +commit 48a6832a717639d2713f85f69d1abb00ef4ec640 (tag: pcsc-1.5.1, tag: 1.5.1) Author: Ludovic Rousseau Date: Wed Jan 7 20:28:29 2009 +0000 @@ -24444,7 +24490,7 @@ Date: Tue Nov 18 20:32:29 2008 +0000 git-svn-id: svn://anonscm.debian.org/svn/pcsclite/trunk/PCSC@3211 0ce88b0d-b2fd-0310-8134-9614164e65ea -commit 557573f7ae43ca7e10f640b0b20cdb5364b47bb3 (tag: 1.5.0) +commit 557573f7ae43ca7e10f640b0b20cdb5364b47bb3 (tag: pcsc-1.5.0, tag: 1.5.0) Author: Ludovic Rousseau Date: Tue Nov 18 15:59:23 2008 +0000 @@ -25528,7 +25574,7 @@ Date: Fri Jul 4 08:31:37 2008 +0000 src/winscard_clnt.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) -commit 4c2cec2d35be1e9f004016f745529adbab8ff20e (tag: 1.4.102) +commit 4c2cec2d35be1e9f004016f745529adbab8ff20e (tag: pcsc-1.4.102, tag: 1.4.102) Author: Ludovic Rousseau Date: Fri Jun 27 08:04:57 2008 +0000 @@ -26160,7 +26206,7 @@ Date: Wed Apr 30 15:14:05 2008 +0000 src/winscard_clnt.c | 2 ++ 1 file changed, 2 insertions(+) -commit 2bc7751a92abb7271f0a9416ad0486f5c34f9fa9 (tag: 1.4.101) +commit 2bc7751a92abb7271f0a9416ad0486f5c34f9fa9 (tag: pcsc-1.4.101, tag: 1.4.101) Author: Ludovic Rousseau Date: Wed Apr 30 15:07:43 2008 +0000 @@ -26734,7 +26780,7 @@ Date: Fri Apr 4 13:42:42 2008 +0000 etc/pcscd.init.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -commit 5181385fb58cedc6cee61118c7c47ecdf8ccb12b (tag: 1.4.100) +commit 5181385fb58cedc6cee61118c7c47ecdf8ccb12b (tag: pcsc-1.4.100, tag: 1.4.100) Author: Ludovic Rousseau Date: Sun Mar 23 13:37:06 2008 +0000 @@ -27431,7 +27477,7 @@ Date: Fri Jan 11 09:59:12 2008 +0000 src/winscard_clnt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -commit a5cc268c4ac5b6d6d486d807f33070ecfff9fb10 (tag: 1.4.99) +commit a5cc268c4ac5b6d6d486d807f33070ecfff9fb10 (tag: pcsc-1.4.99, tag: 1.4.99) Author: Ludovic Rousseau Date: Wed Jan 9 08:58:49 2008 +0000 @@ -28002,7 +28048,7 @@ Date: Mon Aug 20 07:44:32 2007 +0000 src/thread_unix.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -commit 0a9be1c3882ebde19c9b84e65e8cd94da169ba9d (tag: 1.4.4) +commit 0a9be1c3882ebde19c9b84e65e8cd94da169ba9d (tag: pcsc-1.4.4, tag: 1.4.4) Author: Ludovic Rousseau Date: Tue Aug 14 17:23:17 2007 +0000 @@ -28268,7 +28314,7 @@ Date: Wed Jun 20 07:24:35 2007 +0000 src/PCSC/reader.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit 5764bf72c25a23671e8f421eb0e02bfbbf508650 (tag: 1.4.3) +commit 5764bf72c25a23671e8f421eb0e02bfbbf508650 (tag: pcsc-1.4.3, tag: 1.4.3) Author: Ludovic Rousseau Date: Tue Jun 19 19:10:35 2007 +0000 @@ -28543,7 +28589,7 @@ Date: Thu May 24 08:54:41 2007 +0000 src/winscard.c | 8 ++++++++ 1 file changed, 8 insertions(+) -commit 487029816cabf2217c58ee8ba50dd07e7848c260 (tag: 1.4.2) +commit 487029816cabf2217c58ee8ba50dd07e7848c260 (tag: pcsc-1.4.2, tag: 1.4.2) Author: Ludovic Rousseau Date: Wed May 23 16:37:52 2007 +0000 @@ -28727,7 +28773,7 @@ Date: Wed May 16 11:39:54 2007 +0000 ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 896e8bfdf9ad640d71f547c8e722baaaf6d7dff9 (tag: 1.4.1) +commit 896e8bfdf9ad640d71f547c8e722baaaf6d7dff9 (tag: pcsc-1.4.1, tag: 1.4.1) Author: Ludovic Rousseau Date: Wed May 16 09:55:34 2007 +0000 @@ -29351,7 +29397,7 @@ Date: Sat Feb 17 15:04:03 2007 +0000 src/debuglog.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -commit 432796c9a72f827d28528e316b2b29d14d43d7dd (tag: 1.4.0) +commit 432796c9a72f827d28528e316b2b29d14d43d7dd (tag: pcsc-1.4.0, tag: 1.4.0) Author: Ludovic Rousseau Date: Tue Feb 13 20:26:17 2007 +0000 @@ -29750,7 +29796,7 @@ Date: Sat Jan 20 15:04:31 2007 +0000 src/ifdwrapper.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) -commit 232475f0616287ba70f757ecb7fff5761d6fb8c9 (tag: 1.3.3) +commit 232475f0616287ba70f757ecb7fff5761d6fb8c9 (tag: pcsc-1.3.3, tag: 1.3.3) Author: Ludovic Rousseau Date: Fri Jan 19 19:47:00 2007 +0000 @@ -31216,7 +31262,7 @@ Date: Sun Aug 13 16:24:30 2006 +0000 src/sys_unix.c | 111 ------------------------------------------------------ 2 files changed, 129 deletions(-) -commit 0d39e0b106afda96c4f891f6237fd481d2c337d0 (tag: 1.3.2) +commit 0d39e0b106afda96c4f891f6237fd481d2c337d0 (tag: pcsc-1.3.2, tag: 1.3.2) Author: Ludovic Rousseau Date: Fri Aug 11 18:26:39 2006 +0000 @@ -31841,7 +31887,7 @@ Date: Tue May 2 06:56:03 2006 +0000 src/sys_unix.c | 1 + 1 file changed, 1 insertion(+) -commit 63e1ccbcbfdd7b5fb05bddcc3e6575baf30dc2c9 (tag: 1.3.1) +commit 63e1ccbcbfdd7b5fb05bddcc3e6575baf30dc2c9 (tag: pcsc-1.3.1, tag: 1.3.1) Author: Ludovic Rousseau Date: Sat Apr 22 18:56:53 2006 +0000 @@ -32371,7 +32417,7 @@ Date: Tue Mar 7 07:49:16 2006 +0000 configure.in | 1 - 1 file changed, 1 deletion(-) -commit 48c62c0baf0ac376daba82db69f4dfed38e1158e (tag: 1.3.0) +commit 48c62c0baf0ac376daba82db69f4dfed38e1158e (tag: pcsc-1.3.0, tag: 1.3.0) Author: Ludovic Rousseau Date: Fri Mar 3 13:58:26 2006 +0000 @@ -33013,7 +33059,7 @@ Date: Tue Nov 29 13:42:03 2005 +0000 TODO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 02b243948df01b2d3bca1bf9f6ec28c4aa6eb3dd (tag: 1.2.9-beta9) +commit 02b243948df01b2d3bca1bf9f6ec28c4aa6eb3dd (tag: pcsc-1.2.9-beta9, tag: 1.2.9-beta9) Author: Ludovic Rousseau Date: Sun Nov 27 16:40:04 2005 +0000 @@ -33799,7 +33845,7 @@ Date: Wed Sep 7 19:05:49 2005 +0000 Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit ad8bdef9a725ea65ac76da744ceee7853775d49b (tag: 1.2.9-beta8) +commit ad8bdef9a725ea65ac76da744ceee7853775d49b (tag: pcsc-1.2.9-beta8, tag: 1.2.9-beta8) Author: Ludovic Rousseau Date: Tue Sep 6 19:51:36 2005 +0000 @@ -35186,7 +35232,7 @@ Date: Thu Mar 17 07:53:53 2005 +0000 src/debuglog.c | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) -commit 385fbae52f42e6c99603abf6b5f34ae784b51e7b (tag: 1.2.9-beta7) +commit 385fbae52f42e6c99603abf6b5f34ae784b51e7b (tag: pcsc-1.2.9-beta7, tag: 1.2.9-beta7) Author: Ludovic Rousseau Date: Wed Mar 2 15:42:52 2005 +0000 @@ -36637,7 +36683,7 @@ Date: Mon Aug 16 15:13:58 2004 +0000 src/ifdwrapper.c | 4 ---- 1 file changed, 4 deletions(-) -commit 5776ed9dae5cda7dddd7844d4143e783fb3f290b (tag: 1.2.9-beta6) +commit 5776ed9dae5cda7dddd7844d4143e783fb3f290b (tag: pcsc-1.2.9-beta6, tag: 1.2.9-beta6) Author: Ludovic Rousseau Date: Sun Aug 15 14:44:21 2004 +0000 @@ -37398,7 +37444,7 @@ Date: Thu Jul 22 13:28:47 2004 +0000 src/readerfactory.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -commit 7dabdb0665a04c361f97b4eb37ccec35e628f15e (tag: 1.2.9-beta5) +commit 7dabdb0665a04c361f97b4eb37ccec35e628f15e (tag: pcsc-1.2.9-beta5, tag: 1.2.9-beta5) Author: Ludovic Rousseau Date: Fri Jul 16 14:04:04 2004 +0000 @@ -37578,7 +37624,7 @@ Date: Sat Jul 3 16:32:53 2004 +0000 configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit e88d027f3e22ce1275dad8d8f0a7845e5278dcd9 (tag: 1.2.9-beta4) +commit e88d027f3e22ce1275dad8d8f0a7845e5278dcd9 (tag: pcsc-1.2.9-beta4, tag: 1.2.9-beta4) Author: Ludovic Rousseau Date: Sat Jul 3 16:25:43 2004 +0000 diff --git a/Makefile.in b/Makefile.in index cd81573..4b98df6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -346,6 +346,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ runstatedir = @runstatedir@ sbindir = @sbindir@ +sbindir_exp = @sbindir_exp@ serialconfdir = @serialconfdir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/bootstrap b/bootstrap index b3d9018..485cd68 100755 --- a/bootstrap +++ b/bootstrap @@ -2,6 +2,7 @@ # I use # - autoconf (GNU Autoconf) 2.64 +# - autoconf-archive (GNU autoconf-archive) # - automake (GNU automake) 1.11 # - libtool (GNU libtool) 2.2.6 diff --git a/configure b/configure index d8bfea8..c04f31c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pcsc-lite 1.9.2. +# Generated by GNU Autoconf 2.69 for pcsc-lite 1.9.3. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pcsc-lite' PACKAGE_TARNAME='pcsc-lite' -PACKAGE_VERSION='1.9.2' -PACKAGE_STRING='pcsc-lite 1.9.2' +PACKAGE_VERSION='1.9.3' +PACKAGE_STRING='pcsc-lite 1.9.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -632,6 +632,7 @@ ac_includes_default="\ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +sbindir_exp PCSCLITE_CONFIG_DIR host_to_ccid_32 host_to_ccid_16 @@ -1391,7 +1392,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pcsc-lite 1.9.2 to adapt to many kinds of systems. +\`configure' configures pcsc-lite 1.9.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1462,7 +1463,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pcsc-lite 1.9.2:";; + short | recursive ) echo "Configuration of pcsc-lite 1.9.3:";; esac cat <<\_ACEOF @@ -1614,7 +1615,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pcsc-lite configure 1.9.2 +pcsc-lite configure 1.9.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2090,7 +2091,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pcsc-lite $as_me 1.9.2, which was +It was created by pcsc-lite $as_me 1.9.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2949,7 +2950,7 @@ fi # Define the identity of the package. PACKAGE='pcsc-lite' - VERSION='1.9.2' + VERSION='1.9.3' cat >>confdefs.h <<_ACEOF @@ -15808,6 +15809,7 @@ sbindir_exp=`(test "x$prefix" = xNONE && prefix="$ac_default_prefix" PCSCLITE_CONFIG_DIR="${confdir_exp}" + PCSCLITE_FEATURES="${PCSCLITE_FEATURES} configdir=${PCSCLITE_CONFIG_DIR}" cat >>confdefs.h <<_ACEOF @@ -16412,7 +16414,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pcsc-lite $as_me 1.9.2, which was +This file was extended by pcsc-lite $as_me 1.9.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16478,7 +16480,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pcsc-lite config.status 1.9.2 +pcsc-lite config.status 1.9.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 298a18c..da835b2 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([pcsc-lite],[1.9.2]) +AC_INIT([pcsc-lite],[1.9.3]) AC_CONFIG_SRCDIR(src/pcscdaemon.c) AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip) AC_CONFIG_HEADERS([config.h]) @@ -411,6 +411,7 @@ AX_RECURSIVE_EVAL($sbindir,sbindir_exp) PCSCLITE_CONFIG_DIR="${confdir_exp}" AC_SUBST(PCSCLITE_CONFIG_DIR) +AC_SUBST(sbindir_exp) PCSCLITE_FEATURES="${PCSCLITE_FEATURES} configdir=${PCSCLITE_CONFIG_DIR}" AC_DEFINE_UNQUOTED([PCSCLITE_FEATURES], ["${PCSCLITE_FEATURES}"], [Enabled PC/SC lite features]) diff --git a/doc/Makefile.in b/doc/Makefile.in index 62c14a2..6e15e30 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -358,6 +358,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ runstatedir = @runstatedir@ sbindir = @sbindir@ +sbindir_exp = @sbindir_exp@ serialconfdir = @serialconfdir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/doc/example/Makefile.in b/doc/example/Makefile.in index 58ba521..3b33361 100644 --- a/doc/example/Makefile.in +++ b/doc/example/Makefile.in @@ -316,6 +316,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ runstatedir = @runstatedir@ sbindir = @sbindir@ +sbindir_exp = @sbindir_exp@ serialconfdir = @serialconfdir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/etc/Makefile.in b/etc/Makefile.in index 05b55d7..dfe9d10 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -291,6 +291,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ runstatedir = @runstatedir@ sbindir = @sbindir@ +sbindir_exp = @sbindir_exp@ serialconfdir = @serialconfdir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/Makefile.in b/src/Makefile.in index 5c1aca4..2f60f3e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -492,6 +492,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ runstatedir = @runstatedir@ sbindir = @sbindir@ +sbindir_exp = @sbindir_exp@ serialconfdir = @serialconfdir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/PCSC/pcsclite.h b/src/PCSC/pcsclite.h index 5a60470..073043f 100644 --- a/src/PCSC/pcsclite.h +++ b/src/PCSC/pcsclite.h @@ -279,7 +279,7 @@ extern const SCARD_IO_REQUEST g_rgSCardT0Pci, g_rgSCardT1Pci, g_rgSCardRawPci; #define INFINITE 0xFFFFFFFF /**< Infinite timeout */ #endif -#define PCSCLITE_VERSION_NUMBER "1.9.2" /**< Current version */ +#define PCSCLITE_VERSION_NUMBER "1.9.3" /**< Current version */ /** Maximum readers context (a slot is count as a reader) */ #define PCSCLITE_MAX_READERS_CONTEXTS 16 diff --git a/src/debug.c b/src/debug.c index e75b8b4..9ad419b 100644 --- a/src/debug.c +++ b/src/debug.c @@ -68,11 +68,7 @@ static void log_init(void) { char *e; -#ifdef LIBPCSCLITE e = getenv("PCSCLITE_DEBUG"); -#else - e = getenv("MUSCLECARD_DEBUG"); -#endif if (e) LogLevel = atoi(e); diff --git a/src/pcscd.h b/src/pcscd.h index 7006225..df8670d 100644 --- a/src/pcscd.h +++ b/src/pcscd.h @@ -49,7 +49,7 @@ #define PCSCLITE_CSOCK_NAME PCSCLITE_IPC_DIR "/pcscd.comm" -#define PCSCLITE_VERSION_NUMBER "1.9.2" /**< Current version */ +#define PCSCLITE_VERSION_NUMBER "1.9.3" /**< Current version */ #define PCSCLITE_STATUS_POLL_RATE 400000 /**< Status polling rate */ #define PCSCLITE_LOCK_POLL_RATE 100000 /**< Lock polling rate */ diff --git a/src/spy/Makefile.in b/src/spy/Makefile.in index dbbfd5a..e05691f 100644 --- a/src/spy/Makefile.in +++ b/src/spy/Makefile.in @@ -345,6 +345,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ runstatedir = @runstatedir@ sbindir = @sbindir@ +sbindir_exp = @sbindir_exp@ serialconfdir = @serialconfdir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@