Last commit made on 2012-12-13
Get this branch:
git clone -b ubuntu/raring-devel 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

9debde8... by Jeremy Bicha on 2012-12-13

Import patches-unapplied version 2.0.9-1ubuntu1 to ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: 0b2e9c1a824c26225b2fd6bba21eff4834dd9a20

New changelog entries:
  * 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).

0b2e9c1... by Holger Levsen <email address hidden> on 2012-12-11

Import patches-unapplied version 2.0.9-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: b4a165eb24f2b74ceadd176a8b0cf72f599ea0ed

New changelog entries:
  * New upstream bugfix release(s).
    - Drop all debian/patches/ (except 100-DejaVu-Fonts-Path.patch) as they
      were included in 2.0.7-2.0.9.
  * Remove libcgi-fast-perl from munin's depends.
  * Add libapache2-mod-fcgid to munin's suggests.
  * Support libapache2-mod-fcgid in /etc/munin/apache.conf out of the box
    (Closes: #695228), remove configuration for libapache2-mod-fastcgi as it's
  * debian/rules: set MUNIN_VERSION correctly during build. (Closes: #694527)
  * 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)
  * 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)
  * Add documentation for munin-async, thanks to Daniel Black.
    (Closes: #681803)
  * 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 debian/patches/238-munin-node-ipv6allow.patch
  * 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)
    This is debian/patches/239-fix-too-many-warnings-in-munin-graph.log.patch
  * munin-doc: Break and replace munin-common << 2. (Closes: #694355)
  * selinux_avcstat plugin: Do not use the "read without variable" bashism,
    thanks to intrigeri for the patch. (Closes: #690711)
    This is 240-Do-not-use-the-read-without-variable-bashism.patch
  * Have master support multi-homed nodes that only listen on IPv4.
    (Closes: #678662) This is upstream commit a18229c5, thanks to Michael
    Renner for the testing and the patch!
    This is debian/patches/241-master-connect-to-AAAA-and-A-address.patch
  * Fix wrong assumption about Net::SSLeay::CTX_set_options return value.
    Thanks to intrigeri for this patch. (Closes: #675377)
    This is 242-Fix-wrong-assumption-about-Net-SSLeay-CTX_set_option.patch
  * http_loadtime plugin: fix stderr redirection (which broke the plugin
    completely) (Closes: #691448)
    This is 243-http_loadtime-fixed-stderr-redirection-with-time.patch
  * 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 and is
  * 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)
  * Use dh --with quilt so that the patches are actually applied.
    (Closes: #691327)
  * Drop 101-suppress-occasional-unknown-states-to-avoid-alerts.patch which
    is included since munin 1.4.4.

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)

f799400... by Holger Levsen <email address hidden> on 2012-05-17

Import patches-unapplied version 2.0~rc6-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 258d16a727a6967e651729966658023dd7d876e5

New changelog entries:
  * Make munin-node depend on munin-plugins-core | munin-plugins.
    (Closes: #673124)
  * munin-node.logroate: create munin-node.log owned by root.
    (Closes: #606216)

258d16a... by Holger Levsen <email address hidden> on 2012-05-14

Import patches-unapplied version 2.0~rc6-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 1745a48268767c3fdfdb77fe0cca84321c261cec

New changelog entries:
  * munin.postinst: Fix typo breaking the chgrp of $cgitempdir.

1745a48... by Holger Levsen <email address hidden> on 2012-05-13

Import patches-unapplied version 2.0~rc6-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8f1d06e1d0f14148de63cdf75c6981541bf46fe5

New changelog entries:
  [ Holger Levsen ]
  * New upstream release candidate, quoting the upstream Changelog:
    - Many bugfixes in munin-cgi-graph:
      - if url parameters are not valid, send HTTP 404 instead of 500
      - move the generation of png via cgi under /var/lib/munin/cgi-tmp/
        (Closes: #668536)
      - don't cache URL with parameters anymore, and don't keep uncached URLs
        (Closes: #668667)
      - validate url characters (Closes: #668666)
      - add a max setting for cgi image size. (Closes: #670811)
    - Plugin fixes:
      - add explicit license for all plugins. (Closes: #670428)
      - hddtemp_smartctl: just use the device name as the labels
      - qmailscan: remove the use of tempfiles. (Closes: #668778)
  * munin.NEWS: document that "cgitmpdir /var/lib/munin/cgi-tmp" has to be
    set in munin.conf.
  * munin-node.postinst: chmod 755 /var/log/munin (Closes: #669230)
  * munin.postinst: make /var/lib/munin/cgi-tmp writable for group www-data.
  [ Matthias Schmitz ]
  * Add installation of apache configuration to /etc/apache2/conf-availble as
    needed by Apache 2.4. (Closes: #669816)