[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

[Sam James]

commit:     f03f7d8f192cfb996003c1b54694b7260f7fc601
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 16:38:38 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 16:39:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f03f7d8f

sys-apps/iproute2: add 6.11.0

Depend on >=libbpf-0.6.0 as some features are conditional on this
later version.

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

 sys-apps/iproute2/Manifest                                         | 1 +
 sys-apps/iproute2/{iproute2-9999.ebuild => iproute2-6.11.0.ebuild} | 5 +++--
 sys-apps/iproute2/iproute2-9999.ebuild                             | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 88ced78286e6..b115fc91c74b 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,4 +1,5 @@
 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.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-9999.ebuild 
b/sys-apps/iproute2/iproute2-6.11.0.ebuild
similarity index 97%
copy from sys-apps/iproute2/iproute2-9999.ebuild
copy to sys-apps/iproute2/iproute2-6.11.0.ebuild
index 1354f3c5f322..26b79a0d0847 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-6.11.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
        !minimal? ( net-libs/libmnl:= )
        atm? ( net-dialup/linux-atm )
        berkdb? ( sys-libs/db:= )
-       bpf? ( dev-libs/libbpf:= )
+       bpf? ( >=dev-libs/libbpf-0.6:= )
        caps? ( sys-libs/libcap )
        elf? ( virtual/libelf:= )
        iptables? ( >=net-firewall/iptables-1.4.20:= )
@@ -48,10 +48,11 @@ BDEPEND="
 "
 
 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
-       "${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622 & #932617
 )
 
 src_prepare() {

diff --git a/sys-apps/iproute2/iproute2-9999.ebuild 
b/sys-apps/iproute2/iproute2-9999.ebuild
index 1354f3c5f322..26b79a0d0847 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
        !minimal? ( net-libs/libmnl:= )
        atm? ( net-dialup/linux-atm )
        berkdb? ( sys-libs/db:= )
-       bpf? ( dev-libs/libbpf:= )
+       bpf? ( >=dev-libs/libbpf-0.6:= )
        caps? ( sys-libs/libcap )
        elf? ( virtual/libelf:= )
        iptables? ( >=net-firewall/iptables-1.4.20:= )
@@ -48,10 +48,11 @@ BDEPEND="
 "
 
 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
-       "${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622 & #932617
 )
 
 src_prepare() {