From nobody Sun Jul 13 22:40:57 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bgL5P5V5bz61ZKQ; Sun, 13 Jul 2025 22:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgL5P4YKXz3KP8; Sun, 13 Jul 2025 22:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752446457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wGf/1uhJC954BsBs691cQlBKmtk+LgF45wrcwBbJB84=; b=cYYwoBE/t7US/atTQT4ow6/UlHeXD9DG4VmciwtPj5BLVr7iQiKm10h2E/8MmtT7AjBJYO /7cAc5zoM/DCf5tVZBO+63O+mWD9DRlvIsa0zS90EcwEiLCVqKrq4qxMevpMubDBaHuawA zjxgFgLslfyQvw0Mqsa6hHRlsjwuI/9Y8dk4mLl4JkEU8fKUFCGy8LMRMhlw+9gIZMDS3t pHG77BfCeRZx5k3ZdjnDuA5+6PK47ACa7S5CV7vpe5Nbz18qCQIrup/fg79A3n+fpe201i 7NmJC5CwLimhKzTtMmBsrdkUtNnLpSGMjIiDEDBkEDQhJ0NsL+sv6Z8f+3KvOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752446457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wGf/1uhJC954BsBs691cQlBKmtk+LgF45wrcwBbJB84=; b=MFFqRGJyDnxzpuA9xmeFCy1S4pGJeRcINU6PtJdRrKGydL6Ql+pbfMhc/m11MB9fhfafBE 3UvUcUdfBruStDE2Dj1h7OK+VVtN83FQrdpHLAOjWiE6mB52ioTqYeG40anxJfEQ4c0EhT EgK2QGpx4grXS2+ZV0fzNK+Z5ZOvOZBqU5CPmpPXOJNV8mU2H/o4cOWnZq/UUSPRxHm6pd OBexKck3lBIRC97nm353bvPBzYOgH2D42dYZmtrVqELgy9N7HRhwK2uEAFQqzkd5/Olk+R qdadKqo61wO0bxN71o8CWJqQwrlCDCu+TxMGBs6CyihSYoQ1mMxvpw03dA/l8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752446457; a=rsa-sha256; cv=none; b=Pc5VVIGQup03qohl5R1sYvv+z105CIQG9Jto30yDWYmC3yArjj0lO7mLHsm9iBQOJe1LKk wlHdZMLn+9hls2Tj2tZWdHprKEdE7ro4BAXGsDwOuBHTlUnwnHwkaT4y64ceVa7y7qsTgN chd5QPJRqmuf40Bkjacs2vJieqGk9vkasAnn2WAd2HXmj55t5HhuVTCt8nMrq2yr0WvXll SlSgY6B9tXLk+mngnLggLwda9WVRy3hahUdora7oJtdAqN59fJMYrhuLUDyUtVLLv1y03P CcS9t91pwPFwb78tp2TFlJ/kpj06Fw8+J4XMsoKRcInzBV0DFSBOLD1cpUEssw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgL5P3vwhzC0b; Sun, 13 Jul 2025 22:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56DMevtX027078; Sun, 13 Jul 2025 22:40:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DMevu4027062; Sun, 13 Jul 2025 22:40:57 GMT (envelope-from git) Date: Sun, 13 Jul 2025 22:40:57 GMT Message-Id: <202507132240.56DMevu4027062@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 9a459e698b70 - main - net-mgmt/net-snmp: Fix 15-CURRENT build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a459e698b700e617a699bc9da4cea88c55c5876 Auto-Submitted: auto-generated The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a459e698b700e617a699bc9da4cea88c55c5876 commit 9a459e698b700e617a699bc9da4cea88c55c5876 Author: Ryan Steinmetz AuthorDate: 2025-07-13 22:39:53 +0000 Commit: Ryan Steinmetz CommitDate: 2025-07-13 22:39:53 +0000 net-mgmt/net-snmp: Fix 15-CURRENT build PR: 288140 Reported by: Cy Schubert --- .../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 #include "mibII_common.h" @@ -15,3 +15,21 @@ #ifdef HAVE_STDLIB_H #include #endif +@@ -38,8 +46,17 @@ + #include + #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 ++#if __FreeBSD_version >= 1500048 ++#undef _KERNEL + #endif ++#endif + #ifdef HAVE_NETINET_TCP_VAR_H + #ifdef openbsd7 + #define _KERNEL /* OpenBSD 7.3 */