From c749b13daff5d349530ee5c87e9df649970b0336 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 29 2022 19:19:11 +0000 Subject: import pcsc-lite-1.9.5-1.el8 --- diff --git a/.gitignore b/.gitignore index 8731516..01b9acf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg -SOURCES/pcsc-lite-1.8.23.tar.bz2 +SOURCES/pcsc-lite-1.9.5.tar.bz2 diff --git a/.pcsc-lite.metadata b/.pcsc-lite.metadata index 632e9b3..a726171 100644 --- a/.pcsc-lite.metadata +++ b/.pcsc-lite.metadata @@ -1,2 +1,2 @@ 13df650b9548b4ef1b24ad11ef6b573af4d48011 SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg -6645f9554b7e031d309bec6d56e031f67ddae771 SOURCES/pcsc-lite-1.8.23.tar.bz2 +66ab757215d5ea436e0f2dffb8594d71904e9d9c SOURCES/pcsc-lite-1.9.5.tar.bz2 diff --git a/SOURCES/org.debian.pcsc-lite.policy b/SOURCES/org.debian.pcsc-lite.policy deleted file mode 100644 index cbae505..0000000 --- a/SOURCES/org.debian.pcsc-lite.policy +++ /dev/null @@ -1,30 +0,0 @@ - - - - The PCSC-lite Project - http://pcsclite.alioth.debian.org/ - - - - Access to the PC/SC daemon - Authentication is required to access the PC/SC daemon - - auth_admin - auth_admin - yes - - - - - Access to the smart card - Authentication is required to access the smart card - - auth_admin - auth_admin - yes - - - - diff --git a/SOURCES/pcsc-lite-1.8.23-maxreaders.patch b/SOURCES/pcsc-lite-1.8.23-maxreaders.patch index 0852fce..bed7bea 100644 --- a/SOURCES/pcsc-lite-1.8.23-maxreaders.patch +++ b/SOURCES/pcsc-lite-1.8.23-maxreaders.patch @@ -15,7 +15,7 @@ diff -up ./src/PCSC/pcsclite.h.readers_32 ./src/PCSC/pcsclite.h +++ ./src/PCSC/pcsclite.h 2018-08-20 16:03:00.061567242 -0700 @@ -281,7 +281,7 @@ extern const SCARD_IO_REQUEST g_rgSCardT - #define PCSCLITE_VERSION_NUMBER "1.8.23" /**< Current version */ + #define PCSCLITE_VERSION_NUMBER "1.9.5" /**< Current version */ /** Maximum readers context (a slot is count as a reader) */ -#define PCSCLITE_MAX_READERS_CONTEXTS 16 +#define PCSCLITE_MAX_READERS_CONTEXTS 48 diff --git a/SOURCES/pcsc-lite-1.8.23.tar.bz2.asc b/SOURCES/pcsc-lite-1.8.23.tar.bz2.asc deleted file mode 100644 index 7396dc0..0000000 --- a/SOURCES/pcsc-lite-1.8.23.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE9eEbn/6REUb0HZU9eKG03+j5xX4FAlo4D+QACgkQeKG03+j5 -xX5DZQ//SMsKZKAm1DBU3IMYjMkHNchuouuzdK5e8y3J/xs2fL2ZI3m2pHHBUsgH -Pol+4D78RgZGD/BG8NBZe3vUoCeeW1VY7Ovn+ZwIV0DgGRJ0tYazVMNBz/mmDFlv -RGcoBHeSVvGrrhd8IIx1oAEx96rWuPwUdLiMozoTmVhd0YE0H6qc3uNga1PoWs5m -ZYnz7d6OrGGlvOSHQUMqqxd1gTuktBRmVvxWbjjCNqUNE/JitjgBnjf3BU5ylFuV -SwvDwN6g404oQbSzdqJNyZd/ZQfTYhc+AS7Xm2kFl1tZoHCIAbYYSBdz138qSpMN -XVkIVBQ/iXuGEEqSsIZ5MIs0L72oUATpr5DL8XhcY+HP27SRB14kEp1OrCAwjOGt -nV46dRzPV5LqeA+2WKP993ZAjZfBEwEB6OdFYNyEkulL1f2FSuZKat4xgOHiyFH0 -99/mbnVy5js2MOm3il4oihLNjkiT2QpuI88Q9JbgqJAwM4GKGIk0tCST+DIzNkA0 -LPLaYskNYXTywl0q9l2dS8lpUUF2ubMlHf+3BySDhyrH2lQrc2h/bfLW62LOKxnG -4GhrnchaiFkRQoVRu5SoKdwKrMvtStXWnsZLC1K9xyWTBhx3WjgLkn90DQThhib+ -i4h1XiHTuEaqoADT9iwqsJ1BiIYtLUPcLzcnQCzaH0gtWme0XxA= -=ie6D ------END PGP SIGNATURE----- diff --git a/SOURCES/pcsc-lite-1.9.5.tar.bz2.asc b/SOURCES/pcsc-lite-1.9.5.tar.bz2.asc new file mode 100644 index 0000000..8bac82e --- /dev/null +++ b/SOURCES/pcsc-lite-1.9.5.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE9eEbn/6REUb0HZU9eKG03+j5xX4FAmGrX3QACgkQeKG03+j5 +xX6OYhAAlPiKTLWkHUq0edTZqptfYvjflQ3oBRSz5aGl1v95RyuklhGSK7H6fVez +eYTG8bVKJDaHQBE+b1LukvIrhVlRGSHzTChTjc4k8qGjvSIqTp3t5Zhi0TDBIBov +agLr2YP6Bi07nJZ+UzE5ssx0zk8Ca4xJDoSpBuD6ZcdTzSJ1VW8DZwD0bpco4a1u +l8/b/DgzLPtzsSeBDoIGRlZsx6VYoxH83vaUp0FUNcdbLnA7teeWgnkSFJws8YAe +TXd10bv3OYYqC/vCcQUv96tZaN2aekhYH9CeefAb6EC+kVWEXvV7d0BN29ToWuDm +AQqkXpSYVihhkmQjTOmX6sKYbXpIkL13Rvmsz++Sf1tKQNuFcudtD2D4BZy4cglk +DwX0dlJeHcQadeeyvC61G5BzreykhD6891PaxTs+BeGLKHe/VXmLhPcbA1r0oOKB +A1G6lie02u2lCeohVFOvrIg7Pgx/msEqvGlqqYAYIz7s3bH0y88dw/QQW0le94Vr +HefVx/dAqN1n90DTwKR5s10OgMAVGj4g9FkxNV/rVqKK6PwpM8wu1RuUeJhbeioN +FVwJXzSsVoLkUn+GEQHXFtx/uOpQcJ63CPybULSXHp9xh4XecEBbJ695TZkzikP0 +Y+eAurhL7mKFpWwVIxTqYy+JU6B2r/p7pY0i15i8nGa2xkda/M8= +=nBYh +-----END PGP SIGNATURE----- diff --git a/SPECS/pcsc-lite.spec b/SPECS/pcsc-lite.spec index 06ecc06..02f061a 100644 --- a/SPECS/pcsc-lite.spec +++ b/SPECS/pcsc-lite.spec @@ -1,19 +1,17 @@ -%global upstream_build 4235 - Name: pcsc-lite -Version: 1.8.23 -Release: 4.1%{?dist} +Version: 1.9.5 +Release: 1%{?dist} Summary: PC/SC Lite smart card framework and applications Group: System Environment/Daemons License: BSD -URL: http://pcsclite.alioth.debian.org/ -Source0: https://alioth.debian.org/frs/download.php/file/%{upstream_build}/%{name}-%{version}.tar.bz2 -Source1: https://alioth.debian.org/frs/download.php/file/%{upstream_build}/%{name}-%{version}.tar.bz2.asc +URL: https://pcsclite.apdu.fr/ +Source0: https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2 +Source1: https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2.asc Source2: gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg -Source3: org.debian.pcsc-lite.policy Patch1: pcsc-lite-1.8.23-maxreaders.patch +BuildRequires: make BuildRequires: doxygen BuildRequires: graphviz BuildRequires: systemd-devel @@ -23,6 +21,8 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel BuildRequires: libtool +BuildRequires: gnupg2 +BuildRequires: gcc Requires(post): systemd Requires(preun): systemd @@ -31,6 +31,8 @@ Requires: pcsc-ifd-handler Requires: %{name}-libs = %{version}-%{release} Requires: polkit Recommends: pcsc-lite-ccid +# This is bundled in upstream without simple way to remove +Provides: bundled(simclist) = 1.6 %description @@ -86,16 +88,11 @@ done --disable-static \ --enable-polkit \ --enable-usbdropdir=%{_libdir}/pcsc/drivers -make %{?_smp_mflags} +%make_build doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5} - %install -make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/ -install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/ +%make_install # Create empty directories mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d @@ -104,14 +101,17 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/pcscd rm $RPM_BUILD_ROOT%{_libdir}/*.la -# Remove documentation installed in a wrong directory -rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON - -# Fix python shebangs -sed -i 's|^#! /usr/bin/python|#!/usr/bin/python3|' %{buildroot}/usr/bin/pcsc-spy - %post %systemd_post pcscd.socket pcscd.service +# If install, test if pcscd socket is enabled. +# If enabled, then attempt to start it. This will silently fail +# in chroots or other environments where services aren't expected +# to be started. +if [ $1 -eq 1 ] ; then + if systemctl -q is-enabled pcscd.socket > /dev/null 2>&1 ; then + systemctl start pcscd.socket > /dev/null 2>&1 || : + fi +fi %preun %systemd_preun pcscd.socket pcscd.service @@ -125,7 +125,7 @@ sed -i 's|^#! /usr/bin/python|#!/usr/bin/python3|' %{buildroot}/usr/bin/pcsc-spy %files -%doc AUTHORS ChangeLog DRIVERS HELP README SECURITY TODO +%doc AUTHORS ChangeLog HELP README SECURITY TODO %doc doc/README.polkit %dir %{_sysconfdir}/reader.conf.d/ %{_unitdir}/pcscd.service @@ -155,6 +155,10 @@ sed -i 's|^#! /usr/bin/python|#!/usr/bin/python3|' %{buildroot}/usr/bin/pcsc-spy %changelog +* Fri Jan 07 2022 Jakub Jelen - 1.9.5-1 +- Rebase to 1.9.5 version to address race conditions (#2014641) +- Drop dowstream polkit policy to avoid repeated authentication requests in remote sessions (#1928154) + * Thu Jun 17 2021 Bob Relyea - 1.8.23-4.1 - rebuild to retrigger gating