diff options
Diffstat (limited to 'net-mgmt/net-snmp-devel/files')
18 files changed, 0 insertions, 563 deletions
diff --git a/net-mgmt/net-snmp-devel/files/patch-Makefile.in b/net-mgmt/net-snmp-devel/files/patch-Makefile.in deleted file mode 100644 index 1df820072caf..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sat Aug 23 15:57:04 2003 -+++ Makefile.in Sat Aug 23 15:57:20 2003 -@@ -15,7 +15,7 @@ - INSTALLHEADERS=version.h - INCLUDESUBDIR=system - INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h darwin.h \ -- dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd.h generic.h hpux.h \ -+ dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd.h generic.h hpux.h \ - irix.h linux.h mips.h netbsd.h openbsd.h solaris2.6.h solaris2.7.h \ - solaris2.8.h solaris2.9.h solaris.h sunos.h svr5.h sysv.h ultrix4.h - INCLUDESUBDIR2=machine diff --git a/net-mgmt/net-snmp-devel/files/patch-Makefile.top b/net-mgmt/net-snmp-devel/files/patch-Makefile.top deleted file mode 100644 index 33bed26b787a..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-Makefile.top +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.top.orig Thu Mar 6 05:08:26 2003 -+++ Makefile.top Sat Mar 29 21:54:50 2003 -@@ -59,7 +59,7 @@ - # generally, LIBCURRENT should stay the same unless major changes occur. - # Increment REVISION every release. - # Increment AGE if new stuff is available. --LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o -+LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(LIBCURRENT) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o - LIB_EXTENSION = la - LIB_VERSION = - LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir) diff --git a/net-mgmt/net-snmp-devel/files/patch-aa b/net-mgmt/net-snmp-devel/files/patch-aa deleted file mode 100644 index 4d371fdbd56e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ ---- snmplib/Makefile.in.orig Wed Jul 17 02:50:49 2002 -+++ snmplib/Makefile.in Mon Jul 22 12:24:37 2002 -@@ -140,6 +140,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) - - #how to build dependencies diff --git a/net-mgmt/net-snmp-devel/files/patch-aclocal.m4 b/net-mgmt/net-snmp-devel/files/patch-aclocal.m4 deleted file mode 100644 index eb2e519aa7f0..000000000000 --- a/net-mgmt/net-snmp-devel/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-snmp-devel/files/patch-al b/net-mgmt/net-snmp-devel/files/patch-al deleted file mode 100644 index 89187b836b0b..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-al +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.in.orig Tue May 7 08:12:10 2002 -+++ configure.in Mon Jun 24 09:38:33 2002 -@@ -1772,6 +1772,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([ - #ifdef HAVE_SYS_PARAM_H diff --git a/net-mgmt/net-snmp-devel/files/patch-diskio.c b/net-mgmt/net-snmp-devel/files/patch-diskio.c deleted file mode 100644 index 609168f22e9c..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-diskio.c +++ /dev/null @@ -1,56 +0,0 @@ ---- agent/mibgroup/ucd-snmp/diskio.c.orig Thu Mar 6 07:55:01 2003 -+++ agent/mibgroup/ucd-snmp/diskio.c Sat Mar 29 22:41:29 2003 -@@ -49,7 +49,12 @@ - #endif /* bsdi */ - - #if defined (freebsd4) || defined(freebsd5) -+#include <sys/param.h> -+#if __FreeBSD_version >= 500101 -+#include <sys/resource.h> -+#else - #include <sys/dkstat.h> -+#endif - #include <devstat.h> - #endif /* freebsd */ - -@@ -380,7 +385,11 @@ - } - memset(stat->dinfo, 0, sizeof(struct devinfo)); - -+#if defined(freebsd5) && (__FreeBSD_version >= 500107) -+ if ((devstat_getdevs(NULL, stat)) == -1) { -+#else - if ((getdevs(stat)) == -1) { -+#endif - fprintf(stderr, "Can't get devices:%s\n", devstat_errbuf); - return 1; - } -@@ -429,6 +438,20 @@ - case DISKIO_DEVICE: - *var_len = strlen(stat->dinfo->devices[indx].device_name); - return (u_char *) stat->dinfo->devices[indx].device_name; -+#if defined(freebsd5) && (__FreeBSD_version >= 500107) -+ case DISKIO_NREAD: -+ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ]; -+ return (u_char *) & long_ret; -+ case DISKIO_NWRITTEN: -+ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE]; -+ return (u_char *) & long_ret; -+ case DISKIO_READS: -+ long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_READ]; -+ return (u_char *) & long_ret; -+ case DISKIO_WRITES: -+ long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_WRITE]; -+ return (u_char *) & long_ret; -+#else - case DISKIO_NREAD: - long_ret = (signed long) stat->dinfo->devices[indx].bytes_read; - return (u_char *) & long_ret; -@@ -441,6 +464,7 @@ - case DISKIO_WRITES: - long_ret = (signed long) stat->dinfo->devices[indx].num_writes; - return (u_char *) & long_ret; -+#endif - - default: - ERROR_MSG("diskio.c: don't know how to handle this request."); diff --git a/net-mgmt/net-snmp-devel/files/patch-freebsd5.h b/net-mgmt/net-snmp-devel/files/patch-freebsd5.h deleted file mode 100644 index 697589ec48b8..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-freebsd5.h +++ /dev/null @@ -1,22 +0,0 @@ ---- /dev/null Sat Aug 16 16:33:01 2003 -+++ include/net-snmp/system/freebsd5.h Sat Aug 16 16:42:08 2003 -@@ -0,0 +1,19 @@ -+#include "freebsd.h" -+ -+/* -+ * freebsd4 is a superset of freebsd2 and freebsd3 -+ */ -+#define freebsd2 1 -+#define freebsd3 1 -+#define freebsd4 1 -+ -+#undef IFADDR_SYMBOL -+#define IFADDR_SYMBOL "in_ifaddrhead" -+ -+#undef PROC_SYMBOL -+#define PROC_SYMBOL "allproc" -+ -+#undef NPROC_SYMBOL -+#define NPROC_SYMBOL "nprocs" -+ -+#undef TOTAL_MEMORY_SYMBOL diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_storage.c b/net-mgmt/net-snmp-devel/files/patch-hr_storage.c deleted file mode 100644 index 1e2e66f97e0a..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-hr_storage.c +++ /dev/null @@ -1,52 +0,0 @@ ---- agent/mibgroup/host/hr_storage.c.orig Thu Jul 4 22:00:31 2002 -+++ agent/mibgroup/host/hr_storage.c Mon Jul 22 14:38:58 2002 -@@ -148,7 +148,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; -@@ -563,7 +563,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; -@@ -646,7 +646,15 @@ - 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 -@@ -704,7 +712,15 @@ - * mbpool.pr_size + (mclpool.pr_nget - mclpool.pr_nput) - * mclpool.pr_size; - #elif defined(MBSTAT_SYMBOL) -+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ -+#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-snmp-devel/files/patch-hr_swrun.c b/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c deleted file mode 100644 index 5ff95f18ca72..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c +++ /dev/null @@ -1,86 +0,0 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Fri Dec 20 00:07:30 2002 -+++ agent/mibgroup/host/hr_swrun.c Sat Aug 16 17:10:54 2003 -@@ -561,7 +561,11 @@ - string[ sizeof(string)-1 ] = 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/status", pid); - if ((fp = fopen(string, "r")) == NULL) -@@ -666,7 +670,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) -@@ -857,7 +865,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) -@@ -952,9 +964,17 @@ - long_return = proc_buf->p_utime * 100 + 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) -@@ -1023,7 +1043,14 @@ - long_return = proc_buf->p_swrss; - #endif - #elif HAVE_KVM_GETPROCS --#if defined(freebsd3) && !defined(darwin) -+#if 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; -+#elif defined(freebsd3) && !defined(darwin) - long_return = - proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024; - #else -@@ -1303,8 +1330,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-snmp-devel/files/patch-interfaces.c b/net-mgmt/net-snmp-devel/files/patch-interfaces.c deleted file mode 100644 index c9d465c00859..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-interfaces.c +++ /dev/null @@ -1,16 +0,0 @@ ---- agent/mibgroup/mibII/interfaces.c.orig Sat Jun 8 00:18:03 2002 -+++ agent/mibgroup/mibII/interfaces.c Mon Jul 29 12:35:08 2002 -@@ -555,11 +555,9 @@ - ifp->ifm_type)); - } - } -- if (have_ifinfo && have_addr) { -+ if (have_ifinfo) { - return 0; -- } else if (have_ifinfo && !(if_msg->ifm_flags & IFF_UP)) -- return 0; -- else { -+ } else { - return -1; - } - } diff --git a/net-mgmt/net-snmp-devel/files/patch-local:Makefile.in b/net-mgmt/net-snmp-devel/files/patch-local:Makefile.in deleted file mode 100644 index 7f648103d7aa..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- local/Makefile.in.orig Sat Apr 20 16:30:13 2002 -+++ local/Makefile.in Wed Apr 24 01:45:55 2002 -@@ -12,7 +12,7 @@ - # local info - # - SNMPCONFPATH=@SNMPCONFPATH@ --PERLSCRIPTS=snmpcheck tkmib mib2c fixproc ipf-mod.pl snmpconf traptoemail -+PERLSCRIPTS=snmpcheck mib2c fixproc ipf-mod.pl snmpconf traptoemail - SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \ - ipf-mod.pl.made snmpconf.made traptoemail.made - PERLPROG=@PERLPROG@ diff --git a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c b/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c deleted file mode 100644 index 47f5da45ccc7..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c +++ /dev/null @@ -1,35 +0,0 @@ ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Sat Nov 9 23:59:53 2002 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Sat Aug 16 17:09:01 2003 -@@ -207,11 +207,13 @@ - auto_nlist(NSWDEV_SYMBOL, (char *) &nswdev, sizeof(nswdev)); - auto_nlist(DMMAX_SYMBOL, (char *) &dmmax, sizeof(dmmax)); - -+#if !defined(freebsd5) - sw = (struct swdevt *) malloc(nswdev * sizeof(*sw)); - if (sw == NULL) - return; - - auto_nlist(SWDEVT_SYMBOL, (char *) sw, nswdev * sizeof(*sw)); -+#endif - - n = kvm_getswapinfo(kd, kswap, sizeof(kswap) / sizeof(kswap[0]), 0); - -@@ -242,7 +244,9 @@ - swapUsed *= pagesize; - swapFree *= pagesize; - -+#if !defined(freebsd5) - free(sw); -+#endif - } - #endif - -@@ -274,7 +278,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-snmp-devel/files/patch-snmpTCPIPv6Domain.c b/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c deleted file mode 100644 index 9a6e083a98bc..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c +++ /dev/null @@ -1,30 +0,0 @@ ---- snmplib/snmpTCPIPv6Domain.c.orig Fri Aug 9 22:57:43 2002 -+++ snmplib/snmpTCPIPv6Domain.c Sun Oct 6 01:07:12 2002 -@@ -62,13 +62,21 @@ - if (to == NULL) { - return strdup("TCP/IPv6: unknown"); - } else { -- char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char tmp[NI_MAXHOST]; - -- sprintf(tmp, "[%s]:%hd", -- inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr, -- INET6_ADDRSTRLEN), ntohs(to->sin6_port)); -- return strdup(tmp); -+/* -+ * NI_WITHSCOPEID will be obsoleted. But some implementations require -+ * this flag to retrieve scoped name. -+ * (2002-07-25: kuriyama@FreeBSD.org) -+ */ -+#ifndef NI_WITHSCOPEID -+#define NI_WITHSCOPEID 0 -+#endif -+ if (getnameinfo(to, sizeof(struct sockaddr_in6), tmp, sizeof(tmp), -+ NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID)) { -+ return strdup("UDP/IPv6: unknown"); -+ } -+ return strdup(tmp); - } - } - diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c b/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c deleted file mode 100644 index 6f1f6c4caeed..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c +++ /dev/null @@ -1,30 +0,0 @@ ---- snmplib/snmpUDPIPv6Domain.c.orig Fri Aug 9 22:57:43 2002 -+++ snmplib/snmpUDPIPv6Domain.c Sun Oct 6 18:03:18 2002 -@@ -62,13 +62,21 @@ - if (to == NULL) { - return strdup("UDP/IPv6: unknown"); - } else { -- char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char tmp[NI_MAXHOST]; - -- sprintf(tmp, "[%s]:%hd", -- inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr, -- INET6_ADDRSTRLEN), ntohs(to->sin6_port)); -- return strdup(tmp); -+/* -+ * NI_WITHSCOPEID will be obsoleted. But some implementations require -+ * this flag to retrieve scoped name. -+ * (2002-07-25: kuriyama@FreeBSD.org) -+ */ -+#ifndef NI_WITHSCOPEID -+#define NI_WITHSCOPEID 0 -+#endif -+ if (getnameinfo(to, sizeof(struct sockaddr_in6), tmp, sizeof(tmp), -+ NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID)) { -+ return strdup("UDP/IPv6: unknown"); -+ } -+ return strdup(tmp); - } - } - diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpd.8.def b/net-mgmt/net-snmp-devel/files/patch-snmpd.8.def deleted file mode 100644 index ac853823ca25..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpd.8.def +++ /dev/null @@ -1,13 +0,0 @@ ---- man/snmpd.8.def.orig Wed Feb 26 04:11:19 2003 -+++ man/snmpd.8.def Sat Mar 29 22:05:07 2003 -@@ -211,6 +211,10 @@ - the error "Error opening specified endpoint". Likewise, since AAL5 - PVC support is only currently available on Linux, it will fail with - the same error on other platforms. -+.PP -+.B snmpd -+uses libwrap's access control if configured by --with-libwrap. -+Access control patterns may only reference IP addresses. - - .RE - .SH CONFIGURATION FILES diff --git a/net-mgmt/net-snmp-devel/files/patch-tcpTable.c b/net-mgmt/net-snmp-devel/files/patch-tcpTable.c deleted file mode 100644 index 19e1f60d7ca8..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-tcpTable.c +++ /dev/null @@ -1,51 +0,0 @@ ---- agent/mibgroup/mibII/tcpTable.c.orig Sat Apr 20 16:30:05 2002 -+++ agent/mibgroup/mibII/tcpTable.c Sat Aug 16 17:38:05 2003 -@@ -462,6 +462,40 @@ - TCP_Count_Connections(void) - { - int Established; -+#if (defined(freebsd2) || defined(netbsd2) || 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)) -@@ -525,6 +559,7 @@ - prev = next; - #endif /* !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) */ - } -+#endif - return (Established); - } - #endif /* !linux && !hpux11 */ diff --git a/net-mgmt/net-snmp-devel/files/patch-vmstat_freebsd2.c b/net-mgmt/net-snmp-devel/files/patch-vmstat_freebsd2.c deleted file mode 100644 index 7e64f3979bcf..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-vmstat_freebsd2.c +++ /dev/null @@ -1,14 +0,0 @@ ---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c.orig Thu May 23 17:39:41 2002 -+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c Thu Feb 20 08:08:20 2003 -@@ -10,7 +10,11 @@ - #include <sys/param.h> - #include <sys/time.h> - #include <sys/proc.h> -+#if defined(freebsd5) && __FreeBSD_version >= 500101 -+#include <sys/resource.h> -+#else - #include <sys/dkstat.h> -+#endif - #ifdef freebsd5 - #include <sys/bio.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/snmpd.sh.sample b/net-mgmt/net-snmp-devel/files/snmpd.sh.sample deleted file mode 100644 index f07a6fac2376..000000000000 --- a/net-mgmt/net-snmp-devel/files/snmpd.sh.sample +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: snmpd -# REQUIRE: DAEMON -# KEYWORD: FreeBSD -# -# Add the following line to /etc/rc.conf to enable snmpd: -# -# snmpd_enable="YES" -# - -snmpd_enable="NO" -snmpd_flags="-P /var/run/snmpd.pid" - -. %%RC_SUBR%% - -load_rc_config net_snmpd - -if [ ! -z "$net_snmpd_enable" ]; then - echo "Warning: \$net_snmpd_enable is obsoleted." - echo " Use \$snmpd_enable instead." - snmpd_enable="$net_snmpd_enable" - [ ! -z "$net_snmpd_flags" ] && snmpd_flags="$net_snmpd_flags" -fi - -name=snmpd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/snmpd -pidfile='/var/run/snmpd.pid' - -load_rc_config $name -run_rc_command "$1" |