pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/net-snmp
Module Name: pkgsrc
Committed By: wiz
Date: Sun Jan 11 05:08:00 UTC 2026
Modified Files:
pkgsrc/net/net-snmp: Makefile Makefile.common PLIST distinfo
pkgsrc/net/net-snmp/patches:
patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c
patch-agent_mibgroup_hardware_memory_memory__freebsd.c
patch-agent_mibgroup_hardware_memory_memory__netbsd.c
patch-agent_mibgroup_mibII_tcp.c
patch-agent_mibgroup_mibII_var__route.c patch-configure
patch-perl_OID_OID.xs
Log Message:
net-snmp: update to 5.9.5.
*5.9.5*:
snmptrapd:
- fixed a critical vulnerability triggered by a specially crafted trap
snmpd:
- Make UCD-SNMP::dskTable dynamic if includeAllDisks is set.") added
a verification that drops all filesystems not present in other_fs[]
table. So add 'ubifs' in other_fs[] to fix it.
configure:
- Change the default OpenSSL path into /usr Change the default
OpenSSL path from /usr/local/ssl into /usr since that is the
default location for all current Linux distributions.
unspecified:
- Remove redundant declarations These changes aim to remove redundant
declarations from the Net-SNMP source code. They are most easily
exposed with adding -Wredundant-decls to CPPFLAGS for the gcc
compiler. Redundant declarations in other used modules and mib2c
generated code are left in place. The changes consist of: - Removal
of duplicate declarations in header files, other or the same. -
Removal of duplicate declarations in source files, where the
prototype already exists in the appropriate header file. - Fixing
declaration of register log handler functions. - Use of forward
declared struct, rather than extern function or char. " prefix to
subject and ran autoreconf ]
Add:
- Wredundant-decls to the developer options
Remove:
- Wredundant-decls from the developer options Revert commit
ad80e335b8af because this option causes a lot of noise for the Perl
header files.
Win32:
- WinExtDLL: Fix the build Fix the following build error:
mibgroup/winExtDLL.c:360:14: error: implicit declaration of
function 'should_init' [-Wimplicit-function-declaration] 360 |
if (!should_init(dll_basename)) { | ^~~~~~~~~~~
configure:
- Add --with-wolfssl Add support for building and linking with the
wolfSSL library instead of OpenSSL. Other changes that have been
included in this patch are: - Only enable AES support if
EVP_aes_128_cfb() is available. - Add support for detecting SSL
functions if these have been defined as macros.
To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 pkgsrc/net/net-snmp/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/net-snmp/Makefile.common
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/net-snmp/PLIST
cvs rdiff -u -r1.105 -r1.106 pkgsrc/net/net-snmp/distinfo
cvs rdiff -u -r1.8 -r1.9 \
pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__freebsd.c \
pkgsrc/net/net-snmp/patches/patch-perl_OID_OID.xs
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__netbsd.c
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c \
pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/net-snmp/patches/patch-configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/net-snmp/Makefile
diff -u pkgsrc/net/net-snmp/Makefile:1.146 pkgsrc/net/net-snmp/Makefile:1.147
--- pkgsrc/net/net-snmp/Makefile:1.146 Tue Oct 7 14:59:50 2025
+++ pkgsrc/net/net-snmp/Makefile Sun Jan 11 05:07:59 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.146 2025/10/07 14:59:50 wiz Exp $
+# $NetBSD: Makefile,v 1.147 2026/01/11 05:07:59 wiz Exp $
-PKGREVISION= 2
.include "Makefile.common"
CATEGORIES= net
@@ -100,6 +99,8 @@ CONFIGURE_ARGS+= --with-dummy-values
#
CONFIGURE_ARGS+= --enable-ucd-snmp-compatibility
+MAKE_ENV+= NETSNMP_DONT_CHECK_VERSION=1
+
# Handle ${PREFIX}/share/snmp in the DEINSTALL script since it may contain
# leftover config files or pidfiles after deinstallation.
#
Index: pkgsrc/net/net-snmp/Makefile.common
diff -u pkgsrc/net/net-snmp/Makefile.common:1.8 pkgsrc/net/net-snmp/Makefile.common:1.9
--- pkgsrc/net/net-snmp/Makefile.common:1.8 Wed Feb 21 10:21:00 2024
+++ pkgsrc/net/net-snmp/Makefile.common Sun Jan 11 05:07:59 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.8 2024/02/21 10:21:00 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2026/01/11 05:07:59 wiz Exp $
# used by net/net-snmp/Makefile
# used by net/py-netsnmp/Makefile
-DISTNAME= net-snmp-5.9.4
+DISTNAME= net-snmp-5.9.5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
HOMEPAGE= http://www.net-snmp.org/
Index: pkgsrc/net/net-snmp/PLIST
diff -u pkgsrc/net/net-snmp/PLIST:1.31 pkgsrc/net/net-snmp/PLIST:1.32
--- pkgsrc/net/net-snmp/PLIST:1.31 Wed Feb 21 10:21:00 2024
+++ pkgsrc/net/net-snmp/PLIST Sun Jan 11 05:07:59 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2024/02/21 10:21:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.32 2026/01/11 05:07:59 wiz Exp $
bin/agentxtrap
${PLIST.perl}bin/checkbandwidth
bin/encode_keychange
@@ -203,6 +203,8 @@ include/net-snmp/system/openbsd.h
include/net-snmp/system/openbsd4.h
include/net-snmp/system/openbsd5.h
include/net-snmp/system/openbsd6.h
+include/net-snmp/system/openbsd7.h
+include/net-snmp/system/openbsd8.h
include/net-snmp/system/osf5.h
include/net-snmp/system/solaris.h
include/net-snmp/system/solaris2.3.h
Index: pkgsrc/net/net-snmp/distinfo
diff -u pkgsrc/net/net-snmp/distinfo:1.105 pkgsrc/net/net-snmp/distinfo:1.106
--- pkgsrc/net/net-snmp/distinfo:1.105 Fri Jul 11 10:11:52 2025
+++ pkgsrc/net/net-snmp/distinfo Sun Jan 11 05:07:59 2026
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.105 2025/07/11 10:11:52 jperkin Exp $
+$NetBSD: distinfo,v 1.106 2026/01/11 05:07:59 wiz Exp $
-BLAKE2s (net-snmp-5.9.4.tar.gz) = 44b2e38afb93da994d7d90f342a9971c266f710e232c84206e204bb9a1266fe6
-SHA512 (net-snmp-5.9.4.tar.gz) = a510fa91a21e9ddc86a12fd1d0bc6b356e63f3ea53f184d2e31439004d41d902390664134dc40b3b828eabb4282eaf3da628a07c4d480fa00eff7e700950c423
-Size (net-snmp-5.9.4.tar.gz) = 6681606 bytes
+BLAKE2s (net-snmp-5.9.5.tar.gz) = 47f5d457d41a5a54534a9223d30eee6247609d93cd9af134f31db76f518784f4
+SHA512 (net-snmp-5.9.5.tar.gz) = a9801dd83cf7a800942327358654977856a20fd16af703c110dfff2b8baa345ea44ed19131b78a2b31076503a9478da91722eefa139783e6908896673d24dbf2
+Size (net-snmp-5.9.5.tar.gz) = 6728907 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_hardware_cpu_cpu__sysctl.c) = 418a4568098ee8c5a01b7efe1bc7b3db81599799
+SHA1 (patch-agent_mibgroup_hardware_memory_memory__freebsd.c) = e07e733912b8906cb168415a1768f9939b7f1bde
+SHA1 (patch-agent_mibgroup_hardware_memory_memory__netbsd.c) = eb5275a0915504449d828143375f6b4773593c1b
SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = f983ae0d99d85ab1ac6dc7cf2d2c0415b6935258
SHA1 (patch-agent_mibgroup_host_hr__swrun.c) = d01e8a93f6e766cedfdc324efd69168f71aac76f
SHA1 (patch-agent_mibgroup_if-mib_data__access_interface.h) = 839003d31a74db7ea71774da0f8c80748c3fc7d3
@@ -15,10 +15,10 @@ SHA1 (patch-agent_mibgroup_kernel__sunos
SHA1 (patch-agent_mibgroup_mibII_icmp.c) = 50ac67db8a9ffc16d983b4192e74db25ef439321
SHA1 (patch-agent_mibgroup_mibII_ip.c) = 04c2a487bad8705c9725ef4a62016051d3898970
SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = cd3345a4b30fe2280d0555ee38feb5f957a55b1e
-SHA1 (patch-agent_mibgroup_mibII_tcp.c) = fb065ad10b375b47608a12cf81f29fd473e6fba1
-SHA1 (patch-agent_mibgroup_mibII_var__route.c) = 6050099b8c060f857ec7d05409bc077db21bd650
+SHA1 (patch-agent_mibgroup_mibII_tcp.c) = 48bfb424819052987181ac61562c560d17e8e15c
+SHA1 (patch-agent_mibgroup_mibII_var__route.c) = 980a30fd82e46ead6ca266c425d61641f1751093
SHA1 (patch-agent_snmp__perl.c) = 52b7b26ce8cae6d892b017c50831565fc138a337
-SHA1 (patch-configure) = ab40b8c62e3f9dfe7b85ee4a3620a572f44493aa
+SHA1 (patch-configure) = c1c6381320eccb72a194053a8024ca3f5665f2d8
SHA1 (patch-ov_UCD-fields) = 40e8d78bad93ca12f4c08c43b86e7f13edafc299
SHA1 (patch-ov_oid__to__type.in) = 281be9a88860987880c71770f4050fd965dd8ed9
-SHA1 (patch-perl_OID_OID.xs) = b23d7ae82d367d457181d231a56c80e648b0ee6e
+SHA1 (patch-perl_OID_OID.xs) = 5c21172a697021543db4f9f88047e98954b2d0d8
Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c:1.8 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c:1.9
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c:1.8 Tue Oct 18 12:01:52 2022
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c Sun Jan 11 05:07:59 2026
@@ -1,6 +1,6 @@
-$NetBSD: patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c,v 1.8 2022/10/18 12:01:52 adam Exp $
+$NetBSD: patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c,v 1.9 2026/01/11 05:07:59 wiz Exp $
---- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig 2022-07-13 21:14:14.000000000 +0000
+--- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig 2025-12-20 15:03:33.000000000 +0000
+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c
@@ -10,6 +10,7 @@
@@ -38,16 +38,18 @@ $NetBSD: patch-agent_mibgroup_hardware_c
/*
* Strictly speaking, BSDi ought to use
-@@ -255,6 +259,32 @@ int netsnmp_cpu_arch_load( netsnmp_cache
- cpu->pageOut = mem_stats.NS_VM_PAGEOUT;
+@@ -253,6 +257,32 @@ int netsnmp_cpu_arch_load( netsnmp_cache *cache, void
#endif
-
+ #ifdef NS_VM_PAGEOUT
+ cpu->pageOut = mem_stats.NS_VM_PAGEOUT;
++#endif
++
+#if defined(__NetBSD__)
+ {
+ NETSNMP_CPU_STATS *ncpu_stats;
++ int i;
+ size_t ncpu_size = sizeof(*ncpu_stats) * cpu_num * CPUSTATES;
+ ncpu_stats = malloc(ncpu_size);
-+ int i;
+ if (ncpu_stats == NULL) {
+ snmp_log(LOG_ERR, "no memory for kern.cp_time (errno %d)\n", errno);
+ return -1;
@@ -66,8 +68,6 @@ $NetBSD: patch-agent_mibgroup_hardware_c
+ }
+ free(ncpu_stats);
+ }
-+#endif
-+
+ #endif
+
#ifdef NETSNMP_KERN_MCPU
- #if defined(KERN_CPTIME2)
- mcpu_size = cpu_num*sizeof(cpu_stats);
Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__freebsd.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__freebsd.c:1.1 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__freebsd.c:1.2
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__freebsd.c:1.1 Tue Oct 18 12:01:52 2022
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__freebsd.c Sun Jan 11 05:08:00 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-agent_mibgroup_hardware_memory_memory__freebsd.c,v 1.1 2022/10/18 12:01:52 adam Exp $
+$NetBSD: patch-agent_mibgroup_hardware_memory_memory__freebsd.c,v 1.2 2026/01/11 05:08:00 wiz Exp $
---- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2014-12-08 20:23:22.000000000 +0000
+--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2025-12-20 15:03:33.000000000 +0000
+++ agent/mibgroup/hardware/memory/memory_freebsd.c
-@@ -36,6 +36,12 @@ int netsnmp_mem_arch_load( netsnmp_cache
+@@ -37,6 +37,12 @@ int netsnmp_mem_arch_load( netsnmp_cache *cache, void
long pagesize;
int nswap;
@@ -15,7 +15,7 @@ $NetBSD: patch-agent_mibgroup_hardware_m
#if !defined(VM_TOTAL)
unsigned int free_mem;
size_t free_size = sizeof(free_mem);
-@@ -76,11 +82,17 @@ int netsnmp_mem_arch_load( netsnmp_cache
+@@ -77,11 +83,17 @@ int netsnmp_mem_arch_load( netsnmp_cache *cache, void
sysctlbyname("vm.stats.vm.v_inactive_count", &inact_count, &inact_size, NULL, 0);
sysctlbyname("vfs.bufspace", &bufspace, &buf_size, NULL, 0);
sysctlbyname("vfs.maxbufspace", &maxbufspace, &buf_size, NULL, 0);
@@ -33,7 +33,7 @@ $NetBSD: patch-agent_mibgroup_hardware_m
/*
* ... and save this in a standard form.
-@@ -91,6 +103,11 @@ int netsnmp_mem_arch_load( netsnmp_cache
+@@ -92,12 +104,18 @@ int netsnmp_mem_arch_load( netsnmp_cache *cache, void
} else {
if (!mem->descr)
mem->descr = strdup("Physical memory");
@@ -45,11 +45,10 @@ $NetBSD: patch-agent_mibgroup_hardware_m
mem->units = pagesize;
mem->size = phys_mem/pagesize;
#if !defined(VM_TOTAL)
-@@ -98,6 +115,7 @@ int netsnmp_mem_arch_load( netsnmp_cache
+ mem->free = free_mem;
#else
mem->free = total.t_free;
- #endif
+#endif
+ #endif
}
- mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_USERMEM, 1 );
Index: pkgsrc/net/net-snmp/patches/patch-perl_OID_OID.xs
diff -u pkgsrc/net/net-snmp/patches/patch-perl_OID_OID.xs:1.1 pkgsrc/net/net-snmp/patches/patch-perl_OID_OID.xs:1.2
--- pkgsrc/net/net-snmp/patches/patch-perl_OID_OID.xs:1.1 Tue Oct 18 12:01:52 2022
+++ pkgsrc/net/net-snmp/patches/patch-perl_OID_OID.xs Sun Jan 11 05:08:00 2026
@@ -1,15 +1,15 @@
-$NetBSD: patch-perl_OID_OID.xs,v 1.1 2022/10/18 12:01:52 adam Exp $
+$NetBSD: patch-perl_OID_OID.xs,v 1.2 2026/01/11 05:08:00 wiz Exp $
Adopt FreeBSD's patch to make this build with perl 5.24, ref.
https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
https://bugs.gentoo.org/show_bug.cgi?id=582368
---- perl/OID/OID.xs.orig 2016-06-06 13:52:38.000000000 +0000
+--- perl/OID/OID.xs.orig 2025-12-20 15:03:33.000000000 +0000
+++ perl/OID/OID.xs
-@@ -7,6 +7,10 @@
- #include "perl.h"
+@@ -8,6 +8,10 @@
#include "XSUB.h"
+ #pragma GCC diagnostic pop
+#ifdef U64TYPE
+#define U64 U64pairU32
Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__netbsd.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__netbsd.c:1.3 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__netbsd.c:1.4
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__netbsd.c:1.3 Wed Dec 31 10:06:57 2014
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__netbsd.c Sun Jan 11 05:08:00 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-agent_mibgroup_hardware_memory_memory__netbsd.c,v 1.3 2014/12/31 10:06:57 adam Exp $
+$NetBSD: patch-agent_mibgroup_hardware_memory_memory__netbsd.c,v 1.4 2026/01/11 05:08:00 wiz Exp $
---- agent/mibgroup/hardware/memory/memory_netbsd.c.orig 2014-12-08 20:23:22.000000000 +0000
+--- agent/mibgroup/hardware/memory/memory_netbsd.c.orig 2025-12-20 15:03:33.000000000 +0000
+++ agent/mibgroup/hardware/memory/memory_netbsd.c
-@@ -48,8 +48,8 @@ int netsnmp_mem_arch_load( netsnmp_cache
+@@ -48,8 +48,8 @@ int netsnmp_mem_arch_load( netsnmp_cache *cache, void
int uvmexp_mib[] = { CTL_VM, VM_UVMEXP };
int total_mib[] = { CTL_VM, VM_METER };
#else
@@ -13,7 +13,7 @@ $NetBSD: patch-agent_mibgroup_hardware_m
size_t buf_size = sizeof(bufspace);
#endif
-@@ -102,6 +102,7 @@ int netsnmp_mem_arch_load( netsnmp_cache
+@@ -102,6 +102,7 @@ int netsnmp_mem_arch_load( netsnmp_cache *cache, void
mem->units = pagesize;
mem->size = phys_mem/pagesize;
mem->free = total.t_free;
@@ -21,7 +21,7 @@ $NetBSD: patch-agent_mibgroup_hardware_m
}
mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_USERMEM, 1 );
-@@ -113,6 +114,7 @@ int netsnmp_mem_arch_load( netsnmp_cache
+@@ -113,6 +114,7 @@ int netsnmp_mem_arch_load( netsnmp_cache *cache, void
mem->units = pagesize;
mem->size = user_mem/pagesize;
mem->free = uvmexp.free;
@@ -29,7 +29,7 @@ $NetBSD: patch-agent_mibgroup_hardware_m
}
#if 1
-@@ -125,6 +127,7 @@ int netsnmp_mem_arch_load( netsnmp_cache
+@@ -125,6 +127,7 @@ int netsnmp_mem_arch_load( netsnmp_cache *cache, void
mem->units = pagesize;
mem->size = total.t_vm;
mem->free = total.t_avm;
@@ -37,7 +37,7 @@ $NetBSD: patch-agent_mibgroup_hardware_m
}
mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SHARED, 1 );
-@@ -136,6 +139,7 @@ int netsnmp_mem_arch_load( netsnmp_cache
+@@ -136,6 +139,7 @@ int netsnmp_mem_arch_load( netsnmp_cache *cache, void
mem->units = pagesize;
mem->size = total.t_vmshr;
mem->free = total.t_avmshr;
@@ -45,7 +45,7 @@ $NetBSD: patch-agent_mibgroup_hardware_m
}
mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SHARED2, 1 );
-@@ -147,6 +151,7 @@ int netsnmp_mem_arch_load( netsnmp_cache
+@@ -147,6 +151,7 @@ int netsnmp_mem_arch_load( netsnmp_cache *cache, void
mem->units = pagesize;
mem->size = total.t_rmshr;
mem->free = total.t_armshr;
@@ -53,7 +53,7 @@ $NetBSD: patch-agent_mibgroup_hardware_m
}
#endif
-@@ -174,7 +179,8 @@ int netsnmp_mem_arch_load( netsnmp_cache
+@@ -174,7 +179,8 @@ int netsnmp_mem_arch_load( netsnmp_cache *cache, void
mem->descr = strdup("Memory buffers");
mem->units = 1024;
mem->size = maxbufspace /1024;
@@ -95,7 +95,7 @@ $NetBSD: patch-agent_mibgroup_hardware_m
+ }
if (!mem->descr) {
- /* sprintf(buf, "swap #%d", s[i].se_dev); */
- sprintf(buf, "swap %s", s[i].se_path);
+ snprintf(buf, sizeof buf, "swap %s", s[i].se_path);
mem->descr = strdup( buf );
}
@@ -219,5 +235,6 @@ swapinfo(long pagesize)
Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c:1.2 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c:1.3
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c:1.2 Wed Feb 21 10:21:01 2024
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c Sun Jan 11 05:08:00 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-agent_mibgroup_mibII_tcp.c,v 1.2 2024/02/21 10:21:01 wiz Exp $
+$NetBSD: patch-agent_mibgroup_mibII_tcp.c,v 1.3 2026/01/11 05:08:00 wiz Exp $
---- agent/mibgroup/mibII/tcp.c.orig 2023-08-15 20:32:01.000000000 +0000
+--- agent/mibgroup/mibII/tcp.c.orig 2025-12-20 15:03:33.000000000 +0000
+++ agent/mibgroup/mibII/tcp.c
-@@ -205,6 +205,16 @@ typedef uint32_t tcp_stats[TCP_NSTATS];
+@@ -215,6 +215,16 @@ typedef uint32_t tcp_stats[TCP_NSTATS];
#define USES_TRADITIONAL_TCPSTAT
#endif
@@ -19,10 +19,11 @@ $NetBSD: patch-agent_mibgroup_mibII_tcp.
#if !defined(TCP_STAT_STRUCTURE)
#define TCP_STAT_STRUCTURE struct tcpstat
#define USES_TRADITIONAL_TCPSTAT
-@@ -332,6 +342,75 @@ tcp_handler(netsnmp_mib_handler
+@@ -341,6 +351,75 @@ tcp_handler(netsnmp_mib_handler *handler,
+ }
#elif defined(solaris2)
ret_value = tcpstat.tcpOutRsts;
- break;
++ break;
+#elif defined(TCP_NSTAT)
+ case TCPRTOALGORITHM: /* Assume Van Jacobsen's algorithm */
+ ret_value = 4;
@@ -91,7 +92,6 @@ $NetBSD: patch-agent_mibgroup_mibII_tcp.
+ break;
+ case TCPOUTRSTS:
+ ret_value = tcpstat[TCP_STAT_SNDCTRL] - tcpstat[TCP_STAT_CLOSED];
-+ break;
+ break;
#endif /* linux */
netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHOBJECT);
- continue;
Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c:1.2 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c:1.3
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c:1.2 Wed Feb 21 10:21:01 2024
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c Sun Jan 11 05:08:00 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-agent_mibgroup_mibII_var__route.c,v 1.2 2024/02/21 10:21:01 wiz Exp $
+$NetBSD: patch-agent_mibgroup_mibII_var__route.c,v 1.3 2026/01/11 05:08:00 wiz Exp $
Fix for systems with RTF_LLDATA in place of RTF_LLINFO.
---- agent/mibgroup/mibII/var_route.c.orig 2023-08-15 20:32:01.000000000 +0000
+--- agent/mibgroup/mibII/var_route.c.orig 2025-12-20 15:03:33.000000000 +0000
+++ agent/mibgroup/mibII/var_route.c
-@@ -956,8 +956,12 @@ load_rtentries(struct radix_node *pt)
+@@ -956,7 +956,11 @@ load_rtentries(struct radix_node *pt)
}
#ifdef CHECK_RT_FLAGS
if (((rt.rt_flags & RTF_CLONING) != RTF_CLONING)
@@ -12,8 +12,7 @@ Fix for systems with RTF_LLDATA in place
+ && ((rt.rt_flags & RTF_LLDATA) != RTF_LLDATA)) {
+#else
&& ((rt.rt_flags & RTF_LLINFO) != RTF_LLINFO)) {
- #endif
+#endif
+ #endif
/*
* check for space and malloc
- */
Index: pkgsrc/net/net-snmp/patches/patch-configure
diff -u pkgsrc/net/net-snmp/patches/patch-configure:1.5 pkgsrc/net/net-snmp/patches/patch-configure:1.6
--- pkgsrc/net/net-snmp/patches/patch-configure:1.5 Wed Mar 6 09:37:00 2024
+++ pkgsrc/net/net-snmp/patches/patch-configure Sun Jan 11 05:08:00 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.5 2024/03/06 09:37:00 jperkin Exp $
+$NetBSD: patch-configure,v 1.6 2026/01/11 05:08:00 wiz Exp $
- Do not store configure options as these might be polluted with workdir.
- Support long fds_bits.
---- configure.orig 2023-08-15 20:32:24.000000000 +0000
+--- configure.orig 2025-12-20 15:03:44.000000000 +0000
+++ configure
-@@ -3752,7 +3752,7 @@ ac_config_headers="$ac_config_headers in
+@@ -3800,7 +3800,7 @@ ac_config_headers="$ac_config_headers include/net-snmp
# save the configure arguments
#
@@ -14,12 +14,3 @@ $NetBSD: patch-configure,v 1.5 2024/03/0
CONFIGURE_OPTIONS="\"$ac_configure_args\""
-@@ -31638,7 +31638,7 @@ CFLAGS="$CFLAGS -Werror"
-
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the type of fd_set::fds_bits" >&5
- printf %s "checking for the type of fd_set::fds_bits... " >&6; }
--for type in __fd_mask __int32_t unknown; do
-+for type in __fd_mask __int32_t long unknown; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
Home |
Main Index |
Thread Index |
Old Index