[gentoo-commits] gentoo-x86 commit in net-analyzer/munin: munin-1.4.3.ebuild ChangeLog metadata.xml munin-1.3.3.ebuild munin-1.3.3-r1.ebuild munin-1.3.3-r2.ebuild munin-1.3.4-r1.ebuild munin-1.3.4.ebuild

[Jeremy Olexa (darkside)]

darkside    10/02/03 15:17:54

  Modified:             ChangeLog metadata.xml
  Added:                munin-1.4.3.ebuild
  Removed:              munin-1.3.3.ebuild munin-1.3.3-r1.ebuild
                        munin-1.3.3-r2.ebuild munin-1.3.4-r1.ebuild
                        munin-1.3.4.ebuild
  Log:
  Version bump to 1.4.3, many thanks to all the contributors on bug 300171. Include ping6 fix from bug 294722. Include QA fix for perl site-dir, bug 298528. Remove old versions and unused patches
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.32                 net-analyzer/munin/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/ChangeLog?r1=1.31&r2=1.32

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog	11 Jan 2010 07:41:55 -0000	1.31
+++ ChangeLog	3 Feb 2010 15:17:53 -0000	1.32
@@ -1,6 +1,22 @@
 # 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.31 2010/01/11 07:41:55 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.32 2010/02/03 15:17:53 darkside Exp $
+
+*munin-1.4.3 (03 Feb 2010)
+
+  03 Feb 2010; Jeremy Olexa <darkside@g.o>
+  -files/munin-1.3.2-plugin-cleanup.patch,
+  -files/munin-1.3.2-rrdtool-comments.patch, -munin-1.3.3.ebuild,
+  -munin-1.3.3-r1.ebuild, -munin-1.3.3-r2.ebuild,
+  -files/munin-1.3.3-Makefile.patch, -munin-1.3.4.ebuild,
+  -munin-1.3.4-r1.ebuild, +munin-1.4.3.ebuild,
+  +files/munin-1.4.3-Makefile.patch,
+  +files/munin-1.4.3-fw_conntrack_plugins.patch,
+  +files/munin-1.4.3-ping6_fix.patch,
+  +files/munin-1.4.3-plugin-cleanup.patch, metadata.xml:
+  Version bump to 1.4.3, many thanks to all the contributors on bug 300171.
+  Include ping6 fix from bug 294722. Include QA fix for perl site-dir, bug
+  298528. Remove old versions and unused patches
 
   11 Jan 2010; Benedikt Böhm <hollow@g.o> munin-1.3.4-r2.ebuild:
   add Net-CIDR dependency wrt #287718



1.3                  net-analyzer/munin/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	4 Aug 2008 19:34:32 -0000	1.2
+++ metadata.xml	3 Feb 2010 15:17:53 -0000	1.3
@@ -18,10 +18,5 @@
 	</longdescription>
 	<use>
 		<flag name='irc'>installs deps for monitoring IRC</flag>
-		<flag name='munin-apache'>installs deps for monitoring apache</flag>
-		<flag name='munin-dhcp'>installs deps for monitoring DHCP</flag>
-		<flag name='munin-irc'>installs deps for monitoring IRC</flag>
-		<flag name='munin-squid'>installs deps for monitoring squid</flag>
-		<flag name='munin-surfboard'>installs deps for monitoring a Motoro Surfboard Cable modem</flag>
 	</use>
 </pkgmetadata>



1.1                  net-analyzer/munin/munin-1.4.3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/munin-1.4.3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/munin-1.4.3.ebuild?rev=1.1&content-type=text/plain

Index: munin-1.4.3.ebuild
===================================================================
# 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.3.ebuild,v 1.1 2010/02/03 15:17:53 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 ~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 virtual/postgresql-base )
			irc? ( dev-perl/Net-IRC )
			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}"
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.3-Makefile.patch
	# Fix noise in the plugins
	epatch "${FILESDIR}"/${PN}-1.4.3-plugin-cleanup.patch

	# Bug #195964, fix up conntrack
	# Patch modified as it has only been partially taken up by upstream
	epatch "${FILESDIR}"/${PN}-1.4.3-fw_conntrack_plugins.patch

	epatch "${FILESDIR}"/${P}-ping6_fix.patch
}

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/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} /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!"
}