From: Jan Paul Tuecking <earl@ipfire.org>
Date: Mon, 16 Aug 2010 17:20:21 +0000 (+0200)
Subject: Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.9-beta1~87^2^2~2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d97b2de4a135b323612a0d7c24760ce9f9ff5040;hp=40228ef46f523a151affc034e0510aa9075e2f3f

Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 7cec76a713..f72d1f765b 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -354,7 +354,7 @@
 * vlc-0.8.6i
 * vnstat-1.6
 * vnstati-beta3
-* vsftpd-2.1.2
+* vsftpd-2.2.2
 * w_scan-20080105
 * watchdog-5.9
 * wget-1.10.2
diff --git a/lfs/vsftpd b/lfs/vsftpd
index e4cb67c4e5..d5e809399e 100644
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.1.2
+VER        = 2.2.2
 
 THISAPP    = vsftpd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vsftpd
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6a8c8579d50adf0d0fc07226c03bfb52
+$(DL_FILE)_MD5 = 6d6bc136af14c23f8fef6f1a51f55418
 
 install : $(TARGET)
 
diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/init.d/openvmtools
index c1588e1dcb..a3bd0736ec 100755
--- a/src/initscripts/init.d/openvmtools
+++ b/src/initscripts/init.d/openvmtools
@@ -4,9 +4,9 @@
 #
 # Description : init-script for open-vm-tools
 #
-# Authors     : earl
+# Authors     : Jan Paul Tuecking (earl@ipfire.org)
 #
-# Version     : 00.01
+# Version     : 1.00
 #
 # Notes       :
 #
diff --git a/src/initscripts/init.d/vdradmin b/src/initscripts/init.d/vdradmin
index c7a565d0ec..a0858de35f 100644
--- a/src/initscripts/init.d/vdradmin
+++ b/src/initscripts/init.d/vdradmin
@@ -8,7 +8,8 @@
 #
 # Version     : 01.00
 #
-# Notes       :
+# Notes       : Changes in 01.01
+#             : v.2.6.7 needs /var/run/vdradmin dir (earl@ipfire.org)
 #
 ########################################################################
 
@@ -18,6 +19,7 @@
 case "${1}" in
 	start)
 		boot_mesg "Starting VDR Webadministration Tool..."
+		mkdir /var/run/vdradmin -p
 		loadproc /usr/bin/vdradmind > /dev/null
 		evaluate_retval
 		;;