diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile index 798559723bc1..83964517c081 100644 --- a/net-mgmt/net-snmp-devel/Makefile +++ b/net-mgmt/net-snmp-devel/Makefile @@ -6,8 +6,8 @@ # PORTNAME= snmp -PORTVERSION= 5.2.3 -PORTREVISION= 4 +PORTVERSION= 5.3.1 +PORTREVISION= 0 CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= net-snmp @@ -81,7 +81,7 @@ PLIST_SUB+= WITH_IPV6="" PLIST_SUB+= WITH_IPV6="@comment " .endif -SHLIB_VERSION= 9 +SHLIB_VERSION= 10 PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} SCRIPTS_SUB= PREFIX=${PREFIX} PERL=${PERL} @@ -160,10 +160,11 @@ _MANPAGES+= ${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%} .endif MAN5= mib2c.conf.5 snmp.conf.5 snmp_config.5 snmpd.conf.5 \ + snmpd.examples.5 snmpd.internal.5 \ snmptrapd.conf.5 variables.5 MAN8= snmpd.8 snmptrapd.8 -BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpnetstat53 snmpset \ +BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk SBIN_FILES= snmpd snmptrapd STARTUP_DIR= ${PREFIX}/etc/rc.d @@ -177,6 +178,7 @@ DOC_FILES= AGENT.txt COPYING FAQ NEWS README \ agent/mibgroup/README.smux PS_CMD?= /bin/ps +CONFLICTS= net-snmp-4.* pre-everything:: @${ECHO_MSG} @@ -258,6 +260,6 @@ display-message: # Maintainer's note: # Don't forget to bump library version in these ports. -# french/plgrenouille,graphics/hpoj,lang/php4,lang/php5,mail/cyrus-imapd22,misc/kdeutils3,net-mgmt/braa,net-mgmt/docsis,net-mgmt/mbrowse,net-mgmt/nagios-snmp-plugins,net-mgmt/p5-SNMP-Info,net-mgmt/py-yapsnmp,net-mgmt/sdig,net-mgmt/zabbix,net/cactid,net/ethereal,net/ifstat,net/quagga,net/rtg,net/tethereal,security/libfwbuilder,sysutils/apcupsd,sysutils/jailadmin,sysutils/nut +# french/plgrenouille,graphics/hpoj,lang/php4,lang/php5,mail/cyrus-imapd22,mail/cyrus-imapd23,misc/kdeutils3,net-mgmt/braa,net-mgmt/docsis,net-mgmt/mbrowse,net-mgmt/nagios-snmp-plugins,net-mgmt/p5-SNMP-Info,net-mgmt/py-yapsnmp,net-mgmt/sdig,net-mgmt/zabbix,net/cactid,net/wireshark,net/ifstat,net/quagga,net/rtg,print/hplip,security/libfwbuilder,sysutils/apcupsd,sysutils/jailadmin,sysutils/nut .include diff --git a/net-mgmt/net-snmp-devel/distinfo b/net-mgmt/net-snmp-devel/distinfo index afa14d31a40f..8ddb0151dc44 100644 --- a/net-mgmt/net-snmp-devel/distinfo +++ b/net-mgmt/net-snmp-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (net-snmp-5.2.3.tar.gz) = ba4bc583413f90618228d0f196da8181 -SHA256 (net-snmp-5.2.3.tar.gz) = d31aa0f608c5b16dece4d5ed5e0e1321aca29a6a4e41ef0148273baed4bfbd79 -SIZE (net-snmp-5.2.3.tar.gz) = 4006389 +MD5 (net-snmp-5.3.1.tar.gz) = 360a9783dbc853bab6bda90d961daee5 +SHA256 (net-snmp-5.3.1.tar.gz) = fb6d5113ccdd8c4661fe5d825160e45a7c5035b145e24ec18f71a509ecb0fe43 +SIZE (net-snmp-5.3.1.tar.gz) = 4210843 diff --git a/net-mgmt/net-snmp-devel/files/patch-agent_index.c b/net-mgmt/net-snmp-devel/files/patch-agent_index.c deleted file mode 100644 index d6254de2148e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-agent_index.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_index.c.orig Mon Jan 24 09:14:39 2005 -+++ agent/agent_index.c Mon Jan 24 09:14:55 2005 -@@ -39,10 +39,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp-devel/files/patch-agent_read_config.c b/net-mgmt/net-snmp-devel/files/patch-agent_read_config.c deleted file mode 100644 index d38b96de7668..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-agent_read_config.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_read_config.c.orig Mon Jan 24 09:12:58 2005 -+++ agent/agent_read_config.c Mon Jan 24 09:13:13 2005 -@@ -84,10 +84,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #if HAVE_UNISTD_H - #include - #endif 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 4eab10a699f9..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-agent_registry.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_registry.c.orig Mon Jan 24 09:14:00 2005 -+++ agent/agent_registry.c Mon Jan 24 09:14:08 2005 -@@ -51,10 +51,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp-devel/files/patch-at.c b/net-mgmt/net-snmp-devel/files/patch-at.c deleted file mode 100644 index 363f1b07991e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-at.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/mibII/at.c.orig Mon Jan 24 09:08:41 2005 -+++ agent/mibgroup/mibII/at.c Mon Jan 24 09:08:58 2005 -@@ -90,9 +90,6 @@ - #if HAVE_WINSOCK_H - #include - #endif --#if HAVE_DMALLOC_H --#include --#endif - - #ifdef hpux11 - #include diff --git a/net-mgmt/net-snmp-devel/files/patch-auto_nlist.c b/net-mgmt/net-snmp-devel/files/patch-auto_nlist.c deleted file mode 100644 index c15443a03afd..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-auto_nlist.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/auto_nlist.c.orig Mon Jan 24 09:11:07 2005 -+++ agent/auto_nlist.c Mon Jan 24 09:11:24 2005 -@@ -21,10 +21,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include "autonlist.h" - #include "kernel.h" diff --git a/net-mgmt/net-snmp-devel/files/patch-configure.in b/net-mgmt/net-snmp-devel/files/patch-configure.in index 172adf21bf2b..d2550644fed6 100644 --- a/net-mgmt/net-snmp-devel/files/patch-configure.in +++ b/net-mgmt/net-snmp-devel/files/patch-configure.in @@ -1,15 +1,15 @@ ---- configure.in.orig Tue Nov 29 14:16:55 2005 -+++ configure.in Wed Nov 30 11:49:24 2005 -@@ -2075,7 +2075,7 @@ +--- configure.in.orig Fri Jul 14 06:55:27 2006 ++++ configure.in Tue Feb 27 20:29:49 2007 +@@ -2171,7 +2171,7 @@ # fall back CFLAG="-f" fi --for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel +-for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel +for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel /dev/null do if test -f $i -o $CFLAG $i; then ac_cv_KERNEL_LOC="$i" -@@ -2989,6 +2989,26 @@ +@@ -3145,6 +3145,26 @@ # checking for 4.3 vs 4.4 rtentry. AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE, [ diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c b/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c deleted file mode 100644 index 8f709c2f9a2a..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c +++ /dev/null @@ -1,78 +0,0 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Thu Oct 20 04:32:20 2005 -+++ agent/mibgroup/host/hr_swrun.c Wed Nov 30 12:50:12 2005 -@@ -585,7 +585,7 @@ - string[ sizeof(string)-1 ] = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -698,7 +698,7 @@ - *cp1 = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -868,8 +868,23 @@ - if (pid < PID_MAXSYS) - long_return = 2; /* operatingSystem */ - else --#endif - long_return = 4; /* application */ -+#elif HAVE_KVM_GETPROCS -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 -+ if (proc_table[LowProcIndex].ki_flag & P_SYSTEM) { -+ if (proc_table[LowProcIndex].ki_pri.pri_class == PRI_ITHD) -+ long_return = 3;/* deviceDriver */ -+ else -+ long_return = 2;/* operatingSystem */ -+ } else -+ long_return = 4; /* application */ -+#else -+ if (proc_table[LowProcIndex].kp_proc.p_flag & P_SYSTEM) -+ long_return = 2; /* operatingSystem */ -+ else -+ long_return = 4; /* application */ -+#endif -+#endif - return (u_char *) & long_return; - case HRSWRUN_STATUS: - #if defined(cygwin) -@@ -901,7 +916,7 @@ - } - #else - #if HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - switch (proc_table[LowProcIndex].ki_stat) { - #else - switch (proc_table[LowProcIndex].kp_proc.p_stat) { -@@ -1000,7 +1015,13 @@ - long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 -+ /* XXX: Accessing ki_paddr causes sig10 ... -+ long_return = proc_table[LowProcIndex].ki_paddr->p_uticks + -+ proc_table[LowProcIndex].ki_paddr->p_sticks + -+ proc_table[LowProcIndex].ki_paddr->p_iticks; */ -+ long_return = 0; -+ #elif defined(freebsd5) - long_return = proc_table[LowProcIndex].ki_runtime / 100000; - #else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + -@@ -1365,7 +1386,7 @@ - #elif defined(solaris2) - return proc_table[current_proc_entry++]; - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - if (proc_table[current_proc_entry].ki_stat != 0) - return proc_table[current_proc_entry++].ki_pid; - #else diff --git a/net-mgmt/net-snmp-devel/files/patch-interfaces.c b/net-mgmt/net-snmp-devel/files/patch-interfaces.c index 37cc368ab1c9..bc56d6ca3a3e 100644 --- a/net-mgmt/net-snmp-devel/files/patch-interfaces.c +++ b/net-mgmt/net-snmp-devel/files/patch-interfaces.c @@ -1,6 +1,6 @@ ---- agent/mibgroup/mibII/interfaces.c.orig Tue Jan 4 00:51:32 2005 -+++ agent/mibgroup/mibII/interfaces.c Thu Apr 7 11:47:45 2005 -@@ -399,6 +399,133 @@ +--- agent/mibgroup/mibII/interfaces.c.orig Wed Oct 26 00:52:19 2005 ++++ agent/mibgroup/mibII/interfaces.c Tue Feb 27 20:44:48 2007 +@@ -395,6 +395,133 @@ return NULL; } @@ -134,7 +134,7 @@ #ifdef USE_SYSCTL_IFLIST static u_char *if_list = 0; -@@ -607,10 +734,20 @@ +@@ -603,10 +730,20 @@ } return (u_char *) & long_return; case IFPHYSADDRESS: @@ -155,139 +155,3 @@ case IFADMINSTATUS: long_return = if_msg.ifm_flags & IFF_UP ? 1 : 2; return (u_char *) & long_return; -@@ -2250,129 +2387,17 @@ - u_char *var_ifEntry(struct variable *, oid *, size_t *, int, - size_t *, WriteMethod ** write); - --static char *physaddrbuf; --static int nphysaddrs; --struct sockaddr_dl **physaddrs; -- - void --init_interfaces_setup(void) -+Interface_Scan_Init(void) - { -- int naddrs, ilen, bit; -- static int mib[6] -- = { CTL_NET, PF_ROUTE, 0, AF_LINK, NET_RT_IFLIST, 0 }; -- char *cp; -- size_t len; -- struct rt_msghdr *rtm; -- struct if_msghdr *ifm; -- struct ifa_msghdr *ifam; -- struct sockaddr *sa; -- -- naddrs = 0; -- if (physaddrs) -- free(physaddrs); -- if (physaddrbuf) -- free(physaddrbuf); -- physaddrbuf = 0; -- physaddrs = 0; -- nphysaddrs = 0; -- len = 0; -- if (sysctl(mib, 6, 0, &len, 0, 0) < 0) -- return; -- -- cp = physaddrbuf = malloc(len); -- if (physaddrbuf == 0) -- return; -- if (sysctl(mib, 6, physaddrbuf, &len, 0, 0) < 0) { -- free(physaddrbuf); -- physaddrbuf = 0; -- return; -- } -- -- loop: -- ilen = len; -- cp = physaddrbuf; -- while (ilen > 0) { -- rtm = (struct rt_msghdr *) cp; -- if (rtm->rtm_version != RTM_VERSION || rtm->rtm_type != RTM_IFINFO) { -- free(physaddrs); -- physaddrs = 0; -- free(physaddrbuf); -- physaddrbuf = 0; -- } -- ifm = (struct if_msghdr *) rtm; --#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) -- if (physaddrs != 0) -- physaddrs[naddrs] = (void *) (ifm + 1); -- naddrs++; --#endif -- ilen -= ifm->ifm_msglen; -- cp += ifm->ifm_msglen; -- rtm = (struct rt_msghdr *) cp; -- while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { --#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) -- ilen -= rtm->rtm_msglen; -- cp += rtm->rtm_msglen; --#else -- int is_alias = 0; -- ifam = (struct ifa_msghdr *) rtm; -- ilen -= sizeof(*ifam); -- cp += sizeof(*ifam); -- sa = (struct sockaddr *) cp; --#define ROUND(x) (((x) + sizeof(long) - 1) & ~sizeof(long)) -- for (bit = 1; bit && ilen > 0; bit <<= 1) { -- if (!(ifam->ifam_addrs & bit)) -- continue; -- ilen -= ROUND(sa->sa_len); -- cp += ROUND(sa->sa_len); -- -- if (bit == RTA_IFA) { -- if (physaddrs) --#define satosdl(sa) ((struct sockaddr_dl *)(sa)) -- physaddrs[naddrs++] -- = satosdl(sa); -- else -- naddrs++; -- } -- sa = (struct sockaddr *) cp; -- } --#endif -- rtm = (struct rt_msghdr *) cp; -- } -- } -- if (physaddrs) { -- nphysaddrs = naddrs; -- return; -- } -- physaddrs = malloc(naddrs * sizeof(*physaddrs)); -- if (physaddrs == 0) -- return; -- naddrs = 0; -- goto loop; -- - } - --static int --get_phys_address(int iindex, char **ap, int *len) -+int -+Interface_Scan_Next(short *Index, -+ char *Name, -+ struct ifnet *Retifnet, struct in_ifaddr *Retin_ifaddr) - { -- int i; -- int once = 1; -- -- do { -- for (i = 0; i < nphysaddrs; i++) { -- if (physaddrs[i]->sdl_index == iindex) -- break; -- } -- if (i < nphysaddrs) -- break; -- init_interfaces_setup(); -- } while (once--); -- -- if (i < nphysaddrs) { -- *ap = LLADDR(physaddrs[i]); -- *len = physaddrs[i]->sdl_alen; -- return 0; -- } -- return -1; -+ return 0; - } - - int diff --git a/net-mgmt/net-snmp-devel/files/patch-master.c b/net-mgmt/net-snmp-devel/files/patch-master.c deleted file mode 100644 index 12e553acc8e0..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-master.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/agentx/master.c.orig Mon Jan 24 09:16:00 2005 -+++ agent/mibgroup/agentx/master.c Mon Jan 24 09:16:21 2005 -@@ -39,10 +39,6 @@ - #endif - #include - --#if HAVE_DMALLOC_H --#include --#endif -- - #if HAVE_UNISTD_H - #include - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-master_admin.c b/net-mgmt/net-snmp-devel/files/patch-master_admin.c deleted file mode 100644 index cb4767076810..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-master_admin.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/agentx/master_admin.c.orig Mon Jan 24 09:18:07 2005 -+++ agent/mibgroup/agentx/master_admin.c Mon Jan 24 09:18:15 2005 -@@ -35,9 +35,6 @@ - #if HAVE_SYS_SOCKET_H - #include - #endif --#if HAVE_DMALLOC_H --#include --#endif - - #include - #include diff --git a/net-mgmt/net-snmp-devel/files/patch-oid_stash.c b/net-mgmt/net-snmp-devel/files/patch-oid_stash.c deleted file mode 100644 index 7978b27d587f..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-oid_stash.c +++ /dev/null @@ -1,13 +0,0 @@ ---- snmplib/oid_stash.c.orig Mon Jan 24 09:43:04 2005 -+++ snmplib/oid_stash.c Mon Jan 24 09:43:14 2005 -@@ -5,10 +5,6 @@ - #include - #include - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - - /** @defgroup oid_stash Store and retrieve data referenced by an OID. diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpUDPDomain.c b/net-mgmt/net-snmp-devel/files/patch-snmpUDPDomain.c deleted file mode 100644 index 8ed548828d8c..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpUDPDomain.c +++ /dev/null @@ -1,11 +0,0 @@ ---- snmplib/snmpUDPDomain.c.orig Mon Jan 24 10:47:16 2005 -+++ snmplib/snmpUDPDomain.c Mon Jan 24 10:47:41 2005 -@@ -88,7 +88,7 @@ - } else { - char tmp[64]; - -- sprintf(tmp, "UDP: [%s]:%hd", -+ sprintf(tmp, "UDP: [%s]:%hu", - inet_ntoa(to->sin_addr), ntohs(to->sin_port)); - return strdup(tmp); - } diff --git a/net-mgmt/net-snmp-devel/files/patch-snmp_vars.c b/net-mgmt/net-snmp-devel/files/patch-snmp_vars.c deleted file mode 100644 index 5004187b2108..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmp_vars.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/snmp_vars.c.orig Mon Jan 24 09:12:09 2005 -+++ agent/snmp_vars.c Mon Jan 24 09:12:23 2005 -@@ -136,10 +136,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpd.8.def b/net-mgmt/net-snmp-devel/files/patch-snmpd.8.def deleted file mode 100644 index ac853823ca25..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpd.8.def +++ /dev/null @@ -1,13 +0,0 @@ ---- man/snmpd.8.def.orig Wed Feb 26 04:11:19 2003 -+++ man/snmpd.8.def Sat Mar 29 22:05:07 2003 -@@ -211,6 +211,10 @@ - the error "Error opening specified endpoint". Likewise, since AAL5 - PVC support is only currently available on Linux, it will fail with - the same error on other platforms. -+.PP -+.B snmpd -+uses libwrap's access control if configured by --with-libwrap. -+Access control patterns may only reference IP addresses. - - .RE - .SH CONFIGURATION FILES diff --git a/net-mgmt/net-snmp-devel/files/patch-subagent.c b/net-mgmt/net-snmp-devel/files/patch-subagent.c deleted file mode 100644 index f198c4da7990..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-subagent.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/agentx/subagent.c.orig Mon Jan 24 09:17:08 2005 -+++ agent/mibgroup/agentx/subagent.c Mon Jan 24 09:17:12 2005 -@@ -36,10 +36,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp-devel/files/patch-sysORTable.c b/net-mgmt/net-snmp-devel/files/patch-sysORTable.c deleted file mode 100644 index e48aa29e5c86..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-sysORTable.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/mibII/sysORTable.c.orig Mon Jan 24 08:27:58 2005 -+++ agent/mibgroup/mibII/sysORTable.c Mon Jan 24 08:28:10 2005 -@@ -34,10 +34,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h b/net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h index 44e8b3202574..00f89af5eb57 100644 --- a/net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h +++ b/net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h @@ -1,14 +1,9 @@ - -$FreeBSD$ - ---- agent/mibgroup/ucd_snmp.h.orig -+++ agent/mibgroup/ucd_snmp.h -@@ -39,6 +39,10 @@ - config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) - config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) +--- agent/mibgroup/ucd_snmp.h.orig Tue Feb 27 20:44:04 2007 ++++ agent/mibgroup/ucd_snmp.h Tue Feb 27 20:44:20 2007 +@@ -41,6 +41,8 @@ config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/vmstat_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) + config_arch_require(freebsd6, ucd-snmp/vmstat_freebsd2) + config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd7, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd7, ucd-snmp/memory_freebsd2) config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) diff --git a/net-mgmt/net-snmp-devel/files/snmpd.sh.in b/net-mgmt/net-snmp-devel/files/snmpd.sh.in index fb0a7a3a5b4f..35dab34e1e18 100644 --- a/net-mgmt/net-snmp-devel/files/snmpd.sh.in +++ b/net-mgmt/net-snmp-devel/files/snmpd.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmpd.sh.in,v 1.4 2006-09-23 15:03:36 nork Exp $ +# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmpd.sh.in,v 1.5 2007-02-28 01:17:16 kuriyama Exp $ # # PROVIDE: snmpd # REQUIRE: DAEMON @@ -14,6 +14,7 @@ snmpd_enable=${snmpd_enable-"NO"} snmpd_flags=${snmpd_flags-""} snmpd_pidfile=${snmpd_pidfile-"/var/run/snmpd.pid"} snmpd_conffile=${snmpd_conffile-""} +snmpd_flush_cache=${snmpd_flush_cache-"NO"} . %%RC_SUBR%% @@ -32,9 +33,16 @@ rcvar=`set_rcvar` command=%%PREFIX%%/sbin/${name} pidfile=${snmpd_pidfile} sig_stop=KILL +start_precmd=snmpd_precmd load_rc_config ${name} +snmpd_precmd () { + if checkyesno snmpd_flush_cache; then + rm -vf /var/net-snmp/.snmp-exec-cache + fi +} + case "${snmpd_flags}" in *-p\ *) echo "Warning: \$snmpd_flags includes -p option." \ diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist index 37eb269feea7..aa3cb4e79c60 100644 --- a/net-mgmt/net-snmp-devel/pkg-plist +++ b/net-mgmt/net-snmp-devel/pkg-plist @@ -14,7 +14,6 @@ bin/snmpget bin/snmpgetnext bin/snmpinform bin/snmpnetstat -bin/snmpnetstat53 bin/snmpset bin/snmpstatus bin/snmptable @@ -65,6 +64,7 @@ include/net-snmp/agent/table_container.h include/net-snmp/agent/table_data.h include/net-snmp/agent/table_dataset.h include/net-snmp/agent/table_iterator.h +include/net-snmp/agent/table_tdata.h include/net-snmp/agent/util_funcs.h include/net-snmp/agent/var_struct.h include/net-snmp/agent/watcher.h @@ -83,6 +83,8 @@ include/net-snmp/library/container_null.h include/net-snmp/library/data_list.h include/net-snmp/library/default_store.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 include/net-snmp/library/int64.h include/net-snmp/library/keytools.h @@ -109,7 +111,6 @@ include/net-snmp/library/snmp_client.h include/net-snmp/library/snmp_debug.h include/net-snmp/library/snmp_enum.h include/net-snmp/library/snmp_impl.h -include/net-snmp/library/snmp_locking.h include/net-snmp/library/snmp_logging.h include/net-snmp/library/snmp_parse_args.h include/net-snmp/library/snmp_secmod.h @@ -118,6 +119,7 @@ include/net-snmp/library/snmpusm.h include/net-snmp/library/snmpv3-security-includes.h include/net-snmp/library/snmpv3.h include/net-snmp/library/system.h +include/net-snmp/library/text_utils.h include/net-snmp/library/tools.h include/net-snmp/library/transform_oids.h include/net-snmp/library/ucd_compat.h @@ -293,6 +295,7 @@ sbin/snmptrapd %%DATADIR%%/mib2c-data/m2c_setup_enum.m2i %%DATADIR%%/mib2c-data/m2c_setup_node.m2i %%DATADIR%%/mib2c-data/m2c_setup_table.m2i +%%DATADIR%%/mib2c-data/m2c_table_save_defaults.m2i %%DATADIR%%/mib2c-data/mfd-access-container-cached-defines.m2i %%DATADIR%%/mib2c-data/mfd-access-unsorted-external-defines.m2i %%DATADIR%%/mib2c-data/mfd-data-access.m2c @@ -302,11 +305,13 @@ sbin/snmptrapd %%DATADIR%%/mib2c-data/mfd-interactive-setup.m2c %%DATADIR%%/mib2c-data/mfd-interface.m2c %%DATADIR%%/mib2c-data/mfd-makefile.m2m +%%DATADIR%%/mib2c-data/mfd-persistence.m2i %%DATADIR%%/mib2c-data/mfd-readme.m2c %%DATADIR%%/mib2c-data/mfd-top.m2c %%DATADIR%%/mib2c-data/node-get.m2i %%DATADIR%%/mib2c-data/node-set.m2i %%DATADIR%%/mib2c-data/node-storage.m2i +%%DATADIR%%/mib2c-data/node-validate.m2i %%DATADIR%%/mib2c-data/node-varbind-validate.m2i %%DATADIR%%/mib2c-data/parent-dependencies.m2i %%DATADIR%%/mib2c-data/parent-set.m2i diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index 798559723bc1..83964517c081 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -6,8 +6,8 @@ # PORTNAME= snmp -PORTVERSION= 5.2.3 -PORTREVISION= 4 +PORTVERSION= 5.3.1 +PORTREVISION= 0 CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= net-snmp @@ -81,7 +81,7 @@ PLIST_SUB+= WITH_IPV6="" PLIST_SUB+= WITH_IPV6="@comment " .endif -SHLIB_VERSION= 9 +SHLIB_VERSION= 10 PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} SCRIPTS_SUB= PREFIX=${PREFIX} PERL=${PERL} @@ -160,10 +160,11 @@ _MANPAGES+= ${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%} .endif MAN5= mib2c.conf.5 snmp.conf.5 snmp_config.5 snmpd.conf.5 \ + snmpd.examples.5 snmpd.internal.5 \ snmptrapd.conf.5 variables.5 MAN8= snmpd.8 snmptrapd.8 -BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpnetstat53 snmpset \ +BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk SBIN_FILES= snmpd snmptrapd STARTUP_DIR= ${PREFIX}/etc/rc.d @@ -177,6 +178,7 @@ DOC_FILES= AGENT.txt COPYING FAQ NEWS README \ agent/mibgroup/README.smux PS_CMD?= /bin/ps +CONFLICTS= net-snmp-4.* pre-everything:: @${ECHO_MSG} @@ -258,6 +260,6 @@ display-message: # Maintainer's note: # Don't forget to bump library version in these ports. -# french/plgrenouille,graphics/hpoj,lang/php4,lang/php5,mail/cyrus-imapd22,misc/kdeutils3,net-mgmt/braa,net-mgmt/docsis,net-mgmt/mbrowse,net-mgmt/nagios-snmp-plugins,net-mgmt/p5-SNMP-Info,net-mgmt/py-yapsnmp,net-mgmt/sdig,net-mgmt/zabbix,net/cactid,net/ethereal,net/ifstat,net/quagga,net/rtg,net/tethereal,security/libfwbuilder,sysutils/apcupsd,sysutils/jailadmin,sysutils/nut +# french/plgrenouille,graphics/hpoj,lang/php4,lang/php5,mail/cyrus-imapd22,mail/cyrus-imapd23,misc/kdeutils3,net-mgmt/braa,net-mgmt/docsis,net-mgmt/mbrowse,net-mgmt/nagios-snmp-plugins,net-mgmt/p5-SNMP-Info,net-mgmt/py-yapsnmp,net-mgmt/sdig,net-mgmt/zabbix,net/cactid,net/wireshark,net/ifstat,net/quagga,net/rtg,print/hplip,security/libfwbuilder,sysutils/apcupsd,sysutils/jailadmin,sysutils/nut .include diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo index afa14d31a40f..8ddb0151dc44 100644 --- a/net-mgmt/net-snmp/distinfo +++ b/net-mgmt/net-snmp/distinfo @@ -1,3 +1,3 @@ -MD5 (net-snmp-5.2.3.tar.gz) = ba4bc583413f90618228d0f196da8181 -SHA256 (net-snmp-5.2.3.tar.gz) = d31aa0f608c5b16dece4d5ed5e0e1321aca29a6a4e41ef0148273baed4bfbd79 -SIZE (net-snmp-5.2.3.tar.gz) = 4006389 +MD5 (net-snmp-5.3.1.tar.gz) = 360a9783dbc853bab6bda90d961daee5 +SHA256 (net-snmp-5.3.1.tar.gz) = fb6d5113ccdd8c4661fe5d825160e45a7c5035b145e24ec18f71a509ecb0fe43 +SIZE (net-snmp-5.3.1.tar.gz) = 4210843 diff --git a/net-mgmt/net-snmp/files/patch-agent_index.c b/net-mgmt/net-snmp/files/patch-agent_index.c deleted file mode 100644 index d6254de2148e..000000000000 --- a/net-mgmt/net-snmp/files/patch-agent_index.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_index.c.orig Mon Jan 24 09:14:39 2005 -+++ agent/agent_index.c Mon Jan 24 09:14:55 2005 -@@ -39,10 +39,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp/files/patch-agent_read_config.c b/net-mgmt/net-snmp/files/patch-agent_read_config.c deleted file mode 100644 index d38b96de7668..000000000000 --- a/net-mgmt/net-snmp/files/patch-agent_read_config.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_read_config.c.orig Mon Jan 24 09:12:58 2005 -+++ agent/agent_read_config.c Mon Jan 24 09:13:13 2005 -@@ -84,10 +84,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #if HAVE_UNISTD_H - #include - #endif 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 4eab10a699f9..000000000000 --- a/net-mgmt/net-snmp/files/patch-agent_registry.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_registry.c.orig Mon Jan 24 09:14:00 2005 -+++ agent/agent_registry.c Mon Jan 24 09:14:08 2005 -@@ -51,10 +51,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp/files/patch-at.c b/net-mgmt/net-snmp/files/patch-at.c deleted file mode 100644 index 363f1b07991e..000000000000 --- a/net-mgmt/net-snmp/files/patch-at.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/mibII/at.c.orig Mon Jan 24 09:08:41 2005 -+++ agent/mibgroup/mibII/at.c Mon Jan 24 09:08:58 2005 -@@ -90,9 +90,6 @@ - #if HAVE_WINSOCK_H - #include - #endif --#if HAVE_DMALLOC_H --#include --#endif - - #ifdef hpux11 - #include diff --git a/net-mgmt/net-snmp/files/patch-auto_nlist.c b/net-mgmt/net-snmp/files/patch-auto_nlist.c deleted file mode 100644 index c15443a03afd..000000000000 --- a/net-mgmt/net-snmp/files/patch-auto_nlist.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/auto_nlist.c.orig Mon Jan 24 09:11:07 2005 -+++ agent/auto_nlist.c Mon Jan 24 09:11:24 2005 -@@ -21,10 +21,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include "autonlist.h" - #include "kernel.h" diff --git a/net-mgmt/net-snmp/files/patch-configure.in b/net-mgmt/net-snmp/files/patch-configure.in index 172adf21bf2b..d2550644fed6 100644 --- a/net-mgmt/net-snmp/files/patch-configure.in +++ b/net-mgmt/net-snmp/files/patch-configure.in @@ -1,15 +1,15 @@ ---- configure.in.orig Tue Nov 29 14:16:55 2005 -+++ configure.in Wed Nov 30 11:49:24 2005 -@@ -2075,7 +2075,7 @@ +--- configure.in.orig Fri Jul 14 06:55:27 2006 ++++ configure.in Tue Feb 27 20:29:49 2007 +@@ -2171,7 +2171,7 @@ # fall back CFLAG="-f" fi --for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel +-for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel +for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel /dev/null do if test -f $i -o $CFLAG $i; then ac_cv_KERNEL_LOC="$i" -@@ -2989,6 +2989,26 @@ +@@ -3145,6 +3145,26 @@ # checking for 4.3 vs 4.4 rtentry. AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE, [ diff --git a/net-mgmt/net-snmp/files/patch-hr_swrun.c b/net-mgmt/net-snmp/files/patch-hr_swrun.c deleted file mode 100644 index 8f709c2f9a2a..000000000000 --- a/net-mgmt/net-snmp/files/patch-hr_swrun.c +++ /dev/null @@ -1,78 +0,0 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Thu Oct 20 04:32:20 2005 -+++ agent/mibgroup/host/hr_swrun.c Wed Nov 30 12:50:12 2005 -@@ -585,7 +585,7 @@ - string[ sizeof(string)-1 ] = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -698,7 +698,7 @@ - *cp1 = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -868,8 +868,23 @@ - if (pid < PID_MAXSYS) - long_return = 2; /* operatingSystem */ - else --#endif - long_return = 4; /* application */ -+#elif HAVE_KVM_GETPROCS -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 -+ if (proc_table[LowProcIndex].ki_flag & P_SYSTEM) { -+ if (proc_table[LowProcIndex].ki_pri.pri_class == PRI_ITHD) -+ long_return = 3;/* deviceDriver */ -+ else -+ long_return = 2;/* operatingSystem */ -+ } else -+ long_return = 4; /* application */ -+#else -+ if (proc_table[LowProcIndex].kp_proc.p_flag & P_SYSTEM) -+ long_return = 2; /* operatingSystem */ -+ else -+ long_return = 4; /* application */ -+#endif -+#endif - return (u_char *) & long_return; - case HRSWRUN_STATUS: - #if defined(cygwin) -@@ -901,7 +916,7 @@ - } - #else - #if HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - switch (proc_table[LowProcIndex].ki_stat) { - #else - switch (proc_table[LowProcIndex].kp_proc.p_stat) { -@@ -1000,7 +1015,13 @@ - long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 -+ /* XXX: Accessing ki_paddr causes sig10 ... -+ long_return = proc_table[LowProcIndex].ki_paddr->p_uticks + -+ proc_table[LowProcIndex].ki_paddr->p_sticks + -+ proc_table[LowProcIndex].ki_paddr->p_iticks; */ -+ long_return = 0; -+ #elif defined(freebsd5) - long_return = proc_table[LowProcIndex].ki_runtime / 100000; - #else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + -@@ -1365,7 +1386,7 @@ - #elif defined(solaris2) - return proc_table[current_proc_entry++]; - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - if (proc_table[current_proc_entry].ki_stat != 0) - return proc_table[current_proc_entry++].ki_pid; - #else diff --git a/net-mgmt/net-snmp/files/patch-interfaces.c b/net-mgmt/net-snmp/files/patch-interfaces.c index 37cc368ab1c9..bc56d6ca3a3e 100644 --- a/net-mgmt/net-snmp/files/patch-interfaces.c +++ b/net-mgmt/net-snmp/files/patch-interfaces.c @@ -1,6 +1,6 @@ ---- agent/mibgroup/mibII/interfaces.c.orig Tue Jan 4 00:51:32 2005 -+++ agent/mibgroup/mibII/interfaces.c Thu Apr 7 11:47:45 2005 -@@ -399,6 +399,133 @@ +--- agent/mibgroup/mibII/interfaces.c.orig Wed Oct 26 00:52:19 2005 ++++ agent/mibgroup/mibII/interfaces.c Tue Feb 27 20:44:48 2007 +@@ -395,6 +395,133 @@ return NULL; } @@ -134,7 +134,7 @@ #ifdef USE_SYSCTL_IFLIST static u_char *if_list = 0; -@@ -607,10 +734,20 @@ +@@ -603,10 +730,20 @@ } return (u_char *) & long_return; case IFPHYSADDRESS: @@ -155,139 +155,3 @@ case IFADMINSTATUS: long_return = if_msg.ifm_flags & IFF_UP ? 1 : 2; return (u_char *) & long_return; -@@ -2250,129 +2387,17 @@ - u_char *var_ifEntry(struct variable *, oid *, size_t *, int, - size_t *, WriteMethod ** write); - --static char *physaddrbuf; --static int nphysaddrs; --struct sockaddr_dl **physaddrs; -- - void --init_interfaces_setup(void) -+Interface_Scan_Init(void) - { -- int naddrs, ilen, bit; -- static int mib[6] -- = { CTL_NET, PF_ROUTE, 0, AF_LINK, NET_RT_IFLIST, 0 }; -- char *cp; -- size_t len; -- struct rt_msghdr *rtm; -- struct if_msghdr *ifm; -- struct ifa_msghdr *ifam; -- struct sockaddr *sa; -- -- naddrs = 0; -- if (physaddrs) -- free(physaddrs); -- if (physaddrbuf) -- free(physaddrbuf); -- physaddrbuf = 0; -- physaddrs = 0; -- nphysaddrs = 0; -- len = 0; -- if (sysctl(mib, 6, 0, &len, 0, 0) < 0) -- return; -- -- cp = physaddrbuf = malloc(len); -- if (physaddrbuf == 0) -- return; -- if (sysctl(mib, 6, physaddrbuf, &len, 0, 0) < 0) { -- free(physaddrbuf); -- physaddrbuf = 0; -- return; -- } -- -- loop: -- ilen = len; -- cp = physaddrbuf; -- while (ilen > 0) { -- rtm = (struct rt_msghdr *) cp; -- if (rtm->rtm_version != RTM_VERSION || rtm->rtm_type != RTM_IFINFO) { -- free(physaddrs); -- physaddrs = 0; -- free(physaddrbuf); -- physaddrbuf = 0; -- } -- ifm = (struct if_msghdr *) rtm; --#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) -- if (physaddrs != 0) -- physaddrs[naddrs] = (void *) (ifm + 1); -- naddrs++; --#endif -- ilen -= ifm->ifm_msglen; -- cp += ifm->ifm_msglen; -- rtm = (struct rt_msghdr *) cp; -- while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { --#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) -- ilen -= rtm->rtm_msglen; -- cp += rtm->rtm_msglen; --#else -- int is_alias = 0; -- ifam = (struct ifa_msghdr *) rtm; -- ilen -= sizeof(*ifam); -- cp += sizeof(*ifam); -- sa = (struct sockaddr *) cp; --#define ROUND(x) (((x) + sizeof(long) - 1) & ~sizeof(long)) -- for (bit = 1; bit && ilen > 0; bit <<= 1) { -- if (!(ifam->ifam_addrs & bit)) -- continue; -- ilen -= ROUND(sa->sa_len); -- cp += ROUND(sa->sa_len); -- -- if (bit == RTA_IFA) { -- if (physaddrs) --#define satosdl(sa) ((struct sockaddr_dl *)(sa)) -- physaddrs[naddrs++] -- = satosdl(sa); -- else -- naddrs++; -- } -- sa = (struct sockaddr *) cp; -- } --#endif -- rtm = (struct rt_msghdr *) cp; -- } -- } -- if (physaddrs) { -- nphysaddrs = naddrs; -- return; -- } -- physaddrs = malloc(naddrs * sizeof(*physaddrs)); -- if (physaddrs == 0) -- return; -- naddrs = 0; -- goto loop; -- - } - --static int --get_phys_address(int iindex, char **ap, int *len) -+int -+Interface_Scan_Next(short *Index, -+ char *Name, -+ struct ifnet *Retifnet, struct in_ifaddr *Retin_ifaddr) - { -- int i; -- int once = 1; -- -- do { -- for (i = 0; i < nphysaddrs; i++) { -- if (physaddrs[i]->sdl_index == iindex) -- break; -- } -- if (i < nphysaddrs) -- break; -- init_interfaces_setup(); -- } while (once--); -- -- if (i < nphysaddrs) { -- *ap = LLADDR(physaddrs[i]); -- *len = physaddrs[i]->sdl_alen; -- return 0; -- } -- return -1; -+ return 0; - } - - int diff --git a/net-mgmt/net-snmp/files/patch-master.c b/net-mgmt/net-snmp/files/patch-master.c deleted file mode 100644 index 12e553acc8e0..000000000000 --- a/net-mgmt/net-snmp/files/patch-master.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/agentx/master.c.orig Mon Jan 24 09:16:00 2005 -+++ agent/mibgroup/agentx/master.c Mon Jan 24 09:16:21 2005 -@@ -39,10 +39,6 @@ - #endif - #include - --#if HAVE_DMALLOC_H --#include --#endif -- - #if HAVE_UNISTD_H - #include - #endif diff --git a/net-mgmt/net-snmp/files/patch-master_admin.c b/net-mgmt/net-snmp/files/patch-master_admin.c deleted file mode 100644 index cb4767076810..000000000000 --- a/net-mgmt/net-snmp/files/patch-master_admin.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/agentx/master_admin.c.orig Mon Jan 24 09:18:07 2005 -+++ agent/mibgroup/agentx/master_admin.c Mon Jan 24 09:18:15 2005 -@@ -35,9 +35,6 @@ - #if HAVE_SYS_SOCKET_H - #include - #endif --#if HAVE_DMALLOC_H --#include --#endif - - #include - #include diff --git a/net-mgmt/net-snmp/files/patch-oid_stash.c b/net-mgmt/net-snmp/files/patch-oid_stash.c deleted file mode 100644 index 7978b27d587f..000000000000 --- a/net-mgmt/net-snmp/files/patch-oid_stash.c +++ /dev/null @@ -1,13 +0,0 @@ ---- snmplib/oid_stash.c.orig Mon Jan 24 09:43:04 2005 -+++ snmplib/oid_stash.c Mon Jan 24 09:43:14 2005 -@@ -5,10 +5,6 @@ - #include - #include - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - - /** @defgroup oid_stash Store and retrieve data referenced by an OID. diff --git a/net-mgmt/net-snmp/files/patch-snmpUDPDomain.c b/net-mgmt/net-snmp/files/patch-snmpUDPDomain.c deleted file mode 100644 index 8ed548828d8c..000000000000 --- a/net-mgmt/net-snmp/files/patch-snmpUDPDomain.c +++ /dev/null @@ -1,11 +0,0 @@ ---- snmplib/snmpUDPDomain.c.orig Mon Jan 24 10:47:16 2005 -+++ snmplib/snmpUDPDomain.c Mon Jan 24 10:47:41 2005 -@@ -88,7 +88,7 @@ - } else { - char tmp[64]; - -- sprintf(tmp, "UDP: [%s]:%hd", -+ sprintf(tmp, "UDP: [%s]:%hu", - inet_ntoa(to->sin_addr), ntohs(to->sin_port)); - return strdup(tmp); - } diff --git a/net-mgmt/net-snmp/files/patch-snmp_vars.c b/net-mgmt/net-snmp/files/patch-snmp_vars.c deleted file mode 100644 index 5004187b2108..000000000000 --- a/net-mgmt/net-snmp/files/patch-snmp_vars.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/snmp_vars.c.orig Mon Jan 24 09:12:09 2005 -+++ agent/snmp_vars.c Mon Jan 24 09:12:23 2005 -@@ -136,10 +136,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp/files/patch-snmpd.8.def b/net-mgmt/net-snmp/files/patch-snmpd.8.def deleted file mode 100644 index ac853823ca25..000000000000 --- a/net-mgmt/net-snmp/files/patch-snmpd.8.def +++ /dev/null @@ -1,13 +0,0 @@ ---- man/snmpd.8.def.orig Wed Feb 26 04:11:19 2003 -+++ man/snmpd.8.def Sat Mar 29 22:05:07 2003 -@@ -211,6 +211,10 @@ - the error "Error opening specified endpoint". Likewise, since AAL5 - PVC support is only currently available on Linux, it will fail with - the same error on other platforms. -+.PP -+.B snmpd -+uses libwrap's access control if configured by --with-libwrap. -+Access control patterns may only reference IP addresses. - - .RE - .SH CONFIGURATION FILES diff --git a/net-mgmt/net-snmp/files/patch-subagent.c b/net-mgmt/net-snmp/files/patch-subagent.c deleted file mode 100644 index f198c4da7990..000000000000 --- a/net-mgmt/net-snmp/files/patch-subagent.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/agentx/subagent.c.orig Mon Jan 24 09:17:08 2005 -+++ agent/mibgroup/agentx/subagent.c Mon Jan 24 09:17:12 2005 -@@ -36,10 +36,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp/files/patch-sysORTable.c b/net-mgmt/net-snmp/files/patch-sysORTable.c deleted file mode 100644 index e48aa29e5c86..000000000000 --- a/net-mgmt/net-snmp/files/patch-sysORTable.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/mibII/sysORTable.c.orig Mon Jan 24 08:27:58 2005 -+++ agent/mibgroup/mibII/sysORTable.c Mon Jan 24 08:28:10 2005 -@@ -34,10 +34,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp/files/patch-ucd_snmp.h b/net-mgmt/net-snmp/files/patch-ucd_snmp.h index 44e8b3202574..00f89af5eb57 100644 --- a/net-mgmt/net-snmp/files/patch-ucd_snmp.h +++ b/net-mgmt/net-snmp/files/patch-ucd_snmp.h @@ -1,14 +1,9 @@ - -$FreeBSD$ - ---- agent/mibgroup/ucd_snmp.h.orig -+++ agent/mibgroup/ucd_snmp.h -@@ -39,6 +39,10 @@ - config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) - config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) +--- agent/mibgroup/ucd_snmp.h.orig Tue Feb 27 20:44:04 2007 ++++ agent/mibgroup/ucd_snmp.h Tue Feb 27 20:44:20 2007 +@@ -41,6 +41,8 @@ config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/vmstat_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) + config_arch_require(freebsd6, ucd-snmp/vmstat_freebsd2) + config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd7, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd7, ucd-snmp/memory_freebsd2) config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) diff --git a/net-mgmt/net-snmp/files/snmpd.sh.in b/net-mgmt/net-snmp/files/snmpd.sh.in index 2cb0a3535b79..5777d5074666 100644 --- a/net-mgmt/net-snmp/files/snmpd.sh.in +++ b/net-mgmt/net-snmp/files/snmpd.sh.in @@ -14,6 +14,7 @@ snmpd_enable=${snmpd_enable-"NO"} snmpd_flags=${snmpd_flags-""} snmpd_pidfile=${snmpd_pidfile-"/var/run/snmpd.pid"} snmpd_conffile=${snmpd_conffile-""} +snmpd_flush_cache=${snmpd_flush_cache-"NO"} . %%RC_SUBR%% @@ -32,9 +33,16 @@ rcvar=`set_rcvar` command=%%PREFIX%%/sbin/${name} pidfile=${snmpd_pidfile} sig_stop=KILL +start_precmd=snmpd_precmd load_rc_config ${name} +snmpd_precmd () { + if checkyesno snmpd_flush_cache; then + rm -vf /var/net-snmp/.snmp-exec-cache + fi +} + case "${snmpd_flags}" in *-p\ *) echo "Warning: \$snmpd_flags includes -p option." \ diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist index 37eb269feea7..aa3cb4e79c60 100644 --- a/net-mgmt/net-snmp/pkg-plist +++ b/net-mgmt/net-snmp/pkg-plist @@ -14,7 +14,6 @@ bin/snmpget bin/snmpgetnext bin/snmpinform bin/snmpnetstat -bin/snmpnetstat53 bin/snmpset bin/snmpstatus bin/snmptable @@ -65,6 +64,7 @@ include/net-snmp/agent/table_container.h include/net-snmp/agent/table_data.h include/net-snmp/agent/table_dataset.h include/net-snmp/agent/table_iterator.h +include/net-snmp/agent/table_tdata.h include/net-snmp/agent/util_funcs.h include/net-snmp/agent/var_struct.h include/net-snmp/agent/watcher.h @@ -83,6 +83,8 @@ include/net-snmp/library/container_null.h include/net-snmp/library/data_list.h include/net-snmp/library/default_store.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 include/net-snmp/library/int64.h include/net-snmp/library/keytools.h @@ -109,7 +111,6 @@ include/net-snmp/library/snmp_client.h include/net-snmp/library/snmp_debug.h include/net-snmp/library/snmp_enum.h include/net-snmp/library/snmp_impl.h -include/net-snmp/library/snmp_locking.h include/net-snmp/library/snmp_logging.h include/net-snmp/library/snmp_parse_args.h include/net-snmp/library/snmp_secmod.h @@ -118,6 +119,7 @@ include/net-snmp/library/snmpusm.h include/net-snmp/library/snmpv3-security-includes.h include/net-snmp/library/snmpv3.h include/net-snmp/library/system.h +include/net-snmp/library/text_utils.h include/net-snmp/library/tools.h include/net-snmp/library/transform_oids.h include/net-snmp/library/ucd_compat.h @@ -293,6 +295,7 @@ sbin/snmptrapd %%DATADIR%%/mib2c-data/m2c_setup_enum.m2i %%DATADIR%%/mib2c-data/m2c_setup_node.m2i %%DATADIR%%/mib2c-data/m2c_setup_table.m2i +%%DATADIR%%/mib2c-data/m2c_table_save_defaults.m2i %%DATADIR%%/mib2c-data/mfd-access-container-cached-defines.m2i %%DATADIR%%/mib2c-data/mfd-access-unsorted-external-defines.m2i %%DATADIR%%/mib2c-data/mfd-data-access.m2c @@ -302,11 +305,13 @@ sbin/snmptrapd %%DATADIR%%/mib2c-data/mfd-interactive-setup.m2c %%DATADIR%%/mib2c-data/mfd-interface.m2c %%DATADIR%%/mib2c-data/mfd-makefile.m2m +%%DATADIR%%/mib2c-data/mfd-persistence.m2i %%DATADIR%%/mib2c-data/mfd-readme.m2c %%DATADIR%%/mib2c-data/mfd-top.m2c %%DATADIR%%/mib2c-data/node-get.m2i %%DATADIR%%/mib2c-data/node-set.m2i %%DATADIR%%/mib2c-data/node-storage.m2i +%%DATADIR%%/mib2c-data/node-validate.m2i %%DATADIR%%/mib2c-data/node-varbind-validate.m2i %%DATADIR%%/mib2c-data/parent-dependencies.m2i %%DATADIR%%/mib2c-data/parent-set.m2i diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile index 798559723bc1..83964517c081 100644 --- a/net-mgmt/net-snmp53/Makefile +++ b/net-mgmt/net-snmp53/Makefile @@ -6,8 +6,8 @@ # PORTNAME= snmp -PORTVERSION= 5.2.3 -PORTREVISION= 4 +PORTVERSION= 5.3.1 +PORTREVISION= 0 CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= net-snmp @@ -81,7 +81,7 @@ PLIST_SUB+= WITH_IPV6="" PLIST_SUB+= WITH_IPV6="@comment " .endif -SHLIB_VERSION= 9 +SHLIB_VERSION= 10 PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} SCRIPTS_SUB= PREFIX=${PREFIX} PERL=${PERL} @@ -160,10 +160,11 @@ _MANPAGES+= ${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%} .endif MAN5= mib2c.conf.5 snmp.conf.5 snmp_config.5 snmpd.conf.5 \ + snmpd.examples.5 snmpd.internal.5 \ snmptrapd.conf.5 variables.5 MAN8= snmpd.8 snmptrapd.8 -BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpnetstat53 snmpset \ +BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk SBIN_FILES= snmpd snmptrapd STARTUP_DIR= ${PREFIX}/etc/rc.d @@ -177,6 +178,7 @@ DOC_FILES= AGENT.txt COPYING FAQ NEWS README \ agent/mibgroup/README.smux PS_CMD?= /bin/ps +CONFLICTS= net-snmp-4.* pre-everything:: @${ECHO_MSG} @@ -258,6 +260,6 @@ display-message: # Maintainer's note: # Don't forget to bump library version in these ports. -# french/plgrenouille,graphics/hpoj,lang/php4,lang/php5,mail/cyrus-imapd22,misc/kdeutils3,net-mgmt/braa,net-mgmt/docsis,net-mgmt/mbrowse,net-mgmt/nagios-snmp-plugins,net-mgmt/p5-SNMP-Info,net-mgmt/py-yapsnmp,net-mgmt/sdig,net-mgmt/zabbix,net/cactid,net/ethereal,net/ifstat,net/quagga,net/rtg,net/tethereal,security/libfwbuilder,sysutils/apcupsd,sysutils/jailadmin,sysutils/nut +# french/plgrenouille,graphics/hpoj,lang/php4,lang/php5,mail/cyrus-imapd22,mail/cyrus-imapd23,misc/kdeutils3,net-mgmt/braa,net-mgmt/docsis,net-mgmt/mbrowse,net-mgmt/nagios-snmp-plugins,net-mgmt/p5-SNMP-Info,net-mgmt/py-yapsnmp,net-mgmt/sdig,net-mgmt/zabbix,net/cactid,net/wireshark,net/ifstat,net/quagga,net/rtg,print/hplip,security/libfwbuilder,sysutils/apcupsd,sysutils/jailadmin,sysutils/nut .include diff --git a/net-mgmt/net-snmp53/distinfo b/net-mgmt/net-snmp53/distinfo index afa14d31a40f..8ddb0151dc44 100644 --- a/net-mgmt/net-snmp53/distinfo +++ b/net-mgmt/net-snmp53/distinfo @@ -1,3 +1,3 @@ -MD5 (net-snmp-5.2.3.tar.gz) = ba4bc583413f90618228d0f196da8181 -SHA256 (net-snmp-5.2.3.tar.gz) = d31aa0f608c5b16dece4d5ed5e0e1321aca29a6a4e41ef0148273baed4bfbd79 -SIZE (net-snmp-5.2.3.tar.gz) = 4006389 +MD5 (net-snmp-5.3.1.tar.gz) = 360a9783dbc853bab6bda90d961daee5 +SHA256 (net-snmp-5.3.1.tar.gz) = fb6d5113ccdd8c4661fe5d825160e45a7c5035b145e24ec18f71a509ecb0fe43 +SIZE (net-snmp-5.3.1.tar.gz) = 4210843 diff --git a/net-mgmt/net-snmp53/files/patch-agent_index.c b/net-mgmt/net-snmp53/files/patch-agent_index.c deleted file mode 100644 index d6254de2148e..000000000000 --- a/net-mgmt/net-snmp53/files/patch-agent_index.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_index.c.orig Mon Jan 24 09:14:39 2005 -+++ agent/agent_index.c Mon Jan 24 09:14:55 2005 -@@ -39,10 +39,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp53/files/patch-agent_read_config.c b/net-mgmt/net-snmp53/files/patch-agent_read_config.c deleted file mode 100644 index d38b96de7668..000000000000 --- a/net-mgmt/net-snmp53/files/patch-agent_read_config.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_read_config.c.orig Mon Jan 24 09:12:58 2005 -+++ agent/agent_read_config.c Mon Jan 24 09:13:13 2005 -@@ -84,10 +84,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #if HAVE_UNISTD_H - #include - #endif diff --git a/net-mgmt/net-snmp53/files/patch-agent_registry.c b/net-mgmt/net-snmp53/files/patch-agent_registry.c deleted file mode 100644 index 4eab10a699f9..000000000000 --- a/net-mgmt/net-snmp53/files/patch-agent_registry.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_registry.c.orig Mon Jan 24 09:14:00 2005 -+++ agent/agent_registry.c Mon Jan 24 09:14:08 2005 -@@ -51,10 +51,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp53/files/patch-at.c b/net-mgmt/net-snmp53/files/patch-at.c deleted file mode 100644 index 363f1b07991e..000000000000 --- a/net-mgmt/net-snmp53/files/patch-at.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/mibII/at.c.orig Mon Jan 24 09:08:41 2005 -+++ agent/mibgroup/mibII/at.c Mon Jan 24 09:08:58 2005 -@@ -90,9 +90,6 @@ - #if HAVE_WINSOCK_H - #include - #endif --#if HAVE_DMALLOC_H --#include --#endif - - #ifdef hpux11 - #include diff --git a/net-mgmt/net-snmp53/files/patch-auto_nlist.c b/net-mgmt/net-snmp53/files/patch-auto_nlist.c deleted file mode 100644 index c15443a03afd..000000000000 --- a/net-mgmt/net-snmp53/files/patch-auto_nlist.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/auto_nlist.c.orig Mon Jan 24 09:11:07 2005 -+++ agent/auto_nlist.c Mon Jan 24 09:11:24 2005 -@@ -21,10 +21,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include "autonlist.h" - #include "kernel.h" diff --git a/net-mgmt/net-snmp53/files/patch-configure.in b/net-mgmt/net-snmp53/files/patch-configure.in index 172adf21bf2b..d2550644fed6 100644 --- a/net-mgmt/net-snmp53/files/patch-configure.in +++ b/net-mgmt/net-snmp53/files/patch-configure.in @@ -1,15 +1,15 @@ ---- configure.in.orig Tue Nov 29 14:16:55 2005 -+++ configure.in Wed Nov 30 11:49:24 2005 -@@ -2075,7 +2075,7 @@ +--- configure.in.orig Fri Jul 14 06:55:27 2006 ++++ configure.in Tue Feb 27 20:29:49 2007 +@@ -2171,7 +2171,7 @@ # fall back CFLAG="-f" fi --for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel +-for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel +for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel /dev/null do if test -f $i -o $CFLAG $i; then ac_cv_KERNEL_LOC="$i" -@@ -2989,6 +2989,26 @@ +@@ -3145,6 +3145,26 @@ # checking for 4.3 vs 4.4 rtentry. AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE, [ diff --git a/net-mgmt/net-snmp53/files/patch-hr_swrun.c b/net-mgmt/net-snmp53/files/patch-hr_swrun.c deleted file mode 100644 index 8f709c2f9a2a..000000000000 --- a/net-mgmt/net-snmp53/files/patch-hr_swrun.c +++ /dev/null @@ -1,78 +0,0 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Thu Oct 20 04:32:20 2005 -+++ agent/mibgroup/host/hr_swrun.c Wed Nov 30 12:50:12 2005 -@@ -585,7 +585,7 @@ - string[ sizeof(string)-1 ] = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -698,7 +698,7 @@ - *cp1 = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -868,8 +868,23 @@ - if (pid < PID_MAXSYS) - long_return = 2; /* operatingSystem */ - else --#endif - long_return = 4; /* application */ -+#elif HAVE_KVM_GETPROCS -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 -+ if (proc_table[LowProcIndex].ki_flag & P_SYSTEM) { -+ if (proc_table[LowProcIndex].ki_pri.pri_class == PRI_ITHD) -+ long_return = 3;/* deviceDriver */ -+ else -+ long_return = 2;/* operatingSystem */ -+ } else -+ long_return = 4; /* application */ -+#else -+ if (proc_table[LowProcIndex].kp_proc.p_flag & P_SYSTEM) -+ long_return = 2; /* operatingSystem */ -+ else -+ long_return = 4; /* application */ -+#endif -+#endif - return (u_char *) & long_return; - case HRSWRUN_STATUS: - #if defined(cygwin) -@@ -901,7 +916,7 @@ - } - #else - #if HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - switch (proc_table[LowProcIndex].ki_stat) { - #else - switch (proc_table[LowProcIndex].kp_proc.p_stat) { -@@ -1000,7 +1015,13 @@ - long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 -+ /* XXX: Accessing ki_paddr causes sig10 ... -+ long_return = proc_table[LowProcIndex].ki_paddr->p_uticks + -+ proc_table[LowProcIndex].ki_paddr->p_sticks + -+ proc_table[LowProcIndex].ki_paddr->p_iticks; */ -+ long_return = 0; -+ #elif defined(freebsd5) - long_return = proc_table[LowProcIndex].ki_runtime / 100000; - #else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + -@@ -1365,7 +1386,7 @@ - #elif defined(solaris2) - return proc_table[current_proc_entry++]; - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - if (proc_table[current_proc_entry].ki_stat != 0) - return proc_table[current_proc_entry++].ki_pid; - #else diff --git a/net-mgmt/net-snmp53/files/patch-interfaces.c b/net-mgmt/net-snmp53/files/patch-interfaces.c index 37cc368ab1c9..bc56d6ca3a3e 100644 --- a/net-mgmt/net-snmp53/files/patch-interfaces.c +++ b/net-mgmt/net-snmp53/files/patch-interfaces.c @@ -1,6 +1,6 @@ ---- agent/mibgroup/mibII/interfaces.c.orig Tue Jan 4 00:51:32 2005 -+++ agent/mibgroup/mibII/interfaces.c Thu Apr 7 11:47:45 2005 -@@ -399,6 +399,133 @@ +--- agent/mibgroup/mibII/interfaces.c.orig Wed Oct 26 00:52:19 2005 ++++ agent/mibgroup/mibII/interfaces.c Tue Feb 27 20:44:48 2007 +@@ -395,6 +395,133 @@ return NULL; } @@ -134,7 +134,7 @@ #ifdef USE_SYSCTL_IFLIST static u_char *if_list = 0; -@@ -607,10 +734,20 @@ +@@ -603,10 +730,20 @@ } return (u_char *) & long_return; case IFPHYSADDRESS: @@ -155,139 +155,3 @@ case IFADMINSTATUS: long_return = if_msg.ifm_flags & IFF_UP ? 1 : 2; return (u_char *) & long_return; -@@ -2250,129 +2387,17 @@ - u_char *var_ifEntry(struct variable *, oid *, size_t *, int, - size_t *, WriteMethod ** write); - --static char *physaddrbuf; --static int nphysaddrs; --struct sockaddr_dl **physaddrs; -- - void --init_interfaces_setup(void) -+Interface_Scan_Init(void) - { -- int naddrs, ilen, bit; -- static int mib[6] -- = { CTL_NET, PF_ROUTE, 0, AF_LINK, NET_RT_IFLIST, 0 }; -- char *cp; -- size_t len; -- struct rt_msghdr *rtm; -- struct if_msghdr *ifm; -- struct ifa_msghdr *ifam; -- struct sockaddr *sa; -- -- naddrs = 0; -- if (physaddrs) -- free(physaddrs); -- if (physaddrbuf) -- free(physaddrbuf); -- physaddrbuf = 0; -- physaddrs = 0; -- nphysaddrs = 0; -- len = 0; -- if (sysctl(mib, 6, 0, &len, 0, 0) < 0) -- return; -- -- cp = physaddrbuf = malloc(len); -- if (physaddrbuf == 0) -- return; -- if (sysctl(mib, 6, physaddrbuf, &len, 0, 0) < 0) { -- free(physaddrbuf); -- physaddrbuf = 0; -- return; -- } -- -- loop: -- ilen = len; -- cp = physaddrbuf; -- while (ilen > 0) { -- rtm = (struct rt_msghdr *) cp; -- if (rtm->rtm_version != RTM_VERSION || rtm->rtm_type != RTM_IFINFO) { -- free(physaddrs); -- physaddrs = 0; -- free(physaddrbuf); -- physaddrbuf = 0; -- } -- ifm = (struct if_msghdr *) rtm; --#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) -- if (physaddrs != 0) -- physaddrs[naddrs] = (void *) (ifm + 1); -- naddrs++; --#endif -- ilen -= ifm->ifm_msglen; -- cp += ifm->ifm_msglen; -- rtm = (struct rt_msghdr *) cp; -- while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { --#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) -- ilen -= rtm->rtm_msglen; -- cp += rtm->rtm_msglen; --#else -- int is_alias = 0; -- ifam = (struct ifa_msghdr *) rtm; -- ilen -= sizeof(*ifam); -- cp += sizeof(*ifam); -- sa = (struct sockaddr *) cp; --#define ROUND(x) (((x) + sizeof(long) - 1) & ~sizeof(long)) -- for (bit = 1; bit && ilen > 0; bit <<= 1) { -- if (!(ifam->ifam_addrs & bit)) -- continue; -- ilen -= ROUND(sa->sa_len); -- cp += ROUND(sa->sa_len); -- -- if (bit == RTA_IFA) { -- if (physaddrs) --#define satosdl(sa) ((struct sockaddr_dl *)(sa)) -- physaddrs[naddrs++] -- = satosdl(sa); -- else -- naddrs++; -- } -- sa = (struct sockaddr *) cp; -- } --#endif -- rtm = (struct rt_msghdr *) cp; -- } -- } -- if (physaddrs) { -- nphysaddrs = naddrs; -- return; -- } -- physaddrs = malloc(naddrs * sizeof(*physaddrs)); -- if (physaddrs == 0) -- return; -- naddrs = 0; -- goto loop; -- - } - --static int --get_phys_address(int iindex, char **ap, int *len) -+int -+Interface_Scan_Next(short *Index, -+ char *Name, -+ struct ifnet *Retifnet, struct in_ifaddr *Retin_ifaddr) - { -- int i; -- int once = 1; -- -- do { -- for (i = 0; i < nphysaddrs; i++) { -- if (physaddrs[i]->sdl_index == iindex) -- break; -- } -- if (i < nphysaddrs) -- break; -- init_interfaces_setup(); -- } while (once--); -- -- if (i < nphysaddrs) { -- *ap = LLADDR(physaddrs[i]); -- *len = physaddrs[i]->sdl_alen; -- return 0; -- } -- return -1; -+ return 0; - } - - int diff --git a/net-mgmt/net-snmp53/files/patch-master.c b/net-mgmt/net-snmp53/files/patch-master.c deleted file mode 100644 index 12e553acc8e0..000000000000 --- a/net-mgmt/net-snmp53/files/patch-master.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/agentx/master.c.orig Mon Jan 24 09:16:00 2005 -+++ agent/mibgroup/agentx/master.c Mon Jan 24 09:16:21 2005 -@@ -39,10 +39,6 @@ - #endif - #include - --#if HAVE_DMALLOC_H --#include --#endif -- - #if HAVE_UNISTD_H - #include - #endif diff --git a/net-mgmt/net-snmp53/files/patch-master_admin.c b/net-mgmt/net-snmp53/files/patch-master_admin.c deleted file mode 100644 index cb4767076810..000000000000 --- a/net-mgmt/net-snmp53/files/patch-master_admin.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/agentx/master_admin.c.orig Mon Jan 24 09:18:07 2005 -+++ agent/mibgroup/agentx/master_admin.c Mon Jan 24 09:18:15 2005 -@@ -35,9 +35,6 @@ - #if HAVE_SYS_SOCKET_H - #include - #endif --#if HAVE_DMALLOC_H --#include --#endif - - #include - #include diff --git a/net-mgmt/net-snmp53/files/patch-oid_stash.c b/net-mgmt/net-snmp53/files/patch-oid_stash.c deleted file mode 100644 index 7978b27d587f..000000000000 --- a/net-mgmt/net-snmp53/files/patch-oid_stash.c +++ /dev/null @@ -1,13 +0,0 @@ ---- snmplib/oid_stash.c.orig Mon Jan 24 09:43:04 2005 -+++ snmplib/oid_stash.c Mon Jan 24 09:43:14 2005 -@@ -5,10 +5,6 @@ - #include - #include - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - - /** @defgroup oid_stash Store and retrieve data referenced by an OID. diff --git a/net-mgmt/net-snmp53/files/patch-snmpUDPDomain.c b/net-mgmt/net-snmp53/files/patch-snmpUDPDomain.c deleted file mode 100644 index 8ed548828d8c..000000000000 --- a/net-mgmt/net-snmp53/files/patch-snmpUDPDomain.c +++ /dev/null @@ -1,11 +0,0 @@ ---- snmplib/snmpUDPDomain.c.orig Mon Jan 24 10:47:16 2005 -+++ snmplib/snmpUDPDomain.c Mon Jan 24 10:47:41 2005 -@@ -88,7 +88,7 @@ - } else { - char tmp[64]; - -- sprintf(tmp, "UDP: [%s]:%hd", -+ sprintf(tmp, "UDP: [%s]:%hu", - inet_ntoa(to->sin_addr), ntohs(to->sin_port)); - return strdup(tmp); - } diff --git a/net-mgmt/net-snmp53/files/patch-snmp_vars.c b/net-mgmt/net-snmp53/files/patch-snmp_vars.c deleted file mode 100644 index 5004187b2108..000000000000 --- a/net-mgmt/net-snmp53/files/patch-snmp_vars.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/snmp_vars.c.orig Mon Jan 24 09:12:09 2005 -+++ agent/snmp_vars.c Mon Jan 24 09:12:23 2005 -@@ -136,10 +136,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp53/files/patch-snmpd.8.def b/net-mgmt/net-snmp53/files/patch-snmpd.8.def deleted file mode 100644 index ac853823ca25..000000000000 --- a/net-mgmt/net-snmp53/files/patch-snmpd.8.def +++ /dev/null @@ -1,13 +0,0 @@ ---- man/snmpd.8.def.orig Wed Feb 26 04:11:19 2003 -+++ man/snmpd.8.def Sat Mar 29 22:05:07 2003 -@@ -211,6 +211,10 @@ - the error "Error opening specified endpoint". Likewise, since AAL5 - PVC support is only currently available on Linux, it will fail with - the same error on other platforms. -+.PP -+.B snmpd -+uses libwrap's access control if configured by --with-libwrap. -+Access control patterns may only reference IP addresses. - - .RE - .SH CONFIGURATION FILES diff --git a/net-mgmt/net-snmp53/files/patch-subagent.c b/net-mgmt/net-snmp53/files/patch-subagent.c deleted file mode 100644 index f198c4da7990..000000000000 --- a/net-mgmt/net-snmp53/files/patch-subagent.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/agentx/subagent.c.orig Mon Jan 24 09:17:08 2005 -+++ agent/mibgroup/agentx/subagent.c Mon Jan 24 09:17:12 2005 -@@ -36,10 +36,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp53/files/patch-sysORTable.c b/net-mgmt/net-snmp53/files/patch-sysORTable.c deleted file mode 100644 index e48aa29e5c86..000000000000 --- a/net-mgmt/net-snmp53/files/patch-sysORTable.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/mibII/sysORTable.c.orig Mon Jan 24 08:27:58 2005 -+++ agent/mibgroup/mibII/sysORTable.c Mon Jan 24 08:28:10 2005 -@@ -34,10 +34,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff --git a/net-mgmt/net-snmp53/files/patch-ucd_snmp.h b/net-mgmt/net-snmp53/files/patch-ucd_snmp.h index 44e8b3202574..00f89af5eb57 100644 --- a/net-mgmt/net-snmp53/files/patch-ucd_snmp.h +++ b/net-mgmt/net-snmp53/files/patch-ucd_snmp.h @@ -1,14 +1,9 @@ - -$FreeBSD$ - ---- agent/mibgroup/ucd_snmp.h.orig -+++ agent/mibgroup/ucd_snmp.h -@@ -39,6 +39,10 @@ - config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) - config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) +--- agent/mibgroup/ucd_snmp.h.orig Tue Feb 27 20:44:04 2007 ++++ agent/mibgroup/ucd_snmp.h Tue Feb 27 20:44:20 2007 +@@ -41,6 +41,8 @@ config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/vmstat_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) + config_arch_require(freebsd6, ucd-snmp/vmstat_freebsd2) + config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) +config_arch_require(freebsd7, ucd-snmp/vmstat_freebsd2) +config_arch_require(freebsd7, ucd-snmp/memory_freebsd2) config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) diff --git a/net-mgmt/net-snmp53/files/snmpd.sh.in b/net-mgmt/net-snmp53/files/snmpd.sh.in index 746899a9b41e..bd52e41eb8d9 100644 --- a/net-mgmt/net-snmp53/files/snmpd.sh.in +++ b/net-mgmt/net-snmp53/files/snmpd.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp53/files/Attic/snmpd.sh.in,v 1.4 2006-09-23 15:03:36 nork Exp $ +# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp53/files/Attic/snmpd.sh.in,v 1.5 2007-02-28 01:17:16 kuriyama Exp $ # # PROVIDE: snmpd # REQUIRE: DAEMON @@ -14,6 +14,7 @@ snmpd_enable=${snmpd_enable-"NO"} snmpd_flags=${snmpd_flags-""} snmpd_pidfile=${snmpd_pidfile-"/var/run/snmpd.pid"} snmpd_conffile=${snmpd_conffile-""} +snmpd_flush_cache=${snmpd_flush_cache-"NO"} . %%RC_SUBR%% @@ -32,9 +33,16 @@ rcvar=`set_rcvar` command=%%PREFIX%%/sbin/${name} pidfile=${snmpd_pidfile} sig_stop=KILL +start_precmd=snmpd_precmd load_rc_config ${name} +snmpd_precmd () { + if checkyesno snmpd_flush_cache; then + rm -vf /var/net-snmp/.snmp-exec-cache + fi +} + case "${snmpd_flags}" in *-p\ *) echo "Warning: \$snmpd_flags includes -p option." \ diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist index 37eb269feea7..aa3cb4e79c60 100644 --- a/net-mgmt/net-snmp53/pkg-plist +++ b/net-mgmt/net-snmp53/pkg-plist @@ -14,7 +14,6 @@ bin/snmpget bin/snmpgetnext bin/snmpinform bin/snmpnetstat -bin/snmpnetstat53 bin/snmpset bin/snmpstatus bin/snmptable @@ -65,6 +64,7 @@ include/net-snmp/agent/table_container.h include/net-snmp/agent/table_data.h include/net-snmp/agent/table_dataset.h include/net-snmp/agent/table_iterator.h +include/net-snmp/agent/table_tdata.h include/net-snmp/agent/util_funcs.h include/net-snmp/agent/var_struct.h include/net-snmp/agent/watcher.h @@ -83,6 +83,8 @@ include/net-snmp/library/container_null.h include/net-snmp/library/data_list.h include/net-snmp/library/default_store.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 include/net-snmp/library/int64.h include/net-snmp/library/keytools.h @@ -109,7 +111,6 @@ include/net-snmp/library/snmp_client.h include/net-snmp/library/snmp_debug.h include/net-snmp/library/snmp_enum.h include/net-snmp/library/snmp_impl.h -include/net-snmp/library/snmp_locking.h include/net-snmp/library/snmp_logging.h include/net-snmp/library/snmp_parse_args.h include/net-snmp/library/snmp_secmod.h @@ -118,6 +119,7 @@ include/net-snmp/library/snmpusm.h include/net-snmp/library/snmpv3-security-includes.h include/net-snmp/library/snmpv3.h include/net-snmp/library/system.h +include/net-snmp/library/text_utils.h include/net-snmp/library/tools.h include/net-snmp/library/transform_oids.h include/net-snmp/library/ucd_compat.h @@ -293,6 +295,7 @@ sbin/snmptrapd %%DATADIR%%/mib2c-data/m2c_setup_enum.m2i %%DATADIR%%/mib2c-data/m2c_setup_node.m2i %%DATADIR%%/mib2c-data/m2c_setup_table.m2i +%%DATADIR%%/mib2c-data/m2c_table_save_defaults.m2i %%DATADIR%%/mib2c-data/mfd-access-container-cached-defines.m2i %%DATADIR%%/mib2c-data/mfd-access-unsorted-external-defines.m2i %%DATADIR%%/mib2c-data/mfd-data-access.m2c @@ -302,11 +305,13 @@ sbin/snmptrapd %%DATADIR%%/mib2c-data/mfd-interactive-setup.m2c %%DATADIR%%/mib2c-data/mfd-interface.m2c %%DATADIR%%/mib2c-data/mfd-makefile.m2m +%%DATADIR%%/mib2c-data/mfd-persistence.m2i %%DATADIR%%/mib2c-data/mfd-readme.m2c %%DATADIR%%/mib2c-data/mfd-top.m2c %%DATADIR%%/mib2c-data/node-get.m2i %%DATADIR%%/mib2c-data/node-set.m2i %%DATADIR%%/mib2c-data/node-storage.m2i +%%DATADIR%%/mib2c-data/node-validate.m2i %%DATADIR%%/mib2c-data/node-varbind-validate.m2i %%DATADIR%%/mib2c-data/parent-dependencies.m2i %%DATADIR%%/mib2c-data/parent-set.m2i