1 |
commit: a02386560ae073b2bf14a2ddb6e30b8a396d653a |
2 |
Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz> |
3 |
AuthorDate: Thu Apr 23 04:32:01 2020 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 23 14:56:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a0238656 |
7 |
|
8 |
iproute2: Fixed upstream in 3326701, release v5.3.0. |
9 |
|
10 |
In-tree builds fine: |
11 |
> michael@ananke ~ $ qlist -ISSRUv iproute2 |
12 |
> sys-apps/iproute2-5.2.0-r1:0::gentoo -atm -berkdb -caps -elf iptables ipv6 -minimal -selinux |
13 |
|
14 |
Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz> |
15 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
16 |
|
17 |
sys-apps/iproute2/Manifest | 3 - |
18 |
sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch | 48 ---- |
19 |
.../iproute2/files/iproute2-4.11.0-no-ipv6.patch | 37 --- |
20 |
.../files/iproute2-4.16.0-configure-nomagic.patch | 191 --------------- |
21 |
.../files/iproute2-4.17.0-configure-nomagic.patch | 207 ---------------- |
22 |
sys-apps/iproute2/files/iproute2-4.17.0-musl.patch | 268 --------------------- |
23 |
.../files/iproute2-4.20.0-configure-nomagic.patch | 208 ---------------- |
24 |
.../iproute2/files/iproute2-4.20.0-limits.patch | 21 -- |
25 |
.../iproute2/files/iproute2-4.20.0-no-ipv6.patch | 38 --- |
26 |
.../files/iproute2-5.1.0-portability.patch | 33 --- |
27 |
sys-apps/iproute2/iproute2-4.17.0-r1.ebuild | 154 ------------ |
28 |
sys-apps/iproute2/iproute2-4.17.0.ebuild | 152 ------------ |
29 |
sys-apps/iproute2/iproute2-4.20.0.ebuild | 156 ------------ |
30 |
sys-apps/iproute2/iproute2-5.2.0.ebuild | 162 ------------- |
31 |
sys-apps/iproute2/metadata.xml | 14 -- |
32 |
15 files changed, 1692 deletions(-) |
33 |
|
34 |
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest |
35 |
deleted file mode 100644 |
36 |
index 761d0f0..0000000 |
37 |
--- a/sys-apps/iproute2/Manifest |
38 |
+++ /dev/null |
39 |
@@ -1,3 +0,0 @@ |
40 |
-DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5 |
41 |
-DIST iproute2-4.20.0.tar.xz 707016 BLAKE2B d62c6b995c4c1f79617e2f8149ff2ed297d741965e81bffebfa475514f5e96f0c9300e65d12bdd14ab492ce66675677eb41af6816876d5e1360218e4f32f4bc8 SHA512 ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b |
42 |
-DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1 |
43 |
|
44 |
diff --git a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch b/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch |
45 |
deleted file mode 100644 |
46 |
index fa12dad..0000000 |
47 |
--- a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch |
48 |
+++ /dev/null |
49 |
@@ -1,48 +0,0 @@ |
50 |
-http://bugs.gentoo.org/291907 |
51 |
- |
52 |
-This patch was merged from two patches extracted from this thread: |
53 |
-http://markmail.org/thread/qkd76gpdgefpjlfn |
54 |
- |
55 |
-tc_stab.c: small fixes to commandline help |
56 |
- |
57 |
- |
58 |
-tc_core.c: |
59 |
-As kernel part of things relies on cell align which is always set to -1, |
60 |
-I also added it to userspace computation stage. This way if someone |
61 |
-specified e.g. 2048 and 512 for mtu and tsize respectively, one wouldn't |
62 |
-end with tsize supporting mtu 4096 suddenly, New default mtu is also set |
63 |
-to 2048 (disregarding weirdness of setting mtu to such values). |
64 |
- |
65 |
- |
66 |
-Unless I missed something, this is harmless and feels cleaner, but if it's |
67 |
-not allowed, documentation will have to be changed back to 2047 + extra |
68 |
-explanation as well. |
69 |
- |
70 |
---- iproute2/tc/tc_core.c |
71 |
-+++ iproute2/tc/tc_core.c |
72 |
-@@ -155,12 +155,12 @@ |
73 |
- } |
74 |
- |
75 |
- if (s->mtu == 0) |
76 |
-- s->mtu = 2047; |
77 |
-+ s->mtu = 2048; |
78 |
- if (s->tsize == 0) |
79 |
- s->tsize = 512; |
80 |
- |
81 |
- s->cell_log = 0; |
82 |
-- while ((s->mtu >> s->cell_log) > s->tsize - 1) |
83 |
-+ while ((s->mtu - 1 >> s->cell_log) > s->tsize - 1) |
84 |
- s->cell_log++; |
85 |
- |
86 |
- *stab = malloc(s->tsize * sizeof(__u16)); |
87 |
---- iproute2/tc/tc_stab.c |
88 |
-+++ iproute2/tc/tc_stab.c |
89 |
-@@ -32,7 +32,7 @@ |
90 |
- fprintf(stderr, |
91 |
- "Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ] \n" |
92 |
- " [ overhead BYTES ] [ linklayer TYPE ] ...\n" |
93 |
-- " mtu : max packet size we create rate map for {2047}\n" |
94 |
-+ " mtu : max packet size we create size table for {2048}\n" |
95 |
- " tsize : how many slots should size table have {512}\n" |
96 |
- " mpu : minimum packet size used in rate computations\n" |
97 |
- " overhead : per-packet size overhead used in rate computations\n" |
98 |
|
99 |
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 |
100 |
deleted file mode 100644 |
101 |
index fc855dc..0000000 |
102 |
--- a/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch |
103 |
+++ /dev/null |
104 |
@@ -1,37 +0,0 @@ |
105 |
---- iproute2-4.11.0/ip/ipmonitor.c |
106 |
-+++ iproute2-4.11.0/ip/ipmonitor.c |
107 |
-@@ -114,7 +114,6 @@ |
108 |
- } |
109 |
- if (n->nlmsg_type == RTM_NEWPREFIX) { |
110 |
- print_headers(fp, "[PREFIX]", ctrl); |
111 |
-- print_prefix(who, n, arg); |
112 |
- return 0; |
113 |
- } |
114 |
- if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) { |
115 |
---- iproute2-4.11.0/ip/iptunnel.c |
116 |
-+++ iproute2-4.11.0/ip/iptunnel.c |
117 |
-@@ -589,13 +589,6 @@ |
118 |
- break; |
119 |
- case AF_INET: |
120 |
- break; |
121 |
-- /* |
122 |
-- * This is silly enough but we have no easy way to make it |
123 |
-- * protocol-independent because of unarranged structure between |
124 |
-- * IPv4 and IPv6. |
125 |
-- */ |
126 |
-- case AF_INET6: |
127 |
-- return do_ip6tunnel(argc, argv); |
128 |
- default: |
129 |
- fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family); |
130 |
- exit(-1); |
131 |
---- iproute2-4.11.0/ip/Makefile |
132 |
-+++ iproute2-4.11.0/ip/Makefile |
133 |
-@@ -1,6 +1,6 @@ |
134 |
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ |
135 |
-- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ |
136 |
-- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \ |
137 |
-+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ |
138 |
-+ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \ |
139 |
- ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \ |
140 |
- iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o \ |
141 |
- iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \ |
142 |
|
143 |
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 |
144 |
deleted file mode 100644 |
145 |
index 01a1fe2..0000000 |
146 |
--- a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch |
147 |
+++ /dev/null |
148 |
@@ -1,191 +0,0 @@ |
149 |
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets |
150 |
-a variable as well as modifying CFLAGS & LDLIBS. |
151 |
- |
152 |
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks |
153 |
-are still in place. |
154 |
- |
155 |
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they |
156 |
-are only passed when correctly needed. |
157 |
- |
158 |
-Prior Gentoo testcase for reproduction: |
159 |
-USE=minimal ebuild ... compile. |
160 |
-- Linking with libelf & libmnl based only on presence. |
161 |
-- Links based on libselinux based only on presence. |
162 |
- |
163 |
-Closes: https://bugs.gentoo.org/643722 |
164 |
-Signed-off-by: Robin H. Johnson <robbat2@g.o> |
165 |
- |
166 |
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o> |
167 |
- |
168 |
---- iproute2-4.16.0/bridge/Makefile |
169 |
-+++ iproute2-4.16.0/bridge/Makefile |
170 |
-@@ -2,6 +2,7 @@ |
171 |
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o |
172 |
- |
173 |
- include ../config.mk |
174 |
-+include ../config.include |
175 |
- |
176 |
- all: bridge |
177 |
- |
178 |
---- iproute2-4.16.0/config.include |
179 |
-+++ iproute2-4.16.0/config.include |
180 |
-@@ -0,0 +1,22 @@ |
181 |
-+# We can only modify CFLAGS/LDLIBS after all the config options are known. |
182 |
-+ifeq ($(IP_CONFIG_SETNS),y) |
183 |
-+ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) |
184 |
-+endif |
185 |
-+ifeq ($(HAVE_ELF),y) |
186 |
-+ CFLAGS += $(HAVE_ELF_CFLAGS) |
187 |
-+ LDLIBS += $(HAVE_ELF_LDLIBS) |
188 |
-+endif |
189 |
-+ifeq ($(HAVE_SELINUX),y) |
190 |
-+ CFLAGS += $(HAVE_SELINUX_CFLAGS) |
191 |
-+ LDLIBS += $(HAVE_SELINUX_LDLIBS) |
192 |
-+endif |
193 |
-+ifeq ($(HAVE_MNL),y) |
194 |
-+ CFLAGS += $(HAVE_MNL_CFLAGS) |
195 |
-+ LDLIBS += $(HAVE_MNL_LDLIBS) |
196 |
-+endif |
197 |
-+ |
198 |
-+# Rules can only be declared after all variables in them are known. |
199 |
-+%.o: %.c |
200 |
-+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< |
201 |
-+ |
202 |
-+# vim: ft=make: |
203 |
---- iproute2-4.16.0/configure |
204 |
-+++ iproute2-4.16.0/configure |
205 |
-@@ -212,7 +212,7 @@ |
206 |
- then |
207 |
- echo "IP_CONFIG_SETNS:=y" >>$CONFIG |
208 |
- echo "yes" |
209 |
-- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG |
210 |
-+ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG |
211 |
- else |
212 |
- echo "no" |
213 |
- fi |
214 |
-@@ -257,8 +257,8 @@ |
215 |
- echo "HAVE_ELF:=y" >>$CONFIG |
216 |
- echo "yes" |
217 |
- |
218 |
-- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG |
219 |
-- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG |
220 |
-+ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG |
221 |
-+ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG |
222 |
- else |
223 |
- echo "no" |
224 |
- fi |
225 |
-@@ -272,8 +272,8 @@ |
226 |
- echo "HAVE_SELINUX:=y" >>$CONFIG |
227 |
- echo "yes" |
228 |
- |
229 |
-- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG |
230 |
-- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG |
231 |
-+ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG |
232 |
-+ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG |
233 |
- else |
234 |
- echo "no" |
235 |
- fi |
236 |
-@@ -286,8 +286,8 @@ |
237 |
- echo "HAVE_MNL:=y" >>$CONFIG |
238 |
- echo "yes" |
239 |
- |
240 |
-- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG |
241 |
-- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG |
242 |
-+ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG |
243 |
-+ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG |
244 |
- else |
245 |
- echo "no" |
246 |
- fi |
247 |
-@@ -426,7 +426,3 @@ |
248 |
- |
249 |
- echo -n "libcap support: " |
250 |
- check_cap |
251 |
-- |
252 |
--echo >> $CONFIG |
253 |
--echo "%.o: %.c" >> $CONFIG |
254 |
--echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG |
255 |
---- iproute2-4.16.0/devlink/Makefile |
256 |
-+++ iproute2-4.16.0/devlink/Makefile |
257 |
-@@ -1,5 +1,6 @@ |
258 |
- # SPDX-License-Identifier: GPL-2.0 |
259 |
- include ../config.mk |
260 |
-+include ../config.include |
261 |
- |
262 |
- TARGETS := |
263 |
- |
264 |
---- iproute2-4.16.0/genl/Makefile |
265 |
-+++ iproute2-4.16.0/genl/Makefile |
266 |
-@@ -2,6 +2,7 @@ |
267 |
- GENLOBJ=genl.o |
268 |
- |
269 |
- include ../config.mk |
270 |
-+include ../config.include |
271 |
- SHARED_LIBS ?= y |
272 |
- |
273 |
- CFLAGS += -fno-strict-aliasing |
274 |
---- iproute2-4.16.0/ip/Makefile |
275 |
-+++ iproute2-4.16.0/ip/Makefile |
276 |
-@@ -15,6 +15,7 @@ |
277 |
- RTMONOBJ=rtmon.o |
278 |
- |
279 |
- include ../config.mk |
280 |
-+include ../config.include |
281 |
- |
282 |
- ALLOBJ=$(IPOBJ) $(RTMONOBJ) |
283 |
- SCRIPTS=ifcfg rtpr routel routef |
284 |
---- iproute2-4.16.0/lib/Makefile |
285 |
-+++ iproute2-4.16.0/lib/Makefile |
286 |
-@@ -1,5 +1,6 @@ |
287 |
- # SPDX-License-Identifier: GPL-2.0 |
288 |
- include ../config.mk |
289 |
-+include ../config.include |
290 |
- |
291 |
- CFLAGS += -fPIC |
292 |
- |
293 |
---- iproute2-4.16.0/misc/Makefile |
294 |
-+++ iproute2-4.16.0/misc/Makefile |
295 |
-@@ -5,6 +5,7 @@ |
296 |
- TARGETS=ss nstat ifstat rtacct lnstat |
297 |
- |
298 |
- include ../config.mk |
299 |
-+include ../config.include |
300 |
- |
301 |
- ifeq ($(HAVE_BERKELEY_DB),y) |
302 |
- TARGETS += arpd |
303 |
---- iproute2-4.16.0/netem/Makefile |
304 |
-+++ iproute2-4.16.0/netem/Makefile |
305 |
-@@ -1,5 +1,6 @@ |
306 |
- # SPDX-License-Identifier: GPL-2.0 |
307 |
- include ../config.mk |
308 |
-+include ../config.include |
309 |
- |
310 |
- DISTGEN = maketable normal pareto paretonormal |
311 |
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist |
312 |
---- iproute2-4.16.0/rdma/Makefile |
313 |
-+++ iproute2-4.16.0/rdma/Makefile |
314 |
-@@ -1,5 +1,6 @@ |
315 |
- # SPDX-License-Identifier: GPL-2.0 |
316 |
- include ../config.mk |
317 |
-+include ../config.include |
318 |
- |
319 |
- TARGETS := |
320 |
- |
321 |
---- iproute2-4.16.0/tc/Makefile |
322 |
-+++ iproute2-4.16.0/tc/Makefile |
323 |
-@@ -4,6 +4,7 @@ |
324 |
- emp_ematch.yacc.o emp_ematch.lex.o |
325 |
- |
326 |
- include ../config.mk |
327 |
-+include ../config.include |
328 |
- |
329 |
- SHARED_LIBS ?= y |
330 |
- |
331 |
---- iproute2-4.16.0/tipc/Makefile |
332 |
-+++ iproute2-4.16.0/tipc/Makefile |
333 |
-@@ -1,5 +1,6 @@ |
334 |
- # SPDX-License-Identifier: GPL-2.0 |
335 |
- include ../config.mk |
336 |
-+include ../config.include |
337 |
- |
338 |
- TARGETS := |
339 |
- |
340 |
|
341 |
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 |
342 |
deleted file mode 100644 |
343 |
index 30b5db3..0000000 |
344 |
--- a/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch |
345 |
+++ /dev/null |
346 |
@@ -1,207 +0,0 @@ |
347 |
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets |
348 |
-a variable as well as modifying CFLAGS & LDLIBS. |
349 |
- |
350 |
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks |
351 |
-are still in place. |
352 |
- |
353 |
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they |
354 |
-are only passed when correctly needed. |
355 |
- |
356 |
-Prior Gentoo testcase for reproduction: |
357 |
-USE=minimal ebuild ... compile. |
358 |
-- Linking with libelf, libmnl & libcap based only on presence. |
359 |
-- Links based on libselinux based only on presence. |
360 |
- |
361 |
-Closes: https://bugs.gentoo.org/643722 |
362 |
-Signed-off-by: Robin H. Johnson <robbat2@g.o> |
363 |
- |
364 |
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o> |
365 |
-Added libcap to v4.17.0 by Lars Wendler <polynomial-c@g.o> |
366 |
- |
367 |
---- iproute2-4.17.0/bridge/Makefile |
368 |
-+++ iproute2-4.17.0/bridge/Makefile |
369 |
-@@ -2,6 +2,7 @@ |
370 |
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o |
371 |
- |
372 |
- include ../config.mk |
373 |
-+include ../config.include |
374 |
- |
375 |
- all: bridge |
376 |
- |
377 |
---- iproute2-4.17.0/config.include |
378 |
-+++ iproute2-4.17.0/config.include |
379 |
-@@ -0,0 +1,26 @@ |
380 |
-+# We can only modify CFLAGS/LDLIBS after all the config options are known. |
381 |
-+ifeq ($(IP_CONFIG_SETNS),y) |
382 |
-+ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) |
383 |
-+endif |
384 |
-+ifeq ($(HAVE_ELF),y) |
385 |
-+ CFLAGS += $(HAVE_ELF_CFLAGS) |
386 |
-+ LDLIBS += $(HAVE_ELF_LDLIBS) |
387 |
-+endif |
388 |
-+ifeq ($(HAVE_SELINUX),y) |
389 |
-+ CFLAGS += $(HAVE_SELINUX_CFLAGS) |
390 |
-+ LDLIBS += $(HAVE_SELINUX_LDLIBS) |
391 |
-+endif |
392 |
-+ifeq ($(HAVE_MNL),y) |
393 |
-+ CFLAGS += $(HAVE_MNL_CFLAGS) |
394 |
-+ LDLIBS += $(HAVE_MNL_LDLIBS) |
395 |
-+endif |
396 |
-+ifeq ($(HAVE_CAP),y) |
397 |
-+ CFLAGS += $(HAVE_CAP_CFLAGS) |
398 |
-+ LDLIBS += $(HAVE_CAP_LDLIBS) |
399 |
-+endif |
400 |
-+ |
401 |
-+# Rules can only be declared after all variables in them are known. |
402 |
-+%.o: %.c |
403 |
-+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< |
404 |
-+ |
405 |
-+# vim: ft=make: |
406 |
---- iproute2-4.17.0/configure |
407 |
-+++ iproute2-4.17.0/configure |
408 |
-@@ -212,7 +212,7 @@ |
409 |
- then |
410 |
- echo "IP_CONFIG_SETNS:=y" >>$CONFIG |
411 |
- echo "yes" |
412 |
-- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG |
413 |
-+ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG |
414 |
- else |
415 |
- echo "no" |
416 |
- fi |
417 |
-@@ -257,8 +257,8 @@ |
418 |
- echo "HAVE_ELF:=y" >>$CONFIG |
419 |
- echo "yes" |
420 |
- |
421 |
-- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG |
422 |
-- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG |
423 |
-+ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG |
424 |
-+ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG |
425 |
- else |
426 |
- echo "no" |
427 |
- fi |
428 |
-@@ -272,8 +272,8 @@ |
429 |
- echo "HAVE_SELINUX:=y" >>$CONFIG |
430 |
- echo "yes" |
431 |
- |
432 |
-- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG |
433 |
-- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG |
434 |
-+ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG |
435 |
-+ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG |
436 |
- else |
437 |
- echo "no" |
438 |
- fi |
439 |
-@@ -286,8 +286,8 @@ |
440 |
- echo "HAVE_MNL:=y" >>$CONFIG |
441 |
- echo "yes" |
442 |
- |
443 |
-- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG |
444 |
-- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG |
445 |
-+ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG |
446 |
-+ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG |
447 |
- else |
448 |
- echo "no" |
449 |
- fi |
450 |
-@@ -343,8 +343,8 @@ |
451 |
- echo "HAVE_CAP:=y" >>$CONFIG |
452 |
- echo "yes" |
453 |
- |
454 |
-- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG |
455 |
-- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG |
456 |
-+ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG |
457 |
-+ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG |
458 |
- else |
459 |
- echo "no" |
460 |
- fi |
461 |
-@@ -426,7 +426,3 @@ |
462 |
- |
463 |
- echo -n "libcap support: " |
464 |
- check_cap |
465 |
-- |
466 |
--echo >> $CONFIG |
467 |
--echo "%.o: %.c" >> $CONFIG |
468 |
--echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG |
469 |
---- iproute2-4.17.0/devlink/Makefile |
470 |
-+++ iproute2-4.17.0/devlink/Makefile |
471 |
-@@ -1,5 +1,6 @@ |
472 |
- # SPDX-License-Identifier: GPL-2.0 |
473 |
- include ../config.mk |
474 |
-+include ../config.include |
475 |
- |
476 |
- TARGETS := |
477 |
- |
478 |
---- iproute2-4.17.0/genl/Makefile |
479 |
-+++ iproute2-4.17.0/genl/Makefile |
480 |
-@@ -2,6 +2,7 @@ |
481 |
- GENLOBJ=genl.o |
482 |
- |
483 |
- include ../config.mk |
484 |
-+include ../config.include |
485 |
- SHARED_LIBS ?= y |
486 |
- |
487 |
- CFLAGS += -fno-strict-aliasing |
488 |
---- iproute2-4.17.0/ip/Makefile |
489 |
-+++ iproute2-4.17.0/ip/Makefile |
490 |
-@@ -15,6 +15,7 @@ |
491 |
- RTMONOBJ=rtmon.o |
492 |
- |
493 |
- include ../config.mk |
494 |
-+include ../config.include |
495 |
- |
496 |
- ALLOBJ=$(IPOBJ) $(RTMONOBJ) |
497 |
- SCRIPTS=ifcfg rtpr routel routef |
498 |
---- iproute2-4.17.0/lib/Makefile |
499 |
-+++ iproute2-4.17.0/lib/Makefile |
500 |
-@@ -1,5 +1,6 @@ |
501 |
- # SPDX-License-Identifier: GPL-2.0 |
502 |
- include ../config.mk |
503 |
-+include ../config.include |
504 |
- |
505 |
- CFLAGS += -fPIC |
506 |
- |
507 |
---- iproute2-4.17.0/misc/Makefile |
508 |
-+++ iproute2-4.17.0/misc/Makefile |
509 |
-@@ -5,6 +5,7 @@ |
510 |
- TARGETS=ss nstat ifstat rtacct lnstat |
511 |
- |
512 |
- include ../config.mk |
513 |
-+include ../config.include |
514 |
- |
515 |
- ifeq ($(HAVE_BERKELEY_DB),y) |
516 |
- TARGETS += arpd |
517 |
---- iproute2-4.17.0/netem/Makefile |
518 |
-+++ iproute2-4.17.0/netem/Makefile |
519 |
-@@ -1,5 +1,6 @@ |
520 |
- # SPDX-License-Identifier: GPL-2.0 |
521 |
- include ../config.mk |
522 |
-+include ../config.include |
523 |
- |
524 |
- DISTGEN = maketable normal pareto paretonormal |
525 |
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist |
526 |
---- iproute2-4.17.0/rdma/Makefile |
527 |
-+++ iproute2-4.17.0/rdma/Makefile |
528 |
-@@ -1,5 +1,6 @@ |
529 |
- # SPDX-License-Identifier: GPL-2.0 |
530 |
- include ../config.mk |
531 |
-+include ../config.include |
532 |
- |
533 |
- TARGETS := |
534 |
- |
535 |
---- iproute2-4.17.0/tc/Makefile |
536 |
-+++ iproute2-4.17.0/tc/Makefile |
537 |
-@@ -4,6 +4,7 @@ |
538 |
- emp_ematch.yacc.o emp_ematch.lex.o |
539 |
- |
540 |
- include ../config.mk |
541 |
-+include ../config.include |
542 |
- |
543 |
- SHARED_LIBS ?= y |
544 |
- |
545 |
---- iproute2-4.17.0/tipc/Makefile |
546 |
-+++ iproute2-4.17.0/tipc/Makefile |
547 |
-@@ -1,5 +1,6 @@ |
548 |
- # SPDX-License-Identifier: GPL-2.0 |
549 |
- include ../config.mk |
550 |
-+include ../config.include |
551 |
- |
552 |
- TARGETS := |
553 |
- |
554 |
|
555 |
diff --git a/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch |
556 |
deleted file mode 100644 |
557 |
index 2a75596..0000000 |
558 |
--- a/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch |
559 |
+++ /dev/null |
560 |
@@ -1,268 +0,0 @@ |
561 |
-diff -Naur iproute2-4.17.0.orig/include/uapi/linux/if_tunnel.h iproute2-4.17.0/include/uapi/linux/if_tunnel.h |
562 |
---- iproute2-4.17.0.orig/include/uapi/linux/if_tunnel.h 2018-06-11 10:31:44.723159108 -0700 |
563 |
-+++ iproute2-4.17.0/include/uapi/linux/if_tunnel.h 2018-06-11 10:32:17.676158518 -0700 |
564 |
-@@ -3,7 +3,6 @@ |
565 |
- #define _IF_TUNNEL_H_ |
566 |
- |
567 |
- #include <linux/types.h> |
568 |
--#include <linux/if.h> |
569 |
- #include <linux/ip.h> |
570 |
- #include <linux/in6.h> |
571 |
- #include <asm/byteorder.h> |
572 |
-diff -Naur iproute2-4.17.0.orig/include/uapi/linux/ip6_tunnel.h iproute2-4.17.0/include/uapi/linux/ip6_tunnel.h |
573 |
---- iproute2-4.17.0.orig/include/uapi/linux/ip6_tunnel.h 2018-06-11 10:31:44.722159108 -0700 |
574 |
-+++ iproute2-4.17.0/include/uapi/linux/ip6_tunnel.h 2018-06-11 10:32:24.676158393 -0700 |
575 |
-@@ -3,7 +3,6 @@ |
576 |
- #define _IP6_TUNNEL_H |
577 |
- |
578 |
- #include <linux/types.h> |
579 |
--#include <linux/if.h> /* For IFNAMSIZ. */ |
580 |
- #include <linux/in6.h> /* For struct in6_addr. */ |
581 |
- |
582 |
- #define IPV6_TLV_TNL_ENCAP_LIMIT 4 |
583 |
-diff -Naur iproute2-4.17.0.orig/include/uapi/linux/kernel.h iproute2-4.17.0/include/uapi/linux/kernel.h |
584 |
---- iproute2-4.17.0.orig/include/uapi/linux/kernel.h 2018-06-11 10:31:44.722159108 -0700 |
585 |
-+++ iproute2-4.17.0/include/uapi/linux/kernel.h 2018-06-11 10:32:41.676158088 -0700 |
586 |
-@@ -2,7 +2,9 @@ |
587 |
- #ifndef _LINUX_KERNEL_H |
588 |
- #define _LINUX_KERNEL_H |
589 |
- |
590 |
-+#ifdef __GLIBC__ |
591 |
- #include <linux/sysinfo.h> |
592 |
-+#endif |
593 |
- |
594 |
- /* |
595 |
- * 'kernel.h' contains some often-used function prototypes etc |
596 |
-diff -Naur iproute2-4.17.0.orig/include/uapi/linux/libc-compat.h iproute2-4.17.0/include/uapi/linux/libc-compat.h |
597 |
---- iproute2-4.17.0.orig/include/uapi/linux/libc-compat.h 2018-06-11 10:31:44.721159108 -0700 |
598 |
-+++ iproute2-4.17.0/include/uapi/linux/libc-compat.h 2018-06-11 10:37:37.376152793 -0700 |
599 |
-@@ -49,47 +49,57 @@ |
600 |
- #ifndef _LIBC_COMPAT_H |
601 |
- #define _LIBC_COMPAT_H |
602 |
- |
603 |
--/* We have included glibc headers... */ |
604 |
--#if defined(__GLIBC__) |
605 |
-+/* We're used from userspace... */ |
606 |
-+#if !defined(__KERNEL__) |
607 |
- |
608 |
--/* Coordinate with glibc net/if.h header. */ |
609 |
-+/* Coordinate with libc net/if.h header. */ |
610 |
- #if defined(_NET_IF_H) && defined(__USE_MISC) |
611 |
- |
612 |
--/* GLIBC headers included first so don't define anything |
613 |
-+/* libc headers included first so don't define anything |
614 |
- * that would already be defined. */ |
615 |
- |
616 |
- #define __UAPI_DEF_IF_IFCONF 0 |
617 |
- #define __UAPI_DEF_IF_IFMAP 0 |
618 |
- #define __UAPI_DEF_IF_IFNAMSIZ 0 |
619 |
- #define __UAPI_DEF_IF_IFREQ 0 |
620 |
--/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ |
621 |
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 |
622 |
-+#if !defined(__GLIBC__) |
623 |
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 |
624 |
-+#else |
625 |
- /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ |
626 |
- #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO |
627 |
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 |
628 |
- #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ |
629 |
-+#endif /* !defined(__GLIBC__) */ |
630 |
- |
631 |
- #else /* _NET_IF_H */ |
632 |
- |
633 |
- /* Linux headers included first, and we must define everything |
634 |
-- * we need. The expectation is that glibc will check the |
635 |
-+ * we need. The expectation is that libc will check the |
636 |
- * __UAPI_DEF_* defines and adjust appropriately. */ |
637 |
- |
638 |
- #define __UAPI_DEF_IF_IFCONF 1 |
639 |
- #define __UAPI_DEF_IF_IFMAP 1 |
640 |
- #define __UAPI_DEF_IF_IFNAMSIZ 1 |
641 |
- #define __UAPI_DEF_IF_IFREQ 1 |
642 |
--/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ |
643 |
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 |
644 |
- /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ |
645 |
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 |
646 |
- |
647 |
- #endif /* _NET_IF_H */ |
648 |
- |
649 |
--/* Coordinate with glibc netinet/in.h header. */ |
650 |
-+/* Coordinate with libc netinet/if_ether.h */ |
651 |
-+#ifdef _NETINET_IF_ETHER_H |
652 |
-+#define __UAPI_DEF_ETHHDR 0 |
653 |
-+#else |
654 |
-+/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */ |
655 |
-+#define __UAPI_DEF_ETHHDR 1 |
656 |
-+#endif /* _NETINET_IF_ETHER_H */ |
657 |
-+ |
658 |
-+/* Coordinate with libc netinet/in.h header. */ |
659 |
- #if defined(_NETINET_IN_H) |
660 |
- |
661 |
--/* GLIBC headers included first so don't define anything |
662 |
-+/* libc headers included first so don't define anything |
663 |
- * that would already be defined. */ |
664 |
- #define __UAPI_DEF_IN_ADDR 0 |
665 |
- #define __UAPI_DEF_IN_IPPROTO 0 |
666 |
-@@ -99,15 +109,7 @@ |
667 |
- #define __UAPI_DEF_IN_CLASS 0 |
668 |
- |
669 |
- #define __UAPI_DEF_IN6_ADDR 0 |
670 |
--/* The exception is the in6_addr macros which must be defined |
671 |
-- * if the glibc code didn't define them. This guard matches |
672 |
-- * the guard in glibc/inet/netinet/in.h which defines the |
673 |
-- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ |
674 |
--#if defined(__USE_MISC) || defined (__USE_GNU) |
675 |
- #define __UAPI_DEF_IN6_ADDR_ALT 0 |
676 |
--#else |
677 |
--#define __UAPI_DEF_IN6_ADDR_ALT 1 |
678 |
--#endif |
679 |
- #define __UAPI_DEF_SOCKADDR_IN6 0 |
680 |
- #define __UAPI_DEF_IPV6_MREQ 0 |
681 |
- #define __UAPI_DEF_IPPROTO_V6 0 |
682 |
-@@ -118,7 +120,7 @@ |
683 |
- #else |
684 |
- |
685 |
- /* Linux headers included first, and we must define everything |
686 |
-- * we need. The expectation is that glibc will check the |
687 |
-+ * we need. The expectation is that libc will check the |
688 |
- * __UAPI_DEF_* defines and adjust appropriately. */ |
689 |
- #define __UAPI_DEF_IN_ADDR 1 |
690 |
- #define __UAPI_DEF_IN_IPPROTO 1 |
691 |
-@@ -128,7 +130,7 @@ |
692 |
- #define __UAPI_DEF_IN_CLASS 1 |
693 |
- |
694 |
- #define __UAPI_DEF_IN6_ADDR 1 |
695 |
--/* We unconditionally define the in6_addr macros and glibc must |
696 |
-+/* We unconditionally define the in6_addr macros and libc must |
697 |
- * coordinate. */ |
698 |
- #define __UAPI_DEF_IN6_ADDR_ALT 1 |
699 |
- #define __UAPI_DEF_SOCKADDR_IN6 1 |
700 |
-@@ -170,7 +172,7 @@ |
701 |
- * or we are being included in the kernel, then define everything |
702 |
- * that we need. Check for previous __UAPI_* definitions to give |
703 |
- * unsupported C libraries a way to opt out of any kernel definition. */ |
704 |
--#else /* !defined(__GLIBC__) */ |
705 |
-+#else /* defined(__KERNEL__) */ |
706 |
- |
707 |
- /* Definitions for if.h */ |
708 |
- #ifndef __UAPI_DEF_IF_IFCONF |
709 |
-@@ -185,7 +187,6 @@ |
710 |
- #ifndef __UAPI_DEF_IF_IFREQ |
711 |
- #define __UAPI_DEF_IF_IFREQ 1 |
712 |
- #endif |
713 |
--/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ |
714 |
- #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS |
715 |
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 |
716 |
- #endif |
717 |
-@@ -194,6 +195,11 @@ |
718 |
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 |
719 |
- #endif |
720 |
- |
721 |
-+/* Definitions for netinet/if_ether.h */ |
722 |
-+#ifndef __UAPI_DEF_ETHHDR |
723 |
-+#define __UAPI_DEF_ETHHDR 1 |
724 |
-+#endif |
725 |
-+ |
726 |
- /* Definitions for in.h */ |
727 |
- #ifndef __UAPI_DEF_IN_ADDR |
728 |
- #define __UAPI_DEF_IN_ADDR 1 |
729 |
-@@ -262,6 +268,6 @@ |
730 |
- #define __UAPI_DEF_XATTR 1 |
731 |
- #endif |
732 |
- |
733 |
--#endif /* __GLIBC__ */ |
734 |
-+#endif /* defined(__KERNEL__) */ |
735 |
- |
736 |
- #endif /* _LIBC_COMPAT_H */ |
737 |
-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 |
738 |
---- iproute2-4.17.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h 2018-06-11 10:31:44.722159108 -0700 |
739 |
-+++ iproute2-4.17.0/include/uapi/linux/netfilter_ipv4/ip_tables.h 2018-06-11 10:38:07.727152249 -0700 |
740 |
-@@ -18,7 +18,6 @@ |
741 |
- |
742 |
- #include <linux/types.h> |
743 |
- |
744 |
--#include <linux/if.h> |
745 |
- #include <linux/netfilter_ipv4.h> |
746 |
- |
747 |
- #include <linux/netfilter/x_tables.h> |
748 |
-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 |
749 |
---- iproute2-4.17.0.orig/rdma/include/uapi/rdma/rdma_user_cm.h 2018-06-11 10:31:44.742159108 -0700 |
750 |
-+++ iproute2-4.17.0/rdma/include/uapi/rdma/rdma_user_cm.h 2018-06-11 10:44:48.746145068 -0700 |
751 |
-@@ -34,9 +34,9 @@ |
752 |
- #ifndef RDMA_USER_CM_H |
753 |
- #define RDMA_USER_CM_H |
754 |
- |
755 |
-+#include <netinet/in.h> |
756 |
- #include <linux/types.h> |
757 |
- #include <linux/socket.h> |
758 |
--#include <linux/in6.h> |
759 |
- #include <rdma/ib_user_verbs.h> |
760 |
- #include <rdma/ib_user_sa.h> |
761 |
- |
762 |
-diff -Naur iproute2-4.17.0.orig/tc/f_flower.c iproute2-4.17.0/tc/f_flower.c |
763 |
---- iproute2-4.17.0.orig/tc/f_flower.c 2018-06-11 10:31:44.746159108 -0700 |
764 |
-+++ iproute2-4.17.0/tc/f_flower.c 2018-06-11 10:38:29.389151861 -0700 |
765 |
-@@ -14,7 +14,7 @@ |
766 |
- #include <unistd.h> |
767 |
- #include <string.h> |
768 |
- #include <net/if.h> |
769 |
--#include <linux/if_arp.h> |
770 |
-+#include <net/if_arp.h> |
771 |
- #include <linux/if_ether.h> |
772 |
- #include <linux/ip.h> |
773 |
- #include <linux/tc_act/tc_vlan.h> |
774 |
-diff -Naur iproute2-4.17.0.orig/tc/m_mirred.c iproute2-4.17.0/tc/m_mirred.c |
775 |
---- iproute2-4.17.0.orig/tc/m_mirred.c 2018-06-11 10:31:44.745159108 -0700 |
776 |
-+++ iproute2-4.17.0/tc/m_mirred.c 2018-06-11 10:38:41.545151644 -0700 |
777 |
-@@ -17,6 +17,7 @@ |
778 |
- #include <unistd.h> |
779 |
- #include <fcntl.h> |
780 |
- #include <sys/socket.h> |
781 |
-+#include <net/if.h> |
782 |
- #include <netinet/in.h> |
783 |
- #include <arpa/inet.h> |
784 |
- #include <string.h> |
785 |
-diff -Naur iproute2-4.17.0.orig/tc/tc_class.c iproute2-4.17.0/tc/tc_class.c |
786 |
---- iproute2-4.17.0.orig/tc/tc_class.c 2018-06-11 10:31:44.743159108 -0700 |
787 |
-+++ iproute2-4.17.0/tc/tc_class.c 2018-06-11 10:38:53.705151426 -0700 |
788 |
-@@ -15,6 +15,7 @@ |
789 |
- #include <unistd.h> |
790 |
- #include <fcntl.h> |
791 |
- #include <sys/socket.h> |
792 |
-+#include <net/if.h> |
793 |
- #include <netinet/in.h> |
794 |
- #include <arpa/inet.h> |
795 |
- #include <string.h> |
796 |
-diff -Naur iproute2-4.17.0.orig/tc/tc_filter.c iproute2-4.17.0/tc/tc_filter.c |
797 |
---- iproute2-4.17.0.orig/tc/tc_filter.c 2018-06-11 10:31:44.743159108 -0700 |
798 |
-+++ iproute2-4.17.0/tc/tc_filter.c 2018-06-11 10:39:04.147151239 -0700 |
799 |
-@@ -15,6 +15,7 @@ |
800 |
- #include <unistd.h> |
801 |
- #include <fcntl.h> |
802 |
- #include <sys/socket.h> |
803 |
-+#include <net/if.h> |
804 |
- #include <netinet/in.h> |
805 |
- #include <arpa/inet.h> |
806 |
- #include <string.h> |
807 |
-diff -Naur iproute2-4.17.0.orig/tc/tc_qdisc.c iproute2-4.17.0/tc/tc_qdisc.c |
808 |
---- iproute2-4.17.0.orig/tc/tc_qdisc.c 2018-06-11 10:31:44.743159108 -0700 |
809 |
-+++ iproute2-4.17.0/tc/tc_qdisc.c 2018-06-11 10:39:17.997150991 -0700 |
810 |
-@@ -15,6 +15,7 @@ |
811 |
- #include <unistd.h> |
812 |
- #include <fcntl.h> |
813 |
- #include <sys/socket.h> |
814 |
-+#include <net/if.h> |
815 |
- #include <netinet/in.h> |
816 |
- #include <arpa/inet.h> |
817 |
- #include <string.h> |
818 |
-diff -Naur iproute2-4.17.0.orig/tc/tc_util.h iproute2-4.17.0/tc/tc_util.h |
819 |
---- iproute2-4.17.0.orig/tc/tc_util.h 2018-06-11 10:31:44.743159108 -0700 |
820 |
-+++ iproute2-4.17.0/tc/tc_util.h 2018-06-11 10:39:25.558150855 -0700 |
821 |
-@@ -4,7 +4,6 @@ |
822 |
- |
823 |
- #define MAX_MSG 16384 |
824 |
- #include <limits.h> |
825 |
--#include <linux/if.h> |
826 |
- |
827 |
- #include <linux/pkt_sched.h> |
828 |
- #include <linux/pkt_cls.h> |
829 |
|
830 |
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 |
831 |
deleted file mode 100644 |
832 |
index 94df850..0000000 |
833 |
--- a/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch |
834 |
+++ /dev/null |
835 |
@@ -1,208 +0,0 @@ |
836 |
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets |
837 |
-a variable as well as modifying CFLAGS & LDLIBS. |
838 |
- |
839 |
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks |
840 |
-are still in place. |
841 |
- |
842 |
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they |
843 |
-are only passed when correctly needed. |
844 |
- |
845 |
-Prior Gentoo testcase for reproduction: |
846 |
-USE=minimal ebuild ... compile. |
847 |
-- Linking with libelf, libmnl & libcap based only on presence. |
848 |
-- Links based on libselinux based only on presence. |
849 |
- |
850 |
-Closes: https://bugs.gentoo.org/643722 |
851 |
-Signed-off-by: Robin H. Johnson <robbat2@g.o> |
852 |
- |
853 |
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o> |
854 |
-Added libcap to v4.17.0 by Lars Wendler <polynomial-c@g.o> |
855 |
-Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@g.o> |
856 |
- |
857 |
---- iproute2-4.20.0/bridge/Makefile |
858 |
-+++ iproute2-4.20.0/bridge/Makefile |
859 |
-@@ -2,6 +2,7 @@ |
860 |
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o |
861 |
- |
862 |
- include ../config.mk |
863 |
-+include ../config.include |
864 |
- |
865 |
- all: bridge |
866 |
- |
867 |
---- iproute2-4.20.0/config.include |
868 |
-+++ iproute2-4.20.0/config.include |
869 |
-@@ -0,0 +1,26 @@ |
870 |
-+# We can only modify CFLAGS/LDLIBS after all the config options are known. |
871 |
-+ifeq ($(IP_CONFIG_SETNS),y) |
872 |
-+ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) |
873 |
-+endif |
874 |
-+ifeq ($(HAVE_ELF),y) |
875 |
-+ CFLAGS += $(HAVE_ELF_CFLAGS) |
876 |
-+ LDLIBS += $(HAVE_ELF_LDLIBS) |
877 |
-+endif |
878 |
-+ifeq ($(HAVE_SELINUX),y) |
879 |
-+ CFLAGS += $(HAVE_SELINUX_CFLAGS) |
880 |
-+ LDLIBS += $(HAVE_SELINUX_LDLIBS) |
881 |
-+endif |
882 |
-+ifeq ($(HAVE_MNL),y) |
883 |
-+ CFLAGS += $(HAVE_MNL_CFLAGS) |
884 |
-+ LDLIBS += $(HAVE_MNL_LDLIBS) |
885 |
-+endif |
886 |
-+ifeq ($(HAVE_CAP),y) |
887 |
-+ CFLAGS += $(HAVE_CAP_CFLAGS) |
888 |
-+ LDLIBS += $(HAVE_CAP_LDLIBS) |
889 |
-+endif |
890 |
-+ |
891 |
-+# Rules can only be declared after all variables in them are known. |
892 |
-+%.o: %.c |
893 |
-+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $< |
894 |
-+ |
895 |
-+# vim: ft=make: |
896 |
---- iproute2-4.20.0/configure |
897 |
-+++ iproute2-4.20.0/configure |
898 |
-@@ -188,7 +188,7 @@ |
899 |
- if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then |
900 |
- echo "IP_CONFIG_SETNS:=y" >>$CONFIG |
901 |
- echo "yes" |
902 |
-- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG |
903 |
-+ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG |
904 |
- else |
905 |
- echo "no" |
906 |
- fi |
907 |
-@@ -231,8 +231,8 @@ |
908 |
- echo "HAVE_ELF:=y" >>$CONFIG |
909 |
- echo "yes" |
910 |
- |
911 |
-- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG |
912 |
-- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG |
913 |
-+ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG |
914 |
-+ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG |
915 |
- else |
916 |
- echo "no" |
917 |
- fi |
918 |
-@@ -245,8 +245,8 @@ |
919 |
- echo "HAVE_SELINUX:=y" >>$CONFIG |
920 |
- echo "yes" |
921 |
- |
922 |
-- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG |
923 |
-- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG |
924 |
-+ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG |
925 |
-+ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG |
926 |
- else |
927 |
- echo "no" |
928 |
- fi |
929 |
-@@ -258,8 +258,8 @@ |
930 |
- echo "HAVE_MNL:=y" >>$CONFIG |
931 |
- echo "yes" |
932 |
- |
933 |
-- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG |
934 |
-- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG |
935 |
-+ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG |
936 |
-+ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG |
937 |
- else |
938 |
- echo "no" |
939 |
- fi |
940 |
-@@ -316,8 +316,8 @@ |
941 |
- echo "HAVE_CAP:=y" >>$CONFIG |
942 |
- echo "yes" |
943 |
- |
944 |
-- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG |
945 |
-- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG |
946 |
-+ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG |
947 |
-+ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG |
948 |
- else |
949 |
- echo "no" |
950 |
- fi |
951 |
-@@ -397,7 +397,3 @@ |
952 |
- |
953 |
- echo -n "libcap support: " |
954 |
- check_cap |
955 |
-- |
956 |
--echo >> $CONFIG |
957 |
--echo "%.o: %.c" >> $CONFIG |
958 |
--echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG |
959 |
---- iproute2-4.20.0/devlink/Makefile |
960 |
-+++ iproute2-4.20.0/devlink/Makefile |
961 |
-@@ -1,5 +1,6 @@ |
962 |
- # SPDX-License-Identifier: GPL-2.0 |
963 |
- include ../config.mk |
964 |
-+include ../config.include |
965 |
- |
966 |
- TARGETS := |
967 |
- |
968 |
---- iproute2-4.20.0/genl/Makefile |
969 |
-+++ iproute2-4.20.0/genl/Makefile |
970 |
-@@ -2,6 +2,7 @@ |
971 |
- GENLOBJ=genl.o |
972 |
- |
973 |
- include ../config.mk |
974 |
-+include ../config.include |
975 |
- SHARED_LIBS ?= y |
976 |
- |
977 |
- CFLAGS += -fno-strict-aliasing |
978 |
---- iproute2-4.20.0/ip/Makefile |
979 |
-+++ iproute2-4.20.0/ip/Makefile |
980 |
-@@ -15,6 +15,7 @@ |
981 |
- RTMONOBJ=rtmon.o |
982 |
- |
983 |
- include ../config.mk |
984 |
-+include ../config.include |
985 |
- |
986 |
- ALLOBJ=$(IPOBJ) $(RTMONOBJ) |
987 |
- SCRIPTS=ifcfg rtpr routel routef |
988 |
---- iproute2-4.20.0/lib/Makefile |
989 |
-+++ iproute2-4.20.0/lib/Makefile |
990 |
-@@ -1,5 +1,6 @@ |
991 |
- # SPDX-License-Identifier: GPL-2.0 |
992 |
- include ../config.mk |
993 |
-+include ../config.include |
994 |
- |
995 |
- CFLAGS += -fPIC |
996 |
- |
997 |
---- iproute2-4.20.0/misc/Makefile |
998 |
-+++ iproute2-4.20.0/misc/Makefile |
999 |
-@@ -5,6 +5,7 @@ |
1000 |
- TARGETS=ss nstat ifstat rtacct lnstat |
1001 |
- |
1002 |
- include ../config.mk |
1003 |
-+include ../config.include |
1004 |
- |
1005 |
- ifeq ($(HAVE_BERKELEY_DB),y) |
1006 |
- TARGETS += arpd |
1007 |
---- iproute2-4.20.0/netem/Makefile |
1008 |
-+++ iproute2-4.20.0/netem/Makefile |
1009 |
-@@ -1,5 +1,6 @@ |
1010 |
- # SPDX-License-Identifier: GPL-2.0 |
1011 |
- include ../config.mk |
1012 |
-+include ../config.include |
1013 |
- |
1014 |
- DISTGEN = maketable normal pareto paretonormal |
1015 |
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist |
1016 |
---- iproute2-4.20.0/rdma/Makefile |
1017 |
-+++ iproute2-4.20.0/rdma/Makefile |
1018 |
-@@ -1,5 +1,6 @@ |
1019 |
- # SPDX-License-Identifier: GPL-2.0 |
1020 |
- include ../config.mk |
1021 |
-+include ../config.include |
1022 |
- |
1023 |
- TARGETS := |
1024 |
- |
1025 |
---- iproute2-4.20.0/tc/Makefile |
1026 |
-+++ iproute2-4.20.0/tc/Makefile |
1027 |
-@@ -4,6 +4,7 @@ |
1028 |
- emp_ematch.yacc.o emp_ematch.lex.o |
1029 |
- |
1030 |
- include ../config.mk |
1031 |
-+include ../config.include |
1032 |
- |
1033 |
- SHARED_LIBS ?= y |
1034 |
- |
1035 |
---- iproute2-4.20.0/tipc/Makefile |
1036 |
-+++ iproute2-4.20.0/tipc/Makefile |
1037 |
-@@ -1,5 +1,6 @@ |
1038 |
- # SPDX-License-Identifier: GPL-2.0 |
1039 |
- include ../config.mk |
1040 |
-+include ../config.include |
1041 |
- |
1042 |
- TARGETS := |
1043 |
- |
1044 |
|
1045 |
diff --git a/sys-apps/iproute2/files/iproute2-4.20.0-limits.patch b/sys-apps/iproute2/files/iproute2-4.20.0-limits.patch |
1046 |
deleted file mode 100644 |
1047 |
index f42ff0a..0000000 |
1048 |
--- a/sys-apps/iproute2/files/iproute2-4.20.0-limits.patch |
1049 |
+++ /dev/null |
1050 |
@@ -1,21 +0,0 @@ |
1051 |
-XATTR_SIZE_MAX requires the usage of linux/limits.h; let's include it |
1052 |
- |
1053 |
-Signed-off-by: Hans Dedecker <dedeckeh@xxxxxxxxx> |
1054 |
---- |
1055 |
- tc/f_flower.c | 1 + |
1056 |
- 1 file changed, 1 insertion(+) |
1057 |
- |
1058 |
-diff --git a/tc/f_flower.c b/tc/f_flower.c |
1059 |
-index c5636667..9659e894 100644 |
1060 |
---- a/tc/f_flower.c |
1061 |
-+++ b/tc/f_flower.c |
1062 |
-@@ -14,6 +14,7 @@ |
1063 |
- #include <unistd.h> |
1064 |
- #include <string.h> |
1065 |
- #include <net/if.h> |
1066 |
-+#include <linux/limits.h> |
1067 |
- #include <linux/if_arp.h> |
1068 |
- #include <linux/if_ether.h> |
1069 |
- #include <linux/ip.h> |
1070 |
--- |
1071 |
-2.19.1 |
1072 |
|
1073 |
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 |
1074 |
deleted file mode 100644 |
1075 |
index 31733e9..0000000 |
1076 |
--- a/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch |
1077 |
+++ /dev/null |
1078 |
@@ -1,38 +0,0 @@ |
1079 |
---- iproute2-4.20.0/ip/ipmonitor.c |
1080 |
-+++ iproute2-4.20.0/ip/ipmonitor.c |
1081 |
-@@ -118,7 +118,6 @@ |
1082 |
- |
1083 |
- case RTM_NEWPREFIX: |
1084 |
- print_headers(fp, "[PREFIX]", ctrl); |
1085 |
-- print_prefix(n, arg); |
1086 |
- return 0; |
1087 |
- |
1088 |
- case RTM_NEWRULE: |
1089 |
---- iproute2-4.20.0/ip/iptunnel.c |
1090 |
-+++ iproute2-4.20.0/ip/iptunnel.c |
1091 |
-@@ -549,13 +549,6 @@ |
1092 |
- break; |
1093 |
- case AF_INET: |
1094 |
- break; |
1095 |
-- /* |
1096 |
-- * This is silly enough but we have no easy way to make it |
1097 |
-- * protocol-independent because of unarranged structure between |
1098 |
-- * IPv4 and IPv6. |
1099 |
-- */ |
1100 |
-- case AF_INET6: |
1101 |
-- return do_ip6tunnel(argc, argv); |
1102 |
- default: |
1103 |
- fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family); |
1104 |
- exit(-1); |
1105 |
---- iproute2-4.20.0/ip/Makefile |
1106 |
-+++ iproute2-4.20.0/ip/Makefile |
1107 |
-@@ -1,7 +1,7 @@ |
1108 |
- # SPDX-License-Identifier: GPL-2.0 |
1109 |
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ |
1110 |
-- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ |
1111 |
-- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \ |
1112 |
-+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ |
1113 |
-+ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \ |
1114 |
- ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \ |
1115 |
- iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o iplink_vxcan.o \ |
1116 |
- iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \ |
1117 |
|
1118 |
diff --git a/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch b/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch |
1119 |
deleted file mode 100644 |
1120 |
index 3fdca40..0000000 |
1121 |
--- a/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch |
1122 |
+++ /dev/null |
1123 |
@@ -1,33 +0,0 @@ |
1124 |
-From 202d79fcf4e184818bd074f8c06e94e700670898 Mon Sep 17 00:00:00 2001 |
1125 |
-From: Jory Pratt <anarchy@g.o> |
1126 |
-Date: Tue, 11 Jun 2019 01:48:01 -0500 |
1127 |
-Subject: [PATCH] including sysinfo.h from kernel.h makes no sense whatsoever, |
1128 |
- but removing it breaks glibc's userspace header, which includes kernel.h |
1129 |
- instead of sysinfo.h from their sys/sysinfo.h. this seems to be a historical |
1130 |
- mistake. on musl, including any header that uses kernel.h directly or |
1131 |
- indirectly plus sys/sysinfo.h will produce a compile error due to |
1132 |
- redefinition of struct sysinfo. so for now, only include it on glibc in order |
1133 |
- not to break their headers. |
1134 |
- |
1135 |
-Signed-off-by: Jory Pratt <anarchy@g.o> |
1136 |
---- |
1137 |
- include/uapi/linux/kernel.h | 2 ++ |
1138 |
- 1 file changed, 2 insertions(+) |
1139 |
- |
1140 |
-diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h |
1141 |
-index d99ffa1..f917115 100644 |
1142 |
---- a/include/uapi/linux/kernel.h |
1143 |
-+++ b/include/uapi/linux/kernel.h |
1144 |
-@@ -2,7 +2,9 @@ |
1145 |
- #ifndef _LINUX_KERNEL_H |
1146 |
- #define _LINUX_KERNEL_H |
1147 |
- |
1148 |
-+#ifdef __GLIBC__ |
1149 |
- #include <linux/sysinfo.h> |
1150 |
-+#endif |
1151 |
- |
1152 |
- /* |
1153 |
- * 'kernel.h' contains some often-used function prototypes etc |
1154 |
--- |
1155 |
-2.22.0 |
1156 |
- |
1157 |
|
1158 |
diff --git a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild |
1159 |
deleted file mode 100644 |
1160 |
index 5c01038..0000000 |
1161 |
--- a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild |
1162 |
+++ /dev/null |
1163 |
@@ -1,154 +0,0 @@ |
1164 |
-# Copyright 1999-2020 Gentoo Authors |
1165 |
-# Distributed under the terms of the GNU General Public License v2 |
1166 |
- |
1167 |
-EAPI=6 |
1168 |
- |
1169 |
-inherit toolchain-funcs flag-o-matic multilib |
1170 |
- |
1171 |
-if [[ ${PV} == "9999" ]] ; then |
1172 |
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
1173 |
- inherit git-r3 |
1174 |
-else |
1175 |
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" |
1176 |
- KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" |
1177 |
-fi |
1178 |
- |
1179 |
-DESCRIPTION="kernel routing and traffic control utilities" |
1180 |
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
1181 |
- |
1182 |
-LICENSE="GPL-2" |
1183 |
-SLOT="0" |
1184 |
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" |
1185 |
- |
1186 |
-# We could make libmnl optional, but it's tiny, so eh |
1187 |
-RDEPEND=" |
1188 |
- !net-misc/arpd |
1189 |
- !minimal? ( net-libs/libmnl ) |
1190 |
- caps? ( sys-libs/libcap ) |
1191 |
- elf? ( virtual/libelf ) |
1192 |
- iptables? ( >=net-firewall/iptables-1.4.20:= ) |
1193 |
- berkdb? ( sys-libs/db:= ) |
1194 |
- atm? ( net-dialup/linux-atm ) |
1195 |
- selinux? ( sys-libs/libselinux ) |
1196 |
-" |
1197 |
-# We require newer linux-headers for ipset support #549948 and some defines #553876 |
1198 |
-DEPEND=" |
1199 |
- ${RDEPEND} |
1200 |
- app-arch/xz-utils |
1201 |
- iptables? ( virtual/pkgconfig ) |
1202 |
- >=sys-devel/bison-2.4 |
1203 |
- sys-devel/flex |
1204 |
- >=sys-kernel/linux-headers-3.16 |
1205 |
- elibc_glibc? ( >=sys-libs/glibc-2.7 ) |
1206 |
-" |
1207 |
- |
1208 |
-PATCHES=( |
1209 |
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
1210 |
- "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722 |
1211 |
- "${FILESDIR}"/${P}-musl.patch |
1212 |
-) |
1213 |
- |
1214 |
-src_prepare() { |
1215 |
- if ! use ipv6 ; then |
1216 |
- PATCHES+=( |
1217 |
- "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 |
1218 |
- ) |
1219 |
- fi |
1220 |
- |
1221 |
- default |
1222 |
- |
1223 |
- sed -i \ |
1224 |
- -e '/^CC :\?=/d' \ |
1225 |
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
1226 |
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ |
1227 |
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
1228 |
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
1229 |
- Makefile || die |
1230 |
- |
1231 |
- # Use /run instead of /var/run. |
1232 |
- sed -i \ |
1233 |
- -e 's:/var/run:/run:g' \ |
1234 |
- include/namespace.h \ |
1235 |
- man/man8/ip-netns.8 || die |
1236 |
- |
1237 |
- # build against system headers |
1238 |
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
1239 |
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
1240 |
- |
1241 |
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile |
1242 |
-} |
1243 |
- |
1244 |
-src_configure() { |
1245 |
- tc-export AR CC PKG_CONFIG |
1246 |
- |
1247 |
- # This sure is ugly. Should probably move into toolchain-funcs at some point. |
1248 |
- local setns |
1249 |
- pushd "${T}" >/dev/null |
1250 |
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
1251 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
1252 |
- echo 'int main(){return 0;}' > test.c |
1253 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
1254 |
- popd >/dev/null |
1255 |
- |
1256 |
- # run "configure" script first which will create "config.mk"... |
1257 |
- econf |
1258 |
- |
1259 |
- # ...now switch on/off requested features via USE flags |
1260 |
- # this is only useful if the test did not set other things, per bug #643722 |
1261 |
- cat <<-EOF >> config.mk |
1262 |
- TC_CONFIG_ATM := $(usex atm y n) |
1263 |
- TC_CONFIG_XT := $(usex iptables y n) |
1264 |
- TC_CONFIG_NO_XT := $(usex iptables n y) |
1265 |
- # We've locked in recent enough kernel headers #549948 |
1266 |
- TC_CONFIG_IPSET := y |
1267 |
- HAVE_BERKELEY_DB := $(usex berkdb y n) |
1268 |
- HAVE_CAP := $(usex caps y n) |
1269 |
- HAVE_MNL := $(usex minimal n y) |
1270 |
- HAVE_ELF := $(usex elf y n) |
1271 |
- HAVE_SELINUX := $(usex selinux y n) |
1272 |
- IP_CONFIG_SETNS := ${setns} |
1273 |
- # Use correct iptables dir, #144265 #293709 |
1274 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
1275 |
- EOF |
1276 |
-} |
1277 |
- |
1278 |
-src_compile() { |
1279 |
- emake V=1 |
1280 |
-} |
1281 |
- |
1282 |
-src_install() { |
1283 |
- if use minimal ; then |
1284 |
- into / |
1285 |
- dosbin tc/tc |
1286 |
- dobin ip/ip |
1287 |
- return 0 |
1288 |
- fi |
1289 |
- |
1290 |
- emake \ |
1291 |
- DESTDIR="${D}" \ |
1292 |
- LIBDIR="${EPREFIX%/}"/$(get_libdir) \ |
1293 |
- SBINDIR="${EPREFIX%/}"/sbin \ |
1294 |
- CONFDIR="${EPREFIX%/}"/etc/iproute2 \ |
1295 |
- DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ |
1296 |
- MANDIR="${EPREFIX%/}"/usr/share/man \ |
1297 |
- ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ |
1298 |
- install |
1299 |
- |
1300 |
- dodir /bin |
1301 |
- mv "${ED%/}"/{s,}bin/ip || die #330115 |
1302 |
- |
1303 |
- dolib.a lib/libnetlink.a |
1304 |
- insinto /usr/include |
1305 |
- doins include/libnetlink.h |
1306 |
- # This local header pulls in a lot of linux headers it |
1307 |
- # doesn't directly need. Delete this header that requires |
1308 |
- # linux-headers-3.8 until that goes stable. #467716 |
1309 |
- sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die |
1310 |
- |
1311 |
- if use berkdb ; then |
1312 |
- dodir /var/lib/arpd |
1313 |
- # bug 47482, arpd doesn't need to be in /sbin |
1314 |
- dodir /usr/bin |
1315 |
- mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die |
1316 |
- fi |
1317 |
-} |
1318 |
|
1319 |
diff --git a/sys-apps/iproute2/iproute2-4.17.0.ebuild b/sys-apps/iproute2/iproute2-4.17.0.ebuild |
1320 |
deleted file mode 100644 |
1321 |
index 7c90076..0000000 |
1322 |
--- a/sys-apps/iproute2/iproute2-4.17.0.ebuild |
1323 |
+++ /dev/null |
1324 |
@@ -1,152 +0,0 @@ |
1325 |
-# Copyright 1999-2020 Gentoo Authors |
1326 |
-# Distributed under the terms of the GNU General Public License v2 |
1327 |
- |
1328 |
-EAPI=6 |
1329 |
- |
1330 |
-inherit toolchain-funcs flag-o-matic multilib |
1331 |
- |
1332 |
-if [[ ${PV} == "9999" ]] ; then |
1333 |
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
1334 |
- inherit git-r3 |
1335 |
-else |
1336 |
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" |
1337 |
- KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86" |
1338 |
-fi |
1339 |
- |
1340 |
-DESCRIPTION="kernel routing and traffic control utilities" |
1341 |
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
1342 |
- |
1343 |
-LICENSE="GPL-2" |
1344 |
-SLOT="0" |
1345 |
-IUSE="atm berkdb elf +iptables ipv6 minimal selinux" |
1346 |
- |
1347 |
-# We could make libmnl optional, but it's tiny, so eh |
1348 |
-RDEPEND=" |
1349 |
- !net-misc/arpd |
1350 |
- !minimal? ( net-libs/libmnl ) |
1351 |
- elf? ( virtual/libelf ) |
1352 |
- iptables? ( >=net-firewall/iptables-1.4.20:= ) |
1353 |
- berkdb? ( sys-libs/db:= ) |
1354 |
- atm? ( net-dialup/linux-atm ) |
1355 |
- selinux? ( sys-libs/libselinux ) |
1356 |
-" |
1357 |
-# We require newer linux-headers for ipset support #549948 and some defines #553876 |
1358 |
-DEPEND=" |
1359 |
- ${RDEPEND} |
1360 |
- app-arch/xz-utils |
1361 |
- iptables? ( virtual/pkgconfig ) |
1362 |
- >=sys-devel/bison-2.4 |
1363 |
- sys-devel/flex |
1364 |
- >=sys-kernel/linux-headers-3.16 |
1365 |
- elibc_glibc? ( >=sys-libs/glibc-2.7 ) |
1366 |
-" |
1367 |
- |
1368 |
-PATCHES=( |
1369 |
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
1370 |
- "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722 |
1371 |
- "${FILESDIR}"/${P}-musl.patch |
1372 |
-) |
1373 |
- |
1374 |
-src_prepare() { |
1375 |
- if ! use ipv6 ; then |
1376 |
- PATCHES+=( |
1377 |
- "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 |
1378 |
- ) |
1379 |
- fi |
1380 |
- |
1381 |
- default |
1382 |
- |
1383 |
- sed -i \ |
1384 |
- -e '/^CC :\?=/d' \ |
1385 |
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
1386 |
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ |
1387 |
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
1388 |
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
1389 |
- Makefile || die |
1390 |
- |
1391 |
- # Use /run instead of /var/run. |
1392 |
- sed -i \ |
1393 |
- -e 's:/var/run:/run:g' \ |
1394 |
- include/namespace.h \ |
1395 |
- man/man8/ip-netns.8 || die |
1396 |
- |
1397 |
- # build against system headers |
1398 |
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
1399 |
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
1400 |
- |
1401 |
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile |
1402 |
-} |
1403 |
- |
1404 |
-src_configure() { |
1405 |
- tc-export AR CC PKG_CONFIG |
1406 |
- |
1407 |
- # This sure is ugly. Should probably move into toolchain-funcs at some point. |
1408 |
- local setns |
1409 |
- pushd "${T}" >/dev/null |
1410 |
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
1411 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
1412 |
- echo 'int main(){return 0;}' > test.c |
1413 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
1414 |
- popd >/dev/null |
1415 |
- |
1416 |
- # run "configure" script first which will create "config.mk"... |
1417 |
- econf |
1418 |
- |
1419 |
- # ...now switch on/off requested features via USE flags |
1420 |
- # this is only useful if the test did not set other things, per bug #643722 |
1421 |
- cat <<-EOF >> config.mk |
1422 |
- TC_CONFIG_ATM := $(usex atm y n) |
1423 |
- TC_CONFIG_XT := $(usex iptables y n) |
1424 |
- TC_CONFIG_NO_XT := $(usex iptables n y) |
1425 |
- # We've locked in recent enough kernel headers #549948 |
1426 |
- TC_CONFIG_IPSET := y |
1427 |
- HAVE_BERKELEY_DB := $(usex berkdb y n) |
1428 |
- HAVE_MNL := $(usex minimal n y) |
1429 |
- HAVE_ELF := $(usex elf y n) |
1430 |
- HAVE_SELINUX := $(usex selinux y n) |
1431 |
- IP_CONFIG_SETNS := ${setns} |
1432 |
- # Use correct iptables dir, #144265 #293709 |
1433 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
1434 |
- EOF |
1435 |
-} |
1436 |
- |
1437 |
-src_compile() { |
1438 |
- emake V=1 |
1439 |
-} |
1440 |
- |
1441 |
-src_install() { |
1442 |
- if use minimal ; then |
1443 |
- into / |
1444 |
- dosbin tc/tc |
1445 |
- dobin ip/ip |
1446 |
- return 0 |
1447 |
- fi |
1448 |
- |
1449 |
- emake \ |
1450 |
- DESTDIR="${D}" \ |
1451 |
- LIBDIR="${EPREFIX%/}"/$(get_libdir) \ |
1452 |
- SBINDIR="${EPREFIX%/}"/sbin \ |
1453 |
- CONFDIR="${EPREFIX%/}"/etc/iproute2 \ |
1454 |
- DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ |
1455 |
- MANDIR="${EPREFIX%/}"/usr/share/man \ |
1456 |
- ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ |
1457 |
- install |
1458 |
- |
1459 |
- dodir /bin |
1460 |
- mv "${ED%/}"/{s,}bin/ip || die #330115 |
1461 |
- |
1462 |
- dolib.a lib/libnetlink.a |
1463 |
- insinto /usr/include |
1464 |
- doins include/libnetlink.h |
1465 |
- # This local header pulls in a lot of linux headers it |
1466 |
- # doesn't directly need. Delete this header that requires |
1467 |
- # linux-headers-3.8 until that goes stable. #467716 |
1468 |
- sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die |
1469 |
- |
1470 |
- if use berkdb ; then |
1471 |
- dodir /var/lib/arpd |
1472 |
- # bug 47482, arpd doesn't need to be in /sbin |
1473 |
- dodir /usr/bin |
1474 |
- mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die |
1475 |
- fi |
1476 |
-} |
1477 |
|
1478 |
diff --git a/sys-apps/iproute2/iproute2-4.20.0.ebuild b/sys-apps/iproute2/iproute2-4.20.0.ebuild |
1479 |
deleted file mode 100644 |
1480 |
index 5b654d9..0000000 |
1481 |
--- a/sys-apps/iproute2/iproute2-4.20.0.ebuild |
1482 |
+++ /dev/null |
1483 |
@@ -1,156 +0,0 @@ |
1484 |
-# Copyright 1999-2020 Gentoo Authors |
1485 |
-# Distributed under the terms of the GNU General Public License v2 |
1486 |
- |
1487 |
-EAPI=6 |
1488 |
- |
1489 |
-inherit toolchain-funcs flag-o-matic multilib |
1490 |
- |
1491 |
-if [[ ${PV} == "9999" ]] ; then |
1492 |
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
1493 |
- inherit git-r3 |
1494 |
-else |
1495 |
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" |
1496 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
1497 |
-fi |
1498 |
- |
1499 |
-DESCRIPTION="kernel routing and traffic control utilities" |
1500 |
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
1501 |
- |
1502 |
-LICENSE="GPL-2" |
1503 |
-SLOT="0" |
1504 |
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" |
1505 |
- |
1506 |
-# We could make libmnl optional, but it's tiny, so eh |
1507 |
-RDEPEND=" |
1508 |
- !net-misc/arpd |
1509 |
- dev-libs/libbsd |
1510 |
- !minimal? ( net-libs/libmnl ) |
1511 |
- caps? ( sys-libs/libcap ) |
1512 |
- elf? ( virtual/libelf ) |
1513 |
- iptables? ( >=net-firewall/iptables-1.4.20:= ) |
1514 |
- berkdb? ( sys-libs/db:= ) |
1515 |
- atm? ( net-dialup/linux-atm ) |
1516 |
- selinux? ( sys-libs/libselinux ) |
1517 |
-" |
1518 |
-# We require newer linux-headers for ipset support #549948 and some defines #553876 |
1519 |
-DEPEND=" |
1520 |
- ${RDEPEND} |
1521 |
- app-arch/xz-utils |
1522 |
- iptables? ( virtual/pkgconfig ) |
1523 |
- >=sys-devel/bison-2.4 |
1524 |
- sys-devel/flex |
1525 |
- >=sys-kernel/linux-headers-3.16 |
1526 |
- virtual/pkgconfig |
1527 |
- elibc_glibc? ( >=sys-libs/glibc-2.7 ) |
1528 |
-" |
1529 |
- |
1530 |
-PATCHES=( |
1531 |
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
1532 |
- "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 |
1533 |
- "${FILESDIR}"/${PN}-4.20.0-limits.patch |
1534 |
-) |
1535 |
- |
1536 |
-src_prepare() { |
1537 |
- if ! use ipv6 ; then |
1538 |
- PATCHES+=( |
1539 |
- "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 |
1540 |
- ) |
1541 |
- fi |
1542 |
- |
1543 |
- default |
1544 |
- |
1545 |
- sed -i \ |
1546 |
- -e '/^CC :\?=/d' \ |
1547 |
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
1548 |
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ |
1549 |
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
1550 |
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
1551 |
- Makefile || die |
1552 |
- |
1553 |
- # Use /run instead of /var/run. |
1554 |
- sed -i \ |
1555 |
- -e 's:/var/run:/run:g' \ |
1556 |
- include/namespace.h \ |
1557 |
- man/man8/ip-netns.8 || die |
1558 |
- |
1559 |
- # build against system headers |
1560 |
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
1561 |
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
1562 |
- |
1563 |
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile |
1564 |
-} |
1565 |
- |
1566 |
-src_configure() { |
1567 |
- tc-export AR CC PKG_CONFIG |
1568 |
- |
1569 |
- # This sure is ugly. Should probably move into toolchain-funcs at some point. |
1570 |
- local setns |
1571 |
- pushd "${T}" >/dev/null |
1572 |
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
1573 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
1574 |
- echo 'int main(){return 0;}' > test.c |
1575 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
1576 |
- popd >/dev/null |
1577 |
- |
1578 |
- # run "configure" script first which will create "config.mk"... |
1579 |
- econf |
1580 |
- |
1581 |
- # ...now switch on/off requested features via USE flags |
1582 |
- # this is only useful if the test did not set other things, per bug #643722 |
1583 |
- cat <<-EOF >> config.mk |
1584 |
- TC_CONFIG_ATM := $(usex atm y n) |
1585 |
- TC_CONFIG_XT := $(usex iptables y n) |
1586 |
- TC_CONFIG_NO_XT := $(usex iptables n y) |
1587 |
- # We've locked in recent enough kernel headers #549948 |
1588 |
- TC_CONFIG_IPSET := y |
1589 |
- HAVE_BERKELEY_DB := $(usex berkdb y n) |
1590 |
- HAVE_CAP := $(usex caps y n) |
1591 |
- HAVE_MNL := $(usex minimal n y) |
1592 |
- HAVE_ELF := $(usex elf y n) |
1593 |
- HAVE_SELINUX := $(usex selinux y n) |
1594 |
- IP_CONFIG_SETNS := ${setns} |
1595 |
- # Use correct iptables dir, #144265 #293709 |
1596 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
1597 |
- EOF |
1598 |
-} |
1599 |
- |
1600 |
-src_compile() { |
1601 |
- emake V=1 |
1602 |
-} |
1603 |
- |
1604 |
-src_install() { |
1605 |
- if use minimal ; then |
1606 |
- into / |
1607 |
- dosbin tc/tc |
1608 |
- dobin ip/ip |
1609 |
- return 0 |
1610 |
- fi |
1611 |
- |
1612 |
- emake \ |
1613 |
- DESTDIR="${D}" \ |
1614 |
- LIBDIR="${EPREFIX%/}"/$(get_libdir) \ |
1615 |
- SBINDIR="${EPREFIX%/}"/sbin \ |
1616 |
- CONFDIR="${EPREFIX%/}"/etc/iproute2 \ |
1617 |
- DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ |
1618 |
- MANDIR="${EPREFIX%/}"/usr/share/man \ |
1619 |
- ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ |
1620 |
- install |
1621 |
- |
1622 |
- dodir /bin |
1623 |
- mv "${ED%/}"/{s,}bin/ip || die #330115 |
1624 |
- |
1625 |
- dolib.a lib/libnetlink.a |
1626 |
- insinto /usr/include |
1627 |
- doins include/libnetlink.h |
1628 |
- # This local header pulls in a lot of linux headers it |
1629 |
- # doesn't directly need. Delete this header that requires |
1630 |
- # linux-headers-3.8 until that goes stable. #467716 |
1631 |
- sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die |
1632 |
- |
1633 |
- if use berkdb ; then |
1634 |
- dodir /var/lib/arpd |
1635 |
- # bug 47482, arpd doesn't need to be in /sbin |
1636 |
- dodir /usr/bin |
1637 |
- mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die |
1638 |
- fi |
1639 |
-} |
1640 |
|
1641 |
diff --git a/sys-apps/iproute2/iproute2-5.2.0.ebuild b/sys-apps/iproute2/iproute2-5.2.0.ebuild |
1642 |
deleted file mode 100644 |
1643 |
index f77a9c4..0000000 |
1644 |
--- a/sys-apps/iproute2/iproute2-5.2.0.ebuild |
1645 |
+++ /dev/null |
1646 |
@@ -1,162 +0,0 @@ |
1647 |
-# Copyright 1999-2019 Gentoo Authors |
1648 |
-# Distributed under the terms of the GNU General Public License v2 |
1649 |
- |
1650 |
-EAPI=7 |
1651 |
- |
1652 |
-inherit toolchain-funcs flag-o-matic multilib |
1653 |
- |
1654 |
-if [[ ${PV} == "9999" ]] ; then |
1655 |
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
1656 |
- inherit git-r3 |
1657 |
-else |
1658 |
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" |
1659 |
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" |
1660 |
-fi |
1661 |
- |
1662 |
-DESCRIPTION="kernel routing and traffic control utilities" |
1663 |
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
1664 |
- |
1665 |
-LICENSE="GPL-2" |
1666 |
-SLOT="0" |
1667 |
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" |
1668 |
- |
1669 |
-# We could make libmnl optional, but it's tiny, so eh |
1670 |
-RDEPEND=" |
1671 |
- !net-misc/arpd |
1672 |
- dev-libs/libbsd |
1673 |
- !minimal? ( net-libs/libmnl ) |
1674 |
- caps? ( sys-libs/libcap ) |
1675 |
- elf? ( virtual/libelf ) |
1676 |
- iptables? ( >=net-firewall/iptables-1.4.20:= ) |
1677 |
- berkdb? ( sys-libs/db:= ) |
1678 |
- atm? ( net-dialup/linux-atm ) |
1679 |
- selinux? ( sys-libs/libselinux ) |
1680 |
- elibc_musl? ( sys-libs/queue-standalone ) |
1681 |
-" |
1682 |
-# We require newer linux-headers for ipset support #549948 and some defines #553876 |
1683 |
-DEPEND=" |
1684 |
- ${RDEPEND} |
1685 |
- >=sys-kernel/linux-headers-3.16 |
1686 |
-" |
1687 |
-BDEPEND=" |
1688 |
- app-arch/xz-utils |
1689 |
- >=sys-devel/bison-2.4 |
1690 |
- sys-devel/flex |
1691 |
- virtual/pkgconfig |
1692 |
-" |
1693 |
- |
1694 |
-PATCHES=( |
1695 |
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
1696 |
- "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 |
1697 |
- "${FILESDIR}"/${PN}-5.1.0-portability.patch |
1698 |
-) |
1699 |
- |
1700 |
-src_prepare() { |
1701 |
- if ! use ipv6 ; then |
1702 |
- PATCHES+=( |
1703 |
- "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 |
1704 |
- ) |
1705 |
- fi |
1706 |
- |
1707 |
- default |
1708 |
- |
1709 |
- # echo -n is not POSIX compliant |
1710 |
- sed 's@echo -n@printf@' -i configure || die |
1711 |
- |
1712 |
- sed -i \ |
1713 |
- -e '/^CC :\?=/d' \ |
1714 |
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
1715 |
- -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ |
1716 |
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
1717 |
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
1718 |
- Makefile || die |
1719 |
- |
1720 |
- # Use /run instead of /var/run. |
1721 |
- sed -i \ |
1722 |
- -e 's:/var/run:/run:g' \ |
1723 |
- include/namespace.h \ |
1724 |
- man/man8/ip-netns.8 || die |
1725 |
- |
1726 |
- # build against system headers |
1727 |
- rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
1728 |
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
1729 |
- |
1730 |
- if use minimal ; then |
1731 |
- sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die |
1732 |
- fi |
1733 |
-} |
1734 |
- |
1735 |
-src_configure() { |
1736 |
- tc-export AR CC PKG_CONFIG |
1737 |
- |
1738 |
- # This sure is ugly. Should probably move into toolchain-funcs at some point. |
1739 |
- local setns |
1740 |
- pushd "${T}" >/dev/null |
1741 |
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
1742 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
1743 |
- echo 'int main(){return 0;}' > test.c |
1744 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
1745 |
- popd >/dev/null |
1746 |
- |
1747 |
- # run "configure" script first which will create "config.mk"... |
1748 |
- econf |
1749 |
- |
1750 |
- # ...now switch on/off requested features via USE flags |
1751 |
- # this is only useful if the test did not set other things, per bug #643722 |
1752 |
- cat <<-EOF >> config.mk |
1753 |
- TC_CONFIG_ATM := $(usex atm y n) |
1754 |
- TC_CONFIG_XT := $(usex iptables y n) |
1755 |
- TC_CONFIG_NO_XT := $(usex iptables n y) |
1756 |
- # We've locked in recent enough kernel headers #549948 |
1757 |
- TC_CONFIG_IPSET := y |
1758 |
- HAVE_BERKELEY_DB := $(usex berkdb y n) |
1759 |
- HAVE_CAP := $(usex caps y n) |
1760 |
- HAVE_MNL := $(usex minimal n y) |
1761 |
- HAVE_ELF := $(usex elf y n) |
1762 |
- HAVE_SELINUX := $(usex selinux y n) |
1763 |
- IP_CONFIG_SETNS := ${setns} |
1764 |
- # Use correct iptables dir, #144265 #293709 |
1765 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
1766 |
- EOF |
1767 |
-} |
1768 |
- |
1769 |
-src_compile() { |
1770 |
- emake V=1 |
1771 |
-} |
1772 |
- |
1773 |
-src_install() { |
1774 |
- if use minimal ; then |
1775 |
- into / |
1776 |
- dosbin tc/tc |
1777 |
- dobin ip/ip |
1778 |
- return 0 |
1779 |
- fi |
1780 |
- |
1781 |
- emake \ |
1782 |
- DESTDIR="${D}" \ |
1783 |
- LIBDIR="${EPREFIX}"/$(get_libdir) \ |
1784 |
- SBINDIR="${EPREFIX}"/sbin \ |
1785 |
- CONFDIR="${EPREFIX}"/etc/iproute2 \ |
1786 |
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ |
1787 |
- MANDIR="${EPREFIX}"/usr/share/man \ |
1788 |
- ARPDDIR="${EPREFIX}"/var/lib/arpd \ |
1789 |
- install |
1790 |
- |
1791 |
- dodir /bin |
1792 |
- mv "${ED}"/{s,}bin/ip || die #330115 |
1793 |
- |
1794 |
- dolib.a lib/libnetlink.a |
1795 |
- insinto /usr/include |
1796 |
- doins include/libnetlink.h |
1797 |
- # This local header pulls in a lot of linux headers it |
1798 |
- # doesn't directly need. Delete this header that requires |
1799 |
- # linux-headers-3.8 until that goes stable. #467716 |
1800 |
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die |
1801 |
- |
1802 |
- if use berkdb ; then |
1803 |
- keepdir /var/lib/arpd |
1804 |
- # bug 47482, arpd doesn't need to be in /sbin |
1805 |
- dodir /usr/bin |
1806 |
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die |
1807 |
- fi |
1808 |
-} |
1809 |
|
1810 |
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml |
1811 |
deleted file mode 100644 |
1812 |
index ad652ef..0000000 |
1813 |
--- a/sys-apps/iproute2/metadata.xml |
1814 |
+++ /dev/null |
1815 |
@@ -1,14 +0,0 @@ |
1816 |
-<?xml version="1.0" encoding="UTF-8"?> |
1817 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1818 |
-<pkgmetadata> |
1819 |
-<maintainer type="project"> |
1820 |
- <email>base-system@g.o</email> |
1821 |
- <name>Gentoo Base System</name> |
1822 |
-</maintainer> |
1823 |
-<use> |
1824 |
- <flag name="berkdb">build programs that use berkdb (just arpd)</flag> |
1825 |
- <flag name="elf">support loading eBPF programs from ELFs (e.g. LLVM's eBPF backend)</flag> |
1826 |
- <flag name="iptables">include support for iptables filtering</flag> |
1827 |
- <flag name="minimal">only install ip and tc programs, without eBPF support</flag> |
1828 |
-</use> |
1829 |
-</pkgmetadata> |