Hello community, here is the log from the commit of package mrtg for openSUSE:Factory checked in at 2012-04-12 09:42:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-03-06 13:40:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mrtg.new/mrtg.changes 2012-04-12 09:42:10.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Mar 28 01:36:56 CEST 2012 - ro@suse.de + +- fix SG300 issue in mrtg-switches.patch directly + +------------------------------------------------------------------- +Wed Mar 28 00:55:48 CEST 2012 - ro@suse.de + +- fix lib64 issue by workaround +- support SG300 switches by cisco + +------------------------------------------------------------------- New: ---- mrtg-lib64hack.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mrtg.spec ++++++ --- /var/tmp/diff_new_pack.FSe841/_old 2012-04-12 09:42:11.000000000 +0200 +++ /var/tmp/diff_new_pack.FSe841/_new 2012-04-12 09:42:11.000000000 +0200 @@ -32,6 +32,8 @@ Patch1: mrtg-pod.patch # PATCH-FIX-UPSTREAM -- add additional switches to cfgmaker Patch2: mrtg-switches.patch +# PATCH-FIX-OPENSUSE -- need to find a better solution for lib64 +Patch3: mrtg-lib64hack.patch BuildRequires: automake BuildRequires: dos2unix %if 0%{?suse_version} > 1020 @@ -77,6 +79,9 @@ %patch0 -p0 %patch1 -p0 %patch2 -p0 +%if "%_lib" == "lib64" +%patch3 -p0 +%endif 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-lib64hack.patch ++++++ --- bin/cfgmaker +++ bin/cfgmaker @@ -44,7 +44,7 @@ use FindBin; use lib "${FindBin::Bin}"; -use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2"; +use lib "${FindBin::Bin}${main::SL}..${main::SL}lib64${main::SL}mrtg2"; use MRTG_lib "2.100015"; use Getopt::Long; --- bin/indexmaker +++ bin/indexmaker @@ -48,7 +48,7 @@ use FindBin; use lib "${FindBin::Bin}"; -use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2"; +use lib "${FindBin::Bin}${main::SL}..${main::SL}lib64${main::SL}mrtg2"; use MRTG_lib "2.100016"; use Getopt::Long; --- bin/mrtg +++ bin/mrtg @@ -81,7 +81,7 @@ use FindBin; use lib "${FindBin::Bin}"; -use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2"; +use lib "${FindBin::Bin}${main::SL}..${main::SL}lib64${main::SL}mrtg2"; use Getopt::Long; use Math::BigFloat; --- bin/mrtg-traffic-sum +++ bin/mrtg-traffic-sum @@ -33,7 +33,7 @@ use FindBin; use lib "${FindBin::Bin}"; -use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2"; +use lib "${FindBin::Bin}${main::SL}..${main::SL}lib64${main::SL}mrtg2"; use MRTG_lib "2.090017"; use POSIX qw(mktime); ++++++ mrtg-switches.patch ++++++ --- /var/tmp/diff_new_pack.FSe841/_old 2012-04-12 09:42:11.000000000 +0200 +++ /var/tmp/diff_new_pack.FSe841/_new 2012-04-12 09:42:11.000000000 +0200 @@ -7,7 +7,7 @@ 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|juniper|dlink|wwp|foundry|dellLan|force10|3com|extremenetworks|openBSD|arista|enterasys|zyxel|vyatta)/i) { push @Variables, "ifAlias"; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org