Hello community,
here is the log from the commit of package mrtg for openSUSE:Factory checked in at 2012-03-06 13:40:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mrtg (Old)
and /work/SRC/openSUSE:Factory/.mrtg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mrtg", Maintainer is "DLovasko@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mrtg/mrtg.changes 2011-12-08 11:53:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mrtg.new/mrtg.changes 2012-03-06 13:40:06.000000000 +0100
@@ -1,0 +2,37 @@
+Sun Mar 4 11:07:10 UTC 2012 - lars@linux-schulserver.de
+
+- update to 2.17.4:
+ * some address fixes to contrib
+ * fixed duplicate install-sh entry in archive
+ * set oid-mib-cache file for New_SNMP_util as well #106
+ * prevent spurious warnings about unknonwn values of inlast outlast in mrtg
+ * add the process id tmp file extensions, to guard against multiple rateup
+ instances messing things up for each other. (attempt to fix #115)
+ * quell warning in CnTWaLK mode #111
+ * spelling fixes
+ * make threshold checking more robust against incomplete information in the
+ config file #113
+ * support ifAlias for Vyatta gear
+ * CnTWaLK should add the count and not max index
+ * abort indexmaker if there is no data to be found
+ * fix for big5 translation
+ * in cfgmaker use ifdesc=alias only if there is actualy alias info
+ * fix of a file pointer leak found by coverity scan
+ * fix for kMG support in rateup
+ * add support for zyxel ifAlias
+ * add support for Matrix N7 Diamond
+ * enable warnings in cfgmaker and fix issues ...
+ * explicitly import SOCK_DGRAM and AF_UNSPEC to make ipv6 support work
+ * Updated Net_SNMP_util.pm and SNMP_util.pm to latest versions
+- added mrtg-switches.patch to add support for Nortel switches with
+ MIB 1.3.6.1.4.1.2272.30 and also new Cisco SG-300 switches
+- split out doc subpackage
+- ran spec-cleaner
+- remove unknown --with-rrd configure option
+- use macros
+- remove outdated call to suse_update_config
+- added manpages for mrtg-traffic-sum and rateup
+- fixed wrong interpreter lines in example scripts
+- install arch dependend files in _libdir
+
+-------------------------------------------------------------------
Old:
----
mrtg-2.17.2-icons.diff
mrtg-2.17.2-pod.diff
mrtg-2.17.2.tar.bz2
New:
----
mrtg-2.17.4.tar.bz2
mrtg-icons_path.patch
mrtg-pod.patch
mrtg-switches.patch
mrtg-traffic-sum.1
rateup.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mrtg.spec ++++++
--- /var/tmp/diff_new_pack.irCJ7K/_old 2012-03-06 13:40:08.000000000 +0100
+++ /var/tmp/diff_new_pack.irCJ7K/_new 2012-03-06 13:40:08.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mrtg
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,83 +15,134 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: mrtg
+Version: 2.17.4
+Release: 0
+Summary: The Multirouter Traffic Grapher
+License: GPL-2.0+
+Group: Productivity/Networking/Diagnostic
+Url: http://www.mrtg.org
+Source0: %{name}-%{version}.tar.bz2
+Source1: rateup.1
+Source2: mrtg-traffic-sum.1
+# PATCH-FIX-OPENSUSE -- install icons in openSUSE specific directory
+Patch0: mrtg-icons_path.patch
+# PATCH-FIX-OPENSUSE -- do not install pod files into subdirectory
+Patch1: mrtg-pod.patch
+# PATCH-FIX-UPSTREAM -- add additional switches to cfgmaker
+Patch2: mrtg-switches.patch
BuildRequires: automake
BuildRequires: dos2unix
+%if 0%{?suse_version} > 1020
+BuildRequires: fdupes
+%endif
BuildRequires: gd-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel
-Version: 2.17.2
-Release: 0
Requires: perl = %{perl_version}
-Group: Productivity/Networking/Diagnostic
-License: GPL-2.0+
-Url: http://www.mrtg.org
-Summary: The Multirouter Traffic Grapher
-Source: %{name}-%{version}.tar.bz2
-Patch0: %{name}-%{version}-icons.diff
-Patch1: %{name}-%{version}-pod.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%define iconsdir /srv/www/icons
%description
-A tool to visualize network traffic via a Web page.
+The Multi Router Traffic Grapher is a tool primarily used to monitor the
+traffic load on network links (typically by using SNMP). MRTG generates HTML
+pages containing PNG images which provide a LIVE visual representation of this
+traffic. MRTG typically produces daily, weekly, monthly, and yearly graphs.
+
+In addition to monitoring via SNMP, MRTG can also generate graphs based on
+the output of any application, allowing one to generate graphs of anything
+that needs monitoring (for example, CPU and memory usage, email volumes, web
+hits, etc). For faster data collection, MRTG can also interface to RRDtool.
+The mrtg-doc package contains additional documentation, contributed scripts
+and configuration files that used to form part of the mrtg package.
-Authors:
---------
- Tobias Oetiker
- Dave Rand
+
+%package doc
+Summary: Documentation and contrib files for mrtg
+Group: Productivity/Networking/Diagnostic
+Requires: %{name} == %{version}
+
+%description doc
+A collection of sample scripts and configuration files for the Multi Router
+Traffic Grapher (MRTG). This package contains additional documentation and
+contributed files that ship with MRTG.
%prep
%setup -q
-%patch0
-%patch1
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
rm -rf contrib/mrtgindex.cgi
grep -rl "/usr/local/bin/perl" contrib | xargs sed -i -e "s@/usr/local/bin/perl@/usr/bin/perl@"
+grep -rl "/usr/tardis/local/gnu/bin/perl5" contrib | xargs sed -i -e "s@/usr/tardis/local/gnu/bin/perl5@/usr/bin/perl@"
+grep -rl "/usr/bin/perl5" contrib | xargs sed -i -e "s@/usr/bin/perl5@/usr/bin/perl@"
+grep -rl "/usr/sepp/bin/perl" contrib | xargs sed -i -e "s@/usr/sepp/bin/perl@/usr/bin/perl@"
+grep -rl "/store/bin/perl" contrib | xargs sed -i -e "s@/store/bin/perl@/usr/bin/perl@"
#contrib contains binaries (ie. zipfile) which we cannot convert,
#hopefully file utility seems to mark all the text files clearly
find contrib -type f | xargs file | grep -i text | cut -d: -f1 | xargs dos2unix
+find contrib -type f -name "*.html" | xargs chmod 644
+# disable the line below to get executable examples in the %%doc directory
find contrib -type f | xargs chmod 644
%build
-%define iconsdir /srv/www/icons
-%{suse_update_config}
aclocal
autoconf
-CFLAGS="$RPM_OPT_FLAGS -Wall -pipe" \
-CXXFLAGS="$RPM_OPT_FLAGS -Wall -fmessage-length=0" \
- ./configure \
- --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --infodir=%{_infodir} \
- --datadir=%{_datadir} \
- --mandir=%{_mandir} \
- --with-rrd \
- --with-gd-inc=/usr/include/gd
-make
+%configure \
+ --with-gd-inc=%{_includedir}/gd
+make %{?_smp_mflags}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT%{iconsdir}
-install -m 644 doc/mrtg-[lmr].png $RPM_BUILD_ROOT%{iconsdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/apache2/icons
-install -m 644 doc/mrtg-[lmr].png $RPM_BUILD_ROOT%{_datadir}/apache2/icons
-rm -rf $RPM_BUILD_ROOT/usr/share/doc
-rm -rf $RPM_BUILD_ROOT/usr/share/mrtg2
+%makeinstall
+mkdir -p %{buildroot}%{iconsdir}
+install -m 644 doc/mrtg-[lmr].png %{buildroot}%{iconsdir}
+install -d -m 755 %{buildroot}%{_datadir}/apache2/icons
+install -m 644 doc/mrtg-[lmr].png %{buildroot}%{_datadir}/apache2/icons
+rm -rf %{buildroot}%{_datadir}/doc
+rm -rf %{buildroot}%{_datadir}/mrtg2
+install -Dm0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/rateup.1
+install -m0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/mrtg-traffic-sum.1
+# install and fix documentation
+mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/examples
+cp -r contrib/* %{buildroot}%{_defaultdocdir}/%{name}/examples/
+cp -r doc/*.{pod,txt,png} %{buildroot}%{_defaultdocdir}/%{name}/
+cp -r CHANGES COPYING COPYRIGHT README THANKS %{buildroot}%{_defaultdocdir}/%{name}/
+pushd %{buildroot}%{_defaultdocdir}/%{name}/
+rm cfgmaker.pod indexmaker.pod mrtglib.pod
+ln -s %{_bindir}/cfgmaker cfgmaker.pod
+ln -s %{_bindir}/indexmaker indexmaker.pod
+ln -s %{_libdir}/mrtg2/MRTG_lib.pm mrtglib.pod
+popd
+%if 0%{?suse_version} > 1020
+%fdupes %{buildroot}%{_defaultdocdir}/%{name}
+%endif
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
%defattr(-, root, root)
-%doc CHANGES COPYING COPYRIGHT README THANKS contrib doc/*.{pod,txt,png}
+%dir %{_defaultdocdir}/%{name}
+%doc %{_defaultdocdir}/%{name}/C*
+%doc %{_defaultdocdir}/%{name}/README
+%doc %{_defaultdocdir}/%{name}/THANKS
%doc %{_mandir}/man?/*
%{_bindir}/*
%{iconsdir}
-%{_prefix}/lib/mrtg2
+%{_libdir}/mrtg2
%{_datadir}/apache2
+%files doc
+%defattr(-, root, root)
+%dir %{_defaultdocdir}/%{name}/examples
+%doc %{_defaultdocdir}/%{name}/examples/*
+%doc %{_defaultdocdir}/%{name}/*.pod
+%doc %{_defaultdocdir}/%{name}/*.txt
+%doc %{_defaultdocdir}/%{name}/*.png
+
%changelog
++++++ mrtg-2.17.2.tar.bz2 -> mrtg-2.17.4.tar.bz2 ++++++
++++ 9127 lines of diff (skipped)
++++++ mrtg-icons_path.patch ++++++
Index: bin/indexmaker
===================================================================
--- bin/indexmaker.orig
+++ bin/indexmaker
@@ -294,7 +294,8 @@ sub genindex ($$$$) {
#lets make sure there is a trailing path separator
$gifPath =~ s|/*$|/|;
} else {
- $gifPath = "$$cfg{imagehtml}";
+ # $gifPath = "$$cfg{imagehtml}";
+ $gifPath = "/icons/"
}
Index: bin/mrtg
===================================================================
--- bin/mrtg.orig
+++ bin/mrtg
@@ -1834,7 +1834,8 @@ print HTML "
#lets make sure there is a trailing path separator
$gifPath =~ s|/*$|/|;
} else {
- $gifPath = "$dirrel$$cfg{imagehtml}";
+# $gifPath = "$dirrel$$cfg{imagehtml}";
+ $gifPath = "/icons/"
}
print HTML< 11.0 or $1 < 10.0 ) ? "ifAlias" : "CiscolocIfDescr";
if ($1 > 11.2) {push @Variables, "vmVlan";};
if ($1 > 11.3) {push @Variables, "vlanTrunkPortDynamicStatus";};
- } elsif ( $routers->{$router}{deviceinfo}{Vendor} =~ /(?:hp|juniper|dlink|wwp|foundry|dellLan|force10|3com|extremenetworks|openBSD|arista|enterasys|zyxel|vyatta)/i) {
+ } elsif ( $routers->{$router}{deviceinfo}{Vendor} =~ /(?:cisco:hp|juniper|dlink|wwp|foundry|dellLan|force10|3com|extremenetworks|openBSD|arista|enterasys|zyxel|vyatta)/i) {
push @Variables, "ifAlias";
}
@@ -993,7 +993,7 @@ sub DeviceInfo ($$$) {
'1.3.6.1.4.1.94.' => 'nokiaipsofw',
'1.3.6.1.4.1.307.' => 'portmaster',
'1.3.6.1.4.1.890.' => 'zyxel',
- '1.3.6.1.4.1.2272.30' => 'nortel',
+ '1.3.6.1.4.1.2272.30' => 'nortel',
'1.3.6.1.4.1.30155.' => 'openBSD',
'1.3.6.1.4.1.30065.' => 'arista',
'1.3.6.1.4.1.5624.' => 'enterasys',
++++++ mrtg-traffic-sum.1 ++++++
.\" Automatically generated by Pod::Man 2.23 (Pod::Simple 3.14)
.\"
.\" Standard preamble:
.\" ========================================================================
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.de Vb \" Begin verbatim text
.ft CW
.nf
.ne \\$1
..
.de Ve \" End verbatim text
.ft R
.fi
..
.\" Set up some character translations and predefined strings. \*(-- will
.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
.\" double quote, and \*(R" will give a right double quote. \*(C+ will
.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
.\" nothing in troff, for use with C<>.
.tr \(*W-
.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
.ie n \{\
. ds -- \(*W-
. ds PI pi
. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
. ds L" ""
. ds R" ""
. ds C` ""
. ds C' ""
'br\}
.el\{\
. ds -- \|\(em\|
. ds PI \(*p
. ds L" ``
. ds R" ''
'br\}
.\"
.\" Escape single quotes in literal strings from groff's Unicode transform.
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\"
.\" If the F register is turned on, we'll generate index entries on stderr for
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
.ie \nF \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
..
. nr % 0
. rr F
.\}
.el \{\
. de IX
..
.\}
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
. \" fudge factors for nroff and troff
.if n \{\
. ds #H 0
. ds #V .8m
. ds #F .3m
. ds #[ \f1
. ds #] \fP
.\}
.if t \{\
. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
. ds #V .6m
. ds #F 0
. ds #[ \&
. ds #] \&
.\}
. \" simple accents for nroff and troff
.if n \{\
. ds ' \&
. ds ` \&
. ds ^ \&
. ds , \&
. ds ~ ~
. ds /
.\}
.if t \{\
. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
.\}
. \" troff and (daisy-wheel) nroff accents
.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
.ds ae a\h'-(\w'a'u*4/10)'e
.ds Ae A\h'-(\w'A'u*4/10)'E
. \" corrections for vroff
.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
. \" for low resolution devices (crt and lpr)
.if \n(.H>23 .if \n(.V>19 \
\{\
. ds : e
. ds 8 ss
. ds o a
. ds d- d\h'-1'\(ga
. ds D- D\h'-1'\(hy
. ds th \o'bp'
. ds Th \o'LP'
. ds ae ae
. ds Ae AE
.\}
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
.IX Title "MRTG-TRAFFIC-SUM 1"
.TH MRTG-TRAFFIC-SUM 1 "2009-12-28" "perl v5.12.3" "User Contributed Perl Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
.nh
.SH "NAME"
mrtg\-traffic\-sum \- Builds monthly traffic summary from mrtg log files
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
\&\fBmrtg-traffic-sum\fR [\fIoptions\fR...] \fBconfig-file\fR
.PP
.Vb 8
\& \-\-man show man\-page and exit
\& \-h, \-\-help display this help and exit
\& \-\-version output version information and exit
\& \-\-catch=regexp filter out things that match this in PageTop
\& \-\-email=address email the result
\& \-\-min=gigabytes minimal number of gigabites required for report
\& \-\-range=<when> Specify "current" for month\-to\-date, "previous" for last complete month
\& \-\-units=[GB|MB] Display results in gigabytes (default is MB)
.Ve
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
The mrtg-traffic-sum goes through the mrtg logs for the targets in the
the config file specified and builds the traffic total for the last
month in Giga Bytes. (Note in communications Giga is 10^9).
.PP
The result of this analysis can be sent via email to an address of
your choice using the \fB\-\-email\fR option.
.PP
With the \fB\-\-catch\fR option you can specify a regular expression which
will be matched against the contents of the PageTop settings. The
regular expression should return a value into \f(CW$1\fR and possibly into
\&\f(CW$2\fR. This will then be used as description for the appropriate traffic
sum. By default the catch is set to:
.PP
.Vb 1
\& (?:description|port name):</td>\es*<td>\es*([^< ]*?[^<]*?)\es*,
Keith Dunnett
.SH "HISTORY"
.IX Header "HISTORY"
.Vb 2
\& 2002\-07\-13 to Initial Version
\& 2009\-12\-38 kd New features
.Ve
++++++ rateup.1 ++++++
.TH RATEUP 1
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
.SH NAME
rateup \- backend tool used by mrtg
.SH SYNOPSIS
.B rateup
.br
.SH "DESCRIPTION"
This manual page documents briefly the
.BR rateup
command.
This manual page was written for the Debian GNU/Linux distribution
because the original program does not have a manual page.
.PP
.B rateup
is a program called by mrtg to generate new logfile entries and to update
the traffic PNG images.
.SH "SEE ALSO"
cfgmaker(1), indexmaker(1), mrtg(1).
.SH AUTHOR
This manual page was written by Dermot Bradley ,
for the Debian GNU/Linux system (but may be used by others).
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org