From c0f1b9f8469391349dd73e6169c257aee55ad84d Mon Sep 17 00:00:00 2001
From: jonathanspw <jonathan@almalinux.org>
Date: Jul 21 2022 16:54:40 +0000
Subject: remove usermode/consolehelper


---

diff --git a/pure-ftpd.pure-ftpwho.consoleapp b/pure-ftpd.pure-ftpwho.consoleapp
deleted file mode 100644
index 8452f88..0000000
--- a/pure-ftpd.pure-ftpwho.consoleapp
+++ /dev/null
@@ -1,3 +0,0 @@
-USER=root
-PROGRAM=/usr/sbin/pure-ftpwho
-GUI=no
diff --git a/pure-ftpd.pure-ftpwho.pam b/pure-ftpd.pure-ftpwho.pam
deleted file mode 100644
index 268cc92..0000000
--- a/pure-ftpd.pure-ftpwho.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth       sufficient   pam_rootok.so
-auth       required     pam_localuser.so
-account    required     pam_permit.so
diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 6fe714f..b02106c 100644
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -8,8 +8,6 @@ URL:        http://www.pureftpd.org
 Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-%{version}.tar.bz2
 Source1:    pure-ftpd.service
 Source2:    pure-ftpd.logrotate
-Source4:    pure-ftpd.pure-ftpwho.pam
-Source5:    pure-ftpd.pure-ftpwho.consoleapp
 Source6:    pure-ftpd.README.SELinux
 Source7:    pure-ftpd.pureftpd.te
 Source8:    pure-ftpd-with-tls-init.service
@@ -31,7 +29,7 @@ BuildRequires: gcc
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
-Requires:   logrotate, usermode
+Requires:   logrotate
 %{!?_without_tls:Requires: sscg}
 
 
@@ -147,12 +145,6 @@ install -p -m 644 pam/pure-ftpd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
-# pure-ftpwho and non-root users
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
-install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pure-ftpwho
-install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/pure-ftpwho
-ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/pure-ftpwho
-
 # SELinux support
 pushd selinux
 echo "%{_sbindir}/pure-ftpd    system_u:object_r:ftpd_exec_t:s0" > pureftpd.fc
@@ -215,8 +207,6 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config(noreplace) %{_sysconfdir}/pam.d/pure-ftpwho
-%config(noreplace) %{_sysconfdir}/security/console.apps/pure-ftpwho
 %{!?_without_tls:%{_sysconfdir}/pki/%{name}}
 %{_mandir}/man8/*
 %dir /var/ftp/
@@ -231,6 +221,8 @@ fi
 * Thu Jul 21 2022 Jonathan Wright <jonathan@almalinux.org> - 1.0.51-1
 - New version
 - Resolves: rhbz#2026153
+- Remove usermode dependency and non-root "ftpwho"
+- Resolves: rhbz#502754
 
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.49-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild