vsftpd: update to 2.3.5

This commit is contained in:
Juergen Daubert 2012-01-06 15:56:07 +01:00
parent 5b8198b48e
commit 3bb482e259
3 changed files with 19 additions and 19 deletions

View File

@ -1,3 +1,3 @@
7f5bb0bcd0f3a54673157aaaee6f6c30 vsftpd 7f5bb0bcd0f3a54673157aaaee6f6c30 vsftpd
2ea5d19978710527bb7444d93b67767a vsftpd-2.3.4.tar.gz 01398a5bef8e85b6cf2c213a4b011eca vsftpd-2.3.5.tar.gz
af40b87797bab83d080a2a2328f02e05 vsftpd-config.patch 6fdedb51829177ff236e06f5948b95d3 vsftpd-config.patch

View File

@ -4,7 +4,7 @@
# Depends on: openssl libcap tcp_wrappers # Depends on: openssl libcap tcp_wrappers
name=vsftpd name=vsftpd
version=2.3.4 version=2.3.5
release=1 release=1
source=(https://security.appspot.com/downloads/$name-$version.tar.gz \ source=(https://security.appspot.com/downloads/$name-$version.tar.gz \
$name-config.patch vsftpd) $name-config.patch vsftpd)

View File

@ -1,6 +1,6 @@
diff -Nru vsftpd-2.3.2.orig/Makefile vsftpd-2.3.2/Makefile diff -Nru vsftpd-2.3.5.orig/Makefile vsftpd-2.3.5/Makefile
--- vsftpd-2.3.2.orig/Makefile 2010-08-28 15:38:07.032912301 +0200 --- vsftpd-2.3.5.orig/Makefile 2012-01-06 10:46:09.698823473 +0100
+++ vsftpd-2.3.2/Makefile 2010-08-28 15:38:23.114141478 +0200 +++ vsftpd-2.3.5/Makefile 2012-01-06 10:46:22.908340697 +0100
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
INSTALL = install INSTALL = install
IFLAGS = -idirafter dummyinc IFLAGS = -idirafter dummyinc
@ -36,9 +36,9 @@ diff -Nru vsftpd-2.3.2.orig/Makefile vsftpd-2.3.2/Makefile
clean: clean:
rm -f *.o *.swp vsftpd rm -f *.o *.swp vsftpd
diff -Nru vsftpd-2.3.2.orig/builddefs.h vsftpd-2.3.2/builddefs.h diff -Nru vsftpd-2.3.5.orig/builddefs.h vsftpd-2.3.5/builddefs.h
--- vsftpd-2.3.2.orig/builddefs.h 2010-08-28 15:38:07.032912301 +0200 --- vsftpd-2.3.5.orig/builddefs.h 2012-01-06 10:46:09.698823473 +0100
+++ vsftpd-2.3.2/builddefs.h 2010-08-28 15:38:23.114141478 +0200 +++ vsftpd-2.3.5/builddefs.h 2012-01-06 10:46:22.908340697 +0100
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
#ifndef VSF_BUILDDEFS_H #ifndef VSF_BUILDDEFS_H
#define VSF_BUILDDEFS_H #define VSF_BUILDDEFS_H
@ -52,9 +52,9 @@ diff -Nru vsftpd-2.3.2.orig/builddefs.h vsftpd-2.3.2/builddefs.h
#endif /* VSF_BUILDDEFS_H */ #endif /* VSF_BUILDDEFS_H */
diff -Nru vsftpd-2.3.2.orig/tunables.c vsftpd-2.3.2/tunables.c diff -Nru vsftpd-2.3.5.orig/tunables.c vsftpd-2.3.5/tunables.c
--- vsftpd-2.3.2.orig/tunables.c 2010-08-28 15:38:07.082917253 +0200 --- vsftpd-2.3.5.orig/tunables.c 2012-01-06 10:46:09.698823473 +0100
+++ vsftpd-2.3.2/tunables.c 2010-08-28 15:38:23.114141478 +0200 +++ vsftpd-2.3.5/tunables.c 2012-01-06 10:46:22.908340697 +0100
@@ -250,7 +250,7 @@ @@ -250,7 +250,7 @@
/* -rw------- */ /* -rw------- */
tunable_chown_upload_mode = 0600; tunable_chown_upload_mode = 0600;
@ -78,9 +78,9 @@ diff -Nru vsftpd-2.3.2.orig/tunables.c vsftpd-2.3.2/tunables.c
install_str_setting(0, &tunable_dsa_private_key_file); install_str_setting(0, &tunable_dsa_private_key_file);
install_str_setting(0, &tunable_ca_certs_file); install_str_setting(0, &tunable_ca_certs_file);
} }
diff -Nru vsftpd-2.3.2.orig/vsftpd.conf vsftpd-2.3.2/vsftpd.conf diff -Nru vsftpd-2.3.5.orig/vsftpd.conf vsftpd-2.3.5/vsftpd.conf
--- vsftpd-2.3.2.orig/vsftpd.conf 2010-08-28 15:38:07.082917253 +0200 --- vsftpd-2.3.5.orig/vsftpd.conf 2012-01-06 10:46:09.698823473 +0100
+++ vsftpd-2.3.2/vsftpd.conf 2010-08-28 15:38:23.114141478 +0200 +++ vsftpd-2.3.5/vsftpd.conf 2012-01-06 10:46:22.908340697 +0100
@@ -8,11 +8,21 @@ @@ -8,11 +8,21 @@
# Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
# capabilities. # capabilities.
@ -103,7 +103,7 @@ diff -Nru vsftpd-2.3.2.orig/vsftpd.conf vsftpd-2.3.2/vsftpd.conf
# #
# Uncomment this to enable any form of FTP write command. # Uncomment this to enable any form of FTP write command.
#write_enable=YES #write_enable=YES
@@ -107,6 +117,7 @@ @@ -110,6 +120,7 @@
# listens on IPv4 sockets. This directive cannot be used in conjunction # listens on IPv4 sockets. This directive cannot be used in conjunction
# with the listen_ipv6 directive. # with the listen_ipv6 directive.
listen=YES listen=YES
@ -111,9 +111,9 @@ diff -Nru vsftpd-2.3.2.orig/vsftpd.conf vsftpd-2.3.2/vsftpd.conf
# #
# This directive enables listening on IPv6 sockets. To listen on IPv4 and IPv6 # This directive enables listening on IPv6 sockets. To listen on IPv4 and IPv6
# sockets, you must run two copies of vsftpd with two configuration files. # sockets, you must run two copies of vsftpd with two configuration files.
diff -Nru vsftpd-2.3.2.orig/vsftpd.conf.5 vsftpd-2.3.2/vsftpd.conf.5 diff -Nru vsftpd-2.3.5.orig/vsftpd.conf.5 vsftpd-2.3.5/vsftpd.conf.5
--- vsftpd-2.3.2.orig/vsftpd.conf.5 2010-08-28 15:38:07.082917253 +0200 --- vsftpd-2.3.5.orig/vsftpd.conf.5 2012-01-06 10:46:09.698823473 +0100
+++ vsftpd-2.3.2/vsftpd.conf.5 2010-08-28 15:38:23.114141478 +0200 +++ vsftpd-2.3.5/vsftpd.conf.5 2012-01-06 10:46:22.908340697 +0100
@@ -955,21 +955,21 @@ @@ -955,21 +955,21 @@
This option specifies the location of the RSA certificate to use for SSL This option specifies the location of the RSA certificate to use for SSL
encrypted connections. encrypted connections.