diff options
Diffstat (limited to 'net/net-snmp/patches')
-rw-r--r-- | net/net-snmp/patches/patch-ai | 23 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-aj | 17 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ak | 18 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-am | 69 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-de | 84 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-dk | 16 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ep | 19 |
7 files changed, 198 insertions, 48 deletions
diff --git a/net/net-snmp/patches/patch-ai b/net/net-snmp/patches/patch-ai new file mode 100644 index 00000000000..bd371df6edf --- /dev/null +++ b/net/net-snmp/patches/patch-ai @@ -0,0 +1,23 @@ +$NetBSD: patch-ai,v 1.3.18.1 2008/06/16 08:51:43 ghen Exp $ + +--- agent/mibgroup/mibII/ip.c.orig 2008-06-06 15:51:31.000000000 +0100 ++++ agent/mibgroup/mibII/ip.c 2008-06-06 15:55:38.000000000 +0100 +@@ -212,6 +212,18 @@ + #define USES_TRADITIONAL_IPSTAT + #endif + ++#ifdef IP_NSTATS ++typedef struct ipstat { ++ uint64_t st[IP_NSTATS]; ++}; ++#define IP_STAT_STRUCTURE struct ipstat ++#endif ++ ++#ifdef dragonfly ++#define IP_STAT_STRUCTURE struct ip_stats ++#define USES_TRADITIONAL_IPSTAT ++#endif ++ + #if !defined(IP_STAT_STRUCTURE) + #define IP_STAT_STRUCTURE struct ipstat + #define USES_TRADITIONAL_IPSTAT diff --git a/net/net-snmp/patches/patch-aj b/net/net-snmp/patches/patch-aj new file mode 100644 index 00000000000..c30cd17ad58 --- /dev/null +++ b/net/net-snmp/patches/patch-aj @@ -0,0 +1,17 @@ +$NetBSD: patch-aj,v 1.4.6.1 2008/06/16 08:51:43 ghen Exp $ + +--- agent/mibgroup/mibII/udp.c.orig 2007-07-16 19:59:44.000000000 -0400 ++++ agent/mibgroup/mibII/udp.c 2008-06-04 19:46:27.000000000 -0400 +@@ -159,6 +159,12 @@ + #define USES_TRADITIONAL_UDPSTAT + #endif + ++#ifdef UDP_NSTATS ++typedef struct udpstat { ++ uint64_t st[UDP_NSTATS]; ++}; ++#define UDP_STAT_STRUCTURE struct udpstat ++#endif + + #if !defined(UDP_STAT_STRUCTURE) + #define UDP_STAT_STRUCTURE struct udpstat diff --git a/net/net-snmp/patches/patch-ak b/net/net-snmp/patches/patch-ak new file mode 100644 index 00000000000..37e899ff515 --- /dev/null +++ b/net/net-snmp/patches/patch-ak @@ -0,0 +1,18 @@ +$NetBSD: patch-ak,v 1.3.18.1 2008/06/16 08:51:43 ghen Exp $ + +--- agent/mibgroup/mibII/icmp.c.orig 2007-07-16 19:59:44.000000000 -0400 ++++ agent/mibgroup/mibII/icmp.c 2008-06-04 19:42:01.000000000 -0400 +@@ -140,6 +140,13 @@ + #define USES_TRADITIONAL_ICMPSTAT + #endif + ++#ifdef ICMP_NSTATS ++struct icmpstat { ++ uint64_t st[ICMP_NSTATS]; ++}; ++#define ICMP_STAT_STRUCTURE struct icmpstat ++#endif ++ + #if !defined(ICMP_STAT_STRUCTURE) + #define ICMP_STAT_STRUCTURE struct icmpstat + #define USES_TRADITIONAL_ICMPSTAT diff --git a/net/net-snmp/patches/patch-am b/net/net-snmp/patches/patch-am index 100642032a6..2167a5da31f 100644 --- a/net/net-snmp/patches/patch-am +++ b/net/net-snmp/patches/patch-am @@ -1,8 +1,33 @@ -$NetBSD: patch-am,v 1.6 2007/02/05 12:06:16 adam Exp $ - ---- agent/mibgroup/host/hr_swrun.c.orig 2006-10-17 16:26:21.000000000 +0200 -+++ agent/mibgroup/host/hr_swrun.c -@@ -926,6 +926,8 @@ var_hrswrun(struct variable * vp, +--- agent/mibgroup/host/hr_swrun.c.orig 2007-04-02 16:51:34 +0300 ++++ agent/mibgroup/host/hr_swrun.c 2007-09-12 21:41:48 +0300 +@@ -599,6 +599,8 @@ + #elif HAVE_KVM_GETPROCS + #if defined(freebsd5) && __FreeBSD_version >= 500014 + strcpy(string, proc_table[LowProcIndex].ki_comm); ++ #elif defined(dragonfly) && __DragonFly_version >= 190000 ++ strcpy(string, proc_table[LowProcIndex].kp_comm); + #else + strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); + #endif +@@ -722,6 +724,8 @@ + #elif HAVE_KVM_GETPROCS + #if defined(freebsd5) && __FreeBSD_version >= 500014 + strcpy(string, proc_table[LowProcIndex].ki_comm); ++ #elif defined(dragonfly) && __DragonFly_version >= 190000 ++ strcpy(string, proc_table[LowProcIndex].kp_comm); + #else + strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); + #endif +@@ -921,11 +925,17 @@ + } else + long_return = 4; /* application */ + #else ++ #if defined(dragonfly) && __DragonFly_version >= 190000 ++ if (proc_table[LowProcIndex].kp_flags & P_SYSTEM) ++ #else + if (proc_table[LowProcIndex].kp_proc.p_flag & P_SYSTEM) ++ #endif + long_return = 2; /* operatingSystem */ else long_return = 4; /* application */ #endif @@ -11,10 +36,23 @@ $NetBSD: patch-am,v 1.6 2007/02/05 12:06:16 adam Exp $ #else long_return = 4; /* application */ #endif -@@ -1069,6 +1071,10 @@ var_hrswrun(struct variable * vp, +@@ -962,6 +972,8 @@ + #if HAVE_KVM_GETPROCS + #if defined(freebsd5) && __FreeBSD_version >= 500014 + switch (proc_table[LowProcIndex].ki_stat) { ++ #elif defined(dragonfly) && __DragonFly_version >= 190000 ++ switch (proc_table[LowProcIndex].kp_stat) { + #else + switch (proc_table[LowProcIndex].kp_proc.p_stat) { + #endif +@@ -1069,6 +1081,14 @@ long_return = 0; #elif defined(freebsd5) long_return = proc_table[LowProcIndex].ki_runtime / 100000; ++ #elif defined(dragonfly) && __DragonFly_version >= 190000 ++ long_return = proc_table[LowProcIndex].kp_lwp.kl_uticks + ++ proc_table[LowProcIndex].kp_lwp.kl_sticks + ++ proc_table[LowProcIndex].kp_lwp.kl_iticks; + #elif defined(dragonfly) + long_return = proc_table[LowProcIndex].kp_eproc.e_uticks + + proc_table[LowProcIndex].kp_eproc.e_sticks + @@ -22,3 +60,22 @@ $NetBSD: patch-am,v 1.6 2007/02/05 12:06:16 adam Exp $ #else long_return = proc_table[LowProcIndex].kp_proc.p_uticks + proc_table[LowProcIndex].kp_proc.p_sticks + +@@ -1157,6 +1177,8 @@ + long_return = + #if defined(freebsd5) + proc_table[LowProcIndex].ki_size / 1024; ++ #elif defined(dragonfly) && __DragonFly_version >= 190000 ++ proc_table[LowProcIndex].kp_vm_map_size / 1024; + #else + proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024; + #endif +@@ -1477,6 +1499,9 @@ + #if defined(freebsd5) && __FreeBSD_version >= 500014 + if (proc_table[current_proc_entry].ki_stat != 0) + return proc_table[current_proc_entry++].ki_pid; ++ #elif defined(dragonfly) && __DragonFly_version >= 190000 ++ if (proc_table[current_proc_entry].kp_stat != 0) ++ return proc_table[current_proc_entry++].kp_pid; + #else + if (proc_table[current_proc_entry].kp_proc.p_stat != 0) + return proc_table[current_proc_entry++].kp_proc.p_pid; diff --git a/net/net-snmp/patches/patch-de b/net/net-snmp/patches/patch-de index 4220bd8944f..d474a7d4644 100644 --- a/net/net-snmp/patches/patch-de +++ b/net/net-snmp/patches/patch-de @@ -1,7 +1,5 @@ -$NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ - ---- agent/mibgroup/mibII/ipv6.c.orig 2007-05-25 00:01:04.000000000 +0200 -+++ agent/mibgroup/mibII/ipv6.c +--- agent/mibgroup/mibII/ipv6.c.orig 2007-05-25 01:01:04 +0300 ++++ agent/mibgroup/mibII/ipv6.c 2008-05-26 22:26:32 +0300 @@ -11,7 +11,7 @@ #include <sys/types.h> #include <sys/param.h> @@ -29,25 +27,67 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ q = (caddr_t) TAILQ_NEXT(&tmp, if_link); #else # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -809,7 +809,7 @@ var_ifv6Entry(register struct variable * +@@ -804,13 +804,36 @@ var_ifv6Entry(register struct variable * + { + struct ifnet ifnet; + struct ifaddr ifaddr; ++#if defined(__DragonFly__) && __DragonFly_version >= 197700 ++ struct ifaddr_container ifac; ++ struct ifaddrhead head; ++#endif + static struct sockaddr_dl sdl; + caddr_t ifa; if (if_getifnet(interface, &ifnet) < 0) break; -#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) +#if defined(freebsd3) || defined(darwin) ++# if defined(__DragonFly__) && __DragonFly_version >= 197700 ++ /* ++ * Locate ifaddr head on CPU0 ++ */ ++ if (!NETSNMP_KLOOKUP(ifnet.if_addrheads, (char *)&head, sizeof(head))) { ++ DEBUGMSGTL(("mibII/ipv6:var_ipv6", "klookup head failed\n")); ++ break; ++ } ++ if (TAILQ_FIRST(&head) != NULL) { ++ if (!NETSNMP_KLOOKUP(TAILQ_FIRST(&head), (char *) &ifac, sizeof(ifac))) { ++ DEBUGMSGTL(("mibII/ipv6:var_ipv6", "klookup ifac failed\n")); ++ break; ++ } ++ ifa = (caddr_t)ifac.ifa; ++ } else { ++ ifa = NULL; ++ } ++# else ifa = (caddr_t) TAILQ_FIRST(&ifnet.if_addrhead); ++# endif #else # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -836,7 +836,7 @@ var_ifv6Entry(register struct variable * + ifa = (caddr_t) TAILQ_FIRST(&ifnet.if_addrlist); +@@ -836,8 +859,20 @@ var_ifv6Entry(register struct variable * *var_len = sdl.sdl_alen; return (u_char *) (sdl.sdl_data + sdl.sdl_nlen); } -#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) +#if defined(freebsd3) || defined(darwin) ++# if defined(__DragonFly__) && __DragonFly_version >= 197700 ++ if (TAILQ_NEXT(&ifac, ifa_link) == NULL) { ++ ifa = NULL; ++ } else { ++ if (!NETSNMP_KLOOKUP(TAILQ_NEXT(&ifac, ifa_link), (char *)&ifac, sizeof(ifac))) { ++ DEBUGMSGTL(("mibII/ipv6:var_ipv6", "klookup ifac next failed\n")); ++ break; ++ } ++ ifa = (caddr_t)ifac.ifa; ++ } ++# else ifa = (caddr_t) TAILQ_NEXT(&ifaddr, ifa_link); ++# endif #else # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -1239,7 +1239,11 @@ var_udp6(register struct variable * vp, + ifa = (caddr_t) TAILQ_NEXT(&ifaddr, ifa_list); +@@ -1239,7 +1274,11 @@ var_udp6(register struct variable * vp, #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ struct inpcbtable udbtable; caddr_t first; @@ -60,7 +100,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ char *sysctl_buf; struct xinpgen *xig, *oxig; #else -@@ -1254,10 +1258,31 @@ var_udp6(register struct variable * vp, +@@ -1254,10 +1293,31 @@ var_udp6(register struct variable * vp, if (!auto_nlist("udbtable", (char *) &udbtable, sizeof(udbtable))) return NULL; first = p = (caddr_t)udbtable.inpt_queue.cqh_first; @@ -93,7 +133,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ #else { const char *udblist = "net.inet.udp.pcblist"; -@@ -1285,15 +1310,17 @@ var_udp6(register struct variable * vp, +@@ -1285,15 +1345,17 @@ var_udp6(register struct variable * vp, while ( #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ p && p != first @@ -113,7 +153,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) { DEBUGMSGTL(("mibII/ipv6", "klookup fail for udb6 at %x\n", p)); -@@ -1306,7 +1333,7 @@ var_udp6(register struct variable * vp, +@@ -1306,7 +1368,7 @@ var_udp6(register struct variable * vp, #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ if (in6pcb.in6p_af != AF_INET6) goto skip; @@ -122,7 +162,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ if (0 == (in6pcb.inp_vflag & INP_IPV6)) goto skip; #endif -@@ -1349,13 +1376,15 @@ var_udp6(register struct variable * vp, +@@ -1349,13 +1411,15 @@ var_udp6(register struct variable * vp, skip: #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ p = (caddr_t)in6pcb.in6p_queue.cqe_next; @@ -140,7 +180,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ free(sysctl_buf); #endif DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1414,7 +1443,7 @@ var_tcp6(register struct variable * vp, +@@ -1414,7 +1478,7 @@ var_tcp6(register struct variable * vp, #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ struct inpcbtable tcbtable; caddr_t first; @@ -149,7 +189,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ char *sysctl_buf; struct xinpgen *xig, *oxig; #else -@@ -1444,7 +1473,7 @@ var_tcp6(register struct variable * vp, +@@ -1444,7 +1508,7 @@ var_tcp6(register struct variable * vp, if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable))) return NULL; first = p = (caddr_t)tcbtable.inpt_queue.cqh_first; @@ -158,7 +198,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ if (!auto_nlist("tcb6", (char *) &tcb6, sizeof(tcb6))) return NULL; p = (caddr_t) tcb6.in6p_next; -@@ -1475,7 +1504,7 @@ var_tcp6(register struct variable * vp, +@@ -1475,7 +1539,7 @@ var_tcp6(register struct variable * vp, while ( #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ p && p != first @@ -167,7 +207,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ p && (u_long) p != auto_nlist_value("tcb6") #else xig->xig_len > sizeof(struct xinpgen) -@@ -1483,7 +1512,7 @@ var_tcp6(register struct variable * vp, +@@ -1483,7 +1547,7 @@ var_tcp6(register struct variable * vp, ) { DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); @@ -176,7 +216,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) { DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n", p)); -@@ -1496,7 +1525,7 @@ var_tcp6(register struct variable * vp, +@@ -1496,7 +1560,7 @@ var_tcp6(register struct variable * vp, #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ if (in6pcb.in6p_af != AF_INET6) goto skip; @@ -185,7 +225,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ if (0 == (in6pcb.inp_vflag & INP_IPV6)) goto skip; #endif -@@ -1553,13 +1582,13 @@ var_tcp6(register struct variable * vp, +@@ -1553,13 +1617,13 @@ var_tcp6(register struct variable * vp, skip: #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ p = (caddr_t)in6pcb.in6p_queue.cqe_next; @@ -201,7 +241,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ free(sysctl_buf); #endif DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1651,7 +1680,11 @@ var_tcp6(register struct variable * vp, +@@ -1651,7 +1715,11 @@ var_tcp6(register struct variable * vp, #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ struct inpcbtable tcbtable; caddr_t first; @@ -214,7 +254,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ char *sysctl_buf; struct xinpgen *xig, *oxig; #else -@@ -1666,10 +1699,31 @@ var_tcp6(register struct variable * vp, +@@ -1666,10 +1734,31 @@ var_tcp6(register struct variable * vp, if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable))) return NULL; first = p = (caddr_t)tcbtable.inpt_queue.cqh_first; @@ -247,7 +287,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ #else { const char *tcblist = "net.inet.tcp.pcblist"; -@@ -1686,7 +1740,8 @@ var_tcp6(register struct variable * vp, +@@ -1686,7 +1775,8 @@ var_tcp6(register struct variable * vp, return NULL; } oxig = (struct xinpgen *) sysctl_buf; @@ -257,7 +297,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ p = (caddr_t) ((char *) xig); /* silence compiler warning */ } #endif -@@ -1697,28 +1752,32 @@ var_tcp6(register struct variable * vp, +@@ -1697,28 +1787,32 @@ var_tcp6(register struct variable * vp, while ( #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ p && p != first @@ -293,7 +333,7 @@ $NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $ if (0 == (in6pcb.inp_vflag & INP_IPV6)) goto skip; #endif -@@ -1774,13 +1833,15 @@ var_tcp6(register struct variable * vp, +@@ -1774,13 +1868,15 @@ var_tcp6(register struct variable * vp, skip: #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ p = (caddr_t)in6pcb.in6p_queue.cqe_next; diff --git a/net/net-snmp/patches/patch-dk b/net/net-snmp/patches/patch-dk deleted file mode 100644 index 2fe796f9672..00000000000 --- a/net/net-snmp/patches/patch-dk +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-dk,v 1.2 2007/02/05 12:06:16 adam Exp $ - ---- agent/mibgroup/mibII/ip.c.orig 2006-09-15 02:48:40.000000000 +0200 -+++ agent/mibgroup/mibII/ip.c -@@ -212,6 +212,11 @@ long ipTTL, oldipTTL; - #define USES_TRADITIONAL_IPSTAT - #endif - -+#ifdef dragonfly -+#define IP_STAT_STRUCTURE struct ip_stats -+#define USES_TRADITIONAL_IPSTAT -+#endif -+ - #if !defined(IP_STAT_STRUCTURE) - #define IP_STAT_STRUCTURE struct ipstat - #define USES_TRADITIONAL_IPSTAT diff --git a/net/net-snmp/patches/patch-ep b/net/net-snmp/patches/patch-ep index bcd72034dd5..780cc8b31b1 100644 --- a/net/net-snmp/patches/patch-ep +++ b/net/net-snmp/patches/patch-ep @@ -1,8 +1,8 @@ -$NetBSD: patch-ep,v 1.2 2007/02/05 12:06:16 adam Exp $ +$NetBSD: patch-ep,v 1.2.10.1 2008/06/16 08:51:43 ghen Exp $ ---- snmplib/scapi.c.orig 2006-09-15 14:47:00.000000000 +0200 -+++ snmplib/scapi.c -@@ -272,7 +272,7 @@ sc_generate_keyed_hash(const oid * autht +--- snmplib/scapi.c.orig 2006-09-15 13:47:01.000000000 +0100 ++++ snmplib/scapi.c 2008-06-12 13:58:35.000000000 +0100 +@@ -272,7 +272,7 @@ u_char buf[SNMP_MAXBUF_SMALL]; #if defined(NETSNMP_USE_OPENSSL) || defined(NETSNMP_USE_PKCS11) @@ -11,3 +11,14 @@ $NetBSD: patch-ep,v 1.2 2007/02/05 12:06:16 adam Exp $ #endif DEBUGTRACE; +@@ -563,6 +563,10 @@ + } + + ++ if (maclen != USM_MD5_AND_SHA_AUTH_LEN) { ++ QUITFUN(SNMPERR_GENERR, sc_check_keyed_hash_quit); ++ } ++ + /* + * Generate a full hash of the message, then compare + * the result with the given MAC which may shorter than |