Add a CONFIG_PROTECT setting for the munin-asyncd allowed keys.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 19 insertions, 11 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 277bbedfacac..c9429ec8c476 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.110 2012/10/21 04:14:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.111 2012/10/21 04:29:51 flameeyes Exp $
+
+  21 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> +files/munin.env,
+  munin-2.0.7-r2.ebuild:
+  Add a CONFIG_PROTECT setting for the munin-asyncd allowed keys.
 
   21 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> munin-2.0.7-r2.ebuild:
   Make sure to set the correct owner to /var/spool/munin-async out of the
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 13b1dca0c473..876e4367b724 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -18,6 +18,7 @@ AUX munin-node_conf.d_1.4.6-r2 316 SHA256 cf250f39eae1ee564f51cd99ec20510accb8a6
 AUX munin-node_init.d_1.4.6-r2 957 SHA256 78cbeff21fc98767775f7ff2c75b4b7096d878aaff26d215789ae5b9fa01e818 SHA512 66b5cc7178f4f6d58bf7101b7c53d356987188c3145384d5bb1b4d4726c1b4993f3742161d2f4166012f2d6084995f4ff9316ab46907cff9398b4701d8d87ef8 WHIRLPOOL 0521ecac81ae6cb29f6f12db57549102e069464b922a77077874e0a31796f6effd66456f37ed714e831269fc125127dd0097ddb3b83ffd7f8dac5a2072c28a55
 AUX munin-node_init.d_2.0.2 946 SHA256 56873af410a42f27b8e69230f0b0f6bf55e714e924f133c4cb00919d8827ab29 SHA512 48278f67bd45f196c301d2a60547f4add8ca09bf5ecdea83a97b2805a5476e251265544b197bee65c7972960a8c36aa28d6781794c9c6f734372eb10f61b5264 WHIRLPOOL 3c6a8670038490ab2980468387e683f60727b44bed1eb6087eab2bbb78c37a07a3b8a1580e8935f14bfd7fe75d8dceb46712902de65cf3d60b6aed807e032850
 AUX munin-node_init.d_2.0.5 869 SHA256 9fea23a7d20e8bff50e9ef8dc41e4c9eaff50c5837f7d8e129cd57701c0fb464 SHA512 a890d5f7adc1d2c1577b4e4f868bab046eef25fd22c829cbda093dc20bd1a41df4bb6da0ffce0d71f6d9d8e0b5612e6ab1be691768824dd3793a2cc44dab64be WHIRLPOOL 6823abef0137268c60b755f642286d825205afde12da72ddda7a2044f687d88860ed3701d81a7c209aeaa80b2e1b4e39ec109953172fcb4037dbe23d88beb22e
+AUX munin.env 41 SHA256 e99f5523b21d70c967d11f3b7376760069d220853d5d22559c9cac691a78b977 SHA512 934c474a31ad4d11ecd84727cf88b70a977bf08b64925d6b9e3562567d4ed8aa9af8b03b2709ca86e24345e491749687892f0905bc1889ccaada66dddc0ddb49 WHIRLPOOL 34d3e4f677ff8495304ba18d142d067dcf8463e9474fdc9d678e317ae7e25512ee707acc290e36b4c447f5e111a7c46465792c56bf8fcfd99c1fb8cfee89c371
 DIST munin-1.4.6.tar.gz 1238782 SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6 SHA512 f1ec1b79b4c90d899fc661656426b4cf7fdcc7f896d6de0938310b49b66e009cd1a85570005fd1a85a8168ce3568ea55c255c3511174cdf1d72bd88f162be5e0 WHIRLPOOL 43d2296bbbd476ffc0cf356fc5a191d723993735769e6f88f3581c0804b82781be38f78bfe34337e2b4e9680ade8c569a6006c0ea107e4a5c60a82b879e08404
 DIST munin-2.0.5-patches-2.tar.xz 9448 SHA256 9a58ff84e33cf5c912eb504f176d689fa8531da01b3541396a03f05fde19d079 SHA512 7f75c6f4a7034327a99820bd0c1fd2272f2cd2a5bc037096e6a142a317a068ffb4217b162578da089cb0f83667d35aee413ecaeb58fdb548dfbff78b97d36e07 WHIRLPOOL 0d128cbc9955e174902670c2a66e5e0c66d4262bd20832065ed220a227a9efba25a93e192a4cd08c85819df91d1552870e6dfc2cd1bd0f3870b0154d6c0f294a
 DIST munin-2.0.5.tar.gz 1319398 SHA256 927b9b557343ad031b55b401eb1542db03d78a48a64797f5fed6ad58fc2c8785 SHA512 e52ce2f44a4322000dc38d0b8ae6e5f406211b7a081e1f4300938dfe10bff1559d9e84f454885c70bae9aabfa4b7fde8c3b3d8b239d35596f678baaba6d7d7bc WHIRLPOOL 7751eee653a0b80a9a3283a8940a270db0c5ece7de67f1b253004901db2fd06f6d8c104497ced6d3659ac6a45f4d8e37bbb362f6dec6f7181cb2d30ca115f495
@@ -25,17 +26,17 @@ DIST munin-2.0.7-patches-2.tar.xz 2392 SHA256 e439c3e019b64e71624b57c52d57162698
 DIST munin-2.0.7.tar.gz 1326773 SHA256 3daf42722ebd74a6269aa290b9f5821e2206df7b0fd6a39876863ff1a9b50c2e SHA512 51bf57fd5d8bdd92c091548dda540af6b355c8fe821db06ba92eb7402b623afcac570b3e1e0816580e6ec962a791835dd845734207556731636003d01b492c3f WHIRLPOOL bfc9de2ec0421ba66109ca77396a35bdf9c7ef6bd82dad1fe1c05144d79d0d9c923a641feca5d78e566015561172704898c1ec3a57da49d67492e335439ef982
 EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d
 EBUILD munin-2.0.5-r1.ebuild 7562 SHA256 2eed40d2d81907b4d6347ecaa9d20ae4c858c4e7c6f353051e1576afaf6b4b2f SHA512 e7d5339acf39f39e50df7f92541767643e1f76be4564bdfcb5b3bc1ed4170f80a3f153cd5994e6b559761b22cd4015e64c2671aa9b76244df07d3f76aaf0fa08 WHIRLPOOL a40a3688837c018a486af91ca20e6841a3b17afa4991f6e40d784c45c99ed6fbcced7d0bdfac187882f3d147a0be00b1c60a282e05a6b1becd82288a13f6ee63
-EBUILD munin-2.0.7-r2.ebuild 9527 SHA256 f302d24dc7e031d78eac55576bf2ff04fbd81b9e2203863f34f5cf7f231df483 SHA512 d1e20b622bab7badd90e151b723ed4ce9d6f34c14eb25757997c358d0eb1352092bcdb5bf69e9b8dded307edc198f1869d1a4a2c9260a9b9775ddf2fdade722d WHIRLPOOL eec6acbc31b2918627e7dbed54b60a33a4f09ae944f2ff65d1879df3fa3e2c8ea1e6746752c8d91d2a258a5cf371b0020d0f7773584fb31694280417bcb15f6b
-MISC ChangeLog 24021 SHA256 8066c86b0191cc2281245937994ca41eaeef2d81c639d6415571f2f9e6943dd0 SHA512 da403ba393298efad2b20f925e8b61aa6ac349e24e900f0888450c91098c431c2334c4b3a81cebfc6a35ba9ef4a998fbbd988952ee788ebc6ba1da4307ff6a91 WHIRLPOOL 61af0ee6297d9f7221e882f6d03b2da19087b364a9f27f5c071711ac7b3218f551c1185af1b0b0382a2b44074b903fbda28770e35d154a13cec381a242d230a5
+EBUILD munin-2.0.7-r2.ebuild 9569 SHA256 68041f166d61303e79efb2ac38a35dd31ec18924727429468cfbdc577007015e SHA512 1a3c2d74f01f9ede921bd380a2ffa45f47405f92a92cdaf22eac3aa40330841657ede69f8627e99b90f0ec02bd910473fa2344b5c19a64df71e8cfd748fad9f2 WHIRLPOOL ad4bba3f96e1eef425e211fa1fcc683b9bea6a2b52c76a4ab8f45fae2b5da22fc180c26340a433208c1fa7f03246cdea6bf44acb1b27374bc5445e4d56d85884
+MISC ChangeLog 24187 SHA256 911eb1f8db92f5bfc1e8c3c50b90c0d899130900ad33ba312b0ed51f84e215ad SHA512 d08e0986b31410e08ef7a16a900b93c95a7c30527e431ba8d7e0635097f5ea617fd38b50b5224fe4c4b837cc40e54438d09574d98e000e086ddb9296ed1c0e29 WHIRLPOOL 0a801c22c02e8fcadc4ad96333951736f22169f9532867203263517ebe5105b35e4f307585a962033d69424d010cd89692c480e2cb41097bebcff59e1174e166
 MISC metadata.xml 3628 SHA256 6c4260bcdcd3def7df5664bc8a298a65de3662f7ba485962a66fd65403de3db3 SHA512 62483575bb2eaa4c8a210853ed6a7a3913946f03f7b36f92843fe60e3be998236f92f38e8d42f62104d0756e4f3206e9e6e7da2c966a7c2ef134ec2d4401f69d WHIRLPOOL 938da8e50a4be76cb469052852e4b1e5a6f2253bf3dd5037e0448b420036ffc4385ad99bf41942f4e19c48900c5298fc1086725ca0b6a102b30d0f4f62d6c34d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQg3c3AAoJEBzRPIrUMBNCCYsH/0uaZuz/ELRqBiYLptN9OFJr
-6Daabhs8Reh/sASEcvgMGEv87AAOY1a+Ul9d59vAWYnLrazyn5JUaEhQidZqOSkQ
-f5iTJkV1kVEOSAw8fd0WUzU1rjZVeJQqbjmUISqUYxFQS7MqTACGXgGeyh/t5qBu
-HICLv+LYpyaR5LHHpG4OKSUgbbklzTqy23MEU5GrAEmF9TawwEUiBA4/ZitsVFC0
-13GnclrDO7s2SDy/0tnS4S0cieClLnqk3zRHGwC3AqjrOsamqwbjKQLNB3mHYNuh
-0S+Olyg8oQ7411mhLtIV0pbjF8108MOse+wEXsuSrsVqYjbE1qDU5quAHW3X9WE=
-=HXSO
+iQEcBAEBCAAGBQJQg3rHAAoJEBzRPIrUMBNCUMUH/1Eigo2KgRuu6eaoyxPE4AfJ
+DfKGoa7fByqvsVGptq0psQdPs/v2PfsuRtotO2drVb8InAqbqHQ+rXyKW/Ts7W7o
+n8BFMkcQtEb445gpDDunSyWfhRuGNVbKBwZk+Kijq9y4NQTlh9/s+1hlu3u8Wg7F
+vFTTA+7Z5tQgUgfyPp47KcIuECQ0WVnoFqQ8Ru9Z2pZU9olVT4FF0IgxZIMYLMb+
+r28YUzVSgr6jbm8mmVXReLk8YeFOe5yCLByXRBT3+6ZcKctduzvsTzA7xywk76p4
+h0Nyt3SrQP+o33R7bH8YvUt3kJPCP91b5+JI7bVSwpgHhaVWFYsjN0bnWHvEpXY=
+=ZBXO
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/files/munin.env b/net-analyzer/munin/files/munin.env
new file mode 100644
index 000000000000..d43d5177ad8a
--- /dev/null
+++ b/net-analyzer/munin/files/munin.env
@@ -0,0 +1 @@
+CONFIG_PROTECT=/var/lib/munin-async/.ssh
diff --git a/net-analyzer/munin/munin-2.0.7-r2.ebuild b/net-analyzer/munin/munin-2.0.7-r2.ebuild
index 032d9b367215..afbf89b06a72 100644
--- a/net-analyzer/munin/munin-2.0.7-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.7-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.7-r2.ebuild,v 1.3 2012/10/21 04:14:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.7-r2.ebuild,v 1.4 2012/10/21 04:29:51 flameeyes Exp $
 
 EAPI=4
 
@@ -164,6 +164,8 @@ src_install() {
 
 	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
 
+	newenvd "${FILESDIR}"/munin.env 50munin
+
 	dodoc README ChangeLog INSTALL
 	if use doc; then
 		cd "${S}"/doc/_build/html