Bug fix release with many fixes from upstream. Also fix Gentoo packaging bugs: 303843, 304379, 304397

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 222 insertions, 2 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index faa0a7f231f2..d9a6c813e918 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2010/02/10 16:38:14 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.35 2010/03/28 05:23:49 darkside Exp $
+
+*munin-1.4.4 (28 Mar 2010)
+
+  28 Mar 2010; Jeremy Olexa <darkside@gentoo.org> +munin-1.4.4.ebuild,
+  +files/munin-1.4.4-Makefile.patch:
+  Bug fix release with many fixes from upstream. Also fix Gentoo packaging
+  bugs: 303843, 304379, 304397
 
   10 Feb 2010; Jeremy Olexa <darkside@gentoo.org> munin-1.4.3.ebuild:
   Fix build with -ssl, bug 303733
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 764aaf862f5a..2878a52b04e5 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -13,12 +13,15 @@ AUX munin-1.4.3-Makefile.patch 2529 RMD160 a263d14838a3713253c91b640632d8a3c5209
 AUX munin-1.4.3-fw_conntrack_plugins.patch 724 RMD160 f2c000e844db9f634643c9cb9dad64577b378ad6 SHA1 4f5751f75eb2880edb3ffdc69d2e46d74d29410a SHA256 a5cca0faa8908d0444af074174a6e1d8a2412c721b52514bceeed34dab12d24e
 AUX munin-1.4.3-ping6_fix.patch 773 RMD160 899b6737eb44d0eec252dce816cf0fada9030756 SHA1 c9ef454efc1ef881ab792092c3f51d26700e0779 SHA256 9b2c3fd24fc665cb6f497e948df90864be29d7bd03bfff9dfad13ebee78cf696
 AUX munin-1.4.3-plugin-cleanup.patch 953 RMD160 1ec9cbfb766834a7e2ad4203440558836717bbe2 SHA1 046943a175629aabcfac5cb9a5b02981cca2d9b9 SHA256 6a62657b885c08e69fb30a75fffda4ac8862d91e97b4c787ed52ffdd5f2621b7
+AUX munin-1.4.4-Makefile.patch 2531 RMD160 f0a492267fd1078139a9f80997173cd1d4823e1b SHA1 6ef37d8a5df64be5e6aaa4fb5e526f48069aad0a SHA256 9f19d908b7097267b82b773d8644a775f76d16921e4efaf41e93835e53613bbc
 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
 AUX munin-node_init.d_1.3.3-r1 651 RMD160 80bb9d847eb14425fa5bd6092dfec0328f2f2626 SHA1 77dcab26eaf48e515e2f187b1a5324b507d19eae SHA256 04f1bfa5d97a451bb9aa3bb81caceb269411c55151c78dffeae1b8696fea937d
 DIST munin-1.4.3.tar.gz 1205698 RMD160 1fdc805950085d14fc71dbf5774d0c2eed0cd554 SHA1 b31a1ddd04007f6f3e80cf35cfd997427fc1fafa SHA256 c5f1c8e5e71e9ffd5c74037ec3eec4da362fd2aecea3c788abb7d92b461834d0
+DIST munin-1.4.4.tar.gz 1218498 RMD160 45a84ebc5e58379da7526c5909bb260ef7a4b444 SHA1 b771065081c699ceb34d28b185c42f42d83cec90 SHA256 c3e6589b73d7362fd29b36e41d4dba6439fa08da9d7aec0cd23681f9519754f2
 DIST munin_1.3.4.tar.gz 451802 RMD160 2580fbf6e78236db182976e8f22c555417e5a2a3 SHA1 9ab7beb3589916c42c24046105f3a898e3293758 SHA256 fdd9dcba0b90373a4ba61da8fd65ac0b8365949a32032d514fc0fd541ab84d12
 EBUILD munin-1.3.4-r2.ebuild 4883 RMD160 0e959206720538bf411000a04ff94fd6e81e3313 SHA1 307e4210386a6ecce125ed5c2dfe38ae9b0fd8ea SHA256 f977da19715be2117027e671337fc5af3addb63c74d17277f2117fb990e7b83e
 EBUILD munin-1.4.3.ebuild 4235 RMD160 e3187fe6e1b42fe9c38c02dc12f8598a9f10aff0 SHA1 8e8545aabe39f787b6942fad709228d7fcbc46d5 SHA256 5b626d7caed5a38b533d99bfbf5989fa237f59aa68525c86336b7f4e2ac8b4e0
-MISC ChangeLog 6566 RMD160 2dd394656aaac208512f59d43175969d7897ba77 SHA1 3dd90375eb5e459a70151d96964b54f6ba8b9407 SHA256 b2382aaca41e2768b76efb53cf0f3c2fed7f811c5586a7baa93015ff6e58ad78
+EBUILD munin-1.4.4.ebuild 4259 RMD160 0c4d0d8cd3117cf5f8539ffbd52e5958743d87e2 SHA1 9e8f5b4de0fa69c7eef548a07027718271ad70ab SHA256 9d674310a147db01741a32702ffb529a3ff009404b13603088ee4b7a361f2d0b
+MISC ChangeLog 6809 RMD160 c451d8b9f1491c8fe8c8a138534ffb76ee7774d9 SHA1 19cbfd780fb4afb1cd381b69b21fe3b028bee596 SHA256 0e259bc59c72b799b4e39fc295053a0cef3d38047b3478cf5dbc0140988231f8
 MISC metadata.xml 988 RMD160 646117caea61c4ff8ca69049e007bbabdbc9470d SHA1 2269fd6852a97ca6bd00c1f6d6410d574ffd6dfd SHA256 010cc66c6c4d8d5f7e1e85be7dda996a43acb5616d4f067da595d7042d1d968f
diff --git a/net-analyzer/munin/files/munin-1.4.4-Makefile.patch b/net-analyzer/munin/files/munin-1.4.4-Makefile.patch
new file mode 100644
index 000000000000..b95efbaac6a0
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.4.4-Makefile.patch
@@ -0,0 +1,75 @@
+--- munin-1.4.3/Makefile.config.org	2009-12-30 13:55:56.000000000 +0100
++++ munin-1.4.3/Makefile.config	2010-01-18 19:34:37.000000000 +0100
+@@ -17,10 +17,10 @@
+ #
+ # the base of the Munin installation.
+ # 
+-PREFIX     = $(DESTDIR)/opt/munin
++PREFIX     = $(DESTDIR)/usr
+ 
+ # Where Munin keeps its configurations (server.conf, client.conf, ++)
+-CONFDIR    = $(DESTDIR)/etc/opt/munin
++CONFDIR    = $(DESTDIR)/etc/munin
+ 
+ # Server only - where to put munin-cron
+ BINDIR     = $(PREFIX)/bin
+@@ -29,37 +29,37 @@
+ SBINDIR    = $(PREFIX)/sbin
+ 
+ # Where to put text and html documentation
+-DOCDIR     = $(PREFIX)/doc
++DOCDIR     = $(PREFIX)/share/doc/munin-$(VERSION)
+ 
+ # Where to put man pages
+-MANDIR     = $(PREFIX)/man
++MANDIR     = $(PREFIX)/share/man
+ 
+ # Where to put internal binaries and plugin repository
+-LIBDIR     = $(PREFIX)/lib
++LIBDIR     = $(PREFIX)/libexec/munin
+ 
+ # Server only - Output directory
+-HTMLDIR    = $(PREFIX)/www/docs
+-CGIDIR     = $(PREFIX)/www/cgi
++HTMLDIR    = $(DESTDIR)/var/www/localhost/htdocs/munin
++CGIDIR     = $(DESTDIR)/var/www/localhost/cgi-bin
+ 
+ # Server only - spool directory for data gathered from nodes by
+ # munin-gather - experimental.  Place on ramdisk to make munin
+ # scale better.  On many versions of Linux as well as on Solaris
+ # /tmp will be a ramdisk.
+ 
+-SSPOOLDIR  = $(PREFIX)/spool
++SSPOOLDIR  = $(DESTDIR)/var/run/munin/spool
+ 
+ # Suggested directory name for a pulic ramdisk based tmp directory.
+ # SSPOOLDIR := /tmp/muninspool
+ 
+ # Client only - Where to put RRD files and other intenal data
+-DBDIR      = $(DESTDIR)/var/opt/munin
++DBDIR      = $(DESTDIR)/var/lib/munin
+ 
+ # Client only - Where plugins should put their states. Must be writable by
+ # group "munin", and should be preserved between reboots
+ PLUGSTATE  = $(DBDIR)/plugin-state
+ 
+ # Where Munin should place its logs.
+-LOGDIR     = $(PREFIX)/log/munin
++LOGDIR     = $(DESTDIR)/var/log/munin
+ 
+ # Location of PID files and other statefiles. On the server, must be
+ # writable by the user "munin".
+@@ -98,11 +98,11 @@
+ BASH       := /bin/bash
+ 
+ # Server only - Where to install the perl libraries
+-PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
++PERLSITELIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2)
+ PERLLIB    = $(DESTDIR)$(PERLSITELIB)
+ 
+ # Client only - Install plugins for this architecture
+-OSTYPE     := $(shell uname | tr '[A-Z]' '[a-z]')
++OSTYPE     := $(shell uname | LANG=C tr '[A-Z]' '[a-z]')
+ 
+ # How to figure out the hostname. (Only used in default configuration
+ # files)
diff --git a/net-analyzer/munin/munin-1.4.4.ebuild b/net-analyzer/munin/munin-1.4.4.ebuild
new file mode 100644
index 000000000000..ef76e9531051
--- /dev/null
+++ b/net-analyzer/munin/munin-1.4.4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.4.ebuild,v 1.1 2010/03/28 05:23:49 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 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 virtual/postgresql-base )
+			dev-perl/DateManip
+			dev-perl/Log-Log4perl
+			dev-perl/Net-CIDR
+			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[perl] )"
+			# 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}"/${P}-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
+}
+
+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}
+
+	emake -j 1 DESTDIR="${D}" install || die "install failed"
+	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.3.3-r1 munin-node || die
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.3.3-r1 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!"
+}