.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,2 +1,30 @@
-SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
+/pcsc-lite-*.tar.bz2
-SOURCES/pcsc-lite-1.9.5.tar.bz2
+/pcsc-lite-1.8.11.tar.bz2.asc
+/pcsc-lite-1.8.12.tar.bz2.asc
+/pcsc-lite-1.8.13.tar.bz2.asc
+/pcsc-lite-1.8.14.tar.bz2.asc
+/pcsc-lite-1.8.15.tar.bz2.asc
+/pcsc-lite-1.8.16.tar.bz2.asc
+/pcsc-lite-1.8.17.tar.bz2.asc
+/pcsc-lite-1.8.18.tar.bz2.asc
+/pcsc-lite-1.8.19.tar.bz2.asc
+/pcsc-lite-1.8.20.tar.bz2.asc
+/pcsc-lite-1.8.22.tar.bz2.asc
+/pcsc-lite-1.8.23.tar.bz2.asc
+/pcsc-lite-1.8.24.tar.bz2.asc
+/pcsc-lite-1.8.25.tar.bz2.asc
+/pcsc-lite-1.8.26.tar.bz2.asc
+/pcsc-lite-1.9.0.tar.bz2.asc
+/pcsc-lite-1.9.1.tar.bz2.asc
+/pcsc-lite-1.9.2.tar.bz2.asc
+/pcsc-lite-1.9.3.tar.bz2.asc
+/pcsc-lite-1.9.4.tar.bz2.asc
+/pcsc-lite-1.9.5.tar.bz2.asc
+/pcsc-lite-1.9.6.tar.bz2.asc
+/pcsc-lite-1.9.7.tar.bz2.asc
+/pcsc-lite-1.9.8.tar.bz2.asc
+/pcsc-lite-1.9.9.tar.bz2.asc
+/pcsc-lite-2.0.0.tar.bz2.asc
+/pcsc-lite-2.0.1.tar.bz2.asc
+/pcsc-lite-2.2.3.tar.xz
+/pcsc-lite-2.2.3.tar.xz.asc

.pcsc-lite.metadata

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

SOURCES/pcsc-lite-1.8.23-maxreaders.patch

@@ -1,24 +0,0 @@
-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.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	
- 
- #define MAX_READERNAME			128
- 

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

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

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

gating.yaml

@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-disabled.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-enabled.functional}

pcsc-lite.spec

@@ -1,35 +1,46 @@
+# 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:        1.9.5
+Version:        2.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
-Group:          System Environment/Daemons
+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.bz2
+Source0:        https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.xz
-Source1:        https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2.asc
+Source1:        https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.xz.asc
 Source2:        gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
-Patch1:		pcsc-lite-1.8.23-maxreaders.patch
 
-BuildRequires:  make
 BuildRequires:  doxygen
 BuildRequires:  graphviz
+BuildRequires:  systemd
 BuildRequires:  systemd-devel
-BuildRequires:  /usr/bin/pod2man
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  perl-podlators
+%if %{with_polkit}
 BuildRequires:  polkit-devel
-BuildRequires:  autoconf
+%endif
-BuildRequires:  automake
 BuildRequires:  gettext-devel
-BuildRequires:  libtool
 BuildRequires:  gnupg2
+BuildRequires:  meson
 BuildRequires:  gcc
+BuildRequires:  python3-devel
+BuildRequires:  flex
 
 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
 Provides:       bundled(simclist) = 1.6
@@ -46,14 +57,12 @@ line tools.
 
 %package        libs
 Summary:        PC/SC Lite libraries
-Group:          System Environment/Libraries
 
 %description    libs
 PC/SC Lite libraries.
 
 %package        devel
 Summary:        PC/SC Lite development files
-Group:          Development/Libraries
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description    devel
@@ -61,7 +70,6 @@ PC/SC Lite development files.
 
 %package        doc
 Summary:        PC/SC Lite developer documentation
-Group:          Documentation
 BuildArch:      noarch
 Requires:       %{name}-libs = %{version}-%{release}
 
@@ -70,10 +78,9 @@ Requires:       %{name}-libs = %{version}-%{release}
 
 
 %prep
-gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 
 %setup -q
-%patch1 -p 0 -b .maxreaders
 
 # Convert to utf-8
 for file in ChangeLog; do
@@ -84,22 +91,27 @@ done
 
 
 %build
-%configure \
+%meson -Dlibsystemd=true \
-  --disable-static \
+    -Dsystemdunit=system \
-  --enable-polkit \
+    -Dserial=true \
-  --enable-usbdropdir=%{_libdir}/pcsc/drivers
+    -Dusbdropdir=%{_libdir}/pcsc/drivers \
-%make_build
+%if ! %{with_polkit}
-doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5}
+   -Dpolkit=false
+%else
+   -Dpolkit=true
+%endif
+%meson_build
+%meson_build doc
+
 
 %install
-%make_install
+%meson_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
@@ -119,14 +131,13 @@ fi
 %postun
 %systemd_postun_with_restart pcscd.socket pcscd.service
 
-%post libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
-
-%postun libs -p /sbin/ldconfig
 
 
 %files
-%doc AUTHORS ChangeLog HELP README SECURITY TODO
+%doc AUTHORS ChangeLog HELP README SECURITY
 %doc doc/README.polkit
+%doc src/spy/setup_spy.sh
 %dir %{_sysconfdir}/reader.conf.d/
 %{_unitdir}/pcscd.service
 %{_unitdir}/pcscd.socket
@@ -135,44 +146,144 @@ fi
 %dir %{_libdir}/pcsc/drivers/
 %{_mandir}/man5/reader.conf.5*
 %{_mandir}/man8/pcscd.8*
-%{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy
 %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
 
 %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 doc/api/ doc/example/pcsc_demo.c
+%doc %{_vpath_builddir}/doc/api/ doc/example/pcsc_demo.c
 
 
 %changelog
-* Fri Jan 07 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.5-1
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.2.3-2
-- Rebase to 1.9.5 version to address race conditions (#2014641)
+- Bump release for October 2024 mass rebuild:
-- Drop dowstream polkit policy to avoid repeated authentication requests in remote sessions (#1928154)
+  Resolves: RHEL-64018
 
-* Thu Jun 17 2021 Bob Relyea <rrelyea@redhat.com> - 1.8.23-4.1
+* Tue Jul 02 2024 Jakub Jelen <jjelen@redhat.com> - 2.2.3-1
-- rebuild to retrigger gating
+- New upstream release.
 
-* Thu Jun 17 2021 Bob Relyea <rrelyea@redhat.com> - 1.8.23-4
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.0.1-4
-- Update max readers to 48
+- Bump release for June 2024 mass rebuild
 
-* Fri May 10 2019 Bob Relyea <rrelyea@redhat.com> - 1.8.23-3.1
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-3
-- test gating.
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Fri Aug 24 2018 Bob Relyea <rrelyea@redhat.com> - 1.8.23-3
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-2
-- Update max readers to 32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Fri Jun 22 2018 Troy Dawson <tdawson@redhat.com> - 1.8.23-2.1
+* Mon Nov 27 2023 Jakub Jelen <jjelen@redhat.com> - 2.0.1-1
-- Fix python shebangs (#1580842)
+- 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
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-3
+- Add support for more readers
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.9.1-2
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Thu Feb 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-1
+- New upstream release (#1932519)
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* 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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

plans/ci.fmf

@@ -0,0 +1,23 @@
+/fips-disabled-buildroot-disabled:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/smart-cards
+      name: /plans/ci/fips-disabled-buildroot-disabled
+
+/fips-disabled-buildroot-enabled:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/smart-cards
+      name: /plans/ci/fips-disabled-buildroot-enabled
+
+/fips-enabled-buildroot-disabled:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/smart-cards
+      name: /plans/ci/fips-enabled-buildroot-disabled
+
+/fips-enabled-buildroot-enabled:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/smart-cards
+      name: /plans/ci/fips-enabled-buildroot-enabled

sources

@@ -0,0 +1,2 @@
+SHA512 (pcsc-lite-2.2.3.tar.xz) = 417410f92a14eff78231ff6007ed801d71ae89c62914a88f21e8cd199e4792f00df09c28604e138efe269c7a6df9c8fd891401c6be77fb8cd8639b7890a9e00c
+SHA512 (pcsc-lite-2.2.3.tar.xz.asc) = 998a155c106eb7e5fd21bb4e4bf36f63b45aa329e15b33e69e6e2e58c9084082d04ee82d7f983ca345bab7352b0f928e333efd7a4faaa3e882eb8a4c62c2ae02