Stable update proposal: munin
Ref item 9 on <URL:http://wiki.debian.org/DebianEdu/Meeting/20070813>,
here is a update proposal for the stable release.
I propose to update the version of munin in the stable repository from
version 1.2.5-1 to 1.2.5-2.0.edu.etch.2. The changes are fixes to the
df* plugins to correctly handle partitions in + in their device names
(Skolelinux bug #1246). There is also a few changes applied to the
current unstable version, as I based my fixes on the latest version in
Debian.
Here is the svn diff output between the two versions:
diff -u munin-1.2.5/debian/changelog munin-1.2.5/debian/changelog
--- munin-1.2.5/debian/changelog
+++ munin-1.2.5/debian/changelog
@@ -1,3 +1,32 @@
+munin (1.2.5-2.0.edu.etch.2) terra; urgency=low
+
+ * Backport to Debian Edu/Etch.
+ * Non-maintainer upload to fix important bug for Debian Edu.
+ * More corrections to value name handling in df* plugins. Accept
+ 0-9 as valid characters too. (Closes: #440003)
+ Fixes skolelinux bug #1246.
+
+ -- Petter Reinholdtsen <pere@debian.org> Sun, 9 Sep 2007 08:01:46 +0200
+
+munin (1.2.5-2.0.edu.etch.1) terra; urgency=low
+
+ * Non-maintainer upload to fix important bug for Debian Edu.
+ * Backport to Debian Edu/Etch.
+ * Correct value name handling in the df* plugins. (Closes: #440003)
+ Fixes skolelinux bug #1246.
+
+ -- Petter Reinholdtsen <pere@debian.org> Sat, 8 Sep 2007 21:48:24 +0200
+
+munin (1.2.5-2) unstable; urgency=low
+
+ * apply patch that reads the default file, closes: #370347
+
+ * control: add Loic Dachary (OuoU) <loic@debian.org> to Uploaders
+
+ * control: standard version 3.7.2
+
+ -- Loic Dachary (OuoU) <loic@debian.org> Tue, 07 Aug 2007 14:54:11 +0000
+
munin (1.2.5-1) unstable; urgency=low
* New upstream release.
diff -u munin-1.2.5/debian/control munin-1.2.5/debian/control
--- munin-1.2.5/debian/control
+++ munin-1.2.5/debian/control
@@ -2,9 +2,9 @@
Section: net
Priority: optional
Maintainer: Munin Debian Maintainers <munin-deb-maint@linpro.no>
-Uploaders: Tore Anderson <tore@debian.org>, Dagfinn Ilmari Mannsaker <ilmari@ilmari.org>
+Uploaders: Tore Anderson <tore@debian.org>, Dagfinn Ilmari Mannsaker <ilmari@ilmari.org>, Loic Dachary (OuoU) <loic@debian.org>
Build-Depends-Indep: debhelper (>> 4.0.0), perl, htmldoc, html2text
-Standards-Version: 3.6.2.1
+Standards-Version: 3.7.2
Package: munin-node
Architecture: all
diff -u munin-1.2.5/debian/munin-node.init munin-1.2.5/debian/munin-node.init
--- munin-1.2.5/debian/munin-node.init
+++ munin-1.2.5/debian/munin-node.init
@@ -43,6 +43,7 @@
}
. /lib/lsb/init-functions
+[ -r /etc/default/munin-node ] && . /etc/default/munin-node
if [ ! -x $DAEMON ]; then
log_failure_msg "Munin-Node appears to be uninstalled."
@@ -86,7 +87,7 @@
log_end_msg 0
exit 0
fi
- start_daemon -p $PIDFILE $DAEMON
+ start_daemon -p $PIDFILE $DAEMON $DAEMON_ARGS
ret=$?
# start_daemon() isn't thorough enough, ensure the daemon has been
# started manually
diff -u munin-1.2.5/node/node.d.linux/users.in munin-1.2.5/node/node.d.linux/users.in
--- munin-1.2.5/node/node.d.linux/users.in
+++ munin-1.2.5/node/node.d.linux/users.in
@@ -18,7 +18,7 @@
#
# config (required)
#
-# $Id: users.in 860 2005-03-29 20:32:59Z ilmari $
+# $Id: users.in 1278 2007-08-07 14:59:04Z loic $
#
# $Log$
# Revision 1.1.2.1 2005/01/11 13:48:33 ilmari
diff -u munin-1.2.5/node/munin-run.in munin-1.2.5/node/munin-run.in
--- munin-1.2.5/node/munin-run.in
+++ munin-1.2.5/node/munin-run.in
@@ -17,7 +17,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
-# $Id: munin-run.in 1112 2006-10-13 07:22:37Z tore $
+# $Id: munin-run.in 1278 2007-08-07 14:59:04Z loic $
#
# $Log$
# Revision 1.12.2.2 2005/03/16 19:55:34 ilmari
diff -u munin-1.2.5/node/node.d/squid_traffic.in munin-1.2.5/node/node.d/squid_traffic.in
--- munin-1.2.5/node/node.d/squid_traffic.in
+++ munin-1.2.5/node/node.d/squid_traffic.in
@@ -76,7 +76,7 @@
#%# family=auto
#%# capabilities=autoconf
-# $Id: squid_traffic.in 860 2005-03-29 20:32:59Z ilmari $
+# $Id: squid_traffic.in 1278 2007-08-07 14:59:04Z loic $
my $ret = undef;
diff -u munin-1.2.5/node/node.d/mysql_queries.in munin-1.2.5/node/node.d/mysql_queries.in
--- munin-1.2.5/node/node.d/mysql_queries.in
+++ munin-1.2.5/node/node.d/mysql_queries.in
@@ -1,6 +1,6 @@
#!@@PERL@@
#
-# $Id: mysql_queries.in 1112 2006-10-13 07:22:37Z tore $
+# $Id: mysql_queries.in 1278 2007-08-07 14:59:04Z loic $
#
# Copyright 2003-2004 - Per Andreas Buer
#
diff -u munin-1.2.5/node/node.d/squid_cache.in munin-1.2.5/node/node.d/squid_cache.in
--- munin-1.2.5/node/node.d/squid_cache.in
+++ munin-1.2.5/node/node.d/squid_cache.in
@@ -67,7 +67,7 @@
#%# family=auto
#%# capabilities=autoconf
-# $Id: squid_cache.in 860 2005-03-29 20:32:59Z ilmari $
+# $Id: squid_cache.in 1278 2007-08-07 14:59:04Z loic $
my $ret = undef;
diff -u munin-1.2.5/node/node.d/squid_icp.in munin-1.2.5/node/node.d/squid_icp.in
--- munin-1.2.5/node/node.d/squid_icp.in
+++ munin-1.2.5/node/node.d/squid_icp.in
@@ -77,7 +77,7 @@
#%# family=manual
#%# capabilities=autoconf
-# $Id: squid_icp.in 860 2005-03-29 20:32:59Z ilmari $
+# $Id: squid_icp.in 1278 2007-08-07 14:59:04Z loic $
my $ret = undef;
diff -u munin-1.2.5/node/node.d/squid_requests.in munin-1.2.5/node/node.d/squid_requests.in
--- munin-1.2.5/node/node.d/squid_requests.in
+++ munin-1.2.5/node/node.d/squid_requests.in
@@ -76,7 +76,7 @@
#%# family=auto
#%# capabilities=autoconf
-# $Id: squid_requests.in 992 2005-11-30 11:56:09Z tore $
+# $Id: squid_requests.in 1278 2007-08-07 14:59:04Z loic $
my $ret = undef;
diff -u munin-1.2.5/node/SNMP.pm.in munin-1.2.5/node/SNMP.pm.in
--- munin-1.2.5/node/SNMP.pm.in
+++ munin-1.2.5/node/SNMP.pm.in
@@ -21,7 +21,7 @@
use Net::SNMP;
@ISA = qw(Net::SNMP);
-# $Id: SNMP.pm.in 860 2005-03-29 20:32:59Z ilmari $
+# $Id: SNMP.pm.in 1278 2007-08-07 14:59:04Z loic $
=head1 NAME
diff -u munin-1.2.5/node/node.d.sunos/netstat.in munin-1.2.5/node/node.d.sunos/netstat.in
--- munin-1.2.5/node/node.d.sunos/netstat.in
+++ munin-1.2.5/node/node.d.sunos/netstat.in
@@ -1,6 +1,6 @@
#!@@PERL@@
#
-# $Id: netstat.in 992 2005-11-30 11:56:09Z tore $
+# $Id: netstat.in 1278 2007-08-07 14:59:04Z loic $
#
# $Log$
# Revision 1.6 2004/12/10 18:51:44 jimmyo
diff -u munin-1.2.5/node/munin-node.in munin-1.2.5/node/munin-node.in
--- munin-1.2.5/node/munin-node.in
+++ munin-1.2.5/node/munin-node.in
@@ -17,7 +17,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
-# $Id: munin-node.in 1112 2006-10-13 07:22:37Z tore $
+# $Id: munin-node.in 1278 2007-08-07 14:59:04Z loic $
#
# $Log$
# Revision 1.20.2.4 2005/03/16 19:55:34 ilmari
diff -u munin-1.2.5/server/munin-graph.in munin-1.2.5/server/munin-graph.in
--- munin-1.2.5/server/munin-graph.in
+++ munin-1.2.5/server/munin-graph.in
@@ -17,7 +17,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
-# $Id: munin-graph.in 1141 2006-10-17 10:42:58Z tore $
+# $Id: munin-graph.in 1278 2007-08-07 14:59:04Z loic $
$|=1;
diff -u munin-1.2.5/server/munin-cgi-graph.in munin-1.2.5/server/munin-cgi-graph.in
--- munin-1.2.5/server/munin-cgi-graph.in
+++ munin-1.2.5/server/munin-cgi-graph.in
@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
-# $Id: munin-cgi-graph.in 860 2005-03-29 20:32:59Z ilmari $
+# $Id: munin-cgi-graph.in 1278 2007-08-07 14:59:04Z loic $
#
# $Log$
# Revision 1.5.2.2 2005/03/09 20:12:40 jimmyo
diff -u munin-1.2.5/server/munin-html.in munin-1.2.5/server/munin-html.in
--- munin-1.2.5/server/munin-html.in
+++ munin-1.2.5/server/munin-html.in
@@ -17,7 +17,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
-# $Id: munin-html.in 1112 2006-10-13 07:22:37Z tore $
+# $Id: munin-html.in 1278 2007-08-07 14:59:04Z loic $
#
# $Log$
# Revision 1.41.2.3 2005/03/07 17:44:11 jimmyo
diff -u munin-1.2.5/server/Munin.pm.in munin-1.2.5/server/Munin.pm.in
--- munin-1.2.5/server/Munin.pm.in
+++ munin-1.2.5/server/Munin.pm.in
@@ -19,7 +19,7 @@
#
#
#
-# $Id: Munin.pm.in 1124 2006-10-13 21:34:21Z tore $
+# $Id: Munin.pm.in 1278 2007-08-07 14:59:04Z loic $
#
# $Log$
# Revision 1.44.2.4 2005/03/09 17:57:37 jimmyo
diff -u munin-1.2.5/server/munin-update.in munin-1.2.5/server/munin-update.in
--- munin-1.2.5/server/munin-update.in
+++ munin-1.2.5/server/munin-update.in
@@ -21,7 +21,7 @@
#
# Script to update the RRD-files with current information.
#
-# $Id: munin-update.in 1112 2006-10-13 07:22:37Z tore $
+# $Id: munin-update.in 1278 2007-08-07 14:59:04Z loic $
#
# $Log$
# Revision 1.28.2.3 2005/03/09 17:57:37 jimmyo
only in patch2:
unchanged:
--- munin-1.2.5.orig/node/node.d.linux/df_inode.in
+++ munin-1.2.5/node/node.d.linux/df_inode.in
@@ -56,7 +56,7 @@
print_values() {
df -P -l -i -x none -x unknown | sed 1d | grep -v "//" | awk '$5 ~ /[0-9]%/ {print}' | while read i; do
if [ "`fs $i`" = "reiserfs" ] ; then continue ; fi
- name=`echo $i | sed 's/[\/.-]/_/g'| awk '{ print $1 ".value " }'`
+ name=`echo $i | sed 's/[^A-Za-z0-9_]/_/g'| awk '{ print $1 ".value " }'`
echo -n "$name "
echo $i | awk '{ print $5 }' | cut -f1 -d%
done
only in patch2:
unchanged:
--- munin-1.2.5.orig/node/node.d.linux/df.in
+++ munin-1.2.5/node/node.d.linux/df.in
@@ -57,7 +57,7 @@
fi
clean_name() {
- echo $1 $7 $2 | sed 's/[\/.-]/_/g'| awk "{
+ echo $1 $7 $2 | sed 's/[^A-Za-z0-9_]/_/g'| awk "{
if (\$3 == \"tmpfs\")
n=\$1\$2
else
only in patch2:
unchanged:
--- munin-1.2.5.orig/node/node.d.linux/df_abs.in
+++ munin-1.2.5/node/node.d.linux/df_abs.in
@@ -32,7 +32,7 @@
fi
clean_name() {
- echo $1 | sed 's/[\/.-]/_/g; s/^_dev\(_mapper\)\?_//'| awk "{
+ echo $1 | sed 's/[^A-Za-z0-9_]/_/g; s/^_dev\(_mapper\)\?_//'| awk "{
if (length(\$1) > $MAXNAME)
print substr(\$1, length(\$1)-$MAXNAME+1)
else
Reply to: