X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fiproute2;h=4d2a6f4d78a93e1892d8265bfebe17d39d372b1d;hb=8ebe72541619278f97fc0be145057f5fc59581c6;hp=47a1b5f50a356b0e0c8e64ef04fd2ffd77505bce;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=ipfire-2.x.git

diff --git a/lfs/iproute2 b/lfs/iproute2
index 47a1b5f50a..4d2a6f4d78 100644
--- a/lfs/iproute2
+++ b/lfs/iproute2
@@ -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-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# 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: iproute2,v 1.6.2.4 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,24 +24,23 @@
 
 include Config
 
-VER        = 2.4.7-now-ss010824
+VER        = 4.18.0
 
 THISAPP    = iproute2-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.funet.fi/pub/mirrors/ftp.inr.ac.ru/ip-routing
-DIR_APP    = $(DIR_SRC)/iproute2
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects = $(DL_FILE) htb3.6-020525.tgz
+
+objects = $(DL_FILE)
 
 $(DL_FILE)             = $(DL_FROM)/$(DL_FILE)
-htb3.6-020525.tgz      = http://luxik.cdi.cz/~devik/qos/htb/v3/htb3.6-020525.tgz
 
-$(DL_FILE)_MD5         = b05a4e375d9468be3a1dd3f0e83daee8
-htb3.6-020525.tgz_MD5  = 3064fd8642ce6a7e155a29c5205b99d4
+$(DL_FILE)_MD5         = 8b8680e91390c57cab788fbf8e929479
 
 install : $(TARGET)
 
@@ -78,13 +69,13 @@ $(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) && tar xfz $(DIR_DL)/htb3.6-020525.tgz *.diff
-	cd $(DIR_APP) && for i in htb3*tc.diff ; do patch -Np1 < $$i; done
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iproute2-includes.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iproute2-2.4.7-netlink.patch
-	cd $(DIR_APP) && sed -i -e 's/-Werror//' Makefile
-	cd $(DIR_APP) && make
-	cd $(DIR_APP) && install -m 0755 ip/ip ip/rtmon tc/tc /sbin
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && make $(MAKETUNING) SBINDIR=/sbin
+	cd $(DIR_APP) && make SBINDIR=/sbin install
+	cd $(DIR_APP) && mv -v /sbin/arpd /usr/sbin
+
+	# Add table for static routing
+	echo "200	static" >> /etc/iproute2/rt_tables
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)