commit ff5b6393ed563903341ae67fab87990f0a3b8540 Author: Juergen Daubert <jue@jue.li> Date: Sat Jul 25 10:39:48 2015 +0200 vsftpd: update to 3.0.3, improved rc script diff --git a/vsftpd/.md5sum b/vsftpd/.md5sum index 4c56e1a..0d71e9c 100644 --- a/vsftpd/.md5sum +++ b/vsftpd/.md5sum @@ -1,3 +1,3 @@ -7f5bb0bcd0f3a54673157aaaee6f6c30 vsftpd -8b00c749719089401315bd3c44dddbb2 vsftpd-3.0.2.tar.gz -5ac97dc3f1bb4a54cbbb329271af4159 vsftpd-config.patch +b923df8d4c519cfc72e465e014510c6a vsftpd +da119d084bd3f98664636ea05b5bb398 vsftpd-3.0.3.tar.gz +3b80f40e146597a757569688a3568271 vsftpd-config.patch diff --git a/vsftpd/Pkgfile b/vsftpd/Pkgfile index e441a61..d69ff4a 100644 --- a/vsftpd/Pkgfile +++ b/vsftpd/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl libcap tcp_wrappers name=vsftpd -version=3.0.2 +version=3.0.3 release=1 source=(https://security.appspot.com/downloads/$name-$version.tar.gz \ $name-config.patch vsftpd) diff --git a/vsftpd/vsftpd b/vsftpd/vsftpd index 58a1c9a..2e3091d 100644 --- a/vsftpd/vsftpd +++ b/vsftpd/vsftpd @@ -3,26 +3,38 @@ # /etc/rc.d/vsftpd: start/stop vsftpd daemon # +SSD=/sbin/start-stop-daemon +PROG=/usr/sbin/vsftpd +OPTS="" + CRT=/etc/ssl/certs/vsftpd.crt KEY=/etc/ssl/keys/vsftpd.key + case $1 in start) if [ ! -s $CRT -o ! -s $KEY ]; then /usr/bin/mksslcert $KEY $CRT fi - /usr/sbin/vsftpd + $SSD --start --exec $PROG -- $OPTS ;; stop) - killall -q /usr/sbin/vsftpd + $SSD --stop --retry 10 --exec $PROG ;; restart) $0 stop - sleep 2 $0 start ;; +status) + $SSD --status --exec $PROG + case $? in + 0) echo "$PROG is running with pid $(pgrep -o -x vsftpd )" ;; + 3) echo "$PROG is not running" ;; + 4) echo "Unable to determine the program status" ;; + esac + ;; *) - echo "usage: $0 [start|stop|restart]" + echo "usage: $0 [start|stop|restart|status]" ;; esac diff --git a/vsftpd/vsftpd-config.patch b/vsftpd/vsftpd-config.patch index 07dad0a..23c0418 100644 --- a/vsftpd/vsftpd-config.patch +++ b/vsftpd/vsftpd-config.patch @@ -1,6 +1,6 @@ -diff -Nru vsftpd-3.0.0.orig/Makefile vsftpd-3.0.0/Makefile ---- vsftpd-3.0.0.orig/Makefile 2012-04-10 09:29:08.529670293 +0200 -+++ vsftpd-3.0.0/Makefile 2012-04-10 09:38:01.020463369 +0200 +diff -Nru vsftpd-3.0.3.orig/Makefile vsftpd-3.0.3/Makefile +--- vsftpd-3.0.3.orig/Makefile 2015-07-25 09:11:09.726498894 +0200 ++++ vsftpd-3.0.3/Makefile 2015-07-25 09:11:35.355581087 +0200 @@ -3,7 +3,7 @@ INSTALL = install IFLAGS = -idirafter dummyinc @@ -36,9 +36,9 @@ diff -Nru vsftpd-3.0.0.orig/Makefile vsftpd-3.0.0/Makefile clean: rm -f *.o *.swp vsftpd -diff -Nru vsftpd-3.0.0.orig/builddefs.h vsftpd-3.0.0/builddefs.h ---- vsftpd-3.0.0.orig/builddefs.h 2012-04-10 09:29:08.533003507 +0200 -+++ vsftpd-3.0.0/builddefs.h 2012-04-10 09:37:33.624784735 +0200 +diff -Nru vsftpd-3.0.3.orig/builddefs.h vsftpd-3.0.3/builddefs.h +--- vsftpd-3.0.3.orig/builddefs.h 2015-07-25 09:11:09.723165680 +0200 ++++ vsftpd-3.0.3/builddefs.h 2015-07-25 09:11:35.355581087 +0200 @@ -1,9 +1,9 @@ #ifndef VSF_BUILDDEFS_H #define VSF_BUILDDEFS_H @@ -52,9 +52,9 @@ diff -Nru vsftpd-3.0.0.orig/builddefs.h vsftpd-3.0.0/builddefs.h #endif /* VSF_BUILDDEFS_H */ -diff -Nru vsftpd-3.0.0.orig/tunables.c vsftpd-3.0.0/tunables.c ---- vsftpd-3.0.0.orig/tunables.c 2012-04-10 09:29:08.529670293 +0200 -+++ vsftpd-3.0.0/tunables.c 2012-04-10 09:39:55.196345553 +0200 +diff -Nru vsftpd-3.0.3.orig/tunables.c vsftpd-3.0.3/tunables.c +--- vsftpd-3.0.3.orig/tunables.c 2015-07-25 09:11:09.723165680 +0200 ++++ vsftpd-3.0.3/tunables.c 2015-07-25 09:17:40.889245729 +0200 @@ -254,7 +254,7 @@ /* -rw------- */ tunable_chown_upload_mode = 0600; @@ -64,23 +64,23 @@ diff -Nru vsftpd-3.0.0.orig/tunables.c vsftpd-3.0.0/tunables.c install_str_setting("ftp", &tunable_ftp_username); install_str_setting("root", &tunable_chown_username); install_str_setting("/var/log/xferlog", &tunable_xferlog_file); -@@ -281,11 +281,11 @@ +@@ -281,11 +281,10 @@ install_str_setting(0, &tunable_user_sub_token); install_str_setting("/etc/vsftpd.email_passwords", &tunable_email_password_file); - install_str_setting("/usr/share/ssl/certs/vsftpd.pem", -+ install_str_setting("/etc/ssl/certs/vsftpd.crt", - &tunable_rsa_cert_file); +- &tunable_rsa_cert_file); ++ install_str_setting("/etc/ssl/certs/vsftpd.crt", &tunable_rsa_cert_file); install_str_setting(0, &tunable_dsa_cert_file); - install_str_setting("AES128-SHA:DES-CBC3-SHA", &tunable_ssl_ciphers); + install_str_setting("ECDHE-RSA-AES256-GCM-SHA384", &tunable_ssl_ciphers); - install_str_setting(0, &tunable_rsa_private_key_file); + install_str_setting("/etc/ssl/keys/vsftpd.key", &tunable_rsa_private_key_file); install_str_setting(0, &tunable_dsa_private_key_file); install_str_setting(0, &tunable_ca_certs_file); } -diff -Nru vsftpd-3.0.0.orig/vsftpd.conf vsftpd-3.0.0/vsftpd.conf ---- vsftpd-3.0.0.orig/vsftpd.conf 2012-04-10 09:29:08.529670293 +0200 -+++ vsftpd-3.0.0/vsftpd.conf 2012-04-10 09:37:33.624784735 +0200 +diff -Nru vsftpd-3.0.3.orig/vsftpd.conf vsftpd-3.0.3/vsftpd.conf +--- vsftpd-3.0.3.orig/vsftpd.conf 2015-07-25 09:11:09.726498894 +0200 ++++ vsftpd-3.0.3/vsftpd.conf 2015-07-25 09:11:35.355581087 +0200 @@ -8,11 +8,21 @@ # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's # capabilities. @@ -111,9 +111,9 @@ diff -Nru vsftpd-3.0.0.orig/vsftpd.conf vsftpd-3.0.0/vsftpd.conf # # 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. -diff -Nru vsftpd-3.0.0.orig/vsftpd.conf.5 vsftpd-3.0.0/vsftpd.conf.5 ---- vsftpd-3.0.0.orig/vsftpd.conf.5 2012-04-10 09:29:08.533003507 +0200 -+++ vsftpd-3.0.0/vsftpd.conf.5 2012-04-10 09:37:33.624784735 +0200 +diff -Nru vsftpd-3.0.3.orig/vsftpd.conf.5 vsftpd-3.0.3/vsftpd.conf.5 +--- vsftpd-3.0.3.orig/vsftpd.conf.5 2015-07-25 09:11:09.723165680 +0200 ++++ vsftpd-3.0.3/vsftpd.conf.5 2015-07-25 09:11:35.355581087 +0200 @@ -955,21 +955,21 @@ This option specifies the location of the RSA certificate to use for SSL encrypted connections.