rpms/vsftpd/F-12 vsftpd-2.1.0-configuration.patch, 1.2, 1.3 vsftpd.spec, 1.101, 1.102

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/vsftpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27429

Modified Files:
	vsftpd-2.1.0-configuration.patch vsftpd.spec 
Log Message:
* Mon Nov 23 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-6
- added lost default values of vsftpd.conf (rh patch)


vsftpd-2.1.0-configuration.patch:
 EXAMPLE/INTERNET_SITE/README         |    6 +++---
 EXAMPLE/INTERNET_SITE_NOINETD/README |    4 ++--
 EXAMPLE/PER_IP_CONFIG/README         |    4 ++--
 EXAMPLE/VIRTUAL_USERS/README         |   14 +++++++-------
 FAQ                                  |    8 ++++----
 INSTALL                              |   10 +++++-----
 README                               |    5 +++++
 defs.h                               |    2 +-
 tunables.c                           |   10 +++++-----
 vsftpd.8                             |   10 +++++-----
 vsftpd.conf                          |   18 +++++++++++-------
 vsftpd.conf.5                        |   22 +++++++++++-----------
 12 files changed, 61 insertions(+), 52 deletions(-)

Index: vsftpd-2.1.0-configuration.patch
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-12/vsftpd-2.1.0-configuration.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vsftpd-2.1.0-configuration.patch	4 Aug 2009 06:23:01 -0000	1.2
+++ vsftpd-2.1.0-configuration.patch	23 Nov 2009 13:40:13 -0000	1.3
@@ -387,6 +387,33 @@ diff -up vsftpd-2.2.0/vsftpd.conf.config
  #
  # The default compiled in settings are fairly paranoid. This sample file
  # loosens things up a bit, to make the ftp daemon more usable.
+@@ -12,14 +12,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
+@@ -52,7 +52,7 @@ connect_from_port_20=YES
+ #
+ # If you want, you can have your log file in standard ftpd xferlog format.
+ # Note that the default log file location is /var/log/xferlog in this case.
+-#xferlog_std_format=YES
++xferlog_std_format=YES
+ #
+ # You may change the default value for timing out an idle session.
+ #idle_session_timeout=600
 @@ -87,7 +87,7 @@ connect_from_port_20=YES
  # useful for combatting certain DoS attacks.
  #deny_email_enable=YES


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-12/vsftpd.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- vsftpd.spec	16 Sep 2009 19:22:56 -0000	1.101
+++ vsftpd.spec	23 Nov 2009 13:40:13 -0000	1.102
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Mon Nov 23 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-6
+- added lost default values of vsftpd.conf (rh patch)
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-5
 - use password-auth common PAM configuration instead of system-auth