vsftpd: merge r28907

SVN-Revision: 30280

diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index a1e7147bc58ee5025b6ba612c5562f1cd11a06de..32cae30a4adcce93a41fc336c163f3f4ed3d55b7 100644 (file)
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vsftpd
 PKG_VERSION:=2.3.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://security.appspot.com/downloads/

diff --git a/net/vsftpd/files/vsftpd.init b/net/vsftpd/files/vsftpd.init
index 303d6cf1bb68987eaaf22e2ce3ef6879639d7c0e..ad3e23da5fc3a1ac8e07b660e19d0926b42e9096 100644 (file)
--- a/net/vsftpd/files/vsftpd.init
+++ b/net/vsftpd/files/vsftpd.init
@@ -1,14 +1,13 @@
 #!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
 
 START=50
 
-RUN_D=/var/run/vsftpd
-
 start() {
-       [ -d $RUN_D ] || mkdir -p $RUN_D
-       vsftpd
+       mkdir -m 0755 -p /var/run/vsftpd
+       service_start /usr/sbin/vsftpd
 }
 
 stop() {
-       killall vsftpd
+       service_stop /usr/sbin/vsftpd
 }