!25 升级到1.9.9版本

From: @liusirui91 
Reviewed-by: @liuzhiqiang26 
Signed-off-by: @liuzhiqiang26
This commit is contained in:
openeuler-ci-bot 2023-01-30 01:02:10 +00:00 committed by Gitee
commit 88bc1e0295
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 7 additions and 53 deletions

View File

@ -1,48 +0,0 @@
From e46aad0c3571bd5f9da4cd4544fa3d6201dc3890 Mon Sep 17 00:00:00 2001
From: Ludovic Rousseau <ludovic.rousseau@free.fr>
Date: Sun, 12 Dec 2021 15:25:32 +0100
Subject: [PATCH] pcscdaemon.c: Fix data race for AraKiri variable
Issue reported by clang ThreadSanitizer
WARNING: ThreadSanitizer: data race (pid=14419)
Read of size 1 at 0x000000f3a9c8 by main thread:
#0 SVCServiceRunLoop <null> (pcscd+0x4c0da9)
#1 main <null> (pcscd+0x4c0694)
Previous write of size 1 at 0x000000f3a9c8 by thread T1:
#0 signal_thread <null> (pcscd+0x4c0aca)
As if synchronized via sleep:
#0 nanosleep <null> (pcscd+0x4297dd)
#1 SYS_USleep <null> (pcscd+0x4c6c36)
#2 SVCServiceRunLoop <null> (pcscd+0x4c0cef)
#3 main <null> (pcscd+0x4c0694)
Location is global 'AraKiri' of size 1 at 0x000000f3a9c8 (pcscd+0x000000f3a9c8)
Thread T1 (tid=14421, running) created by main thread at:
#0 pthread_create <null> (pcscd+0x42be9b)
#1 main <null> (pcscd+0x4c01c8)
SUMMARY: ThreadSanitizer: data race (/home/rousseau/sc/costa/PCSC/src/pcscd+0x4c0da9) in SVCServiceRunLoop
---
src/pcscdaemon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pcscdaemon.c b/src/pcscdaemon.c
index 2cc3fc0..2c4e305 100644
--- a/src/pcscdaemon.c
+++ b/src/pcscdaemon.c
@@ -75,7 +75,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define FALSE 0
#endif
-char AraKiri = FALSE;
+_Atomic char AraKiri = FALSE;
static char Init = TRUE;
char AutoExit = FALSE;
char SocketActivated = FALSE;
--
2.33.0

Binary file not shown.

BIN
pcsc-lite-1.9.9.tar.bz2 Normal file

Binary file not shown.

View File

@ -1,15 +1,13 @@
Name: pcsc-lite Name: pcsc-lite
Version: 1.9.4 Version: 1.9.9
Release: 2 Release: 1
Summary: Middleware to access a smart card using SCard API (PC/SC) Summary: Middleware to access a smart card using SCard API (PC/SC)
License: BSD License: BSD
URL: https://pcsclite.apdu.fr/ URL: https://pcsclite.apdu.fr/
Source0: https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2 Source0: https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2
Patch0: 0001-pcscdaemon.c-Fix-data-race-for-AraKiri-variable.patch
BuildRequires: systemd-devel polkit-devel gettext-devel BuildRequires: systemd-devel polkit-devel gettext-devel
BuildRequires: perl-podlators doxygen gnupg2 gcc python3 BuildRequires: perl-podlators doxygen gnupg2 gcc python3 flex
Requires(post): systemd Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
@ -84,6 +82,7 @@ mkdir -p %{buildroot}/%{_localstatedir}/run/pcscd
%files %files
%doc AUTHORS ChangeLog HELP README SECURITY TODO %doc AUTHORS ChangeLog HELP README SECURITY TODO
%doc doc/README.polkit %doc doc/README.polkit
%doc install_spy.sh uninstall_spy.sh
%license COPYING %license COPYING
%dir %{_sysconfdir}/reader.conf.d/ %dir %{_sysconfdir}/reader.conf.d/
%dir %{_libdir}/pcsc/ %dir %{_libdir}/pcsc/
@ -112,6 +111,9 @@ mkdir -p %{buildroot}/%{_localstatedir}/run/pcscd
%changelog %changelog
* Sun Jan 29 2023 liusirui <liusirui@huawei.com> - 1.9.9-1
- update to 1.9.9
* Thu Oct 20 2022 liusirui <liusirui@huawei.com> - 1.9.4-2 * Thu Oct 20 2022 liusirui <liusirui@huawei.com> - 1.9.4-2
- backport patch to fix data race - backport patch to fix data race