rpms/vsftpd/F-12 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 vsftpd-2.1.0-configuration.patch, 1.3, 1.4 vsftpd-2.1.1-daemonize_plus.patch, 1.4, 1.5 vsftpd.spec, 1.102, 1.103
Jiri Skala
jskala at fedoraproject.org
Thu Jan 14 14:05:42 UTC 2010
Author: jskala
Update of /cvs/extras/rpms/vsftpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2842
Modified Files:
.cvsignore sources vsftpd-2.1.0-configuration.patch
vsftpd-2.1.1-daemonize_plus.patch vsftpd.spec
Log Message:
* Thu Jan 14 2010 Jiri Skala <jskala at redhat.com> - 2.2.2-1
- update to latest upstream version
- fixes #553479
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore 24 Aug 2009 15:01:45 -0000 1.21
+++ .cvsignore 14 Jan 2010 14:05:41 -0000 1.22
@@ -1 +1 @@
-vsftpd-2.2.0.tar.gz
+vsftpd-2.2.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources 24 Aug 2009 15:01:45 -0000 1.21
+++ sources 14 Jan 2010 14:05:41 -0000 1.22
@@ -1 +1 @@
-e4eb190af270ae65d57a84274a38ec31 vsftpd-2.2.0.tar.gz
+6d6bc136af14c23f8fef6f1a51f55418 vsftpd-2.2.2.tar.gz
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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vsftpd-2.1.0-configuration.patch 23 Nov 2009 13:40:13 -0000 1.3
+++ vsftpd-2.1.0-configuration.patch 14 Jan 2010 14:05:41 -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/F-12/vsftpd-2.1.1-daemonize_plus.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- vsftpd-2.1.1-daemonize_plus.patch 2 Jun 2009 09:06:56 -0000 1.4
+++ vsftpd-2.1.1-daemonize_plus.patch 14 Jan 2010 14:05:41 -0000 1.5
@@ -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;
@@ -176,7 +176,7 @@ diff -up vsftpd-2.1.1/sysutil.h.daemoniz
/* Process creation/exit/process handling */
unsigned int vsf_sysutil_getpid(void);
+unsigned int vsf_sysutil_getppid(void);
- void vsf_sysutil_clear_pid_cache(void);
+ void vsf_sysutil_post_fork(void);
int vsf_sysutil_fork(void);
int vsf_sysutil_fork_failok(void);
@@ -182,6 +184,9 @@ int vsf_sysutil_wait_exited_normally(
Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-12/vsftpd.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- vsftpd.spec 23 Nov 2009 13:40:13 -0000 1.102
+++ vsftpd.spec 14 Jan 2010 14:05:41 -0000 1.103
@@ -1,8 +1,8 @@
%{!?tcp_wrappers:%define tcp_wrappers 1}
Name: vsftpd
-Version: 2.2.0
-Release: 6%{?dist}
+Version: 2.2.2
+Release: 1%{?dist}
Summary: Very Secure Ftp Daemon
Group: System Environment/Daemons
@@ -137,18 +137,21 @@ fi
%{_mandir}/man8/vsftpd.*
%{_var}/ftp
-
%changelog
-* Mon Nov 23 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-6
+* Thu Jan 14 2010 Jiri Skala <jskala at redhat.com> - 2.2.2-1
+- update to latest upstream version
+- fixes #553479
+
+* Mon Nov 23 2009 Jiri Skala <jskala at redhat.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
-* Mon Sep 14 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-4
+* Mon Sep 14 2009 Jiri Skala <jskala at redhat.com> - 2.2.0-4
- modified init script to be LSB compliant
-* Tue Sep 08 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-3
+* Tue Sep 08 2009 Jiri Skala <jskala at redhat.com> - 2.2.0-3
- fixed bug messaged in RHEL-4 #479774 - Wildcard failures with vsftpd
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-2
More information about the scm-commits
mailing list