diff options
| -rw-r--r-- | net-analyzer/munin/ChangeLog | 8 | ||||
| -rw-r--r-- | net-analyzer/munin/files/digest-munin-1.3.2-r3 | 3 | ||||
| -rw-r--r-- | net-analyzer/munin/files/munin-1.3.2-r3-Makefile.patch | 248 | ||||
| -rw-r--r-- | net-analyzer/munin/munin-1.3.2-r3.ebuild | 120 |
4 files changed, 378 insertions, 1 deletions
diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog index e86310c7770e..2c6fdcb9cb94 100644 --- a/net-analyzer/munin/ChangeLog +++ b/net-analyzer/munin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/munin # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.4 2006/10/19 10:29:07 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.5 2006/11/13 10:52:33 robbat2 Exp $ + +*munin-1.3.2-r3 (13 Nov 2006) + + 13 Nov 2006; Robin H. Johnson <robbat2@gentoo.org> + +files/munin-1.3.2-r3-Makefile.patch, +munin-1.3.2-r3.ebuild: + Bug #153878 - correct mandir location. *munin-1.3.2-r2 (19 Oct 2006) diff --git a/net-analyzer/munin/files/digest-munin-1.3.2-r3 b/net-analyzer/munin/files/digest-munin-1.3.2-r3 new file mode 100644 index 000000000000..3bc37b06a1a9 --- /dev/null +++ b/net-analyzer/munin/files/digest-munin-1.3.2-r3 @@ -0,0 +1,3 @@ +MD5 9eef4a53626cee0e088391c5deb8bd51 munin_1.3.2.tar.gz 309319 +RMD160 7bcc16d00ad28731041015ef240144ed0c4fdeb4 munin_1.3.2.tar.gz 309319 +SHA256 964887d3af5b5b1fadbabb4c887095820613ea06c768251d6a9c37fa35efcc40 munin_1.3.2.tar.gz 309319 diff --git a/net-analyzer/munin/files/munin-1.3.2-r3-Makefile.patch b/net-analyzer/munin/files/munin-1.3.2-r3-Makefile.patch new file mode 100644 index 000000000000..cfef6aa0c6ab --- /dev/null +++ b/net-analyzer/munin/files/munin-1.3.2-r3-Makefile.patch @@ -0,0 +1,248 @@ +diff -Nuar --exclude '*~' munin-1.3.2.orig/Makefile munin-1.3.2/Makefile +--- munin-1.3.2.orig/Makefile 2005-04-15 13:37:29.000000000 -0700 ++++ munin-1.3.2/Makefile 2006-07-10 13:03:36.000000000 -0700 +@@ -17,64 +17,65 @@ + + install-main: build + $(CHECKUSER) +- mkdir -p $(CONFDIR)/templates +- mkdir -p $(LIBDIR) +- mkdir -p $(BINDIR) +- mkdir -p $(PERLLIB) +- +- mkdir -p $(LOGDIR) +- mkdir -p $(STATEDIR) +- mkdir -p $(HTMLDIR) +- mkdir -p $(DBDIR) +- mkdir -p $(CGIDIR) ++ mkdir -p $(DESTDIR)$(CONFDIR)/templates ++ mkdir -p $(DESTDIR)$(LIBDIR) ++ mkdir -p $(DESTDIR)$(BINDIR) ++ mkdir -p $(DESTDIR)$(PERLLIB) ++ ++ mkdir -p $(DESTDIR)$(LOGDIR) ++ mkdir -p $(DESTDIR)$(STATEDIR) ++ mkdir -p $(DESTDIR)$(HTMLDIR) ++ mkdir -p $(DESTDIR)$(DBDIR) ++ mkdir -p $(DESTDIR)$(CGIDIR) + +- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) ++ $(CHOWN) $(USER) $(DESTDIR)$(LOGDIR) $(DESTDIR)$(STATEDIR) $(DESTDIR)$(RUNDIR) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(DBDIR) + + for p in build/server/*.tmpl; do \ +- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ ++ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \ + done +- $(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/ +- $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/ +- $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/ ++ $(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/ ++ $(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/ ++ $(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/ + +- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/ ++ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(DESTDIR)$(CONFDIR)/ + +- $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/ ++ $(INSTALL) -m 0755 build/server/munin-cron $(DESTDIR)$(BINDIR)/ + +- $(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/ +- $(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/ +- $(INSTALL) -m 0755 build/server/munin-html $(LIBDIR)/ +- $(INSTALL) -m 0755 build/server/munin-limits $(LIBDIR)/ +- $(INSTALL) -m 0755 build/server/munin-cgi-graph $(CGIDIR)/ ++ $(INSTALL) -m 0755 build/server/munin-update $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/server/munin-graph $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/server/munin-html $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/server/munin-limits $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/server/munin-cgi-graph $(DESTDIR)$(CGIDIR)/ + +- $(INSTALL) -m 0644 build/server/Munin.pm $(PERLLIB)/ ++ $(INSTALL) -m 0644 build/server/Munin.pm $(DESTDIR)$(PERLLIB)/ + + install-node: build install-node-non-snmp install-node-snmp + echo Done. + + install-node-snmp: build +- $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/ ++ mkdir -p $(DESTDIR)$(SBINDIR) ++ $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(DESTDIR)$(SBINDIR)/ + + install-node-non-snmp: build + $(CHECKGROUP) +- mkdir -p $(CONFDIR)/plugins +- mkdir -p $(CONFDIR)/plugin-conf.d +- mkdir -p $(LIBDIR)/plugins +- mkdir -p $(SBINDIR) +- mkdir -p $(PERLLIB)/Munin/Plugin +- +- mkdir -p $(LOGDIR) +- mkdir -p $(STATEDIR) +- mkdir -p $(PLUGSTATE) +- +- $(CHGRP) $(GROUP) $(PLUGSTATE) +- $(CHMOD) 775 $(PLUGSTATE) +- $(CHMOD) 755 $(CONFDIR)/plugin-conf.d +- +- $(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/ +- $(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/ +- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ +- $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/ ++ mkdir -p $(DESTDIR)$(CONFDIR)/plugins ++ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d ++ mkdir -p $(DESTDIR)$(LIBDIR)/plugins ++ mkdir -p $(DESTDIR)$(SBINDIR) ++ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Plugin ++ ++ mkdir -p $(DESTDIR)$(LOGDIR) ++ mkdir -p $(DESTDIR)$(STATEDIR) ++ mkdir -p $(DESTDIR)$(PLUGSTATE) ++ ++ $(CHGRP) $(GROUP) $(DESTDIR)$(PLUGSTATE) ++ $(CHMOD) 775 $(DESTDIR)$(PLUGSTATE) ++ $(CHMOD) 755 $(DESTDIR)$(CONFDIR)/plugin-conf.d ++ ++ $(INSTALL) -m 0755 build/node/munin-node $(DESTDIR)$(SBINDIR)/ ++ $(INSTALL) -m 0755 build/node/munin-node-configure $(DESTDIR)$(SBINDIR)/ ++ test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/ ++ $(INSTALL) -m 0755 build/node/munin-run $(DESTDIR)$(SBINDIR)/ + + install-node-plugins: build + for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do \ +@@ -82,41 +83,41 @@ + family=`sed -n 's/^#%# family=\(.*\)$$/\1/p' $$p`; \ + test "$$family" || family=contrib; \ + if echo $(INSTALL_PLUGINS) | grep $$family >/dev/null; then \ +- test -f "$(LIBDIR)/plugins/`basename $$p`" \ +- || $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ ++ test -f "$(DESTDIR)$(LIBDIR)/plugins/`basename $$p`" \ ++ || $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ + fi; \ + fi \ + done +- $(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/ ++ $(INSTALL) -m 0644 build/node/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ + + #TODO: + #configure plugins. + + install-man: build-man +- mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 +- $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/ +- $(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/ +- $(INSTALL) -m 0644 build/doc/munin-node.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-run.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/ ++ mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 ++ $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/ ++ $(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/ ++ $(INSTALL) -m 0644 build/doc/munin-node.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-run.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/ + + install-doc: build-doc +- mkdir -p $(DOCDIR) +- $(INSTALL) -m 0644 build/doc/munin-doc.html $(DOCDIR)/ +- $(INSTALL) -m 0644 build/doc/munin-doc.pdf $(DOCDIR)/ +- $(INSTALL) -m 0644 build/doc/munin-doc.txt $(DOCDIR)/ +- $(INSTALL) -m 0644 build/doc/munin-faq.html $(DOCDIR)/ +- $(INSTALL) -m 0644 build/doc/munin-faq.pdf $(DOCDIR)/ +- $(INSTALL) -m 0644 build/doc/munin-faq.txt $(DOCDIR)/ +- $(INSTALL) -m 0644 README.* $(DOCDIR)/ +- $(INSTALL) -m 0644 COPYING $(DOCDIR)/ +- $(INSTALL) -m 0644 node/node.d/README $(DOCDIR)/README.plugins ++ mkdir -p $(DESTDIR)$(DOCDIR) ++ $(INSTALL) -m 0644 build/doc/munin-doc.html $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 build/doc/munin-doc.pdf $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 build/doc/munin-doc.txt $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 build/doc/munin-faq.html $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 build/doc/munin-faq.pdf $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 build/doc/munin-faq.txt $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 README.* $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 node/node.d/README $(DESTDIR)$(DOCDIR)/README.plugins + + build: build-stamp + +diff -Nuar --exclude '*~' munin-1.3.2.orig/Makefile.config munin-1.3.2/Makefile.config +--- munin-1.3.2.orig/Makefile.config 2005-04-15 13:29:18.000000000 -0700 ++++ munin-1.3.2/Makefile.config 2006-07-10 13:04:07.000000000 -0700 +@@ -7,10 +7,10 @@ + # + # the base of the Munin installation. + # +-PREFIX = $(DESTDIR)/opt/munin ++PREFIX = /usr + + # Where Munin keeps its configurations (server.conf, client.conf, ++) +-CONFDIR = $(DESTDIR)/etc/opt/munin ++CONFDIR = /etc/munin + + # Server only - where to put munin-cron + BINDIR = $(PREFIX)/bin +@@ -19,31 +19,31 @@ + 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)/var/www +-CGIDIR = $(HTMLDIR)/cgi ++HTMLDIR = /var/www/localhost/htdocs/munin ++CGIDIR = /var/www/localhost/cgi-bin + + # Client only - Where to put RRD files and other intenal data +-DBDIR = $(DESTDIR)/var/opt/munin ++DBDIR = /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 = $(DESTDIR)/var/log/munin ++LOGDIR = /var/log/munin + + # Location of PID files and other statefiles. On the server, must be + # writable by the user "munin". +-STATEDIR = $(DESTDIR)/var/run/munin ++STATEDIR = /var/run/munin + + # The perl interpreter to use + PERL = $(shell which perl) +@@ -52,10 +52,11 @@ + PYTHON = /usr/bin/env python + + # Server only - Where to install the perl libraries +-PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g") ++PERLLIB = $(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g") + + # Client only - Install plugins for this architecture +-OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') ++# LANG=C is because some locales are a bit different in their alphabet (eg ee_EE). ++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.3.2-r3.ebuild b/net-analyzer/munin/munin-1.3.2-r3.ebuild new file mode 100644 index 000000000000..42ce8a971b5c --- /dev/null +++ b/net-analyzer/munin/munin-1.3.2-r3.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.2-r3.ebuild,v 1.1 2006/11/13 10:52:33 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="~x86 ~ppc ~amd64" +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 ) + +DEPEND="${DEPEND_COM} + doc? ( app-text/htmldoc + app-text/html2text )" +RDEPEND="${DEPEND_COM} + 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.2-r3-Makefile.patch + # Fix noise in the plugins + EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.2-plugin-cleanup.patch + # Make it work with new versions of Rrdtool where : in COMMENT blocks must + # be escaped! + EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.2-rrdtool-comments.patch +} + +src_compile() { + emake build build-man || die "build/build-man failed" + if use doc; then + emake build-doc || die "build-doc 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" + keepdir ${dirs} + + emake DESTDIR="${D}" install-main install-man install-node install-node-plugins || die "install failed" + fowners munin:munin ${dirs} + + if use doc; then + emake DESTDIR="${D}" install-doc install-man || die "install docs failed" + fi + + insinto /etc/munin/plugin-conf.d/ + newins ${FILESDIR}/${P}-plugins.conf munin-node + + # ensure TLS is disabled is built without SSL + use ssl || echo "tls disabled" >>${D}/etc/munin/munin-node.conf + + # make sure we've got everything in the correct directory + insinto /var/lib/munin + newins ${FILESDIR}/${P}-crontab crontab + newinitd ${FILESDIR}/munin-init.d munin-node + dodoc ChangeLog INSTALL README-apache-cgi.in README.api logo.eps + munin-doc-base.html munin-faq-base.html TODO.plugins + newdoc server/TODO TODO.server + newdoc node/TODO TODO.node +} + +pkg_config() { + crontab -l -u munin 2>/dev/null | grep --silent '.*' + if [ $? -eq 0 ]; then + die "Crontab already install for user munin. Not overwriting." + 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 + crontab -u munin /var/lib/munin/crontab +} + +pkg_postinst() { + einfo "Please follow the munin documentation to set up the plugins you" + einfo "need, afterwards start munin-node via /etc/init.d/munin-node." + einfo "To have munin's cronjob automatically configured for you if this is" + einfo "your munin master installation, please:" + einfo "emerge --config net-analyzer/munin" +} |