From c157a8fd75b6a2505bd8dfcabfffd9c202356d4cfc7f623d989c84d5942f19a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Thu, 3 Oct 2024 18:05:22 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main vsftpd revision
 c2f3e54be9798567155f95bb0afb4c33

---
 vsftpd.changes | 10 ++++++
 vsftpd.pam     |  2 +-
 vsftpd.spec    | 88 +++++++++++++++++++++++++-------------------------
 3 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/vsftpd.changes b/vsftpd.changes
index b1ce42d..2274b79 100644
--- a/vsftpd.changes
+++ b/vsftpd.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Feb 20 13:23:04 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Tue Jan 30 21:03:43 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
+
+- Fix location of ftpusers in /usr/lib/pam.d/vsftpd (boo#1219362)
+
 -------------------------------------------------------------------
 Wed Oct  4 08:00:40 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/vsftpd.pam b/vsftpd.pam
index 1fab4fe..3213854 100644
--- a/vsftpd.pam
+++ b/vsftpd.pam
@@ -3,7 +3,7 @@
 # Uncomment this to achieve what used to be ftpd -A.
 # auth       required     pam_listfile.so item=user sense=allow file=/etc/ftpchroot onerr=fail
 
-auth     required       pam_listfile.so item=user sense=deny file=/etc/vftpd/ftpusers onerr=succeed
+auth     required       pam_listfile.so item=user sense=deny file=/etc/vsftpd/ftpusers onerr=succeed
 # Uncomment the following line for anonymous ftp.
 #auth	 sufficient     pam_ftp.so
 auth     required       pam_shells.so
diff --git a/vsftpd.spec b/vsftpd.spec
index 208c7b9..ab7084a 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -143,52 +143,52 @@ tests.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
+%patch -P 1 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 5 -p1
+%patch -P 6 -p1
+%patch -P 7 -p1
+%patch -P 8 -p1
+%patch -P 9 -p1
+%patch -P 10 -p1
+%patch -P 11 -p1
+%patch -P 13 -p1
+%patch -P 14 -p1
+%patch -P 15 -p1
+%patch -P 16 -p1
+%patch -P 17 -p1
+%patch -P 18 -p1
+%patch -P 19 -p1
+%patch -P 20 -p1
+%patch -P 21 -p1
+%patch -P 22 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 25 -p1
+%patch -P 26 -p1
+%patch -P 27 -p1
+%patch -P 28 -p1
+%patch -P 29 -p1
+%patch -P 30 -p1
+%patch -P 31 -p1
+%patch -P 32 -p1
+%patch -P 33 -p1
+%patch -P 35 -p1
+%patch -P 36 -p1
+%patch -P 37 -p1
+%patch -P 38 -p1
+%patch -P 39 -p1
+%patch -P 40 -p1
+%patch -P 41 -p1
+%patch -P 42 -p1
+%patch -P 43 -p1
+%patch -P 44 -p1
 %if 0%{?sle_version} == 150000
-%patch45 -p1
+%patch -P 45 -p1
 %endif
-%patch46 -p1
-%patch47 -p1
+%patch -P 46 -p1
+%patch -P 47 -p1
 
 %build
 %define seccomp_opts -D_GNU_SOURCE -DUSE_SECCOMP