up to 2.1.0

diff --git a/missing-symbol.patch b/missing-symbol.patch
new file mode 100644 (file)
index 0000000..b4006e2
--- /dev/null
+++ b/missing-symbol.patch
@@ -0,0 +1,33 @@
+From 2384e4cd63ea8cb52af6af7c7cad54ead8d78543 Mon Sep 17 00:00:00 2001
+From: Ludovic Rousseau <ludovic.rousseau@free.fr>
+Date: Fri, 12 Apr 2024 21:20:14 +0200
+Subject: [PATCH] libpcscspy.c: do not use pcsc_stringify_error()
+
+Fix the library loading by dlopen(), for example with OpenSC.
+
+$ LIBPCSCLITE_DELEGATE=/lib/x86_64-linux-gnu/libpcscspy.so.0 opensc-tool -a
+loading "/lib/x86_64-linux-gnu/libpcscspy.so.0" failed: /lib/x86_64-linux-gnu/libpcscspy.so.0: undefined symbol: pcsc_stringify_error
+No smart card readers found.
+Failed to connect to reader: No readers found
+---
+ src/spy/libpcscspy.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/spy/libpcscspy.c b/src/spy/libpcscspy.c
+index 9877c4e9..80113529 100644
+--- a/src/spy/libpcscspy.c
++++ b/src/spy/libpcscspy.c
+@@ -205,8 +205,8 @@ static void spy_quit(const char *fname, LONG rv)
+       struct timeval profile_time;
+ 
+       gettimeofday(&profile_time, NULL);
+-      spy_line("<|%ld|%ld|%s|%s|0x%08lX", profile_time.tv_sec,
+-              profile_time.tv_usec, fname, pcsc_stringify_error(rv), rv);
++      spy_line("<|%ld|%ld|%s|0x%08lX", profile_time.tv_sec,
++              profile_time.tv_usec, fname, rv);
+ }
+ 
+ #define Enter() spy_enter(__FUNCTION__)
+-- 
+GitLab
+

diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index acfd9e09bc9d756ccd5144483f83cd9298c70fc5..8aea642bc842afb4e3931bf414285de81afd3256 100644 (file)
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -14,15 +14,16 @@
 Summary:       PCSC Framework for Linux
 Summary(pl.UTF-8):     Środowisko PCSC dla Linuksa
 Name:          pcsc-lite
-Version:       2.0.3
+Version:       2.1.0
 Release:       1
 License:       BSD
 Group:         Daemons
 Source0:       https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 4167d2d3fa2be3f8e24b2f44e38a35ee
+# Source0-md5: 132f3cfb8642ee7600233c7742e92bc4
 Source1:       %{name}-pcscd.init
 Source2:       %{name}-pcscd.sysconfig
 Source4:       %{name}.tmpfiles
+Patch0:                missing-symbol.patch
 Patch1:                %{name}-any.patch
 Patch2:                debuglog-pid.patch
 URL:           https://pcsclite.apdu.fr/
@@ -114,6 +115,7 @@ Dokumentacja API biblioteki PC/SC Lite.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
@@ -196,7 +198,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog HELP README SECURITY TODO doc/README.polkit
+%doc AUTHORS COPYING ChangeLog HELP README SECURITY doc/README.polkit
 %attr(755,root,root) %{_bindir}/pcsc-spy
 %attr(755,root,root) %{_sbindir}/pcscd
 %dir %{_libdir}/pcsc
@@ -219,14 +221,18 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpcsclite.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpcsclite.so.1
+%attr(755,root,root) %{_libdir}/libpcsclite_real.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpcsclite_real.so.1
 %attr(755,root,root) %{_libdir}/libpcscspy.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpcscspy.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpcsclite.so
+%attr(755,root,root) %{_libdir}/libpcsclite_real.so
 %attr(755,root,root) %{_libdir}/libpcscspy.so
 %{_libdir}/libpcsclite.la
+%{_libdir}/libpcsclite_real.la
 %{_libdir}/libpcscspy.la
 %{_includedir}/PCSC
 %{_pkgconfigdir}/libpcsclite.pc