[pkgsrc/trunk]: pkgsrc/net net-snmp py-netsnmp: updated to 5.9.3

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f8447b1d473
branches:  trunk
changeset: 386939:9f8447b1d473
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Oct 18 12:01:52 2022 +0000

description:
net-snmp py-netsnmp: updated to 5.9.3

*5.9.3*:
    security:
      - These two CVEs can be exploited by a user with read-only credentials:
          - CVE-2022-24805 A buffer overflow in the handling of the INDEX of
            NET-SNMP-VACM-MIB can cause an out-of-bounds memory access.
          - CVE-2022-24809 A malformed OID in a GET-NEXT to the nsVacmAccessTable
            can cause a NULL pointer dereference.
      - These CVEs can be exploited by a user with read-write credentials:
          - CVE-2022-24806 Improper Input Validation when SETing malformed
            OIDs in master agent and subagent simultaneously
          - CVE-2022-24807 A malformed OID in a SET request to
            SNMP-VIEW-BASED-ACM-MIB::vacmAccessTable can cause an
            out-of-bounds memory access.
          - CVE-2022-24808 A malformed OID in a SET request to
            NET-SNMP-AGENT-MIB::nsLogTable can cause a NULL pointer dereference
          - CVE-2022-24810 A malformed OID in a SET to the nsVacmAccessTable
            can cause a NULL pointer dereference.
      - To avoid these flaws, use strong SNMPv3 credentials and do not share them.
        If you must use SNMPv1 or SNMPv2c, use a complex community string
        and enhance the protection by restricting access to a given IP address range.
      - Thanks are due to Yu Zhang of VARAS@IIE and Nanyu Zhong of VARAS@IIE for
        reporting the following CVEs that have been fixed in this release, and
        to Arista Networks for providing fixes.

    misc:
      - Snmp-create-v3-user: Fix the snmpd.conf path   @datadir@ is
        expanded in ${datarootdir} so datarootdir must be set before
        @datadir@ is used.

    general: Many bug fixes

*5.9.2*:
    skipped due to a last minute library versioning found bug -- use 5.9.3 instead

*5.9.1*:
    General: Many bug fixes

*5.9*
    snmplib:
      - Add IPv6 support to DTLSUDP transport CHANGES: snmplib: use new
        netsnmp_sockaddr_storage in netsnmp_addr_pair CHANGES: snmplib: add
        base_transport ptr for tunneled transports

    snmpd:
      - Security vulnerabilty in the ping MIB reported by Christopher Ertl
        from Microsoft fixed
      - Changing to a different uid/gid can only be done once
      - The extend mib is now read-only by default

    snmptrap:
      - BUG: 2899: Patch from Drew Roedersheimer to set library
        engineboots/time values before sending

    unspecified:
      - Add pkg-config support for building applications and sub-agents Use
        the netsnmp package when building Net-SNMP applications. Use the
        netsnmp-agent package when building Net-SNMP subagents.

diffstat:

 net/net-snmp/Makefile                                                       |  22 +-
 net/net-snmp/Makefile.common                                                |   4 +-
 net/net-snmp/PLIST                                                          |  19 +-
 net/net-snmp/builtin.mk                                                     |   4 +-
 net/net-snmp/distinfo                                                       |  51 ++--
 net/net-snmp/patches/patch-ag                                               |  40 ----
 net/net-snmp/patches/patch-agent_auto__nlist.c                              |  13 +
 net/net-snmp/patches/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c        |  68 +------
 net/net-snmp/patches/patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c   |  16 -
 net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__freebsd.c |  55 +++++
 net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c  |  12 +-
 net/net-snmp/patches/patch-agent_mibgroup_host_hr__storage.c                |  40 ++++
 net/net-snmp/patches/patch-agent_mibgroup_host_hr__swrun.c                  |  13 +
 net/net-snmp/patches/patch-agent_mibgroup_if-mib_data__access_interface.h   |  16 +
 net/net-snmp/patches/patch-agent_mibgroup_kernel__sunos5.c                  |  36 +-
 net/net-snmp/patches/patch-agent_mibgroup_mibII_icmp.c                      |  18 +
 net/net-snmp/patches/patch-agent_mibgroup_mibII_interfaces.c                |  38 +++
 net/net-snmp/patches/patch-agent_mibgroup_mibII_ip.c                        |  23 ++
 net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c                       |  97 ++++++++++
 net/net-snmp/patches/patch-agent_mibgroup_mibII_udp.c                       |  17 +
 net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c                  |   3 +-
 net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c                |  19 +
 net/net-snmp/patches/patch-agent_mibgroup_ucd-snmp_memory__netbsd1.c        |  39 ++++
 net/net-snmp/patches/patch-agent_mibgroup_var__route.c                      |  19 -
 net/net-snmp/patches/patch-ai                                               |  23 --
 net/net-snmp/patches/patch-aj                                               |  17 -
 net/net-snmp/patches/patch-ak                                               |  18 -
 net/net-snmp/patches/patch-am                                               |  13 -
 net/net-snmp/patches/patch-ap                                               |  38 ---
 net/net-snmp/patches/patch-aq                                               |  13 -
 net/net-snmp/patches/patch-configure                                        |  48 +----
 net/net-snmp/patches/patch-da                                               |  12 -
 net/net-snmp/patches/patch-db                                               |  12 -
 net/net-snmp/patches/patch-dl                                               |  97 ----------
 net/net-snmp/patches/patch-dt                                               |  13 -
 net/net-snmp/patches/patch-du                                               |  55 -----
 net/net-snmp/patches/patch-el                                               |  20 --
 net/net-snmp/patches/patch-es                                               |  39 ----
 net/net-snmp/patches/patch-ov_UCD-fields                                    |  12 +
 net/net-snmp/patches/patch-ov_oid__to__type.in                              |  12 +
 net/net-snmp/patches/patch-perl_OID_OID.xs                                  |  20 ++
 net/net-snmp/patches/patch-snmplib_transports_snmpUDPBaseDomain.c           |  27 --
 net/py-netsnmp/Makefile                                                     |   3 +-
 43 files changed, 502 insertions(+), 672 deletions(-)

diffs (truncated from 1585 to 300 lines):

diff -r 46132d652c10 -r 9f8447b1d473 net/net-snmp/Makefile
--- a/net/net-snmp/Makefile     Tue Oct 18 11:14:18 2022 +0000
+++ b/net/net-snmp/Makefile     Tue Oct 18 12:01:52 2022 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.138 2022/06/28 11:35:04 wiz Exp $
+# $NetBSD: Makefile,v 1.139 2022/10/18 12:01:52 adam Exp $
 
-PKGREVISION= 4
 .include "Makefile.common"
 CATEGORIES=    net
 
@@ -68,6 +67,8 @@
 CONFIGURE_ARGS+=       --with-mibdirs=${NET_SNMP_MIBDIRS:Q}
 .endif
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=       --with-mib-modules="smux host ucd-snmp/diskio mibII/kernel_netbsd"
+.elif ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=       --with-mib-modules="smux host ucd-snmp/diskio"
 .else
 CONFIGURE_ARGS+=       --with-mib-modules="smux host"
@@ -94,12 +95,6 @@
 #
 CONFIGURE_ARGS+=       --enable-ucd-snmp-compatibility
 
-CFLAGS.Darwin+=                -framework ApplicationServices
-CFLAGS.Darwin+=                -framework CoreFoundation
-CFLAGS.Darwin+=                -framework CoreServices
-CFLAGS.Darwin+=                -framework DiskArbitration
-CFLAGS.Darwin+=                -framework IOKit
-
 # Handle ${PREFIX}/share/snmp in the DEINSTALL script since it may contain
 # leftover config files or pidfiles after deinstallation.
 #
@@ -109,21 +104,12 @@
 SMF_INSTANCES= default snmptrapd
 
 USE_TOOLS+=            sh:run
-REPLACE_INTERPRETER+=  bash
-REPLACE.bash.old=      /bin/bash
-REPLACE.bash.new=      ${SH}
-REPLACE_FILES.bash=    local/mib2c-update
 
 INSTALLATION_DIRS+=    share/examples/net-snmp
 
 post-extract:
 .if ${OPSYS} == "DragonFly"
-       cp ${FILESDIR}/cpu_dragonfly.c ${WRKSRC}/agent/mibgroup/hardware/cpu/cpu_nlist.c
-.elif ${OPSYS} == "Darwin"
-       ${LN} -s ${WRKSRC}/include/net-snmp/system/darwin17.h ${WRKSRC}/include/net-snmp/system/darwin18.h
-       ${LN} -s ${WRKSRC}/include/net-snmp/system/darwin17.h ${WRKSRC}/include/net-snmp/system/darwin19.h
-       ${LN} -s ${WRKSRC}/include/net-snmp/system/darwin17.h ${WRKSRC}/include/net-snmp/system/darwin20.h
-       ${LN} -s ${WRKSRC}/include/net-snmp/system/darwin17.h ${WRKSRC}/include/net-snmp/system/darwin21.h
+       ${CP} ${FILESDIR}/cpu_dragonfly.c ${WRKSRC}/agent/mibgroup/hardware/cpu/cpu_nlist.c
 .endif
 
 post-wrapper:
diff -r 46132d652c10 -r 9f8447b1d473 net/net-snmp/Makefile.common
--- a/net/net-snmp/Makefile.common      Tue Oct 18 11:14:18 2022 +0000
+++ b/net/net-snmp/Makefile.common      Tue Oct 18 12:01:52 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.6 2020/06/12 02:22:07 sevan Exp $
+# $NetBSD: Makefile.common,v 1.7 2022/10/18 12:01:52 adam Exp $
 # used by net/net-snmp/Makefile
 # used by net/py-netsnmp/Makefile
 
-DISTNAME=      net-snmp-5.8
+DISTNAME=      net-snmp-5.9.3
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
 
 HOMEPAGE=      http://www.net-snmp.org/
diff -r 46132d652c10 -r 9f8447b1d473 net/net-snmp/PLIST
--- a/net/net-snmp/PLIST        Tue Oct 18 11:14:18 2022 +0000
+++ b/net/net-snmp/PLIST        Tue Oct 18 12:01:52 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2022/08/05 10:55:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.30 2022/10/18 12:01:52 adam Exp $
 bin/agentxtrap
 ${PLIST.perl}bin/checkbandwidth
 bin/encode_keychange
@@ -102,7 +102,6 @@
 include/net-snmp/library/data_list.h
 include/net-snmp/library/default_store.h
 include/net-snmp/library/dir_utils.h
-include/net-snmp/library/factory.h
 include/net-snmp/library/fd_event_manager.h
 include/net-snmp/library/file_utils.h
 include/net-snmp/library/getopt.h
@@ -123,6 +122,7 @@
 include/net-snmp/library/snmp.h
 include/net-snmp/library/snmpAliasDomain.h
 include/net-snmp/library/snmpCallbackDomain.h
+include/net-snmp/library/snmpIPBaseDomain.h
 include/net-snmp/library/snmpIPv4BaseDomain.h
 ${PLIST.inet6}include/net-snmp/library/snmpIPv6BaseDomain.h
 include/net-snmp/library/snmpSocketBaseDomain.h
@@ -174,23 +174,14 @@
 include/net-snmp/system/bsdi4.h
 include/net-snmp/system/cygwin.h
 include/net-snmp/system/darwin.h
-include/net-snmp/system/darwin10.h
-include/net-snmp/system/darwin11.h
-include/net-snmp/system/darwin12.h
-include/net-snmp/system/darwin13.h
-include/net-snmp/system/darwin14.h
-include/net-snmp/system/darwin15.h
-include/net-snmp/system/darwin16.h
-include/net-snmp/system/darwin17.h
-include/net-snmp/system/darwin7.h
-include/net-snmp/system/darwin8.h
-include/net-snmp/system/darwin9.h
 include/net-snmp/system/dragonfly.h
 include/net-snmp/system/dynix.h
 include/net-snmp/system/freebsd.h
 include/net-snmp/system/freebsd10.h
 include/net-snmp/system/freebsd11.h
 include/net-snmp/system/freebsd12.h
+include/net-snmp/system/freebsd13.h
+include/net-snmp/system/freebsd14.h
 include/net-snmp/system/freebsd2.h
 include/net-snmp/system/freebsd3.h
 include/net-snmp/system/freebsd4.h
@@ -274,6 +265,8 @@
 lib/libnetsnmpmibs.la
 lib/libnetsnmptrapd.la
 lib/libsnmp.la
+lib/pkgconfig/netsnmp-agent.pc
+lib/pkgconfig/netsnmp.pc
 man/man1/agentxtrap.1
 man/man1/encode_keychange.1
 man/man1/fixproc.1
diff -r 46132d652c10 -r 9f8447b1d473 net/net-snmp/builtin.mk
--- a/net/net-snmp/builtin.mk   Tue Oct 18 11:14:18 2022 +0000
+++ b/net/net-snmp/builtin.mk   Tue Oct 18 12:01:52 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2019/11/03 11:45:44 rillig Exp $
+# $NetBSD: builtin.mk,v 1.3 2022/10/18 12:01:52 adam Exp $
 
 BUILTIN_PKG:=  net-snmp
 
@@ -52,7 +52,7 @@
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.net-snmp}
 .        if !empty(USE_BUILTIN.net-snmp:M[yY][eE][sS])
 USE_BUILTIN.net-snmp!=                                                 \
-       if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.net-snmp:Q}; then \
+       if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.net-snmp}; then \
                ${ECHO} yes;                                            \
        else                                                            \
                ${ECHO} no;                                             \
diff -r 46132d652c10 -r 9f8447b1d473 net/net-snmp/distinfo
--- a/net/net-snmp/distinfo     Tue Oct 18 11:14:18 2022 +0000
+++ b/net/net-snmp/distinfo     Tue Oct 18 12:01:52 2022 +0000
@@ -1,33 +1,30 @@
-$NetBSD: distinfo,v 1.99 2022/08/05 10:55:01 adam Exp $
+$NetBSD: distinfo,v 1.100 2022/10/18 12:01:52 adam Exp $
 
-BLAKE2s (net-snmp-5.8.tar.gz) = 3baf340de546040278255692e48b57bab2bbfb595572bcd814fb53be3fd6f65c
-SHA512 (net-snmp-5.8.tar.gz) = 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7
-Size (net-snmp-5.8.tar.gz) = 6591680 bytes
-SHA1 (patch-ac) = fa5a32e497a7651f4804082d921bb2e91b17d098
-SHA1 (patch-ag) = d9595eceeb5ee986ab4365f62e3c3ab339e605aa
-SHA1 (patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c) = d36d2490448c2dfda0383c67deb36fdb31ff18a3
-SHA1 (patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c) = cee9722d9a3f956726a8760b900ed3a375afde3f
+BLAKE2s (net-snmp-5.9.3.tar.gz) = c5f3e30c73294c0f8b7db2a776a0a28e6f63ed1d55f32acb4328fbbb277cbe4a
+SHA512 (net-snmp-5.9.3.tar.gz) = a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc
+Size (net-snmp-5.9.3.tar.gz) = 6646950 bytes
+SHA1 (patch-agent_auto__nlist.c) = a8fe703d8902c2847ca6692af4400ddbf9cbe74b
+SHA1 (patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c) = 22fd0b95e06117fd8f59bd0112b2c91e40d61e70
+SHA1 (patch-agent_mibgroup_hardware_memory_memory__freebsd.c) = 51d2c7e11b3d422e57ea2f5761aff624f7333842
 SHA1 (patch-agent_mibgroup_hardware_memory_memory__netbsd.c) = 928a5aa99e7893ee91dea3110db8098212e328fa
-SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = 39888f6489b89bd6598c453977b29519b2f7968f
-SHA1 (patch-agent_mibgroup_kernel__sunos5.c) = 3e345f92f42a47959716b0176096c6b0d91aa65a
+SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = f983ae0d99d85ab1ac6dc7cf2d2c0415b6935258
+SHA1 (patch-agent_mibgroup_host_hr__storage.c) = d9595eceeb5ee986ab4365f62e3c3ab339e605aa
+SHA1 (patch-agent_mibgroup_host_hr__swrun.c) = d01e8a93f6e766cedfdc324efd69168f71aac76f
+SHA1 (patch-agent_mibgroup_if-mib_data__access_interface.h) = f888d65ec32020dc75d60d5d67ec54614d934489
+SHA1 (patch-agent_mibgroup_kernel__sunos5.c) = e1cfb194ec2ef784ae8bdf1ff3537edc9b30b66c
 SHA1 (patch-agent_mibgroup_kernel__sunos5.h) = eb80eb5e55020014b1e5524fd572839aefdce5a5
+SHA1 (patch-agent_mibgroup_mibII_icmp.c) = 50ac67db8a9ffc16d983b4192e74db25ef439321
+SHA1 (patch-agent_mibgroup_mibII_interfaces.c) = 44a4ce6302457094ba2b200e4c47ff6c2a425746
+SHA1 (patch-agent_mibgroup_mibII_ip.c) = 04c2a487bad8705c9725ef4a62016051d3898970
 SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = cd3345a4b30fe2280d0555ee38feb5f957a55b1e
+SHA1 (patch-agent_mibgroup_mibII_tcp.c) = 92563fd6be6f27be5b348cdc8bc02061374026b0
 SHA1 (patch-agent_mibgroup_mibII_tcpTable.c) = acea4fdb55622df9ed0a45051412de278695c9da
-SHA1 (patch-agent_mibgroup_mibII_udpTable.c) = 7726d27a52a03c16bd220530ddb41b896cfec089
-SHA1 (patch-agent_mibgroup_var__route.c) = 919348e62849367793e4abf7d608d9824eb8ff2d
+SHA1 (patch-agent_mibgroup_mibII_udp.c) = d110e996d0538d17251d39a5eed46df6944ba0fa
+SHA1 (patch-agent_mibgroup_mibII_udpTable.c) = 7672f7df9c8f6540987895e784b85de1e7cebf5e
+SHA1 (patch-agent_mibgroup_mibII_var__route.c) = 919348e62849367793e4abf7d608d9824eb8ff2d
+SHA1 (patch-agent_mibgroup_ucd-snmp_memory__netbsd1.c) = 7336d905bac315f344f93664e4118332f88fb6ee
 SHA1 (patch-agent_snmp__perl.c) = 893cf46624d4f26941b3911a64c752c110ba6ef8
-SHA1 (patch-ai) = 04c2a487bad8705c9725ef4a62016051d3898970
-SHA1 (patch-aj) = d110e996d0538d17251d39a5eed46df6944ba0fa
-SHA1 (patch-ak) = 50ac67db8a9ffc16d983b4192e74db25ef439321
-SHA1 (patch-am) = d01e8a93f6e766cedfdc324efd69168f71aac76f
-SHA1 (patch-ap) = 44a4ce6302457094ba2b200e4c47ff6c2a425746
-SHA1 (patch-aq) = a8fe703d8902c2847ca6692af4400ddbf9cbe74b
-SHA1 (patch-configure) = 7dd273e74c2d0a4cfc90398ba7804e0416d6f4f1
-SHA1 (patch-da) = 40e8d78bad93ca12f4c08c43b86e7f13edafc299
-SHA1 (patch-db) = 281be9a88860987880c71770f4050fd965dd8ed9
-SHA1 (patch-dl) = 92563fd6be6f27be5b348cdc8bc02061374026b0
-SHA1 (patch-dt) = 452fee78b37f8ce0eb30049f9f18b04cff9b6e6e
-SHA1 (patch-du) = 51d2c7e11b3d422e57ea2f5761aff624f7333842
-SHA1 (patch-el) = b23d7ae82d367d457181d231a56c80e648b0ee6e
-SHA1 (patch-es) = 7336d905bac315f344f93664e4118332f88fb6ee
-SHA1 (patch-snmplib_transports_snmpUDPBaseDomain.c) = a7eec599e1cfb2fbd22d0dd53412727b5ff1825d
+SHA1 (patch-configure) = 26012c2d7e22b01db3ab3a6d7d959645185065bb
+SHA1 (patch-ov_UCD-fields) = 40e8d78bad93ca12f4c08c43b86e7f13edafc299
+SHA1 (patch-ov_oid__to__type.in) = 281be9a88860987880c71770f4050fd965dd8ed9
+SHA1 (patch-perl_OID_OID.xs) = b23d7ae82d367d457181d231a56c80e648b0ee6e
diff -r 46132d652c10 -r 9f8447b1d473 net/net-snmp/patches/patch-ag
--- a/net/net-snmp/patches/patch-ag     Tue Oct 18 11:14:18 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-ag,v 1.12 2013/03/17 00:15:29 gdt Exp $
-
---- agent/mibgroup/host/hr_storage.c.orig      2012-10-09 22:28:58.000000000 +0000
-+++ agent/mibgroup/host/hr_storage.c
-@@ -69,6 +69,13 @@
- #endif
- #endif                          /* vm/vm.h */
- #endif                          /* sys/vm.h */
-+#if HAVE_SYS_POOL_H
-+#if defined(MBPOOL_SYMBOL) && defined(MCLPOOL_SYMBOL)
-+#define __POOL_EXPOSE
-+#include <sys/pool.h>
-+#else
-+#undef HAVE_SYS_POOL_H
-+#endif
- #if defined(HAVE_UVM_UVM_PARAM_H) && defined(HAVE_UVM_UVM_EXTERN_H)
- #include <uvm/uvm_param.h>
- #include <uvm/uvm_extern.h>
-@@ -76,20 +83,13 @@
- #include <vm/vm_param.h>
- #include <vm/vm_extern.h>
- #endif
-+#endif
- #if HAVE_KVM_H
- #include <kvm.h>
- #endif
- #if HAVE_FCNTL_H
- #include <fcntl.h>
- #endif
--#if HAVE_SYS_POOL_H
--#if defined(MBPOOL_SYMBOL) && defined(MCLPOOL_SYMBOL)
--#define __POOL_EXPOSE
--#include <sys/pool.h>
--#else
--#undef HAVE_SYS_POOL_H
--#endif
--#endif
- #if HAVE_SYS_MBUF_H
- #include <sys/mbuf.h>
- #endif
diff -r 46132d652c10 -r 9f8447b1d473 net/net-snmp/patches/patch-agent_auto__nlist.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/net-snmp/patches/patch-agent_auto__nlist.c    Tue Oct 18 12:01:52 2022 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-agent_auto__nlist.c,v 1.1 2022/10/18 12:01:52 adam Exp $
+
+--- agent/auto_nlist.c.orig    2012-10-09 22:28:58.000000000 +0000
++++ agent/auto_nlist.c
+@@ -67,7 +67,7 @@ auto_nlist_value(const char *string)
+         it->nl[0].n_name = (char *) malloc(strlen(string) + 2);
+ #if defined(aix4) || defined(aix5) || defined(aix6) || defined(aix7)
+         strcpy(it->nl[0].n_name, string);
+-        it->nl[0].n_name[strlen(string)+1] = '\0';
++        /* it->nl[0].n_name[strlen(string)+1] = '\0'; */
+ #elif defined(freebsd9)
+         sprintf(__DECONST(char*, it->nl[0].n_name), "_%s", string);
+ #else
diff -r 46132d652c10 -r 9f8447b1d473 net/net-snmp/patches/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c
--- a/net/net-snmp/patches/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c      Tue Oct 18 11:14:18 2022 +0000
+++ b/net/net-snmp/patches/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c      Tue Oct 18 12:01:52 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c,v 1.7 2017/10/06 02:39:38 gavan Exp $
+$NetBSD: patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c,v 1.8 2022/10/18 12:01:52 adam Exp $
 
---- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig      2014-12-08 20:23:22.000000000 +0000
+--- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig      2022-07-13 21:14:14.000000000 +0000
 +++ agent/mibgroup/hardware/cpu/cpu_sysctl.c
 @@ -10,6 +10,7 @@
  
@@ -9,7 +9,7 @@
 +#include <errno.h>
  #include <sys/types.h>
  
- #if defined(__FreeBSD__)
+ #if defined(freebsd3)
 @@ -24,6 +25,9 @@
  #include <sys/param.h>
  #include <sys/sysctl.h>
@@ -20,7 +20,7 @@
  #ifdef HAVE_VM_VM_PARAM_H
  #include <vm/vm_param.h>
  #endif
-@@ -43,7 +47,7 @@ void init_cpu_sysctl( void ) {
+@@ -46,7 +50,7 @@ void init_cpu_sysctl( void ) {
      int               i, n;
      size_t            siz;
      int               ncpu_mib[]  = { CTL_HW, HW_NCPU };