Accepting request 1059874 from security:chipcard

OBS-URL: https://build.opensuse.org/request/show/1059874
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam_pkcs11?expand=0&rev=36

pam_pkcs11.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 16 09:31:59 UTC 2023 - Stefan Schubert <schubi@suse.com>
+
+- Migration of PAM settings to /usr/lib/pam.d.
+
 -------------------------------------------------------------------
 Fri Jul 29 08:49:15 UTC 2022 - pgajdos@suse.com
 

pam_pkcs11.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pam_pkcs11
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -122,8 +122,13 @@ done
 cd ..
 mkdir -p %{buildroot}%{_docdir}/%{name}
 cp -a AUTHORS COPYING ChangeLog ChangeLog.git NEWS README README.md TODO doc/pam_pkcs11.html doc/mappers_api.html doc/api doc/README.autologin doc/README.mappers %{buildroot}%{_docdir}/%{name}
+%if 0%{?suse_version} > 1500
+mkdir -p %{buildroot}%{_pam_vendordir}
+cp common-auth-smartcard %{buildroot}%{_pam_vendordir}
+%else
 mkdir -p %{buildroot}%{_sysconfdir}/pam.d
 cp common-auth-smartcard %{buildroot}%{_sysconfdir}/pam.d/
+%endif
 install -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/pkcs11_eventmgr.service
 mkdir -p %{buildroot}%{_sbindir}
 ln -s service %{buildroot}%{_sbindir}/rcpkcs11_eventmgr
@@ -132,6 +137,18 @@ ln -s service %{buildroot}%{_sbindir}/rcpkcs11_eventmgr
 
 %pre
 %service_add_pre pkcs11_eventmgr.service
+%if 0%{?suse_version} > 1500
+# Prepare for migration to /usr/lib; save any old .rpmsave
+for i in pam.d/common-auth-smartcard ; do
+     test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
+done
+
+%posttrans
+# Migration to /usr/lib, restore just created .rpmsave
+for i in pam.d/common-auth-smartcard ; do
+     test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
+done
+%endif
 
 %post
 %service_add_post pkcs11_eventmgr.service
@@ -153,7 +170,11 @@ ln -s service %{buildroot}%{_sbindir}/rcpkcs11_eventmgr
 %dir %{_sysconfdir}/pam_pkcs11/cacerts
 %dir %{_sysconfdir}/pam_pkcs11/crls
 %config(noreplace) %{_sysconfdir}/pam_pkcs11/*.conf
+%if 0%{?suse_version} > 1500
+%{_pam_vendordir}/common-auth-smartcard
+%else
 %config(noreplace) %{_sysconfdir}/pam.d/common-auth-smartcard
+%endif
 %{_prefix}/lib/systemd/system/pkcs11_eventmgr.service
 %{_sbindir}/*