pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/mrtg Updated mrtg to 2.10.15
details: https://anonhg.NetBSD.org/pkgsrc/rev/181a333f79a8
branches: trunk
changeset: 480109:181a333f79a8
user: martti <martti%pkgsrc.org@localhost>
date: Mon Aug 30 18:40:14 2004 +0000
description:
Updated mrtg to 2.10.15
* patches for netware support
* the optional Conversion function wants to have the original
data pulled in via snmp to work with, mapping \n and \r to nothing
and stripping spaces must happen later.
* better error message for missing library
* Updated to snmp_session 1.05
* fix for cuin and cout values saved in html comments
* fix for polish translation
* nodetach option for running mrtg under daemontools
* fixed indexmaker. added missing last for --section=portname code
* fixed scaling bug in rateup (unsigned long) should have been long long
* fix indexmaker when used with 14all
diffstat:
net/mrtg/Makefile | 4 ++--
net/mrtg/distinfo | 8 ++++----
net/mrtg/patches/patch-ad | 24 ++++++------------------
3 files changed, 12 insertions(+), 24 deletions(-)
diffs (72 lines):
diff -r 15c065003fca -r 181a333f79a8 net/mrtg/Makefile
--- a/net/mrtg/Makefile Mon Aug 30 18:13:18 2004 +0000
+++ b/net/mrtg/Makefile Mon Aug 30 18:40:14 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2004/06/21 19:10:31 tv Exp $
+# $NetBSD: Makefile,v 1.54 2004/08/30 18:40:14 martti Exp $
-DISTNAME= mrtg-2.10.14
+DISTNAME= mrtg-2.10.15
CATEGORIES= net
MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
ftp://ftp.sunet.se/pub/network/monitoring/mrtg/ \
diff -r 15c065003fca -r 181a333f79a8 net/mrtg/distinfo
--- a/net/mrtg/distinfo Mon Aug 30 18:13:18 2004 +0000
+++ b/net/mrtg/distinfo Mon Aug 30 18:40:14 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2004/06/21 16:20:14 martti Exp $
+$NetBSD: distinfo,v 1.15 2004/08/30 18:40:14 martti Exp $
-SHA1 (mrtg-2.10.14.tar.gz) = b4239e17c59ca8dae68511223215b9772949876d
-Size (mrtg-2.10.14.tar.gz) = 1101215 bytes
+SHA1 (mrtg-2.10.15.tar.gz) = 03505fb686d17c95f504b82baedbcc10aa6d1a71
+Size (mrtg-2.10.15.tar.gz) = 1105158 bytes
SHA1 (patch-aa) = 15b23737797e274018187ea74919c1affa02372c
SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
SHA1 (patch-ac) = fbb1c3306f05d0e5c4c3fba210bf29719dd20278
-SHA1 (patch-ad) = 183c9e3fdb1ee46caa681efd4939a70ea2d11939
+SHA1 (patch-ad) = bdcea3ea03b988a675552c74eefe0b3278d7349b
SHA1 (patch-ae) = 0583ab18c911b2ff32bce7da8c61cdb82f28f90a
diff -r 15c065003fca -r 181a333f79a8 net/mrtg/patches/patch-ad
--- a/net/mrtg/patches/patch-ad Mon Aug 30 18:13:18 2004 +0000
+++ b/net/mrtg/patches/patch-ad Mon Aug 30 18:40:14 2004 +0000
@@ -1,33 +1,21 @@
-$NetBSD: patch-ad,v 1.8 2004/06/21 16:20:14 martti Exp $
+$NetBSD: patch-ad,v 1.9 2004/08/30 18:40:14 martti Exp $
---- bin/mrtg.orig 2004-06-08 21:08:28.000000000 +0000
-+++ bin/mrtg 2004-06-14 17:32:26.000000000 +0000
-@@ -700,8 +700,8 @@
-
- ((($MRTG_lib::OS eq 'NT' or $MRTG_lib::OS eq 'OS2') and (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.exe")) or
+--- bin/mrtg.orig 2004-08-08 12:58:55.000000000 +0300
++++ bin/mrtg 2004-08-30 21:23:13.000000000 +0300
+@@ -703,4 +703,4 @@
(($MRTG_lib::OS eq 'NW') and (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.nlm")) or
- (-x "${FindBin::Bin}${MRTG_lib::SL}rateup")) or
- die "ERROR: Can't Execute '${FindBin::Bin}${MRTG_lib::SL}rateup'\n";
+ (-x "__PREFIX__/libexec/rateup")) ||
+ die "ERROR: Can't Execute '__PREFIX__/libexec/rateup'\n";
- # rateup does not know about undef so we make inlast and outlast ready for rateup
- #warn "ERROR: inlast is undefined. Skipping $router\n" unless defined $inlast;
-@@ -713,7 +713,7 @@
- $outlast = -1 unless defined $outlast;
-
+@@ -716,3 +716,3 @@
if ($$rcfg{'options'}{'dorelpercent'}{$router}) {
- @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup",
+ @exec = ("__PREFIX__/libexec/rateup",
"$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
- $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
- "$up_abs"."p", $inlast, $outlast, $absmax,
-@@ -722,7 +722,7 @@
- $$rcfg{'rgb5'}{$router});
- } else {
+@@ -725,3 +725,3 @@
- @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup",
+ @exec = ("__PREFIX__/libexec/rateup",
"$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
- $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
- "$up_abs", $inlast, $outlast, $absmax,
Home |
Main Index |
Thread Index |
Old Index