CVS commit: pkgsrc/net/mrtg

["John Nemeth" <jnemeth%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jnemeth
Date:           Sun Apr 14 21:50:36 UTC 2019

Modified Files:
        pkgsrc/net/mrtg: Makefile PLIST distinfo
        pkgsrc/net/mrtg/patches: patch-lib__mrtg2__SNMP_Session.pm

Log Message:
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@localhost>
* make sure threshval does not get clobberd

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


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 pkgsrc/net/mrtg/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/mrtg/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/mrtg/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/mrtg/patches/patch-lib__mrtg2__SNMP_Session.pm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/mrtg/Makefile
diff -u pkgsrc/net/mrtg/Makefile:1.126 pkgsrc/net/mrtg/Makefile:1.127
--- pkgsrc/net/mrtg/Makefile:1.126      Wed Aug 22 09:45:54 2018
+++ pkgsrc/net/mrtg/Makefile    Sun Apr 14 21:50:36 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.126 2018/08/22 09:45:54 wiz Exp $
+# $NetBSD: Makefile,v 1.127 2019/04/14 21:50:36 jnemeth Exp $
 
-DISTNAME=      mrtg-2.17.4
-PKGREVISION=   12
+DISTNAME=      mrtg-2.17.7
+#PKGREVISION=  12
 CATEGORIES=    net
 MASTER_SITES=  https://oss.oetiker.ch/mrtg/pub/
 MASTER_SITES+= https://oss.oetiker.ch/mrtg/pub/old/

Index: pkgsrc/net/mrtg/PLIST
diff -u pkgsrc/net/mrtg/PLIST:1.13 pkgsrc/net/mrtg/PLIST:1.14
--- pkgsrc/net/mrtg/PLIST:1.13  Fri Jul  9 08:45:33 2010
+++ pkgsrc/net/mrtg/PLIST       Sun Apr 14 21:50:36 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2010/07/09 08:45:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2019/04/14 21:50:36 jnemeth Exp $
 bin/cfgmaker
 bin/indexmaker
 bin/mrtg
@@ -40,42 +40,62 @@ share/doc/mrtg2/COPYING
 share/doc/mrtg2/COPYRIGHT
 share/doc/mrtg2/README
 share/doc/mrtg2/THANKS
+share/doc/mrtg2/cfgmaker.1
 share/doc/mrtg2/cfgmaker.pod
 share/doc/mrtg2/cfgmaker.txt
+share/doc/mrtg2/indexmaker.1
 share/doc/mrtg2/indexmaker.pod
 share/doc/mrtg2/indexmaker.txt
+share/doc/mrtg2/mrtg-contrib.1
 share/doc/mrtg2/mrtg-contrib.pod
 share/doc/mrtg2/mrtg-contrib.txt
+share/doc/mrtg2/mrtg-faq.1
 share/doc/mrtg2/mrtg-faq.pod
 share/doc/mrtg2/mrtg-faq.txt
+share/doc/mrtg2/mrtg-forum.1
 share/doc/mrtg2/mrtg-forum.pod
 share/doc/mrtg2/mrtg-forum.txt
+share/doc/mrtg2/mrtg-ipv6.1
 share/doc/mrtg2/mrtg-ipv6.pod
 share/doc/mrtg2/mrtg-ipv6.txt
+share/doc/mrtg2/mrtg-l.gif
 share/doc/mrtg2/mrtg-l.png
+share/doc/mrtg2/mrtg-logfile.1
 share/doc/mrtg2/mrtg-logfile.pod
 share/doc/mrtg2/mrtg-logfile.txt
+share/doc/mrtg2/mrtg-m.gif
 share/doc/mrtg2/mrtg-m.png
+share/doc/mrtg2/mrtg-mibhelp.1
 share/doc/mrtg2/mrtg-mibhelp.pod
 share/doc/mrtg2/mrtg-mibhelp.txt
+share/doc/mrtg2/mrtg-nt-guide.1
 share/doc/mrtg2/mrtg-nt-guide.pod
 share/doc/mrtg2/mrtg-nt-guide.txt
+share/doc/mrtg2/mrtg-nw-guide.1
 share/doc/mrtg2/mrtg-nw-guide.pod
 share/doc/mrtg2/mrtg-nw-guide.txt
+share/doc/mrtg2/mrtg-r.gif
 share/doc/mrtg2/mrtg-r.png
+share/doc/mrtg2/mrtg-reference.1
 share/doc/mrtg2/mrtg-reference.pod
 share/doc/mrtg2/mrtg-reference.txt
+share/doc/mrtg2/mrtg-rrd.1
 share/doc/mrtg2/mrtg-rrd.pod
 share/doc/mrtg2/mrtg-rrd.txt
+share/doc/mrtg2/mrtg-squid.1
 share/doc/mrtg2/mrtg-squid.pod
 share/doc/mrtg2/mrtg-squid.txt
 share/doc/mrtg2/mrtg-ti.png
+share/doc/mrtg2/mrtg-unix-guide.1
 share/doc/mrtg2/mrtg-unix-guide.pod
 share/doc/mrtg2/mrtg-unix-guide.txt
+share/doc/mrtg2/mrtg-webserver.1
 share/doc/mrtg2/mrtg-webserver.pod
 share/doc/mrtg2/mrtg-webserver.txt
+share/doc/mrtg2/mrtg.1
 share/doc/mrtg2/mrtg.pod
 share/doc/mrtg2/mrtg.txt
+share/doc/mrtg2/mrtglib.1
 share/doc/mrtg2/mrtglib.pod
 share/doc/mrtg2/mrtglib.txt
 share/examples/mrtg/mrtg.conf

Index: pkgsrc/net/mrtg/distinfo
diff -u pkgsrc/net/mrtg/distinfo:1.34 pkgsrc/net/mrtg/distinfo:1.35
--- pkgsrc/net/mrtg/distinfo:1.34       Wed Nov  4 00:35:12 2015
+++ pkgsrc/net/mrtg/distinfo    Sun Apr 14 21:50:36 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.34 2015/11/04 00:35:12 agc Exp $
+$NetBSD: distinfo,v 1.35 2019/04/14 21:50:36 jnemeth Exp $
 
-SHA1 (mrtg-2.17.4.tar.gz) = 5ae0e659001c613b847237a6b223b26cb7a8ab0f
-RMD160 (mrtg-2.17.4.tar.gz) = cea76ad3685375770520ebbccd0ad4b6adafff1f
-SHA512 (mrtg-2.17.4.tar.gz) = b15dac707e387714ba1a181c487894fcacbb9c2c1a1710475ebe86a11e30d758a4b44c139b42638de7fdef6616cf3112afc4e5a8c5fbf53718829673698ee110
-Size (mrtg-2.17.4.tar.gz) = 1096879 bytes
+SHA1 (mrtg-2.17.7.tar.gz) = c8d6134dd22b9a62e5924faf42d7779bbd1d33ff
+RMD160 (mrtg-2.17.7.tar.gz) = b035d853822fbcf39e9ac20093f199f463b8a6e8
+SHA512 (mrtg-2.17.7.tar.gz) = b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768
+Size (mrtg-2.17.7.tar.gz) = 1098650 bytes
 SHA1 (patch-aa) = 2874cd59371db10fbc4ff6c29e3a917a4b8eec55
 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
 SHA1 (patch-ac) = 24ae08714f896ca0f1724454b8ad47c32412c018
-SHA1 (patch-lib__mrtg2__SNMP_Session.pm) = ab19dfdab6951a1b375bf2433f794293ed191bf4
+SHA1 (patch-lib__mrtg2__SNMP_Session.pm) = 85175f077f08fa9c14c35211735ebe56641c4b5d

Index: pkgsrc/net/mrtg/patches/patch-lib__mrtg2__SNMP_Session.pm
diff -u pkgsrc/net/mrtg/patches/patch-lib__mrtg2__SNMP_Session.pm:1.1 pkgsrc/net/mrtg/patches/patch-lib__mrtg2__SNMP_Session.pm:1.2
--- pkgsrc/net/mrtg/patches/patch-lib__mrtg2__SNMP_Session.pm:1.1       Sat Aug  3 17:05:17 2013
+++ pkgsrc/net/mrtg/patches/patch-lib__mrtg2__SNMP_Session.pm   Sun Apr 14 21:50:36 2019
@@ -1,24 +1,24 @@
-$NetBSD: patch-lib__mrtg2__SNMP_Session.pm,v 1.1 2013/08/03 17:05:17 tron Exp $
+$NetBSD: patch-lib__mrtg2__SNMP_Session.pm,v 1.2 2019/04/14 21:50:36 jnemeth Exp $
 
 Fix run-time warnings under Perl 5.16 and newer caused by the IPv6 support
 in the "Socket" module.
 
---- lib/mrtg2/SNMP_Session.pm.orig     2012-01-12 10:29:00.000000000 +0000
-+++ lib/mrtg2/SNMP_Session.pm  2013-08-03 17:56:14.000000000 +0100
-@@ -146,7 +146,7 @@
+--- lib/mrtg2/SNMP_Session.pm.orig     2018-07-13 06:09:56.000000000 +0000
++++ lib/mrtg2/SNMP_Session.pm
+@@ -146,7 +146,7 @@ BEGIN {
  
      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 unpack_sockaddr_in6));
+-       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 @@
+@@ -601,7 +601,7 @@ use Carp;
  BEGIN {
      if($SNMP_Session::ipv6available) {
            import IO::Socket::INET6;
--        Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo unpack_sockaddr_in6));
+-        Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
 +        Socket6->import(qw(inet_pton getaddrinfo));
      }
  }