From 0fb8b6cecd8feb921d60ba77927c3df49243500f Mon Sep 17 00:00:00 2001
From: Maros Barabas <mbarabas@fedoraproject.org>
Date: Thu, 11 Jan 2007 16:15:45 +0000
Subject: [PATCH] Adding files vsftpd-2.0.5-confspell.patch &
 vsftpd-2.0.5-file_stat.patch

---
 vsftpd-2.0.5-confspell.patch | 17 +++++++++++++++++
 vsftpd-2.0.5-file_stat.patch | 11 +++++++++++
 vsftpd.spec                  |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 vsftpd-2.0.5-confspell.patch
 create mode 100644 vsftpd-2.0.5-file_stat.patch

diff --git a/vsftpd-2.0.5-confspell.patch b/vsftpd-2.0.5-confspell.patch
new file mode 100644
index 0000000..1cd5335
--- /dev/null
+++ b/vsftpd-2.0.5-confspell.patch
@@ -0,0 +1,17 @@
+--- vsftpd-2.0.5/vsftpd.conf.5.old	2006-12-04 17:10:51.000000000 +0100
++++ vsftpd-2.0.5/vsftpd.conf.5	2006-12-04 17:11:57.000000000 +0100
+@@ -588,12 +588,12 @@
+ 
+ Default: 300
+ .TP
+-.B delay_failed_logins
++.B delay_failed_login
+ The number of seconds to pause prior to reporting a failed login.
+ 
+ Default: 1
+ .TP
+-.B delay_successful_logins
++.B delay_successful_login
+ The number of seconds to pause prior to allowing a successful login.
+ 
+ Default: 0
diff --git a/vsftpd-2.0.5-file_stat.patch b/vsftpd-2.0.5-file_stat.patch
new file mode 100644
index 0000000..1e81a3c
--- /dev/null
+++ b/vsftpd-2.0.5-file_stat.patch
@@ -0,0 +1,11 @@
+--- vsftpd-2.0.5/parseconf.c.old	2006-12-05 12:19:48.000000000 +0100
++++ vsftpd-2.0.5/parseconf.c	2006-12-05 12:19:54.000000000 +0100
+@@ -208,7 +208,7 @@
+     copy_string_settings();
+   }
+   retval = str_fileread(&config_file_str, p_filename, VSFTP_CONF_FILE_MAX);
+-  (int)str_stat(&config_file_str, &p_statbuf);
++  (int)vsf_sysutil_stat(p_filename, &p_statbuf);
+   /* Security - die unless the conf file is owned by root */ 
+   if (vsf_sysutil_retval_is_error(retval) || vsf_sysutil_statbuf_get_uid(p_statbuf) != VSFTP_ROOT_UID)
+   {
diff --git a/vsftpd.spec b/vsftpd.spec
index 96b2faa..819e7e8 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -41,7 +41,7 @@ Patch25: vsftpd-2.0.5-confspell.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
-BuildPrereq: tcp_wrappers-devel
+BuildPrereq: tcp_wrappers
 %endif
 BuildRequires: pam-devel
 Requires: pam