Updated vsftpd to 2.2.2

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

diff --git a/lfs/vsftpd b/lfs/vsftpd
index 1cce1dfa2972af9c624ccc07b34e9dc1072bcc88..d5e809399e185525202c7400110b8798a2089b1d 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.0.5
+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    = 1
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 146062e8b2f93af43ff6c2c770feea94
+$(DL_FILE)_MD5 = 6d6bc136af14c23f8fef6f1a51f55418
 
 install : $(TARGET)
 
@@ -78,7 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && echo "#define VSF_BUILD_SSL" >>builddefs.h
-       cd $(DIR_APP) && echo "#undef VSF_BUILD_PAM" >>builddefs.h
        cd $(DIR_APP) && install -v -d -m 0755 /var/ftp/empty
        cd $(DIR_APP) && install -v -d -m 0755 /home/ftp
        chown vsftpd.vsftpd /home/ftp
@@ -87,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)