commit:     bb58955e1e5dbc0a4e66bc6e2433ab7dd403b402
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 18 16:08:43 2025 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Dec 18 16:09:53 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb58955e

sys-apps/iproute2: Fix build failure in netshaper (bug #967676)

Patch contributed by Cyril Baletaud

Closes: https://bugs.gentoo.org/967676
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 .../iproute2/files/iproute2-6.18.0-netshaper-libmnl.patch   | 13 -------------
 sys-apps/iproute2/files/iproute2-6.18.0-netshaper.patch     | 10 ++++++++++
 sys-apps/iproute2/iproute2-6.18.0.ebuild                    |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/sys-apps/iproute2/files/iproute2-6.18.0-netshaper-libmnl.patch 
b/sys-apps/iproute2/files/iproute2-6.18.0-netshaper-libmnl.patch
deleted file mode 100644
index 6d9484c01e46..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.18.0-netshaper-libmnl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/netshaper/Makefile b/netshaper/Makefile
-index 54a6a691..cec3ec91 100644
---- a/netshaper/Makefile
-+++ b/netshaper/Makefile
-@@ -3,7 +3,7 @@ include ../config.mk
- 
- NSOBJ = netshaper.o
- TARGETS += netshaper
--LDLIBS += -lm
-+LDLIBS += -lm -lmnl
- 
- all: $(TARGETS) $(LIBS)
- 

diff --git a/sys-apps/iproute2/files/iproute2-6.18.0-netshaper.patch 
b/sys-apps/iproute2/files/iproute2-6.18.0-netshaper.patch
new file mode 100644
index 000000000000..79061b974fe9
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.18.0-netshaper.patch
@@ -0,0 +1,10 @@
+diff '--color=auto' -Naur iproute2-6.18.0/netshaper/Makefile 
iproute2-6.18.0-fix/netshaper/Makefile
+--- iproute2-6.18.0/netshaper/Makefile 2025-12-01 19:47:16.000000000 +0300
++++ iproute2-6.18.0-fix/netshaper/Makefile     2025-12-18 11:26:23.091330554 
+0300
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ NSOBJ = netshaper.o
+ TARGETS += netshaper

diff --git a/sys-apps/iproute2/iproute2-6.18.0.ebuild 
b/sys-apps/iproute2/iproute2-6.18.0.ebuild
index 94a8e0ab5383..0753a4d0762f 100644
--- a/sys-apps/iproute2/iproute2-6.18.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.18.0.ebuild
@@ -51,7 +51,7 @@ 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
-       "${FILESDIR}"/${PN}-6.18.0-netshaper-libmnl.patch
+       "${FILESDIR}"/${PN}-6.18.0-netshaper.patch
 )
 
 src_prepare() {

Reply via email to