rpms/pure-ftpd/FC-3 pure-ftpd.pure-ftpwho.consoleapp, NONE, 1.1 pure-ftpd.pure-ftpwho.pam, NONE, 1.1 pure-ftpd.init, 1.1, 1.2 pure-ftpd.spec, 1.2, 1.3

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18282/FC-3

Modified Files:
	pure-ftpd.init pure-ftpd.spec 
Added Files:
	pure-ftpd.pure-ftpwho.consoleapp pure-ftpd.pure-ftpwho.pam 
Log Message:
- implement Jose's RFE in bug 151337: pure-ftpwho can be run by a normal user.
- change release tag for FC3/FC4



--- NEW FILE pure-ftpd.pure-ftpwho.consoleapp ---
USER=root
PROGRAM=/usr/sbin/pure-ftpwho
GUI=no


--- NEW FILE pure-ftpd.pure-ftpwho.pam ---
#%PAM-1.0
auth       sufficient   pam_rootok.so
auth       required     pam_localuser.so
account    required     pam_permit.so


Index: pure-ftpd.init
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/FC-3/pure-ftpd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pure-ftpd.init	13 Mar 2005 21:45:54 -0000	1.1
+++ pure-ftpd.init	23 Mar 2005 22:19:44 -0000	1.2
@@ -10,6 +10,8 @@
 
 # Source function library.
 . /etc/init.d/functions
+
+# Source networking configuration.
 . /etc/sysconfig/network
 
 # Check that networking is configured.


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/FC-3/pure-ftpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pure-ftpd.spec	13 Mar 2005 21:49:29 -0000	1.2
+++ pure-ftpd.spec	23 Mar 2005 22:19:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.20
-Release:    1
+Release:    2.fc3
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -10,6 +10,8 @@
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
+Source4:    pure-ftpd.pure-ftpwho.pam
+Source5:    pure-ftpd.pure-ftpwho.consoleapp
 Patch0:     pure-ftpd-1.0.20-config.patch
 Patch1:     pure-ftpd-1.0.20-libdir.patch
 Provides:   ftpserver
@@ -23,7 +25,7 @@
 Requires(post):   chkconfig
 Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
-Requires:   logrotate
+Requires:   logrotate, usermode
 
 
 %description
@@ -83,7 +85,7 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8/
+install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8
 install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
 install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -112,17 +114,23 @@
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 # Pam 
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m 644 pam/pure-ftpd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 
 # Logrotate
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 # xinetd support
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.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
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -158,11 +166,18 @@
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
+%config %{_sysconfdir}/pam.d/pure-ftpwho
+%config %{_sysconfdir}/security/console.apps/pure-ftpwho
 %{_mandir}/man8/*
 %dir /var/ftp/
 
 
 %changelog
+* Wed Mar 23 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-2
+- implement Jose's RFE in bug 151337: pure-ftpwho can be run
+  by a normal user.
+- change release tag for FC3
+
 * Sun Mar 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-1
 - adapt to Fedora Extras (drop Epoch, change Release tag)