ubuntu/+source/munin:applied/debian/wheezy

Last commit made on 2014-02-08
Get this branch:
git clone -b applied/debian/wheezy https://git.launchpad.net/ubuntu/+source/munin
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/debian/wheezy
Repository:
lp:ubuntu/+source/munin

Recent commits

b53ab08... by Stig Sandbeck Mathisen on 2013-11-12

Import patches-applied version 2.0.6-4+deb7u2 to applied/debian/wheezy

Imported using git-ubuntu import.

Changelog parent: c5384b2070c6ec05d7ddaeb33486c6d60713b281
Unapplied parent: 4ec81071cbdf7a376038b1b3b96be146577654e5

New changelog entries:
  [ Christoph Biedl ]
  * Avoid a node DoS on bad plugin (CVE-2013-6359)
  * Avoid an OOM in HTML generation on bad multigraph data (CVE-2013-6048)

4ec8107... by Stig Sandbeck Mathisen on 2013-11-12

Import patches-unapplied version 2.0.6-4+deb7u2 to debian/wheezy

Imported using git-ubuntu import.

Changelog parent: ee0f1aa28f087e7d81eebc315c8d81419de3787a

New changelog entries:
  [ Christoph Biedl ]
  * Avoid a node DoS on bad plugin (CVE-2013-6359)
  * Avoid an OOM in HTML generation on bad multigraph data (CVE-2013-6048)

c5384b2... by Holger Levsen <email address hidden> on 2013-06-09

Import patches-applied version 2.0.6-4+deb7u1 to applied/debian/wheezy

Imported using git-ubuntu import.

Changelog parent: 64c2fde2d3569c1fb8cc40c2ccaf38b1533c5c52
Unapplied parent: ee0f1aa28f087e7d81eebc315c8d81419de3787a

New changelog entries:
  * master:
    - on limit checks, if one of the two values is 'U', make
      the final value 'U' as well. Cherry-picked 9d84cb3 as 764006e.
      (Closes: #711201)
    - fix limit for ABSOLUTE checks too. Cherry-picked 334b691 as 1e44056.
    - add ":" to the allowed chars in CGI. Cherry-picked 456e117 as 7d3cb5f.
      (Closes: #710527)
    - fixes for munin-cgi-graph crashes in trend and predict. Cherry-picked
      f325fd6 as 5cb74ba.
  * plugins/df: ignore devtmpfs. Cherry picked from 2.0.16-2.
    (Closes: #710899)
  * asyncd: use the same rules as munin-update. Cherry-picked d4ba06b as
    87975d0. (Closes: #710529)

ee0f1aa... by Holger Levsen <email address hidden> on 2013-06-09

Import patches-unapplied version 2.0.6-4+deb7u1 to debian/wheezy

Imported using git-ubuntu import.

Changelog parent: e3b6fce797aac0ac10a6e6c33f4a29429f4df990

New changelog entries:
  * master:
    - on limit checks, if one of the two values is 'U', make
      the final value 'U' as well. Cherry-picked 9d84cb3 as 764006e.
      (Closes: #711201)
    - fix limit for ABSOLUTE checks too. Cherry-picked 334b691 as 1e44056.
    - add ":" to the allowed chars in CGI. Cherry-picked 456e117 as 7d3cb5f.
      (Closes: #710527)
    - fixes for munin-cgi-graph crashes in trend and predict. Cherry-picked
      f325fd6 as 5cb74ba.
  * plugins/df: ignore devtmpfs. Cherry picked from 2.0.16-2.
    (Closes: #710899)
  * asyncd: use the same rules as munin-update. Cherry-picked d4ba06b as
    87975d0. (Closes: #710529)

64c2fde... by Holger Levsen <email address hidden> on 2013-04-16

Import patches-applied version 2.0.6-4 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 8dded512b2a157afe443182cd9def20d9712f369
Unapplied parent: e3b6fce797aac0ac10a6e6c33f4a29429f4df990

New changelog entries:
  * Master/Node.pm: cherry-pick 71d0a86 from 2.0.12 to fix TLS enabled
    updates. (Closes: #699803)
  * several master components: turn INFO messages into DEBUG messages to avoid
    logfiles reaching gigabyte sizes in a few days. The cherries picked were
    8ad5dda (from 2.0.7) and 4372cdf (from 2.0.12). (Closes: #703479)

e3b6fce... by Holger Levsen <email address hidden> on 2013-04-16

Import patches-unapplied version 2.0.6-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3cc48349404f2326166b4b668a38b81349378236

New changelog entries:
  * Master/Node.pm: cherry-pick 71d0a86 from 2.0.12 to fix TLS enabled
    updates. (Closes: #699803)
  * several master components: turn INFO messages into DEBUG messages to avoid
    logfiles reaching gigabyte sizes in a few days. The cherries picked were
    8ad5dda (from 2.0.7) and 4372cdf (from 2.0.12). (Closes: #703479)

8dded51... by Holger Levsen <email address hidden> on 2013-01-04

Import patches-applied version 2.0.6-3 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: a1d7ab2f093e1815da70749654893dd9d019d804
Unapplied parent: 3cc48349404f2326166b4b668a38b81349378236

New changelog entries:
  * debian/rules: set MUNIN_VERSION correctly during build. (Closes: #694527)
  * debian/munin-async.logrotate:
    - use adm group for created files.
    - use *0 as glob, not *.0 (Closes: #691758)

3cc4834... by Holger Levsen <email address hidden> on 2013-01-04

Import patches-unapplied version 2.0.6-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 339d1a58c263245abfea8058373afc4e722e5a94

New changelog entries:
  * debian/rules: set MUNIN_VERSION correctly during build. (Closes: #694527)
  * debian/munin-async.logrotate:
    - use adm group for created files.
    - use *0 as glob, not *.0 (Closes: #691758)

a1d7ab2... by Holger Levsen <email address hidden> on 2012-12-23

Import patches-applied version 2.0.6-2 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: bc296c6da378baf3277f7223cf934be2f2098e1b
Unapplied parent: 339d1a58c263245abfea8058373afc4e722e5a94

New changelog entries:
  * Fix "/etc/apache2/conf.d/munin removed on upgrade":
    - debian/munin.postinst: create symlink for new installs and also for
      upgrades from versions where it was still removed (up to 1.4.6-3) but
      not re-created (from 1.4.6-1 onwards). Thanks to Gregor Herrman for the
      patch and intrigeri for reviewing. (Closes: #677943)
  * munin-doc: Break and replace munin-common << 2. (Closes: #694355)
  * munin-node.postinst: delete /var/lib/munin(-node)/plugin-state recursively
    on purge. The plugin-state is outdated after a few minutes anyway.
    (Closes: #687715)
  * apt_all plugin: the apt_all plugin has its state updated in cron. There
    the ENV var MUNIN_PLUGSTATE doesn't exist, so we need to set a default.
    (Closes: #687495). This has been in included in 2.0.7 as d53b34d.
  * munin-async.init: Run munin-async after munin-node has been started.
    (Closes: #691390) - Thanks to Daniel Black for this and the next two
    fixes:
  * munin-async.postinst: fix /var/lib/munin-async ownership (once on upgrades
    from previous versions) and for new installs. (Closes: #691309)
  * munin-async.logrotate: correct location of munin-async logfiles.
    (Closes: #691758)
  * Add documentation for munin-async, thanks to Daniel Black.
    (Closes: #681803)
  * Have master support multi-homed nodes that only listen on IPv4.
    (Closes: #678662) This is upstream commit a18229c5 from 2.0.9, thanks to
    Michael Renner for the testing and the patch!
  * Patch node/munin-node.conf.in to allow incoming IPv6 from localhost,
    mostly to document that IPv6 addresses are allowed as well. Thanks to
    Daniel Black. (Closes: #676798) This is upstream commit 7501128 which was
    included in 2.0.9.
  * Common/TLS.pm: use the correct error checking functions from Net::SSLeay,
    cherry-pick c112139 from 2.0.9. (Closes: #675377)
  * HTMLConfig.pm: cherry-pick 789c59e from 2.0.7 to avoid (using the default
    configuration) /var/log/munin/munin-html.log being flooded with 106 lines
    of noisy warnings (out of 112 lines in total) every 5min. (Closes: #689291)
  * selinux_avcstat plugin: Do not use the "read without variable" bashism,
    thanks to intrigeri for the patch. (Closes: #690711)
    This fix has been included upstream as 099cc00f.
  * http_loadtime plugin: fix stderr redirection (which broke the plugin
    completely) (Closes: #691448) - This is upstream commit 9a1cbce from
    2.0.8.
  * Keep using "dh $@" (=without anything) and not change to "dh --with quilt"
    (so #691327 is still open in sid and wheezy.).
  * Drop 101-suppress-occasional-unknown-states-to-avoid-alerts.patch as it
    is included since 1.4.4.
  * Drop 100-DejaVu-Fonts-Path.patch since it only affects a codepath used
    with rrdtool 1.2.
  * Drop 237-hddtemp_smartctl-sata-detect.patch and cherry-pick the identical
    commit 29e4ca9 from 2.0.7 instead: this was the bugfix for #497400,
    included in both lenny and squeeze releases (so it fixes a regression, and
    so today introducing #497400 would be an important bug.)
  * Remove quilt from build-depends. We are not using it and have not been
    using it since March 2012 / 2.0~rc2-1.

339d1a5... by Holger Levsen <email address hidden> on 2012-12-23

Import patches-unapplied version 2.0.6-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: b4a165eb24f2b74ceadd176a8b0cf72f599ea0ed

New changelog entries:
  * Fix "/etc/apache2/conf.d/munin removed on upgrade":
    - debian/munin.postinst: create symlink for new installs and also for
      upgrades from versions where it was still removed (up to 1.4.6-3) but
      not re-created (from 1.4.6-1 onwards). Thanks to Gregor Herrman for the
      patch and intrigeri for reviewing. (Closes: #677943)
  * munin-doc: Break and replace munin-common << 2. (Closes: #694355)
  * munin-node.postinst: delete /var/lib/munin(-node)/plugin-state recursively
    on purge. The plugin-state is outdated after a few minutes anyway.
    (Closes: #687715)
  * apt_all plugin: the apt_all plugin has its state updated in cron. There
    the ENV var MUNIN_PLUGSTATE doesn't exist, so we need to set a default.
    (Closes: #687495). This has been in included in 2.0.7 as d53b34d.
  * munin-async.init: Run munin-async after munin-node has been started.
    (Closes: #691390) - Thanks to Daniel Black for this and the next two
    fixes:
  * munin-async.postinst: fix /var/lib/munin-async ownership (once on upgrades
    from previous versions) and for new installs. (Closes: #691309)
  * munin-async.logrotate: correct location of munin-async logfiles.
    (Closes: #691758)
  * Add documentation for munin-async, thanks to Daniel Black.
    (Closes: #681803)
  * Have master support multi-homed nodes that only listen on IPv4.
    (Closes: #678662) This is upstream commit a18229c5 from 2.0.9, thanks to
    Michael Renner for the testing and the patch!
  * Patch node/munin-node.conf.in to allow incoming IPv6 from localhost,
    mostly to document that IPv6 addresses are allowed as well. Thanks to
    Daniel Black. (Closes: #676798) This is upstream commit 7501128 which was
    included in 2.0.9.
  * Common/TLS.pm: use the correct error checking functions from Net::SSLeay,
    cherry-pick c112139 from 2.0.9. (Closes: #675377)
  * HTMLConfig.pm: cherry-pick 789c59e from 2.0.7 to avoid (using the default
    configuration) /var/log/munin/munin-html.log being flooded with 106 lines
    of noisy warnings (out of 112 lines in total) every 5min. (Closes: #689291)
  * selinux_avcstat plugin: Do not use the "read without variable" bashism,
    thanks to intrigeri for the patch. (Closes: #690711)
    This fix has been included upstream as 099cc00f.
  * http_loadtime plugin: fix stderr redirection (which broke the plugin
    completely) (Closes: #691448) - This is upstream commit 9a1cbce from
    2.0.8.
  * Keep using "dh $@" (=without anything) and not change to "dh --with quilt"
    (so #691327 is still open in sid and wheezy.).
  * Drop 101-suppress-occasional-unknown-states-to-avoid-alerts.patch as it
    is included since 1.4.4.
  * Drop 100-DejaVu-Fonts-Path.patch since it only affects a codepath used
    with rrdtool 1.2.
  * Drop 237-hddtemp_smartctl-sata-detect.patch and cherry-pick the identical
    commit 29e4ca9 from 2.0.7 instead: this was the bugfix for #497400,
    included in both lenny and squeeze releases (so it fixes a regression, and
    so today introducing #497400 would be an important bug.)
  * Remove quilt from build-depends. We are not using it and have not been
    using it since March 2012 / 2.0~rc2-1.