Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/
Date: Mon, 21 Jan 2019 11:38:05
Message-Id: 1548070662.2c8e69376f26fe6d3502845157dc54469b712f0a.polynomial-c@gentoo
1 commit: 2c8e69376f26fe6d3502845157dc54469b712f0a
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 7 15:10:30 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 21 11:37:42 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8e6937
7
8 sys-apps/iproute2: remove unused patches
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 .../files/iproute2-4.14.1-configure-nomagic.patch | 196 ---------------------
14 .../files/iproute2-4.14.1-posix-shell.patch | 65 -------
15 .../iproute2/files/iproute2-4.2.0-no-ipv6.patch | 37 ----
16 3 files changed, 298 deletions(-)
17
18 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
19 deleted file mode 100644
20 index 919249b8392..00000000000
21 --- a/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch
22 +++ /dev/null
23 @@ -1,196 +0,0 @@
24 -The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
25 -a variable as well as modifying CFLAGS & LDLIBS.
26 -
27 -If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
28 -are still in place.
29 -
30 -Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
31 -are only passed when correctly needed.
32 -
33 -Prior Gentoo testcase for reproduction:
34 -USE=minimal ebuild ... compile.
35 -- Linking with libelf & libmnl based only on presence.
36 -- Links based on libselinux based only on presence.
37 -
38 -Closes: https://bugs.gentoo.org/643722
39 -Signed-off-by: Robin H. Johnson <robbat2@g.o>
40 -
41 -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/bridge/Makefile iproute2-4.14.1/bridge/Makefile
42 ---- iproute2-4.14.1.orig/bridge/Makefile 2017-11-13 10:09:57.000000000 -0800
43 -+++ iproute2-4.14.1/bridge/Makefile 2018-01-07 14:24:23.350726423 -0800
44 -@@ -1,6 +1,7 @@
45 - BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
46 -
47 - include ../config.mk
48 -+include ../config.include
49 -
50 - all: bridge
51 -
52 -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/config.include iproute2-4.14.1/config.include
53 ---- iproute2-4.14.1.orig/config.include 1969-12-31 16:00:00.000000000 -0800
54 -+++ iproute2-4.14.1/config.include 2018-01-07 14:25:34.406126921 -0800
55 -@@ -0,0 +1,22 @@
56 -+# We can only modify CFLAGS/LDLIBS after all the config options are known.
57 -+ifeq ($(IP_CONFIG_SETNS),y)
58 -+ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
59 -+endif
60 -+ifeq ($(HAVE_ELF),y)
61 -+ CFLAGS += $(HAVE_ELF_CFLAGS)
62 -+ LDLIBS += $(HAVE_ELF_LDLIBS)
63 -+endif
64 -+ifeq ($(HAVE_SELINUX),y)
65 -+ CFLAGS += $(HAVE_SELINUX_CFLAGS)
66 -+ LDLIBS += $(HAVE_SELINUX_LDLIBS)
67 -+endif
68 -+ifeq ($(HAVE_MNL),y)
69 -+ CFLAGS += $(HAVE_MNL_CFLAGS)
70 -+ LDLIBS += $(HAVE_MNL_LDLIBS)
71 -+endif
72 -+
73 -+# Rules can only be declared after all variables in them are known.
74 -+%.o: %.c
75 -+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
76 -+
77 -+# vim: ft=make:
78 -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/configure iproute2-4.14.1/configure
79 ---- iproute2-4.14.1.orig/configure 2017-11-13 10:09:57.000000000 -0800
80 -+++ iproute2-4.14.1/configure 2018-01-07 14:25:49.242419367 -0800
81 -@@ -223,7 +223,7 @@
82 - then
83 - echo "IP_CONFIG_SETNS:=y" >>$CONFIG
84 - echo "yes"
85 -- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
86 -+ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
87 - else
88 - echo "no"
89 - fi
90 -@@ -268,8 +268,8 @@
91 - echo "HAVE_ELF:=y" >>$CONFIG
92 - echo "yes"
93 -
94 -- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
95 -- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
96 -+ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
97 -+ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
98 - else
99 - echo "no"
100 - fi
101 -@@ -283,8 +283,8 @@
102 - echo "HAVE_SELINUX:=y" >>$CONFIG
103 - echo "yes"
104 -
105 -- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
106 -- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
107 -+ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
108 -+ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
109 - else
110 - echo "no"
111 - fi
112 -@@ -297,8 +297,8 @@
113 - echo "HAVE_MNL:=y" >>$CONFIG
114 - echo "yes"
115 -
116 -- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
117 -- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
118 -+ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
119 -+ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
120 - else
121 - echo "no"
122 - fi
123 -@@ -425,7 +425,3 @@
124 - echo -n "docs:"
125 - check_docs
126 - echo
127 --
128 --echo >> $CONFIG
129 --echo "%.o: %.c" >> $CONFIG
130 --echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
131 -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/devlink/Makefile iproute2-4.14.1/devlink/Makefile
132 ---- iproute2-4.14.1.orig/devlink/Makefile 2017-11-13 10:09:57.000000000 -0800
133 -+++ iproute2-4.14.1/devlink/Makefile 2018-01-07 14:24:23.351726442 -0800
134 -@@ -1,4 +1,5 @@
135 - include ../config.mk
136 -+include ../config.include
137 -
138 - ifeq ($(HAVE_MNL),y)
139 -
140 -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/genl/Makefile iproute2-4.14.1/genl/Makefile
141 ---- iproute2-4.14.1.orig/genl/Makefile 2017-11-13 10:09:57.000000000 -0800
142 -+++ iproute2-4.14.1/genl/Makefile 2018-01-07 14:24:23.351726442 -0800
143 -@@ -1,6 +1,7 @@
144 - GENLOBJ=genl.o
145 -
146 - include ../config.mk
147 -+include ../config.include
148 - SHARED_LIBS ?= y
149 -
150 - CFLAGS += -fno-strict-aliasing
151 -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/ip/Makefile iproute2-4.14.1/ip/Makefile
152 ---- iproute2-4.14.1.orig/ip/Makefile 2017-11-13 10:09:57.000000000 -0800
153 -+++ iproute2-4.14.1/ip/Makefile 2018-01-07 14:24:23.351726442 -0800
154 -@@ -14,6 +14,7 @@
155 - RTMONOBJ=rtmon.o
156 -
157 - include ../config.mk
158 -+include ../config.include
159 -
160 - ALLOBJ=$(IPOBJ) $(RTMONOBJ)
161 - SCRIPTS=ifcfg rtpr routel routef
162 -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/lib/Makefile iproute2-4.14.1/lib/Makefile
163 ---- iproute2-4.14.1.orig/lib/Makefile 2017-11-13 10:09:57.000000000 -0800
164 -+++ iproute2-4.14.1/lib/Makefile 2018-01-07 14:24:23.351726442 -0800
165 -@@ -1,4 +1,5 @@
166 - include ../config.mk
167 -+include ../config.include
168 -
169 - CFLAGS += -fPIC
170 -
171 -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/misc/Makefile iproute2-4.14.1/misc/Makefile
172 ---- iproute2-4.14.1.orig/misc/Makefile 2017-11-13 10:09:57.000000000 -0800
173 -+++ iproute2-4.14.1/misc/Makefile 2018-01-07 14:24:23.351726442 -0800
174 -@@ -4,6 +4,7 @@
175 - TARGETS=ss nstat ifstat rtacct lnstat
176 -
177 - include ../config.mk
178 -+include ../config.include
179 -
180 - ifeq ($(HAVE_BERKELEY_DB),y)
181 - TARGETS += arpd
182 -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/netem/Makefile iproute2-4.14.1/netem/Makefile
183 ---- iproute2-4.14.1.orig/netem/Makefile 2017-11-13 10:09:57.000000000 -0800
184 -+++ iproute2-4.14.1/netem/Makefile 2018-01-07 14:24:23.351726442 -0800
185 -@@ -1,4 +1,5 @@
186 - include ../config.mk
187 -+include ../config.include
188 -
189 - DISTGEN = maketable normal pareto paretonormal
190 - DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
191 -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/rdma/Makefile iproute2-4.14.1/rdma/Makefile
192 ---- iproute2-4.14.1.orig/rdma/Makefile 2017-11-13 10:09:57.000000000 -0800
193 -+++ iproute2-4.14.1/rdma/Makefile 2018-01-07 14:24:23.352726462 -0800
194 -@@ -1,4 +1,5 @@
195 - include ../config.mk
196 -+include ../config.include
197 -
198 - ifeq ($(HAVE_MNL),y)
199 -
200 -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tc/Makefile iproute2-4.14.1/tc/Makefile
201 ---- iproute2-4.14.1.orig/tc/Makefile 2017-11-13 10:09:57.000000000 -0800
202 -+++ iproute2-4.14.1/tc/Makefile 2018-01-07 14:24:23.352726462 -0800
203 -@@ -3,6 +3,7 @@
204 - emp_ematch.yacc.o emp_ematch.lex.o
205 -
206 - include ../config.mk
207 -+include ../config.include
208 -
209 - SHARED_LIBS ?= y
210 -
211 -diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tipc/Makefile iproute2-4.14.1/tipc/Makefile
212 ---- iproute2-4.14.1.orig/tipc/Makefile 2017-11-13 10:09:57.000000000 -0800
213 -+++ iproute2-4.14.1/tipc/Makefile 2018-01-07 14:24:23.352726462 -0800
214 -@@ -1,4 +1,5 @@
215 - include ../config.mk
216 -+include ../config.include
217 -
218 - ifeq ($(HAVE_MNL),y)
219 -
220
221 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
222 deleted file mode 100644
223 index e5efc9068ce..00000000000
224 --- a/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch
225 +++ /dev/null
226 @@ -1,65 +0,0 @@
227 -https://marc.info/?l=linux-netdev&m=151554000532498&w=2
228 -
229 -From aec69bbc285e5498add5384b6018564355594233 Mon Sep 17 00:00:00 2001
230 -From: Mike Frysinger <vapier@××××××××.org>
231 -Date: Tue, 9 Jan 2018 18:16:53 -0500
232 -Subject: [PATCH iproute2] ifcfg/rtpr: convert to POSIX shell
233 -
234 -These files are already mostly written in POSIX shell, so convert their
235 -shebangs to /bin/sh and tweak the few bashisms in here.
236 -
237 -URL: https://crbug.com/756559
238 -Reported-by: Pat Erley <perley@××××××××.org>
239 -Signed-off-by: Mike Frysinger <vapier@××××××××.org>
240 ----
241 - ip/ifcfg | 12 ++++++------
242 - ip/rtpr | 2 +-
243 - 2 files changed, 7 insertions(+), 7 deletions(-)
244 -
245 -diff --git a/ip/ifcfg b/ip/ifcfg
246 -index 851b9215ab63..5b34decd4480 100644
247 ---- a/ip/ifcfg
248 -+++ b/ip/ifcfg
249 -@@ -1,3 +1,3 @@
250 --#! /bin/bash
251 -+#! /bin/sh
252 -
253 - CheckForwarding () {
254 -@@ -7,7 +7,7 @@ CheckForwarding () {
255 - fwd=0
256 - if [ -d $sbase ]; then
257 - for dir in $sbase/*/forwarding; do
258 -- fwd=$[$fwd + `cat $dir`]
259 -+ fwd=$(( fwd + $(cat "$dir") ))
260 - done
261 - else
262 - fwd=2
263 -@@ -128,12 +128,12 @@ fi
264 - arping -q -A -c 1 -I $dev $ipaddr
265 - noarp=$?
266 - ( sleep 2 ;
267 -- arping -q -U -c 1 -I $dev $ipaddr ) >& /dev/null </dev/null &
268 -+ arping -q -U -c 1 -I $dev $ipaddr ) >/dev/null 2>&1 </dev/null &
269 -
270 --ip route add unreachable 224.0.0.0/24 >& /dev/null
271 --ip route add unreachable 255.255.255.255 >& /dev/null
272 -+ip route add unreachable 224.0.0.0/24 >/dev/null 2>&1
273 -+ip route add unreachable 255.255.255.255 >/dev/null 2>&1
274 - if [ "`ip link ls $dev | grep -c MULTICAST`" -ge 1 ]; then
275 -- ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null
276 -+ ip route add 224.0.0.0/4 dev $dev scope global >/dev/null 2>&1
277 - fi
278 -
279 - if [ $fwd -eq 0 ]; then
280 -diff --git a/ip/rtpr b/ip/rtpr
281 -index 192a476f817e..7e48674bcf53 100644
282 ---- a/ip/rtpr
283 -+++ b/ip/rtpr
284 -@@ -1,3 +1,3 @@
285 --#! /bin/bash
286 -+#! /bin/sh
287 -
288 - exec tr "[\\\\]" "[
289 ---
290 -2.15.1
291 -
292
293 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
294 deleted file mode 100644
295 index b29e1aa3e11..00000000000
296 --- a/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch
297 +++ /dev/null
298 @@ -1,37 +0,0 @@
299 ---- iproute2-4.2.0/ip/ipmonitor.c
300 -+++ iproute2-4.2.0/ip/ipmonitor.c
301 -@@ -115,7 +115,6 @@
302 - }
303 - if (n->nlmsg_type == RTM_NEWPREFIX) {
304 - print_headers(fp, "[PREFIX]", ctrl);
305 -- print_prefix(who, n, arg);
306 - return 0;
307 - }
308 - if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
309 ---- iproute2-4.2.0/ip/iptunnel.c
310 -+++ iproute2-4.2.0/ip/iptunnel.c
311 -@@ -637,13 +637,6 @@
312 - break;
313 - case AF_INET:
314 - break;
315 -- /*
316 -- * This is silly enough but we have no easy way to make it
317 -- * protocol-independent because of unarranged structure between
318 -- * IPv4 and IPv6.
319 -- */
320 -- case AF_INET6:
321 -- return do_ip6tunnel(argc, argv);
322 - default:
323 - fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
324 - exit(-1);
325 ---- iproute2-4.2.0/ip/Makefile
326 -+++ iproute2-4.2.0/ip/Makefile
327 -@@ -1,6 +1,6 @@
328 - IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
329 -- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
330 -- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
331 -+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
332 -+ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
333 - ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \
334 - iplink_vlan.o link_veth.o link_gre.o iplink_can.o \
335 - iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o link_vti6.o \
Report Message
Find on MARC Find on Google Groups