diff options
author | tron <tron@pkgsrc.org> | 2011-08-06 11:52:16 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2011-08-06 11:52:16 +0000 |
commit | 30001ec209d276ee2a2d1db7e00835e875032422 (patch) | |
tree | 00468c896888aeb0c2c5aa0cd4c5ff597c294b54 /net/mrtg | |
parent | b82ca4a17327ca3b979ec9c5443c641a8479f54a (diff) | |
download | pkgsrc-30001ec209d276ee2a2d1db7e00835e875032422.tar.gz |
Update "mrtg" package to version 2.17.2. Changes since version 2.16.4:
- can not replace a file by renaming another to its name under WIN32
fix in rateup #104
- Fix scaling when noo and noi options are used. fix for #95
- Stop staticly linking rateup. fix for #97
- Only set LD_RUN_PATH if it is actually necessary. patch from #98
- Net::SNMP only support aes128, des and 3des ... fix for cfgmaker from #99
- Understand desc and descr in ifdesc option of cfgmaker
- only set $args{'-maxrepetitions'} if $Net_SNMP_util::MaxRepetitions > 0
- do not load Net_SNMP_util unless snmpv3 is requested ... fix for #75
- be more agressive about updating the confcache. If a key is missing, go
looking for it again and complain. fix for #74
- only apply 32bit counter wrap compensation when the wrap is within 32bit
range. fix for #70
- implement pngdate as TimeStrPos[x]: RU instead of separately. for for #68
- add missing <p> tag arount 'last updated ... ' in html output. fix for #63
- remove rececondition when writing new trafic graph files by writing to a
temp file and moving it later. fix for #51
- make snmpopt_current available in cfgmaker templates. fix for #48
- explicitly import Socket6 routines in SNMP_Session. fix for #45
- default ThreshHyst to 0.1 only if ThreshDir is define. fix for #42
- point out when there is an unknown interface found. fix for #41.
- allow for $speed to return 0 and still use SNMPv2 ... some Cisco Gear
seems todo that. Fix for #33
- add dlink support for ifAlias OIDs to cfgmaker from #50
- add WWP (Ciena) support for ifAlias OIDs to cfgmaker from #66
- Updated squid docu #80
- Fix russian translation bug #92
- added rrdcached support
- new keyword: RRDCached: which overrides anything set in the RRDCACHED_ADDRESS
environment variable and sets MRTG to work in RRDCached mode. This verifies
that you're using a unix-domain socket and the socket is writeable.
- Check for environment variable RRDCACHED_ADDRESS and use this if no
explicit address was set in the cfg file, making the same config validity
checks.
- Make warning if using rrdcached to the effect that the thresholding
checks will no longer work.
- If in rrdcached-mode, and using RRDTool 1.4, then force use of update
rather than updatev (as rrdcached does not yet support updatev) and
consequently bypass the thresholding checks.
- Changes to validity check error messages to also report the file
containing the error (as well as the line).
- Added support for glob patterns in include
- Make daemon reload cfg automatically when it changes
- added support for Arista to cfgmaker
- fix cfgmaker to work in mixed v1/2/3 snmp environment
- do not strigify arguments to conversion function let eval take care of this
- untaint inlast and outlast to make perl taint mode happy
- teach cfgmaker about openbsd
pkgsrc changes:
- Avoid "Subroutine SNMP_Session::pack_sockaddr_in6 redefined" warnings
with the Perl 5.14.1. As the patch might break "mrtg" with older version
of Perl require at least version 5.14.1 of the "perl5" package.
Diffstat (limited to 'net/mrtg')
-rw-r--r-- | net/mrtg/Makefile | 6 | ||||
-rw-r--r-- | net/mrtg/distinfo | 10 | ||||
-rw-r--r-- | net/mrtg/options.mk | 4 | ||||
-rw-r--r-- | net/mrtg/patches/patch-ae | 32 |
4 files changed, 38 insertions, 14 deletions
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index 451cd5ed6bb..dfb5772a19f 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.101 2011/04/22 13:44:25 obache Exp $ +# $NetBSD: Makefile,v 1.102 2011/08/06 11:52:16 tron Exp $ -DISTNAME= mrtg-2.16.4 -PKGREVISION= 2 +DISTNAME= mrtg-2.17.2 CATEGORIES= net MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \ http://oss.oetiker.ch/mrtg/pub/old/ @@ -14,6 +13,7 @@ LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= perl:run +PERL5_REQD= 5.14.1 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-gd=${BUILDLINK_PREFIX.gd} CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png} diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo index 151e9ad24f1..ce0ab6b8a48 100644 --- a/net/mrtg/distinfo +++ b/net/mrtg/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.30 2010/07/09 08:45:33 adam Exp $ +$NetBSD: distinfo,v 1.31 2011/08/06 11:52:16 tron Exp $ -SHA1 (mrtg-2.16.4.tar.gz) = 8d810487585c929bf48246311512f88077e10e55 -RMD160 (mrtg-2.16.4.tar.gz) = 9d7f2573fded09b16cd5b108271b9dd68d78bc18 -Size (mrtg-2.16.4.tar.gz) = 1089068 bytes +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 (patch-aa) = 2874cd59371db10fbc4ff6c29e3a917a4b8eec55 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c SHA1 (patch-ac) = 24ae08714f896ca0f1724454b8ad47c32412c018 -SHA1 (patch-ae) = 38793e3bd13570d18006a016c65a4cc3c3f5e1b5 +SHA1 (patch-ae) = 7ba301b01d575f4ff18f082c9f3baaaa2c6e8332 diff --git a/net/mrtg/options.mk b/net/mrtg/options.mk index aa87036e329..263076e8b5f 100644 --- a/net/mrtg/options.mk +++ b/net/mrtg/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2010/07/09 08:45:33 adam Exp $ +# $NetBSD: options.mk,v 1.4 2011/08/06 11:52:16 tron Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mrtg PKG_SUPPORTED_OPTIONS= inet6 mrtg-snmpv3 @@ -16,5 +16,5 @@ DEPENDS+= p5-Net-SNMP-[0-9]*:../../net/p5-Net-SNMP ### Support for IPv6 enabled devices ### .if !empty(PKG_OPTIONS:Minet6) -DEPENDS+= p5-IO-Socket-INET6>=2.00:../../net/p5-IO-Socket-INET6 +DEPENDS+= p5-IO-Socket-INET6>=2.67:../../net/p5-IO-Socket-INET6 .endif diff --git a/net/mrtg/patches/patch-ae b/net/mrtg/patches/patch-ae index 573c1e232dd..db734381085 100644 --- a/net/mrtg/patches/patch-ae +++ b/net/mrtg/patches/patch-ae @@ -1,8 +1,14 @@ -$NetBSD: patch-ae,v 1.5 2008/02/13 12:05:26 martti Exp $ +$NetBSD: patch-ae,v 1.6 2011/08/06 11:52:16 tron Exp $ ---- lib/mrtg2/SNMP_Session.pm.orig 2008-02-06 16:35:49.000000000 +0200 -+++ lib/mrtg2/SNMP_Session.pm 2008-02-13 13:57:53.000000000 +0200 -@@ -110,7 +110,7 @@ +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. ### @@ -11,3 +17,21 @@ $NetBSD: patch-ae,v 1.5 2008/02/13 12:05:26 martti Exp $ ### 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)); + } + } + |