mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sys-apps/iproute2: 5.10.0 revbump to make libbsd dep optional
Package-Manager: Portage-3.0.15, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler
226
sys-apps/iproute2/files/iproute2-5.10.0-configure-nomagic.patch
Normal file
226
sys-apps/iproute2/files/iproute2-5.10.0-configure-nomagic.patch
Normal file
@@ -0,0 +1,226 @@
|
||||
The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
|
||||
a variable as well as modifying CFLAGS & LDLIBS.
|
||||
|
||||
If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
|
||||
are still in place.
|
||||
|
||||
Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
|
||||
are only passed when correctly needed.
|
||||
|
||||
Prior Gentoo testcase for reproduction:
|
||||
USE=minimal ebuild ... compile.
|
||||
- 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 <robbat2@gentoo.org>
|
||||
|
||||
Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Forward-ported from v4.20.0 to v5.10.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
|
||||
--- iproute2-5.10.0/bridge/Makefile
|
||||
+++ iproute2-5.10.0/bridge/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
all: bridge
|
||||
|
||||
--- iproute2-5.10.0/config.include
|
||||
+++ iproute2-5.10.0/config.include
|
||||
@@ -0,0 +1,32 @@
|
||||
+# We can only modify CFLAGS/LDLIBS after all the config options are known.
|
||||
+ifeq ($(IP_CONFIG_SETNS),y)
|
||||
+ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_ELF),y)
|
||||
+ CFLAGS += $(HAVE_ELF_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_ELF_LDLIBS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_SELINUX),y)
|
||||
+ CFLAGS += $(HAVE_SELINUX_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_SELINUX_LDLIBS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_MNL),y)
|
||||
+ CFLAGS += $(HAVE_MNL_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_MNL_LDLIBS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_CAP),y)
|
||||
+ CFLAGS += $(HAVE_CAP_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_CAP_LDLIBS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_LIBBSD),y)
|
||||
+ CFLAGS += $(HAVE_LIBBSD_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_LIBBSD_LDLIBS)
|
||||
+else
|
||||
+ CFLAGS += -DNEED_STRLCPY
|
||||
+endif
|
||||
+
|
||||
+# Rules can only be declared after all variables in them are known.
|
||||
+%.o: %.c
|
||||
+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
|
||||
+
|
||||
+# vim: ft=make:
|
||||
--- iproute2-5.10.0/configure
|
||||
+++ iproute2-5.10.0/configure
|
||||
@@ -190,7 +190,7 @@
|
||||
if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
|
||||
echo "IP_CONFIG_SETNS:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
|
||||
+ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -233,8 +233,8 @@
|
||||
echo "HAVE_ELF:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
|
||||
- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
|
||||
+ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
|
||||
+ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -247,8 +247,8 @@
|
||||
echo "HAVE_SELINUX:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
|
||||
- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
|
||||
+ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
|
||||
+ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -260,8 +260,8 @@
|
||||
echo "HAVE_MNL:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
|
||||
+ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
|
||||
+ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -301,8 +301,8 @@
|
||||
echo "no"
|
||||
else
|
||||
if ${PKG_CONFIG} libbsd --exists; then
|
||||
- echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
|
||||
+ echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
|
||||
+ echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
|
||||
echo "no"
|
||||
else
|
||||
echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
|
||||
@@ -318,8 +318,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
|
||||
@@ -399,7 +399,3 @@
|
||||
|
||||
echo -n "libcap support: "
|
||||
check_cap
|
||||
-
|
||||
-echo >> $CONFIG
|
||||
-echo "%.o: %.c" >> $CONFIG
|
||||
-echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
|
||||
--- iproute2-5.10.0/devlink/Makefile
|
||||
+++ iproute2-5.10.0/devlink/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
--- iproute2-5.10.0/genl/Makefile
|
||||
+++ iproute2-5.10.0/genl/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
GENLOBJ=genl.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
SHARED_LIBS ?= y
|
||||
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
--- iproute2-5.10.0/ip/Makefile
|
||||
+++ iproute2-5.10.0/ip/Makefile
|
||||
@@ -16,6 +16,7 @@
|
||||
RTMONOBJ=rtmon.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
ALLOBJ=$(IPOBJ) $(RTMONOBJ)
|
||||
SCRIPTS=ifcfg rtpr routel routef
|
||||
--- iproute2-5.10.0/lib/Makefile
|
||||
+++ iproute2-5.10.0/lib/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
CFLAGS += -fPIC
|
||||
|
||||
--- iproute2-5.10.0/misc/Makefile
|
||||
+++ iproute2-5.10.0/misc/Makefile
|
||||
@@ -5,6 +5,7 @@
|
||||
TARGETS=ss nstat ifstat rtacct lnstat
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
ifeq ($(HAVE_BERKELEY_DB),y)
|
||||
TARGETS += arpd
|
||||
--- iproute2-5.10.0/netem/Makefile
|
||||
+++ iproute2-5.10.0/netem/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
DISTGEN = maketable normal pareto paretonormal
|
||||
DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
|
||||
--- iproute2-5.10.0/rdma/Makefile
|
||||
+++ iproute2-5.10.0/rdma/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
--- iproute2-5.10.0/tc/Makefile
|
||||
+++ iproute2-5.10.0/tc/Makefile
|
||||
@@ -4,6 +4,7 @@
|
||||
emp_ematch.tab.o emp_ematch.lex.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
SHARED_LIBS ?= y
|
||||
|
||||
--- iproute2-5.10.0/tipc/Makefile
|
||||
+++ iproute2-5.10.0/tipc/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
168
sys-apps/iproute2/iproute2-5.10.0-r1.ebuild
Normal file
168
sys-apps/iproute2/iproute2-5.10.0-r1.ebuild
Normal file
@@ -0,0 +1,168 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs flag-o-matic multilib
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="kernel routing and traffic control utilities"
|
||||
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="atm berkdb caps elf +iptables ipv6 libbsd minimal selinux"
|
||||
|
||||
# We could make libmnl optional, but it's tiny, so eh
|
||||
RDEPEND="
|
||||
!net-misc/arpd
|
||||
!minimal? ( net-libs/libmnl )
|
||||
atm? ( net-dialup/linux-atm )
|
||||
berkdb? ( sys-libs/db:= )
|
||||
caps? ( sys-libs/libcap )
|
||||
elf? ( virtual/libelf )
|
||||
iptables? ( >=net-firewall/iptables-1.4.20:= )
|
||||
libbsd? ( dev-libs/libbsd )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
"
|
||||
# We require newer linux-headers for ipset support #549948 and some defines #553876
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-kernel/linux-headers-3.16
|
||||
"
|
||||
BDEPEND="
|
||||
app-arch/xz-utils
|
||||
>=sys-devel/bison-2.4
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
|
||||
"${FILESDIR}"/${PN}-5.10.0-configure-nomagic.patch # bug 643722
|
||||
"${FILESDIR}"/${PN}-5.1.0-portability.patch
|
||||
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
if ! use ipv6 ; then
|
||||
PATCHES+=(
|
||||
"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
|
||||
)
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
# Fix version if necessary
|
||||
local versionfile="include/version.h"
|
||||
if ! grep -Fq "${PV}" ${versionfile} ; then
|
||||
einfo "Fixing version string"
|
||||
sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
|
||||
-i ${versionfile} || die
|
||||
fi
|
||||
|
||||
# echo -n is not POSIX compliant
|
||||
sed 's@echo -n@printf@' -i configure || die
|
||||
|
||||
sed -i \
|
||||
-e '/^CC :\?=/d' \
|
||||
-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
|
||||
-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
|
||||
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
|
||||
-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
|
||||
Makefile || die
|
||||
|
||||
# build against system headers
|
||||
rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
|
||||
sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
|
||||
|
||||
if use minimal ; then
|
||||
sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export AR CC PKG_CONFIG
|
||||
|
||||
# This sure is ugly. Should probably move into toolchain-funcs at some point.
|
||||
local setns
|
||||
pushd "${T}" >/dev/null
|
||||
printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
|
||||
${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
|
||||
echo 'int main(){return 0;}' > test.c
|
||||
${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
|
||||
popd >/dev/null
|
||||
|
||||
# run "configure" script first which will create "config.mk"...
|
||||
econf
|
||||
|
||||
# ...now switch on/off requested features via USE flags
|
||||
# this is only useful if the test did not set other things, per bug #643722
|
||||
cat <<-EOF >> config.mk
|
||||
TC_CONFIG_ATM := $(usex atm y n)
|
||||
TC_CONFIG_XT := $(usex iptables y n)
|
||||
TC_CONFIG_NO_XT := $(usex iptables n y)
|
||||
# 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)
|
||||
IP_CONFIG_SETNS := ${setns}
|
||||
# Use correct iptables dir, #144265 #293709
|
||||
IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
|
||||
HAVE_LIBBSD := $(usex libbsd y n)
|
||||
EOF
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1 NETNS_RUN_DIR=/run/netns
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use minimal ; then
|
||||
into /
|
||||
dosbin tc/tc
|
||||
dobin ip/ip
|
||||
return 0
|
||||
fi
|
||||
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
LIBDIR="${EPREFIX}"/$(get_libdir) \
|
||||
SBINDIR="${EPREFIX}"/sbin \
|
||||
CONFDIR="${EPREFIX}"/etc/iproute2 \
|
||||
DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
|
||||
MANDIR="${EPREFIX}"/usr/share/man \
|
||||
ARPDDIR="${EPREFIX}"/var/lib/arpd \
|
||||
install
|
||||
|
||||
dodir /bin
|
||||
mv "${ED}"/{s,}bin/ip || die #330115
|
||||
|
||||
dolib.a lib/libnetlink.a
|
||||
insinto /usr/include
|
||||
doins include/libnetlink.h
|
||||
# This local header pulls in a lot of linux headers it
|
||||
# doesn't directly need. Delete this header that requires
|
||||
# linux-headers-3.8 until that goes stable. #467716
|
||||
sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
|
||||
|
||||
if use berkdb ; then
|
||||
keepdir /var/lib/arpd
|
||||
# bug 47482, arpd doesn't need to be in /sbin
|
||||
dodir /usr/bin
|
||||
mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
|
||||
elif [[ -d "${ED}"/var/lib/arpd ]]; then
|
||||
rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user