X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Finetutils;h=ba87c9c994cbd093a983dc5cbe849397ada9d5de;hp=4f0b6067eac3c93d673e72888dc1803762c7b2e0;hb=7add463e51039d0409545f7279d43a66eba1d532;hpb=cd1a2927226c734d96478e12bb768256fb64a06a

diff --git a/lfs/inetutils b/lfs/inetutils
index 4f0b6067e..ba87c9c99 100644
--- a/lfs/inetutils
+++ b/lfs/inetutils
@@ -1,28 +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) 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    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: inetutils,v 1.3.2.3 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -36,7 +28,7 @@ VER        = 1.4.2
 
 THISAPP    = inetutils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_GNU)/inetutils
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -78,13 +70,19 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-ping-1.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --disable-syslogd \
-	    --libexecdir=/usr/sbin --disable-logger \
-	    --sysconfdir=/etc --localstatedir=/var \
-	    --disable-whois --disable-servers
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fixes-3.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-daemon_fixes-1.patch
+	cd $(DIR_APP) && sed -i '/#include/a #include <stdlib.h>' libicmp/icmp_timestamp.c
+	cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/sbin \
+				--sysconfdir=/etc --localstatedir=/var \
+				--mandir=/usr/share/man --infodir=/usr/share/info \
+				--disable-logger --disable-syslogd --disable-telnet --disable-telnetd
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	mv -f /usr/bin/ping /bin
+	mv -v /usr/bin/ping /bin
+
+	# Don't use whois command from here.
+	rm -vf /usr/bin/whois
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)