From 922807db675d8769ab8ccf773c0d37c371c2d7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
Date: Thu, 30 Jun 2005 08:14:36 +0000
Subject: [PATCH] - start in background as default, init script changed
 (#158714)

---
 vsftpd-2.0.3-background.patch | 22 ++++++++++++++++++++++
 vsftpd.init                   |  7 ++-----
 vsftpd.spec                   |  7 ++++++-
 3 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 vsftpd-2.0.3-background.patch

diff --git a/vsftpd-2.0.3-background.patch b/vsftpd-2.0.3-background.patch
new file mode 100644
index 0000000..e56f794
--- /dev/null
+++ b/vsftpd-2.0.3-background.patch
@@ -0,0 +1,22 @@
+--- vsftpd-2.0.3/tunables.c.background	2005-06-30 09:51:51.000000000 +0200
++++ vsftpd-2.0.3/tunables.c	2005-06-30 09:57:29.000000000 +0200
+@@ -49,7 +49,7 @@
+ int tunable_listen_ipv6 = 0;
+ int tunable_dual_log_enable = 0;
+ int tunable_syslog_enable = 0;
+-int tunable_background = 0;
++int tunable_background = 1;
+ int tunable_virtual_use_local_privs = 0;
+ int tunable_session_support = 0;
+ int tunable_download_enable = 1;
+--- vsftpd-2.0.3/vsftpd.conf.5.background	2005-06-30 09:51:51.000000000 +0200
++++ vsftpd-2.0.3/vsftpd.conf.5	2005-06-30 09:58:28.000000000 +0200
+@@ -108,7 +108,7 @@
+ the listener process. i.e. control will immediately be returned to the shell
+ which launched vsftpd.
+ 
+-Default: NO
++Default: YES
+ .TP
+ .B check_shell
+ Note! This option only has an effect for non-PAM builds of vsftpd. If disabled,
diff --git a/vsftpd.init b/vsftpd.init
index 5f87358..8a7c51c 100755
--- a/vsftpd.init
+++ b/vsftpd.init
@@ -30,12 +30,9 @@ start() {
                 for i in `ls /etc/vsftpd/*.conf`; do
                         site=`basename $i .conf`
                         echo -n $"Starting $prog for $site: "
-                        /usr/sbin/vsftpd $i &
+                        daemon /usr/sbin/vsftpd $i
                         RETVAL=$?
-                        [ $RETVAL -eq 0 ] && {
-                           touch /var/lock/subsys/$prog
-                           success $"$prog $site" 
-                        } 
+                        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
                         echo
                 done
         else
diff --git a/vsftpd.spec b/vsftpd.spec
index 1504a5a..a8438c1 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -3,7 +3,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.3
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -26,6 +26,7 @@ Patch9: vsftpd-2.0.1-dir.patch
 Patch10: vsftpd-2.0.1-use_localtime.patch
 Patch11: vsftpd-1.2.1-nonrootconf.patch
 Patch12: vsftpd-2.0.1-tzfix.diff
+Patch13: vsftpd-2.0.3-background.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
 BuildPrereq: tcp_wrappers
@@ -65,6 +66,7 @@ cp %{SOURCE1} .
 %patch10 -p1 -b .use_localtime
 %patch11 -p1 -b .nonrootconf
 %patch12 -p1 -b .tzfix
+%patch13 -p1 -b .background
 
 %build
 %ifarch s390x
@@ -123,6 +125,9 @@ fi
 /var/ftp
 
 %changelog
+* Thu Jun 30 2005 Radek Vokal <rvokal@redhat.com> 2.0.3-6
+- start in background as default, init script changed (#158714)
+
 * Mon Jun 27 2005 Radek Vokal <rvokal@redhat.com> 2.0.3-5
 - fixed requires for 64bit libs