aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Everitt <gentoo@veremit.xyz>2020-04-23 05:32:01 +0100
committerAnthony G. Basile <blueness@gentoo.org>2020-04-23 10:56:07 -0400
commita02386560ae073b2bf14a2ddb6e30b8a396d653a (patch)
tree4e27fce3232b529d437f099b3c77ca97f15c4c60 /sys-apps
parentnet-wireless/bluez: limits.h patch merged upstream in 2d249af, release 5.52 (diff)
downloadmusl-a02386560ae073b2bf14a2ddb6e30b8a396d653a.tar.gz
musl-a02386560ae073b2bf14a2ddb6e30b8a396d653a.tar.bz2
musl-a02386560ae073b2bf14a2ddb6e30b8a396d653a.zip
iproute2: Fixed upstream in 3326701, release v5.3.0.
In-tree builds fine: > michael@ananke ~ $ qlist -ISSRUv iproute2 > sys-apps/iproute2-5.2.0-r1:0::gentoo -atm -berkdb -caps -elf iptables ipv6 -minimal -selinux Signed-off-by: Michael Everitt <gentoo@veremit.xyz> Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/iproute2/Manifest3
-rw-r--r--sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch48
-rw-r--r--sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch37
-rw-r--r--sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch191
-rw-r--r--sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch207
-rw-r--r--sys-apps/iproute2/files/iproute2-4.17.0-musl.patch268
-rw-r--r--sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch208
-rw-r--r--sys-apps/iproute2/files/iproute2-4.20.0-limits.patch21
-rw-r--r--sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch38
-rw-r--r--sys-apps/iproute2/files/iproute2-5.1.0-portability.patch33
-rw-r--r--sys-apps/iproute2/iproute2-4.17.0-r1.ebuild154
-rw-r--r--sys-apps/iproute2/iproute2-4.17.0.ebuild152
-rw-r--r--sys-apps/iproute2/iproute2-4.20.0.ebuild156
-rw-r--r--sys-apps/iproute2/iproute2-5.2.0.ebuild162
-rw-r--r--sys-apps/iproute2/metadata.xml14
15 files changed, 0 insertions, 1692 deletions
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
deleted file mode 100644
index 761d0f0..0000000
--- a/sys-apps/iproute2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
-DIST iproute2-4.20.0.tar.xz 707016 BLAKE2B d62c6b995c4c1f79617e2f8149ff2ed297d741965e81bffebfa475514f5e96f0c9300e65d12bdd14ab492ce66675677eb41af6816876d5e1360218e4f32f4bc8 SHA512 ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b
-DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
diff --git a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch b/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch
deleted file mode 100644
index fa12dad..0000000
--- a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-http://bugs.gentoo.org/291907
-
-This patch was merged from two patches extracted from this thread:
-http://markmail.org/thread/qkd76gpdgefpjlfn
-
-tc_stab.c: small fixes to commandline help
-
-
-tc_core.c:
-As kernel part of things relies on cell align which is always set to -1,
-I also added it to userspace computation stage. This way if someone
-specified e.g. 2048 and 512 for mtu and tsize respectively, one wouldn't
-end with tsize supporting mtu 4096 suddenly, New default mtu is also set
-to 2048 (disregarding weirdness of setting mtu to such values).
-
-
-Unless I missed something, this is harmless and feels cleaner, but if it's
-not allowed, documentation will have to be changed back to 2047 + extra
-explanation as well.
-
---- iproute2/tc/tc_core.c
-+++ iproute2/tc/tc_core.c
-@@ -155,12 +155,12 @@
- }
-
- if (s->mtu == 0)
-- s->mtu = 2047;
-+ s->mtu = 2048;
- if (s->tsize == 0)
- s->tsize = 512;
-
- s->cell_log = 0;
-- while ((s->mtu >> s->cell_log) > s->tsize - 1)
-+ while ((s->mtu - 1 >> s->cell_log) > s->tsize - 1)
- s->cell_log++;
-
- *stab = malloc(s->tsize * sizeof(__u16));
---- iproute2/tc/tc_stab.c
-+++ iproute2/tc/tc_stab.c
-@@ -32,7 +32,7 @@
- fprintf(stderr,
- "Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ] \n"
- " [ overhead BYTES ] [ linklayer TYPE ] ...\n"
-- " mtu : max packet size we create rate map for {2047}\n"
-+ " mtu : max packet size we create size table for {2048}\n"
- " tsize : how many slots should size table have {512}\n"
- " mpu : minimum packet size used in rate computations\n"
- " overhead : per-packet size overhead used in rate computations\n"
diff --git a/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch
deleted file mode 100644
index fc855dc..0000000
--- a/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- iproute2-4.11.0/ip/ipmonitor.c
-+++ iproute2-4.11.0/ip/ipmonitor.c
-@@ -114,7 +114,6 @@
- }
- if (n->nlmsg_type == RTM_NEWPREFIX) {
- print_headers(fp, "[PREFIX]", ctrl);
-- print_prefix(who, n, arg);
- return 0;
- }
- if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
---- iproute2-4.11.0/ip/iptunnel.c
-+++ iproute2-4.11.0/ip/iptunnel.c
-@@ -589,13 +589,6 @@
- break;
- case AF_INET:
- break;
-- /*
-- * This is silly enough but we have no easy way to make it
-- * protocol-independent because of unarranged structure between
-- * IPv4 and IPv6.
-- */
-- case AF_INET6:
-- return do_ip6tunnel(argc, argv);
- default:
- fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
- exit(-1);
---- iproute2-4.11.0/ip/Makefile
-+++ iproute2-4.11.0/ip/Makefile
-@@ -1,6 +1,6 @@
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
-- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
-+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
- ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \
- iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o \
- iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \
diff --git a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch
deleted file mode 100644
index 01a1fe2..0000000
--- a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
-a variable as well as modifying CFLAGS & LDLIBS.
-
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
-are still in place.
-
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
-are only passed when correctly needed.
-
-Prior Gentoo testcase for reproduction:
-USE=minimal ebuild ... compile.
-- Linking with libelf & libmnl based only on presence.
-- Links based on libselinux based only on presence.
-
-Closes: https://bugs.gentoo.org/643722
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
-
---- iproute2-4.16.0/bridge/Makefile
-+++ iproute2-4.16.0/bridge/Makefile
-@@ -2,6 +2,7 @@
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
-
- include ../config.mk
-+include ../config.include
-
- all: bridge
-
---- iproute2-4.16.0/config.include
-+++ iproute2-4.16.0/config.include
-@@ -0,0 +1,22 @@
-+# We can only modify CFLAGS/LDLIBS after all the config options are known.
-+ifeq ($(IP_CONFIG_SETNS),y)
-+ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
-+endif
-+ifeq ($(HAVE_ELF),y)
-+ CFLAGS += $(HAVE_ELF_CFLAGS)
-+ LDLIBS += $(HAVE_ELF_LDLIBS)
-+endif
-+ifeq ($(HAVE_SELINUX),y)
-+ CFLAGS += $(HAVE_SELINUX_CFLAGS)
-+ LDLIBS += $(HAVE_SELINUX_LDLIBS)
-+endif
-+ifeq ($(HAVE_MNL),y)
-+ CFLAGS += $(HAVE_MNL_CFLAGS)
-+ LDLIBS += $(HAVE_MNL_LDLIBS)
-+endif
-+
-+# Rules can only be declared after all variables in them are known.
-+%.o: %.c
-+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-+
-+# vim: ft=make:
---- iproute2-4.16.0/configure
-+++ iproute2-4.16.0/configure
-@@ -212,7 +212,7 @@
- then
- echo "IP_CONFIG_SETNS:=y" >>$CONFIG
- echo "yes"
-- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
-+ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
- else
- echo "no"
- fi
-@@ -257,8 +257,8 @@
- echo "HAVE_ELF:=y" >>$CONFIG
- echo "yes"
-
-- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-+ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-+ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
- else
- echo "no"
- fi
-@@ -272,8 +272,8 @@
- echo "HAVE_SELINUX:=y" >>$CONFIG
- echo "yes"
-
-- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
-- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
- else
- echo "no"
- fi
-@@ -286,8 +286,8 @@
- echo "HAVE_MNL:=y" >>$CONFIG
- echo "yes"
-
-- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
-+ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-+ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
- else
- echo "no"
- fi
-@@ -426,7 +426,3 @@
-
- echo -n "libcap support: "
- check_cap
--
--echo >> $CONFIG
--echo "%.o: %.c" >> $CONFIG
--echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
---- iproute2-4.16.0/devlink/Makefile
-+++ iproute2-4.16.0/devlink/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- TARGETS :=
-
---- iproute2-4.16.0/genl/Makefile
-+++ iproute2-4.16.0/genl/Makefile
-@@ -2,6 +2,7 @@
- GENLOBJ=genl.o
-
- include ../config.mk
-+include ../config.include
- SHARED_LIBS ?= y
-
- CFLAGS += -fno-strict-aliasing
---- iproute2-4.16.0/ip/Makefile
-+++ iproute2-4.16.0/ip/Makefile
-@@ -15,6 +15,7 @@
- RTMONOBJ=rtmon.o
-
- include ../config.mk
-+include ../config.include
-
- ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=ifcfg rtpr routel routef
---- iproute2-4.16.0/lib/Makefile
-+++ iproute2-4.16.0/lib/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- CFLAGS += -fPIC
-
---- iproute2-4.16.0/misc/Makefile
-+++ iproute2-4.16.0/misc/Makefile
-@@ -5,6 +5,7 @@
- TARGETS=ss nstat ifstat rtacct lnstat
-
- include ../config.mk
-+include ../config.include
-
- ifeq ($(HAVE_BERKELEY_DB),y)
- TARGETS += arpd
---- iproute2-4.16.0/netem/Makefile
-+++ iproute2-4.16.0/netem/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- DISTGEN = maketable normal pareto paretonormal
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
---- iproute2-4.16.0/rdma/Makefile
-+++ iproute2-4.16.0/rdma/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- TARGETS :=
-
---- iproute2-4.16.0/tc/Makefile
-+++ iproute2-4.16.0/tc/Makefile
-@@ -4,6 +4,7 @@
- emp_ematch.yacc.o emp_ematch.lex.o
-
- include ../config.mk
-+include ../config.include
-
- SHARED_LIBS ?= y
-
---- iproute2-4.16.0/tipc/Makefile
-+++ iproute2-4.16.0/tipc/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- TARGETS :=
-
diff --git a/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch
deleted file mode 100644
index 30b5db3..0000000
--- a/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
-a variable as well as modifying CFLAGS & LDLIBS.
-
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
-are still in place.
-
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
-are only passed when correctly needed.
-
-Prior Gentoo testcase for reproduction:
-USE=minimal ebuild ... compile.
-- Linking with libelf, libmnl & libcap based only on presence.
-- Links based on libselinux based only on presence.
-
-Closes: https://bugs.gentoo.org/643722
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
-Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
-
---- iproute2-4.17.0/bridge/Makefile
-+++ iproute2-4.17.0/bridge/Makefile
-@@ -2,6 +2,7 @@
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
-
- include ../config.mk
-+include ../config.include
-
- all: bridge
-
---- iproute2-4.17.0/config.include
-+++ iproute2-4.17.0/config.include
-@@ -0,0 +1,26 @@
-+# We can only modify CFLAGS/LDLIBS after all the config options are known.
-+ifeq ($(IP_CONFIG_SETNS),y)
-+ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
-+endif
-+ifeq ($(HAVE_ELF),y)
-+ CFLAGS += $(HAVE_ELF_CFLAGS)
-+ LDLIBS += $(HAVE_ELF_LDLIBS)
-+endif
-+ifeq ($(HAVE_SELINUX),y)
-+ CFLAGS += $(HAVE_SELINUX_CFLAGS)
-+ LDLIBS += $(HAVE_SELINUX_LDLIBS)
-+endif
-+ifeq ($(HAVE_MNL),y)
-+ CFLAGS += $(HAVE_MNL_CFLAGS)
-+ LDLIBS += $(HAVE_MNL_LDLIBS)
-+endif
-+ifeq ($(HAVE_CAP),y)
-+ CFLAGS += $(HAVE_CAP_CFLAGS)
-+ LDLIBS += $(HAVE_CAP_LDLIBS)
-+endif
-+
-+# Rules can only be declared after all variables in them are known.
-+%.o: %.c
-+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-+
-+# vim: ft=make:
---- iproute2-4.17.0/configure
-+++ iproute2-4.17.0/configure
-@@ -212,7 +212,7 @@
- then
- echo "IP_CONFIG_SETNS:=y" >>$CONFIG
- echo "yes"
-- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
-+ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
- else
- echo "no"
- fi
-@@ -257,8 +257,8 @@
- echo "HAVE_ELF:=y" >>$CONFIG
- echo "yes"
-
-- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-+ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-+ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
- else
- echo "no"
- fi
-@@ -272,8 +272,8 @@
- echo "HAVE_SELINUX:=y" >>$CONFIG
- echo "yes"
-
-- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
-- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
- else
- echo "no"
- fi
-@@ -286,8 +286,8 @@
- echo "HAVE_MNL:=y" >>$CONFIG
- echo "yes"
-
-- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
-+ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-+ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
- else
- echo "no"
- fi
-@@ -343,8 +343,8 @@
- echo "HAVE_CAP:=y" >>$CONFIG
- echo "yes"
-
-- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
-- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
-+ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
-+ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
- else
- echo "no"
- fi
-@@ -426,7 +426,3 @@
-
- echo -n "libcap support: "
- check_cap
--
--echo >> $CONFIG
--echo "%.o: %.c" >> $CONFIG
--echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
---- iproute2-4.17.0/devlink/Makefile
-+++ iproute2-4.17.0/devlink/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- TARGETS :=
-
---- iproute2-4.17.0/genl/Makefile
-+++ iproute2-4.17.0/genl/Makefile
-@@ -2,6 +2,7 @@
- GENLOBJ=genl.o
-
- include ../config.mk
-+include ../config.include
- SHARED_LIBS ?= y
-
- CFLAGS += -fno-strict-aliasing
---- iproute2-4.17.0/ip/Makefile
-+++ iproute2-4.17.0/ip/Makefile
-@@ -15,6 +15,7 @@
- RTMONOBJ=rtmon.o
-
- include ../config.mk
-+include ../config.include
-
- ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=ifcfg rtpr routel routef
---- iproute2-4.17.0/lib/Makefile
-+++ iproute2-4.17.0/lib/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- CFLAGS += -fPIC
-
---- iproute2-4.17.0/misc/Makefile
-+++ iproute2-4.17.0/misc/Makefile
-@@ -5,6 +5,7 @@
- TARGETS=ss nstat ifstat rtacct lnstat
-
- include ../config.mk
-+include ../config.include
-
- ifeq ($(HAVE_BERKELEY_DB),y)
- TARGETS += arpd
---- iproute2-4.17.0/netem/Makefile
-+++ iproute2-4.17.0/netem/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- DISTGEN = maketable normal pareto paretonormal
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
---- iproute2-4.17.0/rdma/Makefile
-+++ iproute2-4.17.0/rdma/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- TARGETS :=
-
---- iproute2-4.17.0/tc/Makefile
-+++ iproute2-4.17.0/tc/Makefile
-@@ -4,6 +4,7 @@
- emp_ematch.yacc.o emp_ematch.lex.o
-
- include ../config.mk
-+include ../config.include
-
- SHARED_LIBS ?= y
-
---- iproute2-4.17.0/tipc/Makefile
-+++ iproute2-4.17.0/tipc/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- TARGETS :=
-
diff --git a/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch
deleted file mode 100644
index 2a75596..0000000
--- a/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-diff -Naur iproute2-4.17.0.orig/include/uapi/linux/if_tunnel.h iproute2-4.17.0/include/uapi/linux/if_tunnel.h
---- iproute2-4.17.0.orig/include/uapi/linux/if_tunnel.h 2018-06-11 10:31:44.723159108 -0700
-+++ iproute2-4.17.0/include/uapi/linux/if_tunnel.h 2018-06-11 10:32:17.676158518 -0700
-@@ -3,7 +3,6 @@
- #define _IF_TUNNEL_H_
-
- #include <linux/types.h>
--#include <linux/if.h>
- #include <linux/ip.h>
- #include <linux/in6.h>
- #include <asm/byteorder.h>
-diff -Naur iproute2-4.17.0.orig/include/uapi/linux/ip6_tunnel.h iproute2-4.17.0/include/uapi/linux/ip6_tunnel.h
---- iproute2-4.17.0.orig/include/uapi/linux/ip6_tunnel.h 2018-06-11 10:31:44.722159108 -0700
-+++ iproute2-4.17.0/include/uapi/linux/ip6_tunnel.h 2018-06-11 10:32:24.676158393 -0700
-@@ -3,7 +3,6 @@
- #define _IP6_TUNNEL_H
-
- #include <linux/types.h>
--#include <linux/if.h> /* For IFNAMSIZ. */
- #include <linux/in6.h> /* For struct in6_addr. */
-
- #define IPV6_TLV_TNL_ENCAP_LIMIT 4
-diff -Naur iproute2-4.17.0.orig/include/uapi/linux/kernel.h iproute2-4.17.0/include/uapi/linux/kernel.h
---- iproute2-4.17.0.orig/include/uapi/linux/kernel.h 2018-06-11 10:31:44.722159108 -0700
-+++ iproute2-4.17.0/include/uapi/linux/kernel.h 2018-06-11 10:32:41.676158088 -0700
-@@ -2,7 +2,9 @@
- #ifndef _LINUX_KERNEL_H
- #define _LINUX_KERNEL_H
-
-+#ifdef __GLIBC__
- #include <linux/sysinfo.h>
-+#endif
-
- /*
- * 'kernel.h' contains some often-used function prototypes etc
-diff -Naur iproute2-4.17.0.orig/include/uapi/linux/libc-compat.h iproute2-4.17.0/include/uapi/linux/libc-compat.h
---- iproute2-4.17.0.orig/include/uapi/linux/libc-compat.h 2018-06-11 10:31:44.721159108 -0700
-+++ iproute2-4.17.0/include/uapi/linux/libc-compat.h 2018-06-11 10:37:37.376152793 -0700
-@@ -49,47 +49,57 @@
- #ifndef _LIBC_COMPAT_H
- #define _LIBC_COMPAT_H
-
--/* We have included glibc headers... */
--#if defined(__GLIBC__)
-+/* We're used from userspace... */
-+#if !defined(__KERNEL__)
-
--/* Coordinate with glibc net/if.h header. */
-+/* Coordinate with libc net/if.h header. */
- #if defined(_NET_IF_H) && defined(__USE_MISC)
-
--/* GLIBC headers included first so don't define anything
-+/* libc headers included first so don't define anything
- * that would already be defined. */
-
- #define __UAPI_DEF_IF_IFCONF 0
- #define __UAPI_DEF_IF_IFMAP 0
- #define __UAPI_DEF_IF_IFNAMSIZ 0
- #define __UAPI_DEF_IF_IFREQ 0
--/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
-+#if !defined(__GLIBC__)
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
-+#else
- /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
- #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
- #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
-+#endif /* !defined(__GLIBC__) */
-
- #else /* _NET_IF_H */
-
- /* Linux headers included first, and we must define everything
-- * we need. The expectation is that glibc will check the
-+ * we need. The expectation is that libc will check the
- * __UAPI_DEF_* defines and adjust appropriately. */
-
- #define __UAPI_DEF_IF_IFCONF 1
- #define __UAPI_DEF_IF_IFMAP 1
- #define __UAPI_DEF_IF_IFNAMSIZ 1
- #define __UAPI_DEF_IF_IFREQ 1
--/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
- /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
-
- #endif /* _NET_IF_H */
-
--/* Coordinate with glibc netinet/in.h header. */
-+/* Coordinate with libc netinet/if_ether.h */
-+#ifdef _NETINET_IF_ETHER_H
-+#define __UAPI_DEF_ETHHDR 0
-+#else
-+/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */
-+#define __UAPI_DEF_ETHHDR 1
-+#endif /* _NETINET_IF_ETHER_H */
-+
-+/* Coordinate with libc netinet/in.h header. */
- #if defined(_NETINET_IN_H)
-
--/* GLIBC headers included first so don't define anything
-+/* libc headers included first so don't define anything
- * that would already be defined. */
- #define __UAPI_DEF_IN_ADDR 0
- #define __UAPI_DEF_IN_IPPROTO 0
-@@ -99,15 +109,7 @@
- #define __UAPI_DEF_IN_CLASS 0
-
- #define __UAPI_DEF_IN6_ADDR 0
--/* The exception is the in6_addr macros which must be defined
-- * if the glibc code didn't define them. This guard matches
-- * the guard in glibc/inet/netinet/in.h which defines the
-- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
--#if defined(__USE_MISC) || defined (__USE_GNU)
- #define __UAPI_DEF_IN6_ADDR_ALT 0
--#else
--#define __UAPI_DEF_IN6_ADDR_ALT 1
--#endif
- #define __UAPI_DEF_SOCKADDR_IN6 0
- #define __UAPI_DEF_IPV6_MREQ 0
- #define __UAPI_DEF_IPPROTO_V6 0
-@@ -118,7 +120,7 @@
- #else
-
- /* Linux headers included first, and we must define everything
-- * we need. The expectation is that glibc will check the
-+ * we need. The expectation is that libc will check the
- * __UAPI_DEF_* defines and adjust appropriately. */
- #define __UAPI_DEF_IN_ADDR 1
- #define __UAPI_DEF_IN_IPPROTO 1
-@@ -128,7 +130,7 @@
- #define __UAPI_DEF_IN_CLASS 1
-
- #define __UAPI_DEF_IN6_ADDR 1
--/* We unconditionally define the in6_addr macros and glibc must
-+/* We unconditionally define the in6_addr macros and libc must
- * coordinate. */
- #define __UAPI_DEF_IN6_ADDR_ALT 1
- #define __UAPI_DEF_SOCKADDR_IN6 1
-@@ -170,7 +172,7 @@
- * or we are being included in the kernel, then define everything
- * that we need. Check for previous __UAPI_* definitions to give
- * unsupported C libraries a way to opt out of any kernel definition. */
--#else /* !defined(__GLIBC__) */
-+#else /* defined(__KERNEL__) */
-
- /* Definitions for if.h */
- #ifndef __UAPI_DEF_IF_IFCONF
-@@ -185,7 +187,6 @@
- #ifndef __UAPI_DEF_IF_IFREQ
- #define __UAPI_DEF_IF_IFREQ 1
- #endif
--/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
- #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
- #endif
-@@ -194,6 +195,11 @@
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
- #endif
-
-+/* Definitions for netinet/if_ether.h */
-+#ifndef __UAPI_DEF_ETHHDR
-+#define __UAPI_DEF_ETHHDR 1
-+#endif
-+
- /* Definitions for in.h */
- #ifndef __UAPI_DEF_IN_ADDR
- #define __UAPI_DEF_IN_ADDR 1
-@@ -262,6 +268,6 @@
- #define __UAPI_DEF_XATTR 1
- #endif
-
--#endif /* __GLIBC__ */
-+#endif /* defined(__KERNEL__) */
-
- #endif /* _LIBC_COMPAT_H */
-diff -Naur iproute2-4.17.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h iproute2-4.17.0/include/uapi/linux/netfilter_ipv4/ip_tables.h
---- iproute2-4.17.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h 2018-06-11 10:31:44.722159108 -0700
-+++ iproute2-4.17.0/include/uapi/linux/netfilter_ipv4/ip_tables.h 2018-06-11 10:38:07.727152249 -0700
-@@ -18,7 +18,6 @@
-
- #include <linux/types.h>
-
--#include <linux/if.h>
- #include <linux/netfilter_ipv4.h>
-
- #include <linux/netfilter/x_tables.h>
-diff -Naur iproute2-4.17.0.orig/rdma/include/uapi/rdma/rdma_user_cm.h iproute2-4.17.0/rdma/include/uapi/rdma/rdma_user_cm.h
---- iproute2-4.17.0.orig/rdma/include/uapi/rdma/rdma_user_cm.h 2018-06-11 10:31:44.742159108 -0700
-+++ iproute2-4.17.0/rdma/include/uapi/rdma/rdma_user_cm.h 2018-06-11 10:44:48.746145068 -0700
-@@ -34,9 +34,9 @@
- #ifndef RDMA_USER_CM_H
- #define RDMA_USER_CM_H
-
-+#include <netinet/in.h>
- #include <linux/types.h>
- #include <linux/socket.h>
--#include <linux/in6.h>
- #include <rdma/ib_user_verbs.h>
- #include <rdma/ib_user_sa.h>
-
-diff -Naur iproute2-4.17.0.orig/tc/f_flower.c iproute2-4.17.0/tc/f_flower.c
---- iproute2-4.17.0.orig/tc/f_flower.c 2018-06-11 10:31:44.746159108 -0700
-+++ iproute2-4.17.0/tc/f_flower.c 2018-06-11 10:38:29.389151861 -0700
-@@ -14,7 +14,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <net/if.h>
--#include <linux/if_arp.h>
-+#include <net/if_arp.h>
- #include <linux/if_ether.h>
- #include <linux/ip.h>
- #include <linux/tc_act/tc_vlan.h>
-diff -Naur iproute2-4.17.0.orig/tc/m_mirred.c iproute2-4.17.0/tc/m_mirred.c
---- iproute2-4.17.0.orig/tc/m_mirred.c 2018-06-11 10:31:44.745159108 -0700
-+++ iproute2-4.17.0/tc/m_mirred.c 2018-06-11 10:38:41.545151644 -0700
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/socket.h>
-+#include <net/if.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <string.h>
-diff -Naur iproute2-4.17.0.orig/tc/tc_class.c iproute2-4.17.0/tc/tc_class.c
---- iproute2-4.17.0.orig/tc/tc_class.c 2018-06-11 10:31:44.743159108 -0700
-+++ iproute2-4.17.0/tc/tc_class.c 2018-06-11 10:38:53.705151426 -0700
-@@ -15,6 +15,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/socket.h>
-+#include <net/if.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <string.h>
-diff -Naur iproute2-4.17.0.orig/tc/tc_filter.c iproute2-4.17.0/tc/tc_filter.c
---- iproute2-4.17.0.orig/tc/tc_filter.c 2018-06-11 10:31:44.743159108 -0700
-+++ iproute2-4.17.0/tc/tc_filter.c 2018-06-11 10:39:04.147151239 -0700
-@@ -15,6 +15,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/socket.h>
-+#include <net/if.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <string.h>
-diff -Naur iproute2-4.17.0.orig/tc/tc_qdisc.c iproute2-4.17.0/tc/tc_qdisc.c
---- iproute2-4.17.0.orig/tc/tc_qdisc.c 2018-06-11 10:31:44.743159108 -0700
-+++ iproute2-4.17.0/tc/tc_qdisc.c 2018-06-11 10:39:17.997150991 -0700
-@@ -15,6 +15,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/socket.h>
-+#include <net/if.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <string.h>
-diff -Naur iproute2-4.17.0.orig/tc/tc_util.h iproute2-4.17.0/tc/tc_util.h
---- iproute2-4.17.0.orig/tc/tc_util.h 2018-06-11 10:31:44.743159108 -0700
-+++ iproute2-4.17.0/tc/tc_util.h 2018-06-11 10:39:25.558150855 -0700
-@@ -4,7 +4,6 @@
-
- #define MAX_MSG 16384
- #include <limits.h>
--#include <linux/if.h>
-
- #include <linux/pkt_sched.h>
- #include <linux/pkt_cls.h>
diff --git a/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch
deleted file mode 100644
index 94df850..0000000
--- a/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
-a variable as well as modifying CFLAGS & LDLIBS.
-
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
-are still in place.
-
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
-are only passed when correctly needed.
-
-Prior Gentoo testcase for reproduction:
-USE=minimal ebuild ... compile.
-- Linking with libelf, libmnl & libcap based only on presence.
-- Links based on libselinux based only on presence.
-
-Closes: https://bugs.gentoo.org/643722
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
-Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
-Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
-
---- iproute2-4.20.0/bridge/Makefile
-+++ iproute2-4.20.0/bridge/Makefile
-@@ -2,6 +2,7 @@
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
-
- include ../config.mk
-+include ../config.include
-
- all: bridge
-
---- iproute2-4.20.0/config.include
-+++ iproute2-4.20.0/config.include
-@@ -0,0 +1,26 @@
-+# We can only modify CFLAGS/LDLIBS after all the config options are known.
-+ifeq ($(IP_CONFIG_SETNS),y)
-+ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
-+endif
-+ifeq ($(HAVE_ELF),y)
-+ CFLAGS += $(HAVE_ELF_CFLAGS)
-+ LDLIBS += $(HAVE_ELF_LDLIBS)
-+endif
-+ifeq ($(HAVE_SELINUX),y)
-+ CFLAGS += $(HAVE_SELINUX_CFLAGS)
-+ LDLIBS += $(HAVE_SELINUX_LDLIBS)
-+endif
-+ifeq ($(HAVE_MNL),y)
-+ CFLAGS += $(HAVE_MNL_CFLAGS)
-+ LDLIBS += $(HAVE_MNL_LDLIBS)
-+endif
-+ifeq ($(HAVE_CAP),y)
-+ CFLAGS += $(HAVE_CAP_CFLAGS)
-+ LDLIBS += $(HAVE_CAP_LDLIBS)
-+endif
-+
-+# Rules can only be declared after all variables in them are known.
-+%.o: %.c
-+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
-+
-+# vim: ft=make:
---- iproute2-4.20.0/configure
-+++ iproute2-4.20.0/configure
-@@ -188,7 +188,7 @@
- if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
- echo "IP_CONFIG_SETNS:=y" >>$CONFIG
- echo "yes"
-- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
-+ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
- else
- echo "no"
- fi
-@@ -231,8 +231,8 @@
- echo "HAVE_ELF:=y" >>$CONFIG
- echo "yes"
-
-- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-+ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-+ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
- else
- echo "no"
- fi
-@@ -245,8 +245,8 @@
- echo "HAVE_SELINUX:=y" >>$CONFIG
- echo "yes"
-
-- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
-- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
- else
- echo "no"
- fi
-@@ -258,8 +258,8 @@
- echo "HAVE_MNL:=y" >>$CONFIG
- echo "yes"
-
-- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
-+ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-+ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
- else
- echo "no"
- fi
-@@ -316,8 +316,8 @@
- echo "HAVE_CAP:=y" >>$CONFIG
- echo "yes"
-
-- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
-- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
-+ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
-+ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
- else
- echo "no"
- fi
-@@ -397,7 +397,3 @@
-
- echo -n "libcap support: "
- check_cap
--
--echo >> $CONFIG
--echo "%.o: %.c" >> $CONFIG
--echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
---- iproute2-4.20.0/devlink/Makefile
-+++ iproute2-4.20.0/devlink/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- TARGETS :=
-
---- iproute2-4.20.0/genl/Makefile
-+++ iproute2-4.20.0/genl/Makefile
-@@ -2,6 +2,7 @@
- GENLOBJ=genl.o
-
- include ../config.mk
-+include ../config.include
- SHARED_LIBS ?= y
-
- CFLAGS += -fno-strict-aliasing
---- iproute2-4.20.0/ip/Makefile
-+++ iproute2-4.20.0/ip/Makefile
-@@ -15,6 +15,7 @@
- RTMONOBJ=rtmon.o
-
- include ../config.mk
-+include ../config.include
-
- ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=ifcfg rtpr routel routef
---- iproute2-4.20.0/lib/Makefile
-+++ iproute2-4.20.0/lib/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- CFLAGS += -fPIC
-
---- iproute2-4.20.0/misc/Makefile
-+++ iproute2-4.20.0/misc/Makefile
-@@ -5,6 +5,7 @@
- TARGETS=ss nstat ifstat rtacct lnstat
-
- include ../config.mk
-+include ../config.include
-
- ifeq ($(HAVE_BERKELEY_DB),y)
- TARGETS += arpd
---- iproute2-4.20.0/netem/Makefile
-+++ iproute2-4.20.0/netem/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- DISTGEN = maketable normal pareto paretonormal
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
---- iproute2-4.20.0/rdma/Makefile
-+++ iproute2-4.20.0/rdma/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- TARGETS :=
-
---- iproute2-4.20.0/tc/Makefile
-+++ iproute2-4.20.0/tc/Makefile
-@@ -4,6 +4,7 @@
- emp_ematch.yacc.o emp_ematch.lex.o
-
- include ../config.mk
-+include ../config.include
-
- SHARED_LIBS ?= y
-
---- iproute2-4.20.0/tipc/Makefile
-+++ iproute2-4.20.0/tipc/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- TARGETS :=
-
diff --git a/sys-apps/iproute2/files/iproute2-4.20.0-limits.patch b/sys-apps/iproute2/files/iproute2-4.20.0-limits.patch
deleted file mode 100644
index f42ff0a..0000000
--- a/sys-apps/iproute2/files/iproute2-4.20.0-limits.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-XATTR_SIZE_MAX requires the usage of linux/limits.h; let's include it
-
-Signed-off-by: Hans Dedecker <dedeckeh@xxxxxxxxx>
----
- tc/f_flower.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tc/f_flower.c b/tc/f_flower.c
-index c5636667..9659e894 100644
---- a/tc/f_flower.c
-+++ b/tc/f_flower.c
-@@ -14,6 +14,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <net/if.h>
-+#include <linux/limits.h>
- #include <linux/if_arp.h>
- #include <linux/if_ether.h>
- #include <linux/ip.h>
---
-2.19.1
diff --git a/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch
deleted file mode 100644
index 31733e9..0000000
--- a/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- iproute2-4.20.0/ip/ipmonitor.c
-+++ iproute2-4.20.0/ip/ipmonitor.c
-@@ -118,7 +118,6 @@
-
- case RTM_NEWPREFIX:
- print_headers(fp, "[PREFIX]", ctrl);
-- print_prefix(n, arg);
- return 0;
-
- case RTM_NEWRULE:
---- iproute2-4.20.0/ip/iptunnel.c
-+++ iproute2-4.20.0/ip/iptunnel.c
-@@ -549,13 +549,6 @@
- break;
- case AF_INET:
- break;
-- /*
-- * This is silly enough but we have no easy way to make it
-- * protocol-independent because of unarranged structure between
-- * IPv4 and IPv6.
-- */
-- case AF_INET6:
-- return do_ip6tunnel(argc, argv);
- default:
- fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
- exit(-1);
---- iproute2-4.20.0/ip/Makefile
-+++ iproute2-4.20.0/ip/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
-- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
-+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
- ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \
- iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o iplink_vxcan.o \
- iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \
diff --git a/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch b/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch
deleted file mode 100644
index 3fdca40..0000000
--- a/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 202d79fcf4e184818bd074f8c06e94e700670898 Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Tue, 11 Jun 2019 01:48:01 -0500
-Subject: [PATCH] including sysinfo.h from kernel.h makes no sense whatsoever,
- but removing it breaks glibc's userspace header, which includes kernel.h
- instead of sysinfo.h from their sys/sysinfo.h. this seems to be a historical
- mistake. on musl, including any header that uses kernel.h directly or
- indirectly plus sys/sysinfo.h will produce a compile error due to
- redefinition of struct sysinfo. so for now, only include it on glibc in order
- not to break their headers.
-
-Signed-off-by: Jory Pratt <anarchy@gentoo.org>
----
- include/uapi/linux/kernel.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
-index d99ffa1..f917115 100644
---- a/include/uapi/linux/kernel.h
-+++ b/include/uapi/linux/kernel.h
-@@ -2,7 +2,9 @@
- #ifndef _LINUX_KERNEL_H
- #define _LINUX_KERNEL_H
-
-+#ifdef __GLIBC__
- #include <linux/sysinfo.h>
-+#endif
-
- /*
- * 'kernel.h' contains some often-used function prototypes etc
---
-2.22.0
-
diff --git a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
deleted file mode 100644
index 5c01038..0000000
--- a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-r3
-else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
- !net-misc/arpd
- !minimal? ( net-libs/libmnl )
- caps? ( sys-libs/libcap )
- elf? ( virtual/libelf )
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- berkdb? ( sys-libs/db:= )
- atm? ( net-dialup/linux-atm )
- selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
- ${RDEPEND}
- app-arch/xz-utils
- iptables? ( virtual/pkgconfig )
- >=sys-devel/bison-2.4
- sys-devel/flex
- >=sys-kernel/linux-headers-3.16
- elibc_glibc? ( >=sys-libs/glibc-2.7 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722
- "${FILESDIR}"/${P}-musl.patch
-)
-
-src_prepare() {
- if ! use ipv6 ; then
- PATCHES+=(
- "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
- )
- fi
-
- default
-
- sed -i \
- -e '/^CC :\?=/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
- Makefile || die
-
- # Use /run instead of /var/run.
- sed -i \
- -e 's:/var/run:/run:g' \
- include/namespace.h \
- man/man8/ip-netns.8 || die
-
- # build against system headers
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
- local setns
- pushd "${T}" >/dev/null
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'int main(){return 0;}' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- # run "configure" script first which will create "config.mk"...
- econf
-
- # ...now switch on/off requested features via USE flags
- # this is only useful if the test did not set other things, per bug #643722
- cat <<-EOF >> config.mk
- TC_CONFIG_ATM := $(usex atm y n)
- TC_CONFIG_XT := $(usex iptables y n)
- TC_CONFIG_NO_XT := $(usex iptables n y)
- # We've locked in recent enough kernel headers #549948
- TC_CONFIG_IPSET := y
- HAVE_BERKELEY_DB := $(usex berkdb y n)
- HAVE_CAP := $(usex caps y n)
- HAVE_MNL := $(usex minimal n y)
- HAVE_ELF := $(usex elf y n)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, #144265 #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
- EOF
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX%/}"/$(get_libdir) \
- SBINDIR="${EPREFIX%/}"/sbin \
- CONFDIR="${EPREFIX%/}"/etc/iproute2 \
- DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX%/}"/usr/share/man \
- ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
- install
-
- dodir /bin
- mv "${ED%/}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- dodir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
- fi
-}
diff --git a/sys-apps/iproute2/iproute2-4.17.0.ebuild b/sys-apps/iproute2/iproute2-4.17.0.ebuild
deleted file mode 100644
index 7c90076..0000000
--- a/sys-apps/iproute2/iproute2-4.17.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-r3
-else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
- !net-misc/arpd
- !minimal? ( net-libs/libmnl )
- elf? ( virtual/libelf )
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- berkdb? ( sys-libs/db:= )
- atm? ( net-dialup/linux-atm )
- selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
- ${RDEPEND}
- app-arch/xz-utils
- iptables? ( virtual/pkgconfig )
- >=sys-devel/bison-2.4
- sys-devel/flex
- >=sys-kernel/linux-headers-3.16
- elibc_glibc? ( >=sys-libs/glibc-2.7 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722
- "${FILESDIR}"/${P}-musl.patch
-)
-
-src_prepare() {
- if ! use ipv6 ; then
- PATCHES+=(
- "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
- )
- fi
-
- default
-
- sed -i \
- -e '/^CC :\?=/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
- Makefile || die
-
- # Use /run instead of /var/run.
- sed -i \
- -e 's:/var/run:/run:g' \
- include/namespace.h \
- man/man8/ip-netns.8 || die
-
- # build against system headers
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
- local setns
- pushd "${T}" >/dev/null
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'int main(){return 0;}' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- # run "configure" script first which will create "config.mk"...
- econf
-
- # ...now switch on/off requested features via USE flags
- # this is only useful if the test did not set other things, per bug #643722
- cat <<-EOF >> config.mk
- TC_CONFIG_ATM := $(usex atm y n)
- TC_CONFIG_XT := $(usex iptables y n)
- TC_CONFIG_NO_XT := $(usex iptables n y)
- # We've locked in recent enough kernel headers #549948
- TC_CONFIG_IPSET := y
- HAVE_BERKELEY_DB := $(usex berkdb y n)
- HAVE_MNL := $(usex minimal n y)
- HAVE_ELF := $(usex elf y n)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, #144265 #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
- EOF
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX%/}"/$(get_libdir) \
- SBINDIR="${EPREFIX%/}"/sbin \
- CONFDIR="${EPREFIX%/}"/etc/iproute2 \
- DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX%/}"/usr/share/man \
- ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
- install
-
- dodir /bin
- mv "${ED%/}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- dodir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
- fi
-}
diff --git a/sys-apps/iproute2/iproute2-4.20.0.ebuild b/sys-apps/iproute2/iproute2-4.20.0.ebuild
deleted file mode 100644
index 5b654d9..0000000
--- a/sys-apps/iproute2/iproute2-4.20.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-r3
-else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
- !net-misc/arpd
- dev-libs/libbsd
- !minimal? ( net-libs/libmnl )
- caps? ( sys-libs/libcap )
- elf? ( virtual/libelf )
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- berkdb? ( sys-libs/db:= )
- atm? ( net-dialup/linux-atm )
- selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
- ${RDEPEND}
- app-arch/xz-utils
- iptables? ( virtual/pkgconfig )
- >=sys-devel/bison-2.4
- sys-devel/flex
- >=sys-kernel/linux-headers-3.16
- virtual/pkgconfig
- elibc_glibc? ( >=sys-libs/glibc-2.7 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
- "${FILESDIR}"/${PN}-4.20.0-limits.patch
-)
-
-src_prepare() {
- if ! use ipv6 ; then
- PATCHES+=(
- "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
- )
- fi
-
- default
-
- sed -i \
- -e '/^CC :\?=/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
- Makefile || die
-
- # Use /run instead of /var/run.
- sed -i \
- -e 's:/var/run:/run:g' \
- include/namespace.h \
- man/man8/ip-netns.8 || die
-
- # build against system headers
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
- local setns
- pushd "${T}" >/dev/null
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'int main(){return 0;}' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- # run "configure" script first which will create "config.mk"...
- econf
-
- # ...now switch on/off requested features via USE flags
- # this is only useful if the test did not set other things, per bug #643722
- cat <<-EOF >> config.mk
- TC_CONFIG_ATM := $(usex atm y n)
- TC_CONFIG_XT := $(usex iptables y n)
- TC_CONFIG_NO_XT := $(usex iptables n y)
- # We've locked in recent enough kernel headers #549948
- TC_CONFIG_IPSET := y
- HAVE_BERKELEY_DB := $(usex berkdb y n)
- HAVE_CAP := $(usex caps y n)
- HAVE_MNL := $(usex minimal n y)
- HAVE_ELF := $(usex elf y n)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, #144265 #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
- EOF
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX%/}"/$(get_libdir) \
- SBINDIR="${EPREFIX%/}"/sbin \
- CONFDIR="${EPREFIX%/}"/etc/iproute2 \
- DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX%/}"/usr/share/man \
- ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
- install
-
- dodir /bin
- mv "${ED%/}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- dodir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
- fi
-}
diff --git a/sys-apps/iproute2/iproute2-5.2.0.ebuild b/sys-apps/iproute2/iproute2-5.2.0.ebuild
deleted file mode 100644
index f77a9c4..0000000
--- a/sys-apps/iproute2/iproute2-5.2.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-r3
-else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
- !net-misc/arpd
- dev-libs/libbsd
- !minimal? ( net-libs/libmnl )
- caps? ( sys-libs/libcap )
- elf? ( virtual/libelf )
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- berkdb? ( sys-libs/db:= )
- atm? ( net-dialup/linux-atm )
- selinux? ( sys-libs/libselinux )
- elibc_musl? ( sys-libs/queue-standalone )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
- ${RDEPEND}
- >=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
- app-arch/xz-utils
- >=sys-devel/bison-2.4
- sys-devel/flex
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
- "${FILESDIR}"/${PN}-5.1.0-portability.patch
-)
-
-src_prepare() {
- if ! use ipv6 ; then
- PATCHES+=(
- "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
- )
- fi
-
- default
-
- # echo -n is not POSIX compliant
- sed 's@echo -n@printf@' -i configure || die
-
- sed -i \
- -e '/^CC :\?=/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
- Makefile || die
-
- # Use /run instead of /var/run.
- sed -i \
- -e 's:/var/run:/run:g' \
- include/namespace.h \
- man/man8/ip-netns.8 || die
-
- # build against system headers
- rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
- if use minimal ; then
- sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
- fi
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
- local setns
- pushd "${T}" >/dev/null
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'int main(){return 0;}' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- # run "configure" script first which will create "config.mk"...
- econf
-
- # ...now switch on/off requested features via USE flags
- # this is only useful if the test did not set other things, per bug #643722
- cat <<-EOF >> config.mk
- TC_CONFIG_ATM := $(usex atm y n)
- TC_CONFIG_XT := $(usex iptables y n)
- TC_CONFIG_NO_XT := $(usex iptables n y)
- # We've locked in recent enough kernel headers #549948
- TC_CONFIG_IPSET := y
- HAVE_BERKELEY_DB := $(usex berkdb y n)
- HAVE_CAP := $(usex caps y n)
- HAVE_MNL := $(usex minimal n y)
- HAVE_ELF := $(usex elf y n)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, #144265 #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
- EOF
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX}"/$(get_libdir) \
- SBINDIR="${EPREFIX}"/sbin \
- CONFDIR="${EPREFIX}"/etc/iproute2 \
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX}"/usr/share/man \
- ARPDDIR="${EPREFIX}"/var/lib/arpd \
- install
-
- dodir /bin
- mv "${ED}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- keepdir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
- fi
-}
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
deleted file mode 100644
index ad652ef..0000000
--- a/sys-apps/iproute2/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<use>
- <flag name="berkdb">build programs that use berkdb (just arpd)</flag>
- <flag name="elf">support loading eBPF programs from ELFs (e.g. LLVM's eBPF backend)</flag>
- <flag name="iptables">include support for iptables filtering</flag>
- <flag name="minimal">only install ip and tc programs, without eBPF support</flag>
-</use>
-</pkgmetadata>