Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -4,3 +4,23 @@
 /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

org.debian.pcsc-lite.policy

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-<policyconfig>
-  <vendor>The PCSC-lite Project</vendor>
-  <vendor_url>http://pcsclite.alioth.debian.org/</vendor_url>
-<!--  <icon_name>smart-card</icon_name> -->
-
-  <action id="org.debian.pcsc-lite.access_pcsc">
-    <description>Access to the PC/SC daemon</description>
-    <message>Authentication is required to access the PC/SC daemon</message>
-    <defaults>
-      <allow_any>auth_admin</allow_any>
-      <allow_inactive>auth_admin</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.debian.pcsc-lite.access_card">
-    <description>Access to the smart card</description>
-    <message>Authentication is required to access the smart card</message>
-    <defaults>
-      <allow_any>auth_admin</allow_any>
-      <allow_inactive>auth_admin</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-</policyconfig>

pcsc-lite.spec

@@ -1,32 +1,51 @@
-%global upstream_build 3963
+# 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.8.15
+Version:        1.9.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
-Group:          System Environment/Daemons
 License:        BSD
-URL:            http://pcsclite.alioth.debian.org/
+URL:            https://pcsclite.apdu.fr/
-Source0:        https://alioth.debian.org/frs/download.php/file/%{upstream_build}/%{name}-%{version}.tar.bz2
+Source0:        https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2
-Source1:	org.debian.pcsc-lite.policy
+Source1:        https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2.asc
+Source2:        gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
 
+BuildRequires:  make
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 BuildRequires:  systemd-devel
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  /usr/bin/pod2man
+%if %{with_polkit}
 BuildRequires:  polkit-devel
+%endif
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
+BuildRequires:  gnupg2
+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}
-Recommends:	pcsc-lite-ccid
+%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
 
 
 %description
@@ -40,14 +59,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
@@ -55,7 +72,6 @@ PC/SC Lite development files.
 
 %package        doc
 Summary:        PC/SC Lite developer documentation
-Group:          Documentation
 BuildArch:      noarch
 Requires:       %{name}-libs = %{version}-%{release}
 
@@ -64,6 +80,8 @@ Requires:       %{name}-libs = %{version}-%{release}
 
 
 %prep
+gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+
 %setup -q
 
 # Convert to utf-8
@@ -77,18 +95,18 @@ done
 %build
 %configure \
   --disable-static \
+%if %{with_polkit}
   --enable-polkit \
+%endif
+  --with-systemdsystemunitdir=%{_unitdir} \
   --enable-usbdropdir=%{_libdir}/pcsc/drivers
-make %{?_smp_mflags}
+%make_build
 doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5}
+%py3_shebang_fix src/spy/pcsc-spy
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
-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 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/
 
 # Create empty directories
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
@@ -97,12 +115,18 @@ 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
-
 
 %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
@@ -110,14 +134,13 @@ rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON
 %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 DRIVERS HELP README SECURITY TODO
+%doc AUTHORS ChangeLog HELP README SECURITY TODO
 %doc doc/README.polkit
+%doc install_spy.sh uninstall_spy.sh
 %dir %{_sysconfdir}/reader.conf.d/
 %{_unitdir}/pcscd.service
 %{_unitdir}/pcscd.socket
@@ -126,11 +149,13 @@ rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON
 %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}
+%{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy
+%endif
 
 %files libs
-%doc COPYING
+%license COPYING
 %{_libdir}/libpcsclite.so.*
 
 %files devel
@@ -146,6 +171,132 @@ rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON
 
 
 %changelog
+* 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
+
+* Tue Dec 19 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.23-1
+- New upstream release
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.22-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.22-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 27 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.22-1
+- New upstream release
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Jan  2 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.20-1
+- New upstream release
+
+* Fri Dec  9 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.19-1
+- New upstream release
+
+* Wed Nov 30 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.18-1
+- New upstream release
+
+* Thu Jun 30 2016 Ville Skyttä <ville.skytta@iki.fi> - 1.8.17-2
+- Add dependency on polkit
+- Mark COPYING as %%license
+- Fix bogus dates in %%changelog
+
+* Tue Jun 21 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.17-1
+- New upstream release
+
+* Fri Apr  1 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.16-1
+- New upstream release (#1319539)
+- Added gpg key verification as part of build process
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
@@ -352,16 +503,16 @@ rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON
   even though s390 does not have libusb or smartCards, the libusb
   packages are required to build other packages.
 
-* Thu Aug 18 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-3
+* Thu Aug 28 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-3
 - bump tag becaue the build system can't deal with mistakes.
 
-* Thu Aug 18 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-2
+* Thu Aug 28 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-2
 - mock build changes
 
-* Wed Aug 17 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-1
+* Thu Aug 28 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-1
 - Pick up 1.4.102
 
-* Wed May 6 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.101-1
+* Tue May 6 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.101-1
 - Pick up 1.4.101
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.4.4-3
@@ -371,7 +522,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON
 - Silence libpcsc-lite even when the daemon isn't running.
 - fix typo in init file which prevents the config file from being read.
 
-* Tue Nov 22 2007 Bob Relyea <rrelyea@redhat.com> - 1.4.4-1
+* Thu Nov 22 2007 Bob Relyea <rrelyea@redhat.com> - 1.4.4-1
 - Pick up 1.4.4
 
 * Tue Feb 06 2007 Bob Relyea <rrelyea@redhat.com> - 1.3.3-1
@@ -388,7 +539,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON
 - follow packaging guidelines for setting up init service
   (bug 200778)
 
-* Sun Jul 24 2006 Bob Relyea <rrelyea@redhat.com> - 1.3.1-5
+* Mon Jul 24 2006 Bob Relyea <rrelyea@redhat.com> - 1.3.1-5
 - start pcscd when pcsc-lite is installed
 
 * Sun Jul 16 2006 Florian La Roche <laroche@redhat.com> - 1.3.1-4
@@ -426,7 +577,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON
 * Thu May 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.2.0-12
 - Rebuild.
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.0-11
+* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.0-11
 - rebuilt
 
 * Tue Aug 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.2.0-10

sources

@@ -1,2 +1,2 @@
-9e20389c7a093e7cbc779deb4b109195  pcsc-lite-1.8.15.tar.bz2.asc
+SHA512 (pcsc-lite-1.9.9.tar.bz2) = 748ec3d82ff48af1a8dc5a581863e5d94adc47ab8f3158ceb838c2b521ece3a746b737c7b4bb2ba8b545be85ff18b9639443864e50b2e065cf2fbfdf79ef9700
-ded5cf2f78d26293934cefd0dbc58a43  pcsc-lite-1.8.15.tar.bz2
+SHA512 (pcsc-lite-1.9.9.tar.bz2.asc) = b2f81fb9ec4dfdf73fce16b139206a5d606038d728ec6a5cdc5d3fb13b908add597baa490df9132155714b295222fef62ae2e0b50de212461af9ac8008297400