>Number:         20850
>Category:       pkg
>Synopsis:       updated package: net/mrtg
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Mar 22 16:29:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Adrian Portelli
>Release:        NetBSD 1.6 i386
>Organization:
STIndustries
>Environment:
NetBSD krusty.mdc.stindustries.net 1.6 NetBSD 1.6 (KRUSTY) #1: Wed Feb  5 21:45:03 EST 2003     root@krusty.mdc.stindustries.net:/usr/src/sys/arch/i386/compile/KRUSTY i386

>Description:
pkgsrc/net/mrtg is out of date.  

Current version in pkgsrc is 2.9.26 while 2.9.27 is available from mrtg.org.

This is in the pkgsrc/doc/TODO list.

Changes include:

Changes 2.9.27
--------------
From: Gordon Tetlow <gordon@FreeBSD.org>
* allow unsetting of Unscaled, WithPeak, and Suppress

From: Barry Rountree <rountree@san.rr.com>
* updated compile instructions for new gdlib
* various documentation fixes

From: David Corlette <corlette@huarp.harvard.edu>
* a whole set of new mrtg commandline options: "--fhs", --daemon",
 "--pid-file", "--confcachefile" ... this makes 

From: MASUDA Takashi <t-masuda@mvd.biglobe.ne.jp>
* fix for propperly handling 'one unknown' value ... 

From: Markus Schlup <markus@qbik.ch>
* --check option for mrtg

From: Christian Birchinger <joker@netswarm.net>
* --pid-file option for mrtg

From: Willem Jaap Zwart <W.J.Zwart@TriMM.nl>
* --perhost option for indexmaker

From: Dave Habben <dhabben@illinois.net>
* fix UTF-8 warning ...

From: Moose God <grendel@moose.interq.or.jp>
* cfgmaker now treats old pre-XL Catalyst 2900 the same as any other
  non-CiscoIOS Catalyst switch

From: Tobi
* revisit default_avoid_negative_request_ids now it should be ok
* --debug option for mrtg
* deal more gracefully with space and other od chars in targets ... 
* do not die on unknown data returned from external scripts skip router instead
* fixed win32 with long long ... MS libc does not understand %lld it need %I64d instead
* generate missing mrtg logo images automatically
* add check for correct operation of long long %lld and strtoll
* fixed daemon code

From: Ambrose Li <a.c.li@ieee.org>
* treat script output ##UNDEF## as this ...

From: Norbert Klasen <norbert.klasen@avinci.de>
*  strings for sys* are too long in cfgmaker use snmpwalk


>How-To-Repeat:
cd pkgsrc/net/mrtg && make show-var VARNAME=DISTNAME
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/mrtg/Makefile,v
retrieving revision 1.36
diff -b -u -r1.36 Makefile
--- Makefile	2002/11/28 10:18:14	1.36
+++ Makefile	2003/03/23 00:15:09
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.36 2002/11/28 10:18:14 tron Exp $
 
-DISTNAME=	mrtg-2.9.26b
-PKGNAME=	mrtg-2.9.26.2
-PKGREVISION=	2
+DISTNAME=	mrtg-2.9.27
+PKGNAME=	mrtg-2.9.27
 CATEGORIES=	net
-MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/ \
+MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		http://gd.tuwien.ac.at/infosys/network/tools/mrtg/pub/ \
 		ftp://mrtg.hdl.com/ \
 		ftp://ftp.sunet.se/pub/network/monitoring/mrtg/ \
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/mrtg/distinfo,v
retrieving revision 1.7
diff -b -u -r1.7 distinfo
--- distinfo	2002/11/19 11:24:28	1.7
+++ distinfo	2003/03/23 00:15:09
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2002/11/19 11:24:28 martti Exp $
+$NetBSD$
 
-SHA1 (mrtg-2.9.26b.tar.gz) = a2ee04326234f6d96ff3223d1b901d1358b80641
-Size (mrtg-2.9.26b.tar.gz) = 1013564 bytes
+SHA1 (mrtg-2.9.27.tar.gz) = 7150b88696041612b861f033d4f23b5c786f44b3
+Size (mrtg-2.9.27.tar.gz) = 1023786 bytes
 SHA1 (patch-aa) = 623fed93b4247e0da7ac34a0c8ae3ee2d17a5df7
 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
 SHA1 (patch-ac) = 77e5a9894e6214962d453421abba00e896761dbb
-SHA1 (patch-ad) = 1bb158d2fe639284c43e0bdb213fd7788cd66954
+SHA1 (patch-ad) = 59b4839db3a147f1dd638d81ec83be013417b9dd
 SHA1 (patch-ae) = 98f93ae72aac4cc63e5c6b11152e5ccec425def3
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/net/mrtg/patches/patch-ad,v
retrieving revision 1.3
diff -b -u -r1.3 patch-ad
--- patches/patch-ad	2002/10/23 10:42:21	1.3
+++ patches/patch-ad	2003/03/23 00:15:09
@@ -1,8 +1,8 @@
 $NetBSD: patch-ad,v 1.3 2002/10/23 10:42:21 martti Exp $
 
---- bin/mrtg.orig	Sat Oct 19 11:06:54 2002
-+++ bin/mrtg	Wed Oct 23 12:15:42 2002
-@@ -535,15 +535,15 @@
+--- bin/mrtg.orig	Sun Mar 23 10:54:01 2003
++++ bin/mrtg	Sun Mar 23 10:57:40 2003
+@@ -586,8 +586,8 @@
      ########## rrdtool users have left here ###############
  
      ((($MRTG_lib::OS eq 'NT') && (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.exe")) ||
@@ -12,8 +12,9 @@
 +       die "ERROR: Can't Execute '__PREFIX__/libexec/rateup'\n";
  
      # rateup does not know about undef so we make inlast and outlast ready for rateup
-     die "ERROR: inlast is undefined. This should not be possible\n" unless defined $inlast;
-     die "ERROR: outlast is undefined. This should not be possible\n" unless defined $outlast;
+     warn "ERROR: inlast is undefined. Skipping $router\n" unless defined $inlast;
+@@ -595,7 +595,7 @@
+     return undef unless defined $inlast and defined $outlast;
  
      if ($$rcfg{'options'}{'dorelpercent'}{$router}) {
 -        @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", 
@@ -21,7 +22,7 @@
                   "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
                   $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
                   "$up_abs"."p", $inlast, $outlast, $absmax,
-@@ -551,7 +551,7 @@
+@@ -603,7 +603,7 @@
                   $$rcfg{'rgb3'}{$router},$$rcfg{'rgb4'}{$router},
                   $$rcfg{'rgb5'}{$router});
      } else { 

>Release-Note:
>Audit-Trail:
>Unformatted: