diff options
Diffstat (limited to 'sys-apps/iproute2/files')
6 files changed, 0 insertions, 956 deletions
diff --git a/sys-apps/iproute2/files/iproute2-4.14.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.14.0-musl.patch deleted file mode 100644 index 5efd9480..00000000 --- a/sys-apps/iproute2/files/iproute2-4.14.0-musl.patch +++ /dev/null @@ -1,214 +0,0 @@ ---- iproute2-4.14.0.orig/include/uapi/linux/if_ether.h -+++ iproute2-4.14.0/include/uapi/linux/if_ether.h -@@ -22,6 +22,7 @@ - #define _LINUX_IF_ETHER_H - - #include <linux/types.h> -+#include <linux/libc-compat.h> - - /* - * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -@@ -142,11 +143,13 @@ - * This is an Ethernet frame header. - */ - -+#if __UAPI_DEF_ETHHDR - struct ethhdr { - unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ - unsigned char h_source[ETH_ALEN]; /* source ether addr */ - __be16 h_proto; /* packet type ID field */ - } __attribute__((packed)); -+#endif - - - #endif /* _LINUX_IF_ETHER_H */ ---- iproute2-4.14.0.orig/include/uapi/linux/if_tunnel.h -+++ iproute2-4.14.0/include/uapi/linux/if_tunnel.h -@@ -2,7 +2,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> ---- iproute2-4.14.0.orig/include/uapi/linux/ip6_tunnel.h -+++ iproute2-4.14.0/include/uapi/linux/ip6_tunnel.h -@@ -2,7 +2,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 ---- iproute2-4.14.0.orig/include/uapi/linux/kernel.h -+++ iproute2-4.14.0/include/uapi/linux/kernel.h -@@ -1,7 +1,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 ---- iproute2-4.14.0.orig/include/uapi/linux/libc-compat.h -+++ iproute2-4.14.0/include/uapi/linux/libc-compat.h -@@ -48,47 +48,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 --/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+#if !defined(__GLIBC__) -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 -+#else - #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 */ -+/* If libc 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 -@@ -98,15 +108,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 -@@ -117,7 +119,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 -@@ -127,7 +129,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 -@@ -168,18 +170,20 @@ - /* If we did not see any headers from any supported C libraries, - * or we are being included in the kernel, then define everything - * that we need. */ --#else /* !defined(__GLIBC__) */ -+#else /* defined(__KERNEL__) */ - - /* Definitions for if.h */ - #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 */ -+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 - -+/* Definitions for if/ether.h */ -+#define __UAPI_DEF_ETHHDR 1 -+ - /* Definitions for in.h */ - #define __UAPI_DEF_IN_ADDR 1 - #define __UAPI_DEF_IN_IPPROTO 1 -@@ -208,6 +212,6 @@ - /* Definitions for xattr.h */ - #define __UAPI_DEF_XATTR 1 - --#endif /* __GLIBC__ */ -+#endif /* defined(__KERNEL__) */ - - #endif /* _LIBC_COMPAT_H */ ---- iproute2-4.14.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h -+++ iproute2-4.14.0/include/uapi/linux/netfilter_ipv4/ip_tables.h -@@ -17,7 +17,6 @@ - - #include <linux/types.h> - --#include <linux/if.h> - #include <linux/netfilter_ipv4.h> - - #include <linux/netfilter/x_tables.h> ---- iproute2-4.14.0.orig/tc/f_flower.c -+++ iproute2-4.14.0/tc/f_flower.c -@@ -15,7 +15,7 @@ - #include <syslog.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 --git a/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch deleted file mode 100644 index 919249b8..00000000 --- a/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch +++ /dev/null @@ -1,196 +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> - -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/bridge/Makefile iproute2-4.14.1/bridge/Makefile ---- iproute2-4.14.1.orig/bridge/Makefile 2017-11-13 10:09:57.000000000 -0800 -+++ iproute2-4.14.1/bridge/Makefile 2018-01-07 14:24:23.350726423 -0800 -@@ -1,6 +1,7 @@ - BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o - - include ../config.mk -+include ../config.include - - all: bridge - -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/config.include iproute2-4.14.1/config.include ---- iproute2-4.14.1.orig/config.include 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2-4.14.1/config.include 2018-01-07 14:25:34.406126921 -0800 -@@ -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: -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/configure iproute2-4.14.1/configure ---- iproute2-4.14.1.orig/configure 2017-11-13 10:09:57.000000000 -0800 -+++ iproute2-4.14.1/configure 2018-01-07 14:25:49.242419367 -0800 -@@ -223,7 +223,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 -@@ -268,8 +268,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 -@@ -283,8 +283,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 -@@ -297,8 +297,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 -@@ -425,7 +425,3 @@ - echo -n "docs:" - check_docs - echo -- --echo >> $CONFIG --echo "%.o: %.c" >> $CONFIG --echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/devlink/Makefile iproute2-4.14.1/devlink/Makefile ---- iproute2-4.14.1.orig/devlink/Makefile 2017-11-13 10:09:57.000000000 -0800 -+++ iproute2-4.14.1/devlink/Makefile 2018-01-07 14:24:23.351726442 -0800 -@@ -1,4 +1,5 @@ - include ../config.mk -+include ../config.include - - ifeq ($(HAVE_MNL),y) - -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/genl/Makefile iproute2-4.14.1/genl/Makefile ---- iproute2-4.14.1.orig/genl/Makefile 2017-11-13 10:09:57.000000000 -0800 -+++ iproute2-4.14.1/genl/Makefile 2018-01-07 14:24:23.351726442 -0800 -@@ -1,6 +1,7 @@ - GENLOBJ=genl.o - - include ../config.mk -+include ../config.include - SHARED_LIBS ?= y - - CFLAGS += -fno-strict-aliasing -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/ip/Makefile iproute2-4.14.1/ip/Makefile ---- iproute2-4.14.1.orig/ip/Makefile 2017-11-13 10:09:57.000000000 -0800 -+++ iproute2-4.14.1/ip/Makefile 2018-01-07 14:24:23.351726442 -0800 -@@ -14,6 +14,7 @@ - RTMONOBJ=rtmon.o - - include ../config.mk -+include ../config.include - - ALLOBJ=$(IPOBJ) $(RTMONOBJ) - SCRIPTS=ifcfg rtpr routel routef -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/lib/Makefile iproute2-4.14.1/lib/Makefile ---- iproute2-4.14.1.orig/lib/Makefile 2017-11-13 10:09:57.000000000 -0800 -+++ iproute2-4.14.1/lib/Makefile 2018-01-07 14:24:23.351726442 -0800 -@@ -1,4 +1,5 @@ - include ../config.mk -+include ../config.include - - CFLAGS += -fPIC - -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/misc/Makefile iproute2-4.14.1/misc/Makefile ---- iproute2-4.14.1.orig/misc/Makefile 2017-11-13 10:09:57.000000000 -0800 -+++ iproute2-4.14.1/misc/Makefile 2018-01-07 14:24:23.351726442 -0800 -@@ -4,6 +4,7 @@ - TARGETS=ss nstat ifstat rtacct lnstat - - include ../config.mk -+include ../config.include - - ifeq ($(HAVE_BERKELEY_DB),y) - TARGETS += arpd -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/netem/Makefile iproute2-4.14.1/netem/Makefile ---- iproute2-4.14.1.orig/netem/Makefile 2017-11-13 10:09:57.000000000 -0800 -+++ iproute2-4.14.1/netem/Makefile 2018-01-07 14:24:23.351726442 -0800 -@@ -1,4 +1,5 @@ - include ../config.mk -+include ../config.include - - DISTGEN = maketable normal pareto paretonormal - DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/rdma/Makefile iproute2-4.14.1/rdma/Makefile ---- iproute2-4.14.1.orig/rdma/Makefile 2017-11-13 10:09:57.000000000 -0800 -+++ iproute2-4.14.1/rdma/Makefile 2018-01-07 14:24:23.352726462 -0800 -@@ -1,4 +1,5 @@ - include ../config.mk -+include ../config.include - - ifeq ($(HAVE_MNL),y) - -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tc/Makefile iproute2-4.14.1/tc/Makefile ---- iproute2-4.14.1.orig/tc/Makefile 2017-11-13 10:09:57.000000000 -0800 -+++ iproute2-4.14.1/tc/Makefile 2018-01-07 14:24:23.352726462 -0800 -@@ -3,6 +3,7 @@ - emp_ematch.yacc.o emp_ematch.lex.o - - include ../config.mk -+include ../config.include - - SHARED_LIBS ?= y - -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tipc/Makefile iproute2-4.14.1/tipc/Makefile ---- iproute2-4.14.1.orig/tipc/Makefile 2017-11-13 10:09:57.000000000 -0800 -+++ iproute2-4.14.1/tipc/Makefile 2018-01-07 14:24:23.352726462 -0800 -@@ -1,4 +1,5 @@ - include ../config.mk -+include ../config.include - - ifeq ($(HAVE_MNL),y) - diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch b/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch deleted file mode 100644 index a8b7aaa9..00000000 --- a/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch +++ /dev/null @@ -1,222 +0,0 @@ -From 3572e01a090a298e2f4c4f796bad6639b652e031 Mon Sep 17 00:00:00 2001 -From: Michal Privoznik <mprivozn@redhat.com> -Date: Fri, 8 Dec 2017 11:18:07 +0100 -Subject: tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() - -Not all callers want parse_action_control*() to advance the -arguments. For instance act_parse_police() does the argument -advancing itself. - -Fixes: e67aba559581 ("tc: actions: add helpers to parse and print control actions") -Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---- - tc/m_bpf.c | 1 + - tc/m_connmark.c | 1 + - tc/m_csum.c | 1 + - tc/m_gact.c | 10 +++++----- - tc/m_ife.c | 1 + - tc/m_mirred.c | 4 +++- - tc/m_nat.c | 1 + - tc/m_pedit.c | 1 + - tc/m_sample.c | 1 + - tc/m_skbedit.c | 1 + - tc/m_skbmod.c | 1 + - tc/m_tunnel_key.c | 1 + - tc/m_vlan.c | 1 + - tc/tc_util.c | 1 - - 14 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/tc/m_bpf.c b/tc/m_bpf.c -index 1c1f71c..576f69c 100644 ---- a/tc/m_bpf.c -+++ b/tc/m_bpf.c -@@ -129,6 +129,7 @@ opt_bpf: - - parse_action_control_dflt(&argc, &argv, &parm.action, - false, TC_ACT_PIPE); -+ NEXT_ARG_FWD(); - - if (argc) { - if (matches(*argv, "index") == 0) { -diff --git a/tc/m_connmark.c b/tc/m_connmark.c -index 37d7185..47c7a8c 100644 ---- a/tc/m_connmark.c -+++ b/tc/m_connmark.c -@@ -82,6 +82,7 @@ parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, - } - - parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_PIPE); -+ NEXT_ARG_FWD(); - - if (argc) { - if (matches(*argv, "index") == 0) { -diff --git a/tc/m_csum.c b/tc/m_csum.c -index 7b15673..e1352c0 100644 ---- a/tc/m_csum.c -+++ b/tc/m_csum.c -@@ -124,6 +124,7 @@ parse_csum(struct action_util *a, int *argc_p, - } - - parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK); -+ NEXT_ARG_FWD(); - - if (argc) { - if (matches(*argv, "index") == 0) { -diff --git a/tc/m_gact.c b/tc/m_gact.c -index e7d91da..b30b042 100644 ---- a/tc/m_gact.c -+++ b/tc/m_gact.c -@@ -87,14 +87,13 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p, - if (argc < 0) - return -1; - -- -- if (matches(*argv, "gact") == 0) { -- argc--; -- argv++; -- } else if (parse_action_control(&argc, &argv, &p.action, false) == -1) { -+ if (matches(*argv, "gact") != 0 && -+ parse_action_control(&argc, &argv, &p.action, false) == -1) { - usage(); /* does not return */ - } - -+ NEXT_ARG_FWD(); -+ - #ifdef CONFIG_GACT_PROB - if (argc > 0) { - if (matches(*argv, "random") == 0) { -@@ -114,6 +113,7 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p, - if (parse_action_control(&argc, &argv, - &pp.paction, false) == -1) - usage(); -+ NEXT_ARG_FWD(); - if (get_u16(&pp.pval, *argv, 10)) { - fprintf(stderr, - "Illegal probability val 0x%x\n", -diff --git a/tc/m_ife.c b/tc/m_ife.c -index 205efc9..4647f6a 100644 ---- a/tc/m_ife.c -+++ b/tc/m_ife.c -@@ -159,6 +159,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p, - - parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_mirred.c b/tc/m_mirred.c -index 3870d3a..aa7ce6d 100644 ---- a/tc/m_mirred.c -+++ b/tc/m_mirred.c -@@ -202,8 +202,10 @@ parse_direction(struct action_util *a, int *argc_p, char ***argv_p, - } - - -- if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR) -+ if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR) { - parse_action_control(&argc, &argv, &p.action, false); -+ NEXT_ARG_FWD(); -+ } - - if (argc) { - if (iok && matches(*argv, "index") == 0) { -diff --git a/tc/m_nat.c b/tc/m_nat.c -index 1e4ff51..f5de4d4 100644 ---- a/tc/m_nat.c -+++ b/tc/m_nat.c -@@ -116,6 +116,7 @@ parse_nat(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, struct - - parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_pedit.c b/tc/m_pedit.c -index 26549ee..dc57f14 100644 ---- a/tc/m_pedit.c -+++ b/tc/m_pedit.c -@@ -672,6 +672,7 @@ int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, - - parse_action_control_dflt(&argc, &argv, &sel.sel.action, false, TC_ACT_OK); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_sample.c b/tc/m_sample.c -index ff5ee6b..31774c0 100644 ---- a/tc/m_sample.c -+++ b/tc/m_sample.c -@@ -100,6 +100,7 @@ static int parse_sample(struct action_util *a, int *argc_p, char ***argv_p, - - parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c -index aa374fc..c41a7bb 100644 ---- a/tc/m_skbedit.c -+++ b/tc/m_skbedit.c -@@ -123,6 +123,7 @@ parse_skbedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, - parse_action_control_dflt(&argc, &argv, &sel.action, - false, TC_ACT_PIPE); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_skbmod.c b/tc/m_skbmod.c -index 561b73f..bc268df 100644 ---- a/tc/m_skbmod.c -+++ b/tc/m_skbmod.c -@@ -124,6 +124,7 @@ static int parse_skbmod(struct action_util *a, int *argc_p, char ***argv_p, - - parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c -index 1cdd035..2dc9187 100644 ---- a/tc/m_tunnel_key.c -+++ b/tc/m_tunnel_key.c -@@ -175,6 +175,7 @@ static int parse_tunnel_key(struct action_util *a, int *argc_p, char ***argv_p, - parse_action_control_dflt(&argc, &argv, &parm.action, - false, TC_ACT_PIPE); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_vlan.c b/tc/m_vlan.c -index 161759f..edae0d1 100644 ---- a/tc/m_vlan.c -+++ b/tc/m_vlan.c -@@ -131,6 +131,7 @@ static int parse_vlan(struct action_util *a, int *argc_p, char ***argv_p, - parse_action_control_dflt(&argc, &argv, &parm.action, - false, TC_ACT_PIPE); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/tc_util.c b/tc/tc_util.c -index 1887905..ee9a70a 100644 ---- a/tc/tc_util.c -+++ b/tc/tc_util.c -@@ -586,7 +586,6 @@ static int __parse_action_control(int *argc_p, char ***argv_p, int *result_p, - } - result |= jump_cnt; - } -- NEXT_ARG_FWD(); - *argc_p = argc; - *argv_p = argv; - *result_p = result; --- -cgit v1.1 - diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch b/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch deleted file mode 100644 index e5efc906..00000000 --- a/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch +++ /dev/null @@ -1,65 +0,0 @@ -https://marc.info/?l=linux-netdev&m=151554000532498&w=2 - -From aec69bbc285e5498add5384b6018564355594233 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@chromium.org> -Date: Tue, 9 Jan 2018 18:16:53 -0500 -Subject: [PATCH iproute2] ifcfg/rtpr: convert to POSIX shell - -These files are already mostly written in POSIX shell, so convert their -shebangs to /bin/sh and tweak the few bashisms in here. - -URL: https://crbug.com/756559 -Reported-by: Pat Erley <perley@chromium.org> -Signed-off-by: Mike Frysinger <vapier@chromium.org> ---- - ip/ifcfg | 12 ++++++------ - ip/rtpr | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/ip/ifcfg b/ip/ifcfg -index 851b9215ab63..5b34decd4480 100644 ---- a/ip/ifcfg -+++ b/ip/ifcfg -@@ -1,3 +1,3 @@ --#! /bin/bash -+#! /bin/sh - - CheckForwarding () { -@@ -7,7 +7,7 @@ CheckForwarding () { - fwd=0 - if [ -d $sbase ]; then - for dir in $sbase/*/forwarding; do -- fwd=$[$fwd + `cat $dir`] -+ fwd=$(( fwd + $(cat "$dir") )) - done - else - fwd=2 -@@ -128,12 +128,12 @@ fi - arping -q -A -c 1 -I $dev $ipaddr - noarp=$? - ( sleep 2 ; -- arping -q -U -c 1 -I $dev $ipaddr ) >& /dev/null </dev/null & -+ arping -q -U -c 1 -I $dev $ipaddr ) >/dev/null 2>&1 </dev/null & - --ip route add unreachable 224.0.0.0/24 >& /dev/null --ip route add unreachable 255.255.255.255 >& /dev/null -+ip route add unreachable 224.0.0.0/24 >/dev/null 2>&1 -+ip route add unreachable 255.255.255.255 >/dev/null 2>&1 - if [ "`ip link ls $dev | grep -c MULTICAST`" -ge 1 ]; then -- ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null -+ ip route add 224.0.0.0/4 dev $dev scope global >/dev/null 2>&1 - fi - - if [ $fwd -eq 0 ]; then -diff --git a/ip/rtpr b/ip/rtpr -index 192a476f817e..7e48674bcf53 100644 ---- a/ip/rtpr -+++ b/ip/rtpr -@@ -1,3 +1,3 @@ --#! /bin/bash -+#! /bin/sh - - exec tr "[\\\\]" "[ --- -2.15.1 - diff --git a/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch deleted file mode 100644 index 8c4a924e..00000000 --- a/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch +++ /dev/null @@ -1,234 +0,0 @@ -diff -Naur iproute2-4.15.0.orig/include/uapi/linux/if_tunnel.h iproute2-4.15.0/include/uapi/linux/if_tunnel.h ---- iproute2-4.15.0.orig/include/uapi/linux/if_tunnel.h 2018-01-30 12:22:46.392424243 -0800 -+++ iproute2-4.15.0/include/uapi/linux/if_tunnel.h 2018-01-30 12:23:57.131422976 -0800 -@@ -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.15.0.orig/include/uapi/linux/ip6_tunnel.h iproute2-4.15.0/include/uapi/linux/ip6_tunnel.h ---- iproute2-4.15.0.orig/include/uapi/linux/ip6_tunnel.h 2018-01-30 12:22:46.393424243 -0800 -+++ iproute2-4.15.0/include/uapi/linux/ip6_tunnel.h 2018-01-30 12:24:05.957422818 -0800 -@@ -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.15.0.orig/include/uapi/linux/kernel.h iproute2-4.15.0/include/uapi/linux/kernel.h ---- iproute2-4.15.0.orig/include/uapi/linux/kernel.h 2018-01-30 12:22:46.393424243 -0800 -+++ iproute2-4.15.0/include/uapi/linux/kernel.h 2018-01-30 12:24:21.576422539 -0800 -@@ -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.15.0.orig/include/uapi/linux/libc-compat.h iproute2-4.15.0/include/uapi/linux/libc-compat.h ---- iproute2-4.15.0.orig/include/uapi/linux/libc-compat.h 2018-01-30 12:22:46.393424243 -0800 -+++ iproute2-4.15.0/include/uapi/linux/libc-compat.h 2018-01-30 12:33:58.575412206 -0800 -@@ -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 -@@ -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 -@@ -262,7 +263,7 @@ - #define __UAPI_DEF_XATTR 1 - #endif - --#endif /* __GLIBC__ */ -+#endif /* defined(__KERNEL__) */ - - /* Definitions for if_ether.h */ - /* allow libcs like musl to deactivate this, glibc does not implement this. */ -diff -Naur iproute2-4.15.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h iproute2-4.15.0/include/uapi/linux/netfilter_ipv4/ip_tables.h ---- iproute2-4.15.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h 2018-01-30 12:22:46.394424243 -0800 -+++ iproute2-4.15.0/include/uapi/linux/netfilter_ipv4/ip_tables.h 2018-01-30 12:34:19.157411837 -0800 -@@ -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.15.0.orig/tc/f_flower.c iproute2-4.15.0/tc/f_flower.c ---- iproute2-4.15.0.orig/tc/f_flower.c 2018-01-30 12:22:46.367424244 -0800 -+++ iproute2-4.15.0/tc/f_flower.c 2018-01-30 12:34:36.182411532 -0800 -@@ -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.15.0.orig/tc/m_mirred.c iproute2-4.15.0/tc/m_mirred.c ---- iproute2-4.15.0.orig/tc/m_mirred.c 2018-01-30 12:22:46.377424243 -0800 -+++ iproute2-4.15.0/tc/m_mirred.c 2018-01-30 12:57:12.620387241 -0800 -@@ -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.15.0.orig/tc/tc_class.c iproute2-4.15.0/tc/tc_class.c ---- iproute2-4.15.0.orig/tc/tc_class.c 2018-01-30 12:22:46.369424244 -0800 -+++ iproute2-4.15.0/tc/tc_class.c 2018-01-30 12:54:53.420389734 -0800 -@@ -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.15.0.orig/tc/tc_filter.c iproute2-4.15.0/tc/tc_filter.c ---- iproute2-4.15.0.orig/tc/tc_filter.c 2018-01-30 12:22:46.368424244 -0800 -+++ iproute2-4.15.0/tc/tc_filter.c 2018-01-30 12:56:02.186388502 -0800 -@@ -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.15.0.orig/tc/tc_qdisc.c iproute2-4.15.0/tc/tc_qdisc.c ---- iproute2-4.15.0.orig/tc/tc_qdisc.c 2018-01-30 12:22:46.368424244 -0800 -+++ iproute2-4.15.0/tc/tc_qdisc.c 2018-01-30 12:53:37.801391088 -0800 -@@ -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.15.0.orig/tc/tc_util.h iproute2-4.15.0/tc/tc_util.h ---- iproute2-4.15.0.orig/tc/tc_util.h 2018-01-30 12:22:46.367424244 -0800 -+++ iproute2-4.15.0/tc/tc_util.h 2018-01-30 12:51:24.463393476 -0800 -@@ -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.16.0-keep-family.patch b/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch deleted file mode 100644 index d2940c9e..00000000 --- a/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch +++ /dev/null @@ -1,25 +0,0 @@ -Bug: https://bugs.gentoo.org/652986 - -https://marc.info/?l=linux-netdev&m=152363743818340&w=2 - ---- a/lib/utils.c -+++ b/lib/utils.c -@@ -568,7 +568,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family) - if (strcmp(name, "default") == 0) { - if ((family == AF_DECnet) || (family == AF_MPLS)) - return -1; -- addr->family = (family != AF_UNSPEC) ? family : AF_INET; -+ addr->family = family; - addr->bytelen = af_byte_len(addr->family); - addr->bitlen = -2; - addr->flags |= PREFIXLEN_SPECIFIED; -@@ -579,7 +579,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family) - strcmp(name, "any") == 0) { - if ((family == AF_DECnet) || (family == AF_MPLS)) - return -1; -- addr->family = AF_UNSPEC; -+ addr->family = family; - addr->bytelen = 0; - addr->bitlen = -2; - return 0; --- |