rpms/vsftpd/devel vsftpd.init,1.4,1.5 vsftpd.spec,1.77,1.78

[Martin Nagy (mnagy)]

Author: mnagy

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8208

Modified Files:
	vsftpd.init vsftpd.spec 
Log Message:
* Mon Feb 25 2008 Martin Nagy <mnagy at redhat.com> - 2.0.6-2
- fix init script (#431452)
- make the init script LSB compliant (#247093)



Index: vsftpd.init
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vsftpd.init	30 Jun 2005 08:14:36 -0000	1.4
+++ vsftpd.init	25 Feb 2008 16:25:30 -0000	1.5
@@ -1,5 +1,14 @@
 #!/bin/bash
 #
+### BEGIN INIT INFO
+# Provides: vsftpd
+# Required-Start: $local_fs $network $named $remote_fs $syslog
+# Required-Stop: $local_fs $network $named $remote_fs $syslog
+# Short-Description: Very Secure Ftp Daemon
+# Description: vsftpd is a Very Secure FTP daemon. It was written completely from
+#              scratch
+### END INIT INFO
+
 # vsftpd      This shell script takes care of starting and stopping
 #             standalone vsftpd.
 #
@@ -15,19 +24,21 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-[ -x /usr/sbin/vsftpd ] || exit 0
-
 RETVAL=0
 prog="vsftpd"
 
 start() {
         # Start daemons.
 
+	# Check that networking is up.
+	[ ${NETWORKING} = "no" ] && exit 1
+
+	[ -x /usr/sbin/vsftpd ] || exit 1
+
         if [ -d /etc/vsftpd ] ; then
-                for i in `ls /etc/vsftpd/*.conf`; do
+                CONFS=`ls /etc/vsftpd/*.conf 2>/dev/null`
+                [ -z $CONFS ] && exit 6
+                for i in $CONFS; do
                         site=`basename $i .conf`
                         echo -n $"Starting $prog for $site: "
                         daemon /usr/sbin/vsftpd $i


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- vsftpd.spec	22 Feb 2008 12:04:21 -0000	1.77
+++ vsftpd.spec	25 Feb 2008 16:25:30 -0000	1.78
@@ -3,7 +3,7 @@
 Summary: Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -158,6 +158,10 @@
 %{_var}/ftp
 
 %changelog
+* Mon Feb 25 2008 Martin Nagy <mnagy at redhat.com> - 2.0.6-2
+- fix init script (#431452)
+- make the init script LSB compliant (#247093)
+
 * Fri Feb 22 2008 Martin Nagy <mnagy at redhat.com> - 2.0.6-1
 - rebase for new upstream version
 - remove patches that were fixed in upstream: kickline, confspell, anon_umask