From: Robin H. Johnson Date: Sun, 25 Feb 2007 11:00:28 +0000 (+0000) Subject: Version bump. Fix bug 156311. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=265c4914726d594a692b73317a349d4633837ee0;p=gentoo.git Version bump. Fix bug 156311. Package-Manager: portage-2.1.2-r11 --- diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog index 2c6fdcb9cb94..37137a2426b6 100644 --- a/net-analyzer/munin/ChangeLog +++ b/net-analyzer/munin/ChangeLog @@ -1,6 +1,13 @@ # 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.5 2006/11/13 10:52:33 robbat2 Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.6 2007/02/25 11:00:28 robbat2 Exp $ + +*munin-1.3.3 (25 Feb 2007) + + 25 Feb 2007; Robin H. Johnson + +files/munin-1.3.3-Makefile.patch, +files/munin-1.3.3-crontab, + +munin-1.3.3.ebuild: + Version bump. Fix bug 156311. *munin-1.3.2-r3 (13 Nov 2006) diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index 4f428a7ed1cc..51269d3bab37 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX munin-1.3.2-Makefile.patch 10340 RMD160 b6be2b774137b17c8218b3dfe86b5dcfe22bac92 SHA1 b8ef6cf0c36a6dbd34359d3645d53b9396cc821b SHA256 698a005d37380194b5d8bed7e554387ec82c58cea6fb0a53bfb5795da778b98a MD5 139f371f6734932eda365fb52b5e4454 files/munin-1.3.2-Makefile.patch 10340 RMD160 b6be2b774137b17c8218b3dfe86b5dcfe22bac92 files/munin-1.3.2-Makefile.patch 10340 @@ -22,11 +25,20 @@ AUX munin-1.3.2-rrdtool-comments.patch 4002 RMD160 2a0697f5b1f6e66f94b857248f346 MD5 d838d13be7814a89be4f3df5cb8be61a files/munin-1.3.2-rrdtool-comments.patch 4002 RMD160 2a0697f5b1f6e66f94b857248f346cc2e706b36f files/munin-1.3.2-rrdtool-comments.patch 4002 SHA256 e4c0a50189ddb54c603c6e83973c58ed7e78af4e6933c2dd2fe1d4699a0945e2 files/munin-1.3.2-rrdtool-comments.patch 4002 +AUX munin-1.3.3-Makefile.patch 15018 RMD160 bb0dc9e5373e26a397f67e439ea745d58306907a SHA1 7f8a1e1d0c60b726ad1f3cebbaad92765dad56df SHA256 a8564f0ff86d3712d33ee5b29dff28c37f5e6de076d07ada5e52f2051053b098 +MD5 21ce17db6d24a5ccf213932320102555 files/munin-1.3.3-Makefile.patch 15018 +RMD160 bb0dc9e5373e26a397f67e439ea745d58306907a files/munin-1.3.3-Makefile.patch 15018 +SHA256 a8564f0ff86d3712d33ee5b29dff28c37f5e6de076d07ada5e52f2051053b098 files/munin-1.3.3-Makefile.patch 15018 +AUX munin-1.3.3-crontab 994 RMD160 ab7cc5acaeaf478413e1eb6d1dafe561d79448b0 SHA1 7a372182c407be60895a4817f9bb74f3a63fda49 SHA256 a5d9a160fc15d152a9cbdbf817a44c9c3450c60d61eeead647bf167fbe55fb89 +MD5 7cc5d293cf203fa9202c283358b81371 files/munin-1.3.3-crontab 994 +RMD160 ab7cc5acaeaf478413e1eb6d1dafe561d79448b0 files/munin-1.3.3-crontab 994 +SHA256 a5d9a160fc15d152a9cbdbf817a44c9c3450c60d61eeead647bf167fbe55fb89 files/munin-1.3.3-crontab 994 AUX munin-init.d 581 RMD160 366649a8ac7ec0b2ce4c48913a7cecb65ca69ea6 SHA1 60c0cccd84678692911b43f7f5800fff115b42ab SHA256 a4332d7ac415e4cfda94189947e0c1bdd87d1029845bbea91799ee7e1a8ebb1f MD5 3ce7d105caf0f5cc37517cc28ffd12ee files/munin-init.d 581 RMD160 366649a8ac7ec0b2ce4c48913a7cecb65ca69ea6 files/munin-init.d 581 SHA256 a4332d7ac415e4cfda94189947e0c1bdd87d1029845bbea91799ee7e1a8ebb1f files/munin-init.d 581 DIST munin_1.3.2.tar.gz 309319 RMD160 7bcc16d00ad28731041015ef240144ed0c4fdeb4 SHA1 575c1dc3373e2e001accd1920fd815d9b875c95a SHA256 964887d3af5b5b1fadbabb4c887095820613ea06c768251d6a9c37fa35efcc40 +DIST munin_1.3.3.tar.gz 386976 RMD160 6fbae6ddd237332c6d28d3827a4b163259d054ea SHA1 0cd9e8e81231782d63d4ed2e52cdf85bea0d07c0 SHA256 8f9bec688084cb37b573a70ecf3617d0ce7389f42f22c48b3fa4c53a68a9d7f8 EBUILD munin-1.3.2-r1.ebuild 3568 RMD160 f8897fcb77b264d6ffc5d9e6eeda3cdae93265e1 SHA1 60a2b5ece16633028d193cf338e7599445c70d7b SHA256 f99176d16d99c53dde24c30280e280e069eb188194fdf3a038ae33ea74068d41 MD5 efffd8b665e079b39293759f7324190a munin-1.3.2-r1.ebuild 3568 RMD160 f8897fcb77b264d6ffc5d9e6eeda3cdae93265e1 munin-1.3.2-r1.ebuild 3568 @@ -43,10 +55,14 @@ EBUILD munin-1.3.2.ebuild 3485 RMD160 94f2957fcde45418cbf2d7f88b7cc27fadddce38 S MD5 ae39f2774e7bf379307670cb0a4f6e67 munin-1.3.2.ebuild 3485 RMD160 94f2957fcde45418cbf2d7f88b7cc27fadddce38 munin-1.3.2.ebuild 3485 SHA256 a4fd76456f2bda0cc8e60f1eb045a42e6edf557c0d963b6b672f599374868b1e munin-1.3.2.ebuild 3485 -MISC ChangeLog 1418 RMD160 f4ead8c1aecaf25146fd823723074490c808e763 SHA1 dde0d15fde91aabe54226713aff4f292aa4e24da SHA256 bda3c75ebd64351534084667a53e7edb1d6579fd7ef69a4ca1e67fc8bf9cd07e -MD5 4eb9061dd0962b0bf514fe29d4441296 ChangeLog 1418 -RMD160 f4ead8c1aecaf25146fd823723074490c808e763 ChangeLog 1418 -SHA256 bda3c75ebd64351534084667a53e7edb1d6579fd7ef69a4ca1e67fc8bf9cd07e ChangeLog 1418 +EBUILD munin-1.3.3.ebuild 3838 RMD160 b8c504b0e9c0f1e10f0b29170c78bf85c9a01356 SHA1 7e15580882d6ce1217597011c10ebb493278f49b SHA256 2c268771f78c99bc97ea66bec9865e9850eaa72de3731ad6dd9090f90868888c +MD5 9d6350ac78e81d86da94f301dae352d7 munin-1.3.3.ebuild 3838 +RMD160 b8c504b0e9c0f1e10f0b29170c78bf85c9a01356 munin-1.3.3.ebuild 3838 +SHA256 2c268771f78c99bc97ea66bec9865e9850eaa72de3731ad6dd9090f90868888c munin-1.3.3.ebuild 3838 +MISC ChangeLog 1620 RMD160 9bb21eaec5b5c0809cfdca67e1915f1c5a892ebf SHA1 68e4bbac90e838afb7a59f50a14964ab4d12996c SHA256 f8ae1a869aea4e20ad758a965eb96b77b77f2043f1d12463ced9c18faa44b56d +MD5 7614135e7d6602785d6c960cf26ed38f ChangeLog 1620 +RMD160 9bb21eaec5b5c0809cfdca67e1915f1c5a892ebf ChangeLog 1620 +SHA256 f8ae1a869aea4e20ad758a965eb96b77b77f2043f1d12463ced9c18faa44b56d ChangeLog 1620 MISC metadata.xml 914 RMD160 0076c2be4c5a72a26639eb531925b4585d905060 SHA1 3b92ce6a0b1aefa369262ca69b485c280dac068b SHA256 16e3a247509483b481b8c8a038bd13f872ad48b91aade8795158a9c304749ff7 MD5 9299a4cbbf52bdd70903df755a77f0cd metadata.xml 914 RMD160 0076c2be4c5a72a26639eb531925b4585d905060 metadata.xml 914 @@ -63,3 +79,14 @@ SHA256 c8f9315ca064bb4486acd4b20b0b0dc914ecae94dd4db7739bee529017d30701 files/di MD5 9e54d7960ffe54d8c894151aae3b80f8 files/digest-munin-1.3.2-r3 235 RMD160 684b4825ee54ec7dd4825ebe63efb012bcde2325 files/digest-munin-1.3.2-r3 235 SHA256 c8f9315ca064bb4486acd4b20b0b0dc914ecae94dd4db7739bee529017d30701 files/digest-munin-1.3.2-r3 235 +MD5 3c467ec04f3153b713bd8c408a072f38 files/digest-munin-1.3.3 235 +RMD160 4e890099a15fb155b20b23f8730a0d606c11d3b0 files/digest-munin-1.3.3 235 +SHA256 630b2ccf3b4ea311439be411b4dff4edc3ff338e70e6a997d47ce69f31af0072 files/digest-munin-1.3.3 235 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) +Comment: Robbat2 @ Orbis-Terrarum Networks - The text below is a digital signature. If it doesn't make any sense to you, ignore it. + +iD8DBQFF4WxvPgYlrpyh79cRAomGAJ4kDwjr472E0Ha/nyeMIKxv4xQ7/ACfXU/F +EuL156kAbDgIVVg6H8vLbP8= +=PWP7 +-----END PGP SIGNATURE----- diff --git a/net-analyzer/munin/files/digest-munin-1.3.3 b/net-analyzer/munin/files/digest-munin-1.3.3 new file mode 100644 index 000000000000..505377a42102 --- /dev/null +++ b/net-analyzer/munin/files/digest-munin-1.3.3 @@ -0,0 +1,3 @@ +MD5 1e0f72f2092764b72d453f3faf298689 munin_1.3.3.tar.gz 386976 +RMD160 6fbae6ddd237332c6d28d3827a4b163259d054ea munin_1.3.3.tar.gz 386976 +SHA256 8f9bec688084cb37b573a70ecf3617d0ce7389f42f22c48b3fa4c53a68a9d7f8 munin_1.3.3.tar.gz 386976 diff --git a/net-analyzer/munin/files/munin-1.3.3-Makefile.patch b/net-analyzer/munin/files/munin-1.3.3-Makefile.patch new file mode 100644 index 000000000000..e845c27887b3 --- /dev/null +++ b/net-analyzer/munin/files/munin-1.3.3-Makefile.patch @@ -0,0 +1,391 @@ +--- munin-1.3.3.orig/Makefile 2006-11-10 04:39:14.000000000 -0800 ++++ munin-1.3.3/Makefile 2007-02-25 02:24:52.000000000 -0800 +@@ -28,72 +28,72 @@ + # This removes the installed config so that the next install-pass installs + # a new config. Target suitable for maintainers + unconfig: +- rm -f $(HTMLDIR)/.htaccess +- rm -f $(CONFDIR)/munin.conf ++ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess ++ rm -f $(DESTDIR)$(CONFDIR)/munin.conf + + 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 0755 server/VeraMono.ttf $(LIBDIR)/ +- $(INSTALL) -m 0644 resources/favicon.ico $(HTMLDIR)/ +- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(HTMLDIR)/.htaccess +- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/ +- $(INSTALL) -m 0755 build/server/munin-cron $(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 0644 build/server/Munin.pm $(PERLLIB)/ ++ $(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/ ++ $(INSTALL) -m 0755 server/VeraMono.ttf $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0644 resources/favicon.ico $(DESTDIR)$(HTMLDIR)/ ++ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess ++ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(DESTDIR)$(CONFDIR)/ ++ $(INSTALL) -m 0755 build/server/munin-cron $(DESTDIR)$(BINDIR)/ ++ $(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 $(DESTDIR)$(PERLLIB)/ + + uninstall-main: build + for p in build/server/*.tmpl; do \ +- rm -f $(CONFDIR)/templates/"$$p" ; \ ++ rm -f $(DESTDIR)$(CONFDIR)/templates/"$$p" ; \ + done +- rm -f $(CONFDIR)/templates/logo.png +- rm -f $(CONFDIR)/templates/style.css +- rm -f $(CONFDIR)/templates/definitions.html +- rm -f $(HTMLDIR)/.htaccess +- +- rm -f $(CONFDIR)/munin.conf +- +- rm -f $(BINDIR)/munin-cron +- +- rm -f $(LIBDIR)/munin-update +- rm -f $(LIBDIR)/munin-graph +- rm -f $(LIBDIR)/munin-html +- rm -f $(LIBDIR)/munin-limits +- rm -f $(CGIDIR)/munin-cgi-graph +- +- rm -f $(PERLLIB)/Munin.pm +- -rmdir $(CONFDIR)/templates +- -rmdir $(CONFDIR) +- -rmdir $(LIBDIR) +- -rmdir $(BINDIR) +- +- -rmdir $(LOGDIR) +- -rmdir $(STATEDIR) +- -rmdir $(HTMLDIR) +- -rmdir $(DBDIR) +- -rmdir $(CGIDIR) ++ rm -f $(DESTDIR)$(CONFDIR)/templates/logo.png ++ rm -f $(DESTDIR)$(CONFDIR)/templates/style.css ++ rm -f $(DESTDIR)$(CONFDIR)/templates/definitions.html ++ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess ++ ++ rm -f $(DESTDIR)$(CONFDIR)/munin.conf ++ ++ rm -f $(DESTDIR)$(BINDIR)/munin-cron ++ ++ rm -f $(DESTDIR)$(LIBDIR)/munin-update ++ rm -f $(DESTDIR)$(LIBDIR)/munin-graph ++ rm -f $(DESTDIR)$(LIBDIR)/munin-html ++ rm -f $(DESTDIR)$(LIBDIR)/munin-limits ++ rm -f $(DESTDIR)$(CGIDIR)/munin-cgi-graph ++ ++ rm -f $(DESTDIR)$(PERLLIB)/Munin.pm ++ -rmdir $(DESTDIR)$(CONFDIR)/templates ++ -rmdir $(DESTDIR)$(CONFDIR) ++ -rmdir $(DESTDIR)$(LIBDIR) ++ -rmdir $(DESTDIR)$(BINDIR) ++ ++ -rmdir $(DESTDIR)$(LOGDIR) ++ -rmdir $(DESTDIR)$(STATEDIR) ++ -rmdir $(DESTDIR)$(HTMLDIR) ++ -rmdir $(DESTDIR)$(DBDIR) ++ -rmdir $(DESTDIR)$(CGIDIR) + + install-node: build install-node-non-snmp install-node-snmp + echo Done. +@@ -102,41 +102,41 @@ + echo Undone. + + install-node-snmp: build +- $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/ ++ $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(DESTDIR)$(SBINDIR)/ + + uninstall-node-snmp: build +- rm -f $(SBINDIR)/munin-node-configure-snmp +- -rmdir $(SBINDIR) ++ rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure-snmp ++ -rmdir $(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)/ + + uninstall-node-non-snmp: build +- rm -f $(SBINDIR)/munin-node +- rm -f $(SBINDIR)/munin-node-configure +- rm -f $(CONFDIR)/munin-node.conf +- rm -f $(SBINDIR)/munin-run +- -rmdir $(CONFDIR)/plugin-conf.d +- -rmdir $(CONFDIR) +- -rmdir $(SBINDIR) ++ rm -f $(DESTDIR)$(SBINDIR)/munin-node ++ rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure ++ rm -f $(DESTDIR)$(CONFDIR)/munin-node.conf ++ rm -f $(DESTDIR)$(SBINDIR)/munin-run ++ -rmdir $(DESTDIR)$(CONFDIR)/plugin-conf.d ++ -rmdir $(DESTDIR)$(CONFDIR) ++ -rmdir $(DESTDIR)$(SBINDIR) + + # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE + # GENERIC ONES +@@ -148,64 +148,64 @@ + if echo $(INSTALL_PLUGINS) | \ + grep $$family >/dev/null; then \ + echo Installing $$p; \ +- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ ++ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ + fi; \ + fi \ + done +- -mkdir -p $(PLUGSTATE) +- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE) +- $(CHMOD) 0664 $(PLUGSTATE) +- $(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/ +- $(INSTALL) -m 0644 build/node/plugin.sh $(LIBDIR)/plugins/ +- mkdir -p $(PERLLIB)/Munin +- $(INSTALL) -m 0644 build/node/Plugin.pm $(PERLLIB)/Munin/ ++ -mkdir -p $(DESTDIR)$(PLUGSTATE) ++ $(CHOWN) $(PLUGINUSER):$(GROUP) $(DESTDIR)$(PLUGSTATE) ++ $(CHMOD) 0664 $(DESTDIR)$(PLUGSTATE) ++ $(INSTALL) -m 0644 build/node/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ ++ $(INSTALL) -m 0644 build/node/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ ++ mkdir -p $(DESTDIR)$(PERLLIB)/Munin ++ $(INSTALL) -m 0644 build/node/Plugin.pm $(DESTDIR)$(PERLLIB)/Munin/ + + uninstall-node-plugins: build $(PLUGINS) + for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do \ +- rm -f $(LIBDIR)/plugins/`basename $$p` \ ++ rm -f $(DESTDIR)$(LIBDIR)/plugins/`basename $$p` \ + done +- rm -f $(LIBDIR)/plugins/plugins.history +- rm -f $(LIBDIR)/plugins/plugin.sh ++ rm -f $(DESTDIR)$(LIBDIR)/plugins/plugins.history ++ rm -f $(DESTDIR)$(LIBDIR)/plugins/plugin.sh + + #TODO: + #configure plugins. + + install-man: build-man Makefile Makefile.config +- 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/ + + uninstall-man: build-man +- rm -f $(MANDIR)/man5/munin-node.conf.5 +- rm -f $(MANDIR)/man5/munin.conf.5 +- rm -f $(MANDIR)/man8/munin-node.8 +- rm -f $(MANDIR)/man8/munin-node-configure.8 +- rm -f $(MANDIR)/man8/munin-node-configure-snmp.8 +- rm -f $(MANDIR)/man8/munin-run.8 +- rm -f $(MANDIR)/man8/munin-graph.8 +- rm -f $(MANDIR)/man8/munin-update.8 +- rm -f $(MANDIR)/man8/munin-limits.8 +- rm -f $(MANDIR)/man8/munin-html.8 +- rm -f $(MANDIR)/man8/munin-cron.8 +- -rmdir $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 $(MANDIR) ++ rm -f $(DESTDIR)$(MANDIR)/man5/munin-node.conf.5 ++ rm -f $(DESTDIR)$(MANDIR)/man5/munin.conf.5 ++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node.8 ++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure.8 ++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure-snmp.8 ++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-run.8 ++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-graph.8 ++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-update.8 ++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-limits.8 ++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-html.8 ++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-cron.8 ++ -rmdir $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR) + + install-doc: build-doc +- mkdir -p $(DOCDIR)/resources +- $(INSTALL) -m 0644 README $(DOCDIR)/ +- $(INSTALL) -m 0644 COPYING $(DOCDIR)/ +- $(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources ++ mkdir -p $(DESTDIR)$(DOCDIR)/resources ++ $(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources + + uninstall-doc: build-doc +- rm -rf $(DOCDIR) ++ rm -rf $(DESTDIR)$(DOCDIR) + + build: build-stamp + +@@ -349,11 +349,11 @@ + endif + + node-monkeywrench: install-node +- rm -rf $(CONFDIR)/plugins +- rm -rf $(LIBDIR)/plugins +- mkdir -p $(LIBDIR)/plugins +- mkdir -p $(CONFDIR)/plugins +- cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/ ++ rm -rf $(DESTDIR)$(CONFDIR)/plugins ++ rm -rf $(DESTDIR)$(LIBDIR)/plugins ++ mkdir -p $(DESTDIR)$(LIBDIR)/plugins ++ mkdir -p $(DESTDIR)$(CONFDIR)/plugins ++ cp monkeywrench/plugin-break*_ $(DESTDIR)$(LIBDIR)/plugins/ + $(SBINDIR)/munin-node-configure --suggest + echo 'Done?' + +--- munin-1.3.3.orig/Makefile.config 2006-11-10 04:39:31.000000000 -0800 ++++ munin-1.3.3/Makefile.config 2007-02-25 02:08:46.000000000 -0800 +@@ -9,10 +9,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 +@@ -21,31 +21,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) +@@ -67,10 +67,11 @@ + BASH = /bin/bash + + # Server only - Where to install the perl libraries +-PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2) ++PERLLIB = $(shell $(PERL) -V:sitelib | cut -d"'" -f2) + + # 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/files/munin-1.3.3-crontab b/net-analyzer/munin/files/munin-1.3.3-crontab new file mode 100644 index 000000000000..37d7a2fca1f8 --- /dev/null +++ b/net-analyzer/munin/files/munin-1.3.3-crontab @@ -0,0 +1,21 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-1.3.3-crontab,v 1.1 2007/02/25 11:00:28 robbat2 Exp $ + +# 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 diff --git a/net-analyzer/munin/munin-1.3.3.ebuild b/net-analyzer/munin/munin-1.3.3.ebuild new file mode 100644 index 000000000000..b6274bd7c7d9 --- /dev/null +++ b/net-analyzer/munin/munin-1.3.3.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.3.ebuild,v 1.1 2007/02/25 11:00:28 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="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 ) + +# Keep this seperate, as previous versions have had other deps here +DEPEND="${DEPEND_COM}" +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.3-Makefile.patch + # Fix noise in the plugins + EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.2-plugin-cleanup.patch + + # Merged by upstream + ## 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/" + 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 + + # ensure TLS is disabled if 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 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 + 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!" +}