From bda14176f0000d8f7be8fc6c6ea5a0b3fa169bc4 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Wed, 17 Jul 2013 13:00:29 +0000
Subject: [PATCH] Update "mrtg" package to version 2.17.4. Changes since
 2.17.2: - some address fixes to contrib - fixed duplicate install-sh entry in
 archive - set oid-mib-cache file for New_SNMP_util as well #106 - prevent
 spurious warnings about unknonwn values of inlast outlast in mrtg - add the
 process id tmp file extensions, to guard against multiple rateup   instances
 messing things up for each other. (attempt to fix #115) - quell warning in
 CnTWaLK mode #111 - spelling fixes - make threshold checking more robust
 against incomplete information in the   config file #113 - support ifAlias
 for Vyatta gear - CnTWaLK should add the count and not max index - abort
 indexmaker if there is no data to be found - fix for big5 translation - in
 cfgmaker use ifdesc=alias only if there is actualy alias info - fix of a file
 pointer leak found by coverity scan - fix for kMG support in rateup - add
 support for zyxel ifAlias - add support for Matrix N7 Diamond - enable
 warnings in cfgmaker and fix issues ... - explicitly import SOCK_DGRAM and
 AF_UNSPEC to make ipv6 support work - Updated Net_SNMP_util.pm and
 SNMP_util.pm to latest versions

---
 net/mrtg/Makefile         |  5 ++---
 net/mrtg/distinfo         |  9 ++++-----
 net/mrtg/patches/patch-ae | 37 -------------------------------------
 3 files changed, 6 insertions(+), 45 deletions(-)
 delete mode 100644 net/mrtg/patches/patch-ae

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index d6c6fecbd02f3..4c33cb412a86a 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.110 2013/06/04 22:16:55 tron Exp $
+# $NetBSD: Makefile,v 1.111 2013/07/17 13:00:29 tron Exp $
 
-DISTNAME=	mrtg-2.17.2
-PKGREVISION=	7
+DISTNAME=	mrtg-2.17.4
 CATEGORIES=	net
 MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
 		http://oss.oetiker.ch/mrtg/pub/old/
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index ce0ab6b8a48cc..eb59f4bb15ce9 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.31 2011/08/06 11:52:16 tron Exp $
+$NetBSD: distinfo,v 1.32 2013/07/17 13:00:29 tron Exp $
 
-SHA1 (mrtg-2.17.2.tar.gz) = dc591cc92ee664d4049333c19becc6a88e162008
-RMD160 (mrtg-2.17.2.tar.gz) = 8159376e1682bcabf41b73a3f7ede5a302216115
-Size (mrtg-2.17.2.tar.gz) = 1095721 bytes
+SHA1 (mrtg-2.17.4.tar.gz) = 5ae0e659001c613b847237a6b223b26cb7a8ab0f
+RMD160 (mrtg-2.17.4.tar.gz) = cea76ad3685375770520ebbccd0ad4b6adafff1f
+Size (mrtg-2.17.4.tar.gz) = 1096879 bytes
 SHA1 (patch-aa) = 2874cd59371db10fbc4ff6c29e3a917a4b8eec55
 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
 SHA1 (patch-ac) = 24ae08714f896ca0f1724454b8ad47c32412c018
-SHA1 (patch-ae) = 7ba301b01d575f4ff18f082c9f3baaaa2c6e8332
diff --git a/net/mrtg/patches/patch-ae b/net/mrtg/patches/patch-ae
deleted file mode 100644
index db7343810854e..0000000000000
--- a/net/mrtg/patches/patch-ae
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2011/08/06 11:52:16 tron Exp $
-
-Fix two problems:
-1.) Avoid negative request ids (default_avoid_negative_request_ids=1) as
-    this might cause problems with some devices. Solution provided by
-    Tobias Oetiker in a private mail.
-2.) Avoid redefinition of "SNMP_Session::pack_sockaddr_in6".
-
---- lib/mrtg2/SNMP_Session.pm.orig	2011-02-20 22:33:38.000000000 +0000
-+++ lib/mrtg2/SNMP_Session.pm	2011-08-06 12:38:35.000000000 +0100
-@@ -111,7 +111,7 @@
- ### some agents erroneously encode the response ID as an unsigned,
- ### which prevents this code from matching such responses to requests.
- ###
--$SNMP_Session::default_avoid_negative_request_ids = 0;
-+$SNMP_Session::default_avoid_negative_request_ids = 1;
- 
- ### Default value for "use_16bit_request_ids".
- ###
-@@ -146,7 +146,7 @@
- 
-     if (eval {local $SIG{__DIE__};require Socket6;} &&
-        eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) {
--       Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
-+       Socket6->import(qw(inet_pton getaddrinfo));
- 	$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
- 	$SNMP_Session::ipv6available = 1;
-     }
-@@ -601,7 +601,7 @@
- BEGIN {
-     if($SNMP_Session::ipv6available) {
- 	    import IO::Socket::INET6;
--        Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
-+        Socket6->import(qw(inet_pton getaddrinfo));
-     }
- }
-