Merge remote-tracking branch 'earl/tor' into next

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

diff --git a/lfs/vsftpd b/lfs/vsftpd
index 819141697565844a811904df08afa849bcf75656..7284be96150a4987b7a812b3b30a08fd42c7d9f9 100644 (file)
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.5
+VER        = 2.3.4
 
 THISAPP    = vsftpd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vsftpd
-PAK_VER    = 1
+PAK_VER    = 8
+
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 146062e8b2f93af43ff6c2c770feea94
+$(DL_FILE)_MD5 = 2ea5d19978710527bb7444d93b67767a
 
 install : $(TARGET)
 
@@ -86,5 +86,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && install -v -m 644 vsftpd.8 /usr/share/man/man8
        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)
        @$(POSTBUILD)