Bug #304447: ps is at /bin/ps in Gentoo. Bug #340301: optional memcache check deps. Bug #358605: detect pidfile location from munin-node config file.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

6 files changed, 199 insertions, 4 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index b27f87dbb3ef..c5f32224d3c6 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/munin
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.47 2010/10/18 03:22:28 darkside Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.48 2011/03/16 06:29:51 robbat2 Exp $
+
+*munin-1.4.5-r2 (16 Mar 2011)
+
+  16 Mar 2011; Robin H. Johnson <robbat2@gentoo.org> +munin-1.4.5-r2.ebuild,
+  +files/munin-node_conf.d_1.4.5-r2, +files/munin-node_init.d_1.4.5-r2,
+  metadata.xml:
+  Bug #304447: ps is at /bin/ps in Gentoo. Bug #340301: optional memcache check
+  deps. Bug #358605: detect pidfile location from munin-node config file.
 
   18 Oct 2010; Jeremy Olexa <darkside@gentoo.org>
   +files/munin-1.3.2-plugins.conf:
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 71888f49c448..fcf08b3635c0 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -3,9 +3,12 @@ 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-node_conf.d_1.3.3-r1 315 RMD160 e33754bafcfb7b9a737ff282157e2201a9a5bbdd SHA1 fc247c9c369543e00faf28e8ce166814a1079e36 SHA256 4a895da9eba3e7ab4b3ce48c6dc9e29297a32ef5ec33be73581867afc4c5e961
+AUX munin-node_conf.d_1.4.5-r2 422 RMD160 1628c6bbd21de3ed59de07aae4dc5f91e93f619b SHA1 d3ceeeb02b064ee4b531a49324adbb7e485c34b4 SHA256 29551106588f7f0c8a01582ea75e4986ddef4c88a42ac8736f7ca82685c2c473
 AUX munin-node_init.d_1.3.3-r1 651 RMD160 80bb9d847eb14425fa5bd6092dfec0328f2f2626 SHA1 77dcab26eaf48e515e2f187b1a5324b507d19eae SHA256 04f1bfa5d97a451bb9aa3bb81caceb269411c55151c78dffeae1b8696fea937d
+AUX munin-node_init.d_1.4.5-r2 694 RMD160 74e7cc90ca3f03691f860b28ef560440dbff3711 SHA1 b9b97f5048b9d6b532168125e4ed187f9869e40f SHA256 d9f599f2bbfcdab57536e449f5cb48392d852e3864a1fa09a9cc3e895ebf75ca
 DIST munin-1.4.5.tar.gz 1231622 RMD160 883aa4baacfa5be1ec6a83737d5d241c40ad6912 SHA1 bd1e8ad1fe1cfade1de9c28f3ad69bf35ca495ca SHA256 4f8632713c5267e282b091cf7ef5163c5de321536e76dbaab2204aa23c957138
 EBUILD munin-1.4.5-r1.ebuild 4439 RMD160 62f51338492be27a556b5a65d5e9c7b87116e96a SHA1 cecffb0a236b2717bbb7713403616905d04c4264 SHA256 97ea6969ddade37f7ab3b4508d469ceee39438516619c466ca7f97e714723925
+EBUILD munin-1.4.5-r2.ebuild 4632 RMD160 7d86d0203096a71144040010f13f9b3239586f63 SHA1 107eb4e5925e27a24ab409df772d64242301437f SHA256 8a5477015deb2b7e48c8faf127539368ed7e707f4d5fe01797951c64f9d50421
 EBUILD munin-1.4.5.ebuild 4276 RMD160 8ffb2a5872118d351c277e509472a0c4c677566f SHA1 ae523154b0284f948c9de02e72e8d4a085aaa0e8 SHA256 b43146bf44c3288ee10b67b9bf2e2012fd67ac97fb8c077368b1e21ad65271ae
-MISC ChangeLog 9024 RMD160 fff54f802dea7c2351212dbf7da5f8dd76e2e41e SHA1 bda3411572052f5bac4a73711b9bf096c517d40a SHA256 64e8ddf554a1879128b658d3929f3d74518415fd71c47121afb37aa4fd3e2feb
-MISC metadata.xml 988 RMD160 646117caea61c4ff8ca69049e007bbabdbc9470d SHA1 2269fd6852a97ca6bd00c1f6d6410d574ffd6dfd SHA256 010cc66c6c4d8d5f7e1e85be7dda996a43acb5616d4f067da595d7042d1d968f
+MISC ChangeLog 9374 RMD160 e24cb74141c2ceb7a904eb0d2f2cb5811a401317 SHA1 de193075128dac2b98e6d31ab2f45bcb3a4da721 SHA256 91dca84a660f323fb11d19e0f19f43a8caacf04ec786e70e63c762b4b5898752
+MISC metadata.xml 1059 RMD160 6742332701cfc8cc749b07a5e1aa691c0d25a206 SHA1 7d3c7c25085c83c3948c8b1a4c1c9eddc7460884 SHA256 1133fa77ad1d63df183790f76cfe19d5b4248b964ee07cc4e50a4bd11faa2c69
diff --git a/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r2 b/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r2
new file mode 100644
index 000000000000..648c8353a869
--- /dev/null
+++ b/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r2
@@ -0,0 +1,10 @@
+# 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.5-r2,v 1.1 2011/03/16 06:29:51 robbat2 Exp $
+
+# Set to the nice level for daemon
+NICE_LEVEL=1
+PIDFILE=$(/usr/bin/awk '/^pid_file/{s=$2}END{print s}' /etc/munin/munin-node.conf)
+echo munin pid $PIDFILE
+
+# vim: filetype=gentoo-conf-d:
diff --git a/net-analyzer/munin/files/munin-node_init.d_1.4.5-r2 b/net-analyzer/munin/files/munin-node_init.d_1.4.5-r2
new file mode 100644
index 000000000000..359470171fbf
--- /dev/null
+++ b/net-analyzer/munin/files/munin-node_init.d_1.4.5-r2
@@ -0,0 +1,27 @@
+#!/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.5-r2,v 1.1 2011/03/16 06:29:51 robbat2 Exp $
+
+[ -z "${NAME}" ] && NAME="munin-node"
+[ -z "${PIDFILE}" ] && 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/metadata.xml b/net-analyzer/munin/metadata.xml
index 9c4737e1c122..4bb54c28f4e2 100644
--- a/net-analyzer/munin/metadata.xml
+++ b/net-analyzer/munin/metadata.xml
@@ -18,5 +18,6 @@
 	</longdescription>
 	<use>
 		<flag name='irc'>installs deps for monitoring IRC</flag>
+		<flag name='memcached'>installs deps for monitoring memcached</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-analyzer/munin/munin-1.4.5-r2.ebuild b/net-analyzer/munin/munin-1.4.5-r2.ebuild
new file mode 100644
index 000000000000..91b69877beb6
--- /dev/null
+++ b/net-analyzer/munin/munin-1.4.5-r2.ebuild
@@ -0,0 +1,146 @@
+# 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.5-r2.ebuild,v 1.1 2011/03/16 06:29:51 robbat2 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
+
+	# 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-r2 munin-node || die
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.5-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 </var/lib/munin/crontab
+}
+
+pkg_postinst() {
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
+	elog "To have munin's cronjob automatically configured for you if this is"
+	elog "your munin master installation, please:"
+	elog "emerge --config net-analyzer/munin"
+	elog ""
+	elog "Please note that the crontab has undergone some modifications"
+	elog "since 1.3.2, and you should update to it!"
+}