ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

vsftpd: update to 2.1.0

Browse Source
This commit is contained in:
Juergen Daubert 2009-02-20 15:10:37 +01:00
parent 3f97f97b1b
commit 1cec002f91
3 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vsftpd/.md5sum
View File

@ -1,3 +1,3 @@
7a0ece0af8aefad4313270a8786e041e vsftpd 7a0ece0af8aefad4313270a8786e041e vsftpd
3e39cb7b0bee306ad7df8e3552e15297 vsftpd-2.0.7.tar.gz 7890b54e7ffa6106ffbdfda53f47fa41 vsftpd-2.1.0.tar.gz
d69ea2c7fe28d63a586f47deb5ea7726 vsftpd-config.patch d4f14655d1d2efb00968a3931ba6e889 vsftpd-config.patch

4
vsftpd/Pkgfile
View File

@ -4,8 +4,8 @@
# Depends on: openssl libcap # Depends on: openssl libcap
name=vsftpd name=vsftpd
version=2.0.7 version=2.1.0
release=2 release=1
source=(ftp://vsftpd.beasts.org/users/cevans/$name-$version.tar.gz \ source=(ftp://vsftpd.beasts.org/users/cevans/$name-$version.tar.gz \
$name-config.patch vsftpd) $name-config.patch vsftpd)

75
vsftpd/vsftpd-config.patch
View File

@ -1,6 +1,6 @@
diff -Nru vsftpd-2.0.7.orig/Makefile vsftpd-2.0.7/Makefile diff -Nru vsftpd-2.1.0.orig/Makefile vsftpd-2.1.0/Makefile
--- vsftpd-2.0.7.orig/Makefile 2008-07-30 22:19:12.000000000 +0200 --- vsftpd-2.1.0.orig/Makefile 2009-02-19 08:48:58.000000000 +0100
+++ vsftpd-2.0.7/Makefile 2008-07-30 22:19:26.000000000 +0200 +++ vsftpd-2.1.0/Makefile 2009-02-19 08:49:11.000000000 +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.0.7.orig/Makefile vsftpd-2.0.7/Makefile
clean: clean:
rm -f *.o *.swp vsftpd rm -f *.o *.swp vsftpd
diff -Nru vsftpd-2.0.7.orig/builddefs.h vsftpd-2.0.7/builddefs.h diff -Nru vsftpd-2.1.0.orig/builddefs.h vsftpd-2.1.0/builddefs.h
--- vsftpd-2.0.7.orig/builddefs.h 2008-07-30 22:19:12.000000000 +0200 --- vsftpd-2.1.0.orig/builddefs.h 2009-02-19 08:48:58.000000000 +0100
+++ vsftpd-2.0.7/builddefs.h 2008-07-30 22:19:26.000000000 +0200 +++ vsftpd-2.1.0/builddefs.h 2009-02-19 08:49:11.000000000 +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,34 +52,35 @@ diff -Nru vsftpd-2.0.7.orig/builddefs.h vsftpd-2.0.7/builddefs.h
#endif /* VSF_BUILDDEFS_H */ #endif /* VSF_BUILDDEFS_H */
diff -Nru vsftpd-2.0.7.orig/tunables.c vsftpd-2.0.7/tunables.c diff -Nru vsftpd-2.1.0.orig/tunables.c vsftpd-2.1.0/tunables.c
--- vsftpd-2.0.7.orig/tunables.c 2008-07-30 22:19:12.000000000 +0200 --- vsftpd-2.1.0.orig/tunables.c 2009-02-19 08:48:58.000000000 +0100
+++ vsftpd-2.0.7/tunables.c 2008-07-30 22:19:26.000000000 +0200 +++ vsftpd-2.1.0/tunables.c 2009-02-19 08:54:20.000000000 +0100
@@ -104,7 +104,7 @@ @@ -242,7 +242,7 @@
/* -rw------- */ /* -rw------- */
unsigned int tunable_chown_upload_mode = 0600; tunable_chown_upload_mode = 0600;
-const char* tunable_secure_chroot_dir = "/usr/share/empty"; - install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
+const char* tunable_secure_chroot_dir = "/var/empty"; + install_str_setting("/var/empty", &tunable_secure_chroot_dir);
const char* tunable_ftp_username = "ftp"; install_str_setting("ftp", &tunable_ftp_username);
const char* tunable_chown_username = "root"; install_str_setting("root", &tunable_chown_username);
const char* tunable_xferlog_file = "/var/log/xferlog"; install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
@@ -129,10 +129,10 @@ @@ -269,11 +269,11 @@
const char* tunable_deny_file = 0; install_str_setting(0, &tunable_user_sub_token);
const char* tunable_user_sub_token = 0; install_str_setting("/etc/vsftpd.email_passwords",
const char* tunable_email_password_file = "/etc/vsftpd.email_passwords"; &tunable_email_password_file);
-const char* tunable_rsa_cert_file = "/usr/share/ssl/certs/vsftpd.pem"; - install_str_setting("/usr/share/ssl/certs/vsftpd.pem",
+const char* tunable_rsa_cert_file = "/etc/ssl/certs/vsftpd.crt"; + install_str_setting("/etc/ssl/certs/vsftpd.crt",
const char* tunable_dsa_cert_file = 0; &tunable_rsa_cert_file);
const char* tunable_ssl_ciphers = "DES-CBC3-SHA"; install_str_setting(0, &tunable_dsa_cert_file);
-const char* tunable_rsa_private_key_file = 0; install_str_setting("DES-CBC3-SHA", &tunable_ssl_ciphers);
+const char* tunable_rsa_private_key_file = "/etc/ssl/keys/vsftpd.key"; - install_str_setting(0, &tunable_rsa_private_key_file);
const char* tunable_dsa_private_key_file = 0; + install_str_setting("/etc/ssl/keys/vsftpd.key", &tunable_rsa_private_key_file);
const char* tunable_ca_certs_file = 0; install_str_setting(0, &tunable_dsa_private_key_file);
install_str_setting(0, &tunable_ca_certs_file);
diff -Nru vsftpd-2.0.7.orig/vsftpd.conf vsftpd-2.0.7/vsftpd.conf }
--- vsftpd-2.0.7.orig/vsftpd.conf 2008-07-30 22:19:12.000000000 +0200 diff -Nru vsftpd-2.1.0.orig/vsftpd.conf vsftpd-2.1.0/vsftpd.conf
+++ vsftpd-2.0.7/vsftpd.conf 2008-07-30 22:19:26.000000000 +0200 --- vsftpd-2.1.0.orig/vsftpd.conf 2009-02-19 08:48:58.000000000 +0100
+++ vsftpd-2.1.0/vsftpd.conf 2009-02-19 08:49:11.000000000 +0100
@@ -8,11 +8,25 @@ @@ -8,11 +8,25 @@
# 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.
@ -106,10 +107,10 @@ diff -Nru vsftpd-2.0.7.orig/vsftpd.conf vsftpd-2.0.7/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
diff -Nru vsftpd-2.0.7.orig/vsftpd.conf.5 vsftpd-2.0.7/vsftpd.conf.5 diff -Nru vsftpd-2.1.0.orig/vsftpd.conf.5 vsftpd-2.1.0/vsftpd.conf.5
--- vsftpd-2.0.7.orig/vsftpd.conf.5 2008-07-30 22:19:12.000000000 +0200 --- vsftpd-2.1.0.orig/vsftpd.conf.5 2009-02-19 08:48:58.000000000 +0100
+++ vsftpd-2.0.7/vsftpd.conf.5 2008-07-30 22:19:26.000000000 +0200 +++ vsftpd-2.1.0/vsftpd.conf.5 2009-02-19 08:49:11.000000000 +0100
@@ -927,21 +927,21 @@ @@ -950,21 +950,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.