From cbbd2225e4710eb29ae530dfff104819ce4a370d55b185c20c2a54adbd820625 Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Mon, 9 Jan 2023 11:03:07 +0000
Subject: [PATCH] Accepting request 1045658 from home:schubi2:pam_usr_etc

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

OBS-URL: https://build.opensuse.org/request/show/1045658
OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=73
---
 ppp.changes |  5 +++++
 ppp.spec    | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/ppp.changes b/ppp.changes
index 70628a3..c4888df 100644
--- a/ppp.changes
+++ b/ppp.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec 28 14:32:02 UTC 2022 - Stefan Schubert <schubi@suse.com>
+
+- Migration of PAM settings to /usr/lib/pam.d. 
+
 -------------------------------------------------------------------
 Thu May 26 18:43:35 UTC 2022 - Martin Liška <mliska@suse.cz>
 
diff --git a/ppp.spec b/ppp.spec
index a949e98..74f045b 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -150,13 +150,32 @@ install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/ppp/peers/pppoatm
 %endif
 install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/ppp/peers/ppp
 install -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/ppp/peers/pptp
+%if 0%{?suse_version} > 1500
+install -d 755 %{buildroot}%{_pam_vendordir}
+install -m 644 %{SOURCE4} %{buildroot}%{_pam_vendordir}/ppp
+%else
 install -d 755 %{buildroot}%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/ppp
+%endif
 install -m 644 %{SOURCE13} %{buildroot}%{_mandir}/man8/pppoe-discovery.8.gz
 install -Dm 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/ppp/chatscripts/modem.chat
 install -Dm 644 %{SOURCE15} %{buildroot}%{_unitdir}/modem@.service
 install -Dm 644 %{SOURCE16} %{buildroot}%{_udevrulesdir}/90-modem.rules
 
+%if 0%{?suse_version} > 1500
+%pre
+# Prepare for migration to /usr/etc; save any old .rpmsave
+for i in pam.d/ppp ; do
+     test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
+done
+
+%posttrans
+# Migration to /usr/etc, restore just created .rpmsave
+for i in pam.d/ppp ; do
+     test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
+done
+%endif
+
 %files
 %attr(0750,root,root) %dir %{_sysconfdir}/ppp
 %dir %{_sysconfdir}/ppp/peers
@@ -165,7 +184,11 @@ install -Dm 644 %{SOURCE16} %{buildroot}%{_udevrulesdir}/90-modem.rules
 %config(noreplace) %{_sysconfdir}/ppp/pap-secrets
 %config(noreplace) %{_sysconfdir}/ppp/chap-secrets
 %config(noreplace) %{_sysconfdir}/ppp/peers/p*
+%if 0%{?suse_version} > 1500
+%{_pam_vendordir}/ppp
+%else
 %config(noreplace) %{_sysconfdir}/pam.d/ppp
+%endif
 %doc FAQ README* SETUP scripts PLUGINS
 %{_mandir}/man?/*.?%{ext_man}
 %attr(-,root,%{_group}) %{_sbindir}/pppd