From fbe9396fa6be6809e9bc6b2ac41c98639f9812013f77c4149a7c0b52459f3758 Mon Sep 17 00:00:00 2001
From: Peter Simons <peter.simons@suse.com>
Date: Mon, 4 Sep 2023 14:01:26 +0000
Subject: [PATCH] Accepting request 1105956 from home:kukuk:no-utmp

- Use pam macros to install pam config in /usr/lib/pam.d
- Adjust vsftpd.pam to include postlogin config (replace wtmp with
  wtmpdb for Y2038 [jsc#3144])

OBS-URL: https://build.opensuse.org/request/show/1105956
OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=177
---
 vsftpd.changes | 7 +++++++
 vsftpd.pam     | 1 +
 vsftpd.spec    | 5 +++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/vsftpd.changes b/vsftpd.changes
index 63ec79a..af42de6 100644
--- a/vsftpd.changes
+++ b/vsftpd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 25 15:06:06 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>
+
+- Use pam macros to install pam config in /usr/lib/pam.d
+- Adjust vsftpd.pam to include postlogin config (replace wtmp with
+  wtmpdb for Y2038 [jsc#3144])
+
 -------------------------------------------------------------------
 Mon Jun 19 06:25:26 UTC 2023 - Peter Simons <psimons@suse.com>
 
diff --git a/vsftpd.pam b/vsftpd.pam
index 75d9ad5..4c569d5 100644
--- a/vsftpd.pam
+++ b/vsftpd.pam
@@ -13,3 +13,4 @@ password include        common-password
 session  required       pam_keyinit.so force revoke
 session  required       pam_loginuid.so
 session  include        common-session
+session  include        postlogin-session
diff --git a/vsftpd.spec b/vsftpd.spec
index 6f895f7..7de6a4f 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -200,7 +200,7 @@ install -D -m 600 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
 %if 0%{?suse_version} < 1330
 install -D -m 600 xinetd.d/%{name} %{buildroot}%{_sysconfdir}/xinetd.d/%{name}
 %endif
-install -D -m 644 $RPM_SOURCE_DIR/%{name}.pam %{buildroot}%{_sysconfdir}/pam.d/%{name}
+install -D -m 644 $RPM_SOURCE_DIR/%{name}.pam %{buildroot}%{_pam_vendordir}/%{name}
 %if 0%{?suse_version} > 1500
 mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
 install -D -m 644 $RPM_SOURCE_DIR/%{name}.logrotate %{buildroot}%{_distconfdir}/logrotate.d/%{name}
@@ -290,10 +290,11 @@ done
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
 %endif
 %config(noreplace) %{_sysconfdir}/%{name}.conf
-%config %{_sysconfdir}/pam.d/%{name}
 %if 0%{?suse_version} > 1500
+%config %{_pam_vendordir}/%{name}
 %{_distconfdir}/logrotate.d/%{name}
 %else
+%config %{_pam_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %endif
 %{_mandir}/man5/%{name}.conf.*