diff options
Diffstat (limited to 'net-mgmt/net-snmp4')
20 files changed, 0 insertions, 819 deletions
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile deleted file mode 100644 index 200f175d4300..000000000000 --- a/net-mgmt/net-snmp4/Makefile +++ /dev/null @@ -1,108 +0,0 @@ -# New ports collection makefile for: ucd-snmp -# Date created: 26 June 1996 -# Whom: gpalmer -# -# $FreeBSD$ -# - -PORTNAME= ucd-snmp -PORTVERSION= 4.2.6 -PORTREVISION= 3 -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 - -MAINTAINER= marcus@FreeBSD.org -COMMENT= An extendable SNMP implementation - -USE_AUTOCONF_VER=213 -USE_REINPLACE= yes -USE_PERL5= yes -USE_LIBTOOL= yes -INSTALLS_SHLIB= yes -LIBTOOLFLAGS= --disable-ltlibs --release-ignore - -CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host ucd-snmp/diskio" \ - --with-gnu-ld --with-libwrap --with-libs="-ldevstat" -.if defined(BATCH) -CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where -.else -IS_INTERACTIVE= yes -.endif - -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_api_errstring.3 snmp_close.3 \ - snmp_error.3 snmp_free_pdu.3 snmp_open.3 snmp_perror.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_perror.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 snmp_trap_api.3 -MAN5= snmp.conf.5 snmp_config.5 snmpd.conf.5 \ - snmptrapd.conf.5 variables.5 -MAN8= snmptrapd.8 -BIN= snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \ - snmpstatus snmptest snmptranslate snmptrap snmpwalk -SBIN= snmpd snmptrapd - -STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 400014 -CONFIGURE_ARGS+= --enable-ipv6 -.endif - -.if defined(WITHOUT_SSL) -CONFIGURE_ARGS+= --without-openssl -.else -USE_OPENSSL= YES -CONFIGURE_ARGS+= --with-openssl=/usr -CFLAGS+= -DOPENSSL_DES_LIBDES_COMPATIBILITY -.endif - -SHLIB_VERSION= 4 -PLIST_SUB+= shlib=${SHLIB_VERSION} - -pre-everything:: - @${ECHO} "" - @${ECHO} "You may use the following build option(s):" - @${ECHO} "" - @${ECHO} " WITHOUT_SSL=yes Disable the OpenSSL support." - @${ECHO} "" - -post-patch: - @${REINPLACE_CMD} \ - -e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \ - -e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \ - ${WRKSRC}/aclocal.m4 - -post-install: - @( cd ${PREFIX}/bin && strip ${BIN} ) - @( cd ${PREFIX}/sbin && strip ${SBIN} ) - @${FIND} ${PREFIX}/include/ucd-snmp ${PREFIX}/share/snmp/mibs -type f \ - | ${XARGS} ${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}; \ - fi - -.include <bsd.port.post.mk> diff --git a/net-mgmt/net-snmp4/distinfo b/net-mgmt/net-snmp4/distinfo deleted file mode 100644 index fac39d4c4661..000000000000 --- a/net-mgmt/net-snmp4/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (ucd-snmp-4.2.6.tar.gz) = cf3f24e6a69a4f52c14affe0064116b1 diff --git a/net-mgmt/net-snmp4/files/patch-Makefile.top b/net-mgmt/net-snmp4/files/patch-Makefile.top deleted file mode 100644 index e6077bc203ef..000000000000 --- a/net-mgmt/net-snmp4/files/patch-Makefile.top +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - LIB_EXTENSION = la - LIB_VERSION = - LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir) diff --git a/net-mgmt/net-snmp4/files/patch-aa b/net-mgmt/net-snmp4/files/patch-aa deleted file mode 100644 index 6c287d18ac93..000000000000 --- a/net-mgmt/net-snmp4/files/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ ---- 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.$(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-aclocal.m4 b/net-mgmt/net-snmp4/files/patch-aclocal.m4 deleted file mode 100644 index eb2e519aa7f0..000000000000 --- a/net-mgmt/net-snmp4/files/patch-aclocal.m4 +++ /dev/null @@ -1,48 +0,0 @@ ---- aclocal.m4.orig Tue Sep 18 17:08:01 2001 -+++ aclocal.m4 Mon Jan 21 10:38:40 2002 -@@ -196,8 +196,23 @@ - AC_DEFUN([AC_PROG_LIBTOOL], - [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl - -+# Save cache, so that ltconfig can load it -+AC_CACHE_SAVE -+ -+# Actually configure libtool. ac_aux_dir is where install-sh is found. -+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ -+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ -+${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \ -+$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LTMAIN%% $lt_target \ -+|| AC_MSG_ERROR([libtool configure failed]) -+ -+# Reload cache, that may have been modified by ltconfig -+AC_CACHE_LOAD -+ - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LTMAIN%%" - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -224,6 +239,11 @@ - AC_REQUIRE([AC_EXEEXT])dnl - dnl - -+case "$target" in -+NONE) lt_target="$host" ;; -+*) lt_target="$target" ;; -+esac -+ - _LT_AC_PROG_ECHO_BACKSLASH - # Only perform the check for file, if the check method requires it - case $deplibs_check_method in -@@ -875,7 +895,7 @@ - # All known linkers require a `.a' archive for static linking (except M$VC, - # which needs '.lib'). - libext=a --ltmain="$ac_aux_dir/ltmain.sh" -+ltmain="--disable-ltlibs --release-ignore %%LTMAIN%%" - ofile="$default_ofile" - with_gnu_ld="$lt_cv_prog_gnu_ld" - need_locks="$enable_libtool_lock" diff --git a/net-mgmt/net-snmp4/files/patch-agent_mibgroup_mibII_tcpTable.c b/net-mgmt/net-snmp4/files/patch-agent_mibgroup_mibII_tcpTable.c deleted file mode 100644 index 3fa2daff896c..000000000000 --- a/net-mgmt/net-snmp4/files/patch-agent_mibgroup_mibII_tcpTable.c +++ /dev/null @@ -1,96 +0,0 @@ ---- agent/mibgroup/mibII/tcpTable.c.orig Fri Jul 18 21:10:09 2003 -+++ agent/mibgroup/mibII/tcpTable.c Fri Jul 18 21:10:12 2003 -@@ -435,11 +435,42 @@ - int TCP_Count_Connections (void) - { - int Established; -+#if !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) -+ int mib[4], len; -+ char *p; -+ struct tcpcb *tpcb; -+ struct xtcpcb *tp; -+ struct xinpgen *next; -+ -+ mib[0]=CTL_NET; -+ mib[1]=PF_INET; -+ mib[2]=IPPROTO_TCP; -+ mib[3]=TCPCTL_PCBLIST; -+ -+ if (sysctl(mib, 4, NULL, &len, NULL, 0) != 0) { -+ snmp_log_perror("TCP_Count_Connections - sysctl"); -+ return 0; -+ } -+ if ((p=(char *)malloc(len)) == NULL) { -+ snmp_log_perror("TCP_Count_Connections - malloc"); -+ return 0; -+ } -+ if (sysctl(mib, 4, p, &len, NULL, 0) != 0) { -+ snmp_log_perror("TCP_Count_Connections - sysctl"); -+ free(p); -+ return 0; -+ } -+ Established=0; -+ next=(struct xinpgen *)p; -+ for (next=(struct xinpgen *)((char *)next + next->xig_len); next->xig_len > sizeof(struct xinpgen); next=(struct xinpgen *)((char *)next + next->xig_len)) { -+ tp=(struct xtcpcb *)next; -+ if (tp->xt_tp.t_state == TCPS_ESTABLISHED || tp->xt_tp.t_state == TCPS_CLOSE_WAIT) -+ Established++; -+ } -+ free(p); -+#else - struct inpcb cb; - register struct inpcb *next; --#if !(defined(freebsd2) || defined(netbsd2) || defined(openbsd2)) -- register struct inpcb *prev; --#endif - struct inpcb inpcb; - struct tcpcb tcpcb; - -@@ -450,17 +481,10 @@ - - auto_nlist(TCP_SYMBOL, (char *)&cb, sizeof(struct inpcb)); - inpcb = cb; --#if !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) -- prev = (struct inpcb *) auto_nlist_value(TCP_SYMBOL); --#endif /* !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) */ - /* - * Scan the control blocks - */ --#if defined(freebsd2) || defined(netbsd1) || defined(openbsd2) - while ((inpcb.INP_NEXT_SYMBOL != NULL) && (inpcb.INP_NEXT_SYMBOL != (struct inpcb *) auto_nlist_value(TCP_SYMBOL))) --#else /* defined(freebsd2) || defined(netbsd1) || defined(openbsd2) */ -- while (inpcb.INP_NEXT_SYMBOL != (struct inpcb *) auto_nlist_value(TCP_SYMBOL)) --#endif /* defined(freebsd2) || defined(netbsd1) */ - { - next = inpcb.INP_NEXT_SYMBOL; - -@@ -468,16 +492,7 @@ - snmp_log_perror("TCP_Count_Connections - inpcb"); - break; - } --#if !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) -- if (inpcb.INP_PREV_SYMBOL != prev) { /* ??? */ -- sleep(1); -- goto Again; -- } --#endif /* !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) */ - if (inet_lnaof(inpcb.inp_laddr) == INADDR_ANY) { --#if !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) -- prev = next; --#endif /* !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) */ - continue; - } - if(klookup((unsigned long)inpcb.inp_ppcb, (char *)&tcpcb, sizeof (tcpcb)) == 0) { -@@ -488,10 +503,8 @@ - if ((tcpcb.t_state == TCPS_ESTABLISHED) || - (tcpcb.t_state == TCPS_CLOSE_WAIT)) - Established++; --#if !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) -- prev = next; --#endif /* !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) */ - } -+#endif - return(Established); - } - #endif /* !linux && !hpux11 */ - diff --git a/net-mgmt/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_diskio.c b/net-mgmt/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_diskio.c deleted file mode 100644 index e41c70389805..000000000000 --- a/net-mgmt/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_diskio.c +++ /dev/null @@ -1,59 +0,0 @@ ---- agent/mibgroup/ucd-snmp/diskio.c.orig Fri Mar 28 12:58:32 2003 -+++ agent/mibgroup/ucd-snmp/diskio.c Fri Mar 28 13:21:04 2003 -@@ -47,7 +47,11 @@ - #endif /* bsdi */ - - #if defined (freebsd4) || defined(freebsd5) -+#include <sys/param.h> -+#if __FreeBSD_version < 500101 - #include <sys/dkstat.h> -+#endif -+#include <sys/resource.h> - #include <devstat.h> - #endif /* freebsd */ - -@@ -318,7 +322,11 @@ - } - memset(stat->dinfo, 0, sizeof(struct devinfo)); - -+#if __FreeBSD_version > 500106 -+ if ((devstat_getdevs(NULL, stat)) == -1){ -+#else - if ((getdevs(stat)) == -1){ -+#endif - fprintf (stderr,"Can't get devices:%s\n", devstat_errbuf); - return 1; - } -@@ -370,16 +378,32 @@ - *var_len = strlen(stat->dinfo->devices[indx].device_name); - return (u_char *) stat->dinfo->devices[indx].device_name; - case DISKIO_NREAD: -+#if __FreeBSD_version > 500106 -+ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DSM_TOTAL_BYTES_READ]; -+#else - long_ret = (signed long) stat->dinfo->devices[indx].bytes_read; -+#endif - return (u_char *) & long_ret; - case DISKIO_NWRITTEN: -+#if __FreeBSD_version > 500106 -+ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DSM_TOTAL_BYTES_WRITE]; -+#else - long_ret = (signed long) stat->dinfo->devices[indx].bytes_written; -+#endif - return (u_char *) & long_ret; - case DISKIO_READS: -+#if __FreeBSD_version > 500106 -+ long_ret = (signed long) stat->dinfo->devices[indx].operations[DSM_TOTAL_TRANSFERS_READ]; -+#else - long_ret = (signed long) stat->dinfo->devices[indx].num_reads; -+#endif - return (u_char *) & long_ret; - case DISKIO_WRITES: -+#if __FreeBSD_version > 500106 -+ long_ret = (signed long) stat->dinfo->devices[indx].operations[DSM_TOTAL_TRANSFERS_WRITE]; -+#else - long_ret = (signed long) stat->dinfo->devices[indx].num_writes; -+#endif - return (u_char *) & long_ret; - - default: diff --git a/net-mgmt/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_vmstat_freebsd2.c b/net-mgmt/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_vmstat_freebsd2.c deleted file mode 100644 index 15b1b69390ab..000000000000 --- a/net-mgmt/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_vmstat_freebsd2.c +++ /dev/null @@ -1,17 +0,0 @@ ---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c.orig Fri Mar 28 13:15:48 2003 -+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c Fri Mar 28 13:16:31 2003 -@@ -8,11 +8,14 @@ - #include <sys/param.h> - #include <sys/time.h> - #include <sys/proc.h> -+#if __FreeBSD_version < 500101 - #include <sys/dkstat.h> -+#endif - #ifdef freebsd5 - #include <sys/bio.h> - #endif - #include <sys/buf.h> -+#include <sys/resource.h> - #include <sys/uio.h> - #include <sys/namei.h> - #include <sys/malloc.h> diff --git a/net-mgmt/net-snmp4/files/patch-ak b/net-mgmt/net-snmp4/files/patch-ak deleted file mode 100644 index 8a9d310cd7a0..000000000000 --- a/net-mgmt/net-snmp4/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-snmp4/files/patch-al b/net-mgmt/net-snmp4/files/patch-al deleted file mode 100644 index c2464056b6bc..000000000000 --- a/net-mgmt/net-snmp4/files/patch-al +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.in~ Sat May 6 01:46:26 2000 -+++ configure.in Wed May 17 11:09:08 2000 -@@ -1286,6 +1286,26 @@ - AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE, - [ - -+dnl 4.4 compatible but renamed on FreeBSD -+AC_TRY_COMPILE([ -+#include <sys/types.h> -+#define KERNEL -+#define _KERNEL -+#include <sys/socket.h> -+#undef KERNEL -+#undef _KERNEL -+#include <net/route.h> -+],[ -+ -+#ifndef STRUCT_RTENTRY_HAS_RT_DST -+#define rt_dst rt_nodes->rn_key -+#endif -+ -+ struct rtentry rt; -+ rt.rt_nodes[0].rn_bit = 1; -+ rt.rt_dst; -+ ], ac_cv_RTENTRY_TYPE="BSD-4.4") -+ - dnl 4.4 compat - AC_TRY_COMPILE([ - #include <sys/types.h> diff --git a/net-mgmt/net-snmp4/files/patch-auto_nlist.c b/net-mgmt/net-snmp4/files/patch-auto_nlist.c deleted file mode 100644 index 5a2885b45cf3..000000000000 --- a/net-mgmt/net-snmp4/files/patch-auto_nlist.c +++ /dev/null @@ -1,18 +0,0 @@ ---- agent/auto_nlist.c.orig Thu Feb 7 20:42:03 2002 -+++ agent/auto_nlist.c Sun Nov 17 00:40:52 2002 -@@ -31,6 +31,15 @@ - #endif - #endif - -+#if HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif -+ -+#if defined(__FreeBSD__) && (__FreeBSD_version >= 500000) -+#include <sys/types.h> -+#include <sys/time.h> -+#endif -+ - #include "auto_nlist.h" - #include "autonlist.h" - #include "kernel.h" diff --git a/net-mgmt/net-snmp4/files/patch-disk.c b/net-mgmt/net-snmp4/files/patch-disk.c deleted file mode 100644 index 5d82a33941bc..000000000000 --- a/net-mgmt/net-snmp4/files/patch-disk.c +++ /dev/null @@ -1,32 +0,0 @@ ---- agent/mibgroup/ucd-snmp/disk.c.orig Wed Apr 3 07:57:57 2002 -+++ agent/mibgroup/ucd-snmp/disk.c Thu Aug 29 12:11:17 2002 -@@ -340,7 +340,7 @@ - double totalblks, free, used, avail, availblks; - #else - static long avail; --#ifdef STRUCT_STATVFS_HAS_F_FILES -+#if defined(HAVE_UFS_FFS_FS_H) || defined(STRUCT_STATVFS_HAS_F_FILES) - int percent_inode; - #endif - #endif -@@ -424,6 +424,11 @@ - (int) ((double) (vfs.f_files - vfs.f_ffree) / - (double) (vfs.f_files - (vfs.f_ffree - vfs.f_favail)) * 100.0 + 0.5); - #endif -+#if defined(HAVE_UFS_FFS_FS_H) && !defined(STRUCT_STATVFS_HAS_F_FILES) -+ percent_inode = vfs.f_files == 0 ? 100.0 : -+ (int) ((double) (vfs.f_files - vfs.f_ffree) / -+ (double) (vfs.f_files) * 100.0 + 0.5); -+#endif - switch (vp->magic) { - case DISKTOTAL: - long_ret = vfs.f_blocks * (vfs.f_bsize / 1024); -@@ -444,7 +449,7 @@ - case DISKPERCENT: - long_ret = percent; - return ((u_char *) (&long_ret)); --#ifdef STRUCT_STATVFS_HAS_F_FILES -+#if defined(HAVE_UFS_FFS_FS_H) || defined(STRUCT_STATVFS_HAS_F_FILES) - case DISKPERCENTNODE: - long_ret = percent_inode; - return ((u_char *) (&long_ret)); diff --git a/net-mgmt/net-snmp4/files/patch-hr_disk.c b/net-mgmt/net-snmp4/files/patch-hr_disk.c deleted file mode 100644 index b4f2c66a92f8..000000000000 --- a/net-mgmt/net-snmp4/files/patch-hr_disk.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) -+#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'); - #elif defined(freebsd3) diff --git a/net-mgmt/net-snmp4/files/patch-hr_storage.c b/net-mgmt/net-snmp4/files/patch-hr_storage.c deleted file mode 100644 index 1dfe804c9c4b..000000000000 --- a/net-mgmt/net-snmp4/files/patch-hr_storage.c +++ /dev/null @@ -1,61 +0,0 @@ ---- agent/mibgroup/host/hr_storage.c.orig Mon Mar 18 22:39:56 2002 -+++ agent/mibgroup/host/hr_storage.c Sun Nov 17 00:43:32 2002 -@@ -32,7 +32,7 @@ - #else - #if HAVE_VM_VM_H - #include <vm/vm.h> --#if HAVE_MACHINE_TYPES_H -+#if HAVE_MACHINE_TYPES_H && (!defined(__FreeBSD__) || __FreeBSD_version < 500000) - #include <machine/types.h> - #endif - #if HAVE_SYS_VMMETER_H -@@ -145,7 +145,7 @@ - #define HRFS_mount mnt_mountp - #define HRFS_statfs statvfs - --#elif defined(HAVE_STATVFS) -+#elif defined(HAVE_STATVFS) && defined(HAVE_MNTENT) - - extern struct mntent *HRFS_entry; - extern int fscount; -@@ -520,7 +520,7 @@ - } - case HRSTORE_UNITS: - if ( store_idx < HRS_TYPE_FS_MAX ) --#if STRUCT_STATVFS_HAS_F_FRSIZE -+#if defined(STRUCT_STATVFS_HAS_F_FRSIZE) && defined(HAVE_MNTENT) - long_return = stat_buf.f_frsize; - #else - long_return = stat_buf.f_bsize; -@@ -601,7 +601,15 @@ - for (i = 0; i < sizeof(mbstat.m_mtypes)/sizeof(mbstat.m_mtypes[0]); i++) - long_return += mbstat.m_mtypes[i]; - #elif defined(MBSTAT_SYMBOL) -+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_mbufs; -+#elif __FreeBSD_version < 500024 -+ /* mbuf stats disabled */ -+ return NULL; -+#else -+ /* XXX TODO: implement new method */ -+ return NULL; -+#endif - #elif defined(NO_DUMMY_VALUES) - return NULL; - #else -@@ -660,7 +668,15 @@ - + (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... */ -+#elif __FreeBSD_version < 500024 -+ /* mbuf stats disabled */ -+ return NULL; -+#else -+ /* XXX TODO: implement new method */ -+ return NULL; -+#endif - #elif defined(NO_DUMMY_VALUES) - return NULL; - #else diff --git a/net-mgmt/net-snmp4/files/patch-hr_swrun.c b/net-mgmt/net-snmp4/files/patch-hr_swrun.c deleted file mode 100644 index c232386f873e..000000000000 --- a/net-mgmt/net-snmp4/files/patch-hr_swrun.c +++ /dev/null @@ -1,84 +0,0 @@ ---- 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); - #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); -+#endif - #elif defined(linux) - sprintf( string, "/proc/%d/status", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -638,7 +642,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); -+#endif - #elif defined(linux) - sprintf( string, "/proc/%d/cmdline", pid ); - if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -810,7 +818,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 ) { -+#endif - #elif defined(dynix) - switch ( lowpsinfo.pr_state ) { - #elif defined(solaris2) -@@ -906,9 +918,17 @@ - proc_buf->p_stime*100; - #endif - #elif HAVE_KVM_GETPROCS -+#if defined(freebsd5) && __FreeBSD_version >= 500014 -+ /* XXX: Accessing ki_paddr causes sig10 ... -+ long_return = proc_table[LowProcIndex].ki_paddr->p_uticks + -+ proc_table[LowProcIndex].ki_paddr->p_sticks + -+ proc_table[LowProcIndex].ki_paddr->p_iticks; */ -+ long_return = 0; -+#else - 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 - #if defined(freebsd3) && !defined(darwin) - 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 + -+ proc_table[LowProcIndex].ki_vmspace->vm_ssize + -+ proc_table[LowProcIndex].ki_vmspace->vm_dsize; -+ 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 @@ - #elif defined(solaris2) - 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; -+#endif - #else - if ( proc_table[current_proc_entry].p_stat != 0 ) - return proc_table[current_proc_entry++].p_pid; diff --git a/net-mgmt/net-snmp4/files/patch-local:Makefile.in b/net-mgmt/net-snmp4/files/patch-local:Makefile.in deleted file mode 100644 index 1028734fb5b3..000000000000 --- a/net-mgmt/net-snmp4/files/patch-local:Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 @@ - - SNMPCONFPATH=@SNMPCONFPATH@ - --SCRIPTS=snmpcheck tkmib mib2c snmpconf -+SCRIPTS=snmpcheck mib2c snmpconf - PERLSCRIPTS=snmpcheck tkmib fixproc ipf-mod.pl rsnmp - SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \ - ipf-mod.pl.made rsnmp.made snmpconf.made diff --git a/net-mgmt/net-snmp4/files/patch-memory_freebsd2.c b/net-mgmt/net-snmp4/files/patch-memory_freebsd2.c deleted file mode 100644 index e49eb0d77c01..000000000000 --- a/net-mgmt/net-snmp4/files/patch-memory_freebsd2.c +++ /dev/null @@ -1,21 +0,0 @@ ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Sun Sep 16 17:16:16 2001 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Fri Mar 28 13:18:19 2003 -@@ -9,7 +9,9 @@ - #include <sys/param.h> - #include <sys/time.h> - #include <sys/proc.h> -+#if __FreeBSD_version < 500101 - #include <sys/dkstat.h> -+#endif - #ifdef freebsd5 - #include <sys/bio.h> - #endif -@@ -232,7 +234,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 }; - diff --git a/net-mgmt/net-snmp4/files/snmpd.sh.sample b/net-mgmt/net-snmp4/files/snmpd.sh.sample deleted file mode 100644 index 71f8b504ce81..000000000000 --- a/net-mgmt/net-snmp4/files/snmpd.sh.sample +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -case "$1" in -start) - [ -x ${PREFIX}/sbin/snmpd ] && ${PREFIX}/sbin/snmpd && echo -n ' snmpd' - ;; -stop) - killall snmpd && echo -n ' snmpd' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac - -exit 0 diff --git a/net-mgmt/net-snmp4/pkg-descr b/net-mgmt/net-snmp4/pkg-descr deleted file mode 100644 index d7c5d86a1b58..000000000000 --- a/net-mgmt/net-snmp4/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -This is UCD SNMP, a derivative of CMU's SNMP package. - -Various tools relating to the Simple Network Management Protocol including: - - An extensible agent - An SNMP library - tools to request or set information from SNMP agents - tools to generate and handle SNMP traps - a version of the unix 'netstat' command using SNMP - a Tk/perl mib browser - -WWW: http://net-snmp.sourceforge.net/ diff --git a/net-mgmt/net-snmp4/pkg-plist b/net-mgmt/net-snmp4/pkg-plist deleted file mode 100644 index e7d031a7cbc5..000000000000 --- a/net-mgmt/net-snmp4/pkg-plist +++ /dev/null @@ -1,146 +0,0 @@ -bin/encode_keychange -bin/mib2c -bin/snmpbulkget -bin/snmpbulkwalk -bin/snmpcheck -bin/snmpconf -bin/snmpdelta -bin/snmpdf -bin/snmpget -bin/snmpgetnext -bin/snmpinform -bin/snmpnetstat -bin/snmpset -bin/snmpstatus -bin/snmptable -bin/snmptest -bin/snmptranslate -bin/snmptrap -bin/snmpusm -bin/snmpvacm -bin/snmpwalk -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%% -sbin/snmpd -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 -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 -share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt -share/snmp/mibs/SNMP-PROXY-MIB.txt -share/snmp/mibs/SNMP-TARGET-MIB.txt -share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt -share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt -share/snmp/mibs/SNMPv2-CONF.txt -share/snmp/mibs/SNMPv2-MIB.txt -share/snmp/mibs/SNMPv2-SMI.txt -share/snmp/mibs/SNMPv2-TC.txt -share/snmp/mibs/SNMPv2-TM.txt -share/snmp/mibs/TCP-MIB.txt -share/snmp/mibs/UCD-DEMO-MIB.txt -share/snmp/mibs/UCD-DISKIO-MIB.txt -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 -@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 |