From 015ebfe1b1a90cf05d936e0266efb67a36fb033c3e6cfc134c8009c6658788e5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 3 Jan 2023 15:05:05 +0000
Subject: [PATCH] Accepting request 1046514 from home:schubi2:pam_usr_etc

- Migration of PAM settings to /usr/lib/pam.d.

OBS-URL: https://build.opensuse.org/request/show/1046514
OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=281
---
 sssd.changes |  5 +++++
 sssd.spec    | 15 ++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/sssd.changes b/sssd.changes
index c30e9f7..8574d17 100644
--- a/sssd.changes
+++ b/sssd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan  3 12:01:41 UTC 2023 - Stefan Schubert <schubi@suse.com>
+
+- Migration of PAM settings to /usr/lib/pam.d. 
+
 -------------------------------------------------------------------
 Wed Dec 21 19:29:45 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/sssd.spec b/sssd.spec
index 9fc843a..f64c5f2 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package sssd
 #
-# 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
@@ -408,6 +408,8 @@ install -d "$b/%_unitdir"
 %if 0%{?suse_version} > 1500
 install -d "$b/%_distconfdir/logrotate.d"
 install -m644 src/examples/logrotate "$b/%_distconfdir/logrotate.d/sssd"
+install -d "$b/%_pam_vendordir"
+mv "$b/%_pam_confdir/sssd-shadowutils" "$b/%_pam_vendordir"
 %else
 install -d "$b/%_sysconfdir/logrotate.d"
 install -m644 src/examples/logrotate "$b/%_sysconfdir/logrotate.d/sssd"
@@ -428,6 +430,12 @@ ln -sfv %_sysconfdir/alternatives/%cifs_idmap_name %buildroot/%cifs_idmap_plugin
 
 %pre
 %service_add_pre sssd.service
+%if 0%{?suse_version} > 1500
+# Prepare for migration to /usr/etc; save any old .rpmsave
+for i in pam.d/sssd-shadowutils ; do
+     test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
+done
+%endif
 
 %post
 /sbin/ldconfig
@@ -497,7 +505,7 @@ done
 %if 0%{?suse_version} > 1500
 %posttrans
 # Migration to /usr/etc, restore just created .rpmsave
-for i in logrotate.d/sssd ; do
+for i in logrotate.d/sssd pam.d/sssd-shadowutils ; do
    test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
 done
 %endif
@@ -595,11 +603,12 @@ done
 %config(noreplace) %_sysconfdir/sssd/sssd.conf
 %if 0%{?suse_version} > 1500
 %_distconfdir/logrotate.d/sssd
+%_pam_vendordir/sssd-shadowutils
 %else
 %config(noreplace) %_sysconfdir/logrotate.d/sssd
+%config(noreplace) %_pam_confdir/sssd-shadowutils
 %endif
 %dir %_sysconfdir/sssd/conf.d
-%config(noreplace) %_pam_confdir/sssd-shadowutils
 %dir %_datadir/%name/
 %_datadir/%name/cfg_rules.ini
 %_datadir/%name/sssd.api.conf