Merge remote-tracking branch 'alfh/feature_vnstat_1.11' into beyond-next

[people/teissler/ipfire-2.x.git] / lfs / vsftpd

diff --git a/lfs/vsftpd b/lfs/vsftpd
index 26d60be19121b8355d135b9007ee279fc2f83f86..f3e74a00e1ac37e0e8b1f0656e107dd7d106b71a 100644 (file)
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.1.0
+VER        = 2.3.4
 
 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    = 3
+PAK_VER    = 7
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7890b54e7ffa6106ffbdfda53f47fa41
+$(DL_FILE)_MD5 = 2ea5d19978710527bb7444d93b67767a
 
 install : $(TARGET)
 
@@ -87,6 +87,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && install -v -m 644 vsftpd.conf.5 /usr/share/man/man5
        cd $(DIR_APP) && install -v -m 644 $(DIR_SRC)/config/vsftpd/vsftpd.conf /etc
        cd $(DIR_APP) && install -v -m 644 $(DIR_SRC)/config/vsftpd/vsftpd.user_list /etc
+       ln -sf ../init.d/vsftpd /etc/rc.d/rc3.d/S65vsftpd
+       ln -sf ../init.d/vsftpd /etc/rc.d/rc0.d/K35vsftpd
+       ln -sf ../init.d/vsftpd /etc/rc.d/rc6.d/K35vsftpd
        install -v -m 644 $(DIR_SRC)/config/backup/includes/vsftpd \
                        /var/ipfire/backup/addons/includes/vsftpd
        @rm -rf $(DIR_APP)