Date: Tuesday, May 18, 2010 @ 12:11:12
Author: dan
Revision: 80524
upgpkg: munin 1.4.4-4
Fix FS#19455
Added:
munin/trunk/upstream-794.patch
Modified:
munin/trunk/PKGBUILD
--------------------+
PKGBUILD | 5 +++-
upstream-794.patch | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-05-18 13:18:13 UTC (rev 80523)
+++ PKGBUILD 2010-05-18 16:11:12 UTC (rev 80524)
@@ -5,7 +5,7 @@
pkgname=('munin' 'munin-node')
pkgbase=munin
pkgver=1.4.4
-pkgrel=3
+pkgrel=4
pkgdesc="A distributed monitoring/graphing tool"
arch=('any')
url="http://munin-monitoring.org/";
@@ -14,6 +14,7 @@
source=(http://downloads.sourceforge.net/sourceforge/munin/munin-$pkgver.tar.gz
Makefile.config
keep-defaults.patch
+ upstream-794.patch
munin-cron-entry
munin-node.init
logrotate.munin
@@ -26,6 +27,7 @@
cp $srcdir/Makefile.config $srcdir/$pkgname-$pkgver || exit 1
# This build is beyond fucked, also need to report this upstream
patch -Np1 < $srcdir/keep-defaults.patch || exit 1
+ (cd master/lib/Munin && patch -Np0 < $srcdir/upstream-794.patch) ||
exit 1
# multithreading wrecks havoc on the build, should probably report this
upstream
make -j1 PREFIX='' || exit 1
}
@@ -57,6 +59,7 @@
md5sums=('18d864fa04134ce67042a99dd3ec23ae'
'5b444a99f8cdbfd3b4d51c1fd362b353'
'7d318c55b33680b14f236c5c06a0a64b'
+ 'c3ba6759e054de7408fa6450d148f797'
'dc9c83aa2a278466fb475364462f4119'
'5da6940cd81ccb2734ae66081078abed'
'db77b53150a906256a71a9f539c7fac2'
Added: upstream-794.patch
===================================================================
--- upstream-794.patch (rev 0)
+++ upstream-794.patch 2010-05-18 16:11:12 UTC (rev 80524)
@@ -0,0 +1,54 @@
+diff -u -r Master.orig/HTMLOld.pm Master/HTMLOld.pm
+--- Master.orig/HTMLOld.pm 2010-01-14 13:13:57.000000000 +0100
++++ Master/HTMLOld.pm 2010-01-25 12:39:55.000000000 +0100
+@@ -169,7 +169,7 @@
+ };
+
+
+- if (defined $groups->{"name"} and $groups->{"name"} eq "root") {
++ if (defined $groups->{"name"} and $groups->{"name"} eq "__root__") {
+ $groups = $groups->{"groups"}; # root->groups
+ }
+
+@@ -509,7 +509,7 @@
+ my $peername = munin_get_node_name($peer);
+ next
+ if $peername eq "contact"
+- and munin_get_node_name($parent) eq "root";
++ and munin_get_node_name($parent) eq "__root__";
+ if ($peername eq $me) {
+ unshift @$ret, {"name" => $peername, "link" => undef};
+ }
+diff -u -r Master.orig/LimitsOld.pm Master/LimitsOld.pm
+--- Master.orig/LimitsOld.pm 2010-01-14 13:13:57.000000000 +0100
++++ Master/LimitsOld.pm 2010-01-25 12:39:56.000000000 +0100
+@@ -250,7 +250,7 @@
+ my $parent = munin_get_parent($group);
+ my $name = get_notify_name($group);
+
+- if (defined $parent and munin_get_node_name($parent) ne "root") {
++ if (defined $parent and munin_get_node_name($parent) ne "__root__") {
+ return (get_full_group_path($parent) . " :: " . $name);
+ } else {
+ return $name;
+diff -u -r Master.orig/Utils.pm Master/Utils.pm
+--- Master.orig/Utils.pm 2010-01-14 13:13:57.000000000 +0100
++++ Master/Utils.pm 2010-01-25 12:39:57.000000000 +0100
+@@ -277,7 +277,7 @@
+ $config->{'htmldir'} ||= $Munin::Common::Defaults::MUNIN_HTMLDIR;
+ $config->{'spooldir'} ||= $Munin::Common::Defaults::MUNIN_SSPOOLDIR;
+ $config->{'#%#parent'} = undef;
+- $config->{'#%#name'} = "root";
++ $config->{'#%#name'} = "__root__";
+
+ return ($config);
+ }
+@@ -920,7 +920,7 @@
+ # Not sure when a #%#name node can go missing
+ my $name = $i->{'#%#name'} || '*BUG*';
+ goto gotoparent if $name eq '*BUG*';
+- last if $name eq 'root';
++ last if $name eq '__root__';
+ if ($host) {
+ # Into group land now
+ unshift(@group,$name);
