Sat Aug 6 11:52:16 2011 UTC ()
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.


(tron)
diff -r1.101 -r1.102 pkgsrc/net/mrtg/Makefile
diff -r1.30 -r1.31 pkgsrc/net/mrtg/distinfo
diff -r1.3 -r1.4 pkgsrc/net/mrtg/options.mk
diff -r1.5 -r1.6 pkgsrc/net/mrtg/patches/patch-ae
cvs diff -r1.101 -r1.102 pkgsrc/net/mrtg/Makefile (expand / switch to unified diff)

--- pkgsrc/net/mrtg/Makefile 2011/04/22 13:44:25 1.101
+++ pkgsrc/net/mrtg/Makefile 2011/08/06 11:52:16 1.102
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.101 2011/04/22 13:44:25 obache Exp $ 1# $NetBSD: Makefile,v 1.102 2011/08/06 11:52:16 tron Exp $
2 2
3DISTNAME= mrtg-2.16.4 3DISTNAME= mrtg-2.17.2
4PKGREVISION= 2 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \ 5MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \
7 http://oss.oetiker.ch/mrtg/pub/old/ 6 http://oss.oetiker.ch/mrtg/pub/old/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://oss.oetiker.ch/mrtg/ 9HOMEPAGE= http://oss.oetiker.ch/mrtg/
11COMMENT= The Multi-Router Traffic Grapher 10COMMENT= The Multi-Router Traffic Grapher
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16USE_TOOLS+= perl:run 15USE_TOOLS+= perl:run
 16PERL5_REQD= 5.14.1
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --with-gd=${BUILDLINK_PREFIX.gd} 18CONFIGURE_ARGS+= --with-gd=${BUILDLINK_PREFIX.gd}
19CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png} 19CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png}
20CONFIGURE_ARGS+= --with-z=${BUILDLINK_PREFIX.zlib} 20CONFIGURE_ARGS+= --with-z=${BUILDLINK_PREFIX.zlib}
21MAKE_ENV+= PERL5_INSTALLVENDORLIB=${PERL5_INSTALLVENDORLIB} 21MAKE_ENV+= PERL5_INSTALLVENDORLIB=${PERL5_INSTALLVENDORLIB}
22 22
23REPLACE_PERL= bin/cfgmaker bin/indexmaker bin/mrtg bin/mrtg-traffic-sum 23REPLACE_PERL= bin/cfgmaker bin/indexmaker bin/mrtg bin/mrtg-traffic-sum
24EGDIR= ${PREFIX}/share/examples/${PKGBASE} 24EGDIR= ${PREFIX}/share/examples/${PKGBASE}
25 25
26CONF_FILES= ${EGDIR}/mrtg.conf ${PKG_SYSCONFDIR}/mrtg.conf 26CONF_FILES= ${EGDIR}/mrtg.conf ${PKG_SYSCONFDIR}/mrtg.conf
27 27
28.include "options.mk" 28.include "options.mk"
29 29
cvs diff -r1.30 -r1.31 pkgsrc/net/mrtg/distinfo (expand / switch to unified diff)

--- pkgsrc/net/mrtg/distinfo 2010/07/09 08:45:33 1.30
+++ pkgsrc/net/mrtg/distinfo 2011/08/06 11:52:16 1.31
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.30 2010/07/09 08:45:33 adam Exp $ 1$NetBSD: distinfo,v 1.31 2011/08/06 11:52:16 tron Exp $
2 2
3SHA1 (mrtg-2.16.4.tar.gz) = 8d810487585c929bf48246311512f88077e10e55 3SHA1 (mrtg-2.17.2.tar.gz) = dc591cc92ee664d4049333c19becc6a88e162008
4RMD160 (mrtg-2.16.4.tar.gz) = 9d7f2573fded09b16cd5b108271b9dd68d78bc18 4RMD160 (mrtg-2.17.2.tar.gz) = 8159376e1682bcabf41b73a3f7ede5a302216115
5Size (mrtg-2.16.4.tar.gz) = 1089068 bytes 5Size (mrtg-2.17.2.tar.gz) = 1095721 bytes
6SHA1 (patch-aa) = 2874cd59371db10fbc4ff6c29e3a917a4b8eec55 6SHA1 (patch-aa) = 2874cd59371db10fbc4ff6c29e3a917a4b8eec55
7SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c 7SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
8SHA1 (patch-ac) = 24ae08714f896ca0f1724454b8ad47c32412c018 8SHA1 (patch-ac) = 24ae08714f896ca0f1724454b8ad47c32412c018
9SHA1 (patch-ae) = 38793e3bd13570d18006a016c65a4cc3c3f5e1b5 9SHA1 (patch-ae) = 7ba301b01d575f4ff18f082c9f3baaaa2c6e8332
cvs diff -r1.3 -r1.4 pkgsrc/net/mrtg/options.mk (expand / switch to unified diff)

--- pkgsrc/net/mrtg/options.mk 2010/07/09 08:45:33 1.3
+++ pkgsrc/net/mrtg/options.mk 2011/08/06 11:52:16 1.4
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: options.mk,v 1.3 2010/07/09 08:45:33 adam Exp $ 1# $NetBSD: options.mk,v 1.4 2011/08/06 11:52:16 tron Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mrtg 3PKG_OPTIONS_VAR= PKG_OPTIONS.mrtg
4PKG_SUPPORTED_OPTIONS= inet6 mrtg-snmpv3 4PKG_SUPPORTED_OPTIONS= inet6 mrtg-snmpv3
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8### 8###
9### Use an external SNMP module to get SNMPv3 support 9### Use an external SNMP module to get SNMPv3 support
10### 10###
11.if !empty(PKG_OPTIONS:Mmrtg-snmpv3) 11.if !empty(PKG_OPTIONS:Mmrtg-snmpv3)
12DEPENDS+= p5-Net-SNMP-[0-9]*:../../net/p5-Net-SNMP 12DEPENDS+= p5-Net-SNMP-[0-9]*:../../net/p5-Net-SNMP
13.endif 13.endif
14 14
15### 15###
16### Support for IPv6 enabled devices 16### Support for IPv6 enabled devices
17### 17###
18.if !empty(PKG_OPTIONS:Minet6) 18.if !empty(PKG_OPTIONS:Minet6)
19DEPENDS+= p5-IO-Socket-INET6>=2.00:../../net/p5-IO-Socket-INET6 19DEPENDS+= p5-IO-Socket-INET6>=2.67:../../net/p5-IO-Socket-INET6
20.endif 20.endif
cvs diff -r1.5 -r1.6 pkgsrc/net/mrtg/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/mrtg/patches/Attic/patch-ae 2008/02/13 12:05:26 1.5
+++ pkgsrc/net/mrtg/patches/Attic/patch-ae 2011/08/06 11:52:16 1.6
@@ -1,13 +1,37 @@ @@ -1,13 +1,37 @@
1$NetBSD: patch-ae,v 1.5 2008/02/13 12:05:26 martti Exp $ 1$NetBSD: patch-ae,v 1.6 2011/08/06 11:52:16 tron Exp $
2 2
3--- lib/mrtg2/SNMP_Session.pm.orig 2008-02-06 16:35:49.000000000 +0200 3Fix two problems:
4+++ lib/mrtg2/SNMP_Session.pm 2008-02-13 13:57:53.000000000 +0200 41.) Avoid negative request ids (default_avoid_negative_request_ids=1) as
5@@ -110,7 +110,7 @@ 5 this might cause problems with some devices. Solution provided by
 6 Tobias Oetiker in a private mail.
 72.) Avoid redefinition of "SNMP_Session::pack_sockaddr_in6".
 8
 9--- lib/mrtg2/SNMP_Session.pm.orig 2011-02-20 22:33:38.000000000 +0000
 10+++ lib/mrtg2/SNMP_Session.pm 2011-08-06 12:38:35.000000000 +0100
 11@@ -111,7 +111,7 @@
6 ### some agents erroneously encode the response ID as an unsigned, 12 ### some agents erroneously encode the response ID as an unsigned,
7 ### which prevents this code from matching such responses to requests. 13 ### which prevents this code from matching such responses to requests.
8 ### 14 ###
9-$SNMP_Session::default_avoid_negative_request_ids = 0; 15-$SNMP_Session::default_avoid_negative_request_ids = 0;
10+$SNMP_Session::default_avoid_negative_request_ids = 1; 16+$SNMP_Session::default_avoid_negative_request_ids = 1;
11  17
12 ### Default value for "use_16bit_request_ids". 18 ### Default value for "use_16bit_request_ids".
13 ### 19 ###
 20@@ -146,7 +146,7 @@
 21
 22 if (eval {local $SIG{__DIE__};require Socket6;} &&
 23 eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) {
 24- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
 25+ Socket6->import(qw(inet_pton getaddrinfo));
 26 $ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
 27 $SNMP_Session::ipv6available = 1;
 28 }
 29@@ -601,7 +601,7 @@
 30 BEGIN {
 31 if($SNMP_Session::ipv6available) {
 32 import IO::Socket::INET6;
 33- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
 34+ Socket6->import(qw(inet_pton getaddrinfo));
 35 }
 36 }
 37