1 |
commit: 1efc25075df9726cab1467d87848a6eda46adce5 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 1 07:17:03 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 1 07:17:26 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1efc2507 |
7 |
|
8 |
sys-apps/iproute2: Removed old |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
sys-apps/iproute2/Manifest | 2 - |
13 |
.../files/iproute2-5.1.0-portability.patch | 32 --- |
14 |
.../files/iproute2-5.10.0-configure-nomagic.patch | 226 --------------------- |
15 |
sys-apps/iproute2/iproute2-5.10.0-r2.ebuild | 168 --------------- |
16 |
sys-apps/iproute2/iproute2-5.12.0-r1.ebuild | 170 ---------------- |
17 |
5 files changed, 598 deletions(-) |
18 |
|
19 |
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest |
20 |
index 7d50a0780cd..144ab4b2b34 100644 |
21 |
--- a/sys-apps/iproute2/Manifest |
22 |
+++ b/sys-apps/iproute2/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST iproute2-5.10.0.tar.xz 798776 BLAKE2B 8c17e65f03427f45b71dc17b289b272545549a6687257498676a23e4fdc4a590a7215bfdba3c7ac4b1ccde6c38ba8e3eb222eea2532374fa9680633aa198d347 SHA512 a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13 |
25 |
-DIST iproute2-5.12.0.tar.xz 835880 BLAKE2B 8e3e1b7188d7ab5014d06d7edaae2cb0c1dc65862999a2ca9f31902256d7f3d166de8a1c76e4e137acce2b445d72ea6850bfec3640d1919cb82351d45dd3e47e SHA512 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac |
26 |
DIST iproute2-5.13.0.tar.xz 845236 BLAKE2B e1c148e2a720236163e7f4d46aa38d244a02ae36ad86571c5606d54c9ccfd8d0363e2fb793d48cf39aae322b3c36b9f8a43eaf570dbdb8243092926cef3d2786 SHA512 a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d |
27 |
DIST iproute2-5.14.0.tar.xz 853572 BLAKE2B 52544021798f2cb716a57998d98dadc2441142b02d38c7e274bc17a6e5f994bdb5bd3ebf0b896bfd7e327a44f00f92c2af8e67367cdc0aac70769d563082f543 SHA512 e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c |
28 |
|
29 |
diff --git a/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch b/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch |
30 |
deleted file mode 100644 |
31 |
index e704f65c113..00000000000 |
32 |
--- a/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch |
33 |
+++ /dev/null |
34 |
@@ -1,32 +0,0 @@ |
35 |
-From 202d79fcf4e184818bd074f8c06e94e700670898 Mon Sep 17 00:00:00 2001 |
36 |
-From: Jory Pratt <anarchy@g.o> |
37 |
-Date: Tue, 11 Jun 2019 01:48:01 -0500 |
38 |
-Subject: [PATCH] including sysinfo.h from kernel.h makes no sense whatsoever, |
39 |
- but removing it breaks glibc's userspace header, which includes kernel.h |
40 |
- instead of sysinfo.h from their sys/sysinfo.h. this seems to be a historical |
41 |
- mistake. on musl, including any header that uses kernel.h directly or |
42 |
- indirectly plus sys/sysinfo.h will produce a compile error due to |
43 |
- redefinition of struct sysinfo. so for now, only include it on glibc in order |
44 |
- not to break their headers. |
45 |
- |
46 |
-Signed-off-by: Jory Pratt <anarchy@g.o> |
47 |
---- |
48 |
- include/uapi/linux/kernel.h | 2 ++ |
49 |
- 1 file changed, 2 insertions(+) |
50 |
- |
51 |
-diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h |
52 |
-index d99ffa1..f917115 100644 |
53 |
---- a/include/uapi/linux/kernel.h |
54 |
-+++ b/include/uapi/linux/kernel.h |
55 |
-@@ -2,7 +2,9 @@ |
56 |
- #ifndef _LINUX_KERNEL_H |
57 |
- #define _LINUX_KERNEL_H |
58 |
- |
59 |
-+#ifdef __GLIBC__ |
60 |
- #include <linux/sysinfo.h> |
61 |
-+#endif |
62 |
- |
63 |
- /* |
64 |
- * 'kernel.h' contains some often-used function prototypes etc |
65 |
--- |
66 |
-2.22.0 |
67 |
|
68 |
diff --git a/sys-apps/iproute2/files/iproute2-5.10.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-5.10.0-configure-nomagic.patch |
69 |
deleted file mode 100644 |
70 |
index cf8ca335f21..00000000000 |
71 |
--- a/sys-apps/iproute2/files/iproute2-5.10.0-configure-nomagic.patch |
72 |
+++ /dev/null |
73 |
@@ -1,226 +0,0 @@ |
74 |
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets |
75 |
-a variable as well as modifying CFLAGS & LDLIBS. |
76 |
- |
77 |
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks |
78 |
-are still in place. |
79 |
- |
80 |
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they |
81 |
-are only passed when correctly needed. |
82 |
- |
83 |
-Prior Gentoo testcase for reproduction: |
84 |
-USE=minimal ebuild ... compile. |
85 |
-- Linking with libelf, libmnl & libcap based only on presence. |
86 |
-- Links based on libselinux based only on presence. |
87 |
- |
88 |
-Closes: https://bugs.gentoo.org/643722 |
89 |
-Signed-off-by: Robin H. Johnson <robbat2@g.o> |
90 |
- |
91 |
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o> |
92 |
-Added libcap to v4.17.0 by Lars Wendler <polynomial-c@g.o> |
93 |
-Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@g.o> |
94 |
-Forward-ported from v4.20.0 to v5.10.0 by Lars Wendler <polynomial-c@g.o> |
95 |
- |
96 |
---- iproute2-5.10.0/bridge/Makefile |
97 |
-+++ iproute2-5.10.0/bridge/Makefile |
98 |
-@@ -2,6 +2,7 @@ |
99 |
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o |
100 |
- |
101 |
- include ../config.mk |
102 |
-+include ../config.include |
103 |
- |
104 |
- all: bridge |
105 |
- |
106 |
---- iproute2-5.10.0/config.include |
107 |
-+++ iproute2-5.10.0/config.include |
108 |
-@@ -0,0 +1,32 @@ |
109 |
-+# We can only modify CFLAGS/LDLIBS after all the config options are known. |
110 |
-+ifeq ($(IP_CONFIG_SETNS),y) |
111 |
-+ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) |
112 |
-+endif |
113 |
-+ifeq ($(HAVE_ELF),y) |
114 |
-+ CFLAGS += $(HAVE_ELF_CFLAGS) |
115 |
-+ LDLIBS += $(HAVE_ELF_LDLIBS) |
116 |
-+endif |
117 |
-+ifeq ($(HAVE_SELINUX),y) |
118 |
-+ CFLAGS += $(HAVE_SELINUX_CFLAGS) |
119 |
-+ LDLIBS += $(HAVE_SELINUX_LDLIBS) |
120 |
-+endif |
121 |
-+ifeq ($(HAVE_MNL),y) |
122 |
-+ CFLAGS += $(HAVE_MNL_CFLAGS) |
123 |
-+ LDLIBS += $(HAVE_MNL_LDLIBS) |
124 |
-+endif |
125 |
-+ifeq ($(HAVE_CAP),y) |
126 |
-+ CFLAGS += $(HAVE_CAP_CFLAGS) |
127 |
-+ LDLIBS += $(HAVE_CAP_LDLIBS) |
128 |
-+endif |
129 |
-+ifeq ($(HAVE_LIBBSD),y) |
130 |
-+ CFLAGS += $(HAVE_LIBBSD_CFLAGS) |
131 |
-+ LDLIBS += $(HAVE_LIBBSD_LDLIBS) |
132 |
-+else |
133 |
-+ CFLAGS += -DNEED_STRLCPY |
134 |
-+endif |
135 |
-+ |
136 |
-+# Rules can only be declared after all variables in them are known. |
137 |
-+%.o: %.c |
138 |
-+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $< |
139 |
-+ |
140 |
-+# vim: ft=make: |
141 |
---- iproute2-5.10.0/configure |
142 |
-+++ iproute2-5.10.0/configure |
143 |
-@@ -190,7 +190,7 @@ |
144 |
- if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then |
145 |
- echo "IP_CONFIG_SETNS:=y" >>$CONFIG |
146 |
- echo "yes" |
147 |
-- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG |
148 |
-+ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG |
149 |
- else |
150 |
- echo "no" |
151 |
- fi |
152 |
-@@ -233,8 +233,8 @@ |
153 |
- echo "HAVE_ELF:=y" >>$CONFIG |
154 |
- echo "yes" |
155 |
- |
156 |
-- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG |
157 |
-- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG |
158 |
-+ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG |
159 |
-+ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG |
160 |
- else |
161 |
- echo "no" |
162 |
- fi |
163 |
-@@ -247,8 +247,8 @@ |
164 |
- echo "HAVE_SELINUX:=y" >>$CONFIG |
165 |
- echo "yes" |
166 |
- |
167 |
-- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG |
168 |
-- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG |
169 |
-+ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG |
170 |
-+ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG |
171 |
- else |
172 |
- echo "no" |
173 |
- fi |
174 |
-@@ -260,8 +260,8 @@ |
175 |
- echo "HAVE_MNL:=y" >>$CONFIG |
176 |
- echo "yes" |
177 |
- |
178 |
-- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG |
179 |
-- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG |
180 |
-+ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG |
181 |
-+ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG |
182 |
- else |
183 |
- echo "no" |
184 |
- fi |
185 |
-@@ -301,8 +301,8 @@ |
186 |
- echo "no" |
187 |
- else |
188 |
- if ${PKG_CONFIG} libbsd --exists; then |
189 |
-- echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG |
190 |
-- echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG |
191 |
-+ echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG |
192 |
-+ echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG |
193 |
- echo "no" |
194 |
- else |
195 |
- echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG |
196 |
-@@ -318,8 +318,8 @@ |
197 |
- echo "HAVE_CAP:=y" >>$CONFIG |
198 |
- echo "yes" |
199 |
- |
200 |
-- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG |
201 |
-- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG |
202 |
-+ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG |
203 |
-+ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG |
204 |
- else |
205 |
- echo "no" |
206 |
- fi |
207 |
-@@ -399,7 +399,3 @@ |
208 |
- |
209 |
- echo -n "libcap support: " |
210 |
- check_cap |
211 |
-- |
212 |
--echo >> $CONFIG |
213 |
--echo "%.o: %.c" >> $CONFIG |
214 |
--echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG |
215 |
---- iproute2-5.10.0/devlink/Makefile |
216 |
-+++ iproute2-5.10.0/devlink/Makefile |
217 |
-@@ -1,5 +1,6 @@ |
218 |
- # SPDX-License-Identifier: GPL-2.0 |
219 |
- include ../config.mk |
220 |
-+include ../config.include |
221 |
- |
222 |
- TARGETS := |
223 |
- |
224 |
---- iproute2-5.10.0/genl/Makefile |
225 |
-+++ iproute2-5.10.0/genl/Makefile |
226 |
-@@ -2,6 +2,7 @@ |
227 |
- GENLOBJ=genl.o |
228 |
- |
229 |
- include ../config.mk |
230 |
-+include ../config.include |
231 |
- SHARED_LIBS ?= y |
232 |
- |
233 |
- CFLAGS += -fno-strict-aliasing |
234 |
---- iproute2-5.10.0/ip/Makefile |
235 |
-+++ iproute2-5.10.0/ip/Makefile |
236 |
-@@ -16,6 +16,7 @@ |
237 |
- RTMONOBJ=rtmon.o |
238 |
- |
239 |
- include ../config.mk |
240 |
-+include ../config.include |
241 |
- |
242 |
- ALLOBJ=$(IPOBJ) $(RTMONOBJ) |
243 |
- SCRIPTS=ifcfg rtpr routel routef |
244 |
---- iproute2-5.10.0/lib/Makefile |
245 |
-+++ iproute2-5.10.0/lib/Makefile |
246 |
-@@ -1,5 +1,6 @@ |
247 |
- # SPDX-License-Identifier: GPL-2.0 |
248 |
- include ../config.mk |
249 |
-+include ../config.include |
250 |
- |
251 |
- CFLAGS += -fPIC |
252 |
- |
253 |
---- iproute2-5.10.0/misc/Makefile |
254 |
-+++ iproute2-5.10.0/misc/Makefile |
255 |
-@@ -5,6 +5,7 @@ |
256 |
- TARGETS=ss nstat ifstat rtacct lnstat |
257 |
- |
258 |
- include ../config.mk |
259 |
-+include ../config.include |
260 |
- |
261 |
- ifeq ($(HAVE_BERKELEY_DB),y) |
262 |
- TARGETS += arpd |
263 |
---- iproute2-5.10.0/netem/Makefile |
264 |
-+++ iproute2-5.10.0/netem/Makefile |
265 |
-@@ -1,5 +1,6 @@ |
266 |
- # SPDX-License-Identifier: GPL-2.0 |
267 |
- include ../config.mk |
268 |
-+include ../config.include |
269 |
- |
270 |
- DISTGEN = maketable normal pareto paretonormal |
271 |
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist |
272 |
---- iproute2-5.10.0/rdma/Makefile |
273 |
-+++ iproute2-5.10.0/rdma/Makefile |
274 |
-@@ -1,5 +1,6 @@ |
275 |
- # SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB |
276 |
- include ../config.mk |
277 |
-+include ../config.include |
278 |
- |
279 |
- TARGETS := |
280 |
- |
281 |
---- iproute2-5.10.0/tc/Makefile |
282 |
-+++ iproute2-5.10.0/tc/Makefile |
283 |
-@@ -4,6 +4,7 @@ |
284 |
- emp_ematch.tab.o emp_ematch.lex.o |
285 |
- |
286 |
- include ../config.mk |
287 |
-+include ../config.include |
288 |
- |
289 |
- SHARED_LIBS ?= y |
290 |
- |
291 |
---- iproute2-5.10.0/tipc/Makefile |
292 |
-+++ iproute2-5.10.0/tipc/Makefile |
293 |
-@@ -1,5 +1,6 @@ |
294 |
- # SPDX-License-Identifier: GPL-2.0 |
295 |
- include ../config.mk |
296 |
-+include ../config.include |
297 |
- |
298 |
- TARGETS := |
299 |
- |
300 |
|
301 |
diff --git a/sys-apps/iproute2/iproute2-5.10.0-r2.ebuild b/sys-apps/iproute2/iproute2-5.10.0-r2.ebuild |
302 |
deleted file mode 100644 |
303 |
index 09e05b28c60..00000000000 |
304 |
--- a/sys-apps/iproute2/iproute2-5.10.0-r2.ebuild |
305 |
+++ /dev/null |
306 |
@@ -1,168 +0,0 @@ |
307 |
-# Copyright 1999-2021 Gentoo Authors |
308 |
-# Distributed under the terms of the GNU General Public License v2 |
309 |
- |
310 |
-EAPI=7 |
311 |
- |
312 |
-inherit toolchain-funcs flag-o-matic multilib |
313 |
- |
314 |
-if [[ ${PV} == "9999" ]] ; then |
315 |
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
316 |
- inherit git-r3 |
317 |
-else |
318 |
- SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" |
319 |
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" |
320 |
-fi |
321 |
- |
322 |
-DESCRIPTION="kernel routing and traffic control utilities" |
323 |
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
324 |
- |
325 |
-LICENSE="GPL-2" |
326 |
-SLOT="0" |
327 |
-IUSE="atm berkdb caps elf +iptables ipv6 libbsd minimal selinux" |
328 |
- |
329 |
-# We could make libmnl optional, but it's tiny, so eh |
330 |
-RDEPEND=" |
331 |
- !net-misc/arpd |
332 |
- !minimal? ( net-libs/libmnl:= ) |
333 |
- atm? ( net-dialup/linux-atm ) |
334 |
- berkdb? ( sys-libs/db:= ) |
335 |
- caps? ( sys-libs/libcap ) |
336 |
- elf? ( virtual/libelf:= ) |
337 |
- iptables? ( >=net-firewall/iptables-1.4.20:= ) |
338 |
- libbsd? ( dev-libs/libbsd ) |
339 |
- selinux? ( sys-libs/libselinux ) |
340 |
-" |
341 |
-# We require newer linux-headers for ipset support #549948 and some defines #553876 |
342 |
-DEPEND=" |
343 |
- ${RDEPEND} |
344 |
- >=sys-kernel/linux-headers-3.16 |
345 |
-" |
346 |
-BDEPEND=" |
347 |
- app-arch/xz-utils |
348 |
- >=sys-devel/bison-2.4 |
349 |
- sys-devel/flex |
350 |
- virtual/pkgconfig |
351 |
-" |
352 |
- |
353 |
-PATCHES=( |
354 |
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
355 |
- "${FILESDIR}"/${PN}-5.10.0-configure-nomagic.patch # bug 643722 |
356 |
- "${FILESDIR}"/${PN}-5.1.0-portability.patch |
357 |
- "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch |
358 |
-) |
359 |
- |
360 |
-src_prepare() { |
361 |
- if ! use ipv6 ; then |
362 |
- PATCHES+=( |
363 |
- "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 |
364 |
- ) |
365 |
- fi |
366 |
- |
367 |
- default |
368 |
- |
369 |
- # Fix version if necessary |
370 |
- local versionfile="include/version.h" |
371 |
- if ! grep -Fq "${PV}" ${versionfile} ; then |
372 |
- einfo "Fixing version string" |
373 |
- sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ |
374 |
- -i ${versionfile} || die |
375 |
- fi |
376 |
- |
377 |
- # echo -n is not POSIX compliant |
378 |
- sed 's@echo -n@printf@' -i configure || die |
379 |
- |
380 |
- sed -i \ |
381 |
- -e '/^CC :\?=/d' \ |
382 |
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
383 |
- -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ |
384 |
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
385 |
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
386 |
- Makefile || die |
387 |
- |
388 |
- # build against system headers |
389 |
- rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
390 |
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
391 |
- |
392 |
- if use minimal ; then |
393 |
- sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die |
394 |
- fi |
395 |
-} |
396 |
- |
397 |
-src_configure() { |
398 |
- tc-export AR CC PKG_CONFIG |
399 |
- |
400 |
- # This sure is ugly. Should probably move into toolchain-funcs at some point. |
401 |
- local setns |
402 |
- pushd "${T}" >/dev/null |
403 |
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
404 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
405 |
- echo 'int main(){return 0;}' > test.c |
406 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
407 |
- popd >/dev/null |
408 |
- |
409 |
- # run "configure" script first which will create "config.mk"... |
410 |
- econf |
411 |
- |
412 |
- # ...now switch on/off requested features via USE flags |
413 |
- # this is only useful if the test did not set other things, per bug #643722 |
414 |
- cat <<-EOF >> config.mk |
415 |
- TC_CONFIG_ATM := $(usex atm y n) |
416 |
- TC_CONFIG_XT := $(usex iptables y n) |
417 |
- TC_CONFIG_NO_XT := $(usex iptables n y) |
418 |
- # We've locked in recent enough kernel headers #549948 |
419 |
- TC_CONFIG_IPSET := y |
420 |
- HAVE_BERKELEY_DB := $(usex berkdb y n) |
421 |
- HAVE_CAP := $(usex caps y n) |
422 |
- HAVE_MNL := $(usex minimal n y) |
423 |
- HAVE_ELF := $(usex elf y n) |
424 |
- HAVE_SELINUX := $(usex selinux y n) |
425 |
- IP_CONFIG_SETNS := ${setns} |
426 |
- # Use correct iptables dir, #144265 #293709 |
427 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
428 |
- HAVE_LIBBSD := $(usex libbsd y n) |
429 |
- EOF |
430 |
-} |
431 |
- |
432 |
-src_compile() { |
433 |
- emake V=1 NETNS_RUN_DIR=/run/netns |
434 |
-} |
435 |
- |
436 |
-src_install() { |
437 |
- if use minimal ; then |
438 |
- into / |
439 |
- dosbin tc/tc |
440 |
- dobin ip/ip |
441 |
- return 0 |
442 |
- fi |
443 |
- |
444 |
- emake \ |
445 |
- DESTDIR="${D}" \ |
446 |
- PREFIX="${EPREFIX}/usr" \ |
447 |
- LIBDIR="${EPREFIX}"/$(get_libdir) \ |
448 |
- SBINDIR="${EPREFIX}"/sbin \ |
449 |
- CONFDIR="${EPREFIX}"/etc/iproute2 \ |
450 |
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ |
451 |
- MANDIR="${EPREFIX}"/usr/share/man \ |
452 |
- ARPDDIR="${EPREFIX}"/var/lib/arpd \ |
453 |
- install |
454 |
- |
455 |
- dodir /bin |
456 |
- mv "${ED}"/{s,}bin/ip || die #330115 |
457 |
- |
458 |
- dolib.a lib/libnetlink.a |
459 |
- insinto /usr/include |
460 |
- doins include/libnetlink.h |
461 |
- # This local header pulls in a lot of linux headers it |
462 |
- # doesn't directly need. Delete this header that requires |
463 |
- # linux-headers-3.8 until that goes stable. #467716 |
464 |
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die |
465 |
- |
466 |
- if use berkdb ; then |
467 |
- keepdir /var/lib/arpd |
468 |
- # bug 47482, arpd doesn't need to be in /sbin |
469 |
- dodir /usr/bin |
470 |
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die |
471 |
- elif [[ -d "${ED}"/var/lib/arpd ]]; then |
472 |
- rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die |
473 |
- fi |
474 |
-} |
475 |
|
476 |
diff --git a/sys-apps/iproute2/iproute2-5.12.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.12.0-r1.ebuild |
477 |
deleted file mode 100644 |
478 |
index 14d225e3e58..00000000000 |
479 |
--- a/sys-apps/iproute2/iproute2-5.12.0-r1.ebuild |
480 |
+++ /dev/null |
481 |
@@ -1,170 +0,0 @@ |
482 |
-# Copyright 1999-2021 Gentoo Authors |
483 |
-# Distributed under the terms of the GNU General Public License v2 |
484 |
- |
485 |
-EAPI=7 |
486 |
- |
487 |
-inherit toolchain-funcs flag-o-matic multilib |
488 |
- |
489 |
-if [[ ${PV} == "9999" ]] ; then |
490 |
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
491 |
- inherit git-r3 |
492 |
-else |
493 |
- SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" |
494 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
495 |
-fi |
496 |
- |
497 |
-DESCRIPTION="kernel routing and traffic control utilities" |
498 |
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
499 |
- |
500 |
-LICENSE="GPL-2" |
501 |
-SLOT="0" |
502 |
-IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux" |
503 |
- |
504 |
-# We could make libmnl optional, but it's tiny, so eh |
505 |
-RDEPEND=" |
506 |
- !net-misc/arpd |
507 |
- !minimal? ( net-libs/libmnl:= ) |
508 |
- atm? ( net-dialup/linux-atm ) |
509 |
- berkdb? ( sys-libs/db:= ) |
510 |
- bpf? ( dev-libs/libbpf:= ) |
511 |
- caps? ( sys-libs/libcap ) |
512 |
- elf? ( virtual/libelf:= ) |
513 |
- iptables? ( >=net-firewall/iptables-1.4.20:= ) |
514 |
- libbsd? ( dev-libs/libbsd ) |
515 |
- selinux? ( sys-libs/libselinux ) |
516 |
-" |
517 |
-# We require newer linux-headers for ipset support #549948 and some defines #553876 |
518 |
-DEPEND=" |
519 |
- ${RDEPEND} |
520 |
- >=sys-kernel/linux-headers-3.16 |
521 |
-" |
522 |
-BDEPEND=" |
523 |
- app-arch/xz-utils |
524 |
- >=sys-devel/bison-2.4 |
525 |
- sys-devel/flex |
526 |
- virtual/pkgconfig |
527 |
-" |
528 |
- |
529 |
-PATCHES=( |
530 |
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
531 |
- "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722 |
532 |
- #"${FILESDIR}"/${PN}-5.1.0-portability.patch |
533 |
- "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch |
534 |
-) |
535 |
- |
536 |
-src_prepare() { |
537 |
- if ! use ipv6 ; then |
538 |
- PATCHES+=( |
539 |
- "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 |
540 |
- ) |
541 |
- fi |
542 |
- |
543 |
- default |
544 |
- |
545 |
- # Fix version if necessary |
546 |
- local versionfile="include/version.h" |
547 |
- if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then |
548 |
- einfo "Fixing version string" |
549 |
- sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ |
550 |
- -i ${versionfile} || die |
551 |
- fi |
552 |
- |
553 |
- # echo -n is not POSIX compliant |
554 |
- sed 's@echo -n@printf@' -i configure || die |
555 |
- |
556 |
- sed -i \ |
557 |
- -e '/^CC :\?=/d' \ |
558 |
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
559 |
- -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ |
560 |
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
561 |
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
562 |
- Makefile || die |
563 |
- |
564 |
- # build against system headers |
565 |
- rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
566 |
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
567 |
- |
568 |
- if use minimal ; then |
569 |
- sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die |
570 |
- fi |
571 |
-} |
572 |
- |
573 |
-src_configure() { |
574 |
- tc-export AR CC PKG_CONFIG |
575 |
- |
576 |
- # This sure is ugly. Should probably move into toolchain-funcs at some point. |
577 |
- local setns |
578 |
- pushd "${T}" >/dev/null |
579 |
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
580 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
581 |
- echo 'int main(){return 0;}' > test.c |
582 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
583 |
- popd >/dev/null |
584 |
- |
585 |
- # run "configure" script first which will create "config.mk"... |
586 |
- LIBBPF_FORCE="$(usex bpf on off)" \ |
587 |
- econf |
588 |
- |
589 |
- # ...now switch on/off requested features via USE flags |
590 |
- # this is only useful if the test did not set other things, per bug #643722 |
591 |
- cat <<-EOF >> config.mk |
592 |
- TC_CONFIG_ATM := $(usex atm y n) |
593 |
- TC_CONFIG_XT := $(usex iptables y n) |
594 |
- TC_CONFIG_NO_XT := $(usex iptables n y) |
595 |
- # We've locked in recent enough kernel headers #549948 |
596 |
- TC_CONFIG_IPSET := y |
597 |
- HAVE_BERKELEY_DB := $(usex berkdb y n) |
598 |
- HAVE_CAP := $(usex caps y n) |
599 |
- HAVE_MNL := $(usex minimal n y) |
600 |
- HAVE_ELF := $(usex elf y n) |
601 |
- HAVE_SELINUX := $(usex selinux y n) |
602 |
- IP_CONFIG_SETNS := ${setns} |
603 |
- # Use correct iptables dir, #144265 #293709 |
604 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
605 |
- HAVE_LIBBSD := $(usex libbsd y n) |
606 |
- EOF |
607 |
-} |
608 |
- |
609 |
-src_compile() { |
610 |
- emake V=1 NETNS_RUN_DIR=/run/netns |
611 |
-} |
612 |
- |
613 |
-src_install() { |
614 |
- if use minimal ; then |
615 |
- into / |
616 |
- dosbin tc/tc |
617 |
- dobin ip/ip |
618 |
- return 0 |
619 |
- fi |
620 |
- |
621 |
- emake \ |
622 |
- DESTDIR="${D}" \ |
623 |
- PREFIX="${EPREFIX}/usr" \ |
624 |
- LIBDIR="${EPREFIX}"/$(get_libdir) \ |
625 |
- SBINDIR="${EPREFIX}"/sbin \ |
626 |
- CONFDIR="${EPREFIX}"/etc/iproute2 \ |
627 |
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ |
628 |
- MANDIR="${EPREFIX}"/usr/share/man \ |
629 |
- ARPDDIR="${EPREFIX}"/var/lib/arpd \ |
630 |
- install |
631 |
- |
632 |
- dodir /bin |
633 |
- mv "${ED}"/{s,}bin/ip || die #330115 |
634 |
- |
635 |
- dolib.a lib/libnetlink.a |
636 |
- insinto /usr/include |
637 |
- doins include/libnetlink.h |
638 |
- # This local header pulls in a lot of linux headers it |
639 |
- # doesn't directly need. Delete this header that requires |
640 |
- # linux-headers-3.8 until that goes stable. #467716 |
641 |
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die |
642 |
- |
643 |
- if use berkdb ; then |
644 |
- keepdir /var/lib/arpd |
645 |
- # bug 47482, arpd doesn't need to be in /sbin |
646 |
- dodir /usr/bin |
647 |
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die |
648 |
- elif [[ -d "${ED}"/var/lib/arpd ]]; then |
649 |
- rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die |
650 |
- fi |
651 |
-} |