Restore checkpath for the pidfile, but don't set owner on it (it doesn't need to have one, here); always change owners in the localstart script instead. Change the default pid_file for the node to /var/run/munin-node.pid as the node does not use anything else in that directory.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

5 files changed, 31 insertions, 16 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 8ff2bfec4130..67d0f6c53bdb 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.96 2012/08/23 19:20:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.97 2012/08/24 22:13:22 flameeyes Exp $
+
+  24 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> files/localstart-munin,
+  files/munin-node_init.d_2.0.5, munin-2.0.5-r2.ebuild:
+  Restore checkpath for the pidfile, but don't set owner on it (it doesn't need
+  to have one, here); always change owners in the localstart script instead.
+  Change the default pid_file for the node to /var/run/munin-node.pid as the
+  node does not use anything else in that directory.
 
 *munin-2.0.5-r2 (23 Aug 2012)
 
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 017dc1b22353..2157ce602c80 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX localstart-munin 127 SHA256 50d77f02e48581b59ecc180ef5571d0321a7677431e03d3dd9b15ad21d3ddff7 SHA512 4e3f18ed51390f32f07a5bf07e57c049333c4caa82d83bc3d7e17afa1d93c3e2322873536b8ec95f4009ccc1e92a20ba2d0935d3c3d43d680b925711818c28a0 WHIRLPOOL b463e99325d316bd35435b0b59b82b95e89ef9927c863d9483f44569fc424cc05df8aa7f3900bd721f8486bb23b636f5fa739eac2ae2f2ccecdc46f40840ac90
+AUX localstart-munin 94 SHA256 e78cf5a383501a6be56ec4ddbbafa82a715ce76088a3d66e9474b91792ff67dd SHA512 2af51792006acc73aaa39632a76f91938511166db41a28d3fd4353c5c4dee86f2e292d86c04fd6bdbde4c210676e6a2b8d91c7c27b5f1921e362f171d79e6ddf WHIRLPOOL 180594f1860f4a19643ea1136be97b71c1cb0a7d1f19e5c4796f36ddef39fbb3c30053319e49a7f2d272e5c097016eec3de99cf7940f15956ee8a7b663d00a74
 AUX logrotate.d-munin 386 SHA256 42bcc50a21e72d9b68df4fad2f1016587f7b033301de754cf956a4d5789ffbea SHA512 6781be81ab473464647ff8a5961a43892fde2558bbad18c70c9d3c7e8a0ed8521db7faab3a56ae7dfa382a95e8ec64909fc6af9d2f2c200ee981784431400e2e WHIRLPOOL 6efa2e81b655d40555e4150fcb0235b275b7fab3b50f88ac2183b2b9f6e4b14541f872eff7935b29f01a64762d5ee5d0c1c9c71da1f8dd48aab7ae893030cede
 AUX munin-1.3.2-plugins.conf 1764 SHA256 cc562d1839812a32b1c0c1d8574f1f5b3395da56d745a91309f31a29bd9624be SHA512 7c791052c6f7e25a3dc056aa95852fffed9083b7e99eb0f6c1d7fd8bc23d76e56a9e05790742728fcd20ebe001c47c3df55382a1965ccb18d227b18c99977362 WHIRLPOOL 52131ba7b5c268ab16fa5b8d3536a43bb6b322e8e02707e58d4186216e73b9c3c048ec02610351cee9ca4777834e8bcf1d90488466aa0790682edec228c32f02
 AUX munin-1.3.3-crontab 994 SHA256 a5d9a160fc15d152a9cbdbf817a44c9c3450c60d61eeead647bf167fbe55fb89 SHA512 c06441c4dc1b030d7ae0cfd35a8f8525f1379ee6ea7218d1f2b4464979c0aae479b4a236e1fdebd260656c52729757958986b9897b858683390a7851d11122cd WHIRLPOOL 773e91e550c6f1351e840cb0cd791ab2183f3a70b2e1d28f18df56f9e46facd92727d2e06a717013d28f2ef02d07063371c82560b6b9c0608dd1621b09dc0fa1
@@ -17,24 +17,24 @@ AUX munin-asyncd.init.2 572 SHA256 15b695a760d06dab4b73e1883162291d2e5fb86574f3e
 AUX munin-node_conf.d_1.4.6-r2 316 SHA256 cf250f39eae1ee564f51cd99ec20510accb8a68d59469893c5f6c474263f5b50 SHA512 07289596eb2f28c37210e5ffe68e81ad16ecdb945e1e61461a409e70d8779a6a0774eae1aaf50d3e7e4c38b366de1585bdfe01132836be85f836064db12e715e WHIRLPOOL 27c1c2858f86cc1e8b50977c91cb43bcf4dc67017195419f48daa8e7a4224b6ec0d60e4b4a1d6d88da31f2ba8aacda79331aa77cdca440a99ee54a0ff4e87b31
 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 690 SHA256 5642dafcc9a07f964d33b716e0d54309c19f59acafc9ba9815fa232f1ebb94a9 SHA512 3b1199e92ae314d54c887bb2fce306fb6d5858e3eff107eb196fd6f882e647d7d3bb8124a9ea945945ee5395ec36a64645483329684f93ec2df11789cd6bfb33 WHIRLPOOL b51991d97a42e7fdf3f8854e57c0d09ed26e2d4194429d7ba9c21a203b605e8f4ed3700b3f038aba6839a771c7c401672128c4401e4960e0f40f4d3df423e41f
+AUX munin-node_init.d_2.0.5 746 SHA256 eda5e087dda2163bbe4f38e5db626a43ab45db07bc69c64f8d1060f2c22fb9b6 SHA512 20b6fcdb81651fda697f8fc268517f7f82f21398411a13345c143824ce42c30f4bc3c71712220d15c4cfe1de18e734a6881f88234f532febe74e699b8f893f6c WHIRLPOOL 81f97773c26d8df111cc8a66343afbeede95971ab7201664207c672bae22b573e991acd68cc5d6e2951d08579843ead03c53fd1cb0027c8f6996ccc8304a996d
 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-patches-3.tar.xz 11144 SHA256 4a8af6f8e4dcb34476ecfdffb6ba7ef139157d23906cba984b10e3da58651ef6 SHA512 69e95288f43414e8fb12b2251689a0dbebbcd4dc64e27041ad5b9be8f917a3be5bf23e754f5565b67426ff998750b28ea3b2e412ff795cad094b352ecb489746 WHIRLPOOL 3d0102296a2480b5dc163e8d473dc9778988105574fe1f9479328d9a43a4c13b9c5fa6c77fb97b07f651e2925f3fbd9472e6c3ba215c2a20b3d46606008f9811
 DIST munin-2.0.5.tar.gz 1319398 SHA256 927b9b557343ad031b55b401eb1542db03d78a48a64797f5fed6ad58fc2c8785 SHA512 e52ce2f44a4322000dc38d0b8ae6e5f406211b7a081e1f4300938dfe10bff1559d9e84f454885c70bae9aabfa4b7fde8c3b3d8b239d35596f678baaba6d7d7bc WHIRLPOOL 7751eee653a0b80a9a3283a8940a270db0c5ece7de67f1b253004901db2fd06f6d8c104497ced6d3659ac6a45f4d8e37bbb362f6dec6f7181cb2d30ca115f495
 EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d
 EBUILD munin-2.0.5-r1.ebuild 7541 SHA256 513bb564d856e06f3f004e10c584fa79aad0d3f7467000c906e67300635915ee SHA512 395f08ec6493f4240247be2d70a98cb7c0e363caa2b04ab6abdefae5860723b531bea948aba78bc8d01a326035e32066afbcbf6e5707b17ebed0f02b3f1f0308 WHIRLPOOL 6a594ae1005da80593c315bc9a0ea763a4e5b0efb95d0a779f8cf22f9e2ead19850cca1f3d660ae71c4b056171182cef72f3a09be581f7cee6e110ddef3465e3
-EBUILD munin-2.0.5-r2.ebuild 8990 SHA256 b029f502345daee2aaa7624b3638f477790d06d17e49eca0059b6fe9e190d55f SHA512 0a7ad6181b80bbe43ff0fc10f3702a18b4f00fc2c391b1f3ac08130c56d9344a185c1be55db40d27ff0f39c700151e77beb50b10981ee03e7b73637822393a50 WHIRLPOOL 9acafd21e377373ed6eefe77b0d00e9211fd2efccb67101ebee58e43fbd99c2e030767f267641d7b0fe4906a9b1fe176cc252ff460e84b8a6e62c6d927deda5d
-MISC ChangeLog 21034 SHA256 792e1a23f3b168008bac91d54ed48f1b8bff98e905d8a81c62941c352561403e SHA512 c5161006c2c538fecd269704dacf1d89d3db3c6dbe25c50bec05c69715422bfa684dc6b13c8408cd76e6fa11c5adeb176ea44f3e0bc3476f8b543421f10f823a WHIRLPOOL aadf2b454c2c9378d7df6f6e14e15c04090840edac7f5ddea1d50d286e76f83ba63dd82cf7c4b5b39e4138e6c0afc775dd39c7577c1d758dc24385c3fedab4d5
+EBUILD munin-2.0.5-r2.ebuild 9251 SHA256 4005c63448d8acda9cfc19f03f49e88404bd270ad6e01e491a0d0bd97659ccd9 SHA512 b4845f38bfd53ccbd9c5591a41cb22bcb5096da73aa68f924b8fa06545e57c8a3d7d97479d8f8de5f7931aaf6b693d8fbf5c38e05c5a446e158cde1f9399fdcd WHIRLPOOL b40c5a72e04db4969acd7efcb20328a883cf54eab3c2c0cd589fc271bfb74e32e40ca892c92fdfc4245a067dd31c0c690aca3cecf184519b72332bfb0610da1b
+MISC ChangeLog 21458 SHA256 10d38c38ed5a56729318214a2e080d83a5da036866661645d91da829627902db SHA512 2264c7e2ee3c18dbe45a760cc601e0441eee7b6389f1bf0cd7d00a6535c25af5f7c780a52c61b077159e93c1cbec4431f108d63dc0acc0fce6ff996c298d45c1 WHIRLPOOL a50e7b0a60392acb080e273ca1b04371138f1aa548fac9dea159cd61e1239331f7b56e3a2798972f26a3247202407e07ee8bd7cab81cfa4ebff3a5135d4df14f
 MISC metadata.xml 3073 SHA256 0c2f892c440a28bcabdddd63da811dfaf408af447caf9b8b5798c5ffe2a21697 SHA512 cc27dfe513500f6ccece937506db7f7baac751dfb78eff9525dd50fdf9cc90101e43ff98e42dfd4934c06bcc0affa1faa09437159bed3ff0560423294896e5cf WHIRLPOOL 1733d43201a45f660b73423f6950bfb46487f57cfc5ab0d0a03a38e06cfc2b6fc8984aeab12923547946858cfefc8182724a40f3ded6c018e20b6c349e6bfe80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQNpAJAAoJEBzRPIrUMBNCXzUIAIVnuRF6w503e37guEOJe4m9
-k+slmHS/y67AXHYvk4odHAZh8eVMQLU9iO6QzcQA3CTs6izATRPFW8P0U104gXZb
-tX2N9+O57RCEiw5YTkgE2YwxAknx0e3mZeZmLIfcNKrZpyrNb2nbsLPZFffySpMF
-JSud0XCsWtCLsp2pjhJx2wiDlz27VQaLrZmRcBsnu6gPkluBs77Ug8yL/V9fPWt3
-EFMLMEQhSo5jYazDh+h+pnE/JO6m5JvrT8AcXu70tA/SfC8KOprpVPeSPDJHuPe0
-HEamZwggs7eLh9HcjpyfXhf78z4Jimqm8mLhzeIbm9tMqr35DL6WdLNoWeoHDbU=
-=itKj
+iQEcBAEBCAAGBQJQN/1yAAoJEBzRPIrUMBNC1pEIAIJnALjOr1+KSdzHEkJJUtyV
+c2eQvGKdgh1z/E26p5cmdBJN9D711kOhjMR/1f1IcSerLugUS/udoUmJPB9hkxdt
+/i1oNIDVCyilvSr5Wis+jOLTHPG1ccBfGQwYnsohRzIIrOSswFxXrpGfaJGGxxRi
+WvuTIaVXnmuJkJ3Yxk0uukVNAJ1xv1n6naVZcsuA9NVqYQThH5LilxuhXl/t/UuF
+catEjALDrRj3A1fd/HlHje7g8u2riyZutYV4KfsxGfDTx0SY7Wp4kTbFaBy9EqSO
+2WW8SkyrB3A5jAgAcDSu3KTpHMaxQ4g11FW13M8VBMKvl/4gcRCYhFW3w+vrwHw=
+=LMt1
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/files/localstart-munin b/net-analyzer/munin/files/localstart-munin
index b32d76092038..2934cba72c18 100644
--- a/net-analyzer/munin/files/localstart-munin
+++ b/net-analyzer/munin/files/localstart-munin
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-[ -d /var/run/munin ] && exit 0
-
 mkdir -p /var/run/munin
 chown munin:munin /var/run/munin
 chmod 0700 /var/run/munin
diff --git a/net-analyzer/munin/files/munin-node_init.d_2.0.5 b/net-analyzer/munin/files/munin-node_init.d_2.0.5
index a3ad32f0dd3a..657ae6640a3a 100644
--- a/net-analyzer/munin/files/munin-node_init.d_2.0.5
+++ b/net-analyzer/munin/files/munin-node_init.d_2.0.5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_2.0.5,v 1.1 2012/08/23 19:20:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_2.0.5,v 1.2 2012/08/24 22:13:22 flameeyes Exp $
 
 get_munin_config() {
 	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
@@ -24,4 +24,8 @@ depend() {
 		use logger
 }
 
+start_pre() {
+    checkpath -d $(dirname ${pidfile})
+}
+
 # vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/munin-2.0.5-r2.ebuild b/net-analyzer/munin/munin-2.0.5-r2.ebuild
index a85dc8a50d64..537f3b13a18b 100644
--- a/net-analyzer/munin/munin-2.0.5-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.5-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.5-r2.ebuild,v 1.1 2012/08/23 19:20:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.5-r2.ebuild,v 1.2 2012/08/24 22:13:22 flameeyes Exp $
 
 EAPI=4
 
@@ -168,6 +168,12 @@ src_install() {
 			"${D}"/etc/munin/munin-node.conf || die
 	fi
 
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/var/run/munin/munin-node.pid:/var/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
 	keepdir /var/lib/munin-async/.ssh /var/spool/munin-async
 	touch "${D}"/var/lib/munin-async/.ssh/authorized_keys
 	fowners munin-async /var/lib/munin-async/.ssh/{,authorized_keys}