commit: 4356d64dfda75809d0f58dc3e83d4ea70bc96839 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Thu Oct 16 19:16:05 2025 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Thu Oct 16 19:16:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4356d64d
sys-apps/iproute2: backport simple musl fix Closes: https://bugs.gentoo.org/963708 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sys-apps/iproute2/files/iproute2-6.17.0-musl.patch | 32 ++++++++++++++++++++++ sys-apps/iproute2/iproute2-6.17.0.ebuild | 1 + 2 files changed, 33 insertions(+) diff --git a/sys-apps/iproute2/files/iproute2-6.17.0-musl.patch b/sys-apps/iproute2/files/iproute2-6.17.0-musl.patch new file mode 100644 index 000000000000..a207f350d202 --- /dev/null +++ b/sys-apps/iproute2/files/iproute2-6.17.0-musl.patch @@ -0,0 +1,32 @@ +From 7119f3736f689ab396ca4193ac593938affd55fa Mon Sep 17 00:00:00 2001 +From: Yureka <[email protected]> +Date: Sun, 12 Oct 2025 14:39:47 +0200 +Subject: lib: bridge: avoid redefinition of in6_addr + +On musl libc, which does not use the kernel definitions of in6_addr, including +the libc headers after the kernel (UAPI) headers would cause a redefinition +error. The opposite order avoids the redefinition. + +Fixes: 9e89d5b94d749f37525cd8778311e1c9f28f172a +Signed-off-by: Yureka <[email protected]> +--- + lib/bridge.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/bridge.c b/lib/bridge.c +index 5386aa017..104f5858b 100644 +--- a/lib/bridge.c ++++ b/lib/bridge.c +@@ -2,8 +2,8 @@ + + #include <net/if.h> + +-#include "bridge.h" + #include "utils.h" ++#include "bridge.h" + + void bridge_print_vlan_flags(__u16 flags) + { +-- +cgit 1.2.3-korg + diff --git a/sys-apps/iproute2/iproute2-6.17.0.ebuild b/sys-apps/iproute2/iproute2-6.17.0.ebuild index 24b326f4fb3b..0409edc6b6c0 100644 --- a/sys-apps/iproute2/iproute2-6.17.0.ebuild +++ b/sys-apps/iproute2/iproute2-6.17.0.ebuild @@ -47,6 +47,7 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}"/${PN}-6.17.0-musl.patch # bug #963708 "${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
