From 5f53d3d034f59224585a3c72528bb788be3dfd6f Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 14:07:30 +0000
Subject: [PATCH] auto-import changelog data from vsftpd-1.2.1-1.src.rpm Mon
 Nov 24 2003 Karsten Hopp <karsten@redhat.de> 1.2.1-1 - update to 1.2.1, which
 fixes #89765 and lot of other issues - remove manpage patch, it isn't
 required anymore - clean up init script - don't use script to find libs to
 link with (lib64 issues)

---
 .cvsignore              |  2 +-
 sources                 |  2 +-
 vsftpd-1.5.1-libs.patch | 12 ++++++++++++
 vsftpd.init             | 20 ++++++++------------
 vsftpd.spec             | 14 ++++++++++----
 5 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100644 vsftpd-1.5.1-libs.patch

diff --git a/.cvsignore b/.cvsignore
index 1f2edb3..b39de3d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-vsftpd-1.2.0.tar.gz
+vsftpd-1.2.1.tar.gz
diff --git a/sources b/sources
index d54ac2b..4ac5a7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19c1818c102b63e4b0fea8d5b8b7c51f  vsftpd-1.2.0.tar.gz
+3dd254f9c9c1aea370b2f1ff6212af6e  vsftpd-1.2.1.tar.gz
diff --git a/vsftpd-1.5.1-libs.patch b/vsftpd-1.5.1-libs.patch
new file mode 100644
index 0000000..702ca18
--- /dev/null
+++ b/vsftpd-1.5.1-libs.patch
@@ -0,0 +1,12 @@
+--- vsftpd-1.2.1/Makefile.rh1	2003-11-25 15:58:11.000000000 +0100
++++ vsftpd-1.2.1/Makefile	2003-11-25 15:58:33.000000000 +0100
+@@ -5,7 +5,8 @@
+ #CFLAGS = -g
+ CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
+ 
+-LIBS	=	`./vsf_findlibs.sh`
++#LIBS	=	`./vsf_findlibs.sh`
++LIBS	=	-lwrap -lnsl -lpam -lcap -ldl
+ LINK	=	-Wl,-s
+ 
+ OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
diff --git a/vsftpd.init b/vsftpd.init
index 8d9a576..5f87358 100755
--- a/vsftpd.init
+++ b/vsftpd.init
@@ -27,20 +27,16 @@ start() {
         # Start daemons.
 
         if [ -d /etc/vsftpd ] ; then
-                declare -a sites
-                sites=(`ls /etc/vsftpd/*.conf`)
-                site_count=${#sites[@]}
-                index=0
-
-                while [ "${index}" -lt "${site_count}" ] ; do
-                        site=`basename ${sites[${index}]} .conf`
+                for i in `ls /etc/vsftpd/*.conf`; do
+                        site=`basename $i .conf`
                         echo -n $"Starting $prog for $site: "
-                                ( /usr/sbin/vsftpd ${sites[${index}]} &)
-                                daemon true
-                                RETVAL=$?
+                        /usr/sbin/vsftpd $i &
+                        RETVAL=$?
+                        [ $RETVAL -eq 0 ] && {
+                           touch /var/lock/subsys/$prog
+                           success $"$prog $site" 
+                        } 
                         echo
-                        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-                        let "index = index + 1"
                 done
         else
                 RETVAL=1
diff --git a/vsftpd.spec b/vsftpd.spec
index debe711..74a72a0 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -2,8 +2,8 @@
 
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
-Version: 1.2.0
-Release: 5
+Version: 1.2.1
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -16,7 +16,7 @@ Source5: vsftpd.init
 Patch1: vsftpd-1.1.3-rh.patch
 Patch2: vsftpd-1.0.1-missingok.patch
 Patch3: vsftpd-1.2.0-tcp_wrappers.patch
-Patch4: vsftpd-1.2.0-man.patch
+Patch4: vsftpd-1.5.1-libs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
 BuildPrereq: tcp_wrappers
@@ -39,7 +39,7 @@ scratch.
 %if %{tcp_wrappers}
 %patch3 -p1 -b .tcp_wrappers
 %endif
-%patch4 -p1 -b .manpage
+%patch4 -p1 -b .libs
 cp %{SOURCE1} .
 
 %build
@@ -98,6 +98,12 @@ fi
 /var/ftp
 
 %changelog
+* Mon Nov 24 2003 Karsten Hopp <karsten@redhat.de> 1.2.1-1
+- update to 1.2.1, which fixes #89765 and lot of other issues
+- remove manpage patch, it isn't required anymore
+- clean up init script
+- don't use script to find libs to link with (lib64 issues)
+
 * Sun Oct 12 2003 Florian La Roche <Florian.LaRoche@redhat.de>
 - allow compiling without tcp_wrappers support