X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fxinetd;h=62f34eabba3bd50ad9456337de59971ebe8a09dd;hb=6fde3230a88f633ec6358959626ca90c1ae3e1a3;hp=d6110552465d910207143e9805e5425c50f7b900;hpb=c3defe9b3f1d87d87591343cc47db69a4cafd154;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/xinetd b/lfs/xinetd
index d61105524..62f34eabb 100644
--- a/lfs/xinetd
+++ b/lfs/xinetd
@@ -1,23 +1,21 @@
 ###############################################################################
-# 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) 2007  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    #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-
 ###############################################################################
 
 ###############################################################################
@@ -26,13 +24,15 @@
 
 include Config
 
-VER        = 2.3.14
+VER        = 2.3.15
 
 THISAPP    = xinetd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = xinetd
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 567382d7972613090215c6c54f9b82d9
+$(DL_FILE)_MD5 = 77358478fd58efa6366accae99b8b04c
 
 install : $(TARGET)
 
@@ -53,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	make-packages.sh xinetd $(THISAPP)-ipfire-beta-1
+	@$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -68,6 +68,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
 $(subst %,%_MD5,$(objects)) :
 	@$(MD5)
 
+
 ###############################################################################
 # Installation Details
 ###############################################################################
@@ -75,24 +76,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --with-loadavg
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	cd $(DIR_APP) && install -v -d -m755 /etc/xinetd.d
-	echo "# Begin /etc/xinetd" 				> /etc/xinetd.conf
-	echo "# Configuration file for xinetd" 		>> /etc/xinetd.conf
-	echo "#" 						>> /etc/xinetd.conf
-	echo "defaults" 					>> /etc/xinetd.conf
-	echo "{" 						>> /etc/xinetd.conf
-	echo "      instances       = 60" 			>> /etc/xinetd.conf
-	echo "      log_type        = SYSLOG daemon" 	>> /etc/xinetd.conf
-	echo "      log_on_success  = HOST PID USERID" 	>> /etc/xinetd.conf
-	echo "      log_on_failure  = HOST USERID" 	>> /etc/xinetd.conf
-	echo "      cps             = 25 30"	 	>> /etc/xinetd.conf
-	echo "}" 						>> /etc/xinetd.conf
-	echo "# All service files are stored in the /etc/xinetd.d directory" >> /etc/xinetd.conf
-	echo "#" 						>> /etc/xinetd.conf
-	echo "includedir /etc/xinetd.d" 			>> /etc/xinetd.conf
-	echo "# End /etc/xinetd" 				>> /etc/xinetd.conf
+	-mkdir -pv /etc/xinetd.d
+	cp -f $(DIR_SRC)/config/xinetd/xinetd.conf /etc/xinetd.conf
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)