diff options
| author | billf <billf@FreeBSD.org> | 2001-01-18 17:58:30 +0800 |
|---|---|---|
| committer | billf <billf@FreeBSD.org> | 2001-01-18 17:58:30 +0800 |
| commit | 03c3929421aef77171bc3fc02dffc92d290a973c (patch) | |
| tree | f0423da5cf422e3e361dfc69d623b342d0f9c699 | |
| parent | 4469bc1c42dfb535a13b97d6c2c55e16ae434896 (diff) | |
| download | freebsd-ports-gnome-03c3929421aef77171bc3fc02dffc92d290a973c.tar.gz freebsd-ports-gnome-03c3929421aef77171bc3fc02dffc92d290a973c.tar.zst freebsd-ports-gnome-03c3929421aef77171bc3fc02dffc92d290a973c.zip | |
Upgrade to version 4.2
Some of the shared library magic is very hackish, however the net-snmp
library building make-fu is hackish as well, so I don't feel bad about it.
This commit also (re-)enables the host module for much more information.
It also fixes a long standing bug where 'snmpwalk localhost public' would
hang.
66 files changed, 798 insertions, 474 deletions
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile index 5186049e7519..0d4d0507c864 100644 --- a/net-mgmt/net-snmp-devel/Makefile +++ b/net-mgmt/net-snmp-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.1.2 +PORTVERSION= 4.2 CATEGORIES= net ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ucd-snmp.ucdavis.edu/ \ @@ -17,27 +17,33 @@ MASTER_SITE_SUBDIR= net-snmp MAINTAINER= billf@FreeBSD.org USE_AUTOCONF= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS+= --enable-shared + +CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host" --with-gnu-ld .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif -USE_GMAKE= YES -MAN1= snmpbulkget.1 snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 \ - snmpgetnext.1 snmpinform.1 snmpnetstat.1 snmpset.1 \ - snmpstatus.1 snmptable.1 snmptest.1 \ - snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1 -MAN3= default_store.3 read_config.3 mib_api.3 snmp_agent_api.3 \ - snmp_alarm.3 snmp_api.3 snmp_close.3 snmp_free_pdu.3 \ - snmp_open.3 snmp_read.3 snmp_select_info.3 snmp_send.3 \ - snmp_sess_api.3 snmp_sess_async_send.3 snmp_sess_close.3 \ - snmp_sess_error.3 snmp_sess_init.3 snmp_sess_open.3 \ - snmp_sess_read.3 snmp_sess_select_info.3 snmp_sess_send.3 \ - snmp_sess_session.3 snmp_sess_timeout.3 snmp_timeout.3 \ - snmp_trap_api.3 +MAN1= 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 \ + 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 \ + snmp_agent_api.3 snmp_alarm.3 snmp_api.3 snmp_close.3 \ + snmp_free_pdu.3 snmp_open.3 snmp_read.3 snmp_select_info.3 \ + snmp_send.3 snmp_sess_api.3 snmp_sess_async_send.3 \ + snmp_sess_close.3 snmp_sess_error.3 snmp_sess_init.3 \ + snmp_sess_open.3 snmp_sess_read.3 snmp_sess_select_info.3 \ + snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \ + snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \ + snmp_timeout.3 MAN5= snmp.conf.5 snmp_config.5 snmpd.conf.5 \ snmptrapd.conf.5 variables.5 MAN8= snmptrapd.8 @@ -45,7 +51,7 @@ BIN= snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk SBIN= snmpd snmptrapd -STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample +STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh .include <bsd.port.pre.mk> @@ -64,6 +70,9 @@ post-install: @( cd ${PREFIX}/sbin && strip ${SBIN} ) @( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * ) @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) + @${INSTALL_SCRIPT} ${WRKSRC}/libsnmp.so.${SHLIB_VERSION} ${PREFIX}/lib + @${INSTALL_SCRIPT} ${WRKSRC}/libucdmibs.so.${SHLIB_VERSION} ${PREFIX}/lib + @${INSTALL_SCRIPT} ${WRKSRC}/libucdagent.so.${SHLIB_VERSION} ${PREFIX}/lib @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @( cd ${PREFIX}/lib && ${LN} -f libucdmibs.so.${SHLIB_VERSION} libucdmibs.so ) @( cd ${PREFIX}/lib && ${LN} -f libucdagent.so.${SHLIB_VERSION} libucdagent.so ) diff --git a/net-mgmt/net-snmp-devel/distinfo b/net-mgmt/net-snmp-devel/distinfo index 8b00c91941d4..bda76becbe98 100644 --- a/net-mgmt/net-snmp-devel/distinfo +++ b/net-mgmt/net-snmp-devel/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-4.1.2.tar.gz) = 378c8cf99e0845da4662fb72c956d20d +MD5 (ucd-snmp-4.2.tar.gz) = 7370edec952a6830459948d9808da7cb diff --git a/net-mgmt/net-snmp-devel/files/patch-aa b/net-mgmt/net-snmp-devel/files/patch-aa index ce70b47986cb..6c287d18ac93 100644 --- a/net-mgmt/net-snmp-devel/files/patch-aa +++ b/net-mgmt/net-snmp-devel/files/patch-aa @@ -1,13 +1,13 @@ ---- snmplib/Makefile.in~ Tue Mar 16 01:49:10 1999 -+++ snmplib/Makefile.in Sat Apr 3 13:30:11 1999 -@@ -41,6 +41,10 @@ +--- snmplib/Makefile.in.orig Mon Oct 2 11:41:46 2000 ++++ snmplib/Makefile.in Wed Jan 17 18:29:44 2001 +@@ -70,6 +70,10 @@ - libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${OBJS} - $(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${OBJS} -+ ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libsnmp.$(SHLIB_EXTENSION) ${OBJS} -+ ln -f libsnmp.$(SHLIB_EXTENSION) \ -+ libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) + libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} + $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ++ ld -Bshareable -soname libsnmp.so.4 \ ++ -o libsnmp.so ${OBJS} ++ ln -f libsnmp.so \ ++ ../libsnmp.so.4 + $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) installdirs: diff --git a/net-mgmt/net-snmp-devel/files/patch-ad b/net-mgmt/net-snmp-devel/files/patch-ad index 6f28af0a528f..bd85f7453919 100644 --- a/net-mgmt/net-snmp-devel/files/patch-ad +++ b/net-mgmt/net-snmp-devel/files/patch-ad @@ -1,6 +1,15 @@ ---- agent/mibgroup/mibII/interfaces.c~ Tue Mar 16 08:46:12 1999 -+++ agent/mibgroup/mibII/interfaces.c Sat Apr 3 13:49:28 1999 -@@ -1745,10 +1745,18 @@ +--- agent/mibgroup/mibII/interfaces.c.orig Fri Dec 1 14:17:21 2000 ++++ agent/mibgroup/mibII/interfaces.c Thu Jan 18 00:04:42 2001 +@@ -129,7 +129,7 @@ + #if HAVE_SYS_SYSCTL_H + #include <sys/sysctl.h> + +-#ifdef freebsd3 ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + # define USE_SYSCTL_IFLIST + #else + # if defined(CTL_NET) && !defined(freebsd2) +@@ -1842,10 +1842,18 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; @@ -19,7 +28,7 @@ int is_alias = 0; ifam = (struct ifa_msghdr *)rtm; ilen -= sizeof(*ifam); -@@ -1771,6 +1779,7 @@ +@@ -1868,6 +1876,7 @@ } sa = (struct sockaddr *)cp; } @@ -27,3 +36,12 @@ rtm = (struct rt_msghdr *)cp; } } +@@ -1982,7 +1991,7 @@ + if (ifmd.ifmd_data.ifi_lastchange.tv_sec == 0 && + ifmd.ifmd_data.ifi_lastchange.tv_usec == 0) { + long_return = 0; +- else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) ++ } else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) { + long_return = 0; + } else { + long_return = (u_long) diff --git a/net-mgmt/net-snmp-devel/files/patch-ah b/net-mgmt/net-snmp-devel/files/patch-ah index b80222ba72eb..194cbf3574b9 100644 --- a/net-mgmt/net-snmp-devel/files/patch-ah +++ b/net-mgmt/net-snmp-devel/files/patch-ah @@ -1,8 +1,7 @@ ---- local/tkmib.orig Wed Jul 21 19:06:52 1999 -+++ local/tkmib Sat Aug 28 02:37:57 1999 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w +--- local/tkmib~ Wed Jul 26 08:53:26 2000 ++++ local/tkmib Wed Jan 17 18:32:52 2001 +@@ -1,4 +1,3 @@ +-#!/usr/bin/perl + #!/usr/bin/perl -w require 5; - diff --git a/net-mgmt/net-snmp-devel/files/patch-ak b/net-mgmt/net-snmp-devel/files/patch-ak index 7ca23e85b748..8a9d310cd7a0 100644 --- a/net-mgmt/net-snmp-devel/files/patch-ak +++ b/net-mgmt/net-snmp-devel/files/patch-ak @@ -1,21 +1,21 @@ ---- agent/Makefile.in.old Tue May 16 19:58:54 2000 -+++ agent/Makefile.in Tue May 16 20:00:26 2000 -@@ -51,10 +51,18 @@ +--- 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.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${LIBAGENTOBJS} libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(SHLIB_LD_CMD) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${LIBAGENTOBJS} $(SHLIB_LD_LIBS) -+ ld -Bshareable -soname libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libucdagent.$(SHLIB_EXTENSION) ${LIBAGENTOBJS} -+ ln -f libucdagent.$(SHLIB_EXTENSION) \ -+ libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) + 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.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${MIBOBJS} - $(SHLIB_LD_CMD) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${MIBOBJS} $(SHLIB_LD_LIBS) -+ ld -Bshareable -soname libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libucdmibs.$(SHLIB_EXTENSION) ${MIBOBJS} -+ ln -f libucdmibs.$(SHLIB_EXTENSION) \ -+ libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_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-am b/net-mgmt/net-snmp-devel/files/patch-am deleted file mode 100644 index 0ad08d546705..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-am +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c~ Sat Dec 18 08:41:14 1999 -+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c Wed May 17 11:18:59 2000 -@@ -9,6 +9,9 @@ - #include <sys/time.h> - #include <sys/proc.h> - #include <sys/dkstat.h> -+#ifdef freebsd5 -+#include <sys/bio.h> -+#endif - #include <sys/buf.h> - #include <sys/uio.h> - #include <sys/namei.h> diff --git a/net-mgmt/net-snmp-devel/files/patch-an b/net-mgmt/net-snmp-devel/files/patch-an deleted file mode 100644 index 8153ba8c5653..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-an +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c~ Tue Mar 14 06:27:00 2000 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Wed May 17 11:19:23 2000 -@@ -10,6 +10,9 @@ - #include <sys/time.h> - #include <sys/proc.h> - #include <sys/dkstat.h> -+#ifdef freebsd5 -+#include <sys/bio.h> -+#endif - #include <sys/buf.h> - #include <sys/uio.h> - #include <sys/namei.h> diff --git a/net-mgmt/net-snmp-devel/files/patch-ao b/net-mgmt/net-snmp-devel/files/patch-ao new file mode 100644 index 000000000000..9ba64ec94695 --- /dev/null +++ b/net-mgmt/net-snmp-devel/files/patch-ao @@ -0,0 +1,11 @@ +--- agent/mibgroup/host/hr_filesys.c.orig Wed Jan 17 19:09:48 2001 ++++ agent/mibgroup/host/hr_filesys.c Wed Jan 17 19:10:22 2001 +@@ -38,7 +38,7 @@ + #include <stdlib.h> + #endif + +-#if defined(freebsd3) || defined(bsdi4) ++#if defined(freebsd3) || defined(bsdi4) || defined(freebsd4) || defined(freebsd5) + #if HAVE_GETFSSTAT + #if defined(MFSNAMELEN) + #define MOUNT_NFS "nfs" diff --git a/net-mgmt/net-snmp-devel/files/patch-ap b/net-mgmt/net-snmp-devel/files/patch-ap new file mode 100644 index 000000000000..4d2ec3fa92ab --- /dev/null +++ b/net-mgmt/net-snmp-devel/files/patch-ap @@ -0,0 +1,11 @@ +--- man/Makefile.in.orig Thu Jan 18 01:37:31 2001 ++++ man/Makefile.in Thu Jan 18 01:37:39 2001 +@@ -2,7 +2,7 @@ + + MAN1 = snmpcmd.1 snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 snmpbulkget.1 \ + snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 snmpstatus.1 \ +- snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 ++ snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 snmpconf.1 + MAN1G = snmpd.1 + MAN3 = snmp_agent_api.3 snmp_api.3 mib_api.3 snmp_sess_api.3 snmp_trap_api.3 \ + snmp_alarm.3 snmp_close.3 snmp_free_pdu.3 snmp_open.3 snmp_read.3 \ diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist index f14ce4af4ab9..d026a072ade1 100644 --- a/net-mgmt/net-snmp-devel/pkg-plist +++ b/net-mgmt/net-snmp-devel/pkg-plist @@ -16,7 +16,8 @@ bin/snmptrap bin/snmpusm bin/snmpwalk bin/tkmib -etc/rc.d/snmpd.sh.sample +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 @@ -41,7 +42,9 @@ 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 @@ -65,13 +68,24 @@ sbin/snmptrapd share/examples/ucd-snmp/EXAMPLE.conf share/examples/ucd-snmp/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp +share/snmp/mib2c.conf +share/snmp/mib2c.storage.conf +share/snmp/mib2c.vartypes.conf +share/snmp/mibs/AGENTX-MIB.txt +share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt share/snmp/mibs/DISMAN-SCRIPT-MIB.txt share/snmp/mibs/EtherLike-MIB.txt +share/snmp/mibs/HCNUM-TC.txt share/snmp/mibs/HOST-RESOURCES-MIB.txt share/snmp/mibs/HOST-RESOURCES-TYPES.txt +share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt +share/snmp/mibs/IANA-LANGUAGE-MIB.txt 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/IPV6-ICMP-MIB.txt share/snmp/mibs/IPV6-MIB.txt share/snmp/mibs/IPV6-TC.txt @@ -79,7 +93,9 @@ share/snmp/mibs/IPV6-TCP-MIB.txt share/snmp/mibs/IPV6-UDP-MIB.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 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt share/snmp/mibs/SNMP-MPD-MIB.txt @@ -100,6 +116,20 @@ 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 @unexec rm -f %D/share/snmp/mibs/.index @dirrm share/snmp/mibs +@dirrm share/snmp/snmpconf/snmp.conf +@dirrm share/snmp/snmpconf/snmpd.conf +@dirrm share/snmp/snmpconf @dirrm share/snmp diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index 5186049e7519..0d4d0507c864 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.1.2 +PORTVERSION= 4.2 CATEGORIES= net ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ucd-snmp.ucdavis.edu/ \ @@ -17,27 +17,33 @@ MASTER_SITE_SUBDIR= net-snmp MAINTAINER= billf@FreeBSD.org USE_AUTOCONF= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS+= --enable-shared + +CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host" --with-gnu-ld .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif -USE_GMAKE= YES -MAN1= snmpbulkget.1 snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 \ - snmpgetnext.1 snmpinform.1 snmpnetstat.1 snmpset.1 \ - snmpstatus.1 snmptable.1 snmptest.1 \ - snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1 -MAN3= default_store.3 read_config.3 mib_api.3 snmp_agent_api.3 \ - snmp_alarm.3 snmp_api.3 snmp_close.3 snmp_free_pdu.3 \ - snmp_open.3 snmp_read.3 snmp_select_info.3 snmp_send.3 \ - snmp_sess_api.3 snmp_sess_async_send.3 snmp_sess_close.3 \ - snmp_sess_error.3 snmp_sess_init.3 snmp_sess_open.3 \ - snmp_sess_read.3 snmp_sess_select_info.3 snmp_sess_send.3 \ - snmp_sess_session.3 snmp_sess_timeout.3 snmp_timeout.3 \ - snmp_trap_api.3 +MAN1= 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 \ + 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 \ + snmp_agent_api.3 snmp_alarm.3 snmp_api.3 snmp_close.3 \ + snmp_free_pdu.3 snmp_open.3 snmp_read.3 snmp_select_info.3 \ + snmp_send.3 snmp_sess_api.3 snmp_sess_async_send.3 \ + snmp_sess_close.3 snmp_sess_error.3 snmp_sess_init.3 \ + snmp_sess_open.3 snmp_sess_read.3 snmp_sess_select_info.3 \ + snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \ + snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \ + snmp_timeout.3 MAN5= snmp.conf.5 snmp_config.5 snmpd.conf.5 \ snmptrapd.conf.5 variables.5 MAN8= snmptrapd.8 @@ -45,7 +51,7 @@ BIN= snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk SBIN= snmpd snmptrapd -STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample +STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh .include <bsd.port.pre.mk> @@ -64,6 +70,9 @@ post-install: @( cd ${PREFIX}/sbin && strip ${SBIN} ) @( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * ) @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) + @${INSTALL_SCRIPT} ${WRKSRC}/libsnmp.so.${SHLIB_VERSION} ${PREFIX}/lib + @${INSTALL_SCRIPT} ${WRKSRC}/libucdmibs.so.${SHLIB_VERSION} ${PREFIX}/lib + @${INSTALL_SCRIPT} ${WRKSRC}/libucdagent.so.${SHLIB_VERSION} ${PREFIX}/lib @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @( cd ${PREFIX}/lib && ${LN} -f libucdmibs.so.${SHLIB_VERSION} libucdmibs.so ) @( cd ${PREFIX}/lib && ${LN} -f libucdagent.so.${SHLIB_VERSION} libucdagent.so ) diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo index 8b00c91941d4..bda76becbe98 100644 --- a/net-mgmt/net-snmp/distinfo +++ b/net-mgmt/net-snmp/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-4.1.2.tar.gz) = 378c8cf99e0845da4662fb72c956d20d +MD5 (ucd-snmp-4.2.tar.gz) = 7370edec952a6830459948d9808da7cb diff --git a/net-mgmt/net-snmp/files/patch-aa b/net-mgmt/net-snmp/files/patch-aa index ce70b47986cb..6c287d18ac93 100644 --- a/net-mgmt/net-snmp/files/patch-aa +++ b/net-mgmt/net-snmp/files/patch-aa @@ -1,13 +1,13 @@ ---- snmplib/Makefile.in~ Tue Mar 16 01:49:10 1999 -+++ snmplib/Makefile.in Sat Apr 3 13:30:11 1999 -@@ -41,6 +41,10 @@ +--- snmplib/Makefile.in.orig Mon Oct 2 11:41:46 2000 ++++ snmplib/Makefile.in Wed Jan 17 18:29:44 2001 +@@ -70,6 +70,10 @@ - libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${OBJS} - $(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${OBJS} -+ ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libsnmp.$(SHLIB_EXTENSION) ${OBJS} -+ ln -f libsnmp.$(SHLIB_EXTENSION) \ -+ libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) + libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} + $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ++ ld -Bshareable -soname libsnmp.so.4 \ ++ -o libsnmp.so ${OBJS} ++ ln -f libsnmp.so \ ++ ../libsnmp.so.4 + $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) installdirs: diff --git a/net-mgmt/net-snmp/files/patch-ad b/net-mgmt/net-snmp/files/patch-ad index 6f28af0a528f..bd85f7453919 100644 --- a/net-mgmt/net-snmp/files/patch-ad +++ b/net-mgmt/net-snmp/files/patch-ad @@ -1,6 +1,15 @@ ---- agent/mibgroup/mibII/interfaces.c~ Tue Mar 16 08:46:12 1999 -+++ agent/mibgroup/mibII/interfaces.c Sat Apr 3 13:49:28 1999 -@@ -1745,10 +1745,18 @@ +--- agent/mibgroup/mibII/interfaces.c.orig Fri Dec 1 14:17:21 2000 ++++ agent/mibgroup/mibII/interfaces.c Thu Jan 18 00:04:42 2001 +@@ -129,7 +129,7 @@ + #if HAVE_SYS_SYSCTL_H + #include <sys/sysctl.h> + +-#ifdef freebsd3 ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + # define USE_SYSCTL_IFLIST + #else + # if defined(CTL_NET) && !defined(freebsd2) +@@ -1842,10 +1842,18 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; @@ -19,7 +28,7 @@ int is_alias = 0; ifam = (struct ifa_msghdr *)rtm; ilen -= sizeof(*ifam); -@@ -1771,6 +1779,7 @@ +@@ -1868,6 +1876,7 @@ } sa = (struct sockaddr *)cp; } @@ -27,3 +36,12 @@ rtm = (struct rt_msghdr *)cp; } } +@@ -1982,7 +1991,7 @@ + if (ifmd.ifmd_data.ifi_lastchange.tv_sec == 0 && + ifmd.ifmd_data.ifi_lastchange.tv_usec == 0) { + long_return = 0; +- else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) ++ } else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) { + long_return = 0; + } else { + long_return = (u_long) diff --git a/net-mgmt/net-snmp/files/patch-ah b/net-mgmt/net-snmp/files/patch-ah index b80222ba72eb..194cbf3574b9 100644 --- a/net-mgmt/net-snmp/files/patch-ah +++ b/net-mgmt/net-snmp/files/patch-ah @@ -1,8 +1,7 @@ ---- local/tkmib.orig Wed Jul 21 19:06:52 1999 -+++ local/tkmib Sat Aug 28 02:37:57 1999 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w +--- local/tkmib~ Wed Jul 26 08:53:26 2000 ++++ local/tkmib Wed Jan 17 18:32:52 2001 +@@ -1,4 +1,3 @@ +-#!/usr/bin/perl + #!/usr/bin/perl -w require 5; - diff --git a/net-mgmt/net-snmp/files/patch-ak b/net-mgmt/net-snmp/files/patch-ak index 7ca23e85b748..8a9d310cd7a0 100644 --- a/net-mgmt/net-snmp/files/patch-ak +++ b/net-mgmt/net-snmp/files/patch-ak @@ -1,21 +1,21 @@ ---- agent/Makefile.in.old Tue May 16 19:58:54 2000 -+++ agent/Makefile.in Tue May 16 20:00:26 2000 -@@ -51,10 +51,18 @@ +--- 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.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${LIBAGENTOBJS} libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(SHLIB_LD_CMD) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${LIBAGENTOBJS} $(SHLIB_LD_LIBS) -+ ld -Bshareable -soname libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libucdagent.$(SHLIB_EXTENSION) ${LIBAGENTOBJS} -+ ln -f libucdagent.$(SHLIB_EXTENSION) \ -+ libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) + 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.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${MIBOBJS} - $(SHLIB_LD_CMD) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${MIBOBJS} $(SHLIB_LD_LIBS) -+ ld -Bshareable -soname libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libucdmibs.$(SHLIB_EXTENSION) ${MIBOBJS} -+ ln -f libucdmibs.$(SHLIB_EXTENSION) \ -+ libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_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-am b/net-mgmt/net-snmp/files/patch-am deleted file mode 100644 index 0ad08d546705..000000000000 --- a/net-mgmt/net-snmp/files/patch-am +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c~ Sat Dec 18 08:41:14 1999 -+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c Wed May 17 11:18:59 2000 -@@ -9,6 +9,9 @@ - #include <sys/time.h> - #include <sys/proc.h> - #include <sys/dkstat.h> -+#ifdef freebsd5 -+#include <sys/bio.h> -+#endif - #include <sys/buf.h> - #include <sys/uio.h> - #include <sys/namei.h> diff --git a/net-mgmt/net-snmp/files/patch-an b/net-mgmt/net-snmp/files/patch-an deleted file mode 100644 index 8153ba8c5653..000000000000 --- a/net-mgmt/net-snmp/files/patch-an +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c~ Tue Mar 14 06:27:00 2000 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Wed May 17 11:19:23 2000 -@@ -10,6 +10,9 @@ - #include <sys/time.h> - #include <sys/proc.h> - #include <sys/dkstat.h> -+#ifdef freebsd5 -+#include <sys/bio.h> -+#endif - #include <sys/buf.h> - #include <sys/uio.h> - #include <sys/namei.h> diff --git a/net-mgmt/net-snmp/files/patch-ao b/net-mgmt/net-snmp/files/patch-ao new file mode 100644 index 000000000000..9ba64ec94695 --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-ao @@ -0,0 +1,11 @@ +--- agent/mibgroup/host/hr_filesys.c.orig Wed Jan 17 19:09:48 2001 ++++ agent/mibgroup/host/hr_filesys.c Wed Jan 17 19:10:22 2001 +@@ -38,7 +38,7 @@ + #include <stdlib.h> + #endif + +-#if defined(freebsd3) || defined(bsdi4) ++#if defined(freebsd3) || defined(bsdi4) || defined(freebsd4) || defined(freebsd5) + #if HAVE_GETFSSTAT + #if defined(MFSNAMELEN) + #define MOUNT_NFS "nfs" diff --git a/net-mgmt/net-snmp/files/patch-ap b/net-mgmt/net-snmp/files/patch-ap new file mode 100644 index 000000000000..4d2ec3fa92ab --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-ap @@ -0,0 +1,11 @@ +--- man/Makefile.in.orig Thu Jan 18 01:37:31 2001 ++++ man/Makefile.in Thu Jan 18 01:37:39 2001 +@@ -2,7 +2,7 @@ + + MAN1 = snmpcmd.1 snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 snmpbulkget.1 \ + snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 snmpstatus.1 \ +- snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 ++ snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 snmpconf.1 + MAN1G = snmpd.1 + MAN3 = snmp_agent_api.3 snmp_api.3 mib_api.3 snmp_sess_api.3 snmp_trap_api.3 \ + snmp_alarm.3 snmp_close.3 snmp_free_pdu.3 snmp_open.3 snmp_read.3 \ diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist index f14ce4af4ab9..d026a072ade1 100644 --- a/net-mgmt/net-snmp/pkg-plist +++ b/net-mgmt/net-snmp/pkg-plist @@ -16,7 +16,8 @@ bin/snmptrap bin/snmpusm bin/snmpwalk bin/tkmib -etc/rc.d/snmpd.sh.sample +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 @@ -41,7 +42,9 @@ 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 @@ -65,13 +68,24 @@ sbin/snmptrapd share/examples/ucd-snmp/EXAMPLE.conf share/examples/ucd-snmp/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp +share/snmp/mib2c.conf +share/snmp/mib2c.storage.conf +share/snmp/mib2c.vartypes.conf +share/snmp/mibs/AGENTX-MIB.txt +share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt share/snmp/mibs/DISMAN-SCRIPT-MIB.txt share/snmp/mibs/EtherLike-MIB.txt +share/snmp/mibs/HCNUM-TC.txt share/snmp/mibs/HOST-RESOURCES-MIB.txt share/snmp/mibs/HOST-RESOURCES-TYPES.txt +share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt +share/snmp/mibs/IANA-LANGUAGE-MIB.txt 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/IPV6-ICMP-MIB.txt share/snmp/mibs/IPV6-MIB.txt share/snmp/mibs/IPV6-TC.txt @@ -79,7 +93,9 @@ share/snmp/mibs/IPV6-TCP-MIB.txt share/snmp/mibs/IPV6-UDP-MIB.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 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt share/snmp/mibs/SNMP-MPD-MIB.txt @@ -100,6 +116,20 @@ 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 @unexec rm -f %D/share/snmp/mibs/.index @dirrm share/snmp/mibs +@dirrm share/snmp/snmpconf/snmp.conf +@dirrm share/snmp/snmpconf/snmpd.conf +@dirrm share/snmp/snmpconf @dirrm share/snmp diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile index 5186049e7519..0d4d0507c864 100644 --- a/net-mgmt/net-snmp4/Makefile +++ b/net-mgmt/net-snmp4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.1.2 +PORTVERSION= 4.2 CATEGORIES= net ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ucd-snmp.ucdavis.edu/ \ @@ -17,27 +17,33 @@ MASTER_SITE_SUBDIR= net-snmp MAINTAINER= billf@FreeBSD.org USE_AUTOCONF= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS+= --enable-shared + +CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host" --with-gnu-ld .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif -USE_GMAKE= YES -MAN1= snmpbulkget.1 snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 \ - snmpgetnext.1 snmpinform.1 snmpnetstat.1 snmpset.1 \ - snmpstatus.1 snmptable.1 snmptest.1 \ - snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1 -MAN3= default_store.3 read_config.3 mib_api.3 snmp_agent_api.3 \ - snmp_alarm.3 snmp_api.3 snmp_close.3 snmp_free_pdu.3 \ - snmp_open.3 snmp_read.3 snmp_select_info.3 snmp_send.3 \ - snmp_sess_api.3 snmp_sess_async_send.3 snmp_sess_close.3 \ - snmp_sess_error.3 snmp_sess_init.3 snmp_sess_open.3 \ - snmp_sess_read.3 snmp_sess_select_info.3 snmp_sess_send.3 \ - snmp_sess_session.3 snmp_sess_timeout.3 snmp_timeout.3 \ - snmp_trap_api.3 +MAN1= 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 \ + 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 \ + snmp_agent_api.3 snmp_alarm.3 snmp_api.3 snmp_close.3 \ + snmp_free_pdu.3 snmp_open.3 snmp_read.3 snmp_select_info.3 \ + snmp_send.3 snmp_sess_api.3 snmp_sess_async_send.3 \ + snmp_sess_close.3 snmp_sess_error.3 snmp_sess_init.3 \ + snmp_sess_open.3 snmp_sess_read.3 snmp_sess_select_info.3 \ + snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \ + snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \ + snmp_timeout.3 MAN5= snmp.conf.5 snmp_config.5 snmpd.conf.5 \ snmptrapd.conf.5 variables.5 MAN8= snmptrapd.8 @@ -45,7 +51,7 @@ BIN= snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk SBIN= snmpd snmptrapd -STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample +STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh .include <bsd.port.pre.mk> @@ -64,6 +70,9 @@ post-install: @( cd ${PREFIX}/sbin && strip ${SBIN} ) @( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * ) @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) + @${INSTALL_SCRIPT} ${WRKSRC}/libsnmp.so.${SHLIB_VERSION} ${PREFIX}/lib + @${INSTALL_SCRIPT} ${WRKSRC}/libucdmibs.so.${SHLIB_VERSION} ${PREFIX}/lib + @${INSTALL_SCRIPT} ${WRKSRC}/libucdagent.so.${SHLIB_VERSION} ${PREFIX}/lib @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @( cd ${PREFIX}/lib && ${LN} -f libucdmibs.so.${SHLIB_VERSION} libucdmibs.so ) @( cd ${PREFIX}/lib && ${LN} -f libucdagent.so.${SHLIB_VERSION} libucdagent.so ) diff --git a/net-mgmt/net-snmp4/distinfo b/net-mgmt/net-snmp4/distinfo index 8b00c91941d4..bda76becbe98 100644 --- a/net-mgmt/net-snmp4/distinfo +++ b/net-mgmt/net-snmp4/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-4.1.2.tar.gz) = 378c8cf99e0845da4662fb72c956d20d +MD5 (ucd-snmp-4.2.tar.gz) = 7370edec952a6830459948d9808da7cb diff --git a/net-mgmt/net-snmp4/files/patch-aa b/net-mgmt/net-snmp4/files/patch-aa index ce70b47986cb..6c287d18ac93 100644 --- a/net-mgmt/net-snmp4/files/patch-aa +++ b/net-mgmt/net-snmp4/files/patch-aa @@ -1,13 +1,13 @@ ---- snmplib/Makefile.in~ Tue Mar 16 01:49:10 1999 -+++ snmplib/Makefile.in Sat Apr 3 13:30:11 1999 -@@ -41,6 +41,10 @@ +--- snmplib/Makefile.in.orig Mon Oct 2 11:41:46 2000 ++++ snmplib/Makefile.in Wed Jan 17 18:29:44 2001 +@@ -70,6 +70,10 @@ - libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${OBJS} - $(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${OBJS} -+ ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libsnmp.$(SHLIB_EXTENSION) ${OBJS} -+ ln -f libsnmp.$(SHLIB_EXTENSION) \ -+ libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) + libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} + $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ++ ld -Bshareable -soname libsnmp.so.4 \ ++ -o libsnmp.so ${OBJS} ++ ln -f libsnmp.so \ ++ ../libsnmp.so.4 + $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) installdirs: diff --git a/net-mgmt/net-snmp4/files/patch-ad b/net-mgmt/net-snmp4/files/patch-ad index 6f28af0a528f..bd85f7453919 100644 --- a/net-mgmt/net-snmp4/files/patch-ad +++ b/net-mgmt/net-snmp4/files/patch-ad @@ -1,6 +1,15 @@ ---- agent/mibgroup/mibII/interfaces.c~ Tue Mar 16 08:46:12 1999 -+++ agent/mibgroup/mibII/interfaces.c Sat Apr 3 13:49:28 1999 -@@ -1745,10 +1745,18 @@ +--- agent/mibgroup/mibII/interfaces.c.orig Fri Dec 1 14:17:21 2000 ++++ agent/mibgroup/mibII/interfaces.c Thu Jan 18 00:04:42 2001 +@@ -129,7 +129,7 @@ + #if HAVE_SYS_SYSCTL_H + #include <sys/sysctl.h> + +-#ifdef freebsd3 ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + # define USE_SYSCTL_IFLIST + #else + # if defined(CTL_NET) && !defined(freebsd2) +@@ -1842,10 +1842,18 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; @@ -19,7 +28,7 @@ int is_alias = 0; ifam = (struct ifa_msghdr *)rtm; ilen -= sizeof(*ifam); -@@ -1771,6 +1779,7 @@ +@@ -1868,6 +1876,7 @@ } sa = (struct sockaddr *)cp; } @@ -27,3 +36,12 @@ rtm = (struct rt_msghdr *)cp; } } +@@ -1982,7 +1991,7 @@ + if (ifmd.ifmd_data.ifi_lastchange.tv_sec == 0 && + ifmd.ifmd_data.ifi_lastchange.tv_usec == 0) { + long_return = 0; +- else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) ++ } else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) { + long_return = 0; + } else { + long_return = (u_long) diff --git a/net-mgmt/net-snmp4/files/patch-ah b/net-mgmt/net-snmp4/files/patch-ah index b80222ba72eb..194cbf3574b9 100644 --- a/net-mgmt/net-snmp4/files/patch-ah +++ b/net-mgmt/net-snmp4/files/patch-ah @@ -1,8 +1,7 @@ ---- local/tkmib.orig Wed Jul 21 19:06:52 1999 -+++ local/tkmib Sat Aug 28 02:37:57 1999 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w +--- local/tkmib~ Wed Jul 26 08:53:26 2000 ++++ local/tkmib Wed Jan 17 18:32:52 2001 +@@ -1,4 +1,3 @@ +-#!/usr/bin/perl + #!/usr/bin/perl -w require 5; - diff --git a/net-mgmt/net-snmp4/files/patch-ak b/net-mgmt/net-snmp4/files/patch-ak index 7ca23e85b748..8a9d310cd7a0 100644 --- a/net-mgmt/net-snmp4/files/patch-ak +++ b/net-mgmt/net-snmp4/files/patch-ak @@ -1,21 +1,21 @@ ---- agent/Makefile.in.old Tue May 16 19:58:54 2000 -+++ agent/Makefile.in Tue May 16 20:00:26 2000 -@@ -51,10 +51,18 @@ +--- 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.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${LIBAGENTOBJS} libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(SHLIB_LD_CMD) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${LIBAGENTOBJS} $(SHLIB_LD_LIBS) -+ ld -Bshareable -soname libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libucdagent.$(SHLIB_EXTENSION) ${LIBAGENTOBJS} -+ ln -f libucdagent.$(SHLIB_EXTENSION) \ -+ libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) + 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.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${MIBOBJS} - $(SHLIB_LD_CMD) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${MIBOBJS} $(SHLIB_LD_LIBS) -+ ld -Bshareable -soname libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libucdmibs.$(SHLIB_EXTENSION) ${MIBOBJS} -+ ln -f libucdmibs.$(SHLIB_EXTENSION) \ -+ libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_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-snmp4/files/patch-am b/net-mgmt/net-snmp4/files/patch-am deleted file mode 100644 index 0ad08d546705..000000000000 --- a/net-mgmt/net-snmp4/files/patch-am +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c~ Sat Dec 18 08:41:14 1999 -+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c Wed May 17 11:18:59 2000 -@@ -9,6 +9,9 @@ - #include <sys/time.h> - #include <sys/proc.h> - #include <sys/dkstat.h> -+#ifdef freebsd5 -+#include <sys/bio.h> -+#endif - #include <sys/buf.h> - #include <sys/uio.h> - #include <sys/namei.h> diff --git a/net-mgmt/net-snmp4/files/patch-an b/net-mgmt/net-snmp4/files/patch-an deleted file mode 100644 index 8153ba8c5653..000000000000 --- a/net-mgmt/net-snmp4/files/patch-an +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c~ Tue Mar 14 06:27:00 2000 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Wed May 17 11:19:23 2000 -@@ -10,6 +10,9 @@ - #include <sys/time.h> - #include <sys/proc.h> - #include <sys/dkstat.h> -+#ifdef freebsd5 -+#include <sys/bio.h> -+#endif - #include <sys/buf.h> - #include <sys/uio.h> - #include <sys/namei.h> diff --git a/net-mgmt/net-snmp4/files/patch-ao b/net-mgmt/net-snmp4/files/patch-ao new file mode 100644 index 000000000000..9ba64ec94695 --- /dev/null +++ b/net-mgmt/net-snmp4/files/patch-ao @@ -0,0 +1,11 @@ +--- agent/mibgroup/host/hr_filesys.c.orig Wed Jan 17 19:09:48 2001 ++++ agent/mibgroup/host/hr_filesys.c Wed Jan 17 19:10:22 2001 +@@ -38,7 +38,7 @@ + #include <stdlib.h> + #endif + +-#if defined(freebsd3) || defined(bsdi4) ++#if defined(freebsd3) || defined(bsdi4) || defined(freebsd4) || defined(freebsd5) + #if HAVE_GETFSSTAT + #if defined(MFSNAMELEN) + #define MOUNT_NFS "nfs" diff --git a/net-mgmt/net-snmp4/files/patch-ap b/net-mgmt/net-snmp4/files/patch-ap new file mode 100644 index 000000000000..4d2ec3fa92ab --- /dev/null +++ b/net-mgmt/net-snmp4/files/patch-ap @@ -0,0 +1,11 @@ +--- man/Makefile.in.orig Thu Jan 18 01:37:31 2001 ++++ man/Makefile.in Thu Jan 18 01:37:39 2001 +@@ -2,7 +2,7 @@ + + MAN1 = snmpcmd.1 snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 snmpbulkget.1 \ + snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 snmpstatus.1 \ +- snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 ++ snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 snmpconf.1 + MAN1G = snmpd.1 + MAN3 = snmp_agent_api.3 snmp_api.3 mib_api.3 snmp_sess_api.3 snmp_trap_api.3 \ + snmp_alarm.3 snmp_close.3 snmp_free_pdu.3 snmp_open.3 snmp_read.3 \ diff --git a/net-mgmt/net-snmp4/pkg-plist b/net-mgmt/net-snmp4/pkg-plist index f14ce4af4ab9..d026a072ade1 100644 --- a/net-mgmt/net-snmp4/pkg-plist +++ b/net-mgmt/net-snmp4/pkg-plist @@ -16,7 +16,8 @@ bin/snmptrap bin/snmpusm bin/snmpwalk bin/tkmib -etc/rc.d/snmpd.sh.sample +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 @@ -41,7 +42,9 @@ 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 @@ -65,13 +68,24 @@ sbin/snmptrapd share/examples/ucd-snmp/EXAMPLE.conf share/examples/ucd-snmp/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp +share/snmp/mib2c.conf +share/snmp/mib2c.storage.conf +share/snmp/mib2c.vartypes.conf +share/snmp/mibs/AGENTX-MIB.txt +share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt share/snmp/mibs/DISMAN-SCRIPT-MIB.txt share/snmp/mibs/EtherLike-MIB.txt +share/snmp/mibs/HCNUM-TC.txt share/snmp/mibs/HOST-RESOURCES-MIB.txt share/snmp/mibs/HOST-RESOURCES-TYPES.txt +share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt +share/snmp/mibs/IANA-LANGUAGE-MIB.txt 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/IPV6-ICMP-MIB.txt share/snmp/mibs/IPV6-MIB.txt share/snmp/mibs/IPV6-TC.txt @@ -79,7 +93,9 @@ share/snmp/mibs/IPV6-TCP-MIB.txt share/snmp/mibs/IPV6-UDP-MIB.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 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt share/snmp/mibs/SNMP-MPD-MIB.txt @@ -100,6 +116,20 @@ 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 @unexec rm -f %D/share/snmp/mibs/.index @dirrm share/snmp/mibs +@dirrm share/snmp/snmpconf/snmp.conf +@dirrm share/snmp/snmpconf/snmpd.conf +@dirrm share/snmp/snmpconf @dirrm share/snmp diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile index 5186049e7519..0d4d0507c864 100644 --- a/net-mgmt/net-snmp53/Makefile +++ b/net-mgmt/net-snmp53/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.1.2 +PORTVERSION= 4.2 CATEGORIES= net ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ucd-snmp.ucdavis.edu/ \ @@ -17,27 +17,33 @@ MASTER_SITE_SUBDIR= net-snmp MAINTAINER= billf@FreeBSD.org USE_AUTOCONF= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS+= --enable-shared + +CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host" --with-gnu-ld .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif -USE_GMAKE= YES -MAN1= snmpbulkget.1 snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 \ - snmpgetnext.1 snmpinform.1 snmpnetstat.1 snmpset.1 \ - snmpstatus.1 snmptable.1 snmptest.1 \ - snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1 -MAN3= default_store.3 read_config.3 mib_api.3 snmp_agent_api.3 \ - snmp_alarm.3 snmp_api.3 snmp_close.3 snmp_free_pdu.3 \ - snmp_open.3 snmp_read.3 snmp_select_info.3 snmp_send.3 \ - snmp_sess_api.3 snmp_sess_async_send.3 snmp_sess_close.3 \ - snmp_sess_error.3 snmp_sess_init.3 snmp_sess_open.3 \ - snmp_sess_read.3 snmp_sess_select_info.3 snmp_sess_send.3 \ - snmp_sess_session.3 snmp_sess_timeout.3 snmp_timeout.3 \ - snmp_trap_api.3 +MAN1= 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 \ + 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 \ + snmp_agent_api.3 snmp_alarm.3 snmp_api.3 snmp_close.3 \ + snmp_free_pdu.3 snmp_open.3 snmp_read.3 snmp_select_info.3 \ + snmp_send.3 snmp_sess_api.3 snmp_sess_async_send.3 \ + snmp_sess_close.3 snmp_sess_error.3 snmp_sess_init.3 \ + snmp_sess_open.3 snmp_sess_read.3 snmp_sess_select_info.3 \ + snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \ + snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \ + snmp_timeout.3 MAN5= snmp.conf.5 snmp_config.5 snmpd.conf.5 \ snmptrapd.conf.5 variables.5 MAN8= snmptrapd.8 @@ -45,7 +51,7 @@ BIN= snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk SBIN= snmpd snmptrapd -STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample +STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh .include <bsd.port.pre.mk> @@ -64,6 +70,9 @@ post-install: @( cd ${PREFIX}/sbin && strip ${SBIN} ) @( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * ) @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) + @${INSTALL_SCRIPT} ${WRKSRC}/libsnmp.so.${SHLIB_VERSION} ${PREFIX}/lib + @${INSTALL_SCRIPT} ${WRKSRC}/libucdmibs.so.${SHLIB_VERSION} ${PREFIX}/lib + @${INSTALL_SCRIPT} ${WRKSRC}/libucdagent.so.${SHLIB_VERSION} ${PREFIX}/lib @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @( cd ${PREFIX}/lib && ${LN} -f libucdmibs.so.${SHLIB_VERSION} libucdmibs.so ) @( cd ${PREFIX}/lib && ${LN} -f libucdagent.so.${SHLIB_VERSION} libucdagent.so ) diff --git a/net-mgmt/net-snmp53/distinfo b/net-mgmt/net-snmp53/distinfo index 8b00c91941d4..bda76becbe98 100644 --- a/net-mgmt/net-snmp53/distinfo +++ b/net-mgmt/net-snmp53/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-4.1.2.tar.gz) = 378c8cf99e0845da4662fb72c956d20d +MD5 (ucd-snmp-4.2.tar.gz) = 7370edec952a6830459948d9808da7cb diff --git a/net-mgmt/net-snmp53/files/patch-aa b/net-mgmt/net-snmp53/files/patch-aa index ce70b47986cb..6c287d18ac93 100644 --- a/net-mgmt/net-snmp53/files/patch-aa +++ b/net-mgmt/net-snmp53/files/patch-aa @@ -1,13 +1,13 @@ ---- snmplib/Makefile.in~ Tue Mar 16 01:49:10 1999 -+++ snmplib/Makefile.in Sat Apr 3 13:30:11 1999 -@@ -41,6 +41,10 @@ +--- snmplib/Makefile.in.orig Mon Oct 2 11:41:46 2000 ++++ snmplib/Makefile.in Wed Jan 17 18:29:44 2001 +@@ -70,6 +70,10 @@ - libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${OBJS} - $(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${OBJS} -+ ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libsnmp.$(SHLIB_EXTENSION) ${OBJS} -+ ln -f libsnmp.$(SHLIB_EXTENSION) \ -+ libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) + libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} + $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ++ ld -Bshareable -soname libsnmp.so.4 \ ++ -o libsnmp.so ${OBJS} ++ ln -f libsnmp.so \ ++ ../libsnmp.so.4 + $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) installdirs: diff --git a/net-mgmt/net-snmp53/files/patch-ad b/net-mgmt/net-snmp53/files/patch-ad index 6f28af0a528f..bd85f7453919 100644 --- a/net-mgmt/net-snmp53/files/patch-ad +++ b/net-mgmt/net-snmp53/files/patch-ad @@ -1,6 +1,15 @@ ---- agent/mibgroup/mibII/interfaces.c~ Tue Mar 16 08:46:12 1999 -+++ agent/mibgroup/mibII/interfaces.c Sat Apr 3 13:49:28 1999 -@@ -1745,10 +1745,18 @@ +--- agent/mibgroup/mibII/interfaces.c.orig Fri Dec 1 14:17:21 2000 ++++ agent/mibgroup/mibII/interfaces.c Thu Jan 18 00:04:42 2001 +@@ -129,7 +129,7 @@ + #if HAVE_SYS_SYSCTL_H + #include <sys/sysctl.h> + +-#ifdef freebsd3 ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + # define USE_SYSCTL_IFLIST + #else + # if defined(CTL_NET) && !defined(freebsd2) +@@ -1842,10 +1842,18 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; @@ -19,7 +28,7 @@ int is_alias = 0; ifam = (struct ifa_msghdr *)rtm; ilen -= sizeof(*ifam); -@@ -1771,6 +1779,7 @@ +@@ -1868,6 +1876,7 @@ } sa = (struct sockaddr *)cp; } @@ -27,3 +36,12 @@ rtm = (struct rt_msghdr *)cp; } } +@@ -1982,7 +1991,7 @@ + if (ifmd.ifmd_data.ifi_lastchange.tv_sec == 0 && + ifmd.ifmd_data.ifi_lastchange.tv_usec == 0) { + long_return = 0; +- else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) ++ } else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) { + long_return = 0; + } else { + long_return = (u_long) diff --git a/net-mgmt/net-snmp53/files/patch-ah b/net-mgmt/net-snmp53/files/patch-ah index b80222ba72eb..194cbf3574b9 100644 --- a/net-mgmt/net-snmp53/files/patch-ah +++ b/net-mgmt/net-snmp53/files/patch-ah @@ -1,8 +1,7 @@ ---- local/tkmib.orig Wed Jul 21 19:06:52 1999 -+++ local/tkmib Sat Aug 28 02:37:57 1999 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w +--- local/tkmib~ Wed Jul 26 08:53:26 2000 ++++ local/tkmib Wed Jan 17 18:32:52 2001 +@@ -1,4 +1,3 @@ +-#!/usr/bin/perl + #!/usr/bin/perl -w require 5; - diff --git a/net-mgmt/net-snmp53/files/patch-ak b/net-mgmt/net-snmp53/files/patch-ak index 7ca23e85b748..8a9d310cd7a0 100644 --- a/net-mgmt/net-snmp53/files/patch-ak +++ b/net-mgmt/net-snmp53/files/patch-ak @@ -1,21 +1,21 @@ ---- agent/Makefile.in.old Tue May 16 19:58:54 2000 -+++ agent/Makefile.in Tue May 16 20:00:26 2000 -@@ -51,10 +51,18 @@ +--- 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.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${LIBAGENTOBJS} libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(SHLIB_LD_CMD) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${LIBAGENTOBJS} $(SHLIB_LD_LIBS) -+ ld -Bshareable -soname libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libucdagent.$(SHLIB_EXTENSION) ${LIBAGENTOBJS} -+ ln -f libucdagent.$(SHLIB_EXTENSION) \ -+ libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) + 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.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${MIBOBJS} - $(SHLIB_LD_CMD) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${MIBOBJS} $(SHLIB_LD_LIBS) -+ ld -Bshareable -soname libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libucdmibs.$(SHLIB_EXTENSION) ${MIBOBJS} -+ ln -f libucdmibs.$(SHLIB_EXTENSION) \ -+ libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_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-am b/net-mgmt/net-snmp53/files/patch-am deleted file mode 100644 index 0ad08d546705..000000000000 --- a/net-mgmt/net-snmp53/files/patch-am +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c~ Sat Dec 18 08:41:14 1999 -+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c Wed May 17 11:18:59 2000 -@@ -9,6 +9,9 @@ - #include <sys/time.h> - #include <sys/proc.h> - #include <sys/dkstat.h> -+#ifdef freebsd5 -+#include <sys/bio.h> -+#endif - #include <sys/buf.h> - #include <sys/uio.h> - #include <sys/namei.h> diff --git a/net-mgmt/net-snmp53/files/patch-an b/net-mgmt/net-snmp53/files/patch-an deleted file mode 100644 index 8153ba8c5653..000000000000 --- a/net-mgmt/net-snmp53/files/patch-an +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c~ Tue Mar 14 06:27:00 2000 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Wed May 17 11:19:23 2000 -@@ -10,6 +10,9 @@ - #include <sys/time.h> - #include <sys/proc.h> - #include <sys/dkstat.h> -+#ifdef freebsd5 -+#include <sys/bio.h> -+#endif - #include <sys/buf.h> - #include <sys/uio.h> - #include <sys/namei.h> diff --git a/net-mgmt/net-snmp53/files/patch-ao b/net-mgmt/net-snmp53/files/patch-ao new file mode 100644 index 000000000000..9ba64ec94695 --- /dev/null +++ b/net-mgmt/net-snmp53/files/patch-ao @@ -0,0 +1,11 @@ +--- agent/mibgroup/host/hr_filesys.c.orig Wed Jan 17 19:09:48 2001 ++++ agent/mibgroup/host/hr_filesys.c Wed Jan 17 19:10:22 2001 +@@ -38,7 +38,7 @@ + #include <stdlib.h> + #endif + +-#if defined(freebsd3) || defined(bsdi4) ++#if defined(freebsd3) || defined(bsdi4) || defined(freebsd4) || defined(freebsd5) + #if HAVE_GETFSSTAT + #if defined(MFSNAMELEN) + #define MOUNT_NFS "nfs" diff --git a/net-mgmt/net-snmp53/files/patch-ap b/net-mgmt/net-snmp53/files/patch-ap new file mode 100644 index 000000000000..4d2ec3fa92ab --- /dev/null +++ b/net-mgmt/net-snmp53/files/patch-ap @@ -0,0 +1,11 @@ +--- man/Makefile.in.orig Thu Jan 18 01:37:31 2001 ++++ man/Makefile.in Thu Jan 18 01:37:39 2001 +@@ -2,7 +2,7 @@ + + MAN1 = snmpcmd.1 snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 snmpbulkget.1 \ + snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 snmpstatus.1 \ +- snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 ++ snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 snmpconf.1 + MAN1G = snmpd.1 + MAN3 = snmp_agent_api.3 snmp_api.3 mib_api.3 snmp_sess_api.3 snmp_trap_api.3 \ + snmp_alarm.3 snmp_close.3 snmp_free_pdu.3 snmp_open.3 snmp_read.3 \ diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist index f14ce4af4ab9..d026a072ade1 100644 --- a/net-mgmt/net-snmp53/pkg-plist +++ b/net-mgmt/net-snmp53/pkg-plist @@ -16,7 +16,8 @@ bin/snmptrap bin/snmpusm bin/snmpwalk bin/tkmib -etc/rc.d/snmpd.sh.sample +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 @@ -41,7 +42,9 @@ 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 @@ -65,13 +68,24 @@ sbin/snmptrapd share/examples/ucd-snmp/EXAMPLE.conf share/examples/ucd-snmp/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp +share/snmp/mib2c.conf +share/snmp/mib2c.storage.conf +share/snmp/mib2c.vartypes.conf +share/snmp/mibs/AGENTX-MIB.txt +share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt share/snmp/mibs/DISMAN-SCRIPT-MIB.txt share/snmp/mibs/EtherLike-MIB.txt +share/snmp/mibs/HCNUM-TC.txt share/snmp/mibs/HOST-RESOURCES-MIB.txt share/snmp/mibs/HOST-RESOURCES-TYPES.txt +share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt +share/snmp/mibs/IANA-LANGUAGE-MIB.txt 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/IPV6-ICMP-MIB.txt share/snmp/mibs/IPV6-MIB.txt share/snmp/mibs/IPV6-TC.txt @@ -79,7 +93,9 @@ share/snmp/mibs/IPV6-TCP-MIB.txt share/snmp/mibs/IPV6-UDP-MIB.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 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt share/snmp/mibs/SNMP-MPD-MIB.txt @@ -100,6 +116,20 @@ 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 @unexec rm -f %D/share/snmp/mibs/.index @dirrm share/snmp/mibs +@dirrm share/snmp/snmpconf/snmp.conf +@dirrm share/snmp/snmpconf/snmpd.conf +@dirrm share/snmp/snmpconf @dirrm share/snmp diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 5186049e7519..0d4d0507c864 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.1.2 +PORTVERSION= 4.2 CATEGORIES= net ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ucd-snmp.ucdavis.edu/ \ @@ -17,27 +17,33 @@ MASTER_SITE_SUBDIR= net-snmp MAINTAINER= billf@FreeBSD.org USE_AUTOCONF= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS+= --enable-shared + +CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host" --with-gnu-ld .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif -USE_GMAKE= YES -MAN1= snmpbulkget.1 snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 \ - snmpgetnext.1 snmpinform.1 snmpnetstat.1 snmpset.1 \ - snmpstatus.1 snmptable.1 snmptest.1 \ - snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1 -MAN3= default_store.3 read_config.3 mib_api.3 snmp_agent_api.3 \ - snmp_alarm.3 snmp_api.3 snmp_close.3 snmp_free_pdu.3 \ - snmp_open.3 snmp_read.3 snmp_select_info.3 snmp_send.3 \ - snmp_sess_api.3 snmp_sess_async_send.3 snmp_sess_close.3 \ - snmp_sess_error.3 snmp_sess_init.3 snmp_sess_open.3 \ - snmp_sess_read.3 snmp_sess_select_info.3 snmp_sess_send.3 \ - snmp_sess_session.3 snmp_sess_timeout.3 snmp_timeout.3 \ - snmp_trap_api.3 +MAN1= 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 \ + 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 \ + snmp_agent_api.3 snmp_alarm.3 snmp_api.3 snmp_close.3 \ + snmp_free_pdu.3 snmp_open.3 snmp_read.3 snmp_select_info.3 \ + snmp_send.3 snmp_sess_api.3 snmp_sess_async_send.3 \ + snmp_sess_close.3 snmp_sess_error.3 snmp_sess_init.3 \ + snmp_sess_open.3 snmp_sess_read.3 snmp_sess_select_info.3 \ + snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \ + snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \ + snmp_timeout.3 MAN5= snmp.conf.5 snmp_config.5 snmpd.conf.5 \ snmptrapd.conf.5 variables.5 MAN8= snmptrapd.8 @@ -45,7 +51,7 @@ BIN= snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk SBIN= snmpd snmptrapd -STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample +STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh .include <bsd.port.pre.mk> @@ -64,6 +70,9 @@ post-install: @( cd ${PREFIX}/sbin && strip ${SBIN} ) @( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * ) @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) + @${INSTALL_SCRIPT} ${WRKSRC}/libsnmp.so.${SHLIB_VERSION} ${PREFIX}/lib + @${INSTALL_SCRIPT} ${WRKSRC}/libucdmibs.so.${SHLIB_VERSION} ${PREFIX}/lib + @${INSTALL_SCRIPT} ${WRKSRC}/libucdagent.so.${SHLIB_VERSION} ${PREFIX}/lib @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @( cd ${PREFIX}/lib && ${LN} -f libucdmibs.so.${SHLIB_VERSION} libucdmibs.so ) @( cd ${PREFIX}/lib && ${LN} -f libucdagent.so.${SHLIB_VERSION} libucdagent.so ) diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo index 8b00c91941d4..bda76becbe98 100644 --- a/net/net-snmp/distinfo +++ b/net/net-snmp/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-4.1.2.tar.gz) = 378c8cf99e0845da4662fb72c956d20d +MD5 (ucd-snmp-4.2.tar.gz) = 7370edec952a6830459948d9808da7cb diff --git a/net/net-snmp/files/patch-aa b/net/net-snmp/files/patch-aa index ce70b47986cb..6c287d18ac93 100644 --- a/net/net-snmp/files/patch-aa +++ b/net/net-snmp/files/patch-aa @@ -1,13 +1,13 @@ ---- snmplib/Makefile.in~ Tue Mar 16 01:49:10 1999 -+++ snmplib/Makefile.in Sat Apr 3 13:30:11 1999 -@@ -41,6 +41,10 @@ +--- snmplib/Makefile.in.orig Mon Oct 2 11:41:46 2000 ++++ snmplib/Makefile.in Wed Jan 17 18:29:44 2001 +@@ -70,6 +70,10 @@ - libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${OBJS} - $(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${OBJS} -+ ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libsnmp.$(SHLIB_EXTENSION) ${OBJS} -+ ln -f libsnmp.$(SHLIB_EXTENSION) \ -+ libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) + libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} + $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ++ ld -Bshareable -soname libsnmp.so.4 \ ++ -o libsnmp.so ${OBJS} ++ ln -f libsnmp.so \ ++ ../libsnmp.so.4 + $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) installdirs: diff --git a/net/net-snmp/files/patch-ad b/net/net-snmp/files/patch-ad index 6f28af0a528f..bd85f7453919 100644 --- a/net/net-snmp/files/patch-ad +++ b/net/net-snmp/files/patch-ad @@ -1,6 +1,15 @@ ---- agent/mibgroup/mibII/interfaces.c~ Tue Mar 16 08:46:12 1999 -+++ agent/mibgroup/mibII/interfaces.c Sat Apr 3 13:49:28 1999 -@@ -1745,10 +1745,18 @@ +--- agent/mibgroup/mibII/interfaces.c.orig Fri Dec 1 14:17:21 2000 ++++ agent/mibgroup/mibII/interfaces.c Thu Jan 18 00:04:42 2001 +@@ -129,7 +129,7 @@ + #if HAVE_SYS_SYSCTL_H + #include <sys/sysctl.h> + +-#ifdef freebsd3 ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + # define USE_SYSCTL_IFLIST + #else + # if defined(CTL_NET) && !defined(freebsd2) +@@ -1842,10 +1842,18 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; @@ -19,7 +28,7 @@ int is_alias = 0; ifam = (struct ifa_msghdr *)rtm; ilen -= sizeof(*ifam); -@@ -1771,6 +1779,7 @@ +@@ -1868,6 +1876,7 @@ } sa = (struct sockaddr *)cp; } @@ -27,3 +36,12 @@ rtm = (struct rt_msghdr *)cp; } } +@@ -1982,7 +1991,7 @@ + if (ifmd.ifmd_data.ifi_lastchange.tv_sec == 0 && + ifmd.ifmd_data.ifi_lastchange.tv_usec == 0) { + long_return = 0; +- else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) ++ } else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) { + long_return = 0; + } else { + long_return = (u_long) diff --git a/net/net-snmp/files/patch-ah b/net/net-snmp/files/patch-ah index b80222ba72eb..194cbf3574b9 100644 --- a/net/net-snmp/files/patch-ah +++ b/net/net-snmp/files/patch-ah @@ -1,8 +1,7 @@ ---- local/tkmib.orig Wed Jul 21 19:06:52 1999 -+++ local/tkmib Sat Aug 28 02:37:57 1999 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w +--- local/tkmib~ Wed Jul 26 08:53:26 2000 ++++ local/tkmib Wed Jan 17 18:32:52 2001 +@@ -1,4 +1,3 @@ +-#!/usr/bin/perl + #!/usr/bin/perl -w require 5; - diff --git a/net/net-snmp/files/patch-ak b/net/net-snmp/files/patch-ak index 7ca23e85b748..8a9d310cd7a0 100644 --- a/net/net-snmp/files/patch-ak +++ b/net/net-snmp/files/patch-ak @@ -1,21 +1,21 @@ ---- agent/Makefile.in.old Tue May 16 19:58:54 2000 -+++ agent/Makefile.in Tue May 16 20:00:26 2000 -@@ -51,10 +51,18 @@ +--- 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.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${LIBAGENTOBJS} libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(SHLIB_LD_CMD) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${LIBAGENTOBJS} $(SHLIB_LD_LIBS) -+ ld -Bshareable -soname libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libucdagent.$(SHLIB_EXTENSION) ${LIBAGENTOBJS} -+ ln -f libucdagent.$(SHLIB_EXTENSION) \ -+ libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) + 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.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${MIBOBJS} - $(SHLIB_LD_CMD) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${MIBOBJS} $(SHLIB_LD_LIBS) -+ ld -Bshareable -soname libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libucdmibs.$(SHLIB_EXTENSION) ${MIBOBJS} -+ ln -f libucdmibs.$(SHLIB_EXTENSION) \ -+ libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_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-am b/net/net-snmp/files/patch-am deleted file mode 100644 index 0ad08d546705..000000000000 --- a/net/net-snmp/files/patch-am +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c~ Sat Dec 18 08:41:14 1999 -+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c Wed May 17 11:18:59 2000 -@@ -9,6 +9,9 @@ - #include <sys/time.h> - #include <sys/proc.h> - #include <sys/dkstat.h> -+#ifdef freebsd5 -+#include <sys/bio.h> -+#endif - #include <sys/buf.h> - #include <sys/uio.h> - #include <sys/namei.h> diff --git a/net/net-snmp/files/patch-an b/net/net-snmp/files/patch-an deleted file mode 100644 index 8153ba8c5653..000000000000 --- a/net/net-snmp/files/patch-an +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c~ Tue Mar 14 06:27:00 2000 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Wed May 17 11:19:23 2000 -@@ -10,6 +10,9 @@ - #include <sys/time.h> - #include <sys/proc.h> - #include <sys/dkstat.h> -+#ifdef freebsd5 -+#include <sys/bio.h> -+#endif - #include <sys/buf.h> - #include <sys/uio.h> - #include <sys/namei.h> diff --git a/net/net-snmp/files/patch-ao b/net/net-snmp/files/patch-ao new file mode 100644 index 000000000000..9ba64ec94695 --- /dev/null +++ b/net/net-snmp/files/patch-ao @@ -0,0 +1,11 @@ +--- agent/mibgroup/host/hr_filesys.c.orig Wed Jan 17 19:09:48 2001 ++++ agent/mibgroup/host/hr_filesys.c Wed Jan 17 19:10:22 2001 +@@ -38,7 +38,7 @@ + #include <stdlib.h> + #endif + +-#if defined(freebsd3) || defined(bsdi4) ++#if defined(freebsd3) || defined(bsdi4) || defined(freebsd4) || defined(freebsd5) + #if HAVE_GETFSSTAT + #if defined(MFSNAMELEN) + #define MOUNT_NFS "nfs" diff --git a/net/net-snmp/files/patch-ap b/net/net-snmp/files/patch-ap new file mode 100644 index 000000000000..4d2ec3fa92ab --- /dev/null +++ b/net/net-snmp/files/patch-ap @@ -0,0 +1,11 @@ +--- man/Makefile.in.orig Thu Jan 18 01:37:31 2001 ++++ man/Makefile.in Thu Jan 18 01:37:39 2001 +@@ -2,7 +2,7 @@ + + MAN1 = snmpcmd.1 snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 snmpbulkget.1 \ + snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 snmpstatus.1 \ +- snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 ++ snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 snmpconf.1 + MAN1G = snmpd.1 + MAN3 = snmp_agent_api.3 snmp_api.3 mib_api.3 snmp_sess_api.3 snmp_trap_api.3 \ + snmp_alarm.3 snmp_close.3 snmp_free_pdu.3 snmp_open.3 snmp_read.3 \ diff --git a/net/net-snmp/pkg-plist b/net/net-snmp/pkg-plist index f14ce4af4ab9..d026a072ade1 100644 --- a/net/net-snmp/pkg-plist +++ b/net/net-snmp/pkg-plist @@ -16,7 +16,8 @@ bin/snmptrap bin/snmpusm bin/snmpwalk bin/tkmib -etc/rc.d/snmpd.sh.sample +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 @@ -41,7 +42,9 @@ 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 @@ -65,13 +68,24 @@ sbin/snmptrapd share/examples/ucd-snmp/EXAMPLE.conf share/examples/ucd-snmp/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp +share/snmp/mib2c.conf +share/snmp/mib2c.storage.conf +share/snmp/mib2c.vartypes.conf +share/snmp/mibs/AGENTX-MIB.txt +share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt share/snmp/mibs/DISMAN-SCRIPT-MIB.txt share/snmp/mibs/EtherLike-MIB.txt +share/snmp/mibs/HCNUM-TC.txt share/snmp/mibs/HOST-RESOURCES-MIB.txt share/snmp/mibs/HOST-RESOURCES-TYPES.txt +share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt +share/snmp/mibs/IANA-LANGUAGE-MIB.txt 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/IPV6-ICMP-MIB.txt share/snmp/mibs/IPV6-MIB.txt share/snmp/mibs/IPV6-TC.txt @@ -79,7 +93,9 @@ share/snmp/mibs/IPV6-TCP-MIB.txt share/snmp/mibs/IPV6-UDP-MIB.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 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt share/snmp/mibs/SNMP-MPD-MIB.txt @@ -100,6 +116,20 @@ 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 @unexec rm -f %D/share/snmp/mibs/.index @dirrm share/snmp/mibs +@dirrm share/snmp/snmpconf/snmp.conf +@dirrm share/snmp/snmpconf/snmpd.conf +@dirrm share/snmp/snmpconf @dirrm share/snmp diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile index 5186049e7519..0d4d0507c864 100644 --- a/net/net-snmp4/Makefile +++ b/net/net-snmp4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ucd-snmp -PORTVERSION= 4.1.2 +PORTVERSION= 4.2 CATEGORIES= net ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ucd-snmp.ucdavis.edu/ \ @@ -17,27 +17,33 @@ MASTER_SITE_SUBDIR= net-snmp MAINTAINER= billf@FreeBSD.org USE_AUTOCONF= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS+= --enable-shared + +CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host" --with-gnu-ld .if defined(BATCH) CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where .else IS_INTERACTIVE= yes .endif -USE_GMAKE= YES -MAN1= snmpbulkget.1 snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 \ - snmpgetnext.1 snmpinform.1 snmpnetstat.1 snmpset.1 \ - snmpstatus.1 snmptable.1 snmptest.1 \ - snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1 -MAN3= default_store.3 read_config.3 mib_api.3 snmp_agent_api.3 \ - snmp_alarm.3 snmp_api.3 snmp_close.3 snmp_free_pdu.3 \ - snmp_open.3 snmp_read.3 snmp_select_info.3 snmp_send.3 \ - snmp_sess_api.3 snmp_sess_async_send.3 snmp_sess_close.3 \ - snmp_sess_error.3 snmp_sess_init.3 snmp_sess_open.3 \ - snmp_sess_read.3 snmp_sess_select_info.3 snmp_sess_send.3 \ - snmp_sess_session.3 snmp_sess_timeout.3 snmp_timeout.3 \ - snmp_trap_api.3 +MAN1= 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 \ + 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 \ + snmp_agent_api.3 snmp_alarm.3 snmp_api.3 snmp_close.3 \ + snmp_free_pdu.3 snmp_open.3 snmp_read.3 snmp_select_info.3 \ + snmp_send.3 snmp_sess_api.3 snmp_sess_async_send.3 \ + snmp_sess_close.3 snmp_sess_error.3 snmp_sess_init.3 \ + snmp_sess_open.3 snmp_sess_read.3 snmp_sess_select_info.3 \ + snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \ + snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \ + snmp_timeout.3 MAN5= snmp.conf.5 snmp_config.5 snmpd.conf.5 \ snmptrapd.conf.5 variables.5 MAN8= snmptrapd.8 @@ -45,7 +51,7 @@ BIN= snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk SBIN= snmpd snmptrapd -STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample +STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh .include <bsd.port.pre.mk> @@ -64,6 +70,9 @@ post-install: @( cd ${PREFIX}/sbin && strip ${SBIN} ) @( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * ) @( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * ) + @${INSTALL_SCRIPT} ${WRKSRC}/libsnmp.so.${SHLIB_VERSION} ${PREFIX}/lib + @${INSTALL_SCRIPT} ${WRKSRC}/libucdmibs.so.${SHLIB_VERSION} ${PREFIX}/lib + @${INSTALL_SCRIPT} ${WRKSRC}/libucdagent.so.${SHLIB_VERSION} ${PREFIX}/lib @( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so ) @( cd ${PREFIX}/lib && ${LN} -f libucdmibs.so.${SHLIB_VERSION} libucdmibs.so ) @( cd ${PREFIX}/lib && ${LN} -f libucdagent.so.${SHLIB_VERSION} libucdagent.so ) diff --git a/net/net-snmp4/distinfo b/net/net-snmp4/distinfo index 8b00c91941d4..bda76becbe98 100644 --- a/net/net-snmp4/distinfo +++ b/net/net-snmp4/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-4.1.2.tar.gz) = 378c8cf99e0845da4662fb72c956d20d +MD5 (ucd-snmp-4.2.tar.gz) = 7370edec952a6830459948d9808da7cb diff --git a/net/net-snmp4/files/patch-aa b/net/net-snmp4/files/patch-aa index ce70b47986cb..6c287d18ac93 100644 --- a/net/net-snmp4/files/patch-aa +++ b/net/net-snmp4/files/patch-aa @@ -1,13 +1,13 @@ ---- snmplib/Makefile.in~ Tue Mar 16 01:49:10 1999 -+++ snmplib/Makefile.in Sat Apr 3 13:30:11 1999 -@@ -41,6 +41,10 @@ +--- snmplib/Makefile.in.orig Mon Oct 2 11:41:46 2000 ++++ snmplib/Makefile.in Wed Jan 17 18:29:44 2001 +@@ -70,6 +70,10 @@ - libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${OBJS} - $(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${OBJS} -+ ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libsnmp.$(SHLIB_EXTENSION) ${OBJS} -+ ln -f libsnmp.$(SHLIB_EXTENSION) \ -+ libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) + libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} + $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ++ ld -Bshareable -soname libsnmp.so.4 \ ++ -o libsnmp.so ${OBJS} ++ ln -f libsnmp.so \ ++ ../libsnmp.so.4 + $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) installdirs: diff --git a/net/net-snmp4/files/patch-ad b/net/net-snmp4/files/patch-ad index 6f28af0a528f..bd85f7453919 100644 --- a/net/net-snmp4/files/patch-ad +++ b/net/net-snmp4/files/patch-ad @@ -1,6 +1,15 @@ ---- agent/mibgroup/mibII/interfaces.c~ Tue Mar 16 08:46:12 1999 -+++ agent/mibgroup/mibII/interfaces.c Sat Apr 3 13:49:28 1999 -@@ -1745,10 +1745,18 @@ +--- agent/mibgroup/mibII/interfaces.c.orig Fri Dec 1 14:17:21 2000 ++++ agent/mibgroup/mibII/interfaces.c Thu Jan 18 00:04:42 2001 +@@ -129,7 +129,7 @@ + #if HAVE_SYS_SYSCTL_H + #include <sys/sysctl.h> + +-#ifdef freebsd3 ++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) + # define USE_SYSCTL_IFLIST + #else + # if defined(CTL_NET) && !defined(freebsd2) +@@ -1842,10 +1842,18 @@ physaddrbuf = 0; } ifm = (struct if_msghdr *)rtm; @@ -19,7 +28,7 @@ int is_alias = 0; ifam = (struct ifa_msghdr *)rtm; ilen -= sizeof(*ifam); -@@ -1771,6 +1779,7 @@ +@@ -1868,6 +1876,7 @@ } sa = (struct sockaddr *)cp; } @@ -27,3 +36,12 @@ rtm = (struct rt_msghdr *)cp; } } +@@ -1982,7 +1991,7 @@ + if (ifmd.ifmd_data.ifi_lastchange.tv_sec == 0 && + ifmd.ifmd_data.ifi_lastchange.tv_usec == 0) { + long_return = 0; +- else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) ++ } else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) { + long_return = 0; + } else { + long_return = (u_long) diff --git a/net/net-snmp4/files/patch-ah b/net/net-snmp4/files/patch-ah index b80222ba72eb..194cbf3574b9 100644 --- a/net/net-snmp4/files/patch-ah +++ b/net/net-snmp4/files/patch-ah @@ -1,8 +1,7 @@ ---- local/tkmib.orig Wed Jul 21 19:06:52 1999 -+++ local/tkmib Sat Aug 28 02:37:57 1999 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w +--- local/tkmib~ Wed Jul 26 08:53:26 2000 ++++ local/tkmib Wed Jan 17 18:32:52 2001 +@@ -1,4 +1,3 @@ +-#!/usr/bin/perl + #!/usr/bin/perl -w require 5; - diff --git a/net/net-snmp4/files/patch-ak b/net/net-snmp4/files/patch-ak index 7ca23e85b748..8a9d310cd7a0 100644 --- a/net/net-snmp4/files/patch-ak +++ b/net/net-snmp4/files/patch-ak @@ -1,21 +1,21 @@ ---- agent/Makefile.in.old Tue May 16 19:58:54 2000 -+++ agent/Makefile.in Tue May 16 20:00:26 2000 -@@ -51,10 +51,18 @@ +--- 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.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${LIBAGENTOBJS} libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(SHLIB_LD_CMD) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${LIBAGENTOBJS} $(SHLIB_LD_LIBS) -+ ld -Bshareable -soname libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libucdagent.$(SHLIB_EXTENSION) ${LIBAGENTOBJS} -+ ln -f libucdagent.$(SHLIB_EXTENSION) \ -+ libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) + 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.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${MIBOBJS} - $(SHLIB_LD_CMD) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${MIBOBJS} $(SHLIB_LD_LIBS) -+ ld -Bshareable -soname libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \ -+ -o libucdmibs.$(SHLIB_EXTENSION) ${MIBOBJS} -+ ln -f libucdmibs.$(SHLIB_EXTENSION) \ -+ libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) - $(RANLIB) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_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-snmp4/files/patch-am b/net/net-snmp4/files/patch-am deleted file mode 100644 index 0ad08d546705..000000000000 --- a/net/net-snmp4/files/patch-am +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c~ Sat Dec 18 08:41:14 1999 -+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c Wed May 17 11:18:59 2000 -@@ -9,6 +9,9 @@ - #include <sys/time.h> - #include <sys/proc.h> - #include <sys/dkstat.h> -+#ifdef freebsd5 -+#include <sys/bio.h> -+#endif - #include <sys/buf.h> - #include <sys/uio.h> - #include <sys/namei.h> diff --git a/net/net-snmp4/files/patch-an b/net/net-snmp4/files/patch-an deleted file mode 100644 index 8153ba8c5653..000000000000 --- a/net/net-snmp4/files/patch-an +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c~ Tue Mar 14 06:27:00 2000 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Wed May 17 11:19:23 2000 -@@ -10,6 +10,9 @@ - #include <sys/time.h> - #include <sys/proc.h> - #include <sys/dkstat.h> -+#ifdef freebsd5 -+#include <sys/bio.h> -+#endif - #include <sys/buf.h> - #include <sys/uio.h> - #include <sys/namei.h> diff --git a/net/net-snmp4/files/patch-ao b/net/net-snmp4/files/patch-ao new file mode 100644 index 000000000000..9ba64ec94695 --- /dev/null +++ b/net/net-snmp4/files/patch-ao @@ -0,0 +1,11 @@ +--- agent/mibgroup/host/hr_filesys.c.orig Wed Jan 17 19:09:48 2001 ++++ agent/mibgroup/host/hr_filesys.c Wed Jan 17 19:10:22 2001 +@@ -38,7 +38,7 @@ + #include <stdlib.h> + #endif + +-#if defined(freebsd3) || defined(bsdi4) ++#if defined(freebsd3) || defined(bsdi4) || defined(freebsd4) || defined(freebsd5) + #if HAVE_GETFSSTAT + #if defined(MFSNAMELEN) + #define MOUNT_NFS "nfs" diff --git a/net/net-snmp4/files/patch-ap b/net/net-snmp4/files/patch-ap new file mode 100644 index 000000000000..4d2ec3fa92ab --- /dev/null +++ b/net/net-snmp4/files/patch-ap @@ -0,0 +1,11 @@ +--- man/Makefile.in.orig Thu Jan 18 01:37:31 2001 ++++ man/Makefile.in Thu Jan 18 01:37:39 2001 +@@ -2,7 +2,7 @@ + + MAN1 = snmpcmd.1 snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 snmpbulkget.1 \ + snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 snmpstatus.1 \ +- snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 ++ snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 snmpconf.1 + MAN1G = snmpd.1 + MAN3 = snmp_agent_api.3 snmp_api.3 mib_api.3 snmp_sess_api.3 snmp_trap_api.3 \ + snmp_alarm.3 snmp_close.3 snmp_free_pdu.3 snmp_open.3 snmp_read.3 \ diff --git a/net/net-snmp4/pkg-plist b/net/net-snmp4/pkg-plist index f14ce4af4ab9..d026a072ade1 100644 --- a/net/net-snmp4/pkg-plist +++ b/net/net-snmp4/pkg-plist @@ -16,7 +16,8 @@ bin/snmptrap bin/snmpusm bin/snmpwalk bin/tkmib -etc/rc.d/snmpd.sh.sample +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 @@ -41,7 +42,9 @@ 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 @@ -65,13 +68,24 @@ sbin/snmptrapd share/examples/ucd-snmp/EXAMPLE.conf share/examples/ucd-snmp/ucdDemoPublic.conf @dirrm share/examples/ucd-snmp +share/snmp/mib2c.conf +share/snmp/mib2c.storage.conf +share/snmp/mib2c.vartypes.conf +share/snmp/mibs/AGENTX-MIB.txt +share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt share/snmp/mibs/DISMAN-SCRIPT-MIB.txt share/snmp/mibs/EtherLike-MIB.txt +share/snmp/mibs/HCNUM-TC.txt share/snmp/mibs/HOST-RESOURCES-MIB.txt share/snmp/mibs/HOST-RESOURCES-TYPES.txt +share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt +share/snmp/mibs/IANA-LANGUAGE-MIB.txt 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/IPV6-ICMP-MIB.txt share/snmp/mibs/IPV6-MIB.txt share/snmp/mibs/IPV6-TC.txt @@ -79,7 +93,9 @@ share/snmp/mibs/IPV6-TCP-MIB.txt share/snmp/mibs/IPV6-UDP-MIB.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 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt share/snmp/mibs/SNMP-MPD-MIB.txt @@ -100,6 +116,20 @@ 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 @unexec rm -f %D/share/snmp/mibs/.index @dirrm share/snmp/mibs +@dirrm share/snmp/snmpconf/snmp.conf +@dirrm share/snmp/snmpconf/snmpd.conf +@dirrm share/snmp/snmpconf @dirrm share/snmp |