[munin] BZ# 861148 Upstream 1213, Incorrect child count in worker threads for GraphOld.pm and HTMLOld.pm

[fenris02]

commit 76c647f8e38a90b13b8068850e3002567fb4d480
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri Oct 19 20:20:05 2012 -0500

    BZ# 861148 Upstream 1213, Incorrect child count in worker threads for
    GraphOld.pm and HTMLOld.pm

 munin-2.0-defect-1213.patch |   22 ++++++++++++++++++++++
 munin.spec                  |    5 +++++
 2 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/munin-2.0-defect-1213.patch b/munin-2.0-defect-1213.patch
new file mode 100644
index 0000000..0246e32
--- /dev/null
+++ b/munin-2.0-defect-1213.patch
@@ -0,0 +1,22 @@
+diff -ru munin-2.0.7.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.7/master/lib/Munin/Master/GraphOld.pm
+--- munin-2.0.7.orig/master/lib/Munin/Master/GraphOld.pm	2012-10-02 17:46:50.000000000 -0500
++++ munin-2.0.7/master/lib/Munin/Master/GraphOld.pm	2012-10-19 20:12:24.600441211 -0500
+@@ -842,6 +842,7 @@
+ 
+         # This block does the real work.  Since we're forking exit
+         # afterwards.
++        $running=0;
+ 
+         &$work;
+ 
+diff -ru munin-2.0.7.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.7/master/lib/Munin/Master/HTMLOld.pm
+--- munin-2.0.7.orig/master/lib/Munin/Master/HTMLOld.pm	2012-10-02 17:46:50.000000000 -0500
++++ munin-2.0.7/master/lib/Munin/Master/HTMLOld.pm	2012-10-19 20:12:52.032172902 -0500
+@@ -784,6 +784,7 @@
+ 
+         # This block does the real work.  Since we're forking exit
+         # afterwards.
++        $running=0;
+ 
+         &$work;
+ 
diff --git a/munin.spec b/munin.spec
index e8e0ec5..de00db6 100644
--- a/munin.spec
+++ b/munin.spec
@@ -32,6 +32,7 @@ Source18:       munin-node.rc
 Patch4:         munin-2.0.4-Utils-cluck.patch
 Patch5:         acpi-2.0.5.patch
 Patch6:         munin-2.0.7-http_loadtime.patch
+Patch7:         munin-2.0-defect-1213.patch
 
 BuildArch:      noarch
 
@@ -236,6 +237,8 @@ sed -i -e '
   s,^PERLSITELIB := \(.*\),PERLSITELIB := %{perl_vendorlib},;
   s,^PLUGSTATE  = \(.*\),PLUGSTATE  = $(DBDIR)/plugin-state,;
   s,^PREFIX     = \(.*\),PREFIX     = $(DESTDIR)/usr,;
+  s,^PYTHON     := \(.*\),PYTHON     := /usr/bin/python,;
+  s,^RUBY       := \(.*\),RUBY       := /usr/bin/ruby,;
   s,^USER       := \(.*\),USER       := nobody,;
   ' Makefile.config
 
@@ -248,6 +251,7 @@ install -c %{SOURCE12} ./plugins/node.d.linux/cpuspeed.in
 %patch4 -p0
 %patch5 -p0
 %patch6 -p1
+%patch7 -p1
 install -c %{SOURCE13} ./resources/
 
 
@@ -567,6 +571,7 @@ exit 0
 %changelog
 * Fri Oct 19 2012 D. Johnson <fenris02 at fedoraproject.org> - 2.0.7-3
 - BZ# 859956 Minor fedora/rhel build macro fixes
+- BZ# 861148 Upstream 1213, Incorrect child count in worker threads for GraphOld.pm and HTMLOld.pm
 
 * Sun Oct 14 2012 D. Johnson <fenris02 at fedoraproject.org> - 2.0.7-2
 - Do not use 'env' for #! lines.