.gitignore

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

.pcsc-lite.metadata

@@ -1,2 +1,2 @@
 13df650b9548b4ef1b24ad11ef6b573af4d48011 SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
-24ca367c0dc1bd87f759827ee937ebd1d31ed50a SOURCES/pcsc-lite-2.2.3.tar.xz
+b8ca342dfa650c2c4d25a86f6dbfa3aa019c2045 SOURCES/pcsc-lite-1.9.4.tar.bz2

SOURCES/pcsc-lite-1.9.1-maxreaders.patch

@@ -0,0 +1,24 @@
+diff -up ./src/PCSC/pcsclite.h.in.readers_32 ./src/PCSC/pcsclite.h.in
+--- ./src/PCSC/pcsclite.h.in.readers_32	2018-08-20 16:02:17.708302410 -0700
++++ ./src/PCSC/pcsclite.h.in	2018-08-20 16:02:49.462500967 -0700
+@@ -281,7 +281,7 @@ extern const SCARD_IO_REQUEST g_rgSCardT
+ 
+ #define PCSCLITE_VERSION_NUMBER		"@VERSION@"	/**< Current version */
+ /** Maximum readers context (a slot is count as a reader) */
+-#define PCSCLITE_MAX_READERS_CONTEXTS			16
++#define PCSCLITE_MAX_READERS_CONTEXTS			48
+ 
+ #define MAX_READERNAME			128
+ 
+diff -up ./src/PCSC/pcsclite.h.readers_32 ./src/PCSC/pcsclite.h
+--- ./src/PCSC/pcsclite.h.readers_32	2018-08-20 16:02:30.993385481 -0700
++++ ./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.9.4"	/**< Current version */
+ /** Maximum readers context (a slot is count as a reader) */
+-#define PCSCLITE_MAX_READERS_CONTEXTS			16
++#define PCSCLITE_MAX_READERS_CONTEXTS		48	
+ 
+ #define MAX_READERNAME			128
+ 

SOURCES/pcsc-lite-1.9.4.tar.bz2.asc

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

SOURCES/pcsc-lite-2.2.3.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE9eEbn/6REUb0HZU9eKG03+j5xX4FAmZTUMcACgkQeKG03+j5
-xX5JXw/8CjH7jrxwZmCLWpvuGGJpDpqEritUqciW03YkjKtp/yC7h6S6KQKgD+RW
-2ArShpaGsCZMDlI8gsW66pgWfjfCYrWEe8G+Tjdd/1t6L+XiO/Kmv/+WT0rRQUNN
-V9kOJkl4Uqse8vupeiUfWto9Kw+2yXAaB3QO0VOLJ+ozsXR7EQ4W90azPchhEIa4
-Gj6qq9rRVWC16kuH80x1umbEFlQujBEXAy2YmscPT4rBSTYej1f2Wi6+RVtltTk9
-6uTnhWiGoy0KtM0Zr0EZLww/G4NpCSQ5vFzCHl883rdol8YRIgCibriTuzeMoAbm
-Fd9IokWWbBvpNxrO5XMZagZwRJpxeyZV9IuDqj8QCEFJ8lghBHx4DvO5/H0Mg8EF
-FMNhC1lMV1EmRnkvmDQZT8v3rjjtmlwycB5jE/txPL2LFwRR0cd7Yr+p7g3dwT+3
-6267mWe0Onq2q08SM/Ixr/fpY8sRvjYmGl6nlZShplTXgNBV80rpXh36NqIdDHkK
-HUjuyo7lG4WMGlWGJh6IJCk3cyHBACb6k0AVBI9jDU6q2wAs9gkjDhV3R1GYIwim
-qD4BjPgWOPKhVrNjXVuv1/csgLxeMT9HBa7Y7S0Dd8WzfdFhLmRD4uGys22m/wOI
-/GwS3iiBgljLOnv7/HDxOWokx7a9UBugQHePxZ5vo8+w/Pfz2FM=
-=UdJS
------END PGP SIGNATURE-----

SPECS/pcsc-lite.spec

@@ -1,48 +1,39 @@
-# doesn't make sense to install a polkit configuration inside a Flatpak
-%if 0%{?flatpak}
-%global with_polkit 0
-%else
-%global with_polkit 1
-%endif
-
 Name:           pcsc-lite
-Version:        2.2.3
+Version:        1.9.4
 Release:        1%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
-License:        BSD-3-Clause AND BSD-2-Clause AND GPL-3.0-or-later
+License:        BSD
 URL:            https://pcsclite.apdu.fr/
-Source0:        https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.xz
+Source0:        https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2
-Source1:        https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.xz.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
 
+BuildRequires: make
 BuildRequires:  doxygen
 BuildRequires:  graphviz
-BuildRequires:  systemd
 BuildRequires:  systemd-devel
-BuildRequires:  systemd-rpm-macros
+BuildRequires:  /usr/bin/pod2man
-BuildRequires:  perl-podlators
-%if %{with_polkit}
 BuildRequires:  polkit-devel
-%endif
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  gettext-devel
+BuildRequires:  libtool
 BuildRequires:  gnupg2
-BuildRequires:  meson
 BuildRequires:  gcc
 BuildRequires:  python3-devel
-BuildRequires:  flex
+BuildRequires:  /usr/bin/pathfix.py
 
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 Requires:       pcsc-ifd-handler
 Requires:       %{name}-libs = %{version}-%{release}
-%if %{with_polkit}
 Requires:       polkit
-%endif
 Requires:       python3
 Recommends:     pcsc-lite-ccid
-# This is bundled in upstream without simple way to remove
+# This is bundled in upstream withou simple way to remove
 Provides:       bundled(simclist) = 1.6
 
 
@@ -78,9 +69,10 @@ Requires:       %{name}-libs = %{version}-%{release}
 
 
 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 
 %setup -q
+%patch1 -p 0 -b .maxreaders
 
 # Convert to utf-8
 for file in ChangeLog; do
@@ -91,27 +83,25 @@ done
 
 
 %build
-%meson -Dlibsystemd=true \
+%configure \
-    -Dsystemdunit=system \
+  --disable-static \
-    -Dserial=true \
+  --enable-polkit \
-    -Dusbdropdir=%{_libdir}/pcsc/drivers \
+  --enable-usbdropdir=%{_libdir}/pcsc/drivers
-%if ! %{with_polkit}
+%make_build
-   -Dpolkit=false
+doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5}
-%else
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" src/spy/pcsc-spy
-   -Dpolkit=true
-%endif
-%meson_build
-%meson_build doc
 
 
 %install
-%meson_install
+%make_install
 
 # Create empty directories
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/pcscd
 
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
 
 %post
 %systemd_post pcscd.socket pcscd.service
@@ -135,9 +125,8 @@ fi
 
 
 %files
-%doc AUTHORS ChangeLog HELP README SECURITY
+%doc AUTHORS ChangeLog HELP README SECURITY TODO
 %doc doc/README.polkit
-%doc src/spy/setup_spy.sh
 %dir %{_sysconfdir}/reader.conf.d/
 %{_unitdir}/pcscd.service
 %{_unitdir}/pcscd.socket
@@ -146,105 +135,39 @@ fi
 %dir %{_libdir}/pcsc/drivers/
 %{_mandir}/man5/reader.conf.5*
 %{_mandir}/man8/pcscd.8*
-%ghost %dir %{_localstatedir}/run/pcscd/
-%if %{with_polkit}
-%dir %{_datadir}/polkit-1/
-%dir %{_datadir}/polkit-1/actions/
 %{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy
-%endif
+%ghost %dir %{_localstatedir}/run/pcscd/
 
 %files libs
 %license COPYING
 %{_libdir}/libpcsclite.so.*
-%{_libdir}/libpcsclite_real.so.*
 
 %files devel
 %{_bindir}/pcsc-spy
 %{_includedir}/PCSC/
 %{_libdir}/libpcsclite.so
-%{_libdir}/libpcsclite_real.so
 %{_libdir}/libpcscspy.so*
-%dir %{_libdir}/pkgconfig/
 %{_libdir}/pkgconfig/libpcsclite.pc
 %{_mandir}/man1/pcsc-spy.1*
 
 %files doc
-%doc %{_vpath_builddir}/doc/api/ doc/example/pcsc_demo.c
+%doc doc/api/ doc/example/pcsc_demo.c
 
 
 %changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.2.3-1
+* Thu Nov 18 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.4-1
-- Rebuilt for MSVSphere 10
+- Rebase to current version from Fedora (#2017828)
-
+- Use of upstrea polkit policy preventing unneeded prompts
-* Tue Jul 02 2024 Jakub Jelen <jjelen@redhat.com> - 2.2.3-1
-- New upstream release.
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.0.1-4
-- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Nov 27 2023 Jakub Jelen <jjelen@redhat.com> - 2.0.1-1
-- New upstream release (#2251427)
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Jun 12 2023 Jakub Jelen <jjelen@redhat.com> - 2.0.0-1
-- New upstream release (#2213961)
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Nov 01 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.9-2
-- Remove downstream patch breaking flatpak (#2054826)
-
-* Mon Sep 19 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.9-1
-- New upstream release (#2126065)
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.8-1
-- New upstream release (#2095962)
-
-* Fri May 13 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.7-1
-- New upstream release (#2085514)
-
-* Thu May 12 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.6-1
-- New upstream release (#2084468)
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Dec 06 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.5-1
-- New upstream release (#2029098)
-
-* Mon Oct 04 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.4-1
-- New upstream release (#2009927)
-
-* Mon Aug 09 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.3-1
-- New upstream release (#1991071)
-
-* Wed Aug 04 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.2-1
-- New upstream release (#1989875)
-
-* Fri Jul 23 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-5
-- Use upstream polkit policy to avoid annoying prompts in remote sessions (#1478345)
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-4
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.9.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
 * Fri Jun 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-3
-- Add support for more readers
+- Increase the maximum readers count (#1975422)
 
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.9.1-2
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.9.1-2
-- Rebuilt for updated systemd-rpm-macros
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-  See https://pagure.io/fesco/issue/2583.
 
 * Thu Feb 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-1
 - New upstream release (#1932519)