From e0023ce1ccabc78c2e3e043b187b66e528632f1f Mon Sep 17 00:00:00 2001 From: Jeremy Olexa Date: Wed, 17 Aug 2011 15:45:54 +0000 Subject: Revision bump to fix bugs: 367785, 378583, 378003. Patches by Diego Elio Pettenò MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.1.10.3/cvs/Linux i686 --- net-analyzer/munin/ChangeLog | 12 +- net-analyzer/munin/Manifest | 11 +- .../files/munin-1.4.6-fix-asterisk-plugins.patch | 188 +++++++++++++++++++++ .../munin/files/munin-node_conf.d_1.3.3-r1 | 8 - .../munin/files/munin-node_conf.d_1.4.6-r2 | 8 + .../munin/files/munin-node_init.d_1.3.3-r1 | 27 --- .../munin/files/munin-node_init.d_1.4.6-r2 | 41 +++++ net-analyzer/munin/metadata.xml | 1 + net-analyzer/munin/munin-1.4.6-r1.ebuild | 149 ---------------- net-analyzer/munin/munin-1.4.6-r2.ebuild | 154 +++++++++++++++++ 10 files changed, 409 insertions(+), 190 deletions(-) create mode 100644 net-analyzer/munin/files/munin-1.4.6-fix-asterisk-plugins.patch delete mode 100644 net-analyzer/munin/files/munin-node_conf.d_1.3.3-r1 create mode 100644 net-analyzer/munin/files/munin-node_conf.d_1.4.6-r2 delete mode 100644 net-analyzer/munin/files/munin-node_init.d_1.3.3-r1 create mode 100644 net-analyzer/munin/files/munin-node_init.d_1.4.6-r2 delete mode 100644 net-analyzer/munin/munin-1.4.6-r1.ebuild create mode 100644 net-analyzer/munin/munin-1.4.6-r2.ebuild (limited to 'net-analyzer/munin') diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog index 74d310605409..593f377daa07 100644 --- a/net-analyzer/munin/ChangeLog +++ b/net-analyzer/munin/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-analyzer/munin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.57 2011/07/20 21:14:29 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.58 2011/08/17 15:45:54 darkside Exp $ + +*munin-1.4.6-r2 (17 Aug 2011) + + 17 Aug 2011; Jeremy Olexa -munin-1.4.6-r1.ebuild, + +munin-1.4.6-r2.ebuild, +files/munin-1.4.6-fix-asterisk-plugins.patch, + +files/munin-node_conf.d_1.4.6-r2, +files/munin-node_init.d_1.4.6-r2, + -files/munin-node_conf.d_1.3.3-r1, -files/munin-node_init.d_1.3.3-r1, + metadata.xml: + Revision bump to fix bugs: 367785, 378583, 378003. Patches by Diego Elio + Pettenò *munin-1.4.6-r1 (20 Jul 2011) diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index 1f39cc582563..574193cb7da4 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -3,14 +3,15 @@ AUX munin-1.3.2-plugins.conf 1623 RMD160 05aa9ba00e714c26d62bc06f6008714cb837f02 AUX munin-1.3.3-crontab 994 RMD160 ab7cc5acaeaf478413e1eb6d1dafe561d79448b0 SHA1 7a372182c407be60895a4817f9bb74f3a63fda49 SHA256 a5d9a160fc15d152a9cbdbf817a44c9c3450c60d61eeead647bf167fbe55fb89 AUX munin-1.4.4-Makefile.patch 2531 RMD160 f0a492267fd1078139a9f80997173cd1d4823e1b SHA1 6ef37d8a5df64be5e6aaa4fb5e526f48069aad0a SHA256 9f19d908b7097267b82b773d8644a775f76d16921e4efaf41e93835e53613bbc AUX munin-1.4.6-apc-temp.patch 1548 RMD160 884a9a0ec0cbc85a3ae7b9082a4c5915f5cac2af SHA1 d90bce289de037502f86ab6841d8a7b23f449140 SHA256 8b51c301cdd90f11e0d3fa5c16ae7bf4717bac2f6321765b6d37ecae4d9d6e27 +AUX munin-1.4.6-fix-asterisk-plugins.patch 6639 RMD160 60be6ab42c0983ddc56e3dacbd25210fdc0492e3 SHA1 07d176e8b1ac7658d27982df8586a3e23f3df080 SHA256 29c8c30b69420453676cc173c232dd3ed1a561e6f0a8fd82ed2b750867ae4ee0 AUX munin-1.4.6-munin-version-identifier.patch 10903 RMD160 373e5a9f3c89a0642adc7aa8b6c8a8f7ff6fc585 SHA1 40615deac2ae75b2767e65f8c321c11ba1f97305 SHA256 a403e5f1ade8b8b3c917fd4a1b72eb1857d6d67c6c955c63a72f5876c5eb4dd4 -AUX munin-node_conf.d_1.3.3-r1 315 RMD160 e33754bafcfb7b9a737ff282157e2201a9a5bbdd SHA1 fc247c9c369543e00faf28e8ce166814a1079e36 SHA256 4a895da9eba3e7ab4b3ce48c6dc9e29297a32ef5ec33be73581867afc4c5e961 AUX munin-node_conf.d_1.4.5-r3 398 RMD160 d2ec21e963a0cb8618866e282bfb1f3bfaab22a8 SHA1 fb184d277f01256234362268f323bdec64bf395b SHA256 1599bf39d048f8330403d14b43dbc839cb7dfe2e4bc7531f52b4af9d00afd6d0 -AUX munin-node_init.d_1.3.3-r1 651 RMD160 80bb9d847eb14425fa5bd6092dfec0328f2f2626 SHA1 77dcab26eaf48e515e2f187b1a5324b507d19eae SHA256 04f1bfa5d97a451bb9aa3bb81caceb269411c55151c78dffeae1b8696fea937d +AUX munin-node_conf.d_1.4.6-r2 316 RMD160 7e20d734fe0e83f10c117a2fe440c9405ed2aac7 SHA1 db3678e68a74d933827217a6f5db251ce567df40 SHA256 cf250f39eae1ee564f51cd99ec20510accb8a68d59469893c5f6c474263f5b50 AUX munin-node_init.d_1.4.5-r3 773 RMD160 464252b8483cc897f2d5151214c2b77a7b5408d4 SHA1 3157812d01894a4fbfe47dd4d71d6682d827c128 SHA256 2352ad981f1356bffe8d8b7a578a621e66493f3d727e7e534aa52ee59bf40b8b +AUX munin-node_init.d_1.4.6-r2 957 RMD160 23d402f155241b37509f3080d7e36bf18c20293d SHA1 37ee7b8268fe834247cee8cdd3312a378c0b3904 SHA256 78cbeff21fc98767775f7ff2c75b4b7096d878aaff26d215789ae5b9fa01e818 DIST munin-1.4.5.tar.gz 1231622 RMD160 883aa4baacfa5be1ec6a83737d5d241c40ad6912 SHA1 bd1e8ad1fe1cfade1de9c28f3ad69bf35ca495ca SHA256 4f8632713c5267e282b091cf7ef5163c5de321536e76dbaab2204aa23c957138 DIST munin-1.4.6.tar.gz 1238782 RMD160 c4e5129641fa279f8b2668c7cafbb9d2656fd895 SHA1 055bf7da181941ce965e57cab7fe9a71fe57779f SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6 EBUILD munin-1.4.5-r3.ebuild 4629 RMD160 1a65cd42f60a281a314a3d48b029e093c44804f0 SHA1 39c9e7b4f49d1df3bd6c58ca10e0897e9673074a SHA256 6f6198d9b815da6a1c587d65c1205eaa56d30c38fe8db508277ce190b3e469fc -EBUILD munin-1.4.6-r1.ebuild 4748 RMD160 5843e35187c031bc10b1dcc27c541b3b0981cd1f SHA1 a97e864355dc008d7be510dd913995a0d628721d SHA256 42546a6e14a2b64d0b134ff89308af20708dba4eaaaab5fc6042152ba0aab05c -MISC ChangeLog 11041 RMD160 b33e675e5d44670029966a773be1da6a2297cd09 SHA1 4f0d11c8bcf81f129c060c7c811c7f9815e23225 SHA256 7a93f008f948ff207e139b7579a7a6da430eb9a6675a390ffe18492197624975 -MISC metadata.xml 1059 RMD160 6742332701cfc8cc749b07a5e1aa691c0d25a206 SHA1 7d3c7c25085c83c3948c8b1a4c1c9eddc7460884 SHA256 1133fa77ad1d63df183790f76cfe19d5b4248b964ee07cc4e50a4bd11faa2c69 +EBUILD munin-1.4.6-r2.ebuild 4965 RMD160 d565b479e1ac3774a0044a23e079bba9b1403641 SHA1 bff0315c3297d885799e1352e3be28cbb8a3c788 SHA256 f5ffa9d6b53e561a4a6786f207d04c33a39f926f0d345e5d72b6ebbd14768a72 +MISC ChangeLog 11466 RMD160 79fa512b308ecd5767eefc0a5631de2f6dcea04a SHA1 a31bce18425d7abcfc76805009edd0815e585daf SHA256 b1cc1141f11f60dc91ae18cb8cba267d933d368b4f93ce65b1c2a5dcc8270f69 +MISC metadata.xml 1128 RMD160 3ba0036609de9db23792b2c864f57e2c9cef64ec SHA1 5fb3f54158ba3e912790ab119878f71e8a6e718f SHA256 7c7cd731ae412b644a36f9f5474fb54b85a6cdf200739d9b1243b5015acf8fcd diff --git a/net-analyzer/munin/files/munin-1.4.6-fix-asterisk-plugins.patch b/net-analyzer/munin/files/munin-1.4.6-fix-asterisk-plugins.patch new file mode 100644 index 000000000000..1a503cf40279 --- /dev/null +++ b/net-analyzer/munin/files/munin-1.4.6-fix-asterisk-plugins.patch @@ -0,0 +1,188 @@ +From 5a1fdd0cbea24bf6775072866cbd5aa7e9b0458b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= +Date: Fri, 12 Aug 2011 20:39:52 +0200 +Subject: [PATCH] Fix Asterisk plugins. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some of the commands have been renamed in 1.6 and 1.8 series (which are the +only versions that are still security-supported and that should be in use), +so use the new syntax without requiring the admin to set up command +aliases. + +Also make sure to exhaust the read buffer of the socket before terminating +the plugin's execution, otherwise the asterisk logs will be full of "Broken +Pipe" error messages, each time a plugin is executed. + +Signed-off-by: Diego Elio Pettenò +--- + plugins/node.d/asterisk_channels.in | 5 ++++- + plugins/node.d/asterisk_channelstypes.in | 5 ++++- + plugins/node.d/asterisk_codecs.in | 3 +++ + plugins/node.d/asterisk_meetme.in | 5 ++++- + plugins/node.d/asterisk_meetmeusers.in | 5 ++++- + plugins/node.d/asterisk_sipchannels.in | 3 +++ + plugins/node.d/asterisk_sippeers.in | 3 +++ + plugins/node.d/asterisk_voicemail.in | 5 ++++- + 8 files changed, 29 insertions(+), 5 deletions(-) + +diff --git a/plugins/node.d/asterisk_channels.in b/plugins/node.d/asterisk_channels.in +index b4e9860..35de2a2 100644 +--- a/plugins/node.d/asterisk_channels.in ++++ b/plugins/node.d/asterisk_channels.in +@@ -104,7 +104,7 @@ $pop->print(""); + + ## Request status of messages. + $pop->print("Action: command"); +-$pop->print("Command: show channels"); ++$pop->print("Command: core show channels"); + $pop->print(""); + my $result; + while (($line = $pop->getline) and ($line !~ /END COMMAND/o)) +@@ -117,6 +117,9 @@ my $nb = (split ' ',$result)[0]; + $pop->print("Action: logoff"); + $pop->print(""); + ++## Exhaust buffer before closing (to avoid polluting Asterisk's logs) ++while ($line = $pop->getline) {} ++ + print "channels.value $nb\n"; + + # vim:syntax=perl +diff --git a/plugins/node.d/asterisk_channelstypes.in b/plugins/node.d/asterisk_channelstypes.in +index 06ab280..a23007b 100644 +--- a/plugins/node.d/asterisk_channelstypes.in ++++ b/plugins/node.d/asterisk_channelstypes.in +@@ -120,7 +120,7 @@ $pop->print(""); + + ## Request status of messages. + $pop->print("Action: command"); +-$pop->print("Command: show channels"); ++$pop->print("Command: core show channels"); + $pop->print(""); + + #Response: Follows +@@ -157,6 +157,9 @@ while (($line = $pop->getline) and ($line !~ /active channels/o)) + $pop->print("Action: logoff"); + $pop->print(""); + ++## Exhaust buffer before closing (to avoid polluting Asterisk's logs) ++while ($line = $pop->getline) {} ++ + $i = 0; + foreach my $channel (@CHANNELS) { + print "$channel.value $results[$i]\n"; +diff --git a/plugins/node.d/asterisk_codecs.in b/plugins/node.d/asterisk_codecs.in +index 434d4e6..93bd87a 100644 +--- a/plugins/node.d/asterisk_codecs.in ++++ b/plugins/node.d/asterisk_codecs.in +@@ -217,6 +217,9 @@ while (($line = $pop->getline) and ($line !~ /active IAX channel/o)) + $pop->print("Action: logoff"); + $pop->print(""); + ++## Exhaust buffer before closing (to avoid polluting Asterisk's logs) ++while ($line = $pop->getline) {} ++ + $i = 0; + foreach my $codec (@CODECS) { + print "$codec.value $results[$i]\n"; +diff --git a/plugins/node.d/asterisk_meetme.in b/plugins/node.d/asterisk_meetme.in +index 72ce10d..091f384 100644 +--- a/plugins/node.d/asterisk_meetme.in ++++ b/plugins/node.d/asterisk_meetme.in +@@ -104,7 +104,7 @@ $pop->print(""); + + ## Request status of messages. + $pop->print("Action: command"); +-$pop->print("Command: meetme"); ++$pop->print("Command: meetme list"); + $pop->print(""); + + +@@ -129,6 +129,9 @@ while (($line = $pop->getline) and ($line !~ /Total number|No active MeetMe/o)) + $pop->print("Action: logoff"); + $pop->print(""); + ++## Exhaust buffer before closing (to avoid polluting Asterisk's logs) ++while ($line = $pop->getline) {} ++ + print "confs.value $confs\n"; + + # vim:syntax=perl +diff --git a/plugins/node.d/asterisk_meetmeusers.in b/plugins/node.d/asterisk_meetmeusers.in +index 1a0c565..0d6a169 100644 +--- a/plugins/node.d/asterisk_meetmeusers.in ++++ b/plugins/node.d/asterisk_meetmeusers.in +@@ -106,7 +106,7 @@ $pop->print(""); + + ## Request status of messages. + $pop->print("Action: command"); +-$pop->print("Command: meetme"); ++$pop->print("Command: meetme list"); + $pop->print(""); + + my $nb = 0; +@@ -125,6 +125,9 @@ while (($line = $pop->getline) and ($line !~ /END COMMAND/o)) + $pop->print("Action: logoff"); + $pop->print(""); + ++## Exhaust buffer before closing (to avoid polluting Asterisk's logs) ++while ($line = $pop->getline) {} ++ + print "users.value $nb\n"; + + # vim:syntax=perl +diff --git a/plugins/node.d/asterisk_sipchannels.in b/plugins/node.d/asterisk_sipchannels.in +index a4750c3..9309575 100644 +--- a/plugins/node.d/asterisk_sipchannels.in ++++ b/plugins/node.d/asterisk_sipchannels.in +@@ -176,6 +176,9 @@ while (($line = $pop->getline) and ($line !~ /active SIP channel/o)) + $pop->print("Action: logoff"); + $pop->print(""); + ++## Exhaust buffer before closing (to avoid polluting Asterisk's logs) ++while ($line = $pop->getline) {} ++ + $i = 0; + foreach my $codec (@CODECS) { + print "$codec.value $results[$i]\n"; +diff --git a/plugins/node.d/asterisk_sippeers.in b/plugins/node.d/asterisk_sippeers.in +index 138ef2c..395881f 100644 +--- a/plugins/node.d/asterisk_sippeers.in ++++ b/plugins/node.d/asterisk_sippeers.in +@@ -152,6 +152,9 @@ while (($line = $pop->getline) and ($line !~ /END COMMAND/o)) + $pop->print("Action: logoff"); + $pop->print(""); + ++## Exhaust buffer before closing (to avoid polluting Asterisk's logs) ++while ($line = $pop->getline) {} ++ + #print "peers.value $peers\n"; + print "mon.value $monitor_online\n"; + print "moff.value $monitor_offline\n"; +diff --git a/plugins/node.d/asterisk_voicemail.in b/plugins/node.d/asterisk_voicemail.in +index 7fa76a0..f8bae21 100644 +--- a/plugins/node.d/asterisk_voicemail.in ++++ b/plugins/node.d/asterisk_voicemail.in +@@ -109,7 +109,7 @@ $pop->print(""); + + ## Request status of messages. + $pop->print("Action: command"); +-$pop->print("Command: show voicemail users"); ++$pop->print("Command: voicemail show users"); + $pop->print(""); + + #Context Mbox User Zone NewMsg +@@ -133,5 +133,8 @@ while (($line = $pop->getline) and ($line !~ /--END/o)) + $pop->print("Action: logoff"); + $pop->print(""); + ++## Exhaust buffer before closing (to avoid polluting Asterisk's logs) ++while ($line = $pop->getline) {} ++ + print "messages.value $results\n"; + # vim:syntax=perl +-- +1.7.6 + diff --git a/net-analyzer/munin/files/munin-node_conf.d_1.3.3-r1 b/net-analyzer/munin/files/munin-node_conf.d_1.3.3-r1 deleted file mode 100644 index 5fcbc9772fd7..000000000000 --- a/net-analyzer/munin/files/munin-node_conf.d_1.3.3-r1 +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_conf.d_1.3.3-r1,v 1.1 2007/05/13 06:07:48 robbat2 Exp $ - -# Set to the nice level for daemon -NICE_LEVEL=1 - -# vim: filetype=gentoo-conf-d: diff --git a/net-analyzer/munin/files/munin-node_conf.d_1.4.6-r2 b/net-analyzer/munin/files/munin-node_conf.d_1.4.6-r2 new file mode 100644 index 000000000000..a984bdbc678f --- /dev/null +++ b/net-analyzer/munin/files/munin-node_conf.d_1.4.6-r2 @@ -0,0 +1,8 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_conf.d_1.4.6-r2,v 1.1 2011/08/17 15:45:54 darkside Exp $ + +# Set to the nice level for daemon +NICE_LEVEL=1 + +# vim: filetype=gentoo-conf-d: diff --git a/net-analyzer/munin/files/munin-node_init.d_1.3.3-r1 b/net-analyzer/munin/files/munin-node_init.d_1.3.3-r1 deleted file mode 100644 index 1d4904867b27..000000000000 --- a/net-analyzer/munin/files/munin-node_init.d_1.3.3-r1 +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_1.3.3-r1,v 1.1 2007/05/13 06:07:48 robbat2 Exp $ - -NAME="munin-node" -PIDFILE=/var/run/munin/$NAME.pid - -depend() { - need net - before cron -} - -start() { - NICE_LEVEL="${NICE_LEVEL:-0}" - ebegin "Starting $NAME" - start-stop-daemon --quiet --nicelevel $NICE_LEVEL --start --pidfile $PIDFILE --exec /usr/sbin/$NAME - eend $? -} - -stop() { - ebegin "Stopping $NAME" - start-stop-daemon --quiet --stop --pidfile $PIDFILE - eend $? -} - -# vim: filetype=gentoo-init-d: diff --git a/net-analyzer/munin/files/munin-node_init.d_1.4.6-r2 b/net-analyzer/munin/files/munin-node_init.d_1.4.6-r2 new file mode 100644 index 000000000000..409570d441ba --- /dev/null +++ b/net-analyzer/munin/files/munin-node_init.d_1.4.6-r2 @@ -0,0 +1,41 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_1.4.6-r2,v 1.1 2011/08/17 15:45:54 darkside Exp $ + +get_munin_config() { + awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE" +} + +: ${NAME:="munin-node"} +: ${CFGFILE:=/etc/munin/munin-node.conf} +: ${PIDFILE:=$(get_munin_config pid_file)} +: ${NICE_LEVEL:=0} + +depend() { + config "$CFGFILE" + + need net + before cron + + [ "$(get_munin_config log_file)" == "Sys::Syslog" ] && \ + use logger +} + +start() { + local piddir=$(dirname ${PIDFILE}) + [ -d ${piddir} ] || mkdir -p ${piddir} + + ebegin "Starting $NAME" + start-stop-daemon --nicelevel $NICE_LEVEL --start --pidfile $PIDFILE --exec /usr/sbin/$NAME -- \ + --config "$CFGFILE" + eend $? +} + +stop() { + ebegin "Stopping $NAME" + start-stop-daemon --stop --pidfile $PIDFILE + eend $? +} + +# vim: filetype=gentoo-init-d: diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml index 4bb54c28f4e2..cf1a1143a00c 100644 --- a/net-analyzer/munin/metadata.xml +++ b/net-analyzer/munin/metadata.xml @@ -17,6 +17,7 @@ easy to see how you're doing capacity wise on all limited resources. + installs deps for monitoring Asterisk installs deps for monitoring IRC installs deps for monitoring memcached diff --git a/net-analyzer/munin/munin-1.4.6-r1.ebuild b/net-analyzer/munin/munin-1.4.6-r1.ebuild deleted file mode 100644 index 969133531b25..000000000000 --- a/net-analyzer/munin/munin-1.4.6-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.6-r1.ebuild,v 1.1 2011/07/20 21:14:29 darkside Exp $ - -EAPI=2 - -inherit eutils - -DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="http://munin.projects.linpro.no/" -SRC_URI="mirror://sourceforge/munin/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" -IUSE="doc irc java memcached minimal mysql postgres ssl" - -# Upstream's listing of required modules is NOT correct! -# Some of the postgres plugins use DBD::Pg, while others call psql directly. -# The mysql plugins use mysqladmin directly. -DEPEND_COM="dev-lang/perl - sys-process/procps - irc? ( dev-perl/Net-IRC ) - java? ( >=virtual/jdk-1.5 ) - mysql? ( virtual/mysql dev-perl/Cache-Cache ) - ssl? ( dev-perl/Net-SSLeay ) - postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) - memcached? ( dev-perl/Cache-Memcached ) - dev-perl/DateManip - dev-perl/Net-CIDR - dev-perl/Net-Netmask - dev-perl/Net-SNMP - dev-perl/libwww-perl - dev-perl/net-server - dev-perl/DBI - virtual/perl-Digest-MD5 - virtual/perl-Getopt-Long - virtual/perl-MIME-Base64 - virtual/perl-Storable - virtual/perl-Text-Balanced - virtual/perl-Time-HiRes - !minimal? ( dev-perl/HTML-Template - net-analyzer/rrdtool[perl] - dev-perl/Log-Log4perl )" - # Sybase isn't supported in Gentoo - #munin-sybase? ( dev-perl/DBD-Sybase ) - -# Keep this seperate, as previous versions have had other deps here -DEPEND="${DEPEND_COM} - virtual/perl-Module-Build" -RDEPEND="${DEPEND_COM} - !minimal? ( virtual/cron )" - -pkg_setup() { - enewgroup munin - enewuser munin 177 -1 /var/lib/munin munin -} - -src_prepare() { - # upstream needs a lot of DESTDIR loving - # and Gentoo location support - epatch "${FILESDIR}"/${PN}-1.4.4-Makefile.patch - - epatch "${FILESDIR}"/${PN}-1.4.6-apc-temp.patch - epatch "${FILESDIR}"/${PN}-1.4.6-munin-version-identifier.patch - - # Don't build java plugins if not requested via USE. - if ! use java; then - # sed is needed so the java plugins aren't automagically built. - sed -i -e 's: build-plugins-java : :' \ - -e 's: install-plugins-java : :' Makefile || die - fi - - # Bug 304447, fix for gentoo PS location - sed -i -e 's,/usr/bin/ps,/bin/ps,g' \ - "${S}"/plugins/node.d/ifx_concurrent_sessions_.in || die -} - -src_compile() { - emake -j 1 build build-man || die "build/build-man failed" - if use doc; then - emake -j 1 build-doc || die "build-doc failed" - fi - - #Ensure TLS is disabled if built without SSL - if ! use ssl; then - echo "tls disabled" >> ${S}/build/node/munin-node.conf \ - || die "Fixing munin-node.conf Failed!" - echo "tls disabled" >> ${S}/build/master/munin.conf \ - || die "Fixing munin.conf Failed!" - fi - -} - -src_install() { - local dirs - dirs="/var/log/munin/ /var/lib/munin/" - dirs="${dirs} /var/lib/munin/plugin-state/" - dirs="${dirs} /var/run/munin/plugin-state/" - dirs="${dirs} /var/run/munin/spool/" - dirs="${dirs} /etc/munin/plugin-conf.d/" - dirs="${dirs} /etc/munin/munin-conf.d/" - dirs="${dirs} /etc/munin/plugins/" - keepdir ${dirs} - - if use minimal; then - emake -j 1 DESTDIR="${D}" install-common-prime install-node-prime \ - install-plugins-prime || die "install failed" - else - emake -j 1 DESTDIR="${D}" install || die "install failed" - fi - fowners munin:munin ${dirs} || die - - insinto /etc/munin/plugin-conf.d/ - newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node || die - - # make sure we've got everything in the correct directory - insinto /var/lib/munin - newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab || die - newinitd "${FILESDIR}"/munin-node_init.d_1.4.5-r3 munin-node || die - newconfd "${FILESDIR}"/munin-node_conf.d_1.4.5-r3 munin-node || die - dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache* \ - || die - - # bug 254968 - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/logrotate.d-munin munin || die -} - -pkg_config() { - einfo "Press enter to install the default crontab for the munin master" - einfo "installation from /var/lib/munin/crontab" - einfo "If you have a large site, you may wish to customize it." - read - # dcron is very fussy about syntax - # the following is the only form that works in BOTH dcron and vixie-cron - crontab - -u munin > ${S}/build/node/munin-node.conf \ + || die "Fixing munin-node.conf Failed!" + echo "tls disabled" >> ${S}/build/master/munin.conf \ + || die "Fixing munin.conf Failed!" + fi + +} + +src_install() { + local dirs + dirs="/var/log/munin/ /var/lib/munin/" + dirs="${dirs} /var/lib/munin/plugin-state/" + dirs="${dirs} /var/run/munin/plugin-state/" + dirs="${dirs} /var/run/munin/spool/" + dirs="${dirs} /etc/munin/plugin-conf.d/" + dirs="${dirs} /etc/munin/munin-conf.d/" + dirs="${dirs} /etc/munin/plugins/" + keepdir ${dirs} + + if use minimal; then + emake -j 1 DESTDIR="${D}" install-common-prime install-node-prime \ + install-plugins-prime || die "install failed" + else + emake -j 1 DESTDIR="${D}" install || die "install failed" + fi + fowners munin:munin ${dirs} || die + + insinto /etc/munin/plugin-conf.d/ + newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node || die + + # make sure we've got everything in the correct directory + insinto /var/lib/munin + newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab || die + newinitd "${FILESDIR}"/munin-node_init.d_1.4.6-r2 munin-node || die + newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node || die + dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache* \ + || die + + # bug 254968 + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/logrotate.d-munin munin || die +} + +pkg_config() { + einfo "Press enter to install the default crontab for the munin master" + einfo "installation from /var/lib/munin/crontab" + einfo "If you have a large site, you may wish to customize it." + read + # dcron is very fussy about syntax + # the following is the only form that works in BOTH dcron and vixie-cron + crontab - -u munin