From a9afdbdfabf990233235df2a14814c1df540aa37 Mon Sep 17 00:00:00 2001
From: Maros Barabas <mbarabas@fedoraproject.org>
Date: Tue, 22 Aug 2006 10:17:39 +0000
Subject: [PATCH] correct man pages

---
 vsftpd-2.0.5-man.patch | 65 ++++++++++++++++++++++++++++++++++++++++++
 vsftpd.spec            | 11 +++++--
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 vsftpd-2.0.5-man.patch

diff --git a/vsftpd-2.0.5-man.patch b/vsftpd-2.0.5-man.patch
new file mode 100644
index 0000000..875e221
--- /dev/null
+++ b/vsftpd-2.0.5-man.patch
@@ -0,0 +1,65 @@
+--- vsftpd-2.0.5/vsftpd.conf.5.old	2006-08-22 10:53:57.000000000 +0200
++++ vsftpd-2.0.5/vsftpd.conf.5	2006-08-22 10:57:24.000000000 +0200
+@@ -138,7 +138,7 @@
+ different if chroot_local_user is set to YES. In this case, the list becomes
+ a list of users which are NOT to be placed in a chroot() jail.
+ By default, the file containing this list is
+-/etc/vsftpd.chroot_list, but you may override this with the
++/etc/vsftpd/chroot_list, but you may override this with the
+ .BR chroot_list_file
+ setting.
+ 
+@@ -166,7 +166,7 @@
+ .B deny_email_enable
+ If activated, you may provide a list of anonymous password e-mail responses
+ which cause login to be denied. By default, the file containing this list is
+-/etc/vsftpd.banned_emails, but you may override this with the
++/etc/vsftpd/banned_emails, but you may override this with the
+ .BR banned_email_file
+ setting.
+ 
+@@ -396,7 +396,7 @@
+ file specified by the
+ .BR email_password_file
+ setting. The file format is one password per line, no extra whitespace. The
+-default filename is /etc/vsftpd.email_passwords.
++default filename is /etc/vsftpd/email_passwords.
+ 
+ Default: NO
+ .TP
+@@ -691,7 +691,7 @@
+ .BR deny_email_enable
+ is enabled.
+ 
+-Default: /etc/vsftpd.banned_emails
++Default: /etc/vsftpd/banned_emails
+ .TP
+ .B banner_file
+ This option is the name of a file containing text to display when someone
+@@ -720,7 +720,7 @@
+ is enabled, then the list file becomes a list of users to NOT place in a
+ chroot() jail.
+ 
+-Default: /etc/vsftpd.chroot_list
++Default: /etc/vsftpd/chroot_list
+ .TP
+ .B cmds_allowed
+ This options specifies a comma separated list of allowed FTP commands (post
+@@ -772,7 +772,7 @@
+ .BR secure_email_list_enable
+ setting.
+ 
+-Default: /etc/vsftpd.email_passwords
++Default: /etc/vsftpd/email_passwords
+ .TP
+ .B ftp_username
+ This is the name of the user we use for handling anonymous FTP. The home
+@@ -934,7 +934,7 @@
+ .BR userlist_enable
+ option is active.
+ 
+-Default: /etc/vsftpd.user_list
++Default: /etc/vsftpd/user_list
+ .TP
+ .B vsftpd_log_file
+ This option is the name of the file to which we write the vsftpd style
diff --git a/vsftpd.spec b/vsftpd.spec
index bd20753..60a88d3 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -34,6 +34,7 @@ Patch18: vsftpd-close-std-fds.patch
 Patch19: vsftpd-2.0.5-default_ipv6.patch
 Patch20: vsftpd-2.0.5-add_ipv6_option.patch
 Patch21: vsftpd-2.0.5-correct_comments.patch
+Patch22: vsftpd-2.0.5-man.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
@@ -79,9 +80,10 @@ cp %{SOURCE1} .
 %patch16 -p1 -b .user_config
 %patch17 -p1 -b .old-pam
 %patch18 -p1 -b .close-fds
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
+%patch19 -p1 -b .ipv6
+%patch20 -p1 -b .ipv6opt
+%patch21 -p1 -b .comments
+%patch22 -p1 -b .manp
 
 %build
 %ifarch s390x
@@ -140,6 +142,9 @@ fi
 /var/ftp
 
 %changelog
+* Tue Aug 22 2006 Maros Barabas <mbarabas@redhat.com> - 2.0.5-7
+- correct paths of configuration files on man pages
+
 * Tue Aug 15 2006 Maros Barabas	<mbarabas@redhat.com> - 2.0.5-6
 - correct comments