Compare commits

...

No commits in common. "c9-beta" and "c8" have entirely different histories.
c9-beta ... c8

6 changed files with 43 additions and 76 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
SOURCES/pcsc-lite-1.9.4.tar.bz2 SOURCES/pcsc-lite-1.9.5.tar.bz2

View File

@ -1,2 +1,2 @@
13df650b9548b4ef1b24ad11ef6b573af4d48011 SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg 13df650b9548b4ef1b24ad11ef6b573af4d48011 SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
b8ca342dfa650c2c4d25a86f6dbfa3aa019c2045 SOURCES/pcsc-lite-1.9.4.tar.bz2 66ab757215d5ea436e0f2dffb8594d71904e9d9c SOURCES/pcsc-lite-1.9.5.tar.bz2

View File

@ -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 +++ ./src/PCSC/pcsclite.h 2018-08-20 16:03:00.061567242 -0700
@@ -281,7 +281,7 @@ extern const SCARD_IO_REQUEST g_rgSCardT @@ -281,7 +281,7 @@ extern const SCARD_IO_REQUEST g_rgSCardT
#define PCSCLITE_VERSION_NUMBER "1.9.4" /**< Current version */ #define PCSCLITE_VERSION_NUMBER "1.9.5" /**< Current version */
/** Maximum readers context (a slot is count as a reader) */ /** Maximum readers context (a slot is count as a reader) */
-#define PCSCLITE_MAX_READERS_CONTEXTS 16 -#define PCSCLITE_MAX_READERS_CONTEXTS 16
+#define PCSCLITE_MAX_READERS_CONTEXTS 48 +#define PCSCLITE_MAX_READERS_CONTEXTS 48

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIyBAABCAAdFiEE9eEbn/6REUb0HZU9eKG03+j5xX4FAmFXMRwACgkQeKG03+j5
xX7/KQ/3RHTZ0G5UIDOY8q072UkGUk1OJW7azD9o1BsQpD0UBIHDD1q8ISilhJ5A
MM1qsV0oirL01CUdkx3rPAFHusZrGbx/DQrX/1k/HmsCtwGMHWX9HkvVfU2ollHV
O6+6RCBrGzL28j6kx6XoC8d1bBkwjCHsdPpkgdnoSrUq79xtIVQa/T8JNg+lDfn4
QmYzVjc2uyeofQt1R4LDOb4sNb4ZwvO/dLoQjJXm+M20TLocXVGS6EzuM3Kt1ppK
1Lf6Y7nqERm8HZtWxqCuiEn+rF9Dr+7DgSfLWTzZ/hVhqSbg5QoQDTzoiYMz8EqL
zagLx/Mqa7VFuHT35QLzExjfvNn94xBpcSMQ5IjOQpgLU79Fx9Dw0TmtKHipcE57
B0Kvt5dWcRXIm3wit2nbL9QbSrkE3B6cy4w6uRU0+HIqR17fWqET1XSG9k9/Wlfi
GYaxe4knAqu/7jcqbqOHs0OHNfUwXZa7xhfYK7/7FAomzHcyFGpDP39J1CrYIT/d
lonOgD8Mul4GJE/ZUSXNMp2My1Ds055ILMmOpxpJzy6QWqXCYKjPoYZWpbNV+we9
yKR22z4Oag2gh3Y/HFh9NQ2WpS23NcY7BD+bMO1zle1MaJbqqoMp29XacrZnqwjX
sDDSia3dtqfZY4ktr98aars2M0BtoqxFnsbdLCxN7EowgEq1Ww==
=auuN
-----END PGP SIGNATURE-----

View File

@ -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-----

View File

@ -1,14 +1,15 @@
Name: pcsc-lite Name: pcsc-lite
Version: 1.9.4 Version: 1.9.5
Release: 1%{?dist} Release: 1%{?dist}
Summary: PC/SC Lite smart card framework and applications Summary: PC/SC Lite smart card framework and applications
Group: System Environment/Daemons
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
Source1: https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2.asc Source1: https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2.asc
Source2: gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg Source2: gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
Patch1: pcsc-lite-1.9.1-maxreaders.patch Patch1: pcsc-lite-1.8.23-maxreaders.patch
BuildRequires: make BuildRequires: make
BuildRequires: doxygen BuildRequires: doxygen
@ -22,8 +23,6 @@ BuildRequires: gettext-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: gnupg2 BuildRequires: gnupg2
BuildRequires: gcc BuildRequires: gcc
BuildRequires: python3-devel
BuildRequires: /usr/bin/pathfix.py
Requires(post): systemd Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
@ -31,9 +30,8 @@ Requires(postun): systemd
Requires: pcsc-ifd-handler Requires: pcsc-ifd-handler
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Requires: polkit Requires: polkit
Requires: python3
Recommends: pcsc-lite-ccid Recommends: pcsc-lite-ccid
# This is bundled in upstream withou simple way to remove # This is bundled in upstream without simple way to remove
Provides: bundled(simclist) = 1.6 Provides: bundled(simclist) = 1.6
@ -48,12 +46,14 @@ line tools.
%package libs %package libs
Summary: PC/SC Lite libraries Summary: PC/SC Lite libraries
Group: System Environment/Libraries
%description libs %description libs
PC/SC Lite libraries. PC/SC Lite libraries.
%package devel %package devel
Summary: PC/SC Lite development files Summary: PC/SC Lite development files
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
%description devel %description devel
@ -61,6 +61,7 @@ PC/SC Lite development files.
%package doc %package doc
Summary: PC/SC Lite developer documentation Summary: PC/SC Lite developer documentation
Group: Documentation
BuildArch: noarch BuildArch: noarch
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
@ -89,8 +90,6 @@ done
--enable-usbdropdir=%{_libdir}/pcsc/drivers --enable-usbdropdir=%{_libdir}/pcsc/drivers
%make_build %make_build
doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5} doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5}
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" src/spy/pcsc-spy
%install %install
%make_install %make_install
@ -102,7 +101,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/pcscd
rm $RPM_BUILD_ROOT%{_libdir}/*.la rm $RPM_BUILD_ROOT%{_libdir}/*.la
%post %post
%systemd_post pcscd.socket pcscd.service %systemd_post pcscd.socket pcscd.service
# If install, test if pcscd socket is enabled. # If install, test if pcscd socket is enabled.
@ -121,7 +119,9 @@ fi
%postun %postun
%systemd_postun_with_restart pcscd.socket pcscd.service %systemd_postun_with_restart pcscd.socket pcscd.service
%ldconfig_scriptlets libs %post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files %files
@ -155,57 +155,24 @@ fi
%changelog %changelog
* Thu Nov 18 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.4-1 * Fri Jan 07 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.5-1
- Rebase to current version from Fedora (#2017828) - Rebase to 1.9.5 version to address race conditions (#2014641)
- Use of upstrea polkit policy preventing unneeded prompts - Drop dowstream polkit policy to avoid repeated authentication requests in remote sessions (#1928154)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.9.1-4 * Thu Jun 17 2021 Bob Relyea <rrelyea@redhat.com> - 1.8.23-4.1
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - rebuild to retrigger gating
Related: rhbz#1991688
* Fri Jun 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-3 * Thu Jun 17 2021 Bob Relyea <rrelyea@redhat.com> - 1.8.23-4
- Increase the maximum readers count (#1975422) - Update max readers to 48
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.9.1-2 * Fri May 10 2019 Bob Relyea <rrelyea@redhat.com> - 1.8.23-3.1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - test gating.
* Thu Feb 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-1 * Fri Aug 24 2018 Bob Relyea <rrelyea@redhat.com> - 1.8.23-3
- New upstream release (#1932519) - Update max readers to 32
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-3 * Fri Jun 22 2018 Troy Dawson <tdawson@redhat.com> - 1.8.23-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Fix python shebangs (#1580842)
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 15 2020 Jakub Jelen <jjelen@redhat.com> - 1.9.0-1
- New upstream release (#1846925)
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.26-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 20 2020 Jakub Jelen <jjelen@redhat.com> - 1.8.26-1
- New upstream release
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.25-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Apr 05 2019 Jakub Jelen <jjelen@redhat.com> - 1.8.25-1
- New upstream release (#1692559)
- Fix memory leak in SCardEstablishContextTH() (#1684674)
- Enable socket activation after installation (#1545027)
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.24-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Nov 20 2018 Jakub Jelen <jjelen@redhat.com> - 1.8.24-1
- New upstream release (#1651353)
* Mon Jul 23 2018 Jakub Jelen <jjelen@redhat.com> - 1.8.23-4
- Add missing dependencies (#1605389)
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.23-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.23-2 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.23-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild