diff options
18 files changed, 86 insertions, 304 deletions
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile index fee0ee8b61d5..4981fefc875b 100644 --- a/net-mgmt/net-snmp-devel/Makefile +++ b/net-mgmt/net-snmp-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= snmp -PORTVERSION= 5.4.1.2 -PORTREVISION= 2 +PORTVERSION= 5.4.2.1 CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= net-snmp diff --git a/net-mgmt/net-snmp-devel/distinfo b/net-mgmt/net-snmp-devel/distinfo index e02915a0ce75..d23d7dcb5c54 100644 --- a/net-mgmt/net-snmp-devel/distinfo +++ b/net-mgmt/net-snmp-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (net-snmp-5.4.1.2.tar.gz) = 2dfcf97d65f3b7d34b78c8d4be11fc83 -SHA256 (net-snmp-5.4.1.2.tar.gz) = 17d67076ab5c5fb6dfaffe70a2757526f99b0638bca102dec27af08ec01a9068 -SIZE (net-snmp-5.4.1.2.tar.gz) = 5123346 +MD5 (net-snmp-5.4.2.1.tar.gz) = 984932520143f0c8bf7b7ce1fc9e1da1 +SHA256 (net-snmp-5.4.2.1.tar.gz) = 11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c +SIZE (net-snmp-5.4.2.1.tar.gz) = 5185390 diff --git a/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu.h b/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu.h deleted file mode 100644 index 143133291f9e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu.h +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- agent/mibgroup/hardware/cpu.h -+++ agent/mibgroup/hardware/cpu.h -@@ -12,10 +12,10 @@ - #elif defined(irix6) - config_require(hardware/cpu/cpu_sysinfo) - --#elif (defined(netbsd) || defined(netbsd1) || defined(netbsdelf) || defined(netbsdelf2)|| defined(netbsdelf3) || defined(openbsd2)|| defined(openbsd3) || defined(openbsd4)) -+#elif (defined(netbsd) || defined(netbsd1) || defined(netbsdelf) || defined(netbsdelf2)|| defined(netbsdelf3) || defined(openbsd2)|| defined(openbsd3) || defined(openbsd4) || defined(freebsd4) || defined(freebsd5)|| defined(freebsd6)) - config_require(hardware/cpu/cpu_sysctl) - --#elif (defined(freebsd2) || defined(freebsd3) || defined(freebsd4) || defined(freebsd5)|| defined(freebsd6)) -+#elif (defined(freebsd2) || defined(freebsd3)) - config_require(hardware/cpu/cpu_nlist) - - #elif (defined(aix4) || defined(aix5)) diff --git a/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c b/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c index 68d058961161..d35125033448 100644 --- a/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c +++ b/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c @@ -1,56 +1,24 @@ - -$FreeBSD$ - ---- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig -+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c -@@ -11,7 +11,14 @@ - #include <unistd.h> - #include <sys/types.h> - -+#if defined(__FreeBSD__) -+#include <sys/resource.h> -+#if !defined(CPUSTATES) -+#include <sys/dkstat.h> -+#endif -+#else - #include <sys/sched.h> -+#endif - #include <sys/param.h> - #include <sys/sysctl.h> - #include <sys/vmmeter.h> -@@ -37,11 +44,11 @@ - strcpy(cpu->name, "Overall CPU statistics"); - - i = sizeof(n); -- sysctl(ncpu_mib, 2, &n, &i, NULL, 0); -+ sysctl(ncpu_mib, 2, &n, (void *)&i, NULL, 0); - if ( n <= 0 ) - n = 1; /* Single CPU system */ - i = sizeof(descr); -- sysctl(model_mib, 2, descr, &i, NULL, 0); -+ sysctl(model_mib, 2, descr, (void *)&i, NULL, 0); - for ( i = 0; i < n; i++ ) { - cpu = netsnmp_cpu_get_byIdx( i, 1 ); - cpu->status = 2; /* running */ -@@ -64,6 +71,8 @@ - #undef NETSNMP_CPU_STATS - #define NETSNMP_CPU_STATS uint64_t +--- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig 2008-05-27 21:47:30.000000000 +0900 ++++ agent/mibgroup/hardware/cpu/cpu_sysctl.c 2008-11-14 16:41:12.000000000 +0900 +@@ -16,6 +16,8 @@ + #if !defined(CPUSTATES) + #include <sys/dkstat.h> #endif +#elif defined(__FreeBSD__) +#define NETSNMP_KERN_CPU 0 /* FreeBSD - dummy value, sysctlnametomib(2) should be used */ #else - #error "No CPU statistics sysctl token" + #include <sys/sched.h> #endif -@@ -95,7 +104,7 @@ - #define NETSNMP_VM_STATS_TYPE struct uvmexp - #endif /* VM_UVMEXP2 || VM_UVMEXP */ +@@ -117,7 +119,7 @@ + #define NS_VM_SWAPIN v_swapin + #define NS_VM_SWAPOUT v_swapout --#elif defined(VM_METER) /* OpenBSD, NetBSD, FreeBSD */ +-#elif defined(VM_METER) /* OpenBSD, NetBSD */ +#elif defined(VM_METER) && !defined(__FreeBSD__) /* OpenBSD, NetBSD */ #define NETSNMP_VM_STATS VM_METER #define NETSNMP_VM_STATS_TYPE struct vmtotal -@@ -108,6 +117,15 @@ +@@ -130,6 +132,15 @@ #undef NS_VM_PAGEOUT #define NS_VM_SWAPIN v_swpin #define NS_VM_SWAPOUT v_swpout @@ -66,29 +34,3 @@ $FreeBSD$ #endif -@@ -126,7 +144,7 @@ - */ - NETSNMP_CPU_STATS cpu_stats[CPUSTATES]; - int cpu_mib[] = { CTL_KERN, NETSNMP_KERN_CPU }; -- int cpu_size = sizeof(cpu_stats); -+ size_t cpu_size = sizeof(cpu_stats); - #ifdef NETSNMP_KERN_MCPU - NETSNMP_KERN_MCPU_TYPE *mcpu_stats; - int mcpu_mib[] = { CTL_KERN, NETSNMP_KERN_MCPU }; -@@ -134,10 +152,13 @@ - #endif - NETSNMP_VM_STATS_TYPE mem_stats; - int mem_mib[] = { CTL_VM, NETSNMP_VM_STATS }; -- int mem_size = sizeof(NETSNMP_VM_STATS_TYPE); -+ size_t mem_size = sizeof(NETSNMP_VM_STATS_TYPE); - netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 ); -- -- sysctl(cpu_mib, 2, cpu_stats, &cpu_size, NULL, 0); -+#if defined(__FreeBSD__) -+ sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0); -+#else -+ sysctl(cpu_time, 2, cpu_stats, &cpu_size, NULL, 0); -+#endif - cpu->user_ticks = (unsigned long)cpu_stats[CP_USER]; - cpu->nice_ticks = (unsigned long)cpu_stats[CP_NICE]; - cpu->sys2_ticks = (unsigned long)cpu_stats[CP_SYS]+cpu_stats[CP_INTR]; diff --git a/net-mgmt/net-snmp-devel/files/patch-agent_registry.c b/net-mgmt/net-snmp-devel/files/patch-agent_registry.c deleted file mode 100644 index 8c81bdf5ab52..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-agent_registry.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/agent_registry.c.orig 2008-08-24 23:24:04.944441100 +0900 -+++ agent/agent_registry.c 2008-08-24 23:25:37.996227686 +0900 -@@ -532,7 +532,8 @@ - - if (next && (next->namelen == new_sub->namelen) && - (next->priority == new_sub->priority)) { -- netsnmp_assert(!"registration != duplicate"); /* always false */ -+ if (new_sub->namelen != 1) /* ignore root OID dups */ -+ netsnmp_assert(!"registration != duplicate"); /* always false */ - return MIB_DUPLICATE_REGISTRATION; - } - diff --git a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd.c b/net-mgmt/net-snmp-devel/files/patch-memory_freebsd.c index 1f996ad6edf2..ccdc537e629a 100644 --- a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd.c +++ b/net-mgmt/net-snmp-devel/files/patch-memory_freebsd.c @@ -1,24 +1,14 @@ ---- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2006-03-07 01:23:52.000000000 +0900 -+++ agent/mibgroup/hardware/memory/memory_freebsd.c 2008-08-24 23:35:12.857234897 +0900 -@@ -47,6 +47,9 @@ - int phys_mem_mib[] = { CTL_HW, HW_PHYSMEM }; - int user_mem_mib[] = { CTL_HW, HW_USERMEM }; - -+ long bufspace; -+ -+ - /* - * Retrieve the memory information from the underlying O/S... - */ -@@ -54,6 +57,7 @@ - sysctl(phys_mem_mib, 2, &phys_mem, &mem_size, NULL, 0); - sysctl(user_mem_mib, 2, &user_mem, &mem_size, NULL, 0); +--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2008-05-28 20:48:46.000000000 +0900 ++++ agent/mibgroup/hardware/memory/memory_freebsd.c 2008-11-14 16:56:48.000000000 +0900 +@@ -59,6 +59,7 @@ + sysctlbyname("vfs.bufspace", &bufspace, &buf_size, NULL, 0); + sysctlbyname("vfs.maxbufspace", &maxbufspace, &buf_size, NULL, 0); auto_nlist(SUM_SYMBOL, (char *) &vmem, sizeof(vmem)); + auto_nlist(BUFSPACE_SYMBOL, (char *) &bufspace, sizeof(bufspace)); #ifndef freebsd4 pagesize = 1024; #else -@@ -70,7 +74,7 @@ +@@ -75,7 +76,7 @@ if (!mem->descr) mem->descr = strdup("Physical memory"); mem->units = pagesize; @@ -27,26 +17,20 @@ mem->free = total.t_free; } -@@ -125,10 +129,22 @@ - if (!mem->descr) - mem->descr = strdup("Cached memory"); - mem->units = vmem.v_page_size; -- mem->size = vmem.v_cache_count; -+ mem->size = vmem.v_cache_count + vmem.v_inactive_count; -+ mem->free = -1; -+ } -+ +@@ -134,6 +135,17 @@ + mem->free = vmem.v_cache_max - vmem.v_cache_count; + } + + mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_MBUF, 1 ); + if (!mem) { + snmp_log_perror("No Memory Buffer info entry"); + } else { + if (!mem->descr) -+ mem->descr = strdup("Memory Buffer"); ++ mem->descr = strdup("Memory Buffer"); + mem->units = pagesize; + mem->size = bufspace/pagesize; - mem->free = -1; - } - ++ mem->free = -1; ++ } + nswap = swapmode(pagesize); mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SWAP, 1 ); diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c b/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c index 570f9bb9347f..44c26b86d08c 100644 --- a/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c +++ b/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c @@ -1,19 +1,16 @@ -Index: snmplib/snmpTCPIPv6Domain.c -diff -u -p snmplib/snmpTCPIPv6Domain.c.orig snmplib/snmpTCPIPv6Domain.c ---- snmplib/snmpTCPIPv6Domain.c.orig Fri Sep 16 19:30:49 2005 -+++ snmplib/snmpTCPIPv6Domain.c Fri Jan 11 13:40:09 2008 -@@ -96,13 +96,24 @@ netsnmp_tcp6_fmtaddr(netsnmp_transport * +--- snmplib/snmpTCPIPv6Domain.c.orig 2008-06-17 17:57:14.000000000 +0900 ++++ snmplib/snmpTCPIPv6Domain.c 2008-11-14 21:34:12.000000000 +0900 +@@ -96,12 +96,23 @@ if (to == NULL) { return strdup("TCP/IPv6: unknown"); } else { - char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; +- char tmp[INET6_ADDRSTRLEN + 18]; ++ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; - sprintf(tmp, "TCP/IPv6: [%s]:%hd", - inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr, - INET6_ADDRSTRLEN), ntohs(to->sin6_port)); -- return strdup(tmp); +/* + * NI_WITHSCOPEID will be obsoleted. But some implementations require + * this flag to retrieve scoped name. @@ -29,7 +26,6 @@ diff -u -p snmplib/snmpTCPIPv6Domain.c.orig snmplib/snmpTCPIPv6Domain.c + } + snprintf(tmp, sizeof(tmp), "TCP/IPv6: [%s]:%hd", addr, + ntohs(to->sin6_port)); -+ return strdup(tmp); + return strdup(tmp); } } - diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c b/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c index ad98e534bdf2..62ceec96c330 100644 --- a/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c +++ b/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c @@ -1,17 +1,16 @@ ---- snmplib/snmpUDPIPv6Domain.c.orig 2007-06-11 07:22:55.000000000 +0900 -+++ snmplib/snmpUDPIPv6Domain.c 2008-03-26 07:47:55.942743517 +0900 -@@ -109,13 +109,24 @@ +--- snmplib/snmpUDPIPv6Domain.c.orig 2007-09-29 22:10:22.000000000 +0900 ++++ snmplib/snmpUDPIPv6Domain.c 2008-11-14 21:36:45.000000000 +0900 +@@ -109,12 +109,22 @@ if (to == NULL) { return strdup("UDP/IPv6: unknown"); } else { - char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; - +- char tmp[INET6_ADDRSTRLEN + 18]; +- - sprintf(tmp, "UDP/IPv6: [%s]:%hu", - inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr, - INET6_ADDRSTRLEN), ntohs(to->sin6_port)); -- return strdup(tmp); ++ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; +/* + * NI_WITHSCOPEID will be obsoleted. But some implementations require + * this flag to retrieve scoped name. @@ -27,7 +26,6 @@ + } + snprintf(tmp, sizeof(tmp), "UDP/IPv6: [%s]:%hu", addr, + ntohs(to->sin6_port)); -+ return strdup(tmp); + return strdup(tmp); } } - diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist index 6d9ec599c68c..1b132415b302 100644 --- a/net-mgmt/net-snmp-devel/pkg-plist +++ b/net-mgmt/net-snmp-devel/pkg-plist @@ -267,6 +267,7 @@ sbin/snmptrapd %%DATADIR%%/mib2c.mfd.conf %%DATADIR%%/mib2c.notify.conf %%DATADIR%%/mib2c.old-api.conf +%%DATADIR%%/mib2c.perl.conf %%DATADIR%%/mib2c.scalar.conf %%DATADIR%%/mib2c.table_data.conf %%DATADIR%%/mib2c-data/default-mfd-top.m2c @@ -370,6 +371,7 @@ sbin/snmptrapd %%DATADIR%%/mibs/RFC1155-SMI.txt %%DATADIR%%/mibs/RFC1213-MIB.txt %%DATADIR%%/mibs/RMON-MIB.txt +%%DATADIR%%/mibs/SCTP-MIB.txt %%DATADIR%%/mibs/SMUX-MIB.txt %%DATADIR%%/mibs/SNMP-COMMUNITY-MIB.txt %%DATADIR%%/mibs/SNMP-FRAMEWORK-MIB.txt diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index fee0ee8b61d5..4981fefc875b 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -6,8 +6,7 @@ # PORTNAME= snmp -PORTVERSION= 5.4.1.2 -PORTREVISION= 2 +PORTVERSION= 5.4.2.1 CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= net-snmp diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo index e02915a0ce75..d23d7dcb5c54 100644 --- a/net-mgmt/net-snmp/distinfo +++ b/net-mgmt/net-snmp/distinfo @@ -1,3 +1,3 @@ -MD5 (net-snmp-5.4.1.2.tar.gz) = 2dfcf97d65f3b7d34b78c8d4be11fc83 -SHA256 (net-snmp-5.4.1.2.tar.gz) = 17d67076ab5c5fb6dfaffe70a2757526f99b0638bca102dec27af08ec01a9068 -SIZE (net-snmp-5.4.1.2.tar.gz) = 5123346 +MD5 (net-snmp-5.4.2.1.tar.gz) = 984932520143f0c8bf7b7ce1fc9e1da1 +SHA256 (net-snmp-5.4.2.1.tar.gz) = 11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c +SIZE (net-snmp-5.4.2.1.tar.gz) = 5185390 diff --git a/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu.h b/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu.h deleted file mode 100644 index 143133291f9e..000000000000 --- a/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu.h +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- agent/mibgroup/hardware/cpu.h -+++ agent/mibgroup/hardware/cpu.h -@@ -12,10 +12,10 @@ - #elif defined(irix6) - config_require(hardware/cpu/cpu_sysinfo) - --#elif (defined(netbsd) || defined(netbsd1) || defined(netbsdelf) || defined(netbsdelf2)|| defined(netbsdelf3) || defined(openbsd2)|| defined(openbsd3) || defined(openbsd4)) -+#elif (defined(netbsd) || defined(netbsd1) || defined(netbsdelf) || defined(netbsdelf2)|| defined(netbsdelf3) || defined(openbsd2)|| defined(openbsd3) || defined(openbsd4) || defined(freebsd4) || defined(freebsd5)|| defined(freebsd6)) - config_require(hardware/cpu/cpu_sysctl) - --#elif (defined(freebsd2) || defined(freebsd3) || defined(freebsd4) || defined(freebsd5)|| defined(freebsd6)) -+#elif (defined(freebsd2) || defined(freebsd3)) - config_require(hardware/cpu/cpu_nlist) - - #elif (defined(aix4) || defined(aix5)) diff --git a/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c b/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c index 68d058961161..d35125033448 100644 --- a/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c +++ b/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c @@ -1,56 +1,24 @@ - -$FreeBSD$ - ---- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig -+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c -@@ -11,7 +11,14 @@ - #include <unistd.h> - #include <sys/types.h> - -+#if defined(__FreeBSD__) -+#include <sys/resource.h> -+#if !defined(CPUSTATES) -+#include <sys/dkstat.h> -+#endif -+#else - #include <sys/sched.h> -+#endif - #include <sys/param.h> - #include <sys/sysctl.h> - #include <sys/vmmeter.h> -@@ -37,11 +44,11 @@ - strcpy(cpu->name, "Overall CPU statistics"); - - i = sizeof(n); -- sysctl(ncpu_mib, 2, &n, &i, NULL, 0); -+ sysctl(ncpu_mib, 2, &n, (void *)&i, NULL, 0); - if ( n <= 0 ) - n = 1; /* Single CPU system */ - i = sizeof(descr); -- sysctl(model_mib, 2, descr, &i, NULL, 0); -+ sysctl(model_mib, 2, descr, (void *)&i, NULL, 0); - for ( i = 0; i < n; i++ ) { - cpu = netsnmp_cpu_get_byIdx( i, 1 ); - cpu->status = 2; /* running */ -@@ -64,6 +71,8 @@ - #undef NETSNMP_CPU_STATS - #define NETSNMP_CPU_STATS uint64_t +--- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig 2008-05-27 21:47:30.000000000 +0900 ++++ agent/mibgroup/hardware/cpu/cpu_sysctl.c 2008-11-14 16:41:12.000000000 +0900 +@@ -16,6 +16,8 @@ + #if !defined(CPUSTATES) + #include <sys/dkstat.h> #endif +#elif defined(__FreeBSD__) +#define NETSNMP_KERN_CPU 0 /* FreeBSD - dummy value, sysctlnametomib(2) should be used */ #else - #error "No CPU statistics sysctl token" + #include <sys/sched.h> #endif -@@ -95,7 +104,7 @@ - #define NETSNMP_VM_STATS_TYPE struct uvmexp - #endif /* VM_UVMEXP2 || VM_UVMEXP */ +@@ -117,7 +119,7 @@ + #define NS_VM_SWAPIN v_swapin + #define NS_VM_SWAPOUT v_swapout --#elif defined(VM_METER) /* OpenBSD, NetBSD, FreeBSD */ +-#elif defined(VM_METER) /* OpenBSD, NetBSD */ +#elif defined(VM_METER) && !defined(__FreeBSD__) /* OpenBSD, NetBSD */ #define NETSNMP_VM_STATS VM_METER #define NETSNMP_VM_STATS_TYPE struct vmtotal -@@ -108,6 +117,15 @@ +@@ -130,6 +132,15 @@ #undef NS_VM_PAGEOUT #define NS_VM_SWAPIN v_swpin #define NS_VM_SWAPOUT v_swpout @@ -66,29 +34,3 @@ $FreeBSD$ #endif -@@ -126,7 +144,7 @@ - */ - NETSNMP_CPU_STATS cpu_stats[CPUSTATES]; - int cpu_mib[] = { CTL_KERN, NETSNMP_KERN_CPU }; -- int cpu_size = sizeof(cpu_stats); -+ size_t cpu_size = sizeof(cpu_stats); - #ifdef NETSNMP_KERN_MCPU - NETSNMP_KERN_MCPU_TYPE *mcpu_stats; - int mcpu_mib[] = { CTL_KERN, NETSNMP_KERN_MCPU }; -@@ -134,10 +152,13 @@ - #endif - NETSNMP_VM_STATS_TYPE mem_stats; - int mem_mib[] = { CTL_VM, NETSNMP_VM_STATS }; -- int mem_size = sizeof(NETSNMP_VM_STATS_TYPE); -+ size_t mem_size = sizeof(NETSNMP_VM_STATS_TYPE); - netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 ); -- -- sysctl(cpu_mib, 2, cpu_stats, &cpu_size, NULL, 0); -+#if defined(__FreeBSD__) -+ sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0); -+#else -+ sysctl(cpu_time, 2, cpu_stats, &cpu_size, NULL, 0); -+#endif - cpu->user_ticks = (unsigned long)cpu_stats[CP_USER]; - cpu->nice_ticks = (unsigned long)cpu_stats[CP_NICE]; - cpu->sys2_ticks = (unsigned long)cpu_stats[CP_SYS]+cpu_stats[CP_INTR]; diff --git a/net-mgmt/net-snmp/files/patch-agent_registry.c b/net-mgmt/net-snmp/files/patch-agent_registry.c deleted file mode 100644 index 8c81bdf5ab52..000000000000 --- a/net-mgmt/net-snmp/files/patch-agent_registry.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/agent_registry.c.orig 2008-08-24 23:24:04.944441100 +0900 -+++ agent/agent_registry.c 2008-08-24 23:25:37.996227686 +0900 -@@ -532,7 +532,8 @@ - - if (next && (next->namelen == new_sub->namelen) && - (next->priority == new_sub->priority)) { -- netsnmp_assert(!"registration != duplicate"); /* always false */ -+ if (new_sub->namelen != 1) /* ignore root OID dups */ -+ netsnmp_assert(!"registration != duplicate"); /* always false */ - return MIB_DUPLICATE_REGISTRATION; - } - diff --git a/net-mgmt/net-snmp/files/patch-memory_freebsd.c b/net-mgmt/net-snmp/files/patch-memory_freebsd.c index 1f996ad6edf2..ccdc537e629a 100644 --- a/net-mgmt/net-snmp/files/patch-memory_freebsd.c +++ b/net-mgmt/net-snmp/files/patch-memory_freebsd.c @@ -1,24 +1,14 @@ ---- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2006-03-07 01:23:52.000000000 +0900 -+++ agent/mibgroup/hardware/memory/memory_freebsd.c 2008-08-24 23:35:12.857234897 +0900 -@@ -47,6 +47,9 @@ - int phys_mem_mib[] = { CTL_HW, HW_PHYSMEM }; - int user_mem_mib[] = { CTL_HW, HW_USERMEM }; - -+ long bufspace; -+ -+ - /* - * Retrieve the memory information from the underlying O/S... - */ -@@ -54,6 +57,7 @@ - sysctl(phys_mem_mib, 2, &phys_mem, &mem_size, NULL, 0); - sysctl(user_mem_mib, 2, &user_mem, &mem_size, NULL, 0); +--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2008-05-28 20:48:46.000000000 +0900 ++++ agent/mibgroup/hardware/memory/memory_freebsd.c 2008-11-14 16:56:48.000000000 +0900 +@@ -59,6 +59,7 @@ + sysctlbyname("vfs.bufspace", &bufspace, &buf_size, NULL, 0); + sysctlbyname("vfs.maxbufspace", &maxbufspace, &buf_size, NULL, 0); auto_nlist(SUM_SYMBOL, (char *) &vmem, sizeof(vmem)); + auto_nlist(BUFSPACE_SYMBOL, (char *) &bufspace, sizeof(bufspace)); #ifndef freebsd4 pagesize = 1024; #else -@@ -70,7 +74,7 @@ +@@ -75,7 +76,7 @@ if (!mem->descr) mem->descr = strdup("Physical memory"); mem->units = pagesize; @@ -27,26 +17,20 @@ mem->free = total.t_free; } -@@ -125,10 +129,22 @@ - if (!mem->descr) - mem->descr = strdup("Cached memory"); - mem->units = vmem.v_page_size; -- mem->size = vmem.v_cache_count; -+ mem->size = vmem.v_cache_count + vmem.v_inactive_count; -+ mem->free = -1; -+ } -+ +@@ -134,6 +135,17 @@ + mem->free = vmem.v_cache_max - vmem.v_cache_count; + } + + mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_MBUF, 1 ); + if (!mem) { + snmp_log_perror("No Memory Buffer info entry"); + } else { + if (!mem->descr) -+ mem->descr = strdup("Memory Buffer"); ++ mem->descr = strdup("Memory Buffer"); + mem->units = pagesize; + mem->size = bufspace/pagesize; - mem->free = -1; - } - ++ mem->free = -1; ++ } + nswap = swapmode(pagesize); mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SWAP, 1 ); diff --git a/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c b/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c index 570f9bb9347f..44c26b86d08c 100644 --- a/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c +++ b/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c @@ -1,19 +1,16 @@ -Index: snmplib/snmpTCPIPv6Domain.c -diff -u -p snmplib/snmpTCPIPv6Domain.c.orig snmplib/snmpTCPIPv6Domain.c ---- snmplib/snmpTCPIPv6Domain.c.orig Fri Sep 16 19:30:49 2005 -+++ snmplib/snmpTCPIPv6Domain.c Fri Jan 11 13:40:09 2008 -@@ -96,13 +96,24 @@ netsnmp_tcp6_fmtaddr(netsnmp_transport * +--- snmplib/snmpTCPIPv6Domain.c.orig 2008-06-17 17:57:14.000000000 +0900 ++++ snmplib/snmpTCPIPv6Domain.c 2008-11-14 21:34:12.000000000 +0900 +@@ -96,12 +96,23 @@ if (to == NULL) { return strdup("TCP/IPv6: unknown"); } else { - char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; +- char tmp[INET6_ADDRSTRLEN + 18]; ++ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; - sprintf(tmp, "TCP/IPv6: [%s]:%hd", - inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr, - INET6_ADDRSTRLEN), ntohs(to->sin6_port)); -- return strdup(tmp); +/* + * NI_WITHSCOPEID will be obsoleted. But some implementations require + * this flag to retrieve scoped name. @@ -29,7 +26,6 @@ diff -u -p snmplib/snmpTCPIPv6Domain.c.orig snmplib/snmpTCPIPv6Domain.c + } + snprintf(tmp, sizeof(tmp), "TCP/IPv6: [%s]:%hd", addr, + ntohs(to->sin6_port)); -+ return strdup(tmp); + return strdup(tmp); } } - diff --git a/net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c b/net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c index ad98e534bdf2..62ceec96c330 100644 --- a/net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c +++ b/net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c @@ -1,17 +1,16 @@ ---- snmplib/snmpUDPIPv6Domain.c.orig 2007-06-11 07:22:55.000000000 +0900 -+++ snmplib/snmpUDPIPv6Domain.c 2008-03-26 07:47:55.942743517 +0900 -@@ -109,13 +109,24 @@ +--- snmplib/snmpUDPIPv6Domain.c.orig 2007-09-29 22:10:22.000000000 +0900 ++++ snmplib/snmpUDPIPv6Domain.c 2008-11-14 21:36:45.000000000 +0900 +@@ -109,12 +109,22 @@ if (to == NULL) { return strdup("UDP/IPv6: unknown"); } else { - char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; - +- char tmp[INET6_ADDRSTRLEN + 18]; +- - sprintf(tmp, "UDP/IPv6: [%s]:%hu", - inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr, - INET6_ADDRSTRLEN), ntohs(to->sin6_port)); -- return strdup(tmp); ++ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; +/* + * NI_WITHSCOPEID will be obsoleted. But some implementations require + * this flag to retrieve scoped name. @@ -27,7 +26,6 @@ + } + snprintf(tmp, sizeof(tmp), "UDP/IPv6: [%s]:%hu", addr, + ntohs(to->sin6_port)); -+ return strdup(tmp); + return strdup(tmp); } } - diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist index 6d9ec599c68c..1b132415b302 100644 --- a/net-mgmt/net-snmp/pkg-plist +++ b/net-mgmt/net-snmp/pkg-plist @@ -267,6 +267,7 @@ sbin/snmptrapd %%DATADIR%%/mib2c.mfd.conf %%DATADIR%%/mib2c.notify.conf %%DATADIR%%/mib2c.old-api.conf +%%DATADIR%%/mib2c.perl.conf %%DATADIR%%/mib2c.scalar.conf %%DATADIR%%/mib2c.table_data.conf %%DATADIR%%/mib2c-data/default-mfd-top.m2c @@ -370,6 +371,7 @@ sbin/snmptrapd %%DATADIR%%/mibs/RFC1155-SMI.txt %%DATADIR%%/mibs/RFC1213-MIB.txt %%DATADIR%%/mibs/RMON-MIB.txt +%%DATADIR%%/mibs/SCTP-MIB.txt %%DATADIR%%/mibs/SMUX-MIB.txt %%DATADIR%%/mibs/SNMP-COMMUNITY-MIB.txt %%DATADIR%%/mibs/SNMP-FRAMEWORK-MIB.txt |