Last commit made on 2014-02-08
Get this branch:
git clone -b 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


Recent commits

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)

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)

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)

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)

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
  * 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
  * 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.

b4a165e... by Holger Levsen <email address hidden> on 2012-09-03

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

Imported using git-ubuntu import.

Changelog parent: f3d9b2fc299efc0ac31083023cb994b22ab51032

New changelog entries:
  * New upstream release 2.0.6, switching back to cron graphing (as it better
    for small setups) and besides that only containing bugfixes, but many of
    them. See the upstream ChangeLog for the full list.
    - munin-node: more secure state file handling, introducing a new plugin
      state directory root, owned by uid 0. Then each plugin runs in its own
      UID plugin state directory, owned by the said UID. (Closes: #684075),
      (Closes: #679897), closes CVE-2012-3512.
      So all properly written plugins will use
      /var/lib/munin-node/plugin-state/$uid/$some_file now - please report
      plugins that are still using /var/lib/munin/plugin-state/ - as those
      might pose a security risk!
    - munin-cgi-graph: ignore @ARGV to fix CVE-2012-3513 (Closes: #684076),
      thanks to Helmut Grohne <email address hidden>
    - munin-cron: call munin-graph with --cron argument (Closes: #685343)
    - Master/Node.pm: fix _node_read_fast() to accept all valid returns
      (Closes: #686089) and _do_connect() to not use an uninitialized
      variable. (Closes: #686090)
    - munin-async: make spoolread less restrictive about (valid) plugin names
      (Closes: #686093)
  * Update Location and Scriptalias in shipped apache.conf to fix a regression
    introduced in fixing #682869.
  * munin-node.postinst: don't create /var/lib/munin/plugin-state anymore as
    munin-node now uses /var/lib/munin-nodes/plugin-state and subdirs and
    handles creation by itself.
  * debian/rules: workaround bug in upstream Makefile targets to move
    /var/lib/async from munin-node package to munin-async.
  * debian/control:
    - make munin-async depend on munin-node for now.
    - update Vcs: headers to point to an uptodate repository.
  * Remove build/resources/apache-cgi.conf from munin.docs as it's outdated.
  * update munin.NEWS to reflect that everybody using cgi graphing needs to
    update the configuration files and that cron graphing is the default
    again. (cgi graphing was the default from pre-2.0 until 2.0.5)

f3d9b2f... by Holger Levsen <email address hidden> on 2012-08-14

Import patches-unapplied version 2.0.5-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: f3086e3b89f4b2e90884306090beec89adb7e0c1

New changelog entries:
  [ Holger Levsen ]
  * New upstream versions, fixing lots of bugs (including a regression in
    munin-cgi-graph preventing it from caching at all (Closes: #683064))
    and adding documentation and manpages. See upstream ChangeLog for the
    full list.
  * Remove workaround concerning java-plugins (667493) in debian/rules
    as upstream has fixed this in e7e29c4 in 2.0.3.
  * munin-async.init:
    - run munin-async as munin-async user (Closes: #684171)
    - use stop function from munin-node.init to make it actually stop it
      (Closes: #684170). In the future we should replace both initscripts with
      saner rewrites.
  [ Helmut Grohne ]
  * Move cgi scripts to /usr/lib/munin/cgi. (Closes: #682869)

f3086e3... by Holger Levsen <email address hidden> on 2012-07-21

Import patches-unapplied version 2.0.2-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 514cfeaf70d04ca82dfa707884e8ca5bd14f8fea

New changelog entries:
  [ Holger Levsen ]
  * New upstream version, reintroducing munin-graph (Closes: #681674) and
    some bugfixes. The new munin book is added to the sources, but not yet
  * Add proper LSB headers to all init scripts. (Closes: #680223)
  [ Stig Sandbeck Mathisen ]
  * debian/control: Rename "munin-async-*" to munin-async and munin-asyncd.

514cfea... by Holger Levsen <email address hidden> on 2012-06-20

Import patches-unapplied version 2.0.1-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: e4e99cb75f06449d77ada69d806bf37e1326b7e5

New changelog entries:
  * New upstream version.
  * Update URL to upstream webpage in debian/copyright. (Closes: #676366)
  * Make munin-node depend on munin-plugins-core unconditionally and recommend
    munin-plugins-extra. (Closes: #677189)
  * debian/munin-node.postinst: chmod 775 /var/lib/munin/plugin-state
    (Closes: #675593)

e4e99cb... by Holger Levsen <email address hidden> on 2012-05-31

Import patches-unapplied version 2.0.0-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: f79940014ca345dd9c73c9ccdfbc3e66a12a791c

New changelog entries:
  * New upstream version. Roughly eight years after munin 1.0 there is now
    finally munin 2.0! See /usr/share/doc/munin/Announce-2.0 in the munin
    package for the full announcement. And/or previous debian/changelog
    entries too. Enjoy! And please report bugs, 2.0.1 shall be out soon.
    (Closes: #675153, #674148)
  * /etc/init/munin-node: chmod 755 /var/log/munin (Closes: #674747)
  * Make munin-node suggest munin-plugins-java and not munin-java-plugins.
  * Lower build-depends on debhelper to version 8. (Closes: #675209)