Restore files/munin-1.3.2-plugins.conf that is used by all ebuilds. Bug #276637: fix overly verbose munin-graph debug output.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

5 files changed, 103 insertions, 5 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 895476b00996..0bc41309ab79 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.25 2009/08/26 23:27:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.26 2009/08/26 23:47:00 robbat2 Exp $
+
+  26 Aug 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +files/munin-1.3.2-plugins.conf, munin-1.3.4-r2.ebuild,
+  +files/munin-1.3.4-terser-munin-graph.patch:
+  Restore files/munin-1.3.2-plugins.conf that is used by all ebuilds. Bug
+  #276637: fix overly verbose munin-graph debug output.
 
   26 Aug 2009; Robin H. Johnson <robbat2@gentoo.org> munin-1.3.4-r2.ebuild:
   Fix double install of manpages.
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 7946e5e2a44b..493215a26b31 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,4 +1,5 @@
 AUX munin-1.3.2-plugin-cleanup.patch 1014 RMD160 55e3af25844ee5ee162e7f0dea850a7b06c8d623 SHA1 3bddfe2ff6e85327b55d5d6548530ca16dd9a31f SHA256 7c44850aa9bd34d6a165acbe094d940a4f89bce436eb28e99688641ace52df8c
+AUX munin-1.3.2-plugins.conf 1622 RMD160 00bc90347f8c989c82cf0fecb3e9ca53b8e2b79e SHA1 8968590e5353a523aaced45fe3423d0bbf9a91a1 SHA256 a3f2337a4eccf6b9f0d63218dcddab226cd8c9b2728facac468739395c7b4cdf
 AUX munin-1.3.2-rrdtool-comments.patch 4002 RMD160 2a0697f5b1f6e66f94b857248f346cc2e706b36f SHA1 d75bbbeb54cad301051709728ce281bb538d275c SHA256 e4c0a50189ddb54c603c6e83973c58ed7e78af4e6933c2dd2fe1d4699a0945e2
 AUX munin-1.3.3-Makefile.patch 15028 RMD160 f1e06ca3c837bfff9951afe71495d79d2dec9522 SHA1 32392770a379fc8537d698b727ffe5a6121f95ea SHA256 eef3e6e6aed9579d8bd4ba35ee0be53a1696f6895d1d7b6995b460c1e39140f3
 AUX munin-1.3.3-crontab 994 RMD160 ab7cc5acaeaf478413e1eb6d1dafe561d79448b0 SHA1 7a372182c407be60895a4817f9bb74f3a63fda49 SHA256 a5d9a160fc15d152a9cbdbf817a44c9c3450c60d61eeead647bf167fbe55fb89
@@ -9,6 +10,7 @@ AUX munin-1.3.4-parallel-make-fix.patch 841 RMD160 8d570e3cff57b7bba8ef577b19a24
 AUX munin-1.3.4-plugin-cleanup.patch 947 RMD160 bf3d2e97ac3a651b6b86e8a170d735e64815f26a SHA1 1c657a132a1cd8d94ebb1fb5db99544367cdca9c SHA256 6cd472a4886a04d7c89e5006f223c6b24fd6e91c9263e13663db9157aefd8d0a
 AUX munin-1.3.4-rrdtool-1.3.patch 1389 RMD160 045a12902649bd40f68e1f8ef9c9e784c3f5e5f2 SHA1 741e773575a29f0d8125dfb18c2b6c9240510622 SHA256 f9d31fc55911a50ca61eb954b59c2d0c87dc2e52f969d846f78d2d6ddf1936ac
 AUX munin-1.3.4-samba-plugin.patch 468 RMD160 24e6b3a140f15f3265e6815dac3c1e5e1e3dcc9c SHA1 6bdb1b0a55de8bd33d53d0ad61ae322c538771cb SHA256 e6700fa3492f7efb4db6bcaee75184f1152aef8ef5231aa62c8a799bfe7dffae
+AUX munin-1.3.4-terser-munin-graph.patch 944 RMD160 774b216c792d3394f0b80d9f4a1efbd43153d913 SHA1 041d6fa73abf1ff14048904296d41c121e61c31a SHA256 b247cf00447cac65f57bffbbf4703f7d75521bc4d4a47dfbd0aa9d5c0d32bab0
 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
@@ -18,7 +20,7 @@ EBUILD munin-1.3.3-r1.ebuild 3895 RMD160 f8545fc8ccddc921273a008a7c50ed63cedfc88
 EBUILD munin-1.3.3-r2.ebuild 3899 RMD160 9d02e45dcb0c0d491608dd7760b60593522dabe2 SHA1 0b4a6bad14fd9658b30444d2696a730b048fb850 SHA256 7d3179c8ce74c516e5be1b18d722b69970dd80f193545ca96cfb33bc64a09140
 EBUILD munin-1.3.3.ebuild 3848 RMD160 7c28208bb9d72c7c101a2564978a8e66e11678b1 SHA1 b11e5fb9a5eb369594c81e2f286ddf7ca1aaf75b SHA256 4811486d38a10cff59d98e3877d3547ad5f57ee2deff71f426389a082d44db0b
 EBUILD munin-1.3.4-r1.ebuild 4201 RMD160 b08b1a0788d7b9609d48f8e8cd9c9a9945ab0314 SHA1 75fcb0fc6c1cf9ca4edfdb82ef2daf377a598345 SHA256 241bb3876cd8242d0b76490508e18d40215de2a6bb2127554456e1e34be6c54b
-EBUILD munin-1.3.4-r2.ebuild 4603 RMD160 61be886dbfc423bbd5de39df00778b9cd9092de9 SHA1 ac4719d8a8ab9bf546f73f05a576c541e6bd7297 SHA256 b75732af4126b95213a4f4a30357715c68f69946a0b39cd347af95f7edb5d1b2
+EBUILD munin-1.3.4-r2.ebuild 4779 RMD160 c42d95097639f4e6dc655f5fef809ef06b383ee7 SHA1 d43ac1aa2fd25761ea10ab1a0051c8d2ed3f9713 SHA256 1186313934a49f3a4c121fd5737cb41291633538c360f40d2ad1c70aaf91b54d
 EBUILD munin-1.3.4.ebuild 4139 RMD160 b289cacd00d3160876278044539d91c279add827 SHA1 5979f56c7e2ab4a024d2bdf82614d9777eaf5aeb SHA256 b8f3e44985fe3d88c61f1a2bb44f303acc50c13e80790abf1de113c7236f293c
-MISC ChangeLog 4804 RMD160 950d58402494981ba00945b5169b56d12a61e90f SHA1 3d40437516e032191349780c8a8a116390cf3e66 SHA256 08d048478e841679708226aec6fe6b200104e28cbe454cf172ba8a1401b98a6f
+MISC ChangeLog 5093 RMD160 22b084d53ba1bfacd0af933cab5f3b2d1f2c2f69 SHA1 67923449ecbff157083063b56bef50f1929b77e4 SHA256 e840113d188ef991bc5381a4718950c476aedf63449de7ef7f6131f61e72cc2b
 MISC metadata.xml 1358 RMD160 96398baf01ddf52ac92bf9db2978fba43c022b2c SHA1 ccaa230711e1a3af054fae27583d0e3b10645dcc SHA256 2f8f87757cd0151b129a526b7c670f55182b8e22bf0d32236814a236398e539f
diff --git a/net-analyzer/munin/files/munin-1.3.2-plugins.conf b/net-analyzer/munin/files/munin-1.3.2-plugins.conf
new file mode 100644
index 000000000000..c988c5b63cbe
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.3.2-plugins.conf
@@ -0,0 +1,68 @@
+# 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.2-plugins.conf,v 1.3 2009/08/26 23:47:01 robbat2 Exp $
+#
+# This file contains configuration options for the plugins. Three
+# options are understood by munin-node itself:
+#
+# 	user <user>         # Set the user to run the plugin as
+# 	group <group>       # Set the group to run the plugin as
+# 	command <command>   # Run <command> instead of the plugin. %c
+# 	                      expands to what would normally be run.
+#   env.<variable>      # Sets <variable> in the plugin's environment, see the
+#                         individual plugins to find out which variables they
+#                         care about.
+#
+#
+
+[smart_*]
+user root
+group disk
+
+# Example for a 3ware 8000-series card, with 2 disks
+# use /dev/twe0 as the actual device
+# and replicate this entry for each drive, increasing the number in -d
+#[smart_3ware-0_twe0]
+#user root
+#group root
+#env.smartargs -H -i -c -l error -l selftest -l selective -a -d 3ware,0
+#[smart_3ware-1_twe0]
+#user root
+#group root
+#env.smartargs -H -i -c -l error -l selftest -l selective -a -d 3ware,1
+
+[bind9*]
+user root
+
+[iostat*]
+user munin
+group munin
+
+[iostat_ios]
+user root
+group disk
+
+[vlan*]
+user root
+
+[postfix*]
+user root
+env.logfile maillog
+
+[sendmail*]
+env.mspqueue /var/spool/clientmqueue
+
+[mysql*]
+#env.mysqlopts -u someuser
+
+[exim*]
+group mail
+
+[cps*]
+user root
+
+# More 3ware examples
+#[hddtemp_smartctl]
+#env.drives twe0_0 twe0_1 hda
+#env.type_twe0_0 3ware,0
+#env.type_twe0_1 3ware,1
diff --git a/net-analyzer/munin/files/munin-1.3.4-terser-munin-graph.patch b/net-analyzer/munin/files/munin-1.3.4-terser-munin-graph.patch
new file mode 100644
index 000000000000..694fc12cd413
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.3.4-terser-munin-graph.patch
@@ -0,0 +1,18 @@
+diff -Nuar munin-1.3.4.orig/server/munin-graph.in munin-1.3.4/server/munin-graph.in
+--- munin-1.3.4.orig/server/munin-graph.in	2009-08-26 23:10:11.942546516 +0000
++++ munin-1.3.4/server/munin-graph.in	2009-08-26 23:37:53.639047143 +0000
+@@ -476,12 +476,12 @@
+     my $graphable = munin_get ($service, "graphable", 0);;
+     if (!$graphable) {
+ 	foreach my $field (@{munin_get_field_order ($service)}) {
+-	    logger ("DEBUG: single_value: Checking field \"$field\".");
++	    logger ("DEBUG: single_value: Checking field \"$field\".") if $DEBUG;
+ 	    $graphable++ if munin_draw_field ($service->{$field});
+ 	}
+ 	munin_set_var_loc ($service, ["graphable"], $graphable);
+     }
+-    logger ("Debug: service ". join (' :: ', @{munin_get_node_loc ($service)}) ." has $graphable elements.");
++    logger ("Debug: service ". join (' :: ', @{munin_get_node_loc ($service)}) ." has $graphable elements.") if $DEBUG;
+     return ($graphable == 1);
+ }
+ 
diff --git a/net-analyzer/munin/munin-1.3.4-r2.ebuild b/net-analyzer/munin/munin-1.3.4-r2.ebuild
index f02545735b02..a13d11520f00 100644
--- a/net-analyzer/munin/munin-1.3.4-r2.ebuild
+++ b/net-analyzer/munin/munin-1.3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.4-r2.ebuild,v 1.3 2009/08/26 23:27:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.4-r2.ebuild,v 1.4 2009/08/26 23:47:00 robbat2 Exp $
 
 EAPI="2"
 
@@ -70,7 +70,11 @@ src_prepare() {
 
 	# Bug #267801, ensure that directories to install to are created before
 	# trying to populate them for parallel install.
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-parallel-make-fix.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-parallel-make-fix.patch
+
+	# Bug #276637, make munin-graph be terser. No more debug output unless
+	# --debug is on.
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-terser-munin-graph.patch
 }
 
 src_compile() {