Date: Sun, 13 Jul 2025 22:40:57 GMT From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9a459e698b70 - main - net-mgmt/net-snmp: Fix 15-CURRENT build Message-ID: <202507132240.56DMevu4027062@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a459e698b700e617a699bc9da4cea88c55c5876 commit 9a459e698b700e617a699bc9da4cea88c55c5876 Author: Ryan Steinmetz <zi@FreeBSD.org> AuthorDate: 2025-07-13 22:39:53 +0000 Commit: Ryan Steinmetz <zi@FreeBSD.org> CommitDate: 2025-07-13 22:39:53 +0000 net-mgmt/net-snmp: Fix 15-CURRENT build PR: 288140 Reported by: Cy Schubert <cy@FreeBSD.org> --- .../files/patch-agent_mibgroup_mibII_tcp.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_tcp.c b/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_tcp.c index af46e3d86d43..83470a30dedf 100644 --- a/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_tcp.c +++ b/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_tcp.c @@ -1,5 +1,5 @@ ---- agent/mibgroup/mibII/tcp.c.orig 2023-08-15 20:32:01 UTC -+++ agent/mibgroup/mibII/tcp.c +--- agent/mibgroup/mibII/tcp.c.orig 2023-08-15 13:32:01.000000000 -0700 ++++ agent/mibgroup/mibII/tcp.c 2025-07-10 17:17:00.309421000 -0700 @@ -8,6 +8,14 @@ #include <net-snmp/net-snmp-features.h> #include "mibII_common.h" @@ -15,3 +15,21 @@ #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif +@@ -38,8 +46,17 @@ + #include <netinet/tcpip.h> + #endif + #ifdef HAVE_NETINET_TCP_TIMER_H ++#if __FreeBSD_version >= 1500048 ++#define _KERNEL ++#define max(x, y) (((x) > (y)) ? (x) : (y)) ++#define MSEC_2_TICKS(m) max(1, (uint32_t)((hz == 1000) ? \ ++ (m) : ((uint64_t)(m) * (uint64_t)hz)/(uint64_t)1000)) ++#endif + #include <netinet/tcp_timer.h> ++#if __FreeBSD_version >= 1500048 ++#undef _KERNEL + #endif ++#endif + #ifdef HAVE_NETINET_TCP_VAR_H + #ifdef openbsd7 + #define _KERNEL /* OpenBSD 7.3 */home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202507132240.56DMevu4027062>