rpms/vsftpd/devel vsftpd-2.1.0-configuration.patch, 1.3, 1.4 vsftpd-2.1.1-daemonize_plus.patch, 1.5, 1.6 vsftpd.spec, 1.103, 1.104

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24466

Modified Files:
	vsftpd-2.1.0-configuration.patch 
	vsftpd-2.1.1-daemonize_plus.patch vsftpd.spec 
Log Message:
* Thu Dec 17 2009 Jiri Skala <jskala at redhat.com> - 2.2.2-2
- corrected two patches due to fuzz 0


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/devel/vsftpd-2.1.0-configuration.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vsftpd-2.1.0-configuration.patch	23 Nov 2009 13:37:04 -0000	1.3
+++ vsftpd-2.1.0-configuration.patch	17 Dec 2009 13:14:16 -0000	1.4
@@ -433,7 +433,7 @@ diff -up vsftpd-2.2.0/vsftpd.conf.config
  # You may activate the "-R" option to the builtin ls. This is disabled by
  # default to avoid remote users being able to cause excessive I/O on large
 @@ -112,3 +112,7 @@ listen=YES
- # sockets, you must run two copies of vsftpd whith two configuration files.
+ # sockets, you must run two copies of vsftpd with two configuration files.
  # Make sure, that one of the listen options is commented !!
  #listen_ipv6=YES
 +

vsftpd-2.1.1-daemonize_plus.patch:
 standalone.c |   38 +++++++++++++++++++++++++++++++++++++-
 sysutil.c    |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sysutil.h    |    7 ++++++-
 3 files changed, 102 insertions(+), 2 deletions(-)

Index: vsftpd-2.1.1-daemonize_plus.patch
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-2.1.1-daemonize_plus.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vsftpd-2.1.1-daemonize_plus.patch	17 Dec 2009 09:09:05 -0000	1.5
+++ vsftpd-2.1.1-daemonize_plus.patch	17 Dec 2009 13:14:17 -0000	1.6
@@ -105,8 +105,8 @@ diff -up vsftpd-2.1.1/sysutil.c.daemoniz
  vsf_sysutil_fork(void)
  {
 @@ -2807,3 +2816,53 @@ vsf_sysutil_set_no_fds()
- {
-   s_current_pid = -1;
+     s_sig_details[i].pending = 0;
+   }
  }
 +
 +static struct sigaction sigalr, sigusr1;


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- vsftpd.spec	17 Dec 2009 09:09:05 -0000	1.103
+++ vsftpd.spec	17 Dec 2009 13:14:17 -0000	1.104
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Thu Dec 17 2009 Jiri Skala <jskala at redhat.com> - 2.2.2-2
+- corrected two patches due to fuzz 0
+
 * Thu Dec 17 2009 Jiri Skala <jskala at redhat.com> - 2.2.2-1
 - update to latest upstream