From 7d61bc6b2af3c7028c2808a01f473641977f54f8a5b2824510e31b2596e15074 Mon Sep 17 00:00:00 2001
From: Valentin Lefebvre <valentin.lefebvre@suse.com>
Date: Wed, 25 Jan 2023 10:56:16 +0000
Subject: [PATCH] Accepting request 1060632 from home:schubi2

OBS-URL: https://build.opensuse.org/request/show/1060632
OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam?expand=0&rev=271
---
 macros.pam  | 13 +++++++------
 pam.changes | 12 ++++++++++++
 pam.spec    | 37 +++++++++++++++++++++----------------
 3 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/macros.pam b/macros.pam
index 87a5493..ac665f6 100644
--- a/macros.pam
+++ b/macros.pam
@@ -1,7 +1,8 @@
-%_pam_libdir     %{_libdir}
-%_pam_moduledir  %{_libdir}/security
-%_pam_secconfdir %{_sysconfdir}/security
-%_pam_confdir    %{_sysconfdir}/pam.d
-%_pam_vendordir  %{_prefix}/lib/pam.d
+%_pam_libdir         %{_libdir}
+%_pam_moduledir      %{_libdir}/security
+%_pam_secconfdir     %{_sysconfdir}/security
+%_pam_secdistconfdir %{_distconfdir}/security
+%_pam_confdir        %{_sysconfdir}/pam.d
+%_pam_vendordir      %{_prefix}/lib/pam.d
 # legacy, to be retired
-%_pamdir         %{_pam_moduledir}
+%_pamdir             %{_pam_moduledir}
diff --git a/pam.changes b/pam.changes
index 7805273..e855161 100644
--- a/pam.changes
+++ b/pam.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Jan 24 08:38:04 UTC 2023 - Valentin Lefebvre <valentin.lefebvre@suse.com>
+
+- Use rpm macros for pam dist conf dir (/usr/etc/security)
+
+-------------------------------------------------------------------
+Wed Jan 18 09:33:37 UTC 2023 - Stefan Schubert <schubi@suse.com>
+
+- Moved following files/dirs in /etc/security to vendor directory:
+  access.conf, limits.d, sepermit.conf, time.conf, namespace.conf,
+  namespace.d, namespace.init
+
 -------------------------------------------------------------------
 Sat Dec 24 13:31:33 UTC 2022 - Dominique Leuenberger <dleuenberger@suse.com>
 
diff --git a/pam.spec b/pam.spec
index 58e913a..464ce23 100644
--- a/pam.spec
+++ b/pam.spec
@@ -19,6 +19,10 @@
 
 %define flavor @BUILD_FLAVOR@%{nil}
 
+%define config_files pam.d/other pam.d/common-account pam.d/common-auth pam.d/common-password pam.d/common-session \\\
+	security/faillock.conf security/group.conf security/limits.conf security/pam_env.conf security/access.conf \\\
+	security/namespace.conf security/namespace.init security/sepermit.conf
+
 %if "%{flavor}" == "full"
 %define build_main 0
 %define build_doc 1
@@ -247,8 +251,9 @@ install -D -m 644 %{SOURCE2} %{buildroot}%{_rpmmacrodir}/macros.pam
 # /run/motd.d
 install -Dm0644 %{SOURCE13} %{buildroot}%{_tmpfilesdir}/pam.conf
 
-mkdir -p %{buildroot}%{_distconfdir}/security
-mv %{buildroot}%{_sysconfdir}/security/{limits.conf,faillock.conf,group.conf,pam_env.conf} %{buildroot}%{_distconfdir}/security/
+mkdir -p %{buildroot}%{_pam_secdistconfdir}
+mv %{buildroot}%{_sysconfdir}/security/{limits.conf,faillock.conf,group.conf,pam_env.conf,access.conf,limits.d,sepermit.conf,time.conf} %{buildroot}%{_pam_secdistconfdir}/
+mv %{buildroot}%{_sysconfdir}/security/{namespace.conf,namespace.d,namespace.init} %{buildroot}%{_pam_secdistconfdir}/
 mv %{buildroot}%{_sysconfdir}/environment %{buildroot}%{_distconfdir}/environment
 
 # Remove manual pages for main package
@@ -287,13 +292,13 @@ rm -rf %{buildroot}%{_mandir}/man8/pam_userdb.8*
 
 %postun -p /sbin/ldconfig
 %pre
-for i in securetty pam.d/other pam.d/common-account pam.d/common-auth pam.d/common-password pam.d/common-session ; do
+for i in securetty %{config_files} ; do
   test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
 done
 
 %posttrans
 # Migration to /usr/etc.
-for i in securetty pam.d/other pam.d/common-account pam.d/common-auth pam.d/common-password pam.d/common-session ; do
+for i in securetty %{config_files} ; do
   test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
 done
 
@@ -307,8 +312,8 @@ done
 %dir %{_pam_confdir}
 %dir %{_pam_vendordir}
 %dir %{_pam_secconfdir}
-%dir %{_pam_secconfdir}/limits.d
-%dir %{_distconfdir}/security
+%dir %{_pam_secdistconfdir}
+%dir %{_pam_secdistconfdir}/limits.d
 # /usr/etc/pam.d is for compat reasons
 %dir %{_distconfdir}/pam.d
 %dir %{_prefix}/lib/motd.d
@@ -320,19 +325,19 @@ done
 %{_pam_vendordir}/common-*
 %endif
 %{_distconfdir}/environment
-%config(noreplace) %{_pam_secconfdir}/access.conf
-%{_distconfdir}/security/group.conf
-%{_distconfdir}/security/faillock.conf
-%{_distconfdir}/security/limits.conf
-%{_distconfdir}/security/pam_env.conf
+%{_pam_secdistconfdir}/access.conf
+%{_pam_secdistconfdir}/group.conf
+%{_pam_secdistconfdir}/faillock.conf
+%{_pam_secdistconfdir}/limits.conf
+%{_pam_secdistconfdir}/pam_env.conf
 %if %{enable_selinux}
-%config(noreplace) %{_pam_secconfdir}/sepermit.conf
+%{_pam_secdistconfdir}/sepermit.conf
 %endif
-%config(noreplace) %{_pam_secconfdir}/time.conf
-%config(noreplace) %{_pam_secconfdir}/namespace.conf
-%config(noreplace) %{_pam_secconfdir}/namespace.init
+%{_pam_secdistconfdir}/time.conf
+%{_pam_secdistconfdir}/namespace.conf
+%{_pam_secdistconfdir}/namespace.init
 %config(noreplace) %{_pam_secconfdir}/pwhistory.conf
-%dir %{_pam_secconfdir}/namespace.d
+%dir %{_pam_secdistconfdir}/namespace.d
 %{_libdir}/libpam.so.0
 %{_libdir}/libpam.so.%{libpam_so_version}
 %{_libdir}/libpamc.so.0