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

Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/, sys-apps/iproute2/
Date: Mon, 29 Oct 2018 22:21:21
Message-Id: 1540851666.2185fdc6724d0cf893fa228ef8e63b3791cae223.polynomial-c@gentoo
1 commit: 2185fdc6724d0cf893fa228ef8e63b3791cae223
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 29 22:18:50 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 29 22:21:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2185fdc6
7
8 sys-apps/iproute2: Revbumps to fix automagic dep on sys-libs/libcap
9
10 Closes: https://bugs.gentoo.org/667644
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 ...tch => iproute2-4.17.0-configure-nomagic.patch} | 68 +++++++++++++---------
15 ...te2-4.17.0.ebuild => iproute2-4.17.0-r1.ebuild} | 6 +-
16 ...te2-4.19.0.ebuild => iproute2-4.18.0-r1.ebuild} | 6 +-
17 ...te2-4.18.0.ebuild => iproute2-4.19.0-r1.ebuild} | 8 ++-
18 sys-apps/iproute2/iproute2-9999.ebuild | 8 ++-
19 5 files changed, 60 insertions(+), 36 deletions(-)
20
21 diff --git a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch
22 similarity index 74%
23 rename from sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch
24 rename to sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch
25 index 01a1fe2d812..30b5db3bc3c 100644
26 --- a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch
27 +++ b/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch
28 @@ -9,16 +9,17 @@ are only passed when correctly needed.
29
30 Prior Gentoo testcase for reproduction:
31 USE=minimal ebuild ... compile.
32 -- Linking with libelf & libmnl based only on presence.
33 +- Linking with libelf, libmnl & libcap based only on presence.
34 - Links based on libselinux based only on presence.
35
36 Closes: https://bugs.gentoo.org/643722
37 Signed-off-by: Robin H. Johnson <robbat2@g.o>
38
39 Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
40 +Added libcap to v4.17.0 by Lars Wendler <polynomial-c@g.o>
41
42 ---- iproute2-4.16.0/bridge/Makefile
43 -+++ iproute2-4.16.0/bridge/Makefile
44 +--- iproute2-4.17.0/bridge/Makefile
45 ++++ iproute2-4.17.0/bridge/Makefile
46 @@ -2,6 +2,7 @@
47 BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
48
49 @@ -27,9 +28,9 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
50
51 all: bridge
52
53 ---- iproute2-4.16.0/config.include
54 -+++ iproute2-4.16.0/config.include
55 -@@ -0,0 +1,22 @@
56 +--- iproute2-4.17.0/config.include
57 ++++ iproute2-4.17.0/config.include
58 +@@ -0,0 +1,26 @@
59 +# We can only modify CFLAGS/LDLIBS after all the config options are known.
60 +ifeq ($(IP_CONFIG_SETNS),y)
61 + CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
62 @@ -46,14 +47,18 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
63 + CFLAGS += $(HAVE_MNL_CFLAGS)
64 + LDLIBS += $(HAVE_MNL_LDLIBS)
65 +endif
66 ++ifeq ($(HAVE_CAP),y)
67 ++ CFLAGS += $(HAVE_CAP_CFLAGS)
68 ++ LDLIBS += $(HAVE_CAP_LDLIBS)
69 ++endif
70 +
71 +# Rules can only be declared after all variables in them are known.
72 +%.o: %.c
73 + $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
74 +
75 +# vim: ft=make:
76 ---- iproute2-4.16.0/configure
77 -+++ iproute2-4.16.0/configure
78 +--- iproute2-4.17.0/configure
79 ++++ iproute2-4.17.0/configure
80 @@ -212,7 +212,7 @@
81 then
82 echo "IP_CONFIG_SETNS:=y" >>$CONFIG
83 @@ -96,6 +101,17 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
84 else
85 echo "no"
86 fi
87 +@@ -343,8 +343,8 @@
88 + echo "HAVE_CAP:=y" >>$CONFIG
89 + echo "yes"
90 +
91 +- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
92 +- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
93 ++ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
94 ++ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
95 + else
96 + echo "no"
97 + fi
98 @@ -426,7 +426,3 @@
99
100 echo -n "libcap support: "
101 @@ -104,8 +120,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
102 -echo >> $CONFIG
103 -echo "%.o: %.c" >> $CONFIG
104 -echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
105 ---- iproute2-4.16.0/devlink/Makefile
106 -+++ iproute2-4.16.0/devlink/Makefile
107 +--- iproute2-4.17.0/devlink/Makefile
108 ++++ iproute2-4.17.0/devlink/Makefile
109 @@ -1,5 +1,6 @@
110 # SPDX-License-Identifier: GPL-2.0
111 include ../config.mk
112 @@ -113,8 +129,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
113
114 TARGETS :=
115
116 ---- iproute2-4.16.0/genl/Makefile
117 -+++ iproute2-4.16.0/genl/Makefile
118 +--- iproute2-4.17.0/genl/Makefile
119 ++++ iproute2-4.17.0/genl/Makefile
120 @@ -2,6 +2,7 @@
121 GENLOBJ=genl.o
122
123 @@ -123,8 +139,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
124 SHARED_LIBS ?= y
125
126 CFLAGS += -fno-strict-aliasing
127 ---- iproute2-4.16.0/ip/Makefile
128 -+++ iproute2-4.16.0/ip/Makefile
129 +--- iproute2-4.17.0/ip/Makefile
130 ++++ iproute2-4.17.0/ip/Makefile
131 @@ -15,6 +15,7 @@
132 RTMONOBJ=rtmon.o
133
134 @@ -133,8 +149,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
135
136 ALLOBJ=$(IPOBJ) $(RTMONOBJ)
137 SCRIPTS=ifcfg rtpr routel routef
138 ---- iproute2-4.16.0/lib/Makefile
139 -+++ iproute2-4.16.0/lib/Makefile
140 +--- iproute2-4.17.0/lib/Makefile
141 ++++ iproute2-4.17.0/lib/Makefile
142 @@ -1,5 +1,6 @@
143 # SPDX-License-Identifier: GPL-2.0
144 include ../config.mk
145 @@ -142,8 +158,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
146
147 CFLAGS += -fPIC
148
149 ---- iproute2-4.16.0/misc/Makefile
150 -+++ iproute2-4.16.0/misc/Makefile
151 +--- iproute2-4.17.0/misc/Makefile
152 ++++ iproute2-4.17.0/misc/Makefile
153 @@ -5,6 +5,7 @@
154 TARGETS=ss nstat ifstat rtacct lnstat
155
156 @@ -152,8 +168,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
157
158 ifeq ($(HAVE_BERKELEY_DB),y)
159 TARGETS += arpd
160 ---- iproute2-4.16.0/netem/Makefile
161 -+++ iproute2-4.16.0/netem/Makefile
162 +--- iproute2-4.17.0/netem/Makefile
163 ++++ iproute2-4.17.0/netem/Makefile
164 @@ -1,5 +1,6 @@
165 # SPDX-License-Identifier: GPL-2.0
166 include ../config.mk
167 @@ -161,8 +177,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
168
169 DISTGEN = maketable normal pareto paretonormal
170 DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
171 ---- iproute2-4.16.0/rdma/Makefile
172 -+++ iproute2-4.16.0/rdma/Makefile
173 +--- iproute2-4.17.0/rdma/Makefile
174 ++++ iproute2-4.17.0/rdma/Makefile
175 @@ -1,5 +1,6 @@
176 # SPDX-License-Identifier: GPL-2.0
177 include ../config.mk
178 @@ -170,8 +186,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
179
180 TARGETS :=
181
182 ---- iproute2-4.16.0/tc/Makefile
183 -+++ iproute2-4.16.0/tc/Makefile
184 +--- iproute2-4.17.0/tc/Makefile
185 ++++ iproute2-4.17.0/tc/Makefile
186 @@ -4,6 +4,7 @@
187 emp_ematch.yacc.o emp_ematch.lex.o
188
189 @@ -180,8 +196,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@g.o>
190
191 SHARED_LIBS ?= y
192
193 ---- iproute2-4.16.0/tipc/Makefile
194 -+++ iproute2-4.16.0/tipc/Makefile
195 +--- iproute2-4.17.0/tipc/Makefile
196 ++++ iproute2-4.17.0/tipc/Makefile
197 @@ -1,5 +1,6 @@
198 # SPDX-License-Identifier: GPL-2.0
199 include ../config.mk
200
201 diff --git a/sys-apps/iproute2/iproute2-4.17.0.ebuild b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
202 similarity index 95%
203 rename from sys-apps/iproute2/iproute2-4.17.0.ebuild
204 rename to sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
205 index 03a8a55c50a..29261b7f6ae 100644
206 --- a/sys-apps/iproute2/iproute2-4.17.0.ebuild
207 +++ b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
208 @@ -18,12 +18,13 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
209
210 LICENSE="GPL-2"
211 SLOT="0"
212 -IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
213 +IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
214
215 # We could make libmnl optional, but it's tiny, so eh
216 RDEPEND="
217 !net-misc/arpd
218 !minimal? ( net-libs/libmnl )
219 + caps? ( sys-libs/libcap )
220 elf? ( virtual/libelf )
221 iptables? ( >=net-firewall/iptables-1.4.20:= )
222 berkdb? ( sys-libs/db:= )
223 @@ -43,7 +44,7 @@ DEPEND="
224
225 PATCHES=(
226 "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
227 - "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722
228 + "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722
229 )
230
231 src_prepare() {
232 @@ -100,6 +101,7 @@ src_configure() {
233 # We've locked in recent enough kernel headers #549948
234 TC_CONFIG_IPSET := y
235 HAVE_BERKELEY_DB := $(usex berkdb y n)
236 + HAVE_CAP := $(usex caps y n)
237 HAVE_MNL := $(usex minimal n y)
238 HAVE_ELF := $(usex elf y n)
239 HAVE_SELINUX := $(usex selinux y n)
240
241 diff --git a/sys-apps/iproute2/iproute2-4.19.0.ebuild b/sys-apps/iproute2/iproute2-4.18.0-r1.ebuild
242 similarity index 95%
243 rename from sys-apps/iproute2/iproute2-4.19.0.ebuild
244 rename to sys-apps/iproute2/iproute2-4.18.0-r1.ebuild
245 index e35ecc5e6ec..fe34c36583b 100644
246 --- a/sys-apps/iproute2/iproute2-4.19.0.ebuild
247 +++ b/sys-apps/iproute2/iproute2-4.18.0-r1.ebuild
248 @@ -18,12 +18,13 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
249
250 LICENSE="GPL-2"
251 SLOT="0"
252 -IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
253 +IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
254
255 # We could make libmnl optional, but it's tiny, so eh
256 RDEPEND="
257 !net-misc/arpd
258 !minimal? ( net-libs/libmnl )
259 + caps? ( sys-libs/libcap )
260 elf? ( virtual/libelf )
261 iptables? ( >=net-firewall/iptables-1.4.20:= )
262 berkdb? ( sys-libs/db:= )
263 @@ -43,7 +44,7 @@ DEPEND="
264
265 PATCHES=(
266 "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
267 - "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722
268 + "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722
269 )
270
271 src_prepare() {
272 @@ -100,6 +101,7 @@ src_configure() {
273 # We've locked in recent enough kernel headers #549948
274 TC_CONFIG_IPSET := y
275 HAVE_BERKELEY_DB := $(usex berkdb y n)
276 + HAVE_CAP := $(usex caps y n)
277 HAVE_MNL := $(usex minimal n y)
278 HAVE_ELF := $(usex elf y n)
279 HAVE_SELINUX := $(usex selinux y n)
280
281 diff --git a/sys-apps/iproute2/iproute2-4.18.0.ebuild b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
282 similarity index 94%
283 rename from sys-apps/iproute2/iproute2-4.18.0.ebuild
284 rename to sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
285 index 7d284f1e544..fe34c36583b 100644
286 --- a/sys-apps/iproute2/iproute2-4.18.0.ebuild
287 +++ b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
288 @@ -1,4 +1,4 @@
289 -# Copyright 1999-2018 Gentoo Foundation
290 +# Copyright 1999-2018 Gentoo Authors
291 # Distributed under the terms of the GNU General Public License v2
292
293 EAPI=6
294 @@ -18,12 +18,13 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
295
296 LICENSE="GPL-2"
297 SLOT="0"
298 -IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
299 +IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
300
301 # We could make libmnl optional, but it's tiny, so eh
302 RDEPEND="
303 !net-misc/arpd
304 !minimal? ( net-libs/libmnl )
305 + caps? ( sys-libs/libcap )
306 elf? ( virtual/libelf )
307 iptables? ( >=net-firewall/iptables-1.4.20:= )
308 berkdb? ( sys-libs/db:= )
309 @@ -43,7 +44,7 @@ DEPEND="
310
311 PATCHES=(
312 "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
313 - "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722
314 + "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722
315 )
316
317 src_prepare() {
318 @@ -100,6 +101,7 @@ src_configure() {
319 # We've locked in recent enough kernel headers #549948
320 TC_CONFIG_IPSET := y
321 HAVE_BERKELEY_DB := $(usex berkdb y n)
322 + HAVE_CAP := $(usex caps y n)
323 HAVE_MNL := $(usex minimal n y)
324 HAVE_ELF := $(usex elf y n)
325 HAVE_SELINUX := $(usex selinux y n)
326
327 diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
328 index c70b80f7038..f9527624933 100644
329 --- a/sys-apps/iproute2/iproute2-9999.ebuild
330 +++ b/sys-apps/iproute2/iproute2-9999.ebuild
331 @@ -1,4 +1,4 @@
332 -# Copyright 1999-2018 Gentoo Foundation
333 +# Copyright 1999-2018 Gentoo Authors
334 # Distributed under the terms of the GNU General Public License v2
335
336 EAPI=6
337 @@ -18,12 +18,13 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
338
339 LICENSE="GPL-2"
340 SLOT="0"
341 -IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
342 +IUSE="atm caps berkdb elf +iptables ipv6 minimal selinux"
343
344 # We could make libmnl optional, but it's tiny, so eh
345 RDEPEND="
346 !net-misc/arpd
347 !minimal? ( net-libs/libmnl )
348 + caps? ( sys-libs/libcap )
349 elf? ( virtual/libelf )
350 iptables? ( >=net-firewall/iptables-1.4.20:= )
351 berkdb? ( sys-libs/db:= )
352 @@ -43,7 +44,7 @@ DEPEND="
353
354 PATCHES=(
355 "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
356 - "${FILESDIR}"/${PN}-4.14.1-configure-nomagic.patch # bug 643722
357 + "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722
358 )
359
360 src_prepare() {
361 @@ -101,6 +102,7 @@ src_configure() {
362 # We've locked in recent enough kernel headers #549948
363 TC_CONFIG_IPSET := y
364 HAVE_BERKELEY_DB := $(usex berkdb y n)
365 + HAVE_CAP := $(usex caps y n)
366 HAVE_MNL := $(usex minimal n y)
367 HAVE_ELF := $(usex elf y n)
368 HAVE_SELINUX := $(usex selinux y n)
Report Message
Find on MARC Find on Google Groups