diff options
author | adam <adam@pkgsrc.org> | 2010-07-20 08:33:44 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2010-07-20 08:33:44 +0000 |
commit | d97b319127b7844a94ad2bda3f41a77ab2bdf501 (patch) | |
tree | 5adc61d346dfcf2ce0982cb9acb504005a8d0937 /net/net-snmp/patches | |
parent | 2b175cc232e123946bd15808ebe523945c01f0a1 (diff) | |
download | pkgsrc-d97b319127b7844a94ad2bda3f41a77ab2bdf501.tar.gz |
Changes 5.4.3:
snmpd:
- Change default AgentX target from 0.0.0.0:705 to localhost:705
- Fix CVE-2008-4309 (GETBULK issue reported by Oscar Mira-Sanchez)
- Fix handling of multiple matching VACM entries
(Use the "best" match, rather than the first one).
Note that this could potentially affect the behaviour of
existing access control configurations.
- Latch large-disk statistics at 2Tb (rather than wrapping)
Linux:
- Fix build on modern distributions (using rpm-4.6)
Windows:
- Fix various builds (recent MSVC, MinGW, IPv6, winExtDLL)
Diffstat (limited to 'net/net-snmp/patches')
-rw-r--r-- | net/net-snmp/patches/patch-ab | 6 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ac | 28 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ad | 36 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ae | 6 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-af | 28 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-am | 18 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-dc | 8 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-dh | 6 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ei | 6 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ey | 10 |
10 files changed, 76 insertions, 76 deletions
diff --git a/net/net-snmp/patches/patch-ab b/net/net-snmp/patches/patch-ab index 89c9a5442db..186c339883d 100644 --- a/net/net-snmp/patches/patch-ab +++ b/net/net-snmp/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.9 2006/08/11 20:40:36 adam Exp $ +$NetBSD: patch-ab,v 1.10 2010/07/20 08:33:44 adam Exp $ ---- agent/mibgroup/ucd-snmp/diskio.c.orig 2006-08-11 22:32:57.000000000 +0200 +--- agent/mibgroup/ucd-snmp/diskio.c.orig 2009-04-10 20:14:51.000000000 +0000 +++ agent/mibgroup/ucd-snmp/diskio.c -@@ -419,6 +419,155 @@ var_diskio(struct variable * vp, +@@ -421,6 +421,155 @@ var_diskio(struct variable * vp, } #endif /* bsdi */ diff --git a/net/net-snmp/patches/patch-ac b/net/net-snmp/patches/patch-ac index cc65cd382ba..ac87bc7f219 100644 --- a/net/net-snmp/patches/patch-ac +++ b/net/net-snmp/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ +$NetBSD: patch-ac,v 1.9 2010/07/20 08:33:44 adam Exp $ ---- configure.in.orig 2008-10-31 17:22:23.000000000 +0200 +--- configure.in.orig 2010-05-23 20:39:44.000000000 +0000 +++ configure.in @@ -2697,6 +2697,8 @@ AC_CHECK_LIB(kstat, kstat_lookup, AC_DEFINE(HAVE_LIBKSTAT, 1, [Define to 1 if you have the `kstat' library (-lkstat).]) @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ # Check for libraries that the agent needs # saving old libraries NONAGENTLIBS=$LIBS -@@ -3425,6 +3427,12 @@ AC_CHECK_HEADERS(netinet/ip6.h netinet6/ +@@ -3432,6 +3434,12 @@ AC_CHECK_HEADERS(netinet/ip6.h netinet6/ #if HAVE_NETINET_IP6_H #include <netinet/ip6.h> #endif @@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ ]]) # DYNAMIC MODULE SUPPORT AC_CHECK_HEADERS(dlfcn.h) -@@ -3864,8 +3872,10 @@ AC_CHECK_STRUCT_FOR([ +@@ -3871,8 +3879,10 @@ AC_CHECK_STRUCT_FOR([ #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> ], sockaddr, sa_len, no) -@@ -3876,8 +3886,10 @@ AC_CHECK_STRUCT_FOR([ +@@ -3883,8 +3893,10 @@ AC_CHECK_STRUCT_FOR([ #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -46,7 +46,7 @@ $NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> ], sockaddr, sa_union.sa_generic.sa_family2, no) -@@ -3912,8 +3924,10 @@ AC_CHECK_STRUCT_FOR([ +@@ -3919,8 +3931,10 @@ AC_CHECK_STRUCT_FOR([ #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -57,7 +57,7 @@ $NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -3932,8 +3946,10 @@ AC_TRY_COMPILE([ +@@ -3939,8 +3953,10 @@ AC_TRY_COMPILE([ #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -68,7 +68,7 @@ $NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -3958,8 +3974,10 @@ AC_TRY_COMPILE([ +@@ -3965,8 +3981,10 @@ AC_TRY_COMPILE([ #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -79,7 +79,7 @@ $NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -4017,8 +4035,10 @@ AC_TRY_COMPILE([ +@@ -4024,8 +4042,10 @@ AC_TRY_COMPILE([ #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -90,7 +90,7 @@ $NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -4057,8 +4077,10 @@ AC_CHECK_STRUCT_FOR([ +@@ -4064,8 +4084,10 @@ AC_CHECK_STRUCT_FOR([ #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -101,7 +101,7 @@ $NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -4072,8 +4094,10 @@ AC_CHECK_STRUCT_FOR([ +@@ -4079,8 +4101,10 @@ AC_CHECK_STRUCT_FOR([ #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -112,7 +112,7 @@ $NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -4087,8 +4111,10 @@ AC_CHECK_STRUCT_FOR([ +@@ -4094,8 +4118,10 @@ AC_CHECK_STRUCT_FOR([ #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -123,7 +123,7 @@ $NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -4102,8 +4128,10 @@ AC_CHECK_STRUCT_FOR([ +@@ -4109,8 +4135,10 @@ AC_CHECK_STRUCT_FOR([ #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -134,7 +134,7 @@ $NetBSD: patch-ac,v 1.8 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -4162,6 +4190,7 @@ AC_CHECK_IFNET_FOR(if_noproto) +@@ -4169,6 +4197,7 @@ AC_CHECK_IFNET_FOR(if_noproto) AC_CHECK_IFNET_FOR(if_omcasts) AC_CHECK_IFNET_FOR(if_xname,no) AC_CHECK_IFNET_FOR(if_lastchange.tv_sec) diff --git a/net/net-snmp/patches/patch-ad b/net/net-snmp/patches/patch-ad index 64842023ad7..bcf26acb356 100644 --- a/net/net-snmp/patches/patch-ad +++ b/net/net-snmp/patches/patch-ad @@ -1,20 +1,20 @@ -$NetBSD: patch-ad,v 1.7 2009/02/15 11:31:51 tron Exp $ +$NetBSD: patch-ad,v 1.8 2010/07/20 08:33:44 adam Exp $ -Patch for CVE-2008-6123, taken from here: - -http://net-snmp.svn.sourceforge.net/viewvc/net-snmp/branches/V5-4-patches/net-snmp/snmplib/snmpUDPDomain.c?r1=17312&r2=17367&pathrev=17367 - ---- snmplib/snmpUDPDomain.c.orig 2007-10-11 21:46:30.000000000 +0100 -+++ snmplib/snmpUDPDomain.c 2009-02-15 11:21:10.000000000 +0000 -@@ -107,9 +107,9 @@ - sprintf(tmp, "UDP: [%s]->unknown", - inet_ntoa(addr_pair->local_addr)); - } else { -- sprintf(tmp, "UDP: [%s]->", inet_ntoa(addr_pair->local_addr)); -- sprintf(tmp + strlen(tmp), "[%s]:%hd", -+ sprintf(tmp, "UDP: [%s]:%hu->", - inet_ntoa(to->sin_addr), ntohs(to->sin_port)); -+ sprintf(tmp + strlen(tmp), "[%s]", inet_ntoa(addr_pair->local_addr)); +--- agent/auto_nlist.c.orig 2010-07-18 22:58:45.000000000 +0000 ++++ agent/auto_nlist.c +@@ -70,13 +70,13 @@ auto_nlist_value(const char *string) + #endif + it->nl[1].n_name = 0; + init_nlist(it->nl); +-#if !(defined(aix4) || defined(aix5) || defined(aix6)) ++/*#if !(defined(aix4) || defined(aix5) || defined(aix6)) + if (it->nl[0].n_type == 0) { + strcpy(it->nl[0].n_name, string); + it->nl[0].n_name[strlen(string)+1] = '\0'; + init_nlist(it->nl); } - return strdup(tmp); - } +-#endif ++#endif*/ + if (it->nl[0].n_type == 0) { + if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, + NETSNMP_DS_AGENT_NO_ROOT_ACCESS)) { diff --git a/net/net-snmp/patches/patch-ae b/net/net-snmp/patches/patch-ae index 1d08fabe153..cb4de6141e5 100644 --- a/net/net-snmp/patches/patch-ae +++ b/net/net-snmp/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.5 2007/02/05 12:06:16 adam Exp $ +$NetBSD: patch-ae,v 1.6 2010/07/20 08:33:44 adam Exp $ ---- snmplib/snmpUDPIPv6Domain.c.orig 2006-09-25 23:33:43.000000000 +0200 +--- snmplib/snmpUDPIPv6Domain.c.orig 2010-04-28 07:29:33.000000000 +0000 +++ snmplib/snmpUDPIPv6Domain.c -@@ -73,6 +73,10 @@ const struct in6_addr in6addr_any = IN6A +@@ -58,6 +58,10 @@ const struct in6_addr in6addr_any = IN6A #define SS_FAMILY __ss_family #endif diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af index e9259bdbb57..3415c7259e9 100644 --- a/net/net-snmp/patches/patch-af +++ b/net/net-snmp/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ +$NetBSD: patch-af,v 1.14 2010/07/20 08:33:44 adam Exp $ ---- configure.orig 2008-10-31 17:53:45.000000000 +0200 +--- configure.orig 2010-05-23 21:10:00.000000000 +0000 +++ configure @@ -27854,6 +27854,81 @@ _ACEOF fi @@ -84,7 +84,7 @@ $NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ # Check for libraries that the agent needs # saving old libraries NONAGENTLIBS=$LIBS -@@ -36844,6 +36919,12 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -36914,6 +36989,12 @@ cat >>conftest.$ac_ext <<_ACEOF #if HAVE_NETINET_IP6_H #include <netinet/ip6.h> #endif @@ -97,7 +97,7 @@ $NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ #include <$ac_header> -@@ -42849,8 +42930,10 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -42919,8 +43000,10 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -108,7 +108,7 @@ $NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> -@@ -42947,8 +43030,10 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -43017,8 +43100,10 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -119,7 +119,7 @@ $NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> -@@ -43241,8 +43326,10 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -43311,8 +43396,10 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -130,7 +130,7 @@ $NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -43330,8 +43417,10 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -43400,8 +43487,10 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -141,7 +141,7 @@ $NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -43399,8 +43488,10 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -43469,8 +43558,10 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -152,7 +152,7 @@ $NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -43539,8 +43630,10 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -43609,8 +43700,10 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -163,7 +163,7 @@ $NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -43772,8 +43865,10 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -43842,8 +43935,10 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -174,7 +174,7 @@ $NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -43873,8 +43968,10 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -43943,8 +44038,10 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -185,7 +185,7 @@ $NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -43974,8 +44071,10 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -44044,8 +44141,10 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -196,7 +196,7 @@ $NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -44075,8 +44174,10 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -44145,8 +44244,10 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> #ifdef IFNET_NEEDS_KERNEL #define KERNEL @@ -207,7 +207,7 @@ $NetBSD: patch-af,v 1.13 2009/03/10 18:30:44 apb Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -45730,6 +45831,143 @@ fi +@@ -45800,6 +45901,143 @@ fi ac_safe_struct=`echo "ifnet" | sed 'y%./+-%__p_%'` diff --git a/net/net-snmp/patches/patch-am b/net/net-snmp/patches/patch-am index 0027a4af45e..7fbd05070ec 100644 --- a/net/net-snmp/patches/patch-am +++ b/net/net-snmp/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.9 2008/09/08 12:58:09 adam Exp $ +$NetBSD: patch-am,v 1.10 2010/07/20 08:33:44 adam Exp $ ---- agent/mibgroup/host/hr_swrun.c.orig 2008-08-22 02:18:50.000000000 +0200 +--- agent/mibgroup/host/hr_swrun.c.orig 2009-06-14 22:01:33.000000000 +0000 +++ agent/mibgroup/host/hr_swrun.c -@@ -599,6 +599,8 @@ var_hrswrun(struct variable * vp, +@@ -604,6 +604,8 @@ var_hrswrun(struct variable * vp, #elif HAVE_KVM_GETPROCS #if defined(freebsd5) && __FreeBSD_version >= 500014 strcpy(string, proc_table[LowProcIndex].ki_comm); @@ -11,7 +11,7 @@ $NetBSD: patch-am,v 1.9 2008/09/08 12:58:09 adam Exp $ #else strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); #endif -@@ -722,6 +724,8 @@ var_hrswrun(struct variable * vp, +@@ -727,6 +729,8 @@ var_hrswrun(struct variable * vp, #elif HAVE_KVM_GETPROCS #if defined(freebsd5) && __FreeBSD_version >= 500014 strcpy(string, proc_table[LowProcIndex].ki_comm); @@ -20,7 +20,7 @@ $NetBSD: patch-am,v 1.9 2008/09/08 12:58:09 adam Exp $ #else strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); #endif -@@ -929,11 +933,17 @@ var_hrswrun(struct variable * vp, +@@ -933,11 +937,17 @@ var_hrswrun(struct variable * vp, } else long_return = 4; /* application */ #else @@ -38,7 +38,7 @@ $NetBSD: patch-am,v 1.9 2008/09/08 12:58:09 adam Exp $ #else long_return = 4; /* application */ #endif -@@ -970,6 +980,8 @@ var_hrswrun(struct variable * vp, +@@ -974,6 +984,8 @@ var_hrswrun(struct variable * vp, #if HAVE_KVM_GETPROCS #if defined(freebsd5) && __FreeBSD_version >= 500014 switch (proc_table[LowProcIndex].ki_stat) { @@ -47,7 +47,7 @@ $NetBSD: patch-am,v 1.9 2008/09/08 12:58:09 adam Exp $ #else switch (proc_table[LowProcIndex].kp_proc.p_stat) { #endif -@@ -1077,6 +1089,14 @@ var_hrswrun(struct variable * vp, +@@ -1081,6 +1093,14 @@ var_hrswrun(struct variable * vp, long_return = 0; #elif defined(freebsd5) long_return = proc_table[LowProcIndex].ki_runtime / 100000; @@ -62,7 +62,7 @@ $NetBSD: patch-am,v 1.9 2008/09/08 12:58:09 adam Exp $ #else long_return = proc_table[LowProcIndex].kp_proc.p_uticks + proc_table[LowProcIndex].kp_proc.p_sticks + -@@ -1169,6 +1189,8 @@ var_hrswrun(struct variable * vp, +@@ -1198,6 +1218,8 @@ var_hrswrun(struct variable * vp, long_return = #if defined(freebsd5) proc_table[LowProcIndex].ki_size / 1024; @@ -71,7 +71,7 @@ $NetBSD: patch-am,v 1.9 2008/09/08 12:58:09 adam Exp $ #else proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024; #endif -@@ -1489,6 +1511,9 @@ Get_Next_HR_SWRun(void) +@@ -1518,6 +1540,9 @@ Get_Next_HR_SWRun(void) #if defined(freebsd5) && __FreeBSD_version >= 500014 if (proc_table[current_proc_entry].ki_stat != 0) return proc_table[current_proc_entry++].ki_pid; diff --git a/net/net-snmp/patches/patch-dc b/net/net-snmp/patches/patch-dc index 8c69a85e156..aa3c551b0db 100644 --- a/net/net-snmp/patches/patch-dc +++ b/net/net-snmp/patches/patch-dc @@ -1,6 +1,6 @@ -$NetBSD: patch-dc,v 1.6 2009/03/10 18:30:44 apb Exp $ +$NetBSD: patch-dc,v 1.7 2010/07/20 08:33:44 adam Exp $ ---- include/net-snmp/net-snmp-config.h.in.orig 2008-07-28 13:41:40.000000000 +0200 +--- include/net-snmp/net-snmp-config.h.in.orig 2010-03-03 16:11:57.000000000 +0000 +++ include/net-snmp/net-snmp-config.h.in @@ -159,6 +159,7 @@ #undef STRUCT_IFNET_HAS_IF_IMCASTS @@ -10,7 +10,7 @@ $NetBSD: patch-dc,v 1.6 2009/03/10 18:30:44 apb Exp $ #undef STRUCT_IFNET_HAS_IF_NOPROTO #undef STRUCT_IFNET_HAS_IF_OMCASTS #undef STRUCT_IFNET_HAS_IF_XNAME -@@ -1463,6 +1464,7 @@ +@@ -1466,6 +1467,7 @@ #define NETSNMP_HPUX11ID 14 #define NETSNMP_AIXID 15 #define NETSNMP_MACOSXID 16 @@ -18,7 +18,7 @@ $NetBSD: patch-dc,v 1.6 2009/03/10 18:30:44 apb Exp $ #define NETSNMP_UNKNOWNID 255 #ifdef hpux9 -@@ -1492,6 +1494,9 @@ +@@ -1495,6 +1497,9 @@ #if defined(__FreeBSD__) #define NETSNMP_OSTYPE NETSNMP_FREEBSDID #endif diff --git a/net/net-snmp/patches/patch-dh b/net/net-snmp/patches/patch-dh index bf436853440..b600780bdd6 100644 --- a/net/net-snmp/patches/patch-dh +++ b/net/net-snmp/patches/patch-dh @@ -1,8 +1,8 @@ -$NetBSD: patch-dh,v 1.2 2007/02/05 12:06:16 adam Exp $ +$NetBSD: patch-dh,v 1.3 2010/07/20 08:33:44 adam Exp $ ---- mibs/UCD-SNMP-MIB.txt.orig 2006-11-22 17:49:28.000000000 +0100 +--- mibs/UCD-SNMP-MIB.txt.orig 2010-04-06 08:56:20.000000000 +0000 +++ mibs/UCD-SNMP-MIB.txt -@@ -127,6 +127,9 @@ bsdi OBJECT IDENTIFIER ::= +@@ -136,6 +136,9 @@ bsdi OBJECT IDENTIFIER ::= openbsd OBJECT IDENTIFIER ::= { ucdSnmpAgent 12 } win32 OBJECT IDENTIFIER ::= { ucdSnmpAgent 13 } -- unlucky hpux11 OBJECT IDENTIFIER ::= { ucdSnmpAgent 14 } diff --git a/net/net-snmp/patches/patch-ei b/net/net-snmp/patches/patch-ei index a7008276590..6cccd405ced 100644 --- a/net/net-snmp/patches/patch-ei +++ b/net/net-snmp/patches/patch-ei @@ -1,8 +1,8 @@ -$NetBSD: patch-ei,v 1.3 2007/08/11 11:05:57 adam Exp $ +$NetBSD: patch-ei,v 1.4 2010/07/20 08:33:44 adam Exp $ ---- agent/mibgroup/util_funcs.c.orig 2007-01-11 23:13:56.000000000 +0100 +--- agent/mibgroup/util_funcs.c.orig 2009-12-08 21:54:37.000000000 +0000 +++ agent/mibgroup/util_funcs.c -@@ -254,7 +254,7 @@ get_exec_output(struct extensible *ex) +@@ -268,7 +268,7 @@ get_exec_output(struct extensible *ex) #if HAVE_EXECV char cachefile[STRMAX]; char cache[NETSNMP_MAXCACHESIZE]; diff --git a/net/net-snmp/patches/patch-ey b/net/net-snmp/patches/patch-ey index ab2cfe0b085..00fe9e456aa 100644 --- a/net/net-snmp/patches/patch-ey +++ b/net/net-snmp/patches/patch-ey @@ -1,8 +1,8 @@ -$NetBSD: patch-ey,v 1.1 2010/05/11 04:39:54 adam Exp $ +$NetBSD: patch-ey,v 1.2 2010/07/20 08:33:44 adam Exp $ ---- agent/mibgroup/mibII/tcp.c.orig 2010-03-12 00:32:22.000000000 +0000 -+++ agent/mibgroup/mibII/tcp.c 2010-03-12 00:34:09.000000000 +0000 -@@ -167,6 +167,12 @@ +--- agent/mibgroup/mibII/tcp.c.orig 2009-11-13 12:59:26.000000000 +0000 ++++ agent/mibgroup/mibII/tcp.c +@@ -167,6 +167,12 @@ init_tcp(void) #define USES_SNMP_DESIGNED_TCPSTAT #endif @@ -15,7 +15,7 @@ $NetBSD: patch-ey,v 1.1 2010/05/11 04:39:54 adam Exp $ #if defined (WIN32) || defined (cygwin) #include <iphlpapi.h> #define TCP_STAT_STRUCTURE MIB_TCPSTATS -@@ -768,6 +774,21 @@ +@@ -689,6 +695,21 @@ tcp_load(netsnmp_cache *cache, void *vma } return ret_value; } |