From 0893fc31b41a6402544b7daa2934bedaa1fd2277 Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Wed, 19 Jan 2022 11:25:24 +0100 Subject: [PATCH] released version 2.17.10 --- src/bin/cfgmaker | 6 +++--- src/bin/indexmaker | 8 ++++---- src/bin/mrtg | 6 +++--- src/doc/mrtg-contrib.pod | 2 +- src/doc/mrtg-faq.pod | 4 ++-- src/doc/mrtg-nt-guide.pod | 22 +++++++++++----------- src/doc/mrtg-reference.pod | 2 +- src/doc/mrtg-unix-guide.pod | 8 ++++---- src/doc/mrtglib.3 | 2 +- src/lib/mrtg2/MRTG_lib.pm | 2 +- src/src/rateup.c | 4 ++-- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/bin/cfgmaker b/src/bin/cfgmaker index 5d1c2fe..2fd8379 100755 --- a/src/bin/cfgmaker +++ b/src/bin/cfgmaker @@ -1,7 +1,7 @@ #! /home/oetiker/.plenv/shims/perl -w # -*- mode: Perl -*- ################################################################## -# MRTG 2.17.9 -- Config file creator +# MRTG 2.17.10 -- Config file creator ################################################################## # Created by Tobias Oetiker # this produces an mrtg config file for one router or more routers @@ -1282,7 +1282,7 @@ sub options ($$) { 'zero-speed=s', '<>', $addrouter_ornf) or pod2usage(2); - die("cfgmaker for mrtg-2.17.9\n") if $$opt{version}; + die("cfgmaker for mrtg-2.17.10\n") if $$opt{version}; pod2usage(-exitval => 0, -verbose => 2) if $$opt{man}; pod2usage(-verbose => 1) if not keys %$routers; } # end options @@ -1589,7 +1589,7 @@ __END__ =head1 NAME -cfgmaker - Creates mrtg.cfg files (for mrtg-2.17.9) +cfgmaker - Creates mrtg.cfg files (for mrtg-2.17.10) =head1 SYNOPSIS diff --git a/src/bin/indexmaker b/src/bin/indexmaker index 5731667..98485a8 100755 --- a/src/bin/indexmaker +++ b/src/bin/indexmaker @@ -1,7 +1,7 @@ #! /home/oetiker/.plenv/shims/perl -w # -*- mode: Perl -*- ################################################################## -# MRTG 2.17.9 --- Index Generator +# MRTG 2.17.10 --- Index Generator ################################################################## # # This reads a mrtg.cfg file form std input or cmdline argument @@ -527,7 +527,7 @@ ECHO # ----------------------------------------------------------- - my $VERSION = "2.17.9"; + my $VERSION = "2.17.10"; $index .= < @@ -636,7 +636,7 @@ sub options ($) { $$opt{prefix} .= '/'; $$opt{prefix} =~ s|/+$|/|; } - die ("Indexmaker for mrtg-2.17.9\n") if $$opt{version}; + die ("Indexmaker for mrtg-2.17.10\n") if $$opt{version}; pod2usage(-exitval => 1, -verbose => 2) if $$opt{man}; pod2usage(-verbose => 1) if not @ARGV; @@ -666,7 +666,7 @@ __END__ =head1 NAME -indexmaker - Creates index files for mrtg web sites (mrtg-2.17.9) +indexmaker - Creates index files for mrtg web sites (mrtg-2.17.10) =head1 SYNOPSIS diff --git a/src/bin/mrtg b/src/bin/mrtg index 6be3a78..59bdd58 100755 --- a/src/bin/mrtg +++ b/src/bin/mrtg @@ -2,7 +2,7 @@ # -*- mode: cperl -*- ################################################################### -# MRTG 2.17.9 Multi Router Traffic Grapher +# MRTG 2.17.10 Multi Router Traffic Grapher ################################################################### # Created by Tobias Oetiker # and Dave Rand @@ -1622,7 +1622,7 @@ sub writehtml { my $dirrel = "../" x ($$rcfg{'directory_web'}{$router} =~ tr|/|/|); $Today=&$LOC(datestr(time)); - $VERSION = "2.17.9"; + $VERSION = "2.17.10"; open (HTML,">$$cfg{'htmldir'}$$rcfg{'directory'}{$router}$router.$$rcfg{'extension'}{$router}") || do { warn ("$NOW: WARNING: Writing $router.$$rcfg{'extension'}{$router}: $!"); next }; @@ -2038,7 +2038,7 @@ sub printusage { print < -mrtg-2.17.9 - Multi Router Traffic Grapher +mrtg-2.17.10 - Multi Router Traffic Grapher Copyright 1995-2006 by Tobias Oetiker Licensed under the Gnu GPL. diff --git a/src/doc/mrtg-contrib.pod b/src/doc/mrtg-contrib.pod index d3f9b22..7e232e6 100644 --- a/src/doc/mrtg-contrib.pod +++ b/src/doc/mrtg-contrib.pod @@ -14,7 +14,7 @@ work. MRTG messages have been translated to a number of languages but there are still many which have not been covered yet. If you want to add yours, go -into the F directory and follow the instructions +into the F directory and follow the instructions given in the F file. =head2 Patches diff --git a/src/doc/mrtg-faq.pod b/src/doc/mrtg-faq.pod index 221fe47..a33b9b6 100644 --- a/src/doc/mrtg-faq.pod +++ b/src/doc/mrtg-faq.pod @@ -14,7 +14,7 @@ In the following sections you'll find some additional Frequently Asked Questions =head2 Why is there no "@#$%" (my native language) version of MRTG? Nobody has contributed a F<@#$%.pmd> file yet. Go into the -F directory and create your own translation file. +F directory and create your own translation file. When you are happy with it send it to me for inclusion with the next mrtg release. @@ -22,7 +22,7 @@ release. =head2 I need a script to make mrtg work with my xyz device. Probably this has already been done. Check the stuff in the -F directory. There is a file called F<00INDEX> in +F directory. There is a file called F<00INDEX> in that directory which tells what you can find in there. =head2 How does this SNMP thing work diff --git a/src/doc/mrtg-nt-guide.pod b/src/doc/mrtg-nt-guide.pod index 90af494..cf691bd 100644 --- a/src/doc/mrtg-nt-guide.pod +++ b/src/doc/mrtg-nt-guide.pod @@ -1,6 +1,6 @@ =head1 NAME -mrtg-nt-guide - The MRTG 2.17.9 Windows Installation Guide +mrtg-nt-guide - The MRTG 2.17.10 Windows Installation Guide =head1 SYNOPSIS @@ -24,7 +24,7 @@ http://www.activestate.com/store/activeperl/download/ =item * The latest version of MRTG from http://oss.oetiker.ch/mrtg/pub. Look for -mrtg-2.17.9.zip or better. The archive also contains a precompiled copy of +mrtg-2.17.10.zip or better. The archive also contains a precompiled copy of rateup.exe for Win32. @@ -40,7 +40,7 @@ to a LOCAL machine. =item First -Unzip MRTG to C:\mrtg-2.17.9 on the Windows machine of your choice. +Unzip MRTG to C:\mrtg-2.17.10 on the Windows machine of your choice. =item Next @@ -54,7 +54,7 @@ You can manually check this by going to [Control Panel]->[System]->[Environment] =back To see if everything is installed properly you can open a Command Shell -and go into F. Type: +and go into F. Type: perl mrtg @@ -89,7 +89,7 @@ Catalyst 5000) with Community string B. We are interested in monitoring traffic, and the CPU load. Let's begin. The first thing we do in setting up MRTG is making a default config file. -Get to a cmd prompt and change to the F directory. Type the +Get to a cmd prompt and change to the F directory. Type the following command: perl cfgmaker public@10.10.10.1 --global "WorkDir: c:\www\mrtg" --output mrtg.cfg @@ -157,7 +157,7 @@ This section determines how the web page headers will look #--------------------------------------------------------------- And that's a very basic MRTG config file. You can run this and see your -results by going into the F directory and typing: +results by going into the F directory and typing: perl mrtg mrtg.cfg @@ -186,7 +186,7 @@ Add the option to your mrtg.cfg file and start it with: - start /Dc:\mrtg-2.17.9\bin wperl mrtg --logging=eventlog mrtg.cfg + start /Dc:\mrtg-2.17.10\bin wperl mrtg --logging=eventlog mrtg.cfg If you use B instead of B, no console window will show. MRTG is now running in the background. If it runs into problems it will tell you so @@ -197,7 +197,7 @@ can be found in the event log. If you put a shortcut with Target: wperl mrtg --logging=eventlog mrtg.cfg - Start in: c:\mrtg-2.17.9\bin + Start in: c:\mrtg-2.17.10\bin into your start-up folder, MRTG will now start whenever you login to your NT box. @@ -246,7 +246,7 @@ Please complete the following steps before starting the installation: =item * -Copy B and B to c:\mrtg-2.17.9\bin\ (your MRTG bin directory). +Copy B and B to c:\mrtg-2.17.10\bin\ (your MRTG bin directory). =item * @@ -257,8 +257,8 @@ following content into it: [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\MRTG\Parameters] "Application"="c:\\perl\\bin\\wperl.exe" - "AppParameters"="c:\\mrtg-2.17.9\\bin\\mrtg --logging=eventlog c:\\mrtg-2.17.9\\bin\\mrtg.cfg" - "AppDirectory"="c:\\mrtg-2.17.9\\bin\\" + "AppParameters"="c:\\mrtg-2.17.10\\bin\\mrtg --logging=eventlog c:\\mrtg-2.17.10\\bin\\mrtg.cfg" + "AppDirectory"="c:\\mrtg-2.17.10\\bin\\" =back diff --git a/src/doc/mrtg-reference.pod b/src/doc/mrtg-reference.pod index 0b43dce..93f965a 100644 --- a/src/doc/mrtg-reference.pod +++ b/src/doc/mrtg-reference.pod @@ -1,6 +1,6 @@ =head1 NAME -mrtg-reference - MRTG 2.17.9 configuration reference +mrtg-reference - MRTG 2.17.10 configuration reference =head1 OVERVIEW diff --git a/src/doc/mrtg-unix-guide.pod b/src/doc/mrtg-unix-guide.pod index 77e6f43..8cc1349 100644 --- a/src/doc/mrtg-unix-guide.pod +++ b/src/doc/mrtg-unix-guide.pod @@ -1,6 +1,6 @@ =head1 NAME -mrtg-unix-guide - The MRTG 2.17.9 Linux/Unix Installation Guide +mrtg-unix-guide - The MRTG 2.17.10 Linux/Unix Installation Guide =head1 DESCRIPTION @@ -160,8 +160,8 @@ For versions starting around 2.0.11, try: Ok, now everything is ready for the mrtg compilation. cd /usr/local/src - gunzip -c mrtg-2.17.9.tar.gz | tar xvf - - cd mrtg-2.17.9 + gunzip -c mrtg-2.17.10.tar.gz | tar xvf - + cd mrtg-2.17.10 If all the libraries have been preinstalled on your system you can configure mrtg by doing a simple: @@ -274,7 +274,7 @@ documentation of your system to make sure you get this right. A B script to put into F might look like this: #! /bin/sh - cd /usr/local/mrtg-2.17.9/bin && ./mrtg --user=mrtg-user \ + cd /usr/local/mrtg-2.17.10/bin && ./mrtg --user=mrtg-user \ /home/httpd/mrtg/mrtg.cfg --logging /var/log/mrtg.log diff --git a/src/doc/mrtglib.3 b/src/doc/mrtglib.3 index 239d6b8..6671c90 100644 --- a/src/doc/mrtglib.3 +++ b/src/doc/mrtglib.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "doc::mrtglib 3" -.TH doc::mrtglib 3 "2022-01-19" "2.17.9" "mrtg" +.TH doc::mrtglib 3 "2022-01-19" "2.17.10" "mrtg" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/lib/mrtg2/MRTG_lib.pm b/src/lib/mrtg2/MRTG_lib.pm index bf38c33..1c12f6c 100644 --- a/src/lib/mrtg2/MRTG_lib.pm +++ b/src/lib/mrtg2/MRTG_lib.pm @@ -1,7 +1,7 @@ # -*- mode: Perl -*- package MRTG_lib; ################################################################### -# MRTG 2.17.9 Support library MRTG_lib.pm +# MRTG 2.17.10 Support library MRTG_lib.pm ################################################################### # Created by Tobias Oetiker # and Dave Rand diff --git a/src/src/rateup.c b/src/src/rateup.c index 519c422..b08bae5 100644 --- a/src/src/rateup.c +++ b/src/src/rateup.c @@ -1,5 +1,5 @@ /* - MRTG 2.17.9 -- Rateup + MRTG 2.17.10 -- Rateup ********************* Rateup is a fast add-on to the great MRTG Traffic monitor. It makes @@ -84,7 +84,7 @@ #include #include -char *VERSION = "2.17.9"; +char *VERSION = "2.17.10"; char *program, *router, *routerpath; int histvalid;