public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/
Date: Sun,  8 Dec 2024 05:45:46 +0000 (UTC)	[thread overview]
Message-ID: <1733636711.754dbb9348adaab456bd3c628f1bb939c27c6093.sam@gentoo> (raw)

commit:     754dbb9348adaab456bd3c628f1bb939c27c6093
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  8 05:42:58 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 05:45:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754dbb93

sys-apps/iproute2: drop 6.6.0-r3, 6.8.0-r2, 6.10.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/iproute2/Manifest                 |   3 -
 sys-apps/iproute2/iproute2-6.10.0.ebuild   | 214 -----------------------------
 sys-apps/iproute2/iproute2-6.6.0-r3.ebuild | 212 ----------------------------
 sys-apps/iproute2/iproute2-6.8.0-r2.ebuild | 214 -----------------------------
 4 files changed, 643 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 56196ef76275..6d83ad4b25e4 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,6 +1,3 @@
-DIST iproute2-6.10.0.tar.xz 920812 BLAKE2B 66332ea333ab2cdc4a2c71000fa2d06fd87cfdf5237dae458aff60ce606155302eb9d0ffaf87107255ab04c02f2b773dc040abb08bb89afb53091396dfc8a3ad SHA512 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41
 DIST iproute2-6.11.0.tar.xz 923736 BLAKE2B 1a360d7cb9a70f5cde184abe934f2d08e9c0d2196c4ec10015636af3984abe2738d9dd8d6c7a69569fc7449e9933829f4eccd593ab8c041ce7b6385adaed63cc SHA512 06bedd7ae573fe5cf9c72af698987ba03e53dc6fce5f41813bf5bb155b683490e5c75cc835ce5ba4509e491eb6138e96da162204c28ea1b3d80887107997a3b3
 DIST iproute2-6.12.0.tar.xz 925392 BLAKE2B 95aee769662e21c8c6223d09ee0ec365fcdeb7a10d01e89e33aa3039a6dfac11401cbdca4bf436544fc05ed709ad90871ac91eaf17dc553d7ca157b98577a7b7 SHA512 dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2
-DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 9d20f19c04c2bbde7a3ae53e61e4623b119570c8446f34b93ddadd64677caa432e00ee085498bc277e0842cc2124340c7100925106d0ef2c11dd8002aacac08f SHA512 21c99a3ba8e1d0047933e99b48fb00901eef18899cd5854000ae910d9d84d13aeafa48b32184775531285782909f4d283d0784491691a1f10462dab147de359d
-DIST iproute2-6.8.0.tar.xz 913512 BLAKE2B d30cdff8522627c27c9165f068f42adbec38f15548a8f2cd31276f283880dc402e10c5989e7227e80cdc891bcc4a574b330d634ae550e689758b849c0506c31f SHA512 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0
 DIST iproute2-6.9.0.tar.xz 918144 BLAKE2B a7434a2537a55b4875db0e3cc35383dfe4d0c8a118a8a1102c4076bfb154c9c2ab0781dcff324fa18ce7cfde798bf332a9e0ff08003ff39acbb8129b597a93a6 SHA512 1cbb234cb8f94213c3529f0b74fed5a575ff1fb838e783b8d2b440643c2e91246eda42e9b26e9775897aadb8b8133d199b2851b8ea0df06a899dc02acf403325

diff --git a/sys-apps/iproute2/iproute2-6.10.0.ebuild b/sys-apps/iproute2/iproute2-6.10.0.ebuild
deleted file mode 100644
index bc6aeb87bc35..000000000000
--- a/sys-apps/iproute2/iproute2-6.10.0.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo toolchain-funcs flag-o-matic
-
-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 ~loong ~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 bpf caps elf +iptables minimal nfs selinux"
-# Needs root
-RESTRICT="test"
-
-# 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:= )
-	bpf? ( dev-libs/libbpf:= )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf:= )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	nfs? ( net-libs/libtirpc:= )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/bison-2.4
-	app-alternatives/lex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-musl-1.patch # bug #936234
-	"${FILESDIR}"/${PN}-6.10.0-musl-2.patch # bug #926341
-	"${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
-	"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
-	"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
-)
-
-src_prepare() {
-	default
-
-	# Fix version if necessary
-	local versionfile="include/version.h"
-	if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
-		einfo "Fixing version string"
-		sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
-			${versionfile} || die
-	fi
-
-	# echo -n is not POSIX compliant
-	sed -i 's@echo -n@printf@' 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 || die
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
-	if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
-		setns=y
-	else
-		setns=n
-	fi
-
-	echo 'int main(){return 0;}' > test.c || die
-	if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
-		sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
-	fi
-	popd >/dev/null || die
-
-	# build system does not pass CFLAGS to LDFLAGS, as is recommended by GCC upstream
-	# https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
-	# https://bugs.gentoo.org/929233
-	append-ldflags ${CFLAGS}
-
-	# run "configure" script first which will create "config.mk"...
-	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
-	edo ./configure --color=auto --libbpf_force $(usex bpf on off)
-
-	# Remove the definitions made by configure and allow them to be overridden
-	# by USE flags below.
-	# We have to do the cheesy only-sed-if-disabled because otherwise
-	# the *_FLAGS etc stuff found by configure will be used but result
-	# in a broken build.
-	if ! use berkdb ; then
-		sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
-	fi
-
-	if ! use caps ; then
-		sed -i -e '/HAVE_CAP/d' config.mk || die
-	fi
-
-	if use minimal ; then
-		sed -i -e '/HAVE_MNL/d' config.mk || die
-	fi
-
-	if ! use elf ; then
-		sed -i -e '/HAVE_ELF/d' config.mk || die
-	fi
-
-	if ! use nfs ; then
-		sed -i -e '/HAVE_RPC/d' config.mk || die
-	fi
-
-	if ! use selinux ; then
-		sed -i -e '/HAVE_SELINUX/d' config.mk || die
-	fi
-
-	# ...Now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	# Keep in sync with ifs above, or refactor to be unified.
-	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, bug #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_RPC      := $(usex nfs y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, bug #144265, bug #293709
-	IPT_LIB_DIR   := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_compile() {
-	emake V=1 NETNS_RUN_DIR=/run/netns
-}
-
-src_test() {
-	emake check
-}
-
-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 # bug #330115
-	mv "${ED}"/{s,}bin/ss || die # bug #547264
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-
-	# Collides with net-analyzer/ifstat
-	# https://bugs.gentoo.org/868321
-	mv "${ED}"/sbin/ifstat{,-iproute2} || 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
-}

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
deleted file mode 100644
index cc0ba0761809..000000000000
--- a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo toolchain-funcs
-
-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 ~loong ~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 bpf caps elf +iptables minimal nfs selinux"
-# Needs root
-RESTRICT="test"
-
-# 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:= )
-	bpf? ( dev-libs/libbpf:= )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf:= )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	nfs? ( net-libs/libtirpc:= )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/bison-2.4
-	app-alternatives/lex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
-	"${FILESDIR}"/${PN}-6.5.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
-	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
-	"${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727
-	"${FILESDIR}"/${PN}-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
-	"${FILESDIR}"/${PN}-6.6.0-revert-CONF_USR_DIR.patch
-	"${FILESDIR}"/${PN}-6.6.0-makefile-use-usr-share-config.patch
-	"${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622
-)
-
-src_prepare() {
-	default
-
-	# Fix version if necessary
-	local versionfile="include/version.h"
-	if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
-		einfo "Fixing version string"
-		sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
-			${versionfile} || die
-	fi
-
-	# echo -n is not POSIX compliant
-	sed -i 's@echo -n@printf@' 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 || die
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
-	if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
-		setns=y
-	else
-		setns=n
-	fi
-
-	echo 'int main(){return 0;}' > test.c || die
-	if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
-		sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
-	fi
-	popd >/dev/null || die
-
-	# run "configure" script first which will create "config.mk"...
-	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
-	edo ./configure --libbpf_force $(usex bpf on off)
-
-	# Remove the definitions made by configure and allow them to be overridden
-	# by USE flags below.
-	# We have to do the cheesy only-sed-if-disabled because otherwise
-	# the *_FLAGS etc stuff found by configure will be used but result
-	# in a broken build.
-	if ! use berkdb ; then
-		sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
-	fi
-
-	if ! use caps ; then
-		sed -i -e '/HAVE_CAP/d' config.mk || die
-	fi
-
-	if use minimal ; then
-		sed -i -e '/HAVE_MNL/d' config.mk || die
-	fi
-
-	if ! use elf ; then
-		sed -i -e '/HAVE_ELF/d' config.mk || die
-	fi
-
-	if ! use nfs ; then
-		sed -i -e '/HAVE_RPC/d' config.mk || die
-	fi
-
-	if ! use selinux ; then
-		sed -i -e '/HAVE_SELINUX/d' config.mk || die
-	fi
-
-	# ...Now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	# Keep in sync with ifs above, or refactor to be unified.
-	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, bug #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_RPC      := $(usex nfs y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, bug #144265, bug #293709
-	IPT_LIB_DIR   := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_compile() {
-	emake V=1 NETNS_RUN_DIR=/run/netns
-}
-
-src_test() {
-	emake check
-}
-
-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 # bug #330115
-	mv "${ED}"/{s,}bin/ss || die # bug #547264
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-
-	# Collides with net-analyzer/ifstat
-	# https://bugs.gentoo.org/868321
-	mv "${ED}"/sbin/ifstat{,-iproute2} || 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
-}

diff --git a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
deleted file mode 100644
index d8f355fe7c69..000000000000
--- a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo toolchain-funcs flag-o-matic
-
-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 ~loong ~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 bpf caps elf +iptables minimal nfs selinux"
-# Needs root
-RESTRICT="test"
-
-# 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:= )
-	bpf? ( dev-libs/libbpf:= )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf:= )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	nfs? ( net-libs/libtirpc:= )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/bison-2.4
-	app-alternatives/lex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
-	"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
-	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
-	"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
-	"${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622
-)
-
-src_prepare() {
-	default
-
-	# Fix version if necessary
-	local versionfile="include/version.h"
-	if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
-		einfo "Fixing version string"
-		sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
-			${versionfile} || die
-	fi
-
-	# echo -n is not POSIX compliant
-	sed -i 's@echo -n@printf@' 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 || die
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
-	if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
-		setns=y
-	else
-		setns=n
-	fi
-
-	echo 'int main(){return 0;}' > test.c || die
-	if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
-		sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
-	fi
-	popd >/dev/null || die
-
-	# build system does not pass CFLAGS to LDFLAGS, as is recommended by GCC upstream
-	# https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
-	# https://bugs.gentoo.org/929233
-	append-ldflags ${CFLAGS}
-
-	# run "configure" script first which will create "config.mk"...
-	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
-	edo ./configure --color=auto --libbpf_force $(usex bpf on off)
-
-	# Remove the definitions made by configure and allow them to be overridden
-	# by USE flags below.
-	# We have to do the cheesy only-sed-if-disabled because otherwise
-	# the *_FLAGS etc stuff found by configure will be used but result
-	# in a broken build.
-	if ! use berkdb ; then
-		sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
-	fi
-
-	if ! use caps ; then
-		sed -i -e '/HAVE_CAP/d' config.mk || die
-	fi
-
-	if use minimal ; then
-		sed -i -e '/HAVE_MNL/d' config.mk || die
-	fi
-
-	if ! use elf ; then
-		sed -i -e '/HAVE_ELF/d' config.mk || die
-	fi
-
-	if ! use nfs ; then
-		sed -i -e '/HAVE_RPC/d' config.mk || die
-	fi
-
-	if ! use selinux ; then
-		sed -i -e '/HAVE_SELINUX/d' config.mk || die
-	fi
-
-	# ...Now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	# Keep in sync with ifs above, or refactor to be unified.
-	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, bug #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_RPC      := $(usex nfs y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, bug #144265, bug #293709
-	IPT_LIB_DIR   := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_compile() {
-	emake V=1 NETNS_RUN_DIR=/run/netns
-}
-
-src_test() {
-	emake check
-}
-
-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 # bug #330115
-	mv "${ED}"/{s,}bin/ss || die # bug #547264
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-
-	# Collides with net-analyzer/ifstat
-	# https://bugs.gentoo.org/868321
-	mv "${ED}"/sbin/ifstat{,-iproute2} || 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
-}


             reply	other threads:[~2024-12-08  5:45 UTC|newest]

Thread overview: 312+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-08  5:45 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-13  1:28 [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/ Sam James
2025-03-13  1:28 Sam James
2025-03-13  1:21 Sam James
2025-03-13  1:21 Sam James
2025-03-13  1:21 Sam James
2025-03-13  1:09 Sam James
2025-03-13  0:53 Sam James
2025-02-09  6:23 Sam James
2025-02-09  6:23 Sam James
2025-01-25  3:40 Matt Turner
2025-01-18  7:11 Arthur Zamarin
2025-01-12 14:22 Sam James
2025-01-12 13:48 Sam James
2025-01-12 13:48 Sam James
2025-01-12 13:48 Sam James
2025-01-12 13:42 Sam James
2025-01-12 13:42 Sam James
2024-12-08  5:45 Sam James
2024-11-13 11:10 Arthur Zamarin
2024-11-13 11:10 Arthur Zamarin
2024-11-13 11:10 Arthur Zamarin
2024-11-13 11:10 Arthur Zamarin
2024-11-13 11:10 Arthur Zamarin
2024-11-12 21:47 Sam James
2024-11-12 20:46 Sam James
2024-11-12  0:20 Sam James
2024-11-11 15:21 Sam James
2024-11-11 15:21 Sam James
2024-11-11 15:21 Sam James
2024-11-11 14:47 Sam James
2024-11-11 14:47 Sam James
2024-11-11 14:47 Sam James
2024-10-31 22:27 Andreas K. Hüttel
2024-10-31 18:37 Mike Gilbert
2024-10-31  0:23 Sam James
2024-09-24  6:06 Sam James
2024-09-17 16:45 Sam James
2024-08-30  7:59 Sam James
2024-08-29  3:51 Sam James
2024-08-29  3:51 Sam James
2024-08-29  2:35 Sam James
2024-08-29  2:35 Sam James
2024-08-29  2:35 Sam James
2024-08-29  2:35 Sam James
2024-07-17  6:12 Sam James
2024-06-25  6:43 Sam James
2024-06-25  6:43 Sam James
2024-06-25  6:43 Sam James
2024-06-25  4:41 Sam James
2024-06-25  4:41 Sam James
2024-06-25  4:14 Sam James
2024-06-25  4:07 Sam James
2024-05-28  1:59 Sam James
2024-04-12 19:11 Patrick McLean
2024-04-12 17:46 Patrick McLean
2024-04-12 17:42 Patrick McLean
2024-04-12 17:22 Patrick McLean
2024-02-22 20:33 Arthur Zamarin
2024-02-06  7:25 Sam James
2024-02-06  7:25 Sam James
2024-02-06  6:54 Sam James
2024-02-06  6:47 Sam James
2024-02-06  6:47 Sam James
2024-02-06  6:25 Sam James
2024-02-06  6:25 Sam James
2024-01-01  1:52 Sam James
2024-01-01  1:51 Sam James
2023-12-17 19:12 Arthur Zamarin
2023-12-15 12:53 Arthur Zamarin
2023-12-15  8:41 Sam James
2023-12-15  8:29 Sam James
2023-12-15  7:16 Sam James
2023-12-15  7:14 Sam James
2023-12-15  7:06 Sam James
2023-11-05 19:04 Sam James
2023-10-27  2:34 Sam James
2023-10-23 14:05 Arthur Zamarin
2023-10-22 12:22 Sam James
2023-10-22 11:44 Sam James
2023-10-22 11:39 Sam James
2023-10-22 11:39 Sam James
2023-10-22 11:39 Sam James
2023-10-17 17:02 Sam James
2023-09-16 10:25 Sam James
2023-09-16 10:25 Sam James
2023-09-16 10:25 Sam James
2023-08-21  3:50 Sam James
2023-08-19  9:24 Sam James
2023-08-19  9:24 Sam James
2023-08-19  9:24 Sam James
2023-08-19  6:58 Arthur Zamarin
2023-08-19  6:33 Sam James
2023-08-19  6:33 Sam James
2023-06-27  2:24 Sam James
2023-06-01  4:21 Sam James
2023-06-01  3:34 Sam James
2023-06-01  3:34 Sam James
2023-06-01  3:29 Sam James
2023-06-01  3:29 Sam James
2023-06-01  3:29 Sam James
2023-06-01  3:29 Sam James
2023-04-28  7:25 Sam James
2023-03-13 19:16 Arthur Zamarin
2023-03-09 19:59 Mike Gilbert
2023-03-04 14:36 Arthur Zamarin
2023-03-04 12:38 Arthur Zamarin
2023-03-04 12:02 Arthur Zamarin
2023-03-04 11:16 Arthur Zamarin
2023-03-04 11:15 Arthur Zamarin
2023-03-04 11:13 Arthur Zamarin
2023-03-04 11:03 Arthur Zamarin
2023-02-22 12:31 Sam James
2023-02-22 11:17 Sam James
2023-02-22 11:17 Sam James
2022-12-15  5:44 Sam James
2022-12-15  5:44 Sam James
2022-12-15  5:44 Sam James
2022-12-15  5:23 Sam James
2022-12-15  5:23 Sam James
2022-12-15  5:23 Sam James
2022-12-15  5:23 Sam James
2022-12-15  5:23 Sam James
2022-12-15  5:21 Sam James
2022-10-09 23:19 Sam James
2022-10-09 23:10 Sam James
2022-10-08 21:04 Mike Gilbert
2022-08-09 20:06 Sam James
2022-06-21  9:41 David Seifert
2022-05-28  3:32 Sam James
2022-05-28  3:06 Sam James
2022-05-28  2:52 Sam James
2022-04-10  9:08 David Seifert
2022-03-24 16:17 Patrick McLean
2022-02-18  2:44 Sam James
2022-01-13  1:00 Sam James
2022-01-13  0:55 Sam James
2021-12-25 21:14 Sam James
2021-12-25 19:43 Arthur Zamarin
2021-12-25 19:35 Arthur Zamarin
2021-12-25 10:25 Sam James
2021-12-25 10:02 Georgy Yakovlev
2021-12-25  9:51 Jakov Smolić
2021-12-25  8:24 Agostino Sarubbo
2021-11-02  9:17 Lars Wendler
2021-09-01  7:17 Lars Wendler
2021-09-01  7:17 Lars Wendler
2021-08-14  3:48 Sam James
2021-08-11 23:13 Sam James
2021-08-11  0:24 Sam James
2021-08-11  0:12 Sam James
2021-08-11  0:02 Sam James
2021-08-10 15:36 Agostino Sarubbo
2021-07-09 13:35 Lars Wendler
2021-07-01  7:06 Lars Wendler
2021-07-01  7:06 Lars Wendler
2021-04-28 21:25 Sam James
2021-04-28 21:25 Sam James
2021-04-28 19:11 Sam James
2021-04-28 18:47 Sam James
2021-04-28 18:47 Sam James
2021-04-28 17:04 Sam James
2021-04-28 17:00 Sam James
2021-04-28  9:53 Lars Wendler
2021-04-28  9:53 Lars Wendler
2021-02-23 14:55 Lars Wendler
2021-02-23 14:55 Lars Wendler
2021-01-01 21:49 Andreas K. Hüttel
2020-12-23  0:20 Lars Wendler
2020-12-23  0:20 Lars Wendler
2020-10-17  7:52 Lars Wendler
2020-09-07  8:47 Sergei Trofimovich
2020-08-29 21:57 Sam James
2020-08-18 11:22 Agostino Sarubbo
2020-08-18 11:16 Agostino Sarubbo
2020-08-16 14:47 Agostino Sarubbo
2020-08-15  7:31 Sergei Trofimovich
2020-08-15  7:26 Sergei Trofimovich
2020-08-15  6:44 Sam James
2020-08-14 21:55 Sam James
2020-08-09  9:38 Lars Wendler
2020-07-30  8:05 Lars Wendler
2020-06-08 16:44 Sergei Trofimovich
2020-06-07  8:44 Agostino Sarubbo
2020-06-06 20:14 Agostino Sarubbo
2020-06-06 17:36 Agostino Sarubbo
2020-06-06 17:34 Agostino Sarubbo
2020-06-06 17:32 Agostino Sarubbo
2020-06-06 17:29 Agostino Sarubbo
2020-06-06 12:57 Sergei Trofimovich
2020-06-04 17:45 Lars Wendler
2020-06-04 17:45 Lars Wendler
2020-06-04 17:45 Lars Wendler
2020-04-17 19:49 Robin H. Johnson
2020-04-17 19:39 Robin H. Johnson
2020-04-02 19:50 Lars Wendler
2020-02-08 16:53 David Seifert
2020-01-27 20:53 Lars Wendler
2020-01-27 20:53 Lars Wendler
2019-11-26 10:45 Lars Wendler
2019-11-26 10:45 Lars Wendler
2019-11-26 10:45 Lars Wendler
2019-11-08  3:19 Aaron Bauman
2019-11-01  9:54 Mikle Kolyada
2019-11-01  9:54 Mikle Kolyada
2019-11-01  9:54 Mikle Kolyada
2019-10-16  5:45 Matt Turner
2019-10-03  8:09 Agostino Sarubbo
2019-09-29  9:11 Sergei Trofimovich
2019-09-26 19:02 Thomas Deutschmann
2019-09-26 18:30 Mikle Kolyada
2019-09-26  6:52 Sergei Trofimovich
2019-09-26  6:49 Sergei Trofimovich
2019-09-26  6:42 Sergei Trofimovich
2019-09-25 14:01 Thomas Deutschmann
2019-08-24 14:13 Lars Wendler
2019-08-24 13:59 Lars Wendler
2019-08-20  6:53 Guilherme Amadio
2019-07-28 11:17 Mikle Kolyada
2019-07-28 11:13 Mikle Kolyada
2019-07-28 11:13 Mikle Kolyada
2019-07-28 11:13 Mikle Kolyada
2019-07-22  0:53 Aaron Bauman
2019-07-19 11:33 Agostino Sarubbo
2019-07-18 12:27 Lars Wendler
2019-07-18 11:33 Agostino Sarubbo
2019-07-18 10:47 Agostino Sarubbo
2019-07-17 14:03 Agostino Sarubbo
2019-07-14  9:11 Sergei Trofimovich
2019-07-10 20:44 Sergei Trofimovich
2019-07-10 11:47 Agostino Sarubbo
2019-07-10 10:30 Agostino Sarubbo
2019-07-09 23:11 Sergei Trofimovich
2019-07-09  8:12 Lars Wendler
2019-07-09  8:12 Lars Wendler
2019-05-13  8:06 Lars Wendler
2019-05-11  9:30 Lars Wendler
2019-05-11  9:30 Lars Wendler
2019-05-06  8:12 Lars Wendler
2019-05-04 11:44 Mikle Kolyada
2019-03-19 20:41 Lars Wendler
2019-03-19 20:41 Lars Wendler
2018-12-28  8:19 Mikle Kolyada
2018-11-23 12:34 Mikle Kolyada
2018-10-24  7:35 Lars Wendler
2018-09-30 22:46 Mart Raudsepp
2018-09-30 21:38 Sergei Trofimovich
2018-09-28  7:58 Mikle Kolyada
2018-09-28  7:56 Mikle Kolyada
2018-09-28  7:55 Mikle Kolyada
2018-09-28  7:52 Mikle Kolyada
2018-09-25  6:35 Sergei Trofimovich
2018-09-23 12:12 Mikle Kolyada
2018-09-23 10:05 Sergei Trofimovich
2018-09-22 22:09 Mikle Kolyada
2018-08-14  8:04 Lars Wendler
2018-06-11  8:37 Lars Wendler
2018-06-11  8:37 Lars Wendler
2018-05-18 16:01 Mike Gilbert
2018-04-05  6:52 Jeroen Roovers
2018-02-02  7:29 Lars Wendler
2018-02-02  7:29 Lars Wendler
2018-02-01 22:36 Mike Frysinger
2018-02-01 22:32 Mike Frysinger
2018-01-30 10:14 Lars Wendler
2018-01-30 10:14 Lars Wendler
2018-01-21  5:00 Mike Frysinger
2018-01-10 22:26 Sergei Trofimovich
2018-01-10  6:19 Markus Meier
2017-12-27 12:20 Sergei Trofimovich
2017-12-27 11:08 Sergei Trofimovich
2017-12-26 23:41 Mikle Kolyada
2017-12-26 21:33 Sergei Trofimovich
2017-12-14 19:48 Sergei Trofimovich
2017-12-14 11:18 Jason Zaman
2017-12-10 23:38 Anthony G. Basile
2017-12-10 21:22 Sergei Trofimovich
2017-12-04  5:17 Robin H. Johnson
2017-11-29 18:51 Robin H. Johnson
2017-11-29 18:46 Robin H. Johnson
2017-11-22 22:25 Robin H. Johnson
2017-11-21 15:34 Lars Wendler
2017-11-13 10:23 Lars Wendler
2017-11-13 10:23 Lars Wendler
2017-09-06  9:04 Lars Wendler
2017-09-06  9:04 Lars Wendler
2017-07-05 21:46 Lars Wendler
2017-02-20 22:40 Lars Wendler
2016-12-18  0:14 Mike Frysinger
2016-12-18  0:14 Mike Frysinger
2016-12-13  9:44 Lars Wendler
2016-10-10 11:16 Lars Wendler
2016-09-18 15:41 Sergei Trofimovich
2016-09-18 15:30 Sergei Trofimovich
2016-08-08 18:09 Lars Wendler
2016-05-25  6:29 Matt Turner
2016-05-23  4:15 Jeroen Roovers
2016-03-25  9:45 Markus Meier
2016-03-20 11:53 Agostino Sarubbo
2016-03-19 11:35 Agostino Sarubbo
2016-03-17 10:50 Agostino Sarubbo
2016-03-15 10:04 Lars Wendler
2016-03-07 13:34 Agostino Sarubbo
2016-02-29  8:46 Stephen Klimaszewski
2016-02-14 10:11 Agostino Sarubbo
2016-02-10 20:46 Markus Meier
2016-02-06  6:53 Jeroen Roovers
2016-02-04 11:57 Tobias Klausmann
2016-02-01  8:14 Agostino Sarubbo
2016-01-11 21:41 Lars Wendler
2015-11-04  9:56 Lars Wendler
2015-09-06 16:11 Lars Wendler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1733636711.754dbb9348adaab456bd3c628f1bb939c27c6093.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox