gentoo auto-resync : 17:07:2024 - 12:28:31

3 files changed, 219 insertions, 11 deletions

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index cecb80b35ddb..4dfbde215895 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -9,13 +9,15 @@ AUX iproute2-6.6.0-revert-CONF_USR_DIR.patch 1325 BLAKE2B 4301d995f758167719699c
 AUX iproute2-6.8.0-configure-nomagic-nolibbsd.patch 7010 BLAKE2B 4aab31c6da283789a6d7aca1b2dddeb828983d8bd4d929a05f5678dc1e4ca67e6e60be173c0968b5aeb3c8b40a4a1d4b307df02171e7adb296d508bb758f8e3f SHA512 0aa9cd6963cbd400f8284299cbeba7d36fe9f4cc775ebc114caf3f7e9479296776bf62415e49cbf821dc3a1c6f6d161fa23e973c44620c3f2a7077de750e9cda
 AUX iproute2-6.8.0-disable-libbsd-fallback.patch 777 BLAKE2B 099a8a59ff6fe385e0bc3e33b94e20ea3319af70b54e45eaad870d8bc84a9cc59057a3d9e51fb566891128a051244e54365c5fb0287d6db859bfd4596dd0ce86 SHA512 c577f536781e1b37f40ddc691697d4875614d392b28f3cd5c53bd27b3a66cfeab39b9e69140274d8713d948cbaccf62fad1845c97500931ec67de51154e59640
 AUX iproute2-6.9.0-mtu.patch 1135 BLAKE2B 503eb3ece9ef5b5a7918a0e26f7b1d57ed6889143e440d97ad7a56305d7a36e148b68e1f9f5de0c13656336ca9a675902aacb42e9866f053b2a68f5ae8c1bd80 SHA512 6b8fec963825ed8e9a51d559a87aa2ae0df53f8c288804547c2e8a9425a2c41a6c0524ee491f1600d011d9175aff3fcdaaec20a18f81e225cab7472f625f4b07
+DIST iproute2-6.10.0.tar.xz 920812 BLAKE2B 66332ea333ab2cdc4a2c71000fa2d06fd87cfdf5237dae458aff60ce606155302eb9d0ffaf87107255ab04c02f2b773dc040abb08bb89afb53091396dfc8a3ad SHA512 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41
 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
+EBUILD iproute2-6.10.0.ebuild 5908 BLAKE2B 6c8b25e7d0ab83b5d3f4f734d244101727f85601f803edd8e6f0fe6287ce7afff851ff50304e6e47e9e8a2c4f0f302b2a5de8144dbc3cf890aec5cbb869333f0 SHA512 1335da63ac9341db20a010e4a84bb33ecce9ab4d6e3840d16985f707b79fb39763bec29be157d75069e2c2dc8cb73335dbb86c94ad868d5de3bee2a591b8c127
 EBUILD iproute2-6.6.0-r1.ebuild 6005 BLAKE2B 9fc5b0e58119278043b53d8a200170f2613065d838922119a03b47df5bdbf98bd167c68a1ee220a5b6ef18ab8a6595470dc515c1f5265d931a6a0f1aab928e9c SHA512 860fd63ceac311bc945fd0729f4b373a824eb7130893c1eb871d1d4138539896385e3380ffa600486d58844aeb08a17a57f2a8daf2672fe7cc0bbf20a1b40dca
 EBUILD iproute2-6.6.0-r3.ebuild 5970 BLAKE2B cd6a2a71c8991b42a23ee59ce356aceb6e2a6801ff48866558f973229cfe525d03ba3eb3f30e679d29dbfa0145b555b5b9ef525eae3b1469c0904fea78359d5d SHA512 2002fd7eca14a2b7dc80bbc7004e5f349229f26bfb097d94d82d9ae5c6f29637ce34e38491401f995a8ccdc0c37eda8f1a5fda91fb16dacef34e4d4da17a5d55
 EBUILD iproute2-6.6.0.ebuild 5912 BLAKE2B 8a2fbae9e828f4ba106489cba07a94f5ce7e287a4e2d8e38901c334e1daaa162d3d94a6ba14116049b9c245b0e76904cf5401c799c32202c7af33df25177d021 SHA512 95d267179aacb4666b0d14dce83ebd790f099d31546c30ec7e61b9dcfa1c7b946e24839d30f4a3a42a6191427b2e3963b5569cffd4256bc09353680a17d9f68d
 EBUILD iproute2-6.8.0-r2.ebuild 6010 BLAKE2B b25a20920e33183fced01a2af9ac98aa76f400f1a3213bbf90e995a0bae555909e6d74b10cc1a1a1566409f3780447d57b7578f2f0bf84b0ba047318be3e2e13 SHA512 26930567fd01feb648117675a52c6fadeb0f13afdfeed8fd4a177f0868ef33a082ce6f333e1f59db6a852330c1745936dd82a6fa8d815b8c956b0831ecc02ef7
 EBUILD iproute2-6.9.0.ebuild 5974 BLAKE2B 0d78cf38466338e0918d60a11edb627297d2363657aa7dba67667693a4560889e0edbb876f7ef5c6bab64aa921ea39b736f3fe2c677c072803b0b1533153507a SHA512 2e260795bffca6c49af09981ee3e4079271d16a13ff46886796ffe3264c79a2562bc2ecbe0cd159d3b1345091af43f24041d7c399147fde7dfbe020b46abe80e
-EBUILD iproute2-9999.ebuild 6105 BLAKE2B d2b239882f105b285305b77bff60e12759226b4ea629f2a84caaa9fc51a35c3be42a9ad46e0c4a7ee3c0a34cd824071c9587d06dccd02a0a5fa61802d24135be SHA512 e6a24e56f94d8d56526a89771f1763849d0eed86dc06aa3d484d78bcb7e3fd63e26a83f4c5c7854af49072df042656b94ed1c752a5cff294ea486034e4a9db72
+EBUILD iproute2-9999.ebuild 5974 BLAKE2B 0d78cf38466338e0918d60a11edb627297d2363657aa7dba67667693a4560889e0edbb876f7ef5c6bab64aa921ea39b736f3fe2c677c072803b0b1533153507a SHA512 2e260795bffca6c49af09981ee3e4079271d16a13ff46886796ffe3264c79a2562bc2ecbe0cd159d3b1345091af43f24041d7c399147fde7dfbe020b46abe80e
 MISC metadata.xml 887 BLAKE2B 28f816c12d798665f2e32e22ffd69dfda03e251bc6447a34e3ddbf0d5d00046c561b7f8282f73ed8609b3d9397da9bc2b1bf54d23bc82d5395af141e2448a3e3 SHA512 e5cafc242c2e4fe64df7456b3e001285933a680b674400ef53b2fc5f966f0c8551fc2ad7d07798d56eed365331ae01536d7b6d41fa5a710c1c2257900ce45d3e
diff --git a/sys-apps/iproute2/iproute2-6.10.0.ebuild b/sys-apps/iproute2/iproute2-6.10.0.ebuild
new file mode 100644
index 000000000000..3d0c9ec799da
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.10.0.ebuild
@@ -0,0 +1,212 @@
+# 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 ~ia64 ~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.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-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index bfc78c186a70..94334695f4ff 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux split-usr"
+IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
 # Needs root
 RESTRICT="test"
 
@@ -48,10 +48,10 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
+	"${FILESDIR}"/${PN}-6.9.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 & #932617
 )
 
 src_prepare() {
@@ -192,6 +192,7 @@ src_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
@@ -201,13 +202,6 @@ src_install() {
 	# https://bugs.gentoo.org/868321
 	mv "${ED}"/sbin/ifstat{,-iproute2} || die
 
-	if use split-usr ; then
-		# Can remove compatibility symlink in a year: 2023-05-28.
-		# bug #547264
-		mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
-		dosym -r /bin/ss /sbin/ss
-	fi
-
 	if use berkdb ; then
 		keepdir /var/lib/arpd
 		# bug #47482, arpd doesn't need to be in /sbin