Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org --- config/rootfiles/common/iproute2 | 42 +++++++++++++++++++++++++++++++++++++--- lfs/iproute2 | 7 ++++--- 2 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2 index 93dcaff..2339d83 100644 --- a/config/rootfiles/common/iproute2 +++ b/config/rootfiles/common/iproute2 @@ -1,4 +1,5 @@ #etc/iproute2 +etc/iproute2/bpf_pinning etc/iproute2/ematch_map etc/iproute2/group etc/iproute2/nl_protos @@ -28,7 +29,10 @@ sbin/tc #usr/lib/tc/normal.dist #usr/lib/tc/pareto.dist #usr/lib/tc/paretonormal.dist -usr/sbin/arpd +#usr/sbin/arpd +#usr/share/bash-completion +#usr/share/bash-completion/completions +usr/share/bash-completion/completions/tc #usr/share/doc/iproute2 #usr/share/doc/iproute2/SNAPSHOT.tex #usr/share/doc/iproute2/api-ip6-flowlabels.tex @@ -60,17 +64,23 @@ usr/sbin/arpd #usr/share/doc/iproute2/preamble.tex #usr/share/doc/iproute2/rtstat.sgml #usr/share/doc/iproute2/ss.sgml +#usr/share/doc/iproute2/tc-filters.tex #usr/share/man/man3/libnetlink.3 #usr/share/man/man7/tc-hfsc.7 -#usr/share/man/man8/arpd.8 #usr/share/man/man8/bridge.8 #usr/share/man/man8/ctstat.8 +#usr/share/man/man8/devlink-dev.8 +#usr/share/man/man8/devlink-monitor.8 +#usr/share/man/man8/devlink-port.8 +#usr/share/man/man8/devlink-sb.8 +#usr/share/man/man8/devlink.8 #usr/share/man/man8/ip-address.8 #usr/share/man/man8/ip-addrlabel.8 #usr/share/man/man8/ip-fou.8 #usr/share/man/man8/ip-gue.8 #usr/share/man/man8/ip-l2tp.8 #usr/share/man/man8/ip-link.8 +#usr/share/man/man8/ip-macsec.8 #usr/share/man/man8/ip-maddress.8 #usr/share/man/man8/ip-monitor.8 #usr/share/man/man8/ip-mroute.8 @@ -91,29 +101,55 @@ usr/sbin/arpd #usr/share/man/man8/routel.8 #usr/share/man/man8/rtacct.8 #usr/share/man/man8/rtmon.8 +#usr/share/man/man8/rtpr.8 #usr/share/man/man8/rtstat.8 #usr/share/man/man8/ss.8 +#usr/share/man/man8/tc-basic.8 #usr/share/man/man8/tc-bfifo.8 #usr/share/man/man8/tc-bpf.8 #usr/share/man/man8/tc-cbq-details.8 #usr/share/man/man8/tc-cbq.8 +#usr/share/man/man8/tc-cgroup.8 #usr/share/man/man8/tc-choke.8 #usr/share/man/man8/tc-codel.8 +#usr/share/man/man8/tc-connmark.8 +#usr/share/man/man8/tc-csum.8 #usr/share/man/man8/tc-drr.8 #usr/share/man/man8/tc-ematch.8 +#usr/share/man/man8/tc-flow.8 +#usr/share/man/man8/tc-flower.8 +#usr/share/man/man8/tc-fq.8 #usr/share/man/man8/tc-fq_codel.8 +#usr/share/man/man8/tc-fw.8 #usr/share/man/man8/tc-hfsc.8 #usr/share/man/man8/tc-htb.8 +#usr/share/man/man8/tc-mirred.8 #usr/share/man/man8/tc-mqprio.8 +#usr/share/man/man8/tc-nat.8 #usr/share/man/man8/tc-netem.8 +#usr/share/man/man8/tc-pedit.8 #usr/share/man/man8/tc-pfifo.8 #usr/share/man/man8/tc-pfifo_fast.8 #usr/share/man/man8/tc-pie.8 +#usr/share/man/man8/tc-police.8 #usr/share/man/man8/tc-prio.8 #usr/share/man/man8/tc-red.8 +#usr/share/man/man8/tc-route.8 #usr/share/man/man8/tc-sfb.8 #usr/share/man/man8/tc-sfq.8 +#usr/share/man/man8/tc-simple.8 +#usr/share/man/man8/tc-skbedit.8 #usr/share/man/man8/tc-stab.8 #usr/share/man/man8/tc-tbf.8 +#usr/share/man/man8/tc-tcindex.8 +#usr/share/man/man8/tc-u32.8 +#usr/share/man/man8/tc-vlan.8 +#usr/share/man/man8/tc-xt.8 #usr/share/man/man8/tc.8 -var/lib/arpd +#usr/share/man/man8/tipc-bearer.8 +#usr/share/man/man8/tipc-link.8 +#usr/share/man/man8/tipc-media.8 +#usr/share/man/man8/tipc-nametable.8 +#usr/share/man/man8/tipc-node.8 +#usr/share/man/man8/tipc-socket.8 +#usr/share/man/man8/tipc.8 diff --git a/lfs/iproute2 b/lfs/iproute2 index 51f1f3d..47ce077 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 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 # @@ -24,7 +24,7 @@
include Config
-VER = 4.2.0 +VER = 4.7.0
THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 51c54cc3245eff451154938fbc0f64f5 +$(DL_FILE)_MD5 = d4b205830cdc2702f8a0cbd6232129cd
install : $(TARGET)
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_arpd.patch cd $(DIR_APP) && make $(MAKETUNING) SBINDIR=/sbin cd $(DIR_APP) && make SBINDIR=/sbin install cd $(DIR_APP) && mv -v /sbin/arpd /usr/sbin