Hello community, here is the log from the commit of package mrtg for openSUSE:Factory checked in at 2013-03-21 22:09:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mrtg (Old) and /work/SRC/openSUSE:Factory/.mrtg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mrtg", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mrtg/mrtg.changes 2012-04-12 09:42:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mrtg.new/mrtg.changes 2013-03-21 22:09:51.000000000 +0100 @@ -1,0 +2,19 @@ +Tue Mar 19 18:19:02 UTC 2013 - [email protected] + +- mrtg-2.17.2-socket6-fix.patch + fails to start ipv6 without. + Seen in http://pkgs.fedoraproject.org/cgit/mrtg.git/plain + +------------------------------------------------------------------- +Wed Aug 22 13:36:53 UTC 2012 - [email protected] + +- re-enable the lib64 patch +- add zlib-devel to build requires +- remove xorg-x11 dependencies for now + +------------------------------------------------------------------- +Thu Aug 16 14:53:24 CEST 2012 - [email protected] + +- add avaya as vendor to find ifAlias on updated nortel switches + +------------------------------------------------------------------- New: ---- mrtg-2.17.4-socket6-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mrtg.spec ++++++ --- /var/tmp/diff_new_pack.FnTiHA/_old 2013-03-21 22:09:53.000000000 +0100 +++ /var/tmp/diff_new_pack.FnTiHA/_new 2013-03-21 22:09:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mrtg # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -34,6 +34,8 @@ Patch2: mrtg-switches.patch # PATCH-FIX-OPENSUSE -- need to find a better solution for lib64 Patch3: mrtg-lib64hack.patch +# PATCH-FIX-OPENSUSE -- also seen in http://pkgs.fedoraproject.org/cgit/mrtg.git/plain/ +Patch4: mrtg-2.17.4-socket6-fix.patch BuildRequires: automake BuildRequires: dos2unix %if 0%{?suse_version} > 1020 @@ -42,8 +44,9 @@ BuildRequires: gd-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: xorg-x11 -BuildRequires: xorg-x11-devel +BuildRequires: zlib-devel +#BuildRequires: xorg-x11 +#BuildRequires: xorg-x11-devel Requires: perl = %{perl_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %define iconsdir /srv/www/icons @@ -79,9 +82,12 @@ %patch0 -p0 %patch1 -p0 %patch2 -p0 -%if "%_lib" == "lib64" +%if "%{_lib}" == "lib64" %patch3 -p0 %endif +# mrtg-2.17.2-socket6-fix.patch +%patch4 -p1 + 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@" ++++++ mrtg-2.17.4-socket6-fix.patch ++++++ --- mrtg-2.17.4/lib/mrtg2/SNMP_Session.pm.orig 2012-01-12 11:29:00.000000000 +0100 +++ mrtg-2.17.4/lib/mrtg2/SNMP_Session.pm 2013-03-19 19:15:57.083595000 +0100 @@ -144,11 +144,11 @@ BEGIN { $SNMP_Session::ipv6available = 0; $dont_wait_flags = 0; 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 unpack_sockaddr_in6 inet_ntop)); $ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1"))); $SNMP_Session::ipv6available = 1; } eval 'local $SIG{__DIE__};local $SIG{__WARN__};$dont_wait_flags = MSG_DONTWAIT();'; } @@ -599,11 +599,11 @@ use IO::Socket; 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 unpack_sockaddr_in6 inet_ntop)); } } @ISA = qw(SNMP_Session); ++++++ mrtg-icons_path.patch ++++++ --- /var/tmp/diff_new_pack.FnTiHA/_old 2013-03-21 22:09:53.000000000 +0100 +++ /var/tmp/diff_new_pack.FnTiHA/_new 2013-03-21 22:09:53.000000000 +0100 @@ -1,8 +1,15 @@ +--- + bin/indexmaker | 3 ++- + bin/mrtg | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + Index: bin/indexmaker =================================================================== --- bin/indexmaker.orig +++ bin/indexmaker -@@ -294,7 +294,8 @@ sub genindex ($$$$) { +@@ -292,11 +292,12 @@ sub genindex ($$$$) { + if ($$cfg{icondir} || $$opt{icondir}) { + $gifPath = $$opt{icondir} || $$cfg{icondir}; #lets make sure there is a trailing path separator $gifPath =~ s|/*$|/|; } else { @@ -12,11 +19,15 @@ } + if ($$opt{optlog}) { + $metaCmdLine = $argz; Index: bin/mrtg =================================================================== --- bin/mrtg.orig +++ bin/mrtg -@@ -1834,7 +1834,8 @@ print HTML " +@@ -1832,11 +1832,12 @@ print HTML " + if (defined $$cfg{icondir}) { + $gifPath = $$cfg{icondir}; #lets make sure there is a trailing path separator $gifPath =~ s|/*$|/|; } else { @@ -26,3 +37,5 @@ } print HTML<<TEXT; + <!-- Begin MRTG Block --> + <div id="footer"> ++++++ mrtg-lib64hack.patch ++++++ --- /var/tmp/diff_new_pack.FnTiHA/_old 2013-03-21 22:09:53.000000000 +0100 +++ /var/tmp/diff_new_pack.FnTiHA/_new 2013-03-21 22:09:53.000000000 +0100 @@ -1,6 +1,17 @@ ---- bin/cfgmaker +--- + bin/cfgmaker | 2 +- + bin/indexmaker | 2 +- + bin/mrtg | 2 +- + bin/mrtg-traffic-sum | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +Index: bin/cfgmaker +=================================================================== +--- bin/cfgmaker.orig +++ bin/cfgmaker -@@ -44,7 +44,7 @@ +@@ -42,11 +42,11 @@ BEGIN { + } + } use FindBin; use lib "${FindBin::Bin}"; @@ -9,9 +20,15 @@ use MRTG_lib "2.100015"; use Getopt::Long; ---- bin/indexmaker + use Pod::Usage; + use Socket; +Index: bin/indexmaker +=================================================================== +--- bin/indexmaker.orig +++ bin/indexmaker -@@ -48,7 +48,7 @@ +@@ -46,11 +46,11 @@ BEGIN { + } + } use FindBin; use lib "${FindBin::Bin}"; @@ -20,9 +37,15 @@ use MRTG_lib "2.100016"; use Getopt::Long; ---- bin/mrtg + use Pod::Usage; + +Index: bin/mrtg +=================================================================== +--- bin/mrtg.orig +++ bin/mrtg -@@ -81,7 +81,7 @@ +@@ -79,11 +79,11 @@ ERR + } + use FindBin; use lib "${FindBin::Bin}"; @@ -31,9 +54,15 @@ use Getopt::Long; use Math::BigFloat; ---- bin/mrtg-traffic-sum + # search for binaries in the bin and bin/../lib directory + use MRTG_lib "2.100016"; +Index: bin/mrtg-traffic-sum +=================================================================== +--- bin/mrtg-traffic-sum.orig +++ bin/mrtg-traffic-sum -@@ -33,7 +33,7 @@ +@@ -31,11 +31,11 @@ BEGIN { + } + } use FindBin; use lib "${FindBin::Bin}"; @@ -42,3 +71,5 @@ use MRTG_lib "2.090017"; use POSIX qw(mktime); + '$Revision: 1.9 $ ' =~ /Revision: (\S*)/; + my $Revision = $1; ++++++ mrtg-pod.patch ++++++ --- /var/tmp/diff_new_pack.FnTiHA/_old 2013-03-21 22:09:53.000000000 +0100 +++ /var/tmp/diff_new_pack.FnTiHA/_new 2013-03-21 22:09:53.000000000 +0100 @@ -1,8 +1,15 @@ +--- + Makefile.in | 4 +--- + lib/mrtg2/MRTG_lib.pm | 2 +- + 2 files changed, 2 insertions(+), 4 deletions(-) + Index: Makefile.in =================================================================== --- Makefile.in.orig +++ Makefile.in -@@ -51,11 +51,9 @@ install: all +@@ -49,15 +49,13 @@ install: all + $(MKINSTALLDIRS) $(DESTDIR)$(bindir) + for x in $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg-traffic-sum; do \ $(INSTALL) -m 755 $$x $(DESTDIR)$(bindir); done for x in bin/rateup; do \ $(INSTALL) -m 755 $$x $(DESTDIR)$(bindir); done @@ -15,11 +22,15 @@ $(MKINSTALLDIRS) $(DESTDIR)$(datadir)/mrtg2/icons for x in $(top_srcdir)/images/*.gif $(top_srcdir)/images/*.png; do \ $(INSTALL) -m 644 $$x $(DESTDIR)$(datadir)/mrtg2/icons; done + $(MKINSTALLDIRS) $(DESTDIR)$(datadir)/doc/mrtg2 + (cd $(top_srcdir); for x in COPYING COPYRIGHT README CHANGES THANKS doc/*.pod doc/*.txt doc/*.png; do \ Index: lib/mrtg2/MRTG_lib.pm =================================================================== --- lib/mrtg2/MRTG_lib.pm.orig +++ lib/mrtg2/MRTG_lib.pm -@@ -684,7 +684,7 @@ sub quickcheck ($$$$$$) { +@@ -682,11 +682,11 @@ sub quickcheck ($$$$$$) { + &{$rules->{$first.$braces}[1]}($arg)."\n\n"; + } } } die "ERROR: CFG Error Unknown Option \"$first\" in file $file on line $line or above.\n". @@ -28,3 +39,5 @@ } # complex config checks + + sub mkdirhier ($){ ++++++ mrtg-switches.patch ++++++ --- /var/tmp/diff_new_pack.FnTiHA/_old 2013-03-21 22:09:53.000000000 +0100 +++ /var/tmp/diff_new_pack.FnTiHA/_new 2013-03-21 22:09:53.000000000 +0100 @@ -1,22 +1,35 @@ +--- + bin/cfgmaker | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + Index: bin/cfgmaker =================================================================== ---- bin/cfgmaker +--- bin/cfgmaker.orig +++ bin/cfgmaker -@@ -175,7 +175,7 @@ sub InterfaceInfo($$$$$) { +@@ -173,11 +173,11 @@ sub InterfaceInfo($$$$$) { + if ($routers->{$router}{deviceinfo}{Vendor} eq 'cisco' && + $routers->{$router}{deviceinfo}{sysDescr} =~ m/Version\s+(\d+\.\d+)/) { push @Variables, ($1 > 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) { ++ } elsif ( $routers->{$router}{deviceinfo}{Vendor} =~ /(?:cisco|hp|nortel|avaya|juniper|dlink|wwp|foundry|dellLan|force10|3com|extremenetworks|openBSD|arista|enterasys|zyxel|vyatta)/i) { push @Variables, "ifAlias"; } -@@ -993,7 +993,7 @@ sub DeviceInfo ($$$) { + my $descr = $routers->{$router}{deviceinfo}{sysDescr}; + if ($routers->{$router}{deviceinfo}{Vendor} eq 'cisco' && +@@ -991,11 +991,12 @@ sub DeviceInfo ($$$) { + '1.3.6.1.4.1.6027.' => 'force10', + '1.3.6.1.4.1.2636.' => 'juniper', '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.45.' => 'avaya', '1.3.6.1.4.1.30155.' => 'openBSD', '1.3.6.1.4.1.30065.' => 'arista', '1.3.6.1.4.1.5624.' => 'enterasys', + '1.3.6.1.4.1.30803.' => 'Vyatta', + '1.3.6.1.4.1.3955.' => 'LinkSys' -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
