commit: 2c8e69376f26fe6d3502845157dc54469b712f0a Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Jan 7 15:10:30 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Jan 21 11:37:42 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8e6937
sys-apps/iproute2: remove unused patches Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> .../files/iproute2-4.14.1-configure-nomagic.patch | 196 --------------------- .../files/iproute2-4.14.1-posix-shell.patch | 65 ------- .../iproute2/files/iproute2-4.2.0-no-ipv6.patch | 37 ---- 3 files changed, 298 deletions(-) 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 919249b8392..00000000000 --- 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 <robb...@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-posix-shell.patch b/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch deleted file mode 100644 index e5efc9068ce..00000000000 --- 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 <vap...@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 <per...@chromium.org> -Signed-off-by: Mike Frysinger <vap...@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.2.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch deleted file mode 100644 index b29e1aa3e11..00000000000 --- a/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- iproute2-4.2.0/ip/ipmonitor.c -+++ iproute2-4.2.0/ip/ipmonitor.c -@@ -115,7 +115,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.2.0/ip/iptunnel.c -+++ iproute2-4.2.0/ip/iptunnel.c -@@ -637,13 +637,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.2.0/ip/Makefile -+++ iproute2-4.2.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_vlan.o link_veth.o link_gre.o iplink_can.o \ - iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o link_vti6.o \
