rpms/vsftpd
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix license tag, update to 2.0.7

Browse Source
This commit is contained in:
Tom Callaway 2008-09-09 03:53:37 +00:00
parent bc3bc4dbe8
commit 6872c7137e
8 changed files with 91 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
vsftpd-2.0.6.tar.gz vsftpd-2.0.7.tar.gz

2
sources
View File

@ -1 +1 @@
f7a742690d7f86e356fb66d3840079c7 vsftpd-2.0.6.tar.gz 3e39cb7b0bee306ad7df8e3552e15297 vsftpd-2.0.7.tar.gz

7
vsftpd-2.0.1-build_ssl.patch
View File

@ -1,8 +1,9 @@
--- vsftpd-2.0.1/builddefs.h-orig 2004-07-02 16:36:59.000000000 +0200 diff -up vsftpd-2.0.6/builddefs.h.build_ssl vsftpd-2.0.6/builddefs.h
+++ vsftpd-2.0.1/builddefs.h 2004-08-17 13:40:42.834402983 +0200 --- vsftpd-2.0.6/builddefs.h.build_ssl 2008-09-08 23:28:16.000000000 -0400
+++ vsftpd-2.0.6/builddefs.h 2008-09-08 23:29:04.000000000 -0400
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
#undef VSF_BUILD_TCPWRAPPERS #define VSF_BUILD_TCPWRAPPERS
#define VSF_BUILD_PAM #define VSF_BUILD_PAM
-#undef VSF_BUILD_SSL -#undef VSF_BUILD_SSL
+#define VSF_BUILD_SSL +#define VSF_BUILD_SSL

30
vsftpd-2.0.3-daemonize_fds.patch
View File

@ -1,18 +1,18 @@
diff -u vsftpd-2.0.1.orig/standalone.c vsftpd-2.0.1/standalone.c diff -up vsftpd-2.0.6/standalone.c.fds vsftpd-2.0.6/standalone.c
--- vsftpd-2.0.1.orig/standalone.c 2005-06-15 16:08:52.000000000 -0400 --- vsftpd-2.0.6/standalone.c.fds 2008-09-08 23:29:23.000000000 -0400
+++ vsftpd-2.0.1/standalone.c 2005-06-15 16:06:26.000000000 -0400 +++ vsftpd-2.0.6/standalone.c 2008-09-08 23:30:16.000000000 -0400
@@ -53,6 +53,7 @@ @@ -57,6 +57,7 @@ vsf_standalone_main(void)
vsf_sysutil_exit(0); vsf_sysutil_close_failok(1);
} vsf_sysutil_close_failok(2);
vsf_sysutil_make_session_leader(); vsf_sysutil_make_session_leader();
+ vsf_sysutil_reopen_standard_fds(); + vsf_sysutil_reopen_standard_fds();
} }
if (tunable_listen) if (tunable_listen)
{ {
diff -u vsftpd-2.0.1.orig/sysutil.c vsftpd-2.0.1/sysutil.c diff -up vsftpd-2.0.6/sysutil.c.fds vsftpd-2.0.6/sysutil.c
--- vsftpd-2.0.1.orig/sysutil.c 2005-06-15 16:08:52.000000000 -0400 --- vsftpd-2.0.6/sysutil.c.fds 2008-09-08 23:29:23.000000000 -0400
+++ vsftpd-2.0.1/sysutil.c 2005-06-15 16:03:25.000000000 -0400 +++ vsftpd-2.0.6/sysutil.c 2008-09-08 23:32:26.000000000 -0400
@@ -2357,6 +2357,44 @@ @@ -2457,6 +2457,44 @@ vsf_sysutil_make_session_leader(void)
} }
void void
@ -56,11 +56,11 @@ diff -u vsftpd-2.0.1.orig/sysutil.c vsftpd-2.0.1/sysutil.c
+void +void
vsf_sysutil_tzset(void) vsf_sysutil_tzset(void)
{ {
tzset(); int retval;
diff -u vsftpd-2.0.1.orig/sysutil.h vsftpd-2.0.1/sysutil.h diff -up vsftpd-2.0.6/sysutil.h.fds vsftpd-2.0.6/sysutil.h
--- vsftpd-2.0.1.orig/sysutil.h 2004-06-04 06:11:52.000000000 -0400 --- vsftpd-2.0.6/sysutil.h.fds 2008-02-01 20:30:39.000000000 -0500
+++ vsftpd-2.0.1/sysutil.h 2005-06-15 16:03:54.000000000 -0400 +++ vsftpd-2.0.6/sysutil.h 2008-09-08 23:29:24.000000000 -0400
@@ -287,6 +287,7 @@ @@ -293,6 +293,7 @@ unsigned char vsf_sysutil_get_random_byt
unsigned int vsf_sysutil_get_umask(void); unsigned int vsf_sysutil_get_umask(void);
void vsf_sysutil_set_umask(unsigned int umask); void vsf_sysutil_set_umask(unsigned int umask);
void vsf_sysutil_make_session_leader(void); void vsf_sysutil_make_session_leader(void);

41
vsftpd-2.0.5-bind_denied.patch
View File

@ -1,30 +1,20 @@
--- vsftpd-2.0.5/postlogin.c.old 2007-01-17 12:22:10.000000000 +0100 diff -up vsftpd-2.0.7/postlogin.c.bind_denied vsftpd-2.0.7/postlogin.c
+++ vsftpd-2.0.5/postlogin.c 2007-01-17 12:20:33.000000000 +0100 --- vsftpd-2.0.7/postlogin.c.bind_denied 2008-07-29 21:51:09.000000000 -0400
@@ -557,7 +557,8 @@ +++ vsftpd-2.0.7/postlogin.c 2008-09-08 23:39:28.000000000 -0400
{ @@ -574,7 +574,8 @@ handle_pasv(struct vsf_session* p_sess,
break; break;
} }
}
- if (vsf_sysutil_get_error() == kVSFSysUtilErrADDRINUSE) - if (vsf_sysutil_get_error() == kVSFSysUtilErrADDRINUSE)
+ if ( (vsf_sysutil_get_error() == kVSFSysUtilErrADDRINUSE) || + if ( (vsf_sysutil_get_error() == kVSFSysUtilErrADDRINUSE) ||
+ (vsf_sysutil_get_error() == kVSFSysUtilErrEACCES) ) + (vsf_sysutil_get_error() == kVSFSysUtilErrEACCES) )
{ {
continue; continue;
} }
--- vsftpd-2.0.5/sysutil.h.old 2007-01-17 12:22:10.000000000 +0100 diff -up vsftpd-2.0.7/sysutil.c.bind_denied vsftpd-2.0.7/sysutil.c
+++ vsftpd-2.0.5/sysutil.h 2007-01-17 12:20:52.000000000 +0100 --- vsftpd-2.0.7/sysutil.c.bind_denied 2008-09-08 23:38:10.000000000 -0400
@@ -16,7 +16,8 @@ +++ vsftpd-2.0.7/sysutil.c 2008-09-08 23:38:10.000000000 -0400
kVSFSysUtilErrNOSYS, @@ -1561,6 +1561,9 @@ vsf_sysutil_get_error(void)
kVSFSysUtilErrINTR,
kVSFSysUtilErrINVAL,
- kVSFSysUtilErrOPNOTSUPP
+ kVSFSysUtilErrOPNOTSUPP,
+ kVSFSysUtilErrEACCES
};
enum EVSFSysUtilError vsf_sysutil_get_error(void);
--- vsftpd-2.0.5/sysutil.c.old 2007-01-17 12:22:10.000000000 +0100
+++ vsftpd-2.0.5/sysutil.c 2007-01-17 12:20:22.000000000 +0100
@@ -1553,6 +1553,9 @@
case EOPNOTSUPP: case EOPNOTSUPP:
retval = kVSFSysUtilErrOPNOTSUPP; retval = kVSFSysUtilErrOPNOTSUPP;
break; break;
@ -34,3 +24,16 @@
} }
return retval; return retval;
} }
diff -up vsftpd-2.0.7/sysutil.h.bind_denied vsftpd-2.0.7/sysutil.h
--- vsftpd-2.0.7/sysutil.h.bind_denied 2008-09-08 23:38:10.000000000 -0400
+++ vsftpd-2.0.7/sysutil.h 2008-09-08 23:38:10.000000000 -0400
@@ -16,7 +16,8 @@ enum EVSFSysUtilError
kVSFSysUtilErrNOSYS,
kVSFSysUtilErrINTR,
kVSFSysUtilErrINVAL,
- kVSFSysUtilErrOPNOTSUPP
+ kVSFSysUtilErrOPNOTSUPP,
+ kVSFSysUtilErrEACCES
};
enum EVSFSysUtilError vsf_sysutil_get_error(void);

48
vsftpd-2.0.5-write_race.patch
View File

@ -1,27 +1,15 @@
diff -up vsftpd-2.0.5/sysutil.h.write_race vsftpd-2.0.5/sysutil.h diff -up vsftpd-2.0.7/postlogin.c.write_race vsftpd-2.0.7/postlogin.c
--- vsftpd-2.0.5/sysutil.h.write_race 2007-11-21 08:48:28.000000000 +0100 --- vsftpd-2.0.7/postlogin.c.write_race 2008-09-08 23:39:58.000000000 -0400
+++ vsftpd-2.0.5/sysutil.h 2007-11-21 08:48:28.000000000 +0100 +++ vsftpd-2.0.7/postlogin.c 2008-09-08 23:47:27.000000000 -0400
@@ -91,6 +91,8 @@ void vsf_sysutil_close(int fd); @@ -982,6 +982,7 @@ handle_upload_common(struct vsf_session*
int vsf_sysutil_close_failok(int fd);
int vsf_sysutil_unlink(const char* p_dead);
int vsf_sysutil_write_access(const char* p_filename);
+/* Trucate after open */
+int vsf_sysutil_truncate(int fd, filesize_t length);
/* Reading and writing */
void vsf_sysutil_lseek_to(const int fd, filesize_t seek_pos);
diff -up vsftpd-2.0.5/postlogin.c.write_race vsftpd-2.0.5/postlogin.c
--- vsftpd-2.0.5/postlogin.c.write_race 2007-11-21 08:48:28.000000000 +0100
+++ vsftpd-2.0.5/postlogin.c 2007-11-21 08:51:59.000000000 +0100
@@ -953,6 +953,7 @@ handle_upload_common(struct vsf_session*
struct vsf_transfer_ret trans_ret; struct vsf_transfer_ret trans_ret;
int new_file_fd; int new_file_fd;
int remote_fd; int remote_fd;
+ int truncit = 0; + int truncit = 0;
int success = 0;
int created = 0;
filesize_t offset = p_sess->restart_pos; filesize_t offset = p_sess->restart_pos;
p_sess->restart_pos = 0; @@ -1018,7 +1019,15 @@ handle_upload_common(struct vsf_session*
if (!data_transfer_checks_ok(p_sess))
@@ -987,7 +988,15 @@ handle_upload_common(struct vsf_session*
/* For non-anonymous, allow open() to overwrite or append existing files */ /* For non-anonymous, allow open() to overwrite or append existing files */
if (!is_append && offset == 0) if (!is_append && offset == 0)
{ {
@ -38,7 +26,7 @@ diff -up vsftpd-2.0.5/postlogin.c.write_race vsftpd-2.0.5/postlogin.c
} }
else else
{ {
@@ -1023,6 +1032,11 @@ handle_upload_common(struct vsf_session* @@ -1056,6 +1065,11 @@ handle_upload_common(struct vsf_session*
if (tunable_lock_upload_files) if (tunable_lock_upload_files)
{ {
vsf_sysutil_lock_file_write(new_file_fd); vsf_sysutil_lock_file_write(new_file_fd);
@ -50,10 +38,10 @@ diff -up vsftpd-2.0.5/postlogin.c.write_race vsftpd-2.0.5/postlogin.c
} }
if (!is_append && offset != 0) if (!is_append && offset != 0)
{ {
diff -up vsftpd-2.0.5/sysutil.c.write_race vsftpd-2.0.5/sysutil.c diff -up vsftpd-2.0.7/sysutil.c.write_race vsftpd-2.0.7/sysutil.c
--- vsftpd-2.0.5/sysutil.c.write_race 2007-11-21 08:48:28.000000000 +0100 --- vsftpd-2.0.7/sysutil.c.write_race 2008-09-08 23:39:58.000000000 -0400
+++ vsftpd-2.0.5/sysutil.c 2007-11-21 08:48:28.000000000 +0100 +++ vsftpd-2.0.7/sysutil.c 2008-09-08 23:39:58.000000000 -0400
@@ -1196,6 +1196,12 @@ vsf_sysutil_close_failok(int fd) @@ -1200,6 +1200,12 @@ vsf_sysutil_close_failok(int fd)
} }
int int
@ -66,3 +54,15 @@ diff -up vsftpd-2.0.5/sysutil.c.write_race vsftpd-2.0.5/sysutil.c
vsf_sysutil_unlink(const char* p_dead) vsf_sysutil_unlink(const char* p_dead)
{ {
return unlink(p_dead); return unlink(p_dead);
diff -up vsftpd-2.0.7/sysutil.h.write_race vsftpd-2.0.7/sysutil.h
--- vsftpd-2.0.7/sysutil.h.write_race 2008-09-08 23:39:58.000000000 -0400
+++ vsftpd-2.0.7/sysutil.h 2008-09-08 23:39:58.000000000 -0400
@@ -91,6 +91,8 @@ void vsf_sysutil_close(int fd);
int vsf_sysutil_close_failok(int fd);
int vsf_sysutil_unlink(const char* p_dead);
int vsf_sysutil_write_access(const char* p_filename);
+/* Trucate after open */
+int vsf_sysutil_truncate(int fd, filesize_t length);
/* Reading and writing */
void vsf_sysutil_lseek_to(const int fd, filesize_t seek_pos);

14
vsftpd-close-std-fds.patch
View File

@ -1,13 +1,13 @@
diff -up vsftpd-2.0.1/standalone.c vsftpd-2.0.1.new/standalone.c diff -up vsftpd-2.0.7/standalone.c.close-fds vsftpd-2.0.7/standalone.c
--- vsftpd-2.0.1/standalone.c 2005-10-24 11:49:43.478375564 +0100 --- vsftpd-2.0.7/standalone.c.close-fds 2008-09-08 23:36:32.000000000 -0400
+++ vsftpd-2.0.1.new/standalone.c 2005-10-24 11:47:33.666544352 +0100 +++ vsftpd-2.0.7/standalone.c 2008-09-08 23:37:53.000000000 -0400
@@ -126,6 +126,9 @@ vsf_standalone_main(void) @@ -131,6 +131,9 @@ vsf_standalone_main(void)
die("could not bind listening IPv6 socket"); die("could not bind listening IPv6 socket");
} }
} }
+ vsf_sysutil_close(0); + vsf_sysutil_close(0);
+ vsf_sysutil_close(1); + vsf_sysutil_close(1);
+ vsf_sysutil_close(2); + vsf_sysutil_close(2);
vsf_sysutil_listen(listen_sock, VSFTP_LISTEN_BACKLOG); retval = vsf_sysutil_listen(listen_sock, VSFTP_LISTEN_BACKLOG);
vsf_sysutil_sockaddr_alloc(&p_accept_addr); if (vsf_sysutil_retval_is_error(retval))
while (1) {

15
vsftpd.spec
View File

@ -2,9 +2,10 @@
Summary: Very Secure Ftp Daemon Summary: Very Secure Ftp Daemon
Name: vsftpd Name: vsftpd
Version: 2.0.6 Version: 2.0.7
Release: 5%{?dist} Release: 1%{?dist}
License: GPL # OpenSSL link exception
License: GPLv2 with exceptions
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://vsftpd.beasts.org/ URL: http://vsftpd.beasts.org/
Source: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz Source: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
@ -111,7 +112,7 @@ make CFLAGS="$RPM_OPT_FLAGS -fpie -pipe" \
%{?_smp_mflags} %{?_smp_mflags}
%install %install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{vsftpd,pam.d,logrotate.d,rc.d/init.d} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{vsftpd,pam.d,logrotate.d,rc.d/init.d}
@ -130,7 +131,7 @@ install -m 744 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/vsftpd_conf_migra
mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
%clean %clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/chkconfig --add vsftpd /sbin/chkconfig --add vsftpd
@ -158,6 +159,10 @@ fi
%{_var}/ftp %{_var}/ftp
%changelog %changelog
* Mon Sep 8 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.7-1
- fix license tag
- update to 2.0.7
* Fri Jun 20 2008 Dennis Gilmore <dennis@ausil.us> - 2.0.6-5 * Fri Jun 20 2008 Dennis Gilmore <dennis@ausil.us> - 2.0.6-5
- add sparc arches to -fPIE list - add sparc arches to -fPIE list