From 3940fcf38ab6408bf633949248f9bf6626078e35 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 14:06:36 +0000
Subject: [PATCH] auto-import changelog data from vsftpd-1.1.3-8.src.rpm Fri
 Feb 28 2003 Nalin Dahyabhai <nalin@redhat.com> 1.1.3-8 - enable use of
 tcp_wrappers

---
 vsftpd-1.1.3-rh.patch | 45 +++++++++++++++++++++++++++++++++++++++++++
 vsftpd.spec           | 10 ++++++++--
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 vsftpd-1.1.3-rh.patch

diff --git a/vsftpd-1.1.3-rh.patch b/vsftpd-1.1.3-rh.patch
new file mode 100644
index 0000000..4fe3113
--- /dev/null
+++ b/vsftpd-1.1.3-rh.patch
@@ -0,0 +1,45 @@
+--- vsftpd-1.0.1/vsftpd.conf.rh	Mon Jul 30 17:51:07 2001
++++ vsftpd-1.0.1/vsftpd.conf	Wed Nov 28 14:38:36 2001
+@@ -7,14 +7,14 @@
+ anonymous_enable=YES
+ #
+ # Uncomment this to allow local users to log in.
+-#local_enable=YES
++local_enable=YES
+ #
+ # Uncomment this to enable any form of FTP write command.
+-#write_enable=YES
++write_enable=YES
+ #
+ # Default umask for local users is 077. You may wish to change this to 022,
+ # if your users expect that (022 is used by most other ftpd's)
+-#local_umask=022
++local_umask=022
+ #
+ # Uncomment this to allow the anonymous FTP user to upload files. This only
+ # has an effect if the above global write enable is activated. Also, you will
+@@ -46,7 +46,7 @@
+ #xferlog_file=/var/log/vsftpd.log
+ #
+ # If you want, you can have your log file in standard ftpd xferlog format
+-#xferlog_std_format=YES
++xferlog_std_format=YES
+ #
+ # You may change the default value for timing out an idle session.
+ #idle_session_timeout=600
+@@ -98,3 +98,8 @@
+ # the presence of the "-R" option, so there is a strong case for enabling it.
+ #ls_recurse_enable=YES
+ 
++pam_service_name=vsftpd
++userlist_enable=YES
++#enable for standalone mode
++listen=YES
++tcp_wrappers=YES
+--- vsftpd-1.1.3/vsftpd.8.foo	Fri Dec 13 19:17:02 2002
++++ vsftpd-1.1.3/vsftpd.8	Fri Dec 13 19:17:13 2002
+@@ -23,4 +23,3 @@
+ .Pa /etc/vsftpd.conf .
+ .Sh SEE ALSO
+ .Xr vsftpd.conf 5
+-
diff --git a/vsftpd.spec b/vsftpd.spec
index aee9f0e..813a364 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -1,7 +1,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 1.1.3
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ferret.lmh.ox.ac.uk/pub/linux/%{name}-%{version}.tar.gz
@@ -10,9 +10,11 @@ Source2: vsftpd.pam
 Source3: vsftpd.ftpusers
 Source4: vsftpd.user_list
 Source5: vsftpd.init
-Patch1: vsftpd-1.1.0-rh.patch
+Patch1: vsftpd-1.1.3-rh.patch
 Patch2: vsftpd-1.0.1-missingok.patch
+Patch3: vsftpd-1.1.3-tcp_wrappers.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildPrereq: tcp_wrappers
 Requires: logrotate
 Prereq: /sbin/chkconfig, /sbin/service, /usr/sbin/usermod
 Obsoletes: anonftp
@@ -26,6 +28,7 @@ scratch.
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .rh
 %patch2 -p1 -b .mok
+%patch3 -p1 -b .tcp_wrappers
 cp %{SOURCE1} .
 
 %build
@@ -80,6 +83,9 @@ fi
 /var/ftp
 
 %changelog
+* Fri Feb 28 2003 Nalin Dahyabhai <nalin@redhat.com> 1.1.3-8
+- enable use of tcp_wrappers
+
 * Tue Feb 11 2003 Bill Nottingham <notting@redhat.com> 1.1.3-7
 - provide /var/ftp & /var/ftp/pub. obsolete anonftp.