Resolve bug #225671 and also clean up USE flags to better represent the new 1.3.4 version. Commit was missed two days ago, due to my desktop crashing.

Package-Manager: portage-2.1.5.4

4 files changed, 161 insertions, 2 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 1a635a8bcddb..4a7be166b813 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.13 2008/06/01 20:56:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.14 2008/06/12 04:01:55 robbat2 Exp $
+
+*munin-1.3.4-r1 (09 Jun 2008)
+
+  09 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/munin-1.3.4-no-html-if-no-input.patch, +munin-1.3.4-r1.ebuild~,
+  +munin-1.3.4-r1.ebuild:
+  Resolve bug #225671 and also clean up USE flags to better represent the
+  new 1.3.4 version.
 
   01 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> munin-1.3.4.ebuild:
   Bug #205293, dcron is fussy about crontab call syntax.
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 06453ebf998c..0153976bd6f6 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -8,6 +8,7 @@ AUX munin-1.3.3-Makefile.patch 15028 RMD160 f1e06ca3c837bfff9951afe71495d79d2dec
 AUX munin-1.3.3-crontab 994 RMD160 ab7cc5acaeaf478413e1eb6d1dafe561d79448b0 SHA1 7a372182c407be60895a4817f9bb74f3a63fda49 SHA256 a5d9a160fc15d152a9cbdbf817a44c9c3450c60d61eeead647bf167fbe55fb89
 AUX munin-1.3.3-fw_conntrack_plugins.patch 3779 RMD160 b3543e7fb59bdaee59cb665efd575e3ce48cc7aa SHA1 ef7951c42c29d02b4294fce76ece9f1ccfa957b6 SHA256 9e4c998dfeb438796b104c7f873f064a99f9359c32553562517a70c34fabb2d9
 AUX munin-1.3.4-Makefile.patch 2328 RMD160 f3cf47a71f09bd4096cefe0523e78f952b6e7b49 SHA1 2f7aba31f7a5dadbf619e731d0023fec9bee1330 SHA256 f1db53e97bb7fb948691614888943dc3b833e656f8035f5d9d6c70537b2e23c2
+AUX munin-1.3.4-no-html-if-no-input.patch 690 RMD160 ad8f1988f97bbb67be30ce47e843e4a158bd9947 SHA1 9f92ea6bb06d7ea0ef6734c1f5acf9e117e7591c SHA256 057d6c0a914993d28151ce2788e1ed6921d1e491bb672eaeb8f4f297d4f1338a
 AUX munin-1.3.4-plugin-cleanup.patch 947 RMD160 bf3d2e97ac3a651b6b86e8a170d735e64815f26a SHA1 1c657a132a1cd8d94ebb1fb5db99544367cdca9c SHA256 6cd472a4886a04d7c89e5006f223c6b24fd6e91c9263e13663db9157aefd8d0a
 AUX munin-init.d 581 RMD160 366649a8ac7ec0b2ce4c48913a7cecb65ca69ea6 SHA1 60c0cccd84678692911b43f7f5800fff115b42ab SHA256 a4332d7ac415e4cfda94189947e0c1bdd87d1029845bbea91799ee7e1a8ebb1f
 AUX munin-node_conf.d_1.3.3-r1 315 RMD160 e33754bafcfb7b9a737ff282157e2201a9a5bbdd SHA1 fc247c9c369543e00faf28e8ce166814a1079e36 SHA256 4a895da9eba3e7ab4b3ce48c6dc9e29297a32ef5ec33be73581867afc4c5e961
@@ -22,6 +23,7 @@ EBUILD munin-1.3.2.ebuild 3485 RMD160 94f2957fcde45418cbf2d7f88b7cc27fadddce38 S
 EBUILD munin-1.3.3-r1.ebuild 3895 RMD160 f8545fc8ccddc921273a008a7c50ed63cedfc88f SHA1 f2408a3b7d5c35aca2ba9eb43b26fed5a7de9770 SHA256 7bab6cd197015b9817f96d2d0141fbb0ea99cb06ab6481d15f7e74bc2ea15274
 EBUILD munin-1.3.3-r2.ebuild 3899 RMD160 9d02e45dcb0c0d491608dd7760b60593522dabe2 SHA1 0b4a6bad14fd9658b30444d2696a730b048fb850 SHA256 7d3179c8ce74c516e5be1b18d722b69970dd80f193545ca96cfb33bc64a09140
 EBUILD munin-1.3.3.ebuild 3848 RMD160 7c28208bb9d72c7c101a2564978a8e66e11678b1 SHA1 b11e5fb9a5eb369594c81e2f286ddf7ca1aaf75b SHA256 4811486d38a10cff59d98e3877d3547ad5f57ee2deff71f426389a082d44db0b
+EBUILD munin-1.3.4-r1.ebuild 4336 RMD160 3bea1d40fed083a52744bb4c11b04e33c5e24a09 SHA1 d918e1b94e84b2f8958a0454fe11337cfae508e5 SHA256 7cb03678759e01b34b5cf18849cb9a1f46d86e76c5c49e9c3ee9daab268e77e9
 EBUILD munin-1.3.4.ebuild 4139 RMD160 b289cacd00d3160876278044539d91c279add827 SHA1 5979f56c7e2ab4a024d2bdf82614d9777eaf5aeb SHA256 b8f3e44985fe3d88c61f1a2bb44f303acc50c13e80790abf1de113c7236f293c
-MISC ChangeLog 2829 RMD160 1b88e15979ba8df991571c37b48a83afb7ca5d5a SHA1 0697be95bc8042caa36cf10259bbffbcb8eb079b SHA256 1ead576c7e79b64ce9e9ecdb0a4e134ba506e11b512c125ef0a1a39e2698b938
+MISC ChangeLog 3108 RMD160 a315a82fb28ab825da645eda0711acd0058c342f SHA1 afd28e07a4b90f79072558d2d6f17019e8ddce51 SHA256 dfbc7af52e0e141cfd049a050ed8f3426af9bb3812528b4e67f8778e35b077e4
 MISC metadata.xml 914 RMD160 0076c2be4c5a72a26639eb531925b4585d905060 SHA1 3b92ce6a0b1aefa369262ca69b485c280dac068b SHA256 16e3a247509483b481b8c8a038bd13f872ad48b91aade8795158a9c304749ff7
diff --git a/net-analyzer/munin/files/munin-1.3.4-no-html-if-no-input.patch b/net-analyzer/munin/files/munin-1.3.4-no-html-if-no-input.patch
new file mode 100644
index 000000000000..c22854f55703
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.3.4-no-html-if-no-input.patch
@@ -0,0 +1,19 @@
+If munin-update has not yet produced any RRD files, then we cannot produce HTML
+output yet.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar munin-1.3.4.orig/server/munin-html.in munin-1.3.4/server/munin-html.in
+--- munin-1.3.4.orig/server/munin-html.in	2008-03-07 17:42:40.000000000 -0800
++++ munin-1.3.4/server/munin-html.in	2008-06-09 14:30:23.000000000 -0700
+@@ -154,6 +154,10 @@
+     $groups = $groups->{"groups"}; # root->groups
+ }
+ 
++if(scalar(keys(%$groups)) == 0) {
++    die "No data available from munin-update yet";
++}
++
+ # Draw main index
+ my $template = HTML::Template->new(filename => "$config->{tmpldir}/munin-overview.tmpl",
+ 				   die_on_bad_params => 0,
diff --git a/net-analyzer/munin/munin-1.3.4-r1.ebuild b/net-analyzer/munin/munin-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..95895cf85d0b
--- /dev/null
+++ b/net-analyzer/munin/munin-1.3.4-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.4-r1.ebuild,v 1.1 2008/06/12 04:01:55 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 ~mips ~ppc ~sparc ~x86"
+IUSE="doc minimal irc 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
+			ssl? ( dev-perl/Net-SSLeay )
+			mysql? ( virtual/mysql )
+			postgres? ( dev-perl/DBD-Pg dev-db/postgresql )
+			irc? ( dev-perl/Net-IRC )
+			dev-perl/DateManip
+			dev-perl/Net-Netmask
+			dev-perl/Net-SNMP
+			dev-perl/libwww-perl
+			dev-perl/net-server
+			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 )"
+			# 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.4-Makefile.patch
+	# Fix noise in the plugins
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.4-plugin-cleanup.patch
+
+	# Bug #195964, fix up conntrack
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.3-fw_conntrack_plugins.patch
+
+	# Bug #225671, cannot produce HTML if RRD and graphs have not yet run.
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-no-html-if-no-input.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}/${PN}-1.3.3-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
+	# 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!"
+}