From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 67004138334 for ; Mon, 29 Oct 2018 22:21:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52126E0877; Mon, 29 Oct 2018 22:21:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 194EFE0877 for ; Mon, 29 Oct 2018 22:21:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E468335CB7 for ; Mon, 29 Oct 2018 22:21:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FE8442F for ; Mon, 29 Oct 2018 22:21:14 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1540851666.2185fdc6724d0cf893fa228ef8e63b3791cae223.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/, sys-apps/iproute2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch sys-apps/iproute2/iproute2-4.17.0-r1.ebuild sys-apps/iproute2/iproute2-4.17.0.ebuild sys-apps/iproute2/iproute2-4.18.0-r1.ebuild sys-apps/iproute2/iproute2-4.18.0.ebuild sys-apps/iproute2/iproute2-4.19.0-r1.ebuild sys-apps/iproute2/iproute2-4.19.0.ebuild sys-apps/iproute2/iproute2-9999.ebuild X-VCS-Directories: sys-apps/iproute2/files/ sys-apps/iproute2/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 2185fdc6724d0cf893fa228ef8e63b3791cae223 X-VCS-Branch: master Date: Mon, 29 Oct 2018 22:21:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 44fa8b9c-ef13-4437-a49e-16f2baecab42 X-Archives-Hash: ea4138b1433d5cb04860f811761a52d0 commit: 2185fdc6724d0cf893fa228ef8e63b3791cae223 Author: Lars Wendler gentoo org> AuthorDate: Mon Oct 29 22:18:50 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Oct 29 22:21:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2185fdc6 sys-apps/iproute2: Revbumps to fix automagic dep on sys-libs/libcap Closes: https://bugs.gentoo.org/667644 Signed-off-by: Lars Wendler gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 ...tch => iproute2-4.17.0-configure-nomagic.patch} | 68 +++++++++++++--------- ...te2-4.17.0.ebuild => iproute2-4.17.0-r1.ebuild} | 6 +- ...te2-4.19.0.ebuild => iproute2-4.18.0-r1.ebuild} | 6 +- ...te2-4.18.0.ebuild => iproute2-4.19.0-r1.ebuild} | 8 ++- sys-apps/iproute2/iproute2-9999.ebuild | 8 ++- 5 files changed, 60 insertions(+), 36 deletions(-) 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 similarity index 74% rename from sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch rename to sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch index 01a1fe2d812..30b5db3bc3c 100644 --- a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch +++ b/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch @@ -9,16 +9,17 @@ are only passed when correctly needed. Prior Gentoo testcase for reproduction: USE=minimal ebuild ... compile. -- Linking with libelf & libmnl based only on presence. +- Linking with libelf, libmnl & libcap based only on presence. - Links based on libselinux based only on presence. Closes: https://bugs.gentoo.org/643722 Signed-off-by: Robin H. Johnson Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler +Added libcap to v4.17.0 by Lars Wendler ---- iproute2-4.16.0/bridge/Makefile -+++ iproute2-4.16.0/bridge/Makefile +--- iproute2-4.17.0/bridge/Makefile ++++ iproute2-4.17.0/bridge/Makefile @@ -2,6 +2,7 @@ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o @@ -27,9 +28,9 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler all: bridge ---- iproute2-4.16.0/config.include -+++ iproute2-4.16.0/config.include -@@ -0,0 +1,22 @@ +--- iproute2-4.17.0/config.include ++++ iproute2-4.17.0/config.include +@@ -0,0 +1,26 @@ +# We can only modify CFLAGS/LDLIBS after all the config options are known. +ifeq ($(IP_CONFIG_SETNS),y) + CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) @@ -46,14 +47,18 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler + CFLAGS += $(HAVE_MNL_CFLAGS) + LDLIBS += $(HAVE_MNL_LDLIBS) +endif ++ifeq ($(HAVE_CAP),y) ++ CFLAGS += $(HAVE_CAP_CFLAGS) ++ LDLIBS += $(HAVE_CAP_LDLIBS) ++endif + +# Rules can only be declared after all variables in them are known. +%.o: %.c + $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< + +# vim: ft=make: ---- iproute2-4.16.0/configure -+++ iproute2-4.16.0/configure +--- iproute2-4.17.0/configure ++++ iproute2-4.17.0/configure @@ -212,7 +212,7 @@ then echo "IP_CONFIG_SETNS:=y" >>$CONFIG @@ -96,6 +101,17 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler else echo "no" fi +@@ -343,8 +343,8 @@ + echo "HAVE_CAP:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG +- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG ++ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG ++ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG + else + echo "no" + fi @@ -426,7 +426,3 @@ echo -n "libcap support: " @@ -104,8 +120,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler -echo >> $CONFIG -echo "%.o: %.c" >> $CONFIG -echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG ---- iproute2-4.16.0/devlink/Makefile -+++ iproute2-4.16.0/devlink/Makefile +--- iproute2-4.17.0/devlink/Makefile ++++ iproute2-4.17.0/devlink/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk @@ -113,8 +129,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler TARGETS := ---- iproute2-4.16.0/genl/Makefile -+++ iproute2-4.16.0/genl/Makefile +--- iproute2-4.17.0/genl/Makefile ++++ iproute2-4.17.0/genl/Makefile @@ -2,6 +2,7 @@ GENLOBJ=genl.o @@ -123,8 +139,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler SHARED_LIBS ?= y CFLAGS += -fno-strict-aliasing ---- iproute2-4.16.0/ip/Makefile -+++ iproute2-4.16.0/ip/Makefile +--- iproute2-4.17.0/ip/Makefile ++++ iproute2-4.17.0/ip/Makefile @@ -15,6 +15,7 @@ RTMONOBJ=rtmon.o @@ -133,8 +149,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler ALLOBJ=$(IPOBJ) $(RTMONOBJ) SCRIPTS=ifcfg rtpr routel routef ---- iproute2-4.16.0/lib/Makefile -+++ iproute2-4.16.0/lib/Makefile +--- iproute2-4.17.0/lib/Makefile ++++ iproute2-4.17.0/lib/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk @@ -142,8 +158,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler CFLAGS += -fPIC ---- iproute2-4.16.0/misc/Makefile -+++ iproute2-4.16.0/misc/Makefile +--- iproute2-4.17.0/misc/Makefile ++++ iproute2-4.17.0/misc/Makefile @@ -5,6 +5,7 @@ TARGETS=ss nstat ifstat rtacct lnstat @@ -152,8 +168,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler ifeq ($(HAVE_BERKELEY_DB),y) TARGETS += arpd ---- iproute2-4.16.0/netem/Makefile -+++ iproute2-4.16.0/netem/Makefile +--- iproute2-4.17.0/netem/Makefile ++++ iproute2-4.17.0/netem/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk @@ -161,8 +177,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler DISTGEN = maketable normal pareto paretonormal DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist ---- iproute2-4.16.0/rdma/Makefile -+++ iproute2-4.16.0/rdma/Makefile +--- iproute2-4.17.0/rdma/Makefile ++++ iproute2-4.17.0/rdma/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk @@ -170,8 +186,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler TARGETS := ---- iproute2-4.16.0/tc/Makefile -+++ iproute2-4.16.0/tc/Makefile +--- iproute2-4.17.0/tc/Makefile ++++ iproute2-4.17.0/tc/Makefile @@ -4,6 +4,7 @@ emp_ematch.yacc.o emp_ematch.lex.o @@ -180,8 +196,8 @@ Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler SHARED_LIBS ?= y ---- iproute2-4.16.0/tipc/Makefile -+++ iproute2-4.16.0/tipc/Makefile +--- iproute2-4.17.0/tipc/Makefile ++++ iproute2-4.17.0/tipc/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk diff --git a/sys-apps/iproute2/iproute2-4.17.0.ebuild b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild similarity index 95% rename from sys-apps/iproute2/iproute2-4.17.0.ebuild rename to sys-apps/iproute2/iproute2-4.17.0-r1.ebuild index 03a8a55c50a..29261b7f6ae 100644 --- a/sys-apps/iproute2/iproute2-4.17.0.ebuild +++ b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild @@ -18,12 +18,13 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb elf +iptables ipv6 minimal selinux" +IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" # We could make libmnl optional, but it's tiny, so eh RDEPEND=" !net-misc/arpd !minimal? ( net-libs/libmnl ) + caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) @@ -43,7 +44,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722 + "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722 ) src_prepare() { @@ -100,6 +101,7 @@ src_configure() { # We've locked in recent enough kernel headers #549948 TC_CONFIG_IPSET := y HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_CAP := $(usex caps y n) HAVE_MNL := $(usex minimal n y) HAVE_ELF := $(usex elf y n) HAVE_SELINUX := $(usex selinux y n) diff --git a/sys-apps/iproute2/iproute2-4.19.0.ebuild b/sys-apps/iproute2/iproute2-4.18.0-r1.ebuild similarity index 95% rename from sys-apps/iproute2/iproute2-4.19.0.ebuild rename to sys-apps/iproute2/iproute2-4.18.0-r1.ebuild index e35ecc5e6ec..fe34c36583b 100644 --- a/sys-apps/iproute2/iproute2-4.19.0.ebuild +++ b/sys-apps/iproute2/iproute2-4.18.0-r1.ebuild @@ -18,12 +18,13 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb elf +iptables ipv6 minimal selinux" +IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" # We could make libmnl optional, but it's tiny, so eh RDEPEND=" !net-misc/arpd !minimal? ( net-libs/libmnl ) + caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) @@ -43,7 +44,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722 + "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722 ) src_prepare() { @@ -100,6 +101,7 @@ src_configure() { # We've locked in recent enough kernel headers #549948 TC_CONFIG_IPSET := y HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_CAP := $(usex caps y n) HAVE_MNL := $(usex minimal n y) HAVE_ELF := $(usex elf y n) HAVE_SELINUX := $(usex selinux y n) diff --git a/sys-apps/iproute2/iproute2-4.18.0.ebuild b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild similarity index 94% rename from sys-apps/iproute2/iproute2-4.18.0.ebuild rename to sys-apps/iproute2/iproute2-4.19.0-r1.ebuild index 7d284f1e544..fe34c36583b 100644 --- a/sys-apps/iproute2/iproute2-4.18.0.ebuild +++ b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,12 +18,13 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb elf +iptables ipv6 minimal selinux" +IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" # We could make libmnl optional, but it's tiny, so eh RDEPEND=" !net-misc/arpd !minimal? ( net-libs/libmnl ) + caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) @@ -43,7 +44,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722 + "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722 ) src_prepare() { @@ -100,6 +101,7 @@ src_configure() { # We've locked in recent enough kernel headers #549948 TC_CONFIG_IPSET := y HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_CAP := $(usex caps y n) HAVE_MNL := $(usex minimal n y) HAVE_ELF := $(usex elf y n) HAVE_SELINUX := $(usex selinux y n) diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index c70b80f7038..f9527624933 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,12 +18,13 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb elf +iptables ipv6 minimal selinux" +IUSE="atm caps berkdb elf +iptables ipv6 minimal selinux" # We could make libmnl optional, but it's tiny, so eh RDEPEND=" !net-misc/arpd !minimal? ( net-libs/libmnl ) + caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) @@ -43,7 +44,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.14.1-configure-nomagic.patch # bug 643722 + "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722 ) src_prepare() { @@ -101,6 +102,7 @@ src_configure() { # We've locked in recent enough kernel headers #549948 TC_CONFIG_IPSET := y HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_CAP := $(usex caps y n) HAVE_MNL := $(usex minimal n y) HAVE_ELF := $(usex elf y n) HAVE_SELINUX := $(usex selinux y n)