pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/net-snmp Changes 5.1.2:
details: https://anonhg.NetBSD.org/pkgsrc/rev/904530d7c78c
branches: trunk
changeset: 479373:904530d7c78c
user: adam <adam%pkgsrc.org@localhost>
date: Fri Aug 13 11:28:49 2004 +0000
description:
Changes 5.1.2:
* Minor improvements to snmpdelta
* Minor improvements to snmpnetstat (IPv6 output)
* Fixes
diffstat:
net/net-snmp/Makefile | 7 +-
net/net-snmp/PLIST | 18 +-
net/net-snmp/distinfo | 16 +-
net/net-snmp/patches/patch-ab | 275 ------------------------------------------
net/net-snmp/patches/patch-ae | 6 +-
net/net-snmp/patches/patch-af | 6 +-
net/net-snmp/patches/patch-ag | 12 +-
net/net-snmp/patches/patch-ah | 31 ----
net/net-snmp/patches/patch-ai | 6 +-
9 files changed, 34 insertions(+), 343 deletions(-)
diffs (truncated from 511 to 300 lines):
diff -r b86d2b361c60 -r 904530d7c78c net/net-snmp/Makefile
--- a/net/net-snmp/Makefile Fri Aug 13 11:08:07 2004 +0000
+++ b/net/net-snmp/Makefile Fri Aug 13 11:28:49 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/07/10 17:59:57 thorpej Exp $
+# $NetBSD: Makefile,v 1.23 2004/08/13 11:28:49 adam Exp $
-DISTNAME= net-snmp-5.1.1
+DISTNAME= net-snmp-5.1.2
CATEGORIES= net
-PKGREVISION= 1
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/
@@ -18,7 +17,7 @@
NET_SNMP_SYS_CONTACT?= default_user@contact.domain
NET_SNMP_SYS_LOCATION?= defaultlocation
-NET_SNMP_PERSISTENTDIR?= /var/net-snmp
+NET_SNMP_PERSISTENTDIR?= ${VARBASE}/net-snmp
NET_SNMP_MIBDIRS?= \$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:/usr/local/share/snmp/mibs
USE_BUILDLINK3= yes
diff -r b86d2b361c60 -r 904530d7c78c net/net-snmp/PLIST
--- a/net/net-snmp/PLIST Fri Aug 13 11:08:07 2004 +0000
+++ b/net/net-snmp/PLIST Fri Aug 13 11:28:49 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/05/14 13:30:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/08/13 11:28:49 adam Exp $
bin/encode_keychange
bin/fixproc
bin/ipf-mod.pl
@@ -204,32 +204,32 @@
lib/libnetsnmp.la
lib/libnetsnmp.so
lib/libnetsnmp.so.6
-lib/libnetsnmp.so.6.1
+lib/libnetsnmp.so.6.2
lib/libnetsnmpagent.a
lib/libnetsnmpagent.la
lib/libnetsnmpagent.so
lib/libnetsnmpagent.so.6
-lib/libnetsnmpagent.so.6.1
+lib/libnetsnmpagent.so.6.2
lib/libnetsnmphelpers.a
lib/libnetsnmphelpers.la
lib/libnetsnmphelpers.so
lib/libnetsnmphelpers.so.6
-lib/libnetsnmphelpers.so.6.1
+lib/libnetsnmphelpers.so.6.2
lib/libnetsnmpmibs.a
lib/libnetsnmpmibs.la
lib/libnetsnmpmibs.so
lib/libnetsnmpmibs.so.6
-lib/libnetsnmpmibs.so.6.1
+lib/libnetsnmpmibs.so.6.2
lib/libsnmp.a
lib/libsnmp.la
lib/libsnmp.so
lib/libsnmp.so.6
-lib/libsnmp.so.6.1
+lib/libsnmp.so.6.2
lib/libnetsnmptrapd.a
lib/libnetsnmptrapd.la
lib/libnetsnmptrapd.so
lib/libnetsnmptrapd.so.6
-lib/libnetsnmptrapd.so.6.1
+lib/libnetsnmptrapd.so.6.2
man/man1/mib2c.1
man/man1/snmpbulkget.1
man/man1/snmpbulkwalk.1
@@ -259,12 +259,12 @@
man/man3/mib_api.3
man/man3/netsnmp_Container_iterator.3
man/man3/netsnmp_agent.3
+man/man3/netsnmp_asn1_packet_parse.3
man/man3/netsnmp_baby_steps.3
man/man3/netsnmp_bulk_to_next.3
man/man3/netsnmp_cache_handler.3
man/man3/netsnmp_container.3
man/man3/netsnmp_debug.3
-man/man3/netsnmp_deprecated.3
man/man3/netsnmp_example_scalar_int.3
man/man3/netsnmp_handler.3
man/man3/netsnmp_instance.3
@@ -287,7 +287,6 @@
man/man3/netsnmp_table_data.3
man/man3/netsnmp_table_dataset.3
man/man3/netsnmp_table_iterator.3
-man/man3/netsnmp_todo.3
man/man3/netsnmp_utilities.3
man/man3/netsnmp_watcher.3
man/man3/print_description.3
@@ -391,6 +390,7 @@
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-USM-AES-MIB.txt
share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
share/snmp/mibs/SNMPv2-CONF.txt
share/snmp/mibs/SNMPv2-MIB.txt
diff -r b86d2b361c60 -r 904530d7c78c net/net-snmp/distinfo
--- a/net/net-snmp/distinfo Fri Aug 13 11:08:07 2004 +0000
+++ b/net/net-snmp/distinfo Fri Aug 13 11:28:49 2004 +0000
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.11 2004/07/10 17:59:17 thorpej Exp $
+$NetBSD: distinfo,v 1.12 2004/08/13 11:28:49 adam Exp $
-SHA1 (net-snmp-5.1.1.tar.gz) = 19fe6191ac1312f6f65bf2b9513e8d25084cac1b
-Size (net-snmp-5.1.1.tar.gz) = 2977122 bytes
+SHA1 (net-snmp-5.1.2.tar.gz) = cf82a86d1b44408890cabe471181b62049cb11d0
+Size (net-snmp-5.1.2.tar.gz) = 3253579 bytes
SHA1 (patch-aa) = df9bcea942743e9bcd843724612b7d82ea364eca
-SHA1 (patch-ab) = d14ea51456a30cc28337cecace032167b2614163
SHA1 (patch-ac) = 43dbf5519feac2a13b893f659090fa24de773ee8
SHA1 (patch-ad) = 522872c90ac1e442dafb1d210af6e978ac741ce9
-SHA1 (patch-ae) = cfa956d0e67dd2ff9720faee248c0b5ca00843e4
-SHA1 (patch-af) = b274c4234ff1034e56954f24db066ee38edc8ef4
-SHA1 (patch-ag) = 6d07febd92597d1d817e3c1960ce9afcc75a6906
-SHA1 (patch-ah) = cd2bd7adfb66f8e250dc686644d3888f4750f2d3
-SHA1 (patch-ai) = 8518a29c82c63330f0300c6ca99f9a1c7ec0d072
+SHA1 (patch-ae) = 122cd63fcdfa01e94083a9f635c3c46d364a0237
+SHA1 (patch-af) = 21febf32bd44c63a96284b231d39abb00c050532
+SHA1 (patch-ag) = bdb76aecc3a301871c990db1440dc3d78f480bf4
+SHA1 (patch-ai) = 8255b8ebfea1242076c87f879169d5f24b0f83e1
SHA1 (patch-aj) = ba320b1b8d5c4e14456f919b70e84de4b86ac73b
diff -r b86d2b361c60 -r 904530d7c78c net/net-snmp/patches/patch-ab
--- a/net/net-snmp/patches/patch-ab Fri Aug 13 11:08:07 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,275 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/05/14 13:30:34 adam Exp $
-
---- agent/mibgroup/mibII/ipv6.c.orig 2004-02-02 23:33:34.000000000 +0000
-+++ agent/mibgroup/mibII/ipv6.c
-@@ -11,7 +11,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-+#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin)
- # if HAVE_SYS_SOCKETVAR_H
- # include <sys/socketvar.h>
- # endif
-@@ -80,7 +80,7 @@
- # include <netinet6/ip6_var.h>
- #endif
- #include <net/route.h>
--#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-+#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin)
- # if HAVE_NETINET_IN_PCB_H
- # include <netinet/in_pcb.h>
- # endif
-@@ -572,7 +572,7 @@ if_getifnet(int idx, struct ifnet *resul
- memcpy(result, &tmp, sizeof(tmp));
- return 0;
- }
--#if defined(__FreeBSD__) && 3 <= __FreeBSD__
-+#if (defined(__FreeBSD__) && 3 <= __FreeBSD__) || defined(darwin)
- q = (caddr_t) TAILQ_NEXT(&tmp, if_link);
- #else
- # if defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -801,7 +801,7 @@ var_ifv6Entry(register struct variable *
-
- if (if_getifnet(interface, &ifnet) < 0)
- break;
--#if defined(__FreeBSD__) && 3 <= __FreeBSD__
-+#if (defined(__FreeBSD__) && 3 <= __FreeBSD__) || defined(darwin)
- ifa = (caddr_t) TAILQ_FIRST(&ifnet.if_addrhead);
- #else
- # if defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -822,7 +822,7 @@ var_ifv6Entry(register struct variable *
- *var_len = sdl.sdl_alen;
- return (u_char *) (sdl.sdl_data + sdl.sdl_nlen);
- }
--#if defined(__FreeBSD__) && 3 <= __FreeBSD__
-+#if (defined(__FreeBSD__) && 3 <= __FreeBSD__) || defined(darwin)
- ifa = (caddr_t) TAILQ_NEXT(&ifaddr, ifa_link);
- #else
- # if defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -1225,7 +1225,11 @@ var_udp6(register struct variable * vp,
- caddr_t p;
- static struct in6pcb in6pcb, udb6;
- int found, hitnext;
--#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/
-+ struct inpcbtable udbtable;
-+ caddr_t first;
-+#endif
-+#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin)
- char *sysctl_buf;
- struct xinpgen *xig, *oxig;
- #endif /* defined(__FreeBSD__) && __FreeBSD__ >= 3 */
-@@ -1234,7 +1238,11 @@ var_udp6(register struct variable * vp,
- DEBUGMSGOID(("mibII/ipv6", name, *length));
- DEBUGMSG(("mibII/ipv6", " %d\n", exact));
-
--#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/
-+ if (!auto_nlist("udbtable", (char *) &udbtable, sizeof(udbtable)))
-+ return NULL;
-+ first = p = (caddr_t)udbtable.inpt_queue.cqh_first;
-+#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin)
- if (!auto_nlist("udb6", (char *) &udb6, sizeof(udb6)))
- return NULL;
- p = (caddr_t) udb6.in6p_next;
-@@ -1260,7 +1268,9 @@ var_udp6(register struct variable * vp,
- (int) vp->namelen * sizeof(oid));
- DEBUGMSGTL(("mibII/ipv6", "start: p=%x\n", p));
- while (
--#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/
-+ p && p != first
-+#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin)
- p && (u_long) p != auto_nlist_value("udb6")
- #else
- xig->xig_len > sizeof(struct xinpgen)
-@@ -1268,11 +1278,17 @@ var_udp6(register struct variable * vp,
- ) {
- DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p));
-
--#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
-+#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin)
- klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb));
- #else
- in6pcb = ((struct xinpcb *) xig)->xi_inp;
- #endif
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/
-+ if (in6pcb.in6p_af != AF_INET6) {
-+ p = (caddr_t)in6pcb.in6p_queue.cqe_next;
-+ continue;
-+ }
-+#endif
- j = (int) vp->namelen;
- for (i = 0; i < sizeof(struct in6_addr); i++)
- newname[j++] = in6pcb.in6p_laddr.s6_addr[i];
-@@ -1325,13 +1341,15 @@ var_udp6(register struct variable * vp,
- }
- }
- }
--#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/
-+ p = (caddr_t)in6pcb.in6p_queue.cqe_next;
-+#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin)
- p = (caddr_t) in6pcb.in6p_next;
- #else
- xig = (struct xinpgen *) ((char *) xig + xig->xig_len);
- #endif
- }
--#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-+#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin)
- free(sysctl_buf);
- #endif /* defined(__FreeBSD__) && __FreeBSD__ >= 3 */
- if (!found)
-@@ -1383,7 +1401,11 @@ var_tcp6(register struct variable * vp,
- int found, hitnext;
- static int tcp6statemap[TCP6_NSTATES];
- static int initialized = 0;
--#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/
-+ struct inpcbtable tcbtable;
-+ caddr_t first;
-+#endif
-+#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin)
- char *sysctl_buf;
- struct xinpgen *xig, *oxig;
- #endif /* defined(__FreeBSD__) && __FreeBSD__ >= 3 */
-@@ -1407,7 +1429,11 @@ var_tcp6(register struct variable * vp,
- DEBUGMSGOID(("mibII/ipv6", name, *length));
- DEBUGMSG(("mibII/ipv6", " %d\n", exact));
-
--#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/
-+ if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable)))
-+ return NULL;
-+ first = p = (caddr_t)udbtable.inpt_queue.cqh_first;
-+#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin)
- if (!auto_nlist("tcb6", (char *) &tcb6, sizeof(tcb6)))
- return NULL;
- p = (caddr_t) tcb6.in6p_next;
-@@ -1433,7 +1459,9 @@ var_tcp6(register struct variable * vp,
- memcpy((char *) newname, (char *) vp->name,
- (int) vp->namelen * sizeof(oid));
- while (
--#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/
-+ p && p != first
-+#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin)
- p && (u_long) p != auto_nlist_value("tcb6")
- #else
- xig->xig_len > sizeof(struct xinpgen)
-@@ -1441,7 +1469,7 @@ var_tcp6(register struct variable * vp,
- ) {
- DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p));
-
--#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
-+#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin)
- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) {
- DEBUGMSGTL(("mibII/ipv6", "klookup fail for in6pcb at %x\n",
- p));
-@@ -1450,6 +1478,12 @@ var_tcp6(register struct variable * vp,
Home |
Main Index |
Thread Index |
Old Index