diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2002-05-15 06:41:00 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2002-05-15 06:41:00 +0000 |
| commit | 1b62f4b5fabd4850adbdd01dc4c11808a6832d1a (patch) | |
| tree | d730788472c477b9ad81dfa40be5b0a5955b390e | |
| parent | 1c96687cd64423f4289c9e80ac7ec676182419ae (diff) | |
| download | ports-1b62f4b5fabd4850adbdd01dc4c11808a6832d1a.tar.gz ports-1b62f4b5fabd4850adbdd01dc4c11808a6832d1a.zip | |
Notes
40 files changed, 1056 insertions, 752 deletions
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile index 706675e545fe..3bba6ce1a30c 100644 --- a/net-mgmt/net-snmp-devel/Makefile +++ b/net-mgmt/net-snmp-devel/Makefile @@ -5,11 +5,10 @@ # $FreeBSD$ # -PORTNAME= ucd-snmp -PORTVERSION= 4.2.5 +PORTNAME= net-snmp +PORTVERSION= 5.0.1 CATEGORIES= net ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - ftp://ucd-snmp.ucdavis.edu/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ ftp://ftp.win.ne.jp/pub/network/snmp/ucd-snmp/ MASTER_SITE_SUBDIR= net-snmp @@ -20,6 +19,7 @@ USE_AUTOCONF_VER=213 USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore +NO_LATEST_LINK= yes CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host ucd-snmp/diskio" \ --with-gnu-ld --with-libwrap --with-libs="-ldevstat" @@ -29,12 +29,20 @@ CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where IS_INTERACTIVE= yes .endif -MAN1= snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 snmpd.1 \ +MAN1= mib2c.1 \ + snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 snmpd.1 \ snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \ snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \ snmptranslate.1 snmptrap.1 snmpusm.1 snmpwalk.1 MAN3= add_mibdir.3 add_module_replacement.3 default_store.3 \ get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \ + netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \ + netsnmp_example_scalar_int.3 netsnmp_handler.3 \ + netsnmp_instance.3 netsnmp_mib_handler_methods.3 \ + netsnmp_multiplexer.3 netsnmp_old_api.3 netsnmp_read_only.3 \ + netsnmp_serialize.3 netsnmp_table.3 netsnmp_table_array.3 \ + netsnmp_table_data.3 netsnmp_table_dataset.3 \ + netsnmp_table_iterator.3 netsnmp_todo.3 \ print_description.3 print_mib.3 print_objid.3 print_value.3 \ print_variable.3 read_all_mibs.3 read_config.3 read_mib.3 \ read_module.3 read_module_node.3 read_objid.3 shutdown_mib.3 \ @@ -64,7 +72,7 @@ STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh CONFIGURE_ARGS+= --enable-ipv6 .endif -SHLIB_VERSION= 4 +SHLIB_VERSION= 5 PLIST_SUB+= shlib=${SHLIB_VERSION} post-patch: @@ -73,11 +81,8 @@ post-patch: post-install: @( cd ${PREFIX}/bin && strip ${BIN} ) @( cd ${PREFIX}/sbin && strip ${SBIN} ) - @( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * ) + @( cd ${PREFIX}/include/net-snmp && ${CHMOD} 644 * ) @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) - @${MKDIR} ${PREFIX}/share/examples/ucd-snmp - @for F in ${WRKSRC}/EXAMPLE.conf ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \ - ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done @if [ ! -f ${STARTUP_FILE} ]; then \ ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/snmpd.sh.sample ${STARTUP_FILE}; \ diff --git a/net-mgmt/net-snmp-devel/distinfo b/net-mgmt/net-snmp-devel/distinfo index 62f49e72ff53..afe0c1b1309e 100644 --- a/net-mgmt/net-snmp-devel/distinfo +++ b/net-mgmt/net-snmp-devel/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-4.2.5.tar.gz) = 615e0b1e760cbb8c63b5392fe2d04b14 +MD5 (net-snmp-5.0.1.tar.gz) = f209cff622b4ffee830d54b68985d859 diff --git a/net-mgmt/net-snmp-devel/files/patch-Makefile.top b/net-mgmt/net-snmp-devel/files/patch-Makefile.top index e6077bc203ef..7bb0b8a79ac8 100644 --- a/net-mgmt/net-snmp-devel/files/patch-Makefile.top +++ b/net-mgmt/net-snmp-devel/files/patch-Makefile.top @@ -1,11 +1,11 @@ ---- Makefile.top.orig Sat Feb 16 10:00:19 2002 -+++ Makefile.top Sat Feb 16 23:31:00 2002 -@@ -52,7 +52,7 @@ - # Misc Compiling Stuff - CC = @CC@ - # version number is prefixed by a 0 for a better shared library version number --LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) $(SHVFLAGS) -o -+LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(VERSION).0 -version-info 4 -o +--- Makefile.top.orig Sat Apr 20 16:29:56 2002 ++++ Makefile.top Tue Apr 23 08:53:54 2002 +@@ -60,7 +60,7 @@ + # generally, LIBCURRENT should stay the same unless major changes occur. + # Increment REVISION every release. + # Increment AGE if new stuff is available. +-LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o ++LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(LIBCURRENT) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o LIB_EXTENSION = la LIB_VERSION = LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir) diff --git a/net-mgmt/net-snmp-devel/files/patch-ak b/net-mgmt/net-snmp-devel/files/patch-ak deleted file mode 100644 index 8a9d310cd7a0..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-ak +++ /dev/null @@ -1,21 +0,0 @@ ---- agent/Makefile.in.orig Sun Nov 19 12:58:06 2000 -+++ agent/Makefile.in Wed Jan 17 18:37:02 2001 -@@ -68,10 +68,18 @@ - - libucdagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) - $(LIB_LD_CMD) libucdagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS) -+ ld -Bshareable -soname libucdagent.$(LIB_EXTENSION)$(LIB_VERSION) \ -+ -o libucdagent.so ${LIBAGENTOBJS} -+ ln -f libucdagent.so \ -+ ../libucdagent.so.4 - $(RANLIB) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) - - libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} - $(LIB_LD_CMD) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) -+ ld -Bshareable -soname libucdmibs.so.4 \ -+ -o libucdmibs.so ${MIBOBJS} -+ ln -f libucdmibs.so \ -+ ../libucdmibs.so.4 - $(RANLIB) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) - - clean: diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_disk.c b/net-mgmt/net-snmp-devel/files/patch-hr_disk.c index b4f2c66a92f8..4afa759aafa6 100644 --- a/net-mgmt/net-snmp-devel/files/patch-hr_disk.c +++ b/net-mgmt/net-snmp-devel/files/patch-hr_disk.c @@ -1,11 +1,12 @@ ---- agent/mibgroup/host/hr_disk.c.orig Tue Feb 26 01:57:26 2002 -+++ agent/mibgroup/host/hr_disk.c Fri Mar 29 16:06:29 2002 -@@ -185,7 +185,7 @@ - #elif defined(solaris2) - Add_HR_Disk_entry ( "/dev/rdsk/c%dt%dd0s%d", 0, 1, 0, 15, "/dev/rdsk/c%dt%dd0s0", 0, 7 ); - Add_HR_Disk_entry ( "/dev/rdsk/c%dd%ds%d", 0, 1, 0, 15, "/dev/rdsk/c%dd%ds0", 0, 7 ); --#elif defined(freebsd4) +--- agent/mibgroup/host/hr_disk.c.orig Sat Apr 20 16:30:03 2002 ++++ agent/mibgroup/host/hr_disk.c Wed Apr 24 01:33:15 2002 +@@ -185,6 +185,9 @@ + "/dev/rdsk/c%dt%dd0s0", 0, 7); + Add_HR_Disk_entry("/dev/rdsk/c%dd%ds%d", 0, 1, 0, 15, + "/dev/rdsk/c%dd%ds0", 0, 7); +#elif defined(__FreeBSD__) && __FreeBSD__ >= 4 - Add_HR_Disk_entry ( "/dev/ad%ds%d%c", 0, 1, 1, 4, "/dev/ad%ds%d", 'a', 'h'); - Add_HR_Disk_entry ( "/dev/da%ds%d%c", 0, 1, 1, 4, "/dev/da%ds%d", 'a', 'h'); ++ Add_HR_Disk_entry("/dev/ad%ds%d%c", 0, 1, 1, 4, "/dev/ad%ds%d", 'a', 'h'); ++ Add_HR_Disk_entry("/dev/da%ds%d%c", 0, 1, 1, 4, "/dev/da%ds%d", 'a', 'h'); #elif defined(freebsd3) + Add_HR_Disk_entry("/dev/wd%ds%d%c", 0, 1, 1, 4, "/dev/wd%ds%d", 'a', + 'h'); diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_storage.c b/net-mgmt/net-snmp-devel/files/patch-hr_storage.c index 0c5381602966..3656d5a3a3d1 100644 --- a/net-mgmt/net-snmp-devel/files/patch-hr_storage.c +++ b/net-mgmt/net-snmp-devel/files/patch-hr_storage.c @@ -1,11 +1,11 @@ ---- agent/mibgroup/host/hr_storage.c.orig Fri Feb 8 19:42:25 2002 -+++ agent/mibgroup/host/hr_storage.c Sat Feb 16 23:37:31 2002 -@@ -583,7 +583,15 @@ - for (i = 0; i < sizeof(mbstat.m_mtypes)/sizeof(mbstat.m_mtypes[0]); i++) - long_return += mbstat.m_mtypes[i]; +--- agent/mibgroup/host/hr_storage.c.orig Sat Apr 20 16:30:03 2002 ++++ agent/mibgroup/host/hr_storage.c Wed Apr 24 01:37:29 2002 +@@ -604,7 +604,15 @@ + i++) + long_return += mbstat.m_mtypes[i]; #elif defined(MBSTAT_SYMBOL) +#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_mbufs; + long_return = mbstat.m_mbufs; +#elif __FreeBSD_version < 500024 + /* mbuf stats disabled */ + return NULL; @@ -14,14 +14,14 @@ + return NULL; +#endif #elif defined(NO_DUMMY_VALUES) - return NULL; + return NULL; #else -@@ -634,7 +642,15 @@ - + (mclpool.pr_nget - mclpool.pr_nput) - * mclpool.pr_size; +@@ -654,7 +662,15 @@ + * mbpool.pr_size + (mclpool.pr_nget - mclpool.pr_nput) + * mclpool.pr_size; #elif defined(MBSTAT_SYMBOL) +#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ + long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ +#elif __FreeBSD_version < 500024 + /* mbuf stats disabled */ + return NULL; @@ -30,5 +30,5 @@ + return NULL; +#endif #elif defined(NO_DUMMY_VALUES) - return NULL; + return NULL; #else diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c b/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c index c232386f873e..a2afd1c61cf3 100644 --- a/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c +++ b/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c @@ -1,43 +1,43 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Sat Feb 16 09:41:19 2002 -+++ agent/mibgroup/host/hr_swrun.c Sat Feb 16 23:41:05 2002 -@@ -543,7 +543,11 @@ - strcpy(string, proc_buf->p_user.u_comm); +--- agent/mibgroup/host/hr_swrun.c.orig Sat Apr 20 16:30:03 2002 ++++ agent/mibgroup/host/hr_swrun.c Wed Apr 24 01:43:15 2002 +@@ -557,7 +557,11 @@ + strcpy(string, proc_buf->p_user.u_comm); #endif #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + strcpy(string, proc_table[LowProcIndex].ki_comm); +#else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); + strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); +#endif #elif defined(linux) - sprintf( string, "/proc/%d/status", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -638,7 +642,11 @@ - *cp1 = 0; + sprintf(string, "/proc/%d/status", pid); + if ((fp = fopen(string, "r")) == NULL) +@@ -662,7 +666,11 @@ + *cp1 = 0; #endif #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + strcpy(string, proc_table[LowProcIndex].ki_comm); +#else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); + strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); +#endif #elif defined(linux) - sprintf( string, "/proc/%d/cmdline", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -810,7 +818,11 @@ - } + sprintf(string, "/proc/%d/cmdline", pid); + if ((fp = fopen(string, "r")) == NULL) +@@ -853,7 +861,11 @@ + } #else #if HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + switch ( proc_table[LowProcIndex].ki_stat ) { +#else - switch ( proc_table[LowProcIndex].kp_proc.p_stat ) { + switch (proc_table[LowProcIndex].kp_proc.p_stat) { +#endif #elif defined(dynix) - switch ( lowpsinfo.pr_state ) { + switch (lowpsinfo.pr_state) { #elif defined(solaris2) -@@ -906,9 +918,17 @@ - proc_buf->p_stime*100; +@@ -948,9 +960,17 @@ + long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; #endif #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 @@ -47,17 +47,17 @@ + proc_table[LowProcIndex].ki_paddr->p_iticks; */ + long_return = 0; +#else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + - proc_table[LowProcIndex].kp_proc.p_sticks + - proc_table[LowProcIndex].kp_proc.p_iticks; + long_return = proc_table[LowProcIndex].kp_proc.p_uticks + + proc_table[LowProcIndex].kp_proc.p_sticks + + proc_table[LowProcIndex].kp_proc.p_iticks; +#endif #elif defined(linux) - sprintf( string, "/proc/%d/stat", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -976,6 +996,13 @@ - #elif HAVE_KVM_GETPROCS + sprintf(string, "/proc/%d/stat", pid); + if ((fp = fopen(string, "r")) == NULL) +@@ -1022,6 +1042,13 @@ #if defined(freebsd3) && !defined(darwin) - long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size/1024; + long_return = + proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024; +#elif defined(freebsd5) && __FreeBSD_version >= 500014 + /* XXX + long_return = proc_table[LowProcIndex].ki_vmspace->vm_tsize + @@ -66,19 +66,19 @@ + long_return = long_return * (getpagesize() / 1024); */ + long_return = 0; #else - long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize + - proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize + -@@ -1237,8 +1264,13 @@ + long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize + + proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize + +@@ -1299,8 +1326,13 @@ #elif defined(solaris2) - return proc_table[current_proc_entry++]; + return proc_table[current_proc_entry++]; #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + if ( proc_table[current_proc_entry].ki_stat != 0 ) + return proc_table[current_proc_entry++].ki_pid; +#else - if ( proc_table[current_proc_entry].kp_proc.p_stat != 0 ) - return proc_table[current_proc_entry++].kp_proc.p_pid; + if (proc_table[current_proc_entry].kp_proc.p_stat != 0) + return proc_table[current_proc_entry++].kp_proc.p_pid; +#endif #else - if ( proc_table[current_proc_entry].p_stat != 0 ) - return proc_table[current_proc_entry++].p_pid; + if (proc_table[current_proc_entry].p_stat != 0) + return proc_table[current_proc_entry++].p_pid; diff --git a/net-mgmt/net-snmp-devel/files/patch-local:Makefile.in b/net-mgmt/net-snmp-devel/files/patch-local:Makefile.in index 1028734fb5b3..7f648103d7aa 100644 --- a/net-mgmt/net-snmp-devel/files/patch-local:Makefile.in +++ b/net-mgmt/net-snmp-devel/files/patch-local:Makefile.in @@ -1,11 +1,11 @@ ---- local/Makefile.in.orig Thu Apr 4 15:04:11 2002 -+++ local/Makefile.in Thu Apr 4 15:04:17 2002 -@@ -2,7 +2,7 @@ - +--- local/Makefile.in.orig Sat Apr 20 16:30:13 2002 ++++ local/Makefile.in Wed Apr 24 01:45:55 2002 +@@ -12,7 +12,7 @@ + # local info + # SNMPCONFPATH=@SNMPCONFPATH@ - --SCRIPTS=snmpcheck tkmib mib2c snmpconf -+SCRIPTS=snmpcheck mib2c snmpconf - PERLSCRIPTS=snmpcheck tkmib fixproc ipf-mod.pl rsnmp +-PERLSCRIPTS=snmpcheck tkmib mib2c fixproc ipf-mod.pl snmpconf traptoemail ++PERLSCRIPTS=snmpcheck mib2c fixproc ipf-mod.pl snmpconf traptoemail SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \ - ipf-mod.pl.made rsnmp.made snmpconf.made + ipf-mod.pl.made snmpconf.made traptoemail.made + PERLPROG=@PERLPROG@ diff --git a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c b/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c index e06a3266f224..8ddf778aea0d 100644 --- a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c +++ b/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c @@ -1,11 +1,11 @@ ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Mon Sep 17 06:16:16 2001 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Mon Mar 4 10:00:56 2002 -@@ -232,7 +232,7 @@ - size_t total_size = sizeof (total); - int total_mib[] = { CTL_VM, VM_METER }; +--- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Sat Apr 20 16:30:08 2002 ++++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Wed Apr 24 01:49:01 2002 +@@ -274,7 +274,7 @@ + size_t total_size = sizeof(total); + int total_mib[] = { CTL_VM, VM_METER }; -- long phys_mem; -+ u_long phys_mem; - size_t phys_mem_size = sizeof(phys_mem); - int phys_mem_mib[] = { CTL_HW, HW_USERMEM }; +- long phys_mem; ++ u_long phys_mem; + size_t phys_mem_size = sizeof(phys_mem); + int phys_mem_mib[] = { CTL_HW, HW_USERMEM }; diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist index e7d031a7cbc5..f9cf36fbd736 100644 --- a/net-mgmt/net-snmp-devel/pkg-plist +++ b/net-mgmt/net-snmp-devel/pkg-plist @@ -1,5 +1,8 @@ bin/encode_keychange +bin/fixproc +bin/ipf-mod.pl bin/mib2c +bin/net-snmp-config bin/snmpbulkget bin/snmpbulkwalk bin/snmpcheck @@ -19,66 +22,148 @@ bin/snmptrap bin/snmpusm bin/snmpvacm bin/snmpwalk +bin/traptoemail etc/rc.d/snmpd.sh -include/ucd-snmp/agent_index.h -include/ucd-snmp/agent_read_config.h -include/ucd-snmp/agent_registry.h -include/ucd-snmp/agent_trap.h -include/ucd-snmp/asn1.h -include/ucd-snmp/auto_nlist.h -include/ucd-snmp/callback.h -include/ucd-snmp/default_store.h -include/ucd-snmp/ds_agent.h -include/ucd-snmp/header_complex.h -include/ucd-snmp/int64.h -include/ucd-snmp/keytools.h -include/ucd-snmp/mib.h -include/ucd-snmp/mib_module_config.h -include/ucd-snmp/mibincl.h -include/ucd-snmp/parse.h -include/ucd-snmp/read_config.h -include/ucd-snmp/scapi.h -include/ucd-snmp/snmp-tc.h -include/ucd-snmp/snmp.h -include/ucd-snmp/snmp_agent.h -include/ucd-snmp/snmp_alarm.h -include/ucd-snmp/snmp_api.h -include/ucd-snmp/snmp_client.h -include/ucd-snmp/snmp_debug.h -include/ucd-snmp/snmp_impl.h -include/ucd-snmp/snmp_logging.h -include/ucd-snmp/snmp_parse_args.h -include/ucd-snmp/snmp_vars.h -include/ucd-snmp/snmpusm.h -include/ucd-snmp/snmpv3.h -include/ucd-snmp/struct.h -include/ucd-snmp/system.h -include/ucd-snmp/tools.h -include/ucd-snmp/transform_oids.h -include/ucd-snmp/ucd-snmp-agent-includes.h -include/ucd-snmp/ucd-snmp-config.h -include/ucd-snmp/ucd-snmp-includes.h -include/ucd-snmp/util_funcs.h -include/ucd-snmp/var_struct.h -include/ucd-snmp/version.h -@dirrm include/ucd-snmp -lib/libsnmp.a -lib/libsnmp.so -lib/libsnmp.so.%%shlib%% -lib/libucdagent.a -lib/libucdagent.so -lib/libucdagent.so.%%shlib%% -lib/libucdmibs.a -lib/libucdmibs.so -lib/libucdmibs.so.%%shlib%% +include/net-snmp/agent/agent_callbacks.h +include/net-snmp/agent/agent_handler.h +include/net-snmp/agent/agent_index.h +include/net-snmp/agent/agent_read_config.h +include/net-snmp/agent/agent_registry.h +include/net-snmp/agent/agent_trap.h +include/net-snmp/agent/all_helpers.h +include/net-snmp/agent/auto_nlist.h +include/net-snmp/agent/bulk_to_next.h +include/net-snmp/agent/debug_handler.h +include/net-snmp/agent/ds_agent.h +include/net-snmp/agent/instance.h +include/net-snmp/agent/mib_module_config.h +include/net-snmp/agent/mib_module_includes.h +include/net-snmp/agent/multiplexer.h +include/net-snmp/agent/net-snmp-agent-includes.h +include/net-snmp/agent/null.h +include/net-snmp/agent/old_api.h +include/net-snmp/agent/read_only.h +include/net-snmp/agent/serialize.h +include/net-snmp/agent/set_helper.h +include/net-snmp/agent/snmp_agent.h +include/net-snmp/agent/snmp_vars.h +include/net-snmp/agent/table.h +include/net-snmp/agent/table_array.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/var_struct.h +include/net-snmp/config_api.h +include/net-snmp/definitions.h +include/net-snmp/library/README +include/net-snmp/library/asn1.h +include/net-snmp/library/callback.h +include/net-snmp/library/check_varbind.h +include/net-snmp/library/cmu_compat.h +include/net-snmp/library/data_list.h +include/net-snmp/library/default_store.h +include/net-snmp/library/getopt.h +include/net-snmp/library/int64.h +include/net-snmp/library/keytools.h +include/net-snmp/library/lcd_time.h +include/net-snmp/library/md5.h +include/net-snmp/library/mib.h +include/net-snmp/library/mt_support.h +include/net-snmp/library/oid_array.h +include/net-snmp/library/oid_stash.h +include/net-snmp/library/parse.h +include/net-snmp/library/read_config.h +include/net-snmp/library/scapi.h +include/net-snmp/library/snmp-tc.h +include/net-snmp/library/snmp.h +include/net-snmp/library/snmpCallbackDomain.h +include/net-snmp/library/snmpTCPDomain.h +include/net-snmp/library/snmpUDPDomain.h +include/net-snmp/library/snmpUnixDomain.h +include/net-snmp/library/snmp_alarm.h +include/net-snmp/library/snmp_api.h +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 +include/net-snmp/library/snmp_transport.h +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/tools.h +include/net-snmp/library/transform_oids.h +include/net-snmp/library/ucd_compat.h +include/net-snmp/library/vacm.h +include/net-snmp/library/winservice.h +include/net-snmp/machine/generic.h +include/net-snmp/mib_api.h +include/net-snmp/net-snmp-config.h +include/net-snmp/net-snmp-includes.h +include/net-snmp/output_api.h +include/net-snmp/pdu_api.h +include/net-snmp/session_api.h +include/net-snmp/snmpv3_api.h +include/net-snmp/system/aix.h +include/net-snmp/system/bsd.h +include/net-snmp/system/bsdi.h +include/net-snmp/system/bsdi3.h +include/net-snmp/system/bsdi4.h +include/net-snmp/system/cygwin.h +include/net-snmp/system/darwin.h +include/net-snmp/system/dynix.h +include/net-snmp/system/freebsd.h +include/net-snmp/system/freebsd2.h +include/net-snmp/system/freebsd3.h +include/net-snmp/system/freebsd4.h +include/net-snmp/system/generic.h +include/net-snmp/system/hpux.h +include/net-snmp/system/irix.h +include/net-snmp/system/linux.h +include/net-snmp/system/mips.h +include/net-snmp/system/netbsd.h +include/net-snmp/system/openbsd.h +include/net-snmp/system/solaris.h +include/net-snmp/system/solaris2.6.h +include/net-snmp/system/solaris2.7.h +include/net-snmp/system/solaris2.8.h +include/net-snmp/system/sunos.h +include/net-snmp/system/svr5.h +include/net-snmp/system/sysv.h +include/net-snmp/system/ultrix4.h +include/net-snmp/types.h +include/net-snmp/utilities.h +include/net-snmp/varbind_api.h +include/net-snmp/version.h +@dirrm include/net-snmp/agent +@dirrm include/net-snmp/library +@dirrm include/net-snmp/machine +@dirrm include/net-snmp/system +@dirrm include/net-snmp +lib/libnetsnmp.a +lib/libnetsnmp.so +lib/libnetsnmp.so.%%shlib%% +lib/libnetsnmpagent.a +lib/libnetsnmpagent.so +lib/libnetsnmpagent.so.%%shlib%% +lib/libnetsnmphelpers.a +lib/libnetsnmphelpers.so +lib/libnetsnmphelpers.so.%%shlib%% +lib/libnetsnmpmibs.a +lib/libnetsnmpmibs.so +lib/libnetsnmpmibs.so.%%shlib%% sbin/snmpd sbin/snmptrapd -share/examples/ucd-snmp/EXAMPLE.conf -share/examples/ucd-snmp/ucdDemoPublic.conf -@dirrm share/examples/ucd-snmp +share/snmp/mib2c.array-user.conf +share/snmp/mib2c.column_defines.conf +share/snmp/mib2c.column_enums.conf share/snmp/mib2c.conf -share/snmp/mib2c.storage.conf -share/snmp/mib2c.vartypes.conf +share/snmp/mib2c.create-dataset.conf +share/snmp/mib2c.iterate.conf share/snmp/mibs/AGENTX-MIB.txt share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt share/snmp/mibs/DISMAN-SCRIPT-MIB.txt @@ -92,16 +177,20 @@ share/snmp/mibs/IANAifType-MIB.txt share/snmp/mibs/IF-INVERTED-STACK-MIB.txt share/snmp/mibs/IF-MIB.txt share/snmp/mibs/INET-ADDRESS-MIB.txt -share/snmp/mibs/IP-MIB.txt share/snmp/mibs/IP-FORWARD-MIB.txt +share/snmp/mibs/IP-MIB.txt share/snmp/mibs/IPV6-ICMP-MIB.txt share/snmp/mibs/IPV6-MIB.txt share/snmp/mibs/IPV6-TC.txt share/snmp/mibs/IPV6-TCP-MIB.txt share/snmp/mibs/IPV6-UDP-MIB.txt +share/snmp/mibs/NET-SNMP-AGENT-MIB.txt +share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt +share/snmp/mibs/NET-SNMP-MIB.txt +share/snmp/mibs/NOTIFICATION-LOG-MIB.txt +share/snmp/mibs/RFC-1215.txt share/snmp/mibs/RFC1155-SMI.txt share/snmp/mibs/RFC1213-MIB.txt -share/snmp/mibs/RFC-1215.txt share/snmp/mibs/RMON-MIB.txt share/snmp/mibs/SMUX-MIB.txt share/snmp/mibs/SNMP-COMMUNITY-MIB.txt @@ -124,23 +213,25 @@ share/snmp/mibs/UCD-DLMOD-MIB.txt share/snmp/mibs/UCD-IPFWACC-MIB.txt share/snmp/mibs/UCD-SNMP-MIB.txt share/snmp/mibs/UDP-MIB.txt -share/snmp/snmpconf/snmp.conf/authopts -share/snmp/snmpconf/snmp.conf/debugging -share/snmp/snmpconf/snmp.conf/mibs -share/snmp/snmpconf/snmp.conf/output -share/snmp/snmpconf/snmpd.conf/acl -share/snmp/snmpconf/snmpd.conf/basic_setup -share/snmp/snmpconf/snmpd.conf/extending -share/snmp/snmpconf/snmpd.conf/monitor -share/snmp/snmpconf/snmpd.conf/operation -share/snmp/snmpconf/snmpd.conf/system -share/snmp/snmpconf/snmpd.conf/trapsinks -share/snmp/snmpconf/snmptrapd.conf/formatting -share/snmp/snmpconf/snmptrapd.conf/traphandle -@unexec rm -f %D/share/snmp/mibs/.index +share/snmp/snmpconf-data/snmp-data/authopts +share/snmp/snmpconf-data/snmp-data/debugging +share/snmp/snmpconf-data/snmp-data/mibs +share/snmp/snmpconf-data/snmp-data/output +share/snmp/snmpconf-data/snmp-data/snmpconf-config +share/snmp/snmpconf-data/snmpd-data/acl +share/snmp/snmpconf-data/snmpd-data/basic_setup +share/snmp/snmpconf-data/snmpd-data/extending +share/snmp/snmpconf-data/snmpd-data/monitor +share/snmp/snmpconf-data/snmpd-data/operation +share/snmp/snmpconf-data/snmpd-data/snmpconf-config +share/snmp/snmpconf-data/snmpd-data/system +share/snmp/snmpconf-data/snmpd-data/trapsinks +share/snmp/snmpconf-data/snmptrapd-data/formatting +share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config +share/snmp/snmpconf-data/snmptrapd-data/traphandle +@dirrm share/snmp/snmpconf-data/snmp-data +@dirrm share/snmp/snmpconf-data/snmpd-data +@dirrm share/snmp/snmpconf-data/snmptrapd-data +@dirrm share/snmp/snmpconf-data @dirrm share/snmp/mibs -@dirrm share/snmp/snmpconf/snmp.conf -@dirrm share/snmp/snmpconf/snmpd.conf -@dirrm share/snmp/snmpconf/snmptrapd.conf -@dirrm share/snmp/snmpconf @unexec rmdir %D/share/snmp 2>/dev/null || true diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index 706675e545fe..3bba6ce1a30c 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -5,11 +5,10 @@ # $FreeBSD$ # -PORTNAME= ucd-snmp -PORTVERSION= 4.2.5 +PORTNAME= net-snmp +PORTVERSION= 5.0.1 CATEGORIES= net ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - ftp://ucd-snmp.ucdavis.edu/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ ftp://ftp.win.ne.jp/pub/network/snmp/ucd-snmp/ MASTER_SITE_SUBDIR= net-snmp @@ -20,6 +19,7 @@ USE_AUTOCONF_VER=213 USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore +NO_LATEST_LINK= yes CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host ucd-snmp/diskio" \ --with-gnu-ld --with-libwrap --with-libs="-ldevstat" @@ -29,12 +29,20 @@ CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where IS_INTERACTIVE= yes .endif -MAN1= snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 snmpd.1 \ +MAN1= mib2c.1 \ + snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 snmpd.1 \ snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \ snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \ snmptranslate.1 snmptrap.1 snmpusm.1 snmpwalk.1 MAN3= add_mibdir.3 add_module_replacement.3 default_store.3 \ get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \ + netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \ + netsnmp_example_scalar_int.3 netsnmp_handler.3 \ + netsnmp_instance.3 netsnmp_mib_handler_methods.3 \ + netsnmp_multiplexer.3 netsnmp_old_api.3 netsnmp_read_only.3 \ + netsnmp_serialize.3 netsnmp_table.3 netsnmp_table_array.3 \ + netsnmp_table_data.3 netsnmp_table_dataset.3 \ + netsnmp_table_iterator.3 netsnmp_todo.3 \ print_description.3 print_mib.3 print_objid.3 print_value.3 \ print_variable.3 read_all_mibs.3 read_config.3 read_mib.3 \ read_module.3 read_module_node.3 read_objid.3 shutdown_mib.3 \ @@ -64,7 +72,7 @@ STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh CONFIGURE_ARGS+= --enable-ipv6 .endif -SHLIB_VERSION= 4 +SHLIB_VERSION= 5 PLIST_SUB+= shlib=${SHLIB_VERSION} post-patch: @@ -73,11 +81,8 @@ post-patch: post-install: @( cd ${PREFIX}/bin && strip ${BIN} ) @( cd ${PREFIX}/sbin && strip ${SBIN} ) - @( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * ) + @( cd ${PREFIX}/include/net-snmp && ${CHMOD} 644 * ) @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) - @${MKDIR} ${PREFIX}/share/examples/ucd-snmp - @for F in ${WRKSRC}/EXAMPLE.conf ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \ - ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done @if [ ! -f ${STARTUP_FILE} ]; then \ ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/snmpd.sh.sample ${STARTUP_FILE}; \ diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo index 62f49e72ff53..afe0c1b1309e 100644 --- a/net-mgmt/net-snmp/distinfo +++ b/net-mgmt/net-snmp/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-4.2.5.tar.gz) = 615e0b1e760cbb8c63b5392fe2d04b14 +MD5 (net-snmp-5.0.1.tar.gz) = f209cff622b4ffee830d54b68985d859 diff --git a/net-mgmt/net-snmp/files/patch-Makefile.top b/net-mgmt/net-snmp/files/patch-Makefile.top index e6077bc203ef..7bb0b8a79ac8 100644 --- a/net-mgmt/net-snmp/files/patch-Makefile.top +++ b/net-mgmt/net-snmp/files/patch-Makefile.top @@ -1,11 +1,11 @@ ---- Makefile.top.orig Sat Feb 16 10:00:19 2002 -+++ Makefile.top Sat Feb 16 23:31:00 2002 -@@ -52,7 +52,7 @@ - # Misc Compiling Stuff - CC = @CC@ - # version number is prefixed by a 0 for a better shared library version number --LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) $(SHVFLAGS) -o -+LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(VERSION).0 -version-info 4 -o +--- Makefile.top.orig Sat Apr 20 16:29:56 2002 ++++ Makefile.top Tue Apr 23 08:53:54 2002 +@@ -60,7 +60,7 @@ + # generally, LIBCURRENT should stay the same unless major changes occur. + # Increment REVISION every release. + # Increment AGE if new stuff is available. +-LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o ++LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(LIBCURRENT) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o LIB_EXTENSION = la LIB_VERSION = LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir) diff --git a/net-mgmt/net-snmp/files/patch-ak b/net-mgmt/net-snmp/files/patch-ak deleted file mode 100644 index 8a9d310cd7a0..000000000000 --- a/net-mgmt/net-snmp/files/patch-ak +++ /dev/null @@ -1,21 +0,0 @@ ---- agent/Makefile.in.orig Sun Nov 19 12:58:06 2000 -+++ agent/Makefile.in Wed Jan 17 18:37:02 2001 -@@ -68,10 +68,18 @@ - - libucdagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) - $(LIB_LD_CMD) libucdagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS) -+ ld -Bshareable -soname libucdagent.$(LIB_EXTENSION)$(LIB_VERSION) \ -+ -o libucdagent.so ${LIBAGENTOBJS} -+ ln -f libucdagent.so \ -+ ../libucdagent.so.4 - $(RANLIB) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) - - libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} - $(LIB_LD_CMD) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) -+ ld -Bshareable -soname libucdmibs.so.4 \ -+ -o libucdmibs.so ${MIBOBJS} -+ ln -f libucdmibs.so \ -+ ../libucdmibs.so.4 - $(RANLIB) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) - - clean: diff --git a/net-mgmt/net-snmp/files/patch-hr_disk.c b/net-mgmt/net-snmp/files/patch-hr_disk.c index b4f2c66a92f8..4afa759aafa6 100644 --- a/net-mgmt/net-snmp/files/patch-hr_disk.c +++ b/net-mgmt/net-snmp/files/patch-hr_disk.c @@ -1,11 +1,12 @@ ---- agent/mibgroup/host/hr_disk.c.orig Tue Feb 26 01:57:26 2002 -+++ agent/mibgroup/host/hr_disk.c Fri Mar 29 16:06:29 2002 -@@ -185,7 +185,7 @@ - #elif defined(solaris2) - Add_HR_Disk_entry ( "/dev/rdsk/c%dt%dd0s%d", 0, 1, 0, 15, "/dev/rdsk/c%dt%dd0s0", 0, 7 ); - Add_HR_Disk_entry ( "/dev/rdsk/c%dd%ds%d", 0, 1, 0, 15, "/dev/rdsk/c%dd%ds0", 0, 7 ); --#elif defined(freebsd4) +--- agent/mibgroup/host/hr_disk.c.orig Sat Apr 20 16:30:03 2002 ++++ agent/mibgroup/host/hr_disk.c Wed Apr 24 01:33:15 2002 +@@ -185,6 +185,9 @@ + "/dev/rdsk/c%dt%dd0s0", 0, 7); + Add_HR_Disk_entry("/dev/rdsk/c%dd%ds%d", 0, 1, 0, 15, + "/dev/rdsk/c%dd%ds0", 0, 7); +#elif defined(__FreeBSD__) && __FreeBSD__ >= 4 - Add_HR_Disk_entry ( "/dev/ad%ds%d%c", 0, 1, 1, 4, "/dev/ad%ds%d", 'a', 'h'); - Add_HR_Disk_entry ( "/dev/da%ds%d%c", 0, 1, 1, 4, "/dev/da%ds%d", 'a', 'h'); ++ Add_HR_Disk_entry("/dev/ad%ds%d%c", 0, 1, 1, 4, "/dev/ad%ds%d", 'a', 'h'); ++ Add_HR_Disk_entry("/dev/da%ds%d%c", 0, 1, 1, 4, "/dev/da%ds%d", 'a', 'h'); #elif defined(freebsd3) + Add_HR_Disk_entry("/dev/wd%ds%d%c", 0, 1, 1, 4, "/dev/wd%ds%d", 'a', + 'h'); diff --git a/net-mgmt/net-snmp/files/patch-hr_storage.c b/net-mgmt/net-snmp/files/patch-hr_storage.c index 0c5381602966..3656d5a3a3d1 100644 --- a/net-mgmt/net-snmp/files/patch-hr_storage.c +++ b/net-mgmt/net-snmp/files/patch-hr_storage.c @@ -1,11 +1,11 @@ ---- agent/mibgroup/host/hr_storage.c.orig Fri Feb 8 19:42:25 2002 -+++ agent/mibgroup/host/hr_storage.c Sat Feb 16 23:37:31 2002 -@@ -583,7 +583,15 @@ - for (i = 0; i < sizeof(mbstat.m_mtypes)/sizeof(mbstat.m_mtypes[0]); i++) - long_return += mbstat.m_mtypes[i]; +--- agent/mibgroup/host/hr_storage.c.orig Sat Apr 20 16:30:03 2002 ++++ agent/mibgroup/host/hr_storage.c Wed Apr 24 01:37:29 2002 +@@ -604,7 +604,15 @@ + i++) + long_return += mbstat.m_mtypes[i]; #elif defined(MBSTAT_SYMBOL) +#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_mbufs; + long_return = mbstat.m_mbufs; +#elif __FreeBSD_version < 500024 + /* mbuf stats disabled */ + return NULL; @@ -14,14 +14,14 @@ + return NULL; +#endif #elif defined(NO_DUMMY_VALUES) - return NULL; + return NULL; #else -@@ -634,7 +642,15 @@ - + (mclpool.pr_nget - mclpool.pr_nput) - * mclpool.pr_size; +@@ -654,7 +662,15 @@ + * mbpool.pr_size + (mclpool.pr_nget - mclpool.pr_nput) + * mclpool.pr_size; #elif defined(MBSTAT_SYMBOL) +#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ + long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ +#elif __FreeBSD_version < 500024 + /* mbuf stats disabled */ + return NULL; @@ -30,5 +30,5 @@ + return NULL; +#endif #elif defined(NO_DUMMY_VALUES) - return NULL; + return NULL; #else diff --git a/net-mgmt/net-snmp/files/patch-hr_swrun.c b/net-mgmt/net-snmp/files/patch-hr_swrun.c index c232386f873e..a2afd1c61cf3 100644 --- a/net-mgmt/net-snmp/files/patch-hr_swrun.c +++ b/net-mgmt/net-snmp/files/patch-hr_swrun.c @@ -1,43 +1,43 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Sat Feb 16 09:41:19 2002 -+++ agent/mibgroup/host/hr_swrun.c Sat Feb 16 23:41:05 2002 -@@ -543,7 +543,11 @@ - strcpy(string, proc_buf->p_user.u_comm); +--- agent/mibgroup/host/hr_swrun.c.orig Sat Apr 20 16:30:03 2002 ++++ agent/mibgroup/host/hr_swrun.c Wed Apr 24 01:43:15 2002 +@@ -557,7 +557,11 @@ + strcpy(string, proc_buf->p_user.u_comm); #endif #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + strcpy(string, proc_table[LowProcIndex].ki_comm); +#else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); + strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); +#endif #elif defined(linux) - sprintf( string, "/proc/%d/status", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -638,7 +642,11 @@ - *cp1 = 0; + sprintf(string, "/proc/%d/status", pid); + if ((fp = fopen(string, "r")) == NULL) +@@ -662,7 +666,11 @@ + *cp1 = 0; #endif #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + strcpy(string, proc_table[LowProcIndex].ki_comm); +#else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); + strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); +#endif #elif defined(linux) - sprintf( string, "/proc/%d/cmdline", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -810,7 +818,11 @@ - } + sprintf(string, "/proc/%d/cmdline", pid); + if ((fp = fopen(string, "r")) == NULL) +@@ -853,7 +861,11 @@ + } #else #if HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + switch ( proc_table[LowProcIndex].ki_stat ) { +#else - switch ( proc_table[LowProcIndex].kp_proc.p_stat ) { + switch (proc_table[LowProcIndex].kp_proc.p_stat) { +#endif #elif defined(dynix) - switch ( lowpsinfo.pr_state ) { + switch (lowpsinfo.pr_state) { #elif defined(solaris2) -@@ -906,9 +918,17 @@ - proc_buf->p_stime*100; +@@ -948,9 +960,17 @@ + long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; #endif #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 @@ -47,17 +47,17 @@ + proc_table[LowProcIndex].ki_paddr->p_iticks; */ + long_return = 0; +#else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + - proc_table[LowProcIndex].kp_proc.p_sticks + - proc_table[LowProcIndex].kp_proc.p_iticks; + long_return = proc_table[LowProcIndex].kp_proc.p_uticks + + proc_table[LowProcIndex].kp_proc.p_sticks + + proc_table[LowProcIndex].kp_proc.p_iticks; +#endif #elif defined(linux) - sprintf( string, "/proc/%d/stat", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -976,6 +996,13 @@ - #elif HAVE_KVM_GETPROCS + sprintf(string, "/proc/%d/stat", pid); + if ((fp = fopen(string, "r")) == NULL) +@@ -1022,6 +1042,13 @@ #if defined(freebsd3) && !defined(darwin) - long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size/1024; + long_return = + proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024; +#elif defined(freebsd5) && __FreeBSD_version >= 500014 + /* XXX + long_return = proc_table[LowProcIndex].ki_vmspace->vm_tsize + @@ -66,19 +66,19 @@ + long_return = long_return * (getpagesize() / 1024); */ + long_return = 0; #else - long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize + - proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize + -@@ -1237,8 +1264,13 @@ + long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize + + proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize + +@@ -1299,8 +1326,13 @@ #elif defined(solaris2) - return proc_table[current_proc_entry++]; + return proc_table[current_proc_entry++]; #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + if ( proc_table[current_proc_entry].ki_stat != 0 ) + return proc_table[current_proc_entry++].ki_pid; +#else - if ( proc_table[current_proc_entry].kp_proc.p_stat != 0 ) - return proc_table[current_proc_entry++].kp_proc.p_pid; + if (proc_table[current_proc_entry].kp_proc.p_stat != 0) + return proc_table[current_proc_entry++].kp_proc.p_pid; +#endif #else - if ( proc_table[current_proc_entry].p_stat != 0 ) - return proc_table[current_proc_entry++].p_pid; + if (proc_table[current_proc_entry].p_stat != 0) + return proc_table[current_proc_entry++].p_pid; diff --git a/net-mgmt/net-snmp/files/patch-local:Makefile.in b/net-mgmt/net-snmp/files/patch-local:Makefile.in index 1028734fb5b3..7f648103d7aa 100644 --- a/net-mgmt/net-snmp/files/patch-local:Makefile.in +++ b/net-mgmt/net-snmp/files/patch-local:Makefile.in @@ -1,11 +1,11 @@ ---- local/Makefile.in.orig Thu Apr 4 15:04:11 2002 -+++ local/Makefile.in Thu Apr 4 15:04:17 2002 -@@ -2,7 +2,7 @@ - +--- local/Makefile.in.orig Sat Apr 20 16:30:13 2002 ++++ local/Makefile.in Wed Apr 24 01:45:55 2002 +@@ -12,7 +12,7 @@ + # local info + # SNMPCONFPATH=@SNMPCONFPATH@ - --SCRIPTS=snmpcheck tkmib mib2c snmpconf -+SCRIPTS=snmpcheck mib2c snmpconf - PERLSCRIPTS=snmpcheck tkmib fixproc ipf-mod.pl rsnmp +-PERLSCRIPTS=snmpcheck tkmib mib2c fixproc ipf-mod.pl snmpconf traptoemail ++PERLSCRIPTS=snmpcheck mib2c fixproc ipf-mod.pl snmpconf traptoemail SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \ - ipf-mod.pl.made rsnmp.made snmpconf.made + ipf-mod.pl.made snmpconf.made traptoemail.made + PERLPROG=@PERLPROG@ diff --git a/net-mgmt/net-snmp/files/patch-memory_freebsd2.c b/net-mgmt/net-snmp/files/patch-memory_freebsd2.c index e06a3266f224..8ddf778aea0d 100644 --- a/net-mgmt/net-snmp/files/patch-memory_freebsd2.c +++ b/net-mgmt/net-snmp/files/patch-memory_freebsd2.c @@ -1,11 +1,11 @@ ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Mon Sep 17 06:16:16 2001 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Mon Mar 4 10:00:56 2002 -@@ -232,7 +232,7 @@ - size_t total_size = sizeof (total); - int total_mib[] = { CTL_VM, VM_METER }; +--- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Sat Apr 20 16:30:08 2002 ++++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Wed Apr 24 01:49:01 2002 +@@ -274,7 +274,7 @@ + size_t total_size = sizeof(total); + int total_mib[] = { CTL_VM, VM_METER }; -- long phys_mem; -+ u_long phys_mem; - size_t phys_mem_size = sizeof(phys_mem); - int phys_mem_mib[] = { CTL_HW, HW_USERMEM }; +- long phys_mem; ++ u_long phys_mem; + size_t phys_mem_size = sizeof(phys_mem); + int phys_mem_mib[] = { CTL_HW, HW_USERMEM }; diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist index e7d031a7cbc5..f9cf36fbd736 100644 --- a/net-mgmt/net-snmp/pkg-plist +++ b/net-mgmt/net-snmp/pkg-plist @@ -1,5 +1,8 @@ bin/encode_keychange +bin/fixproc +bin/ipf-mod.pl bin/mib2c +bin/net-snmp-config bin/snmpbulkget bin/snmpbulkwalk bin/snmpcheck @@ -19,66 +22,148 @@ bin/snmptrap bin/snmpusm bin/snmpvacm bin/snmpwalk +bin/traptoemail etc/rc.d/snmpd.sh -include/ucd-snmp/agent_index.h -include/ucd-snmp/agent_read_config.h -include/ucd-snmp/agent_registry.h -include/ucd-snmp/agent_trap.h -include/ucd-snmp/asn1.h -include/ucd-snmp/auto_nlist.h -include/ucd-snmp/callback.h -include/ucd-snmp/default_store.h -include/ucd-snmp/ds_agent.h -include/ucd-snmp/header_complex.h -include/ucd-snmp/int64.h -include/ucd-snmp/keytools.h -include/ucd-snmp/mib.h -include/ucd-snmp/mib_module_config.h -include/ucd-snmp/mibincl.h -include/ucd-snmp/parse.h -include/ucd-snmp/read_config.h -include/ucd-snmp/scapi.h -include/ucd-snmp/snmp-tc.h -include/ucd-snmp/snmp.h -include/ucd-snmp/snmp_agent.h -include/ucd-snmp/snmp_alarm.h -include/ucd-snmp/snmp_api.h -include/ucd-snmp/snmp_client.h -include/ucd-snmp/snmp_debug.h -include/ucd-snmp/snmp_impl.h -include/ucd-snmp/snmp_logging.h -include/ucd-snmp/snmp_parse_args.h -include/ucd-snmp/snmp_vars.h -include/ucd-snmp/snmpusm.h -include/ucd-snmp/snmpv3.h -include/ucd-snmp/struct.h -include/ucd-snmp/system.h -include/ucd-snmp/tools.h -include/ucd-snmp/transform_oids.h -include/ucd-snmp/ucd-snmp-agent-includes.h -include/ucd-snmp/ucd-snmp-config.h -include/ucd-snmp/ucd-snmp-includes.h -include/ucd-snmp/util_funcs.h -include/ucd-snmp/var_struct.h -include/ucd-snmp/version.h -@dirrm include/ucd-snmp -lib/libsnmp.a -lib/libsnmp.so -lib/libsnmp.so.%%shlib%% -lib/libucdagent.a -lib/libucdagent.so -lib/libucdagent.so.%%shlib%% -lib/libucdmibs.a -lib/libucdmibs.so -lib/libucdmibs.so.%%shlib%% +include/net-snmp/agent/agent_callbacks.h +include/net-snmp/agent/agent_handler.h +include/net-snmp/agent/agent_index.h +include/net-snmp/agent/agent_read_config.h +include/net-snmp/agent/agent_registry.h +include/net-snmp/agent/agent_trap.h +include/net-snmp/agent/all_helpers.h +include/net-snmp/agent/auto_nlist.h +include/net-snmp/agent/bulk_to_next.h +include/net-snmp/agent/debug_handler.h +include/net-snmp/agent/ds_agent.h +include/net-snmp/agent/instance.h +include/net-snmp/agent/mib_module_config.h +include/net-snmp/agent/mib_module_includes.h +include/net-snmp/agent/multiplexer.h +include/net-snmp/agent/net-snmp-agent-includes.h +include/net-snmp/agent/null.h +include/net-snmp/agent/old_api.h +include/net-snmp/agent/read_only.h +include/net-snmp/agent/serialize.h +include/net-snmp/agent/set_helper.h +include/net-snmp/agent/snmp_agent.h +include/net-snmp/agent/snmp_vars.h +include/net-snmp/agent/table.h +include/net-snmp/agent/table_array.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/var_struct.h +include/net-snmp/config_api.h +include/net-snmp/definitions.h +include/net-snmp/library/README +include/net-snmp/library/asn1.h +include/net-snmp/library/callback.h +include/net-snmp/library/check_varbind.h +include/net-snmp/library/cmu_compat.h +include/net-snmp/library/data_list.h +include/net-snmp/library/default_store.h +include/net-snmp/library/getopt.h +include/net-snmp/library/int64.h +include/net-snmp/library/keytools.h +include/net-snmp/library/lcd_time.h +include/net-snmp/library/md5.h +include/net-snmp/library/mib.h +include/net-snmp/library/mt_support.h +include/net-snmp/library/oid_array.h +include/net-snmp/library/oid_stash.h +include/net-snmp/library/parse.h +include/net-snmp/library/read_config.h +include/net-snmp/library/scapi.h +include/net-snmp/library/snmp-tc.h +include/net-snmp/library/snmp.h +include/net-snmp/library/snmpCallbackDomain.h +include/net-snmp/library/snmpTCPDomain.h +include/net-snmp/library/snmpUDPDomain.h +include/net-snmp/library/snmpUnixDomain.h +include/net-snmp/library/snmp_alarm.h +include/net-snmp/library/snmp_api.h +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 +include/net-snmp/library/snmp_transport.h +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/tools.h +include/net-snmp/library/transform_oids.h +include/net-snmp/library/ucd_compat.h +include/net-snmp/library/vacm.h +include/net-snmp/library/winservice.h +include/net-snmp/machine/generic.h +include/net-snmp/mib_api.h +include/net-snmp/net-snmp-config.h +include/net-snmp/net-snmp-includes.h +include/net-snmp/output_api.h +include/net-snmp/pdu_api.h +include/net-snmp/session_api.h +include/net-snmp/snmpv3_api.h +include/net-snmp/system/aix.h +include/net-snmp/system/bsd.h +include/net-snmp/system/bsdi.h +include/net-snmp/system/bsdi3.h +include/net-snmp/system/bsdi4.h +include/net-snmp/system/cygwin.h +include/net-snmp/system/darwin.h +include/net-snmp/system/dynix.h +include/net-snmp/system/freebsd.h +include/net-snmp/system/freebsd2.h +include/net-snmp/system/freebsd3.h +include/net-snmp/system/freebsd4.h +include/net-snmp/system/generic.h +include/net-snmp/system/hpux.h +include/net-snmp/system/irix.h +include/net-snmp/system/linux.h +include/net-snmp/system/mips.h +include/net-snmp/system/netbsd.h +include/net-snmp/system/openbsd.h +include/net-snmp/system/solaris.h +include/net-snmp/system/solaris2.6.h +include/net-snmp/system/solaris2.7.h +include/net-snmp/system/solaris2.8.h +include/net-snmp/system/sunos.h +include/net-snmp/system/svr5.h +include/net-snmp/system/sysv.h +include/net-snmp/system/ultrix4.h +include/net-snmp/types.h +include/net-snmp/utilities.h +include/net-snmp/varbind_api.h +include/net-snmp/version.h +@dirrm include/net-snmp/agent +@dirrm include/net-snmp/library +@dirrm include/net-snmp/machine +@dirrm include/net-snmp/system +@dirrm include/net-snmp +lib/libnetsnmp.a +lib/libnetsnmp.so +lib/libnetsnmp.so.%%shlib%% +lib/libnetsnmpagent.a +lib/libnetsnmpagent.so +lib/libnetsnmpagent.so.%%shlib%% +lib/libnetsnmphelpers.a +lib/libnetsnmphelpers.so +lib/libnetsnmphelpers.so.%%shlib%% +lib/libnetsnmpmibs.a +lib/libnetsnmpmibs.so +lib/libnetsnmpmibs.so.%%shlib%% sbin/snmpd sbin/snmptrapd -share/examples/ucd-snmp/EXAMPLE.conf -share/examples/ucd-snmp/ucdDemoPublic.conf -@dirrm share/examples/ucd-snmp +share/snmp/mib2c.array-user.conf +share/snmp/mib2c.column_defines.conf +share/snmp/mib2c.column_enums.conf share/snmp/mib2c.conf -share/snmp/mib2c.storage.conf -share/snmp/mib2c.vartypes.conf +share/snmp/mib2c.create-dataset.conf +share/snmp/mib2c.iterate.conf share/snmp/mibs/AGENTX-MIB.txt share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt share/snmp/mibs/DISMAN-SCRIPT-MIB.txt @@ -92,16 +177,20 @@ share/snmp/mibs/IANAifType-MIB.txt share/snmp/mibs/IF-INVERTED-STACK-MIB.txt share/snmp/mibs/IF-MIB.txt share/snmp/mibs/INET-ADDRESS-MIB.txt -share/snmp/mibs/IP-MIB.txt share/snmp/mibs/IP-FORWARD-MIB.txt +share/snmp/mibs/IP-MIB.txt share/snmp/mibs/IPV6-ICMP-MIB.txt share/snmp/mibs/IPV6-MIB.txt share/snmp/mibs/IPV6-TC.txt share/snmp/mibs/IPV6-TCP-MIB.txt share/snmp/mibs/IPV6-UDP-MIB.txt +share/snmp/mibs/NET-SNMP-AGENT-MIB.txt +share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt +share/snmp/mibs/NET-SNMP-MIB.txt +share/snmp/mibs/NOTIFICATION-LOG-MIB.txt +share/snmp/mibs/RFC-1215.txt share/snmp/mibs/RFC1155-SMI.txt share/snmp/mibs/RFC1213-MIB.txt -share/snmp/mibs/RFC-1215.txt share/snmp/mibs/RMON-MIB.txt share/snmp/mibs/SMUX-MIB.txt share/snmp/mibs/SNMP-COMMUNITY-MIB.txt @@ -124,23 +213,25 @@ share/snmp/mibs/UCD-DLMOD-MIB.txt share/snmp/mibs/UCD-IPFWACC-MIB.txt share/snmp/mibs/UCD-SNMP-MIB.txt share/snmp/mibs/UDP-MIB.txt -share/snmp/snmpconf/snmp.conf/authopts -share/snmp/snmpconf/snmp.conf/debugging -share/snmp/snmpconf/snmp.conf/mibs -share/snmp/snmpconf/snmp.conf/output -share/snmp/snmpconf/snmpd.conf/acl -share/snmp/snmpconf/snmpd.conf/basic_setup -share/snmp/snmpconf/snmpd.conf/extending -share/snmp/snmpconf/snmpd.conf/monitor -share/snmp/snmpconf/snmpd.conf/operation -share/snmp/snmpconf/snmpd.conf/system -share/snmp/snmpconf/snmpd.conf/trapsinks -share/snmp/snmpconf/snmptrapd.conf/formatting -share/snmp/snmpconf/snmptrapd.conf/traphandle -@unexec rm -f %D/share/snmp/mibs/.index +share/snmp/snmpconf-data/snmp-data/authopts +share/snmp/snmpconf-data/snmp-data/debugging +share/snmp/snmpconf-data/snmp-data/mibs +share/snmp/snmpconf-data/snmp-data/output +share/snmp/snmpconf-data/snmp-data/snmpconf-config +share/snmp/snmpconf-data/snmpd-data/acl +share/snmp/snmpconf-data/snmpd-data/basic_setup +share/snmp/snmpconf-data/snmpd-data/extending +share/snmp/snmpconf-data/snmpd-data/monitor +share/snmp/snmpconf-data/snmpd-data/operation +share/snmp/snmpconf-data/snmpd-data/snmpconf-config +share/snmp/snmpconf-data/snmpd-data/system +share/snmp/snmpconf-data/snmpd-data/trapsinks +share/snmp/snmpconf-data/snmptrapd-data/formatting +share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config +share/snmp/snmpconf-data/snmptrapd-data/traphandle +@dirrm share/snmp/snmpconf-data/snmp-data +@dirrm share/snmp/snmpconf-data/snmpd-data +@dirrm share/snmp/snmpconf-data/snmptrapd-data +@dirrm share/snmp/snmpconf-data @dirrm share/snmp/mibs -@dirrm share/snmp/snmpconf/snmp.conf -@dirrm share/snmp/snmpconf/snmpd.conf -@dirrm share/snmp/snmpconf/snmptrapd.conf -@dirrm share/snmp/snmpconf @unexec rmdir %D/share/snmp 2>/dev/null || true diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile index 706675e545fe..3bba6ce1a30c 100644 --- a/net-mgmt/net-snmp53/Makefile +++ b/net-mgmt/net-snmp53/Makefile @@ -5,11 +5,10 @@ # $FreeBSD$ # -PORTNAME= ucd-snmp -PORTVERSION= 4.2.5 +PORTNAME= net-snmp +PORTVERSION= 5.0.1 CATEGORIES= net ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - ftp://ucd-snmp.ucdavis.edu/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ ftp://ftp.win.ne.jp/pub/network/snmp/ucd-snmp/ MASTER_SITE_SUBDIR= net-snmp @@ -20,6 +19,7 @@ USE_AUTOCONF_VER=213 USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore +NO_LATEST_LINK= yes CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host ucd-snmp/diskio" \ --with-gnu-ld --with-libwrap --with-libs="-ldevstat" @@ -29,12 +29,20 @@ CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where IS_INTERACTIVE= yes .endif -MAN1= snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 snmpd.1 \ +MAN1= mib2c.1 \ + snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 snmpd.1 \ snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \ snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \ snmptranslate.1 snmptrap.1 snmpusm.1 snmpwalk.1 MAN3= add_mibdir.3 add_module_replacement.3 default_store.3 \ get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \ + netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \ + netsnmp_example_scalar_int.3 netsnmp_handler.3 \ + netsnmp_instance.3 netsnmp_mib_handler_methods.3 \ + netsnmp_multiplexer.3 netsnmp_old_api.3 netsnmp_read_only.3 \ + netsnmp_serialize.3 netsnmp_table.3 netsnmp_table_array.3 \ + netsnmp_table_data.3 netsnmp_table_dataset.3 \ + netsnmp_table_iterator.3 netsnmp_todo.3 \ print_description.3 print_mib.3 print_objid.3 print_value.3 \ print_variable.3 read_all_mibs.3 read_config.3 read_mib.3 \ read_module.3 read_module_node.3 read_objid.3 shutdown_mib.3 \ @@ -64,7 +72,7 @@ STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh CONFIGURE_ARGS+= --enable-ipv6 .endif -SHLIB_VERSION= 4 +SHLIB_VERSION= 5 PLIST_SUB+= shlib=${SHLIB_VERSION} post-patch: @@ -73,11 +81,8 @@ post-patch: post-install: @( cd ${PREFIX}/bin && strip ${BIN} ) @( cd ${PREFIX}/sbin && strip ${SBIN} ) - @( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * ) + @( cd ${PREFIX}/include/net-snmp && ${CHMOD} 644 * ) @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) - @${MKDIR} ${PREFIX}/share/examples/ucd-snmp - @for F in ${WRKSRC}/EXAMPLE.conf ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \ - ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done @if [ ! -f ${STARTUP_FILE} ]; then \ ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/snmpd.sh.sample ${STARTUP_FILE}; \ diff --git a/net-mgmt/net-snmp53/distinfo b/net-mgmt/net-snmp53/distinfo index 62f49e72ff53..afe0c1b1309e 100644 --- a/net-mgmt/net-snmp53/distinfo +++ b/net-mgmt/net-snmp53/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-4.2.5.tar.gz) = 615e0b1e760cbb8c63b5392fe2d04b14 +MD5 (net-snmp-5.0.1.tar.gz) = f209cff622b4ffee830d54b68985d859 diff --git a/net-mgmt/net-snmp53/files/patch-Makefile.top b/net-mgmt/net-snmp53/files/patch-Makefile.top index e6077bc203ef..7bb0b8a79ac8 100644 --- a/net-mgmt/net-snmp53/files/patch-Makefile.top +++ b/net-mgmt/net-snmp53/files/patch-Makefile.top @@ -1,11 +1,11 @@ ---- Makefile.top.orig Sat Feb 16 10:00:19 2002 -+++ Makefile.top Sat Feb 16 23:31:00 2002 -@@ -52,7 +52,7 @@ - # Misc Compiling Stuff - CC = @CC@ - # version number is prefixed by a 0 for a better shared library version number --LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) $(SHVFLAGS) -o -+LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(VERSION).0 -version-info 4 -o +--- Makefile.top.orig Sat Apr 20 16:29:56 2002 ++++ Makefile.top Tue Apr 23 08:53:54 2002 +@@ -60,7 +60,7 @@ + # generally, LIBCURRENT should stay the same unless major changes occur. + # Increment REVISION every release. + # Increment AGE if new stuff is available. +-LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o ++LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(LIBCURRENT) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o LIB_EXTENSION = la LIB_VERSION = LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir) diff --git a/net-mgmt/net-snmp53/files/patch-ak b/net-mgmt/net-snmp53/files/patch-ak deleted file mode 100644 index 8a9d310cd7a0..000000000000 --- a/net-mgmt/net-snmp53/files/patch-ak +++ /dev/null @@ -1,21 +0,0 @@ ---- agent/Makefile.in.orig Sun Nov 19 12:58:06 2000 -+++ agent/Makefile.in Wed Jan 17 18:37:02 2001 -@@ -68,10 +68,18 @@ - - libucdagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) - $(LIB_LD_CMD) libucdagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS) -+ ld -Bshareable -soname libucdagent.$(LIB_EXTENSION)$(LIB_VERSION) \ -+ -o libucdagent.so ${LIBAGENTOBJS} -+ ln -f libucdagent.so \ -+ ../libucdagent.so.4 - $(RANLIB) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) - - libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} - $(LIB_LD_CMD) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) -+ ld -Bshareable -soname libucdmibs.so.4 \ -+ -o libucdmibs.so ${MIBOBJS} -+ ln -f libucdmibs.so \ -+ ../libucdmibs.so.4 - $(RANLIB) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) - - clean: diff --git a/net-mgmt/net-snmp53/files/patch-hr_disk.c b/net-mgmt/net-snmp53/files/patch-hr_disk.c index b4f2c66a92f8..4afa759aafa6 100644 --- a/net-mgmt/net-snmp53/files/patch-hr_disk.c +++ b/net-mgmt/net-snmp53/files/patch-hr_disk.c @@ -1,11 +1,12 @@ ---- agent/mibgroup/host/hr_disk.c.orig Tue Feb 26 01:57:26 2002 -+++ agent/mibgroup/host/hr_disk.c Fri Mar 29 16:06:29 2002 -@@ -185,7 +185,7 @@ - #elif defined(solaris2) - Add_HR_Disk_entry ( "/dev/rdsk/c%dt%dd0s%d", 0, 1, 0, 15, "/dev/rdsk/c%dt%dd0s0", 0, 7 ); - Add_HR_Disk_entry ( "/dev/rdsk/c%dd%ds%d", 0, 1, 0, 15, "/dev/rdsk/c%dd%ds0", 0, 7 ); --#elif defined(freebsd4) +--- agent/mibgroup/host/hr_disk.c.orig Sat Apr 20 16:30:03 2002 ++++ agent/mibgroup/host/hr_disk.c Wed Apr 24 01:33:15 2002 +@@ -185,6 +185,9 @@ + "/dev/rdsk/c%dt%dd0s0", 0, 7); + Add_HR_Disk_entry("/dev/rdsk/c%dd%ds%d", 0, 1, 0, 15, + "/dev/rdsk/c%dd%ds0", 0, 7); +#elif defined(__FreeBSD__) && __FreeBSD__ >= 4 - Add_HR_Disk_entry ( "/dev/ad%ds%d%c", 0, 1, 1, 4, "/dev/ad%ds%d", 'a', 'h'); - Add_HR_Disk_entry ( "/dev/da%ds%d%c", 0, 1, 1, 4, "/dev/da%ds%d", 'a', 'h'); ++ Add_HR_Disk_entry("/dev/ad%ds%d%c", 0, 1, 1, 4, "/dev/ad%ds%d", 'a', 'h'); ++ Add_HR_Disk_entry("/dev/da%ds%d%c", 0, 1, 1, 4, "/dev/da%ds%d", 'a', 'h'); #elif defined(freebsd3) + Add_HR_Disk_entry("/dev/wd%ds%d%c", 0, 1, 1, 4, "/dev/wd%ds%d", 'a', + 'h'); diff --git a/net-mgmt/net-snmp53/files/patch-hr_storage.c b/net-mgmt/net-snmp53/files/patch-hr_storage.c index 0c5381602966..3656d5a3a3d1 100644 --- a/net-mgmt/net-snmp53/files/patch-hr_storage.c +++ b/net-mgmt/net-snmp53/files/patch-hr_storage.c @@ -1,11 +1,11 @@ ---- agent/mibgroup/host/hr_storage.c.orig Fri Feb 8 19:42:25 2002 -+++ agent/mibgroup/host/hr_storage.c Sat Feb 16 23:37:31 2002 -@@ -583,7 +583,15 @@ - for (i = 0; i < sizeof(mbstat.m_mtypes)/sizeof(mbstat.m_mtypes[0]); i++) - long_return += mbstat.m_mtypes[i]; +--- agent/mibgroup/host/hr_storage.c.orig Sat Apr 20 16:30:03 2002 ++++ agent/mibgroup/host/hr_storage.c Wed Apr 24 01:37:29 2002 +@@ -604,7 +604,15 @@ + i++) + long_return += mbstat.m_mtypes[i]; #elif defined(MBSTAT_SYMBOL) +#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_mbufs; + long_return = mbstat.m_mbufs; +#elif __FreeBSD_version < 500024 + /* mbuf stats disabled */ + return NULL; @@ -14,14 +14,14 @@ + return NULL; +#endif #elif defined(NO_DUMMY_VALUES) - return NULL; + return NULL; #else -@@ -634,7 +642,15 @@ - + (mclpool.pr_nget - mclpool.pr_nput) - * mclpool.pr_size; +@@ -654,7 +662,15 @@ + * mbpool.pr_size + (mclpool.pr_nget - mclpool.pr_nput) + * mclpool.pr_size; #elif defined(MBSTAT_SYMBOL) +#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ + long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ +#elif __FreeBSD_version < 500024 + /* mbuf stats disabled */ + return NULL; @@ -30,5 +30,5 @@ + return NULL; +#endif #elif defined(NO_DUMMY_VALUES) - return NULL; + return NULL; #else diff --git a/net-mgmt/net-snmp53/files/patch-hr_swrun.c b/net-mgmt/net-snmp53/files/patch-hr_swrun.c index c232386f873e..a2afd1c61cf3 100644 --- a/net-mgmt/net-snmp53/files/patch-hr_swrun.c +++ b/net-mgmt/net-snmp53/files/patch-hr_swrun.c @@ -1,43 +1,43 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Sat Feb 16 09:41:19 2002 -+++ agent/mibgroup/host/hr_swrun.c Sat Feb 16 23:41:05 2002 -@@ -543,7 +543,11 @@ - strcpy(string, proc_buf->p_user.u_comm); +--- agent/mibgroup/host/hr_swrun.c.orig Sat Apr 20 16:30:03 2002 ++++ agent/mibgroup/host/hr_swrun.c Wed Apr 24 01:43:15 2002 +@@ -557,7 +557,11 @@ + strcpy(string, proc_buf->p_user.u_comm); #endif #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + strcpy(string, proc_table[LowProcIndex].ki_comm); +#else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); + strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); +#endif #elif defined(linux) - sprintf( string, "/proc/%d/status", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -638,7 +642,11 @@ - *cp1 = 0; + sprintf(string, "/proc/%d/status", pid); + if ((fp = fopen(string, "r")) == NULL) +@@ -662,7 +666,11 @@ + *cp1 = 0; #endif #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + strcpy(string, proc_table[LowProcIndex].ki_comm); +#else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); + strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); +#endif #elif defined(linux) - sprintf( string, "/proc/%d/cmdline", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -810,7 +818,11 @@ - } + sprintf(string, "/proc/%d/cmdline", pid); + if ((fp = fopen(string, "r")) == NULL) +@@ -853,7 +861,11 @@ + } #else #if HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + switch ( proc_table[LowProcIndex].ki_stat ) { +#else - switch ( proc_table[LowProcIndex].kp_proc.p_stat ) { + switch (proc_table[LowProcIndex].kp_proc.p_stat) { +#endif #elif defined(dynix) - switch ( lowpsinfo.pr_state ) { + switch (lowpsinfo.pr_state) { #elif defined(solaris2) -@@ -906,9 +918,17 @@ - proc_buf->p_stime*100; +@@ -948,9 +960,17 @@ + long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; #endif #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 @@ -47,17 +47,17 @@ + proc_table[LowProcIndex].ki_paddr->p_iticks; */ + long_return = 0; +#else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + - proc_table[LowProcIndex].kp_proc.p_sticks + - proc_table[LowProcIndex].kp_proc.p_iticks; + long_return = proc_table[LowProcIndex].kp_proc.p_uticks + + proc_table[LowProcIndex].kp_proc.p_sticks + + proc_table[LowProcIndex].kp_proc.p_iticks; +#endif #elif defined(linux) - sprintf( string, "/proc/%d/stat", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -976,6 +996,13 @@ - #elif HAVE_KVM_GETPROCS + sprintf(string, "/proc/%d/stat", pid); + if ((fp = fopen(string, "r")) == NULL) +@@ -1022,6 +1042,13 @@ #if defined(freebsd3) && !defined(darwin) - long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size/1024; + long_return = + proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024; +#elif defined(freebsd5) && __FreeBSD_version >= 500014 + /* XXX + long_return = proc_table[LowProcIndex].ki_vmspace->vm_tsize + @@ -66,19 +66,19 @@ + long_return = long_return * (getpagesize() / 1024); */ + long_return = 0; #else - long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize + - proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize + -@@ -1237,8 +1264,13 @@ + long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize + + proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize + +@@ -1299,8 +1326,13 @@ #elif defined(solaris2) - return proc_table[current_proc_entry++]; + return proc_table[current_proc_entry++]; #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + if ( proc_table[current_proc_entry].ki_stat != 0 ) + return proc_table[current_proc_entry++].ki_pid; +#else - if ( proc_table[current_proc_entry].kp_proc.p_stat != 0 ) - return proc_table[current_proc_entry++].kp_proc.p_pid; + if (proc_table[current_proc_entry].kp_proc.p_stat != 0) + return proc_table[current_proc_entry++].kp_proc.p_pid; +#endif #else - if ( proc_table[current_proc_entry].p_stat != 0 ) - return proc_table[current_proc_entry++].p_pid; + if (proc_table[current_proc_entry].p_stat != 0) + return proc_table[current_proc_entry++].p_pid; diff --git a/net-mgmt/net-snmp53/files/patch-local:Makefile.in b/net-mgmt/net-snmp53/files/patch-local:Makefile.in index 1028734fb5b3..7f648103d7aa 100644 --- a/net-mgmt/net-snmp53/files/patch-local:Makefile.in +++ b/net-mgmt/net-snmp53/files/patch-local:Makefile.in @@ -1,11 +1,11 @@ ---- local/Makefile.in.orig Thu Apr 4 15:04:11 2002 -+++ local/Makefile.in Thu Apr 4 15:04:17 2002 -@@ -2,7 +2,7 @@ - +--- local/Makefile.in.orig Sat Apr 20 16:30:13 2002 ++++ local/Makefile.in Wed Apr 24 01:45:55 2002 +@@ -12,7 +12,7 @@ + # local info + # SNMPCONFPATH=@SNMPCONFPATH@ - --SCRIPTS=snmpcheck tkmib mib2c snmpconf -+SCRIPTS=snmpcheck mib2c snmpconf - PERLSCRIPTS=snmpcheck tkmib fixproc ipf-mod.pl rsnmp +-PERLSCRIPTS=snmpcheck tkmib mib2c fixproc ipf-mod.pl snmpconf traptoemail ++PERLSCRIPTS=snmpcheck mib2c fixproc ipf-mod.pl snmpconf traptoemail SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \ - ipf-mod.pl.made rsnmp.made snmpconf.made + ipf-mod.pl.made snmpconf.made traptoemail.made + PERLPROG=@PERLPROG@ diff --git a/net-mgmt/net-snmp53/files/patch-memory_freebsd2.c b/net-mgmt/net-snmp53/files/patch-memory_freebsd2.c index e06a3266f224..8ddf778aea0d 100644 --- a/net-mgmt/net-snmp53/files/patch-memory_freebsd2.c +++ b/net-mgmt/net-snmp53/files/patch-memory_freebsd2.c @@ -1,11 +1,11 @@ ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Mon Sep 17 06:16:16 2001 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Mon Mar 4 10:00:56 2002 -@@ -232,7 +232,7 @@ - size_t total_size = sizeof (total); - int total_mib[] = { CTL_VM, VM_METER }; +--- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Sat Apr 20 16:30:08 2002 ++++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Wed Apr 24 01:49:01 2002 +@@ -274,7 +274,7 @@ + size_t total_size = sizeof(total); + int total_mib[] = { CTL_VM, VM_METER }; -- long phys_mem; -+ u_long phys_mem; - size_t phys_mem_size = sizeof(phys_mem); - int phys_mem_mib[] = { CTL_HW, HW_USERMEM }; +- long phys_mem; ++ u_long phys_mem; + size_t phys_mem_size = sizeof(phys_mem); + int phys_mem_mib[] = { CTL_HW, HW_USERMEM }; diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist index e7d031a7cbc5..f9cf36fbd736 100644 --- a/net-mgmt/net-snmp53/pkg-plist +++ b/net-mgmt/net-snmp53/pkg-plist @@ -1,5 +1,8 @@ bin/encode_keychange +bin/fixproc +bin/ipf-mod.pl bin/mib2c +bin/net-snmp-config bin/snmpbulkget bin/snmpbulkwalk bin/snmpcheck @@ -19,66 +22,148 @@ bin/snmptrap bin/snmpusm bin/snmpvacm bin/snmpwalk +bin/traptoemail etc/rc.d/snmpd.sh -include/ucd-snmp/agent_index.h -include/ucd-snmp/agent_read_config.h -include/ucd-snmp/agent_registry.h -include/ucd-snmp/agent_trap.h -include/ucd-snmp/asn1.h -include/ucd-snmp/auto_nlist.h -include/ucd-snmp/callback.h -include/ucd-snmp/default_store.h -include/ucd-snmp/ds_agent.h -include/ucd-snmp/header_complex.h -include/ucd-snmp/int64.h -include/ucd-snmp/keytools.h -include/ucd-snmp/mib.h -include/ucd-snmp/mib_module_config.h -include/ucd-snmp/mibincl.h -include/ucd-snmp/parse.h -include/ucd-snmp/read_config.h -include/ucd-snmp/scapi.h -include/ucd-snmp/snmp-tc.h -include/ucd-snmp/snmp.h -include/ucd-snmp/snmp_agent.h -include/ucd-snmp/snmp_alarm.h -include/ucd-snmp/snmp_api.h -include/ucd-snmp/snmp_client.h -include/ucd-snmp/snmp_debug.h -include/ucd-snmp/snmp_impl.h -include/ucd-snmp/snmp_logging.h -include/ucd-snmp/snmp_parse_args.h -include/ucd-snmp/snmp_vars.h -include/ucd-snmp/snmpusm.h -include/ucd-snmp/snmpv3.h -include/ucd-snmp/struct.h -include/ucd-snmp/system.h -include/ucd-snmp/tools.h -include/ucd-snmp/transform_oids.h -include/ucd-snmp/ucd-snmp-agent-includes.h -include/ucd-snmp/ucd-snmp-config.h -include/ucd-snmp/ucd-snmp-includes.h -include/ucd-snmp/util_funcs.h -include/ucd-snmp/var_struct.h -include/ucd-snmp/version.h -@dirrm include/ucd-snmp -lib/libsnmp.a -lib/libsnmp.so -lib/libsnmp.so.%%shlib%% -lib/libucdagent.a -lib/libucdagent.so -lib/libucdagent.so.%%shlib%% -lib/libucdmibs.a -lib/libucdmibs.so -lib/libucdmibs.so.%%shlib%% +include/net-snmp/agent/agent_callbacks.h +include/net-snmp/agent/agent_handler.h +include/net-snmp/agent/agent_index.h +include/net-snmp/agent/agent_read_config.h +include/net-snmp/agent/agent_registry.h +include/net-snmp/agent/agent_trap.h +include/net-snmp/agent/all_helpers.h +include/net-snmp/agent/auto_nlist.h +include/net-snmp/agent/bulk_to_next.h +include/net-snmp/agent/debug_handler.h +include/net-snmp/agent/ds_agent.h +include/net-snmp/agent/instance.h +include/net-snmp/agent/mib_module_config.h +include/net-snmp/agent/mib_module_includes.h +include/net-snmp/agent/multiplexer.h +include/net-snmp/agent/net-snmp-agent-includes.h +include/net-snmp/agent/null.h +include/net-snmp/agent/old_api.h +include/net-snmp/agent/read_only.h +include/net-snmp/agent/serialize.h +include/net-snmp/agent/set_helper.h +include/net-snmp/agent/snmp_agent.h +include/net-snmp/agent/snmp_vars.h +include/net-snmp/agent/table.h +include/net-snmp/agent/table_array.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/var_struct.h +include/net-snmp/config_api.h +include/net-snmp/definitions.h +include/net-snmp/library/README +include/net-snmp/library/asn1.h +include/net-snmp/library/callback.h +include/net-snmp/library/check_varbind.h +include/net-snmp/library/cmu_compat.h +include/net-snmp/library/data_list.h +include/net-snmp/library/default_store.h +include/net-snmp/library/getopt.h +include/net-snmp/library/int64.h +include/net-snmp/library/keytools.h +include/net-snmp/library/lcd_time.h +include/net-snmp/library/md5.h +include/net-snmp/library/mib.h +include/net-snmp/library/mt_support.h +include/net-snmp/library/oid_array.h +include/net-snmp/library/oid_stash.h +include/net-snmp/library/parse.h +include/net-snmp/library/read_config.h +include/net-snmp/library/scapi.h +include/net-snmp/library/snmp-tc.h +include/net-snmp/library/snmp.h +include/net-snmp/library/snmpCallbackDomain.h +include/net-snmp/library/snmpTCPDomain.h +include/net-snmp/library/snmpUDPDomain.h +include/net-snmp/library/snmpUnixDomain.h +include/net-snmp/library/snmp_alarm.h +include/net-snmp/library/snmp_api.h +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 +include/net-snmp/library/snmp_transport.h +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/tools.h +include/net-snmp/library/transform_oids.h +include/net-snmp/library/ucd_compat.h +include/net-snmp/library/vacm.h +include/net-snmp/library/winservice.h +include/net-snmp/machine/generic.h +include/net-snmp/mib_api.h +include/net-snmp/net-snmp-config.h +include/net-snmp/net-snmp-includes.h +include/net-snmp/output_api.h +include/net-snmp/pdu_api.h +include/net-snmp/session_api.h +include/net-snmp/snmpv3_api.h +include/net-snmp/system/aix.h +include/net-snmp/system/bsd.h +include/net-snmp/system/bsdi.h +include/net-snmp/system/bsdi3.h +include/net-snmp/system/bsdi4.h +include/net-snmp/system/cygwin.h +include/net-snmp/system/darwin.h +include/net-snmp/system/dynix.h +include/net-snmp/system/freebsd.h +include/net-snmp/system/freebsd2.h +include/net-snmp/system/freebsd3.h +include/net-snmp/system/freebsd4.h +include/net-snmp/system/generic.h +include/net-snmp/system/hpux.h +include/net-snmp/system/irix.h +include/net-snmp/system/linux.h +include/net-snmp/system/mips.h +include/net-snmp/system/netbsd.h +include/net-snmp/system/openbsd.h +include/net-snmp/system/solaris.h +include/net-snmp/system/solaris2.6.h +include/net-snmp/system/solaris2.7.h +include/net-snmp/system/solaris2.8.h +include/net-snmp/system/sunos.h +include/net-snmp/system/svr5.h +include/net-snmp/system/sysv.h +include/net-snmp/system/ultrix4.h +include/net-snmp/types.h +include/net-snmp/utilities.h +include/net-snmp/varbind_api.h +include/net-snmp/version.h +@dirrm include/net-snmp/agent +@dirrm include/net-snmp/library +@dirrm include/net-snmp/machine +@dirrm include/net-snmp/system +@dirrm include/net-snmp +lib/libnetsnmp.a +lib/libnetsnmp.so +lib/libnetsnmp.so.%%shlib%% +lib/libnetsnmpagent.a +lib/libnetsnmpagent.so +lib/libnetsnmpagent.so.%%shlib%% +lib/libnetsnmphelpers.a +lib/libnetsnmphelpers.so +lib/libnetsnmphelpers.so.%%shlib%% +lib/libnetsnmpmibs.a +lib/libnetsnmpmibs.so +lib/libnetsnmpmibs.so.%%shlib%% sbin/snmpd sbin/snmptrapd -share/examples/ucd-snmp/EXAMPLE.conf -share/examples/ucd-snmp/ucdDemoPublic.conf -@dirrm share/examples/ucd-snmp +share/snmp/mib2c.array-user.conf +share/snmp/mib2c.column_defines.conf +share/snmp/mib2c.column_enums.conf share/snmp/mib2c.conf -share/snmp/mib2c.storage.conf -share/snmp/mib2c.vartypes.conf +share/snmp/mib2c.create-dataset.conf +share/snmp/mib2c.iterate.conf share/snmp/mibs/AGENTX-MIB.txt share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt share/snmp/mibs/DISMAN-SCRIPT-MIB.txt @@ -92,16 +177,20 @@ share/snmp/mibs/IANAifType-MIB.txt share/snmp/mibs/IF-INVERTED-STACK-MIB.txt share/snmp/mibs/IF-MIB.txt share/snmp/mibs/INET-ADDRESS-MIB.txt -share/snmp/mibs/IP-MIB.txt share/snmp/mibs/IP-FORWARD-MIB.txt +share/snmp/mibs/IP-MIB.txt share/snmp/mibs/IPV6-ICMP-MIB.txt share/snmp/mibs/IPV6-MIB.txt share/snmp/mibs/IPV6-TC.txt share/snmp/mibs/IPV6-TCP-MIB.txt share/snmp/mibs/IPV6-UDP-MIB.txt +share/snmp/mibs/NET-SNMP-AGENT-MIB.txt +share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt +share/snmp/mibs/NET-SNMP-MIB.txt +share/snmp/mibs/NOTIFICATION-LOG-MIB.txt +share/snmp/mibs/RFC-1215.txt share/snmp/mibs/RFC1155-SMI.txt share/snmp/mibs/RFC1213-MIB.txt -share/snmp/mibs/RFC-1215.txt share/snmp/mibs/RMON-MIB.txt share/snmp/mibs/SMUX-MIB.txt share/snmp/mibs/SNMP-COMMUNITY-MIB.txt @@ -124,23 +213,25 @@ share/snmp/mibs/UCD-DLMOD-MIB.txt share/snmp/mibs/UCD-IPFWACC-MIB.txt share/snmp/mibs/UCD-SNMP-MIB.txt share/snmp/mibs/UDP-MIB.txt -share/snmp/snmpconf/snmp.conf/authopts -share/snmp/snmpconf/snmp.conf/debugging -share/snmp/snmpconf/snmp.conf/mibs -share/snmp/snmpconf/snmp.conf/output -share/snmp/snmpconf/snmpd.conf/acl -share/snmp/snmpconf/snmpd.conf/basic_setup -share/snmp/snmpconf/snmpd.conf/extending -share/snmp/snmpconf/snmpd.conf/monitor -share/snmp/snmpconf/snmpd.conf/operation -share/snmp/snmpconf/snmpd.conf/system -share/snmp/snmpconf/snmpd.conf/trapsinks -share/snmp/snmpconf/snmptrapd.conf/formatting -share/snmp/snmpconf/snmptrapd.conf/traphandle -@unexec rm -f %D/share/snmp/mibs/.index +share/snmp/snmpconf-data/snmp-data/authopts +share/snmp/snmpconf-data/snmp-data/debugging +share/snmp/snmpconf-data/snmp-data/mibs +share/snmp/snmpconf-data/snmp-data/output +share/snmp/snmpconf-data/snmp-data/snmpconf-config +share/snmp/snmpconf-data/snmpd-data/acl +share/snmp/snmpconf-data/snmpd-data/basic_setup +share/snmp/snmpconf-data/snmpd-data/extending +share/snmp/snmpconf-data/snmpd-data/monitor +share/snmp/snmpconf-data/snmpd-data/operation +share/snmp/snmpconf-data/snmpd-data/snmpconf-config +share/snmp/snmpconf-data/snmpd-data/system +share/snmp/snmpconf-data/snmpd-data/trapsinks +share/snmp/snmpconf-data/snmptrapd-data/formatting +share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config +share/snmp/snmpconf-data/snmptrapd-data/traphandle +@dirrm share/snmp/snmpconf-data/snmp-data +@dirrm share/snmp/snmpconf-data/snmpd-data +@dirrm share/snmp/snmpconf-data/snmptrapd-data +@dirrm share/snmp/snmpconf-data @dirrm share/snmp/mibs -@dirrm share/snmp/snmpconf/snmp.conf -@dirrm share/snmp/snmpconf/snmpd.conf -@dirrm share/snmp/snmpconf/snmptrapd.conf -@dirrm share/snmp/snmpconf @unexec rmdir %D/share/snmp 2>/dev/null || true diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 706675e545fe..3bba6ce1a30c 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -5,11 +5,10 @@ # $FreeBSD$ # -PORTNAME= ucd-snmp -PORTVERSION= 4.2.5 +PORTNAME= net-snmp +PORTVERSION= 5.0.1 CATEGORIES= net ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - ftp://ucd-snmp.ucdavis.edu/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ ftp://ftp.win.ne.jp/pub/network/snmp/ucd-snmp/ MASTER_SITE_SUBDIR= net-snmp @@ -20,6 +19,7 @@ USE_AUTOCONF_VER=213 USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore +NO_LATEST_LINK= yes CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host ucd-snmp/diskio" \ --with-gnu-ld --with-libwrap --with-libs="-ldevstat" @@ -29,12 +29,20 @@ CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where IS_INTERACTIVE= yes .endif -MAN1= snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 snmpd.1 \ +MAN1= mib2c.1 \ + snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 snmpd.1 \ snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \ snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \ snmptranslate.1 snmptrap.1 snmpusm.1 snmpwalk.1 MAN3= add_mibdir.3 add_module_replacement.3 default_store.3 \ get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \ + netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \ + netsnmp_example_scalar_int.3 netsnmp_handler.3 \ + netsnmp_instance.3 netsnmp_mib_handler_methods.3 \ + netsnmp_multiplexer.3 netsnmp_old_api.3 netsnmp_read_only.3 \ + netsnmp_serialize.3 netsnmp_table.3 netsnmp_table_array.3 \ + netsnmp_table_data.3 netsnmp_table_dataset.3 \ + netsnmp_table_iterator.3 netsnmp_todo.3 \ print_description.3 print_mib.3 print_objid.3 print_value.3 \ print_variable.3 read_all_mibs.3 read_config.3 read_mib.3 \ read_module.3 read_module_node.3 read_objid.3 shutdown_mib.3 \ @@ -64,7 +72,7 @@ STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh CONFIGURE_ARGS+= --enable-ipv6 .endif -SHLIB_VERSION= 4 +SHLIB_VERSION= 5 PLIST_SUB+= shlib=${SHLIB_VERSION} post-patch: @@ -73,11 +81,8 @@ post-patch: post-install: @( cd ${PREFIX}/bin && strip ${BIN} ) @( cd ${PREFIX}/sbin && strip ${SBIN} ) - @( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * ) + @( cd ${PREFIX}/include/net-snmp && ${CHMOD} 644 * ) @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) - @${MKDIR} ${PREFIX}/share/examples/ucd-snmp - @for F in ${WRKSRC}/EXAMPLE.conf ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \ - ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done @if [ ! -f ${STARTUP_FILE} ]; then \ ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/snmpd.sh.sample ${STARTUP_FILE}; \ diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo index 62f49e72ff53..afe0c1b1309e 100644 --- a/net/net-snmp/distinfo +++ b/net/net-snmp/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-4.2.5.tar.gz) = 615e0b1e760cbb8c63b5392fe2d04b14 +MD5 (net-snmp-5.0.1.tar.gz) = f209cff622b4ffee830d54b68985d859 diff --git a/net/net-snmp/files/patch-Makefile.top b/net/net-snmp/files/patch-Makefile.top index e6077bc203ef..7bb0b8a79ac8 100644 --- a/net/net-snmp/files/patch-Makefile.top +++ b/net/net-snmp/files/patch-Makefile.top @@ -1,11 +1,11 @@ ---- Makefile.top.orig Sat Feb 16 10:00:19 2002 -+++ Makefile.top Sat Feb 16 23:31:00 2002 -@@ -52,7 +52,7 @@ - # Misc Compiling Stuff - CC = @CC@ - # version number is prefixed by a 0 for a better shared library version number --LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) $(SHVFLAGS) -o -+LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(VERSION).0 -version-info 4 -o +--- Makefile.top.orig Sat Apr 20 16:29:56 2002 ++++ Makefile.top Tue Apr 23 08:53:54 2002 +@@ -60,7 +60,7 @@ + # generally, LIBCURRENT should stay the same unless major changes occur. + # Increment REVISION every release. + # Increment AGE if new stuff is available. +-LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o ++LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(LIBCURRENT) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o LIB_EXTENSION = la LIB_VERSION = LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir) diff --git a/net/net-snmp/files/patch-ak b/net/net-snmp/files/patch-ak deleted file mode 100644 index 8a9d310cd7a0..000000000000 --- a/net/net-snmp/files/patch-ak +++ /dev/null @@ -1,21 +0,0 @@ ---- agent/Makefile.in.orig Sun Nov 19 12:58:06 2000 -+++ agent/Makefile.in Wed Jan 17 18:37:02 2001 -@@ -68,10 +68,18 @@ - - libucdagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) - $(LIB_LD_CMD) libucdagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS) -+ ld -Bshareable -soname libucdagent.$(LIB_EXTENSION)$(LIB_VERSION) \ -+ -o libucdagent.so ${LIBAGENTOBJS} -+ ln -f libucdagent.so \ -+ ../libucdagent.so.4 - $(RANLIB) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) - - libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} - $(LIB_LD_CMD) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) -+ ld -Bshareable -soname libucdmibs.so.4 \ -+ -o libucdmibs.so ${MIBOBJS} -+ ln -f libucdmibs.so \ -+ ../libucdmibs.so.4 - $(RANLIB) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) - - clean: diff --git a/net/net-snmp/files/patch-hr_disk.c b/net/net-snmp/files/patch-hr_disk.c index b4f2c66a92f8..4afa759aafa6 100644 --- a/net/net-snmp/files/patch-hr_disk.c +++ b/net/net-snmp/files/patch-hr_disk.c @@ -1,11 +1,12 @@ ---- agent/mibgroup/host/hr_disk.c.orig Tue Feb 26 01:57:26 2002 -+++ agent/mibgroup/host/hr_disk.c Fri Mar 29 16:06:29 2002 -@@ -185,7 +185,7 @@ - #elif defined(solaris2) - Add_HR_Disk_entry ( "/dev/rdsk/c%dt%dd0s%d", 0, 1, 0, 15, "/dev/rdsk/c%dt%dd0s0", 0, 7 ); - Add_HR_Disk_entry ( "/dev/rdsk/c%dd%ds%d", 0, 1, 0, 15, "/dev/rdsk/c%dd%ds0", 0, 7 ); --#elif defined(freebsd4) +--- agent/mibgroup/host/hr_disk.c.orig Sat Apr 20 16:30:03 2002 ++++ agent/mibgroup/host/hr_disk.c Wed Apr 24 01:33:15 2002 +@@ -185,6 +185,9 @@ + "/dev/rdsk/c%dt%dd0s0", 0, 7); + Add_HR_Disk_entry("/dev/rdsk/c%dd%ds%d", 0, 1, 0, 15, + "/dev/rdsk/c%dd%ds0", 0, 7); +#elif defined(__FreeBSD__) && __FreeBSD__ >= 4 - Add_HR_Disk_entry ( "/dev/ad%ds%d%c", 0, 1, 1, 4, "/dev/ad%ds%d", 'a', 'h'); - Add_HR_Disk_entry ( "/dev/da%ds%d%c", 0, 1, 1, 4, "/dev/da%ds%d", 'a', 'h'); ++ Add_HR_Disk_entry("/dev/ad%ds%d%c", 0, 1, 1, 4, "/dev/ad%ds%d", 'a', 'h'); ++ Add_HR_Disk_entry("/dev/da%ds%d%c", 0, 1, 1, 4, "/dev/da%ds%d", 'a', 'h'); #elif defined(freebsd3) + Add_HR_Disk_entry("/dev/wd%ds%d%c", 0, 1, 1, 4, "/dev/wd%ds%d", 'a', + 'h'); diff --git a/net/net-snmp/files/patch-hr_storage.c b/net/net-snmp/files/patch-hr_storage.c index 0c5381602966..3656d5a3a3d1 100644 --- a/net/net-snmp/files/patch-hr_storage.c +++ b/net/net-snmp/files/patch-hr_storage.c @@ -1,11 +1,11 @@ ---- agent/mibgroup/host/hr_storage.c.orig Fri Feb 8 19:42:25 2002 -+++ agent/mibgroup/host/hr_storage.c Sat Feb 16 23:37:31 2002 -@@ -583,7 +583,15 @@ - for (i = 0; i < sizeof(mbstat.m_mtypes)/sizeof(mbstat.m_mtypes[0]); i++) - long_return += mbstat.m_mtypes[i]; +--- agent/mibgroup/host/hr_storage.c.orig Sat Apr 20 16:30:03 2002 ++++ agent/mibgroup/host/hr_storage.c Wed Apr 24 01:37:29 2002 +@@ -604,7 +604,15 @@ + i++) + long_return += mbstat.m_mtypes[i]; #elif defined(MBSTAT_SYMBOL) +#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_mbufs; + long_return = mbstat.m_mbufs; +#elif __FreeBSD_version < 500024 + /* mbuf stats disabled */ + return NULL; @@ -14,14 +14,14 @@ + return NULL; +#endif #elif defined(NO_DUMMY_VALUES) - return NULL; + return NULL; #else -@@ -634,7 +642,15 @@ - + (mclpool.pr_nget - mclpool.pr_nput) - * mclpool.pr_size; +@@ -654,7 +662,15 @@ + * mbpool.pr_size + (mclpool.pr_nget - mclpool.pr_nput) + * mclpool.pr_size; #elif defined(MBSTAT_SYMBOL) +#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ + long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ +#elif __FreeBSD_version < 500024 + /* mbuf stats disabled */ + return NULL; @@ -30,5 +30,5 @@ + return NULL; +#endif #elif defined(NO_DUMMY_VALUES) - return NULL; + return NULL; #else diff --git a/net/net-snmp/files/patch-hr_swrun.c b/net/net-snmp/files/patch-hr_swrun.c index c232386f873e..a2afd1c61cf3 100644 --- a/net/net-snmp/files/patch-hr_swrun.c +++ b/net/net-snmp/files/patch-hr_swrun.c @@ -1,43 +1,43 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Sat Feb 16 09:41:19 2002 -+++ agent/mibgroup/host/hr_swrun.c Sat Feb 16 23:41:05 2002 -@@ -543,7 +543,11 @@ - strcpy(string, proc_buf->p_user.u_comm); +--- agent/mibgroup/host/hr_swrun.c.orig Sat Apr 20 16:30:03 2002 ++++ agent/mibgroup/host/hr_swrun.c Wed Apr 24 01:43:15 2002 +@@ -557,7 +557,11 @@ + strcpy(string, proc_buf->p_user.u_comm); #endif #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + strcpy(string, proc_table[LowProcIndex].ki_comm); +#else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); + strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); +#endif #elif defined(linux) - sprintf( string, "/proc/%d/status", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -638,7 +642,11 @@ - *cp1 = 0; + sprintf(string, "/proc/%d/status", pid); + if ((fp = fopen(string, "r")) == NULL) +@@ -662,7 +666,11 @@ + *cp1 = 0; #endif #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + strcpy(string, proc_table[LowProcIndex].ki_comm); +#else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); + strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); +#endif #elif defined(linux) - sprintf( string, "/proc/%d/cmdline", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -810,7 +818,11 @@ - } + sprintf(string, "/proc/%d/cmdline", pid); + if ((fp = fopen(string, "r")) == NULL) +@@ -853,7 +861,11 @@ + } #else #if HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + switch ( proc_table[LowProcIndex].ki_stat ) { +#else - switch ( proc_table[LowProcIndex].kp_proc.p_stat ) { + switch (proc_table[LowProcIndex].kp_proc.p_stat) { +#endif #elif defined(dynix) - switch ( lowpsinfo.pr_state ) { + switch (lowpsinfo.pr_state) { #elif defined(solaris2) -@@ -906,9 +918,17 @@ - proc_buf->p_stime*100; +@@ -948,9 +960,17 @@ + long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; #endif #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 @@ -47,17 +47,17 @@ + proc_table[LowProcIndex].ki_paddr->p_iticks; */ + long_return = 0; +#else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + - proc_table[LowProcIndex].kp_proc.p_sticks + - proc_table[LowProcIndex].kp_proc.p_iticks; + long_return = proc_table[LowProcIndex].kp_proc.p_uticks + + proc_table[LowProcIndex].kp_proc.p_sticks + + proc_table[LowProcIndex].kp_proc.p_iticks; +#endif #elif defined(linux) - sprintf( string, "/proc/%d/stat", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -976,6 +996,13 @@ - #elif HAVE_KVM_GETPROCS + sprintf(string, "/proc/%d/stat", pid); + if ((fp = fopen(string, "r")) == NULL) +@@ -1022,6 +1042,13 @@ #if defined(freebsd3) && !defined(darwin) - long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size/1024; + long_return = + proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024; +#elif defined(freebsd5) && __FreeBSD_version >= 500014 + /* XXX + long_return = proc_table[LowProcIndex].ki_vmspace->vm_tsize + @@ -66,19 +66,19 @@ + long_return = long_return * (getpagesize() / 1024); */ + long_return = 0; #else - long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize + - proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize + -@@ -1237,8 +1264,13 @@ + long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize + + proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize + +@@ -1299,8 +1326,13 @@ #elif defined(solaris2) - return proc_table[current_proc_entry++]; + return proc_table[current_proc_entry++]; #elif HAVE_KVM_GETPROCS +#if defined(freebsd5) && __FreeBSD_version >= 500014 + if ( proc_table[current_proc_entry].ki_stat != 0 ) + return proc_table[current_proc_entry++].ki_pid; +#else - if ( proc_table[current_proc_entry].kp_proc.p_stat != 0 ) - return proc_table[current_proc_entry++].kp_proc.p_pid; + if (proc_table[current_proc_entry].kp_proc.p_stat != 0) + return proc_table[current_proc_entry++].kp_proc.p_pid; +#endif #else - if ( proc_table[current_proc_entry].p_stat != 0 ) - return proc_table[current_proc_entry++].p_pid; + if (proc_table[current_proc_entry].p_stat != 0) + return proc_table[current_proc_entry++].p_pid; diff --git a/net/net-snmp/files/patch-local:Makefile.in b/net/net-snmp/files/patch-local:Makefile.in index 1028734fb5b3..7f648103d7aa 100644 --- a/net/net-snmp/files/patch-local:Makefile.in +++ b/net/net-snmp/files/patch-local:Makefile.in @@ -1,11 +1,11 @@ ---- local/Makefile.in.orig Thu Apr 4 15:04:11 2002 -+++ local/Makefile.in Thu Apr 4 15:04:17 2002 -@@ -2,7 +2,7 @@ - +--- local/Makefile.in.orig Sat Apr 20 16:30:13 2002 ++++ local/Makefile.in Wed Apr 24 01:45:55 2002 +@@ -12,7 +12,7 @@ + # local info + # SNMPCONFPATH=@SNMPCONFPATH@ - --SCRIPTS=snmpcheck tkmib mib2c snmpconf -+SCRIPTS=snmpcheck mib2c snmpconf - PERLSCRIPTS=snmpcheck tkmib fixproc ipf-mod.pl rsnmp +-PERLSCRIPTS=snmpcheck tkmib mib2c fixproc ipf-mod.pl snmpconf traptoemail ++PERLSCRIPTS=snmpcheck mib2c fixproc ipf-mod.pl snmpconf traptoemail SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \ - ipf-mod.pl.made rsnmp.made snmpconf.made + ipf-mod.pl.made snmpconf.made traptoemail.made + PERLPROG=@PERLPROG@ diff --git a/net/net-snmp/files/patch-memory_freebsd2.c b/net/net-snmp/files/patch-memory_freebsd2.c index e06a3266f224..8ddf778aea0d 100644 --- a/net/net-snmp/files/patch-memory_freebsd2.c +++ b/net/net-snmp/files/patch-memory_freebsd2.c @@ -1,11 +1,11 @@ ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Mon Sep 17 06:16:16 2001 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Mon Mar 4 10:00:56 2002 -@@ -232,7 +232,7 @@ - size_t total_size = sizeof (total); - int total_mib[] = { CTL_VM, VM_METER }; +--- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Sat Apr 20 16:30:08 2002 ++++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Wed Apr 24 01:49:01 2002 +@@ -274,7 +274,7 @@ + size_t total_size = sizeof(total); + int total_mib[] = { CTL_VM, VM_METER }; -- long phys_mem; -+ u_long phys_mem; - size_t phys_mem_size = sizeof(phys_mem); - int phys_mem_mib[] = { CTL_HW, HW_USERMEM }; +- long phys_mem; ++ u_long phys_mem; + size_t phys_mem_size = sizeof(phys_mem); + int phys_mem_mib[] = { CTL_HW, HW_USERMEM }; diff --git a/net/net-snmp/pkg-plist b/net/net-snmp/pkg-plist index e7d031a7cbc5..f9cf36fbd736 100644 --- a/net/net-snmp/pkg-plist +++ b/net/net-snmp/pkg-plist @@ -1,5 +1,8 @@ bin/encode_keychange +bin/fixproc +bin/ipf-mod.pl bin/mib2c +bin/net-snmp-config bin/snmpbulkget bin/snmpbulkwalk bin/snmpcheck @@ -19,66 +22,148 @@ bin/snmptrap bin/snmpusm bin/snmpvacm bin/snmpwalk +bin/traptoemail etc/rc.d/snmpd.sh -include/ucd-snmp/agent_index.h -include/ucd-snmp/agent_read_config.h -include/ucd-snmp/agent_registry.h -include/ucd-snmp/agent_trap.h -include/ucd-snmp/asn1.h -include/ucd-snmp/auto_nlist.h -include/ucd-snmp/callback.h -include/ucd-snmp/default_store.h -include/ucd-snmp/ds_agent.h -include/ucd-snmp/header_complex.h -include/ucd-snmp/int64.h -include/ucd-snmp/keytools.h -include/ucd-snmp/mib.h -include/ucd-snmp/mib_module_config.h -include/ucd-snmp/mibincl.h -include/ucd-snmp/parse.h -include/ucd-snmp/read_config.h -include/ucd-snmp/scapi.h -include/ucd-snmp/snmp-tc.h -include/ucd-snmp/snmp.h -include/ucd-snmp/snmp_agent.h -include/ucd-snmp/snmp_alarm.h -include/ucd-snmp/snmp_api.h -include/ucd-snmp/snmp_client.h -include/ucd-snmp/snmp_debug.h -include/ucd-snmp/snmp_impl.h -include/ucd-snmp/snmp_logging.h -include/ucd-snmp/snmp_parse_args.h -include/ucd-snmp/snmp_vars.h -include/ucd-snmp/snmpusm.h -include/ucd-snmp/snmpv3.h -include/ucd-snmp/struct.h -include/ucd-snmp/system.h -include/ucd-snmp/tools.h -include/ucd-snmp/transform_oids.h -include/ucd-snmp/ucd-snmp-agent-includes.h -include/ucd-snmp/ucd-snmp-config.h -include/ucd-snmp/ucd-snmp-includes.h -include/ucd-snmp/util_funcs.h -include/ucd-snmp/var_struct.h -include/ucd-snmp/version.h -@dirrm include/ucd-snmp -lib/libsnmp.a -lib/libsnmp.so -lib/libsnmp.so.%%shlib%% -lib/libucdagent.a -lib/libucdagent.so -lib/libucdagent.so.%%shlib%% -lib/libucdmibs.a -lib/libucdmibs.so -lib/libucdmibs.so.%%shlib%% +include/net-snmp/agent/agent_callbacks.h +include/net-snmp/agent/agent_handler.h +include/net-snmp/agent/agent_index.h +include/net-snmp/agent/agent_read_config.h +include/net-snmp/agent/agent_registry.h +include/net-snmp/agent/agent_trap.h +include/net-snmp/agent/all_helpers.h +include/net-snmp/agent/auto_nlist.h +include/net-snmp/agent/bulk_to_next.h +include/net-snmp/agent/debug_handler.h +include/net-snmp/agent/ds_agent.h +include/net-snmp/agent/instance.h +include/net-snmp/agent/mib_module_config.h +include/net-snmp/agent/mib_module_includes.h +include/net-snmp/agent/multiplexer.h +include/net-snmp/agent/net-snmp-agent-includes.h +include/net-snmp/agent/null.h +include/net-snmp/agent/old_api.h +include/net-snmp/agent/read_only.h +include/net-snmp/agent/serialize.h +include/net-snmp/agent/set_helper.h +include/net-snmp/agent/snmp_agent.h +include/net-snmp/agent/snmp_vars.h +include/net-snmp/agent/table.h +include/net-snmp/agent/table_array.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/var_struct.h +include/net-snmp/config_api.h +include/net-snmp/definitions.h +include/net-snmp/library/README +include/net-snmp/library/asn1.h +include/net-snmp/library/callback.h +include/net-snmp/library/check_varbind.h +include/net-snmp/library/cmu_compat.h +include/net-snmp/library/data_list.h +include/net-snmp/library/default_store.h +include/net-snmp/library/getopt.h +include/net-snmp/library/int64.h +include/net-snmp/library/keytools.h +include/net-snmp/library/lcd_time.h +include/net-snmp/library/md5.h +include/net-snmp/library/mib.h +include/net-snmp/library/mt_support.h +include/net-snmp/library/oid_array.h +include/net-snmp/library/oid_stash.h +include/net-snmp/library/parse.h +include/net-snmp/library/read_config.h +include/net-snmp/library/scapi.h +include/net-snmp/library/snmp-tc.h +include/net-snmp/library/snmp.h +include/net-snmp/library/snmpCallbackDomain.h +include/net-snmp/library/snmpTCPDomain.h +include/net-snmp/library/snmpUDPDomain.h +include/net-snmp/library/snmpUnixDomain.h +include/net-snmp/library/snmp_alarm.h +include/net-snmp/library/snmp_api.h +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 +include/net-snmp/library/snmp_transport.h +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/tools.h +include/net-snmp/library/transform_oids.h +include/net-snmp/library/ucd_compat.h +include/net-snmp/library/vacm.h +include/net-snmp/library/winservice.h +include/net-snmp/machine/generic.h +include/net-snmp/mib_api.h +include/net-snmp/net-snmp-config.h +include/net-snmp/net-snmp-includes.h +include/net-snmp/output_api.h +include/net-snmp/pdu_api.h +include/net-snmp/session_api.h +include/net-snmp/snmpv3_api.h +include/net-snmp/system/aix.h +include/net-snmp/system/bsd.h +include/net-snmp/system/bsdi.h +include/net-snmp/system/bsdi3.h +include/net-snmp/system/bsdi4.h +include/net-snmp/system/cygwin.h +include/net-snmp/system/darwin.h +include/net-snmp/system/dynix.h +include/net-snmp/system/freebsd.h +include/net-snmp/system/freebsd2.h +include/net-snmp/system/freebsd3.h +include/net-snmp/system/freebsd4.h +include/net-snmp/system/generic.h +include/net-snmp/system/hpux.h +include/net-snmp/system/irix.h +include/net-snmp/system/linux.h +include/net-snmp/system/mips.h +include/net-snmp/system/netbsd.h +include/net-snmp/system/openbsd.h +include/net-snmp/system/solaris.h +include/net-snmp/system/solaris2.6.h +include/net-snmp/system/solaris2.7.h +include/net-snmp/system/solaris2.8.h +include/net-snmp/system/sunos.h +include/net-snmp/system/svr5.h +include/net-snmp/system/sysv.h +include/net-snmp/system/ultrix4.h +include/net-snmp/types.h +include/net-snmp/utilities.h +include/net-snmp/varbind_api.h +include/net-snmp/version.h +@dirrm include/net-snmp/agent +@dirrm include/net-snmp/library +@dirrm include/net-snmp/machine +@dirrm include/net-snmp/system +@dirrm include/net-snmp +lib/libnetsnmp.a +lib/libnetsnmp.so +lib/libnetsnmp.so.%%shlib%% +lib/libnetsnmpagent.a +lib/libnetsnmpagent.so +lib/libnetsnmpagent.so.%%shlib%% +lib/libnetsnmphelpers.a +lib/libnetsnmphelpers.so +lib/libnetsnmphelpers.so.%%shlib%% +lib/libnetsnmpmibs.a +lib/libnetsnmpmibs.so +lib/libnetsnmpmibs.so.%%shlib%% sbin/snmpd sbin/snmptrapd -share/examples/ucd-snmp/EXAMPLE.conf -share/examples/ucd-snmp/ucdDemoPublic.conf -@dirrm share/examples/ucd-snmp +share/snmp/mib2c.array-user.conf +share/snmp/mib2c.column_defines.conf +share/snmp/mib2c.column_enums.conf share/snmp/mib2c.conf -share/snmp/mib2c.storage.conf -share/snmp/mib2c.vartypes.conf +share/snmp/mib2c.create-dataset.conf +share/snmp/mib2c.iterate.conf share/snmp/mibs/AGENTX-MIB.txt share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt share/snmp/mibs/DISMAN-SCRIPT-MIB.txt @@ -92,16 +177,20 @@ share/snmp/mibs/IANAifType-MIB.txt share/snmp/mibs/IF-INVERTED-STACK-MIB.txt share/snmp/mibs/IF-MIB.txt share/snmp/mibs/INET-ADDRESS-MIB.txt -share/snmp/mibs/IP-MIB.txt share/snmp/mibs/IP-FORWARD-MIB.txt +share/snmp/mibs/IP-MIB.txt share/snmp/mibs/IPV6-ICMP-MIB.txt share/snmp/mibs/IPV6-MIB.txt share/snmp/mibs/IPV6-TC.txt share/snmp/mibs/IPV6-TCP-MIB.txt share/snmp/mibs/IPV6-UDP-MIB.txt +share/snmp/mibs/NET-SNMP-AGENT-MIB.txt +share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt +share/snmp/mibs/NET-SNMP-MIB.txt +share/snmp/mibs/NOTIFICATION-LOG-MIB.txt +share/snmp/mibs/RFC-1215.txt share/snmp/mibs/RFC1155-SMI.txt share/snmp/mibs/RFC1213-MIB.txt -share/snmp/mibs/RFC-1215.txt share/snmp/mibs/RMON-MIB.txt share/snmp/mibs/SMUX-MIB.txt share/snmp/mibs/SNMP-COMMUNITY-MIB.txt @@ -124,23 +213,25 @@ share/snmp/mibs/UCD-DLMOD-MIB.txt share/snmp/mibs/UCD-IPFWACC-MIB.txt share/snmp/mibs/UCD-SNMP-MIB.txt share/snmp/mibs/UDP-MIB.txt -share/snmp/snmpconf/snmp.conf/authopts -share/snmp/snmpconf/snmp.conf/debugging -share/snmp/snmpconf/snmp.conf/mibs -share/snmp/snmpconf/snmp.conf/output -share/snmp/snmpconf/snmpd.conf/acl -share/snmp/snmpconf/snmpd.conf/basic_setup -share/snmp/snmpconf/snmpd.conf/extending -share/snmp/snmpconf/snmpd.conf/monitor -share/snmp/snmpconf/snmpd.conf/operation -share/snmp/snmpconf/snmpd.conf/system -share/snmp/snmpconf/snmpd.conf/trapsinks -share/snmp/snmpconf/snmptrapd.conf/formatting -share/snmp/snmpconf/snmptrapd.conf/traphandle -@unexec rm -f %D/share/snmp/mibs/.index +share/snmp/snmpconf-data/snmp-data/authopts +share/snmp/snmpconf-data/snmp-data/debugging +share/snmp/snmpconf-data/snmp-data/mibs +share/snmp/snmpconf-data/snmp-data/output +share/snmp/snmpconf-data/snmp-data/snmpconf-config +share/snmp/snmpconf-data/snmpd-data/acl +share/snmp/snmpconf-data/snmpd-data/basic_setup +share/snmp/snmpconf-data/snmpd-data/extending +share/snmp/snmpconf-data/snmpd-data/monitor +share/snmp/snmpconf-data/snmpd-data/operation +share/snmp/snmpconf-data/snmpd-data/snmpconf-config +share/snmp/snmpconf-data/snmpd-data/system +share/snmp/snmpconf-data/snmpd-data/trapsinks +share/snmp/snmpconf-data/snmptrapd-data/formatting +share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config +share/snmp/snmpconf-data/snmptrapd-data/traphandle +@dirrm share/snmp/snmpconf-data/snmp-data +@dirrm share/snmp/snmpconf-data/snmpd-data +@dirrm share/snmp/snmpconf-data/snmptrapd-data +@dirrm share/snmp/snmpconf-data @dirrm share/snmp/mibs -@dirrm share/snmp/snmpconf/snmp.conf -@dirrm share/snmp/snmpconf/snmpd.conf -@dirrm share/snmp/snmpconf/snmptrapd.conf -@dirrm share/snmp/snmpconf @unexec rmdir %D/share/snmp 2>/dev/null || true |