From nobody Wed Sep 28 04:02:35 2022 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 4McjWH3nfpz4YHrg; Wed, 28 Sep 2022 04:02:35 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4McjWH3KBfz3hJ8; Wed, 28 Sep 2022 04:02:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664337755; 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=wdWJPzIMI9By0sSJ/k4nDYji4hyly+qm7qANttHNZgE=; b=SeUEOxV8Q3NTGXmNPF47hYveUjuyfXG0xsni+ST+AR7JPcii4iDd15F7wE8OmaYt34M5fv 7hfe+bzmkjQup/U6bmCq7WEj90aSA95r+S8Gisdo5g0xOMyFi8pmP2G761t7/42EzsX+Y3 2RNoNS84lyuAg0E41Sxu2MhaEb9Vx3nf9WDMzfat3jBnhxRhJuLR8FzVCE0U5lZ2Cl0EMj Z1IT1w48i+uMNA0rE3/PACKj/c5aBD8tpg6jN7UEkOx7N2lCAisCYHzzqM8KRSgtjWPitG jWT2i05O+4vtuKzDaW0yH8lD4X9RsDstUXVTVPOAbIKOvwaDh9/CZgu16vvYpw== 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 4McjWH2MYBzLgV; Wed, 28 Sep 2022 04:02:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28S42Zki070896; Wed, 28 Sep 2022 04:02:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28S42ZEj070895; Wed, 28 Sep 2022 04:02:35 GMT (envelope-from git) Date: Wed, 28 Sep 2022 04:02:35 GMT Message-Id: <202209280402.28S42ZEj070895@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: ce59a3f9d9d1 - main - net-mgmt/net-snmp: Fix build under 14-CURRENT > 1400066 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce59a3f9d9d15e48d112a1b2a1bd61d54b51f43f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664337755; 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=wdWJPzIMI9By0sSJ/k4nDYji4hyly+qm7qANttHNZgE=; b=bA6ZzunPIZnSlv86MBwM+c5hm/gE3kZT2az1QnW7YCETfF7DwTsSR5rApAJs2KMMu/o0Gd jqn6V44C24PLlb30+/bXrIXhtZkiLZCCBsAcR8z4FmgiKye04h2oj42kqON2WFfineIDZE hmHgcjMSX5JNYuaSG3dCEYh41nl3YkgATn6E3TwVIec7Bihx+z4A36t1Bt7MBgO9GXOEak 47GXQwQ+9rB2F2fET42PrUUv8ruDqeFlGREXFSXN1fmEyUwA9iE1+CvORiayB2ErAEb0jp w9E5jI8mHJw7yIx65GX8+gbseLVsymO77axhWB7cMEqRiTXZNAcVMu3p20Nd7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664337755; a=rsa-sha256; cv=none; b=mAxDlYyHBFkyY6i199ZFaHKgNA5vtI9TFtVdh71tFNb3kBaSbeUz3+pjgvagaoa1tXRUIL 9UGAlKZhPfBg9qOmHyWuPn8/FDUzxMSVTag/yGm+hVcqBFsZPeR8IF5FTIU6dzI0IqY1Dh Y+twDpotaCsABAWXCRyXRUug6ul034SAMSOw/Nq/S6/w78um34yMO3rh274s7E//XWhEX/ iG+hzVY81rz+eyiqfa/dyAppRHiI4hVsPJwa6Lr9nkCAoLz2GIZ4eG8SQ/PkuNhs3quQtN AVyO6AkMLbuIqzDkQDj09czz3mI0nZAl4AoVru35Ihfo9AlPiNtrHLfAi0irwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce59a3f9d9d15e48d112a1b2a1bd61d54b51f43f commit ce59a3f9d9d15e48d112a1b2a1bd61d54b51f43f Author: Cy Schubert AuthorDate: 2022-09-28 03:21:01 +0000 Commit: Cy Schubert CommitDate: 2022-09-28 04:02:21 +0000 net-mgmt/net-snmp: Fix build under 14-CURRENT > 1400066 IPFRAGTTL was removed in 81a34d374ed6e5a7b14f24583bc8e3abfdc66306 (1400067). Define the value in the port. --- ..._mibgroup_ip-mib_data__access_scalars__sysctl.c | 23 ++++++++++++++++++++++ .../net-snmp/files/patch-agent_mibgroup_mibII_ip.c | 16 +++++++++++++++ .../files/patch-agent_mibgroup_mibII_tcp.c | 17 ++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/net-mgmt/net-snmp/files/patch-agent_mibgroup_ip-mib_data__access_scalars__sysctl.c b/net-mgmt/net-snmp/files/patch-agent_mibgroup_ip-mib_data__access_scalars__sysctl.c new file mode 100644 index 000000000000..ce13e2022ab2 --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-agent_mibgroup_ip-mib_data__access_scalars__sysctl.c @@ -0,0 +1,23 @@ +--- agent/mibgroup/ip-mib/data_access/scalars_sysctl.c.orig 2021-05-25 15:19:35.000000000 -0700 ++++ agent/mibgroup/ip-mib/data_access/scalars_sysctl.c 2022-09-27 20:25:15.687146000 -0700 +@@ -9,6 +9,7 @@ + #include + #include + ++#include + #include + #include + #include +@@ -16,6 +17,12 @@ + #include + #include + #include ++ ++#if defined(__FreeBSD_version) && __FreeBSD_version > 1400066 ++#define IPFRAGTTL 60 /* time to live for frags, slowhz */ ++#define PR_SLOWHZ 2 /* 2 slow timeouts per second */ ++#define PR_FASTHZ 5 /* 5 fast timeouts per second */ ++#endif + + /* XXX: the values passed to netsnmp_arch_ip_scalars(..) may or may not be + * portable to the other BSDs -- it seems to be portable back to FreeBSD 4.x diff --git a/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_ip.c b/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_ip.c new file mode 100644 index 000000000000..abf6b0ab944a --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_ip.c @@ -0,0 +1,16 @@ +--- agent/mibgroup/mibII/ip.c.orig 2021-05-25 15:19:35.000000000 -0700 ++++ agent/mibgroup/mibII/ip.c 2022-09-27 20:25:12.959145000 -0700 +@@ -5,6 +5,13 @@ + + #include + #include "mibII_common.h" ++#include ++ ++#if defined(__FreeBSD_version) && __FreeBSD_version > 1400066 ++#define IPFRAGTTL 60 /* time to live for frags, slowhz */ ++#define PR_SLOWHZ 2 /* 2 slow timeouts per second */ ++#define PR_FASTHZ 5 /* 5 fast timeouts per second */ ++#endif + + #if HAVE_SYS_HASHING_H + #include 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 new file mode 100644 index 000000000000..4919b4e3c974 --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_tcp.c @@ -0,0 +1,17 @@ +--- agent/mibgroup/mibII/tcp.c.orig 2021-05-25 15:19:35.000000000 -0700 ++++ agent/mibgroup/mibII/tcp.c 2022-09-27 20:36:22.284180000 -0700 +@@ -8,6 +8,14 @@ + #include + #include "mibII_common.h" + ++#include ++ ++#if defined(__FreeBSD_version) && __FreeBSD_version > 1400066 ++#define IPFRAGTTL 60 /* time to live for frags, slowhz */ ++#define PR_SLOWHZ 2 /* 2 slow timeouts per second */ ++#define PR_FASTHZ 5 /* 5 fast timeouts per second */ ++#endif ++ + #if HAVE_STDLIB_H + #include + #endif