diff -u munin-2.0.9/debian/changelog munin-2.0.9/debian/changelog --- munin-2.0.9/debian/changelog +++ munin-2.0.9/debian/changelog @@ -1,3 +1,13 @@ +munin (2.0.9-1ubuntu1) raring; urgency=low + + * Merge from Debian unstable (LP: #1089218). Remaining changes: + - d/munin-node.upstart,munin.upstart: Add upstart configurations. + - debian/patches/fix_ran_out_of_children.patch: + + Fix occasional "Ran out of children: No child processes" error messages + (LP: #1009357). + + -- Jeremy Bicha Thu, 13 Dec 2012 23:44:14 +0100 + munin (2.0.9-1) experimental; urgency=low * New upstream bugfix release(s). @@ -122,6 +132,45 @@ -- Holger Levsen Tue, 14 Aug 2012 19:12:54 +0200 +munin (2.0.2-1ubuntu3) raring; urgency=low + + * SECURITY UPDATE: privilege escalation via root running plugins + - debian/patches/CVE-2012-3512.patch: run each plugin in their own + state directory in Makefile, Makefile.config, + node/lib/Munin/Node/{OS,Service}.pm, plugins/lib/Munin/Plugin.pm, + plugins/node.d/*.in,plugins/node.d.linux/*.in. + - CVE-2012-3512 + * SECURITY UPDATE: remote code exection via bad arguments + - debian/patches/CVE-2012-3513.patch: use MUNIN_CONFIG env variable + instead of @ARGV to specify alternate config file in + master/_bin/munin-cgi-graph.in, master/_bin/munin-cgi-html.in. + - debian/patches/CVE-2012-3512-regression.patch: Don't rely on + MUNIN_PLUGSTATE being in the environment as these scripts also get + run by a cron job in plugins/node.d.linux/apt_all.in, + plugins/node.d.linux/apt.in. + - CVE-2012-3513 + * debian/rules: actually apply quilt patches. + * debian/Makefile.config: added new plugin state directory location. + * debian/munin-node.{postinst,postrm}: Switch to new plugin state + directory. + + -- Marc Deslauriers Mon, 05 Nov 2012 09:28:03 -0500 + +munin (2.0.2-1ubuntu2) quantal; urgency=low + + * debian/patches/fix_ran_out_of_children.patch: + - Fix occasional "Ran out of children: No child processes" error messages + (LP: #1009357). + + -- Petri Lehtinen Wed, 03 Oct 2012 15:33:15 -0400 + +munin (2.0.2-1ubuntu1) quantal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/munin-node.upstart,munin.upstart: Add upstart configurations. + + -- Logan Rosen Sun, 22 Jul 2012 14:19:53 -0400 + munin (2.0.2-1) unstable; urgency=low [ Holger Levsen ] @@ -135,6 +184,13 @@ -- Holger Levsen Sat, 21 Jul 2012 12:43:33 -0600 +munin (2.0.1-1ubuntu1) quantal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/munin-node.upstart,munin.upstart: Add upstart configurations. + + -- James Page Mon, 02 Jul 2012 14:15:42 +0100 + munin (2.0.1-1) unstable; urgency=low * New upstream version. @@ -146,6 +202,13 @@ -- Holger Levsen Thu, 21 Jun 2012 00:29:37 +0200 +munin (2.0.0-1ubuntu1) quantal; urgency=low + + * Resync with Debian unstable. + * d/munin-node.upstart,munin.upstart: Add upstart configurations. + + -- James Page Mon, 11 Jun 2012 12:54:28 +0100 + munin (2.0.0-1) unstable; urgency=medium * New upstream version. Roughly eight years after munin 1.0 there is now diff -u munin-2.0.9/debian/control munin-2.0.9/debian/control --- munin-2.0.9/debian/control +++ munin-2.0.9/debian/control @@ -1,7 +1,8 @@ Source: munin Section: net Priority: optional -Maintainer: Munin Debian Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Munin Debian Maintainers Uploaders: Holger Levsen , Stig Sandbeck Mathisen , Tom Feiner , diff -u munin-2.0.9/debian/patches/series munin-2.0.9/debian/patches/series --- munin-2.0.9/debian/patches/series +++ munin-2.0.9/debian/patches/series @@ -1,0 +2 @@ +fix_ran_out_of_children.patch only in patch2: unchanged: --- munin-2.0.9.orig/debian/munin.upstart +++ munin-2.0.9/debian/munin.upstart @@ -0,0 +1,15 @@ +# munin + +description "munin" +author "James Page " + +start on runlevel [2345] +stop on runlevel [!2345] + +task + +script + mkdir -p /var/run/munin + chown munin:munin /var/run/munin + chmod 0755 /var/run/munin +end script only in patch2: unchanged: --- munin-2.0.9.orig/debian/munin-node.upstart +++ munin-2.0.9/debian/munin-node.upstart @@ -0,0 +1,24 @@ +# munin-node + +description "munin-node" +author "Chuck Short " + +start on (filesystem and net-device-up IFACE=lo) +stop on runlevel [!2345] + +env DAEMON=/usr/sbin/munin-node + +expect fork +respawn + +pre-start script + mkdir -p /var/run/munin + chown munin:munin /var/run/munin + chmod 0755 /var/run/munin +end script + +script + [ -r /etc/default/munin-node ] && . /etc/default/munin-node + + exec $DAEMON $DAEMON_ARGS +end script only in patch2: unchanged: --- munin-2.0.9.orig/debian/patches/fix_ran_out_of_children.patch +++ munin-2.0.9/debian/patches/fix_ran_out_of_children.patch @@ -0,0 +1,22 @@ +diff -urN a/master/lib/Munin/Master/GraphOld.pm b/master/lib/Munin/Master/GraphOld.pm +--- a/master/lib/Munin/Master/GraphOld.pm 2012-09-26 09:34:05.837131699 +0300 ++++ b/master/lib/Munin/Master/GraphOld.pm 2012-09-26 09:36:52.781138620 +0300 +@@ -618,6 +618,7 @@ + + # This block does the real work. Since we're forking exit + # afterwards. ++ $running = 0; + + &$work; + +diff -urN a/master/lib/Munin/Master/HTMLOld.pm b/master/lib/Munin/Master/HTMLOld.pm +--- a/master/lib/Munin/Master/HTMLOld.pm 2012-09-26 09:34:05.837131699 +0300 ++++ b/master/lib/Munin/Master/HTMLOld.pm 2012-09-26 09:37:18.973139706 +0300 +@@ -853,6 +853,7 @@ + + # This block does the real work. Since we're forking exit + # afterwards. ++ $running = 0; + + &$work; +