* [gentoo-commits] gentoo-x86 commit in net-analyzer/munin: munin-2.0.2-r1.ebuild ChangeLog munin-2.0.2.ebuild
@ 2012-07-21 15:14 Diego Petteno (flameeyes)
0 siblings, 0 replies; only message in thread
From: Diego Petteno (flameeyes) @ 2012-07-21 15:14 UTC (permalink / raw
To: gentoo-commits
flameeyes 12/07/21 15:14:27
Modified: ChangeLog
Added: munin-2.0.2-r1.ebuild
Removed: munin-2.0.2.ebuild
Log:
Support fcron as well as vixie-cron and dcron (with a separate crontab); crontabs are created in the ebuild instead of using files to avoid wasting space on sync; use -j1 for make as well as install until parallel build is cleaned consistently; add a patch to not display cgroup_root in the df plugin output; backport a fix for the non-cgi munin-graph building; stop pkg_config if minimal USE flag is enabled. Drop ppc keyword for missing dependencies.
(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)
Revision Changes Path
1.77 net-analyzer/munin/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?r1=1.76&r2=1.77
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ChangeLog 20 Jul 2012 18:10:54 -0000 1.76
+++ ChangeLog 21 Jul 2012 15:14:27 -0000 1.77
@@ -1,6 +1,17 @@
# ChangeLog for net-analyzer/munin
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.76 2012/07/20 18:10:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.77 2012/07/21 15:14:27 flameeyes Exp $
+
+*munin-2.0.2-r1 (21 Jul 2012)
+
+ 21 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +munin-2.0.2-r1.ebuild,
+ -munin-2.0.2.ebuild:
+ Support fcron as well as vixie-cron and dcron (with a separate crontab);
+ crontabs are created in the ebuild instead of using files to avoid wasting
+ space on sync; use -j1 for make as well as install until parallel build is
+ cleaned consistently; add a patch to not display cgroup_root in the df plugin
+ output; backport a fix for the non-cgi munin-graph building; stop pkg_config
+ if minimal USE flag is enabled. Drop ppc keyword for missing dependencies.
20 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> munin-2.0.2.ebuild:
Log-Log4perl is used by the node, so depend on it even with USE=-minimal; only
1.1 net-analyzer/munin/munin-2.0.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: munin-2.0.2-r1.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2-r1.ebuild,v 1.1 2012/07/21 15:14:27 flameeyes Exp $
EAPI=4
PATCHSET=9
inherit eutils user versionator java-pkg-opt-2
MY_P=${P/_/-}
DESCRIPTION="Munin Server Monitoring Tool"
HOMEPAGE="http://munin-monitoring.org/"
SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~mips ~x86"
IUSE="asterisk irc java memcached minimal mysql postgres ssl test +cgi"
REQUIRED_USE="cgi? ( !minimal )"
# Upstream's listing of required modules is NOT correct!
# Some of the postgres plugins use DBD::Pg, while others call psql directly.
# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
DEPEND_COM="dev-lang/perl
sys-process/procps
asterisk? ( dev-perl/Net-Telnet )
irc? ( dev-perl/Net-IRC )
mysql? ( virtual/mysql
dev-perl/Cache-Cache
dev-perl/DBD-mysql )
ssl? ( dev-perl/Net-SSLeay )
postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
memcached? ( dev-perl/Cache-Memcached )
cgi? ( dev-perl/FCGI )
dev-perl/DBI
dev-perl/DateManip
dev-perl/File-Copy-Recursive
dev-perl/IO-Socket-INET6
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-1.3[perl] )"
# Keep this seperate, as previous versions have had other deps here
DEPEND="${DEPEND_COM}
virtual/perl-Module-Build
java? ( >=virtual/jdk-1.5 )
test? (
dev-perl/Test-LongString
dev-perl/Test-Differences
dev-perl/Test-MockModule
dev-perl/File-Slurp
dev-perl/IO-stringy
)"
RDEPEND="${DEPEND_COM}
java? ( >=virtual/jre-1.5 )
!minimal? (
virtual/cron
media-fonts/dejavu
)"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
enewgroup munin
enewuser munin 177 -1 /var/lib/munin munin
java-pkg-opt-2_pkg_setup
}
src_prepare() {
epatch "${WORKDIR}"/patches/*.patch
java-pkg-opt-2_src_prepare
}
src_configure() {
local cgidir='$(DESTDIR)/var/www/localhost/cgi-bin'
use cgi || cgidir="${T}/useless/cgi-bin"
cat - >> "${S}"/Makefile.config <<EOF
PREFIX=\$(DESTDIR)/usr
CONFDIR=\$(DESTDIR)/etc/munin
DOCDIR=${T}/useless/doc
MANDIR=\$(PREFIX)/share/man
LIBDIR=\$(PREFIX)/libexec/munin
HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
CGIDIR=${cgidir}
DBDIR=\$(DESTDIR)/var/lib/munin
LOGDIR=\$(DESTDIR)/var/log/munin
PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
JCVALID=$(usex java yes no)
EOF
}
# parallel make and install need to be fixed before, and I haven't
# gotten around to do so yet.
src_compile() {
emake -j1
}
src_install() {
local dirs
dirs="/var/log/munin/ /var/lib/munin/"
dirs="${dirs} /var/lib/munin/plugin-state/"
dirs="${dirs} /etc/munin/plugin-conf.d/"
dirs="${dirs} /etc/munin/munin-conf.d/"
dirs="${dirs} /etc/munin/plugins/"
keepdir ${dirs}
local install_targets="install-common-prime install-node-prime install-plugins-prime"
use java && install_targets+=" install-plugins-java"
use minimal || install_targets=install
# parallel install doesn't work and it's also pointless to have this
# run in parallel for now (because it uses internal loops).
emake -j1 DESTDIR="${D}" ${install_targets}
fowners munin:munin ${dirs}
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
newinitd "${FILESDIR}"/munin-node_init.d_2.0.2 munin-node
newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
dodoc README ChangeLog INSTALL build/resources/apache*
# bug 254968
insinto /etc/logrotate.d/
newins "${FILESDIR}"/logrotate.d-munin munin
if ! use minimal; then
exeinto /etc/local.d/
newexe "${FILESDIR}"/localstart-munin 50munin.start
# remove font files so that we don't have to keep them around
rm "${D}"/usr/libexec/${PN}/*.ttf || die
dodir /usr/share/${PN}
cat - >> "${D}"/usr/share/${PN}/crontab <<EOF
# Force the shell to bash
SHELL=/bin/bash
# Mail reports to root@, not munin@
MAILTO=root
# This runs the munin task every 5 minutes.
*/5 * * * * [ -x /usr/bin/munin-cron ] && /usr/bin/munin-cron
# Alternatively, this route works differently
# Update once a minute (for busy sites)
#*/1 * * * * [ -x /usr/libexec/munin/munin-update ] && /usr/libexec/munin/munin-update
## Check for limit excess every 2 minutes
#*/2 * * * * [ -x /usr/libexec/munin/munin-limits ] && /usr/libexec/munin/munin-limits
## Update graphs every 5 minutes
#*/5 * * * * [ -x /usr/libexec/munin/munin-graph ] && nice /usr/libexec/munin/munin-graph --cron
## Update HTML pages every 15 minutes
#*/15 * * * * [ -x /usr/libexec/munin/munin-html ] && nice /usr/libexec/munin/munin-html
EOF
cat - >> "${D}"/usr/share/${PN}/fcrontab <<EOF
# Mail reports to root@, not munin@, only execute one at a time
!mailto(root),serial(true)
# This runs the munin task every 5 minutes.
@ 5 [ -x /usr/bin/munin-cron ] && /usr/bin/munin-cron
# Alternatively, this route works differently
# Update once a minute (for busy sites)
#@ 1 [ -x /usr/libexec/munin/munin-update ] && /usr/libexec/munin/munin-update
## Check for limit excess every 2 minutes
#@ 2 [ -x /usr/libexec/munin/munin-limits ] && /usr/libexec/munin/munin-limits
## Update graphs every 5 minutes
#@ 5 [ -x /usr/libexec/munin/munin-graph ] && nice /usr/libexec/munin/munin-graph --cron
## Update HTML pages every 15 minutes
#@ 15 [ -x /usr/libexec/munin/munin-html ] && nice /usr/libexec/munin/munin-html
EOF
fi
}
pkg_config() {
if use minimal; then
einfo "Nothing to do."
return 0
fi
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
if has_version sys-process/fcron; then
fcrontab - -u munin < /usr/share/${PN}/fcrontab
else
# dcron is very fussy about syntax
# the following is the only form that works in BOTH dcron and vixie-cron
crontab - -u munin < /usr/share/${PN}/crontab
fi
}
pkg_postinst() {
elog
if ! use minimal; then
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"
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-07-21 20:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-21 15:14 [gentoo-commits] gentoo-x86 commit in net-analyzer/munin: munin-2.0.2-r1.ebuild ChangeLog munin-2.0.2.ebuild Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox