Sun Apr 14 21:50:36 2019 UTC ()
Update to MRTG 2.17.7:

Changes 2.17.7, 2018-07-12
--------------------------
From: Martin Sechny, shenk.sk
* update to HTML 5 template in bin/mrtg, checked by HTML+CSS W3C validator
* corrected style in HTML template: color with background-color
  (workaround for missing text color property in mrtg.cfg)

Changes 2.17.6, 2014-12-02
--------------------------
From: tobi
* add --descr=ifname option to indexmaker
* fix parsing of global option in cfgmaker
* add dcn id to cfgmaker (baed on input from Pawel Golaszeswski)

From: Steve Alligood <steve@betterlinux.com>
* make sure threshval does not get clobberd

Changes 2.17.5, 2012-04-26
--------------------------
From: Pavel Gulchouck <gul@gul.kiev.ua>
* fix for kmg option coredump


(jnemeth)
diff -r1.126 -r1.127 pkgsrc/net/mrtg/Makefile
diff -r1.13 -r1.14 pkgsrc/net/mrtg/PLIST
diff -r1.34 -r1.35 pkgsrc/net/mrtg/distinfo
diff -r1.1 -r1.2 pkgsrc/net/mrtg/patches/patch-lib__mrtg2__SNMP_Session.pm
cvs diff -r1.126 -r1.127 pkgsrc/net/mrtg/Makefile (expand / switch to unified diff)

--- pkgsrc/net/mrtg/Makefile 2018/08/22 09:45:54 1.126
+++ pkgsrc/net/mrtg/Makefile 2019/04/14 21:50:36 1.127
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.126 2018/08/22 09:45:54 wiz Exp $ 1# $NetBSD: Makefile,v 1.127 2019/04/14 21:50:36 jnemeth Exp $
2 2
3DISTNAME= mrtg-2.17.4 3DISTNAME= mrtg-2.17.7
4PKGREVISION= 12 4#PKGREVISION= 12
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= https://oss.oetiker.ch/mrtg/pub/ 6MASTER_SITES= https://oss.oetiker.ch/mrtg/pub/
7MASTER_SITES+= https://oss.oetiker.ch/mrtg/pub/old/ 7MASTER_SITES+= https://oss.oetiker.ch/mrtg/pub/old/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://oss.oetiker.ch/mrtg/ 10HOMEPAGE= https://oss.oetiker.ch/mrtg/
11COMMENT= The Multi-Router Traffic Grapher 11COMMENT= The Multi-Router Traffic Grapher
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= perl:run 14USE_TOOLS+= perl:run
15PERL5_REQD= 5.14.1 15PERL5_REQD= 5.14.1
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --with-gd=${BUILDLINK_PREFIX.gd} 17CONFIGURE_ARGS+= --with-gd=${BUILDLINK_PREFIX.gd}
cvs diff -r1.13 -r1.14 pkgsrc/net/mrtg/PLIST (expand / switch to unified diff)

--- pkgsrc/net/mrtg/PLIST 2010/07/09 08:45:33 1.13
+++ pkgsrc/net/mrtg/PLIST 2019/04/14 21:50:36 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2010/07/09 08:45:33 adam Exp $ 1@comment $NetBSD: PLIST,v 1.14 2019/04/14 21:50:36 jnemeth Exp $
2bin/cfgmaker 2bin/cfgmaker
3bin/indexmaker 3bin/indexmaker
4bin/mrtg 4bin/mrtg
5bin/mrtg-traffic-sum 5bin/mrtg-traffic-sum
6bin/rateup 6bin/rateup
7libexec/envstat2mrtg 7libexec/envstat2mrtg
8libexec/netstat2mrtg 8libexec/netstat2mrtg
9libexec/sys2mrtg 9libexec/sys2mrtg
10${PERL5_SUB_INSTALLVENDORLIB}/BER.pm 10${PERL5_SUB_INSTALLVENDORLIB}/BER.pm
11${PERL5_SUB_INSTALLVENDORLIB}/MRTG_lib.pm 11${PERL5_SUB_INSTALLVENDORLIB}/MRTG_lib.pm
12${PERL5_SUB_INSTALLVENDORLIB}/SNMP_Session.pm 12${PERL5_SUB_INSTALLVENDORLIB}/SNMP_Session.pm
13${PERL5_SUB_INSTALLVENDORLIB}/SNMP_util.pm 13${PERL5_SUB_INSTALLVENDORLIB}/SNMP_util.pm
14${PERL5_SUB_INSTALLVENDORLIB}/Net_SNMP_util.pm 14${PERL5_SUB_INSTALLVENDORLIB}/Net_SNMP_util.pm
@@ -30,60 +30,80 @@ man/man1/mrtg-nt-guide.1 @@ -30,60 +30,80 @@ man/man1/mrtg-nt-guide.1
30man/man1/mrtg-nw-guide.1 30man/man1/mrtg-nw-guide.1
31man/man1/mrtg-reference.1 31man/man1/mrtg-reference.1
32man/man1/mrtg-rrd.1 32man/man1/mrtg-rrd.1
33man/man1/mrtg-squid.1 33man/man1/mrtg-squid.1
34man/man1/mrtg-unix-guide.1 34man/man1/mrtg-unix-guide.1
35man/man1/mrtg-webserver.1 35man/man1/mrtg-webserver.1
36man/man1/mrtg.1 36man/man1/mrtg.1
37man/man1/mrtglib.1 37man/man1/mrtglib.1
38share/doc/mrtg2/CHANGES 38share/doc/mrtg2/CHANGES
39share/doc/mrtg2/COPYING 39share/doc/mrtg2/COPYING
40share/doc/mrtg2/COPYRIGHT 40share/doc/mrtg2/COPYRIGHT
41share/doc/mrtg2/README 41share/doc/mrtg2/README
42share/doc/mrtg2/THANKS 42share/doc/mrtg2/THANKS
 43share/doc/mrtg2/cfgmaker.1
43share/doc/mrtg2/cfgmaker.pod 44share/doc/mrtg2/cfgmaker.pod
44share/doc/mrtg2/cfgmaker.txt 45share/doc/mrtg2/cfgmaker.txt
 46share/doc/mrtg2/indexmaker.1
45share/doc/mrtg2/indexmaker.pod 47share/doc/mrtg2/indexmaker.pod
46share/doc/mrtg2/indexmaker.txt 48share/doc/mrtg2/indexmaker.txt
 49share/doc/mrtg2/mrtg-contrib.1
47share/doc/mrtg2/mrtg-contrib.pod 50share/doc/mrtg2/mrtg-contrib.pod
48share/doc/mrtg2/mrtg-contrib.txt 51share/doc/mrtg2/mrtg-contrib.txt
 52share/doc/mrtg2/mrtg-faq.1
49share/doc/mrtg2/mrtg-faq.pod 53share/doc/mrtg2/mrtg-faq.pod
50share/doc/mrtg2/mrtg-faq.txt 54share/doc/mrtg2/mrtg-faq.txt
 55share/doc/mrtg2/mrtg-forum.1
51share/doc/mrtg2/mrtg-forum.pod 56share/doc/mrtg2/mrtg-forum.pod
52share/doc/mrtg2/mrtg-forum.txt 57share/doc/mrtg2/mrtg-forum.txt
 58share/doc/mrtg2/mrtg-ipv6.1
53share/doc/mrtg2/mrtg-ipv6.pod 59share/doc/mrtg2/mrtg-ipv6.pod
54share/doc/mrtg2/mrtg-ipv6.txt 60share/doc/mrtg2/mrtg-ipv6.txt
 61share/doc/mrtg2/mrtg-l.gif
55share/doc/mrtg2/mrtg-l.png 62share/doc/mrtg2/mrtg-l.png
 63share/doc/mrtg2/mrtg-logfile.1
56share/doc/mrtg2/mrtg-logfile.pod 64share/doc/mrtg2/mrtg-logfile.pod
57share/doc/mrtg2/mrtg-logfile.txt 65share/doc/mrtg2/mrtg-logfile.txt
 66share/doc/mrtg2/mrtg-m.gif
58share/doc/mrtg2/mrtg-m.png 67share/doc/mrtg2/mrtg-m.png
 68share/doc/mrtg2/mrtg-mibhelp.1
59share/doc/mrtg2/mrtg-mibhelp.pod 69share/doc/mrtg2/mrtg-mibhelp.pod
60share/doc/mrtg2/mrtg-mibhelp.txt 70share/doc/mrtg2/mrtg-mibhelp.txt
 71share/doc/mrtg2/mrtg-nt-guide.1
61share/doc/mrtg2/mrtg-nt-guide.pod 72share/doc/mrtg2/mrtg-nt-guide.pod
62share/doc/mrtg2/mrtg-nt-guide.txt 73share/doc/mrtg2/mrtg-nt-guide.txt
 74share/doc/mrtg2/mrtg-nw-guide.1
63share/doc/mrtg2/mrtg-nw-guide.pod 75share/doc/mrtg2/mrtg-nw-guide.pod
64share/doc/mrtg2/mrtg-nw-guide.txt 76share/doc/mrtg2/mrtg-nw-guide.txt
 77share/doc/mrtg2/mrtg-r.gif
65share/doc/mrtg2/mrtg-r.png 78share/doc/mrtg2/mrtg-r.png
 79share/doc/mrtg2/mrtg-reference.1
66share/doc/mrtg2/mrtg-reference.pod 80share/doc/mrtg2/mrtg-reference.pod
67share/doc/mrtg2/mrtg-reference.txt 81share/doc/mrtg2/mrtg-reference.txt
 82share/doc/mrtg2/mrtg-rrd.1
68share/doc/mrtg2/mrtg-rrd.pod 83share/doc/mrtg2/mrtg-rrd.pod
69share/doc/mrtg2/mrtg-rrd.txt 84share/doc/mrtg2/mrtg-rrd.txt
 85share/doc/mrtg2/mrtg-squid.1
70share/doc/mrtg2/mrtg-squid.pod 86share/doc/mrtg2/mrtg-squid.pod
71share/doc/mrtg2/mrtg-squid.txt 87share/doc/mrtg2/mrtg-squid.txt
72share/doc/mrtg2/mrtg-ti.png 88share/doc/mrtg2/mrtg-ti.png
 89share/doc/mrtg2/mrtg-unix-guide.1
73share/doc/mrtg2/mrtg-unix-guide.pod 90share/doc/mrtg2/mrtg-unix-guide.pod
74share/doc/mrtg2/mrtg-unix-guide.txt 91share/doc/mrtg2/mrtg-unix-guide.txt
 92share/doc/mrtg2/mrtg-webserver.1
75share/doc/mrtg2/mrtg-webserver.pod 93share/doc/mrtg2/mrtg-webserver.pod
76share/doc/mrtg2/mrtg-webserver.txt 94share/doc/mrtg2/mrtg-webserver.txt
 95share/doc/mrtg2/mrtg.1
77share/doc/mrtg2/mrtg.pod 96share/doc/mrtg2/mrtg.pod
78share/doc/mrtg2/mrtg.txt 97share/doc/mrtg2/mrtg.txt
 98share/doc/mrtg2/mrtglib.1
79share/doc/mrtg2/mrtglib.pod 99share/doc/mrtg2/mrtglib.pod
80share/doc/mrtg2/mrtglib.txt 100share/doc/mrtg2/mrtglib.txt
81share/examples/mrtg/mrtg.conf 101share/examples/mrtg/mrtg.conf
82share/mrtg2/icons/mrtg-l.gif 102share/mrtg2/icons/mrtg-l.gif
83share/mrtg2/icons/mrtg-l.png 103share/mrtg2/icons/mrtg-l.png
84share/mrtg2/icons/mrtg-m.gif 104share/mrtg2/icons/mrtg-m.gif
85share/mrtg2/icons/mrtg-m.png 105share/mrtg2/icons/mrtg-m.png
86share/mrtg2/icons/mrtg-r.gif 106share/mrtg2/icons/mrtg-r.gif
87share/mrtg2/icons/mrtg-r.png 107share/mrtg2/icons/mrtg-r.png
88share/mrtg2/icons/mrtg-ti.gif 108share/mrtg2/icons/mrtg-ti.gif
89share/mrtg2/icons/mrtg-ti.png 109share/mrtg2/icons/mrtg-ti.png
cvs diff -r1.34 -r1.35 pkgsrc/net/mrtg/distinfo (expand / switch to unified diff)

--- pkgsrc/net/mrtg/distinfo 2015/11/04 00:35:12 1.34
+++ pkgsrc/net/mrtg/distinfo 2019/04/14 21:50:36 1.35
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.34 2015/11/04 00:35:12 agc Exp $ 1$NetBSD: distinfo,v 1.35 2019/04/14 21:50:36 jnemeth Exp $
2 2
3SHA1 (mrtg-2.17.4.tar.gz) = 5ae0e659001c613b847237a6b223b26cb7a8ab0f 3SHA1 (mrtg-2.17.7.tar.gz) = c8d6134dd22b9a62e5924faf42d7779bbd1d33ff
4RMD160 (mrtg-2.17.4.tar.gz) = cea76ad3685375770520ebbccd0ad4b6adafff1f 4RMD160 (mrtg-2.17.7.tar.gz) = b035d853822fbcf39e9ac20093f199f463b8a6e8
5SHA512 (mrtg-2.17.4.tar.gz) = b15dac707e387714ba1a181c487894fcacbb9c2c1a1710475ebe86a11e30d758a4b44c139b42638de7fdef6616cf3112afc4e5a8c5fbf53718829673698ee110 5SHA512 (mrtg-2.17.7.tar.gz) = b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768
6Size (mrtg-2.17.4.tar.gz) = 1096879 bytes 6Size (mrtg-2.17.7.tar.gz) = 1098650 bytes
7SHA1 (patch-aa) = 2874cd59371db10fbc4ff6c29e3a917a4b8eec55 7SHA1 (patch-aa) = 2874cd59371db10fbc4ff6c29e3a917a4b8eec55
8SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c 8SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
9SHA1 (patch-ac) = 24ae08714f896ca0f1724454b8ad47c32412c018 9SHA1 (patch-ac) = 24ae08714f896ca0f1724454b8ad47c32412c018
10SHA1 (patch-lib__mrtg2__SNMP_Session.pm) = ab19dfdab6951a1b375bf2433f794293ed191bf4 10SHA1 (patch-lib__mrtg2__SNMP_Session.pm) = 85175f077f08fa9c14c35211735ebe56641c4b5d
cvs diff -r1.1 -r1.2 pkgsrc/net/mrtg/patches/patch-lib__mrtg2__SNMP_Session.pm (expand / switch to unified diff)

--- pkgsrc/net/mrtg/patches/patch-lib__mrtg2__SNMP_Session.pm 2013/08/03 17:05:17 1.1
+++ pkgsrc/net/mrtg/patches/patch-lib__mrtg2__SNMP_Session.pm 2019/04/14 21:50:36 1.2
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-lib__mrtg2__SNMP_Session.pm,v 1.1 2013/08/03 17:05:17 tron Exp $ 1$NetBSD: patch-lib__mrtg2__SNMP_Session.pm,v 1.2 2019/04/14 21:50:36 jnemeth Exp $
2 2
3Fix run-time warnings under Perl 5.16 and newer caused by the IPv6 support 3Fix run-time warnings under Perl 5.16 and newer caused by the IPv6 support
4in the "Socket" module. 4in the "Socket" module.
5 5
6--- lib/mrtg2/SNMP_Session.pm.orig 2012-01-12 10:29:00.000000000 +0000 6--- lib/mrtg2/SNMP_Session.pm.orig 2018-07-13 06:09:56.000000000 +0000
7+++ lib/mrtg2/SNMP_Session.pm 2013-08-03 17:56:14.000000000 +0100 7+++ lib/mrtg2/SNMP_Session.pm
8@@ -146,7 +146,7 @@ 8@@ -146,7 +146,7 @@ BEGIN {
9  9
10 if (eval {local $SIG{__DIE__};require Socket6;} && 10 if (eval {local $SIG{__DIE__};require Socket6;} &&
11 eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) { 11 eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) {
12- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo unpack_sockaddr_in6)); 12- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
13+ Socket6->import(qw(inet_pton getaddrinfo)); 13+ Socket6->import(qw(inet_pton getaddrinfo));
14 $ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1"))); 14 $ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
15 $SNMP_Session::ipv6available = 1; 15 $SNMP_Session::ipv6available = 1;
16 } 16 }
17@@ -601,7 +601,7 @@ 17@@ -601,7 +601,7 @@ use Carp;
18 BEGIN { 18 BEGIN {
19 if($SNMP_Session::ipv6available) { 19 if($SNMP_Session::ipv6available) {
20 import IO::Socket::INET6; 20 import IO::Socket::INET6;
21- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo unpack_sockaddr_in6)); 21- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
22+ Socket6->import(qw(inet_pton getaddrinfo)); 22+ Socket6->import(qw(inet_pton getaddrinfo));
23 } 23 }
24 } 24 }
25  25