!24 [sync] PR-22: backport patch to fix data race problem

From: @openeuler-sync-bot 
Reviewed-by: @liuzhiqiang26 
Signed-off-by: @liuzhiqiang26

0000-pcsc-lite-change-to-use-python3-for-pcsc-spy.patch

@@ -1,26 +0,0 @@
-From 5a0c5fcd6371f1e1b5b18b2888d9e3304e402177 Mon Sep 17 00:00:00 2001
-From: Shijie Luo <luoshijie1@huawei.com>
-Date: Tue, 18 Feb 2020 09:43:11 +0800
-Subject: [PATCH] pcsc-lite:change to use python3 for pcsc-spy
-
-pcsc-spy is needed when we compile pcsc-lite, change to
-use python3 instead of python2.
-
-Signed-off-by: Shijie Luo <luoshijie1@huawei.com>
----
- src/spy/pcsc-spy | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/spy/pcsc-spy b/src/spy/pcsc-spy
-index bf49482..7b9c5f3 100755
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#! /usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
--- 
-1.8.3.1
-

0001-pcscdaemon.c-Fix-data-race-for-AraKiri-variable.patch

@@ -0,0 +1,48 @@
+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
+

pcsc-lite.spec

@@ -1,13 +1,15 @@
 Name:           pcsc-lite
-Version:        1.8.23
-Release:        9
+Version:        1.9.4
+Release:        2
 Summary:        Middleware to access a smart card using SCard API (PC/SC)
 License:        BSD
 URL:            https://pcsclite.apdu.fr/
 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:  perl-podlators doxygen gnupg2 gcc git python3
+BuildRequires:  perl-podlators doxygen gnupg2 gcc python3
 
 Requires(post): systemd
 Requires(preun): systemd
@@ -18,8 +20,6 @@ Recommends:     ccid
 Provides:       pcsc-lite-libs%{?_isa} pcsc-lite-libs
 Obsoletes:      pcsc-lite-libs
 
-Patch0:      0000-pcsc-lite-change-to-use-python3-for-pcsc-spy.patch
-
 %description
 PC/SC Lite is a middleware to access a smart card using SCard API (PC/SC).
 This package contains PC/SC Lite server and other utilities.
@@ -44,7 +44,7 @@ Obsoletes:      %{name}-doc
 This package includes documentation for PC/SC Lite.
 
 %prep
-%autosetup -n %{name}-%{version} -p1 -S git
+%autosetup -n %{name}-%{version} -p1
 
 for file in ChangeLog; do
     iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
@@ -82,7 +82,7 @@ mkdir -p %{buildroot}/%{_localstatedir}/run/pcscd
 %ldconfig_scriptlets
 
 %files
-%doc AUTHORS ChangeLog DRIVERS HELP README SECURITY TODO
+%doc AUTHORS ChangeLog HELP README SECURITY TODO
 %doc doc/README.polkit
 %license COPYING
 %dir %{_sysconfdir}/reader.conf.d/
@@ -112,6 +112,21 @@ mkdir -p %{buildroot}/%{_localstatedir}/run/pcscd
 
 
 %changelog
+* Thu Oct 20 2022 liusirui <liusirui@huawei.com> - 1.9.4-2
+- backport patch to fix data race
+
+* Tue Nov 23 2021 yanglongkang <yanglongkang@huawei.com> - 1.9.4-1
+- update to 1.9.4
+
+* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 1.9.0-3
+- DESC: delete -S git from %autosetup, and delete BuildRequires git
+
+* Thu Oct 29 2020 Zhiqiang Liu <liuzhiqiang26@huawei.com> - 1.9.0-2
+- backport some patches to solve some upstream problems
+
+* Tue Jul 21 2020 jixinjie <jixinjie@huawei.com> - 1.9.0-1
+- update package to 1.9.0
+
 * Tue Feb 18 2020 Shijie Luo <buildteam@openeuler.org> - 1.8.23-9
 - change to use python3 for pcsc-spy python script.