Changes 0.5.0:

Bug fixes.
Updated MIBs.

4 files changed, 113 insertions, 47 deletions

diff --git a/devel/libsmi/Makefile b/devel/libsmi/Makefile
index bdf8e08ab8f..89e20b9c772 100644
--- a/devel/libsmi/Makefile
+++ b/devel/libsmi/Makefile
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.18 2012/10/31 11:17:21 asau Exp $
+# $NetBSD: Makefile,v 1.19 2015/11/06 17:07:23 adam Exp $
 
-DISTNAME=	libsmi-0.4.8
-PKGREVISION=	1
+DISTNAME=	libsmi-0.5.0
 CATEGORIES=	devel net
-MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/
+MASTER_SITES=	http://www.ibr.cs.tu-bs.de/projects/libsmi/download/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ibr.cs.tu-bs.de/projects/libsmi/
 COMMENT=	Library to access SMI MIB information
+LICENSE=	esdl-license
 
 MIBDIR=		${PREFIX}/share/libsmi/mibs
 PIBDIR=		${PREFIX}/share/libsmi/pibs
 
 DEPENDS+=	wget-[0-9]*:../../net/wget
 
-USE_LIBTOOL=	YES
-USE_TOOLS+=	gmake
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--with-mibdir=${MIBDIR:Q}
-CONFIGURE_ARGS+=--with-pibdir=${PIBDIR:Q}
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-mibdir=${MIBDIR:Q}
+CONFIGURE_ARGS+=	--with-pibdir=${PIBDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 REPLACE_SH+=	tools/smicache.in
 REPLACE_SH+=	tools/smistrip.in
diff --git a/devel/libsmi/PLIST b/devel/libsmi/PLIST
index 4d0d8b18bbe..1b7b995fc70 100644
--- a/devel/libsmi/PLIST
+++ b/devel/libsmi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:48:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/11/06 17:07:23 adam Exp $
 bin/smicache
 bin/smidiff
 bin/smidump
@@ -7,6 +7,7 @@ bin/smiquery
 bin/smistrip
 bin/smixlate
 include/smi.h
+include/yang.h
 lib/libsmi.la
 lib/pkgconfig/libsmi.pc
 man/man1/smicache.1
@@ -27,15 +28,13 @@ man/man3/smi_module.3
 man/man3/smi_node.3
 man/man3/smi_render.3
 man/man3/smi_type.3
-man/man1/smixlate.1
-man/man3/smi_attribute.3
-man/man3/smi_class.3
-man/man3/smi_event.3
-man/man3/smi_identity.3
 man/man3/smi_util.3
+man/man3/yang_node.3
 share/aclocal/libsmi.m4
 share/libsmi/mibs/iana/IANA-ADDRESS-FAMILY-NUMBERS-MIB
+share/libsmi/mibs/iana/IANA-BFD-TC-STD-MIB
 share/libsmi/mibs/iana/IANA-CHARSET-MIB
+share/libsmi/mibs/iana/IANA-ENTITY-MIB
 share/libsmi/mibs/iana/IANA-FINISHER-MIB
 share/libsmi/mibs/iana/IANA-GMPLS-TC-MIB
 share/libsmi/mibs/iana/IANA-IPPM-METRICS-REGISTRY-MIB
@@ -44,6 +43,7 @@ share/libsmi/mibs/iana/IANA-LANGUAGE-MIB
 share/libsmi/mibs/iana/IANA-MALLOC-MIB
 share/libsmi/mibs/iana/IANA-MAU-MIB
 share/libsmi/mibs/iana/IANA-PRINTER-MIB
+share/libsmi/mibs/iana/IANA-PWE3-MIB
 share/libsmi/mibs/iana/IANA-RTPROTO-MIB
 share/libsmi/mibs/iana/IANATn3270eTC-MIB
 share/libsmi/mibs/iana/IANAifType-MIB
@@ -69,9 +69,13 @@ share/libsmi/mibs/ietf/ATM-ACCOUNTING-INFORMATION-MIB
 share/libsmi/mibs/ietf/ATM-MIB
 share/libsmi/mibs/ietf/ATM-TC-MIB
 share/libsmi/mibs/ietf/ATM2-MIB
+share/libsmi/mibs/ietf/BFD-STD-MIB
+share/libsmi/mibs/ietf/BFD-TC-STD-MIB
 share/libsmi/mibs/ietf/BGP4-MIB
 share/libsmi/mibs/ietf/BLDG-HVAC-MIB
 share/libsmi/mibs/ietf/BRIDGE-MIB
+share/libsmi/mibs/ietf/CAPWAP-BASE-MIB
+share/libsmi/mibs/ietf/CAPWAP-DOT11-MIB
 share/libsmi/mibs/ietf/CHARACTER-MIB
 share/libsmi/mibs/ietf/CIRCUIT-IF-MIB
 share/libsmi/mibs/ietf/CLNS-MIB
@@ -110,6 +114,7 @@ share/libsmi/mibs/ietf/DS1-MIB
 share/libsmi/mibs/ietf/DS3-MIB
 share/libsmi/mibs/ietf/DSA-MIB
 share/libsmi/mibs/ietf/DSMON-MIB
+share/libsmi/mibs/ietf/DVB-RCS-MIB
 share/libsmi/mibs/ietf/EBN-MIB
 share/libsmi/mibs/ietf/EFM-CU-MIB
 share/libsmi/mibs/ietf/ENTITY-MIB
@@ -123,7 +128,9 @@ share/libsmi/mibs/ietf/FC-MGMT-MIB
 share/libsmi/mibs/ietf/FCIP-MGMT-MIB
 share/libsmi/mibs/ietf/FDDI-SMT73-MIB
 share/libsmi/mibs/ietf/FIBRE-CHANNEL-FE-MIB
+share/libsmi/mibs/ietf/FLOAT-TC-MIB
 share/libsmi/mibs/ietf/FLOW-METER-MIB
+share/libsmi/mibs/ietf/FORCES-MIB
 share/libsmi/mibs/ietf/FR-ATM-PVC-SERVICE-IWF-MIB
 share/libsmi/mibs/ietf/FR-MFR-MIB
 share/libsmi/mibs/ietf/FRAME-RELAY-DTE-MIB
@@ -157,6 +164,8 @@ share/libsmi/mibs/ietf/INTERFACETOPN-MIB
 share/libsmi/mibs/ietf/IP-FORWARD-MIB
 share/libsmi/mibs/ietf/IP-MIB
 share/libsmi/mibs/ietf/IPATM-IPMC-MIB
+share/libsmi/mibs/ietf/IPFIX-MIB
+share/libsmi/mibs/ietf/IPFIX-SELECTOR-MIB
 share/libsmi/mibs/ietf/IPMCAST-MIB
 share/libsmi/mibs/ietf/IPMROUTE-STD-MIB
 share/libsmi/mibs/ietf/IPOA-MIB
@@ -178,6 +187,7 @@ share/libsmi/mibs/ietf/ITU-ALARM-TC-MIB
 share/libsmi/mibs/ietf/Job-Monitoring-MIB
 share/libsmi/mibs/ietf/L2TP-MIB
 share/libsmi/mibs/ietf/LANGTAG-TC-MIB
+share/libsmi/mibs/ietf/LISP-MIB
 share/libsmi/mibs/ietf/LMP-MIB
 share/libsmi/mibs/ietf/MALLOC-MIB
 share/libsmi/mibs/ietf/MAU-MIB
@@ -201,11 +211,14 @@ share/libsmi/mibs/ietf/MTA-MIB
 share/libsmi/mibs/ietf/Modem-MIB
 share/libsmi/mibs/ietf/NAT-MIB
 share/libsmi/mibs/ietf/NETWORK-SERVICES-MIB
+share/libsmi/mibs/ietf/NHDP-MIB
 share/libsmi/mibs/ietf/NHRP-MIB
 share/libsmi/mibs/ietf/NOTIFICATION-LOG-MIB
+share/libsmi/mibs/ietf/NTPv4-MIB
 share/libsmi/mibs/ietf/OPT-IF-MIB
 share/libsmi/mibs/ietf/OSPF-MIB
 share/libsmi/mibs/ietf/OSPF-TRAP-MIB
+share/libsmi/mibs/ietf/OSPFV3-MIB
 share/libsmi/mibs/ietf/P-BRIDGE-MIB
 share/libsmi/mibs/ietf/PARALLEL-MIB
 share/libsmi/mibs/ietf/PIM-MIB
@@ -213,13 +226,21 @@ share/libsmi/mibs/ietf/PIM-STD-MIB
 share/libsmi/mibs/ietf/PINT-MIB
 share/libsmi/mibs/ietf/PKTC-IETF-MTA-MIB
 share/libsmi/mibs/ietf/PKTC-IETF-SIG-MIB
+share/libsmi/mibs/ietf/PMIPV6-MIB
+share/libsmi/mibs/ietf/PMIPV6-TC-MIB
 share/libsmi/mibs/ietf/POLICY-BASED-MANAGEMENT-MIB
 share/libsmi/mibs/ietf/POWER-ETHERNET-MIB
 share/libsmi/mibs/ietf/PPP-BRIDGE-NCP-MIB
 share/libsmi/mibs/ietf/PPP-IP-NCP-MIB
 share/libsmi/mibs/ietf/PPP-LCP-MIB
 share/libsmi/mibs/ietf/PPP-SEC-MIB
+share/libsmi/mibs/ietf/PSAMP-MIB
 share/libsmi/mibs/ietf/PTOPO-MIB
+share/libsmi/mibs/ietf/PW-ATM-MIB
+share/libsmi/mibs/ietf/PW-CEP-STD-MIB
+share/libsmi/mibs/ietf/PW-STD-MIB
+share/libsmi/mibs/ietf/PW-TC-STD-MIB
+share/libsmi/mibs/ietf/PW-TDM-MIB
 share/libsmi/mibs/ietf/PerfHist-TC-MIB
 share/libsmi/mibs/ietf/Printer-MIB
 share/libsmi/mibs/ietf/Q-BRIDGE-MIB
@@ -230,6 +251,7 @@ share/libsmi/mibs/ietf/RADIUS-AUTH-SERVER-MIB
 share/libsmi/mibs/ietf/RADIUS-DYNAUTH-CLIENT-MIB
 share/libsmi/mibs/ietf/RADIUS-DYNAUTH-SERVER-MIB
 share/libsmi/mibs/ietf/RAQMON-MIB
+share/libsmi/mibs/ietf/RBRIDGE-MIB
 share/libsmi/mibs/ietf/RDBMS-MIB
 share/libsmi/mibs/ietf/RFC-1212
 share/libsmi/mibs/ietf/RFC-1215
@@ -250,7 +272,9 @@ share/libsmi/mibs/ietf/RMON2-MIB
 share/libsmi/mibs/ietf/ROHC-MIB
 share/libsmi/mibs/ietf/ROHC-RTP-MIB
 share/libsmi/mibs/ietf/ROHC-UNCOMPRESSED-MIB
+share/libsmi/mibs/ietf/RPKI-ROUTER-MIB
 share/libsmi/mibs/ietf/RS-232-MIB
+share/libsmi/mibs/ietf/RSERPOOL-MIB
 share/libsmi/mibs/ietf/RSTP-MIB
 share/libsmi/mibs/ietf/RSVP-MIB
 share/libsmi/mibs/ietf/RTP-MIB
@@ -272,7 +296,10 @@ share/libsmi/mibs/ietf/SNMP-MPD-MIB
 share/libsmi/mibs/ietf/SNMP-NOTIFICATION-MIB
 share/libsmi/mibs/ietf/SNMP-PROXY-MIB
 share/libsmi/mibs/ietf/SNMP-REPEATER-MIB
+share/libsmi/mibs/ietf/SNMP-SSH-TM-MIB
 share/libsmi/mibs/ietf/SNMP-TARGET-MIB
+share/libsmi/mibs/ietf/SNMP-TLS-TM-MIB
+share/libsmi/mibs/ietf/SNMP-TSM-MIB
 share/libsmi/mibs/ietf/SNMP-USER-BASED-SM-MIB
 share/libsmi/mibs/ietf/SNMP-USM-AES-MIB
 share/libsmi/mibs/ietf/SNMP-USM-DH-OBJECTS-MIB
@@ -302,6 +329,7 @@ share/libsmi/mibs/ietf/TCP-MIB
 share/libsmi/mibs/ietf/TCPIPX-MIB
 share/libsmi/mibs/ietf/TE-LINK-STD-MIB
 share/libsmi/mibs/ietf/TE-MIB
+share/libsmi/mibs/ietf/TED-MIB
 share/libsmi/mibs/ietf/TIME-AGGREGATE-MIB
 share/libsmi/mibs/ietf/TN3270E-MIB
 share/libsmi/mibs/ietf/TN3270E-RT-MIB
@@ -316,15 +344,23 @@ share/libsmi/mibs/ietf/UDP-MIB
 share/libsmi/mibs/ietf/UDPLITE-MIB
 share/libsmi/mibs/ietf/UPS-MIB
 share/libsmi/mibs/ietf/URI-TC-MIB
+share/libsmi/mibs/ietf/UUID-TC-MIB
 share/libsmi/mibs/ietf/VDSL-LINE-EXT-MCM-MIB
 share/libsmi/mibs/ietf/VDSL-LINE-EXT-SCM-MIB
 share/libsmi/mibs/ietf/VDSL-LINE-MIB
+share/libsmi/mibs/ietf/VDSL2-LINE-MIB
+share/libsmi/mibs/ietf/VDSL2-LINE-TC-MIB
 share/libsmi/mibs/ietf/VPN-TC-STD-MIB
 share/libsmi/mibs/ietf/VRRP-MIB
+share/libsmi/mibs/ietf/VRRPV3-MIB
 share/libsmi/mibs/ietf/WWW-MIB
 share/libsmi/mibs/irtf/IRTF-NMRG-SMING
 share/libsmi/mibs/irtf/IRTF-NMRG-SMING-EXTENSIONS
 share/libsmi/mibs/irtf/IRTF-NMRG-SMING-TYPES
+share/libsmi/mibs/jacobs/JACOBS-FS20-MIB
+share/libsmi/mibs/jacobs/JACOBS-LOWPAN-MIB
+share/libsmi/mibs/jacobs/JACOBS-RPL-MIB
+share/libsmi/mibs/jacobs/JACOBS-SMI
 share/libsmi/mibs/tubs/POLICY-DEVICE-AUX-MIB
 share/libsmi/mibs/tubs/POLICY-DEVICE-AUX-MIB-orig
 share/libsmi/mibs/tubs/TUBS-IBR-AGENT-CAPABILITIES
@@ -379,3 +415,59 @@ share/libsmi/pibs/UMTS-PIB-orig
 @pkgdir share/libsmi/pibs/site
 @pkgdir share/libsmi/pibs/ietf
 @pkgdir share/libsmi/mibs/site
+share/yang/iana-crypt-hash.yang
+share/yang/iana-crypt-hash@2014-08-06.yang
+share/yang/iana-if-type.yang
+share/yang/iana-if-type@2014-05-19.yang
+share/yang/iana/iana-crypt-hash.yang
+share/yang/iana/iana-crypt-hash@2014-08-06.yang
+share/yang/iana/iana-if-type.yang
+share/yang/iana/iana-if-type@2014-05-19.yang
+share/yang/ietf-inet-types.yang
+share/yang/ietf-inet-types@2010-09-24.yang
+share/yang/ietf-inet-types@2013-07-15.yang
+share/yang/ietf-interfaces.yang
+share/yang/ietf-interfaces@2014-05-08.yang
+share/yang/ietf-ip.yang
+share/yang/ietf-ip@2014-06-16.yang
+share/yang/ietf-ipfix-psamp.yang
+share/yang/ietf-ipfix-psamp@2012-09-05.yang
+share/yang/ietf-netconf-acm.yang
+share/yang/ietf-netconf-acm@2012-02-22.yang
+share/yang/ietf-netconf-monitoring.yang
+share/yang/ietf-netconf-monitoring@2010-10-04.yang
+share/yang/ietf-netconf-notifications.yang
+share/yang/ietf-netconf-notifications@2012-02-06.yang
+share/yang/ietf-netconf-with-defaults.yang
+share/yang/ietf-netconf-with-defaults@2011-06-01.yang
+share/yang/ietf-netconf.yang
+share/yang/ietf-netconf@2011-06-01.yang
+share/yang/ietf-system.yang
+share/yang/ietf-system@2014-08-06.yang
+share/yang/ietf-yang-types.yang
+share/yang/ietf-yang-types@2010-09-24.yang
+share/yang/ietf-yang-types@2013-07-15.yang
+share/yang/ietf/ietf-inet-types.yang
+share/yang/ietf/ietf-inet-types@2010-09-24.yang
+share/yang/ietf/ietf-inet-types@2013-07-15.yang
+share/yang/ietf/ietf-interfaces.yang
+share/yang/ietf/ietf-interfaces@2014-05-08.yang
+share/yang/ietf/ietf-ip.yang
+share/yang/ietf/ietf-ip@2014-06-16.yang
+share/yang/ietf/ietf-ipfix-psamp.yang
+share/yang/ietf/ietf-ipfix-psamp@2012-09-05.yang
+share/yang/ietf/ietf-netconf-acm.yang
+share/yang/ietf/ietf-netconf-acm@2012-02-22.yang
+share/yang/ietf/ietf-netconf-monitoring.yang
+share/yang/ietf/ietf-netconf-monitoring@2010-10-04.yang
+share/yang/ietf/ietf-netconf-notifications.yang
+share/yang/ietf/ietf-netconf-notifications@2012-02-06.yang
+share/yang/ietf/ietf-netconf-with-defaults.yang
+share/yang/ietf/ietf-netconf-with-defaults@2011-06-01.yang
+share/yang/ietf/ietf-netconf.yang
+share/yang/ietf/ietf-netconf@2011-06-01.yang
+share/yang/ietf/ietf-system.yang
+share/yang/ietf/ietf-system@2014-08-06.yang
+share/yang/ietf/ietf-yang-types.yang
+share/yang/ietf/ietf-yang-types@2010-09-24.yang
+share/yang/ietf/ietf-yang-types@2013-07-15.yang
diff --git a/devel/libsmi/distinfo b/devel/libsmi/distinfo
index 046fa4465bd..a556fddc1b6 100644
--- a/devel/libsmi/distinfo
+++ b/devel/libsmi/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 03:27:45 agc Exp $
+$NetBSD: distinfo,v 1.8 2015/11/06 17:07:23 adam Exp $
 
-SHA1 (libsmi-0.4.8.tar.gz) = 77c512ccbdd29667d152398b0dcde533aed57b49
-RMD160 (libsmi-0.4.8.tar.gz) = 66fbe0e0128c4134cce386aaf754a48bb2d2580e
-SHA512 (libsmi-0.4.8.tar.gz) = c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863
-Size (libsmi-0.4.8.tar.gz) = 4104111 bytes
+SHA1 (libsmi-0.5.0.tar.gz) = 87bc7a9fa5ee13fbca8dded98ec2d9e92ee5a0ed
+RMD160 (libsmi-0.5.0.tar.gz) = 0d5aa133128136d3ab08a81669c14e77813d2a54
+SHA512 (libsmi-0.5.0.tar.gz) = be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
+Size (libsmi-0.5.0.tar.gz) = 4798883 bytes
 SHA1 (patch-aa) = 0daa795492391e52cce09db2334872838ea654f3
 SHA1 (patch-ab) = 2ebd512bfa4e284eaf892a5437f0bf12ad3ff36c
 SHA1 (patch-ac) = e10b25773c6df404b74a2cd28bac06cbd6183983
 SHA1 (patch-ad) = ca9376deac37b3c894f8d34e4b73473af49c7790
-SHA1 (patch-ae) = f8a56ba5ac896a02b09a6cd3139fd8284748324b
diff --git a/devel/libsmi/patches/patch-ae b/devel/libsmi/patches/patch-ae
deleted file mode 100644
index 2fe9dedbb99..00000000000
--- a/devel/libsmi/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2010/11/23 11:30:50 tron Exp $
-
-Fix for CVE-2010-2891 taken from here:
-
-http://git.debian.org/?p=collab-maint/libsmi.git;a=blob_plain;f=debian/patches/cve-2010-2891.patch;hb=1b460ead526610a66d032c75d191dd65bc5727f4
-
---- lib/smi.c.orig	2008-04-18 11:42:50.000000000 +0100
-+++ lib/smi.c	2010-11-23 11:27:28.000000000 +0000
-@@ -1314,10 +1314,15 @@
-     }
- 
-     if (isdigit((int)node2[0])) {
--	for (oidlen = 0, p = strtok(node2, ". "); p;
-+	for (oidlen = 0, p = strtok(node2, ". ");
-+	     p && oidlen < sizeof(oid)/sizeof(oid[0]);
- 	     oidlen++, p = strtok(NULL, ". ")) {
- 	    oid[oidlen] = strtoul(p, NULL, 0);
- 	}
-+	if (p) {
-+	    /* the numeric OID is too long */
-+	    return NULL;
-+	}
- 	nodePtr = getNode(oidlen, oid);
- 	if (nodePtr) {
- 	    if (modulePtr) {