git: 150dd61663a2 - main - net/smcroute: fix build on 15.1 and later
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 10 Oct 2026 18:16:22 UTC
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=150dd61663a247f4300acbdd40a61fd45e6fbad7
commit 150dd61663a247f4300acbdd40a61fd45e6fbad7
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2026-10-08 21:55:34 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2026-10-10 18:15:19 +0000
net/smcroute: fix build on 15.1 and later
Do not define _KERNEL around netinet/ip_mroute.h on FreeBSD. Its
kernel-only section now uses VNET_DECLARE(), and smcroute does not
need anything from it anyway.
---
net/smcroute/files/patch-src-mroute.h | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/net/smcroute/files/patch-src-mroute.h b/net/smcroute/files/patch-src-mroute.h
index 77bb0371f14a..85d701df2115 100644
--- a/net/smcroute/files/patch-src-mroute.h
+++ b/net/smcroute/files/patch-src-mroute.h
@@ -1,14 +1,12 @@
--- src/mroute.h.orig 2024-05-09 17:03:52 UTC
+++ src/mroute.h
-@@ -13,7 +13,11 @@
- #include <netinet/in_var.h>
+@@ -34,7 +34,9 @@
#endif
- #include <netinet/ip.h>
-+#if defined(__FreeBSD__)
- #include "queue.h" /* Needed by netinet/ip_mroute.h on FreeBSD */
-+#include <sys/callout.h>
-+#include <sys/mutex.h>
-+#endif
- #ifdef HAVE_LINUX_MROUTE_H
- #define _LINUX_IN_H /* For Linux <= 2.6.25 */
+ #ifdef HAVE_NETINET_IP_MROUTE_H
++#ifndef __FreeBSD__
+ #define _KERNEL
++#endif
+ #include <netinet/ip_mroute.h>
+ #undef _KERNEL
+ #else