aboutsummaryrefslogtreecommitdiff
path: root/package/vsftpd
diff options
context:
space:
mode:
Diffstat (limited to 'package/vsftpd')
-rw-r--r--package/vsftpd/0002-fix-CVE-2015-1419.patch (renamed from package/vsftpd/0003-fix-CVE-2015-1419.patch)0
-rw-r--r--package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch (renamed from package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch)0
-rw-r--r--package/vsftpd/S70vsftpd4
-rw-r--r--package/vsftpd/vsftpd.mk1
4 files changed, 3 insertions, 2 deletions
diff --git a/package/vsftpd/0003-fix-CVE-2015-1419.patch b/package/vsftpd/0002-fix-CVE-2015-1419.patch
index 95ad017a1c..95ad017a1c 100644
--- a/package/vsftpd/0003-fix-CVE-2015-1419.patch
+++ b/package/vsftpd/0002-fix-CVE-2015-1419.patch
diff --git a/package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch b/package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch
index 0732c5f632..0732c5f632 100644
--- a/package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch
+++ b/package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch
diff --git a/package/vsftpd/S70vsftpd b/package/vsftpd/S70vsftpd
index 38bcfd431f..62f9a1b744 100644
--- a/package/vsftpd/S70vsftpd
+++ b/package/vsftpd/S70vsftpd
@@ -9,12 +9,12 @@ DAEMON=/usr/sbin/$NAME
case "$1" in
start)
printf "Starting $DESC: "
- start-stop-daemon -S -b -x $NAME
+ start-stop-daemon -S -b -x $DAEMON
echo "OK"
;;
stop)
printf "Stopping $DESC: "
- start-stop-daemon -K -x $NAME
+ start-stop-daemon -K -x $DAEMON
echo "OK"
;;
restart|force-reload)
diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index 8a9aac2d29..2804a3a39d 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -9,6 +9,7 @@ VSFTPD_SITE = https://security.appspot.com/downloads
VSFTPD_LIBS = -lcrypt
VSFTPD_LICENSE = GPL-2.0
VSFTPD_LICENSE_FILES = COPYING
+VSFTPD_CPE_ID_VALID = YES
define VSFTPD_DISABLE_UTMPX
$(SED) 's/.*VSF_BUILD_UTMPX/#undef VSF_BUILD_UTMPX/' $(@D)/builddefs.h