Bugfixes: #171174, #176309, #176485.

Package-Manager: portage-2.1.2.7

6 files changed, 184 insertions, 15 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index be49a7fe2e25..70005d9e7ea7 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.7 2007/03/13 18:40:16 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.8 2007/05/13 06:07:48 robbat2 Exp $
+
+*munin-1.3.3-r1 (13 May 2007)
+
+  13 May 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +files/munin-node_conf.d_1.3.3-r1, +files/munin-node_init.d_1.3.3-r1,
+  +munin-1.3.3-r1.ebuild:
+  Bugfixes: #171174, #176309, #176485.
 
   13 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> munin-1.3.3.ebuild:
   Keyworded ~sparc wrt #169941
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 0e456ac316e1..d0ee3db774f7 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX munin-1.3.2-Makefile.patch 10340 RMD160 b6be2b774137b17c8218b3dfe86b5dcfe22bac92 SHA1 b8ef6cf0c36a6dbd34359d3645d53b9396cc821b SHA256 698a005d37380194b5d8bed7e554387ec82c58cea6fb0a53bfb5795da778b98a
 MD5 139f371f6734932eda365fb52b5e4454 files/munin-1.3.2-Makefile.patch 10340
 RMD160 b6be2b774137b17c8218b3dfe86b5dcfe22bac92 files/munin-1.3.2-Makefile.patch 10340
@@ -37,6 +34,14 @@ AUX munin-init.d 581 RMD160 366649a8ac7ec0b2ce4c48913a7cecb65ca69ea6 SHA1 60c0cc
 MD5 3ce7d105caf0f5cc37517cc28ffd12ee files/munin-init.d 581
 RMD160 366649a8ac7ec0b2ce4c48913a7cecb65ca69ea6 files/munin-init.d 581
 SHA256 a4332d7ac415e4cfda94189947e0c1bdd87d1029845bbea91799ee7e1a8ebb1f files/munin-init.d 581
+AUX munin-node_conf.d_1.3.3-r1 315 RMD160 e33754bafcfb7b9a737ff282157e2201a9a5bbdd SHA1 fc247c9c369543e00faf28e8ce166814a1079e36 SHA256 4a895da9eba3e7ab4b3ce48c6dc9e29297a32ef5ec33be73581867afc4c5e961
+MD5 7bdb4bf54ab9654e157f34804fa37a3a files/munin-node_conf.d_1.3.3-r1 315
+RMD160 e33754bafcfb7b9a737ff282157e2201a9a5bbdd files/munin-node_conf.d_1.3.3-r1 315
+SHA256 4a895da9eba3e7ab4b3ce48c6dc9e29297a32ef5ec33be73581867afc4c5e961 files/munin-node_conf.d_1.3.3-r1 315
+AUX munin-node_init.d_1.3.3-r1 651 RMD160 80bb9d847eb14425fa5bd6092dfec0328f2f2626 SHA1 77dcab26eaf48e515e2f187b1a5324b507d19eae SHA256 04f1bfa5d97a451bb9aa3bb81caceb269411c55151c78dffeae1b8696fea937d
+MD5 1ee624b45d9763f510b9a955bb37eb71 files/munin-node_init.d_1.3.3-r1 651
+RMD160 80bb9d847eb14425fa5bd6092dfec0328f2f2626 files/munin-node_init.d_1.3.3-r1 651
+SHA256 04f1bfa5d97a451bb9aa3bb81caceb269411c55151c78dffeae1b8696fea937d files/munin-node_init.d_1.3.3-r1 651
 DIST munin_1.3.2.tar.gz 309319 RMD160 7bcc16d00ad28731041015ef240144ed0c4fdeb4 SHA1 575c1dc3373e2e001accd1920fd815d9b875c95a SHA256 964887d3af5b5b1fadbabb4c887095820613ea06c768251d6a9c37fa35efcc40
 DIST munin_1.3.3.tar.gz 386976 RMD160 6fbae6ddd237332c6d28d3827a4b163259d054ea SHA1 0cd9e8e81231782d63d4ed2e52cdf85bea0d07c0 SHA256 8f9bec688084cb37b573a70ecf3617d0ce7389f42f22c48b3fa4c53a68a9d7f8
 EBUILD munin-1.3.2-r1.ebuild 3568 RMD160 f8897fcb77b264d6ffc5d9e6eeda3cdae93265e1 SHA1 60a2b5ece16633028d193cf338e7599445c70d7b SHA256 f99176d16d99c53dde24c30280e280e069eb188194fdf3a038ae33ea74068d41
@@ -55,14 +60,18 @@ EBUILD munin-1.3.2.ebuild 3485 RMD160 94f2957fcde45418cbf2d7f88b7cc27fadddce38 S
 MD5 ae39f2774e7bf379307670cb0a4f6e67 munin-1.3.2.ebuild 3485
 RMD160 94f2957fcde45418cbf2d7f88b7cc27fadddce38 munin-1.3.2.ebuild 3485
 SHA256 a4fd76456f2bda0cc8e60f1eb045a42e6edf557c0d963b6b672f599374868b1e munin-1.3.2.ebuild 3485
+EBUILD munin-1.3.3-r1.ebuild 3895 RMD160 f8545fc8ccddc921273a008a7c50ed63cedfc88f SHA1 f2408a3b7d5c35aca2ba9eb43b26fed5a7de9770 SHA256 7bab6cd197015b9817f96d2d0141fbb0ea99cb06ab6481d15f7e74bc2ea15274
+MD5 6d8a1efdaef942e18c5612e9eb9f2c80 munin-1.3.3-r1.ebuild 3895
+RMD160 f8545fc8ccddc921273a008a7c50ed63cedfc88f munin-1.3.3-r1.ebuild 3895
+SHA256 7bab6cd197015b9817f96d2d0141fbb0ea99cb06ab6481d15f7e74bc2ea15274 munin-1.3.3-r1.ebuild 3895
 EBUILD munin-1.3.3.ebuild 3846 RMD160 bfd52a9fa44d7b82ed513feb2126ae09df74b081 SHA1 825165d5ce5604046832205a668baf17936de9a4 SHA256 dc3447ea882f8423f77764659824ef58e73eea6676532d93540e793dcbe7f304
 MD5 df52a6c88506cb4e7093d7f3bcf531d2 munin-1.3.3.ebuild 3846
 RMD160 bfd52a9fa44d7b82ed513feb2126ae09df74b081 munin-1.3.3.ebuild 3846
 SHA256 dc3447ea882f8423f77764659824ef58e73eea6676532d93540e793dcbe7f304 munin-1.3.3.ebuild 3846
-MISC ChangeLog 1727 RMD160 c18d49055fc255cccfbcefc9fc8135b39e2e0381 SHA1 24d815f07c82879c6480cec9c27d53bd0eb6819f SHA256 5b8b14305c810ed1205bc520447ba8f6284ff2a14d17cb8e3f9e555db6197533
-MD5 62fec9a51272b4f1c8f7e28f2ff86252 ChangeLog 1727
-RMD160 c18d49055fc255cccfbcefc9fc8135b39e2e0381 ChangeLog 1727
-SHA256 5b8b14305c810ed1205bc520447ba8f6284ff2a14d17cb8e3f9e555db6197533 ChangeLog 1727
+MISC ChangeLog 1948 RMD160 676176ded61b42dae510ad5da4d4fb7baad232f4 SHA1 4e0f5cd767cce32b31a35a7b2f17f31b57afc330 SHA256 207f6957e672519d1c81e696e27f8c2900cdbc501a5bfef14e5e6529076b46c7
+MD5 9bd343a92b65a35ebd1ae35da38378bf ChangeLog 1948
+RMD160 676176ded61b42dae510ad5da4d4fb7baad232f4 ChangeLog 1948
+SHA256 207f6957e672519d1c81e696e27f8c2900cdbc501a5bfef14e5e6529076b46c7 ChangeLog 1948
 MISC metadata.xml 914 RMD160 0076c2be4c5a72a26639eb531925b4585d905060 SHA1 3b92ce6a0b1aefa369262ca69b485c280dac068b SHA256 16e3a247509483b481b8c8a038bd13f872ad48b91aade8795158a9c304749ff7
 MD5 9299a4cbbf52bdd70903df755a77f0cd metadata.xml 914
 RMD160 0076c2be4c5a72a26639eb531925b4585d905060 metadata.xml 914
@@ -82,10 +91,6 @@ SHA256 c8f9315ca064bb4486acd4b20b0b0dc914ecae94dd4db7739bee529017d30701 files/di
 MD5 3c467ec04f3153b713bd8c408a072f38 files/digest-munin-1.3.3 235
 RMD160 4e890099a15fb155b20b23f8730a0d606c11d3b0 files/digest-munin-1.3.3 235
 SHA256 630b2ccf3b4ea311439be411b4dff4edc3ff338e70e6a997d47ce69f31af0072 files/digest-munin-1.3.3 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFF9vAYKRy60XGEcJIRAk9dAJ45ofebv7WCleIurV3nT2sypE84WQCfYHwq
-EA83XoQDjm8vI7Om+ORTNFE=
-=NhUr
------END PGP SIGNATURE-----
+MD5 3c467ec04f3153b713bd8c408a072f38 files/digest-munin-1.3.3-r1 235
+RMD160 4e890099a15fb155b20b23f8730a0d606c11d3b0 files/digest-munin-1.3.3-r1 235
+SHA256 630b2ccf3b4ea311439be411b4dff4edc3ff338e70e6a997d47ce69f31af0072 files/digest-munin-1.3.3-r1 235
diff --git a/net-analyzer/munin/files/digest-munin-1.3.3-r1 b/net-analyzer/munin/files/digest-munin-1.3.3-r1
new file mode 100644
index 000000000000..505377a42102
--- /dev/null
+++ b/net-analyzer/munin/files/digest-munin-1.3.3-r1
@@ -0,0 +1,3 @@
+MD5 1e0f72f2092764b72d453f3faf298689 munin_1.3.3.tar.gz 386976
+RMD160 6fbae6ddd237332c6d28d3827a4b163259d054ea munin_1.3.3.tar.gz 386976
+SHA256 8f9bec688084cb37b573a70ecf3617d0ce7389f42f22c48b3fa4c53a68a9d7f8 munin_1.3.3.tar.gz 386976
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
new file mode 100644
index 000000000000..5fcbc9772fd7
--- /dev/null
+++ b/net-analyzer/munin/files/munin-node_conf.d_1.3.3-r1
@@ -0,0 +1,8 @@
+# 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_init.d_1.3.3-r1 b/net-analyzer/munin/files/munin-node_init.d_1.3.3-r1
new file mode 100644
index 000000000000..1d4904867b27
--- /dev/null
+++ b/net-analyzer/munin/files/munin-node_init.d_1.3.3-r1
@@ -0,0 +1,27 @@
+#!/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/munin-1.3.3-r1.ebuild b/net-analyzer/munin/munin-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..67c950bdfa19
--- /dev/null
+++ b/net-analyzer/munin/munin-1.3.3-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.3-r1.ebuild,v 1.1 2007/05/13 06:07:48 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin.sourceforge.net"
+SRC_URI="mirror://sourceforge/munin/${PN}_${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc minimal munin-irc munin-dhcp munin-surfboard munin-apache munin-squid ssl"
+
+# Upstream's listing of required modules is NOT correct!
+DEPEND_COM="dev-lang/perl
+			dev-perl/net-server
+			sys-process/procps
+			ssl? ( dev-perl/Net-SSLeay )
+			dev-perl/Net-SNMP
+			dev-perl/DateManip
+			virtual/perl-Time-HiRes
+			virtual/perl-Digest-MD5
+			virtual/perl-Getopt-Long
+			virtual/perl-Storable
+			virtual/perl-Text-Balanced
+			!minimal? ( dev-perl/HTML-Template
+						net-analyzer/rrdtool )
+			munin-irc? ( dev-perl/Net-IRC )
+			munin-dhcp? ( dev-perl/Net-Netmask dev-perl/libwww-perl )
+			munin-surfboard? ( dev-perl/libwww-perl )
+			munin-apache? ( dev-perl/libwww-perl )
+			munin-squid? ( virtual/perl-MIME-Base64 )"
+			# 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}"
+RDEPEND="${DEPEND_COM}
+		!minimal? ( virtual/cron )"
+
+pkg_setup() {
+	enewgroup munin
+	enewuser munin 177 -1 /var/lib/munin munin
+}
+
+src_unpack() {
+	if use !minimal; then
+		if ! built_with_use net-analyzer/rrdtool perl ; then
+			die 'Sorry, munin needs net-analyzer/rrdtool built with USE=perl.'
+		fi
+	fi
+	unpack ${A}
+	# upstream needs a lot of DESTDIR loving
+	# and Gentoo location support
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.3-Makefile.patch
+	# Fix noise in the plugins
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.2-plugin-cleanup.patch
+}
+
+src_compile() {
+	emake build build-man || die "build/build-man failed"
+	if use doc; then
+		emake 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/server/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} /etc/munin/plugin-conf.d/"
+	dirs="${dirs} /etc/munin/plugins/"
+	keepdir ${dirs}
+
+	emake DESTDIR="${D}" install-main install-man install-node install-node-plugins || die "install failed"
+	fowners munin:munin ${dirs}
+
+	emake DESTDIR="${D}" install-man || die "install manpages failed"
+
+	insinto /etc/munin/plugin-conf.d/
+	newins ${FILESDIR}/${PN}-1.3.2-plugins.conf munin-node
+
+	# make sure we've got everything in the correct directory
+	insinto /var/lib/munin
+	newins ${FILESDIR}/${P}-crontab crontab
+	newinitd ${FILESDIR}/munin-node_init.d_1.3.3-r1 munin-node
+	newconfd ${FILESDIR}/munin-node_conf.d_1.3.3-r1 munin-node
+	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache*
+}
+
+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
+	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!"
+}