Accepting request 984917 from Linux-PAM

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/984917
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam?expand=0&rev=122

macros.pam

@@ -2,6 +2,6 @@
 %_pam_moduledir  %{_libdir}/security
 %_pam_secconfdir %{_sysconfdir}/security
 %_pam_confdir    %{_sysconfdir}/pam.d
-%_pam_vendordir  %{_distconfdir}/pam.d
+%_pam_vendordir  %{_prefix}/lib/pam.d
 # legacy, to be retired
 %_pamdir         %{_pam_moduledir}

pam.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jun 17 15:26:20 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
+
+- Keep old directory in filelist for migration
+
+-------------------------------------------------------------------
+Wed Jun  1 11:43:22 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
+
+- Move PAM config files from /usr/etc/pam.d to /usr/lib/pam.d
+
 -------------------------------------------------------------------
 Fri Mar 11 11:25:35 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
 

pam.spec

@@ -195,7 +195,7 @@ CFLAGS="$CFLAGS -DNDEBUG"
 	--pdfdir=%{_docdir}/pam/pdf \
 	--enable-isadir=../..%{_pam_moduledir} \
 	--enable-securedir=%{_pam_moduledir} \
-	--enable-vendordir=%{_distconfdir} \
+	--enable-vendordir=%{_prefix}/etc \
 %if %{with debug}
 	--enable-debug
 %endif
@@ -215,6 +215,8 @@ mkdir -p %{buildroot}%{_includedir}/security
 mkdir -p %{buildroot}%{_pam_moduledir}
 mkdir -p %{buildroot}/sbin
 mkdir -p -m 755 %{buildroot}%{_libdir}
+# For compat reasons
+mkdir -p %{buildroot}%{_distconfdir}/pam.d
 %make_install
 /sbin/ldconfig -n %{buildroot}%{libdir}
 # Install documentation
@@ -253,7 +255,7 @@ install -D -m 644 %{SOURCE2} %{buildroot}%{_rpmmacrodir}/macros.pam
 # /run/motd.d
 install -Dm0644 %{SOURCE13} %{buildroot}%{_tmpfilesdir}/pam.conf
 
-mkdir %{buildroot}%{_distconfdir}/security
+mkdir -p %{buildroot}%{_distconfdir}/security
 mv %{buildroot}%{_sysconfdir}/security/{limits.conf,faillock.conf,group.conf} %{buildroot}%{_distconfdir}/security/
 
 # Remove manual pages for main package
@@ -314,6 +316,8 @@ done
 %dir %{_pam_secconfdir}
 %dir %{_pam_secconfdir}/limits.d
 %dir %{_distconfdir}/security
+# /usr/etc/pam.d is for compat reasons
+%dir %{_distconfdir}/pam.d
 %dir %{_prefix}/lib/motd.d
 %if %{defined config_noreplace}
 %config(noreplace) %{_pam_confdir}/other