Hi, please unblock munin 1.2.6-10~lenny1 for stable-proposed-updates, it fixes an important yet trivial bug with cgi graphing (#514634) and fixes a trivial regex in the netstat plugin (#507069)). I'll add the package on http://wiki.debian.org/DebianReleases/PointReleases/5.0.1 with status "not yet checked" now. (As Luk said I should upload, I have done this already.) The difference to 1.2.6-10 (in squeeze since two days, in sid since two weeks) is the changelog entry, the difference to 1.2.6-9 in lenny looks like this and is attached: debdiff munin_1.2.6-9.dsc munin_1.2.6-10~lenny1.dsc |diffstat debian/patches/460-munin-cgi-graph-mkdir.patch | 15 +++++++++++++++ debian/patches/460-netstat-regex.patch | 11 +++++++++++ munin-1.2.6/debian/changelog | 16 ++++++++++++++++ munin-1.2.6/debian/patches/series | 1 + 4 files changed, 43 insertions(+) regards & thanks, Holger
diff -u munin-1.2.6/debian/changelog munin-1.2.6/debian/changelog
--- munin-1.2.6/debian/changelog
+++ munin-1.2.6/debian/changelog
@@ -1,3 +1,19 @@
+munin (1.2.6-10~lenny1) stable-proposed-updates; urgency=low
+
+ * Rebuild for stable-proposed-updates.
+
+ -- Holger Levsen <holger@debian.org> Fri, 13 Mar 2009 09:53:38 +0100
+
+munin (1.2.6-10) unstable; urgency=low
+
+ * munin-html: create needed directories if they don't exist. Normally this
+ is done in munin-graph, but that's not used in cgi mode. Thanks to Peter
+ Palfrader for the bugreport with patch! (Closes: #514634)
+ * node.d.linux/netstat.in: fix regex to only match openened connections,
+ thanks to Paul Slootman for 460-netstat-regex.patch. (Closes: #507069)
+
+ -- Holger Levsen <holger@debian.org> Sat, 28 Feb 2009 19:54:14 +0100
+
munin (1.2.6-9) unstable; urgency=low
[ Matthias Schmitz ]
diff -u munin-1.2.6/debian/patches/series munin-1.2.6/debian/patches/series
--- munin-1.2.6/debian/patches/series
+++ munin-1.2.6/debian/patches/series
@@ -41,0 +42 @@
+460-munin-cgi-graph-mkdir.patch
only in patch2:
unchanged:
--- munin-1.2.6.orig/debian/patches/460-munin-cgi-graph-mkdir.patch
+++ munin-1.2.6/debian/patches/460-munin-cgi-graph-mkdir.patch
@@ -0,0 +1,15 @@
+Index: munin-1.2.6/server/munin-html.in
+===================================================================
+--- munin-1.2.6.orig/server/munin-html.in 2009-02-10 18:04:55.000000000 +0100
++++ munin-1.2.6/server/munin-html.in 2009-02-10 18:06:36.000000000 +0100
+@@ -180,6 +180,10 @@
+ push @nodeorder, $n;
+ }
+ }
++ unless (-d "$config->{htmldir}/$domain" ) {
++ mkdir("$config->{htmldir}/$domain") or
++ die "Cannot mkdir $config->{htmldir}/$domain: $!";
++ }
+ for my $node (@nodeorder) {
+ logger("processing node: $node");
+ my %node;
only in patch2:
unchanged:
--- munin-1.2.6.orig/debian/patches/460-netstat-regex.patch
+++ munin-1.2.6/debian/patches/460-netstat-regex.patch
@@ -0,0 +1,11 @@
+Index: munin-1.2.6/node/node.d.linux/netstat.in
+===================================================================
+--- munin-1.2.6.orig/node/node.d.linux/netstat.in 2009-02-26 23:03:35.000000000 +0100
++++ munin-1.2.6/node/node.d.linux/netstat.in 2009-02-26 23:04:34.000000000 +0100
+@@ -71,5 +71,5 @@
+ exit 0
+ fi
+
+-netstat -s | awk '/active connections/ { print "active.value " $1 } /passive connection ope/ { print "passive.value " $1 } /failed connection/ { print "failed.value " $1 } /connection resets/ { print "resets.value " $1 } /connections established/ { print "established.value " $1 }'
++netstat -s | awk '/active connections opening/ { print "active.value " $1 } /passive connection opening/ { print "passive.value " $1 } /failed connection/ { print "failed.value " $1 } /connection resets/ { print "resets.value " $1 } /connections established/ { print "established.value " $1 }'
+
Attachment:
signature.asc
Description: This is a digitally signed message part.