Install two different Apache configuration files for 2.2 and 2.4, as access compat doesn't work nor does the IfModule trick. Fix the log permission for cgi-html as well.

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

1 files changed, 12 insertions, 11 deletions

diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 4de65ff862b8..c6121bef78a4 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -3,7 +3,7 @@ Hash: SHA256
 
 AUX localstart-munin 94 SHA256 e78cf5a383501a6be56ec4ddbbafa82a715ce76088a3d66e9474b91792ff67dd SHA512 2af51792006acc73aaa39632a76f91938511166db41a28d3fd4353c5c4dee86f2e292d86c04fd6bdbde4c210676e6a2b8d91c7c27b5f1921e362f171d79e6ddf WHIRLPOOL 180594f1860f4a19643ea1136be97b71c1cb0a7d1f19e5c4796f36ddef39fbb3c30053319e49a7f2d272e5c097016eec3de99cf7940f15956ee8a7b663d00a74
 AUX logrotate.d-munin 386 SHA256 42bcc50a21e72d9b68df4fad2f1016587f7b033301de754cf956a4d5789ffbea SHA512 6781be81ab473464647ff8a5961a43892fde2558bbad18c70c9d3c7e8a0ed8521db7faab3a56ae7dfa382a95e8ec64909fc6af9d2f2c200ee981784431400e2e WHIRLPOOL 6efa2e81b655d40555e4150fcb0235b275b7fab3b50f88ac2183b2b9f6e4b14541f872eff7935b29f01a64762d5ee5d0c1c9c71da1f8dd48aab7ae893030cede
-AUX logrotate.d-munin.2 498 SHA256 2f436c25f93b54d470570c9672b52c18e2ffaf98212587dd8a53a2ba7f417799 SHA512 442014ed1ee0996fcb64012cd2c2456fcd6cfbf4b8e5ab16035b873cd5a82da421b65c1ecf0e036655ebd7b7a5e85c6ae3926f8a4977203afc98f6abb5f581d2 WHIRLPOOL 5ac0cb18617b78517ccb03131dcb090cc0ab177946beebb7dc59328ed125613c86e352de6d24d3f384e6cba116ff7f1b6c0a08128b6f50c4a08b88ffeaa74f40
+AUX logrotate.d-munin.2 532 SHA256 3b2597a52a2dc6b49099be6ab9c685be2ea09ed136666c2c1d56af1883fe4378 SHA512 25cd3017c9edcf07ac8e54b75a7b881255a4043cbe6c5f99320aa87cea00118be03010d9b76e5c214eeac82ebc4e4d3807474c5d112bff23d83238e7650d6563 WHIRLPOOL bc956e4454887cc1f102eb4ac0a563b5317acf9cd83a76b1bf379b2cd06e5518878aded99be04e7c03d79bcda02265864d3b83e65afef76a19da81464154937f
 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
 AUX munin-1.4.4-Makefile.patch 2531 SHA256 9f19d908b7097267b82b773d8644a775f76d16921e4efaf41e93835e53613bbc SHA512 87ebd2b90aa40891e4401a9066860da99a3cfdb5bf80cf5301d1301440c5cd9a9b02823c10c0a1b5708ccf4816977a6df27a7358627e3d11fd811911a422916b WHIRLPOOL ba0b9bfb42ce4efb6bc5698058e6f9750ecda5a17423655770ebef120adf540aee5d7b822274d57b72cb0e2d414924025573b4b4b1677dd0c7cbc0b482a7a8bb
@@ -20,7 +20,8 @@ AUX munin-node_init.d_1.4.6-r2 957 SHA256 78cbeff21fc98767775f7ff2c75b4b7096d878
 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-node_init.d_2.0.7 859 SHA256 26b490cc4c5023c3797714ead05fc4a3bef06caad96c8b2211ccbeeec1081098 SHA512 09f8da4c1ad07d38bac3b1fe81818c1c29a3a32dc6410104afdbcfb853af2455bf7a2ab9caad21ead3aba937dabb29a9b8c962716dcfa9d491c67bb29e331180 WHIRLPOOL bdbed8b90748cf4f216c38c2dd96b7de5420ae25b11342829047e9484f80e30b7be0d30f2496f0992c6463529d29af05ca29a378d88d794d221b6c5c1d5059f9
-AUX munin.apache.include 908 SHA256 76a7cacc8d608470e0aaa45ac2890818a18e5e8cbd5dd8758501463671fd974c SHA512 33620807787c944f87a6702d0917d57b043defae55fec486997d2fb8396c233673c89b0b53575a20aaacfa63153364a2a1e6b950bcceffa4a7c26a9fe93b5804 WHIRLPOOL 48d0320402ad3a1ff65fc49d12733ec1fe0703ea34cb52bfe0af370a7ce07eb0d8a8076966b0f52d39ef0e535ea02ee909d5803221cde33348065553f3659a43
+AUX munin.apache.include 604 SHA256 5051ff79220e5ef578e6e5fa66ef8b0a71b72cca6fde93264cf371585f56cb52 SHA512 de4797ccac5c9299dd55140300276f746febf3ac5bfebfc48901ca71fa0e035017917eba054b251cc2383c65f1e209e244906b34eebad237f43a7bd7171f6087 WHIRLPOOL 5adfbcc61a3e5f7b6bec7396ca72bf24fd59406ee2a49ac47dc81dfff2eef98e688b6fa6699a9095f34943dd7df2ee1f392e1f7a9c1572dc0505d2439a836c5c
+AUX munin.apache.include-2.4 577 SHA256 21245e9eb7b759d2d2e65c2d1424da6d8c6fd8f49ec2f30cf72696cfc4227694 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4 WHIRLPOOL 90a166f400e8336792fabcbcb786169dc5ed6b5fe9151ac5aef40f85c8d3f2724a6fffe17e41d90f31948a9462fc619fe45747caf8f62d55f6d494d48a7a2bb1
 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
@@ -28,17 +29,17 @@ DIST munin-2.0.8-patches-1.tar.xz 8464 SHA256 8ebb8c8de5b17d7ec340ddac7184d2a842
 DIST munin-2.0.8.tar.gz 1328805 SHA256 ae645daee35214c1ba3d771d990fa781df741751b7b79e9d9fe48c583890dca6 SHA512 f767e586aee68c389ce0ae250376bc43d6bfe73df8e193bb7ba8b373d887301e0c1d3574c3fe456be3b93dc86cc8ec8ce27e3c36836a0048b80afb55a3a3cc1e WHIRLPOOL 312f006c21af98f5d9e548a77d43fe7396dcc69072e06faedb3d8262e70599da91bfecdfd06e859d6ff8706506e73308cbcac38e658a28e428fd50399f3f3c3e
 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.8.ebuild 10928 SHA256 f88c38124abc3a8eeba28e4c92d639727169a5ba8a9e83ff0331ecbc4f00d438 SHA512 e51854844a9897bda111a91360bab1a0fd8a229f4ddbad10fa5913be584f42428c1ca77fbb30c59217bbce34f57199abd51ece2d0bb7e926ccb22e5be61ba584 WHIRLPOOL dc9f9f064343a134fa1762d2f2c40b6a6a679a6583bfc0e14aa8f62817d4e187be9a15c92b104c1c13a3a59bc8dd1960de68fcfcc98299d935804ca15e8a7e3a
-MISC ChangeLog 26056 SHA256 a7d8ee3be21b3108c2b426ed0eddf993fa360ad8a4bd2487dfa79db3fc89a0c8 SHA512 7e6ca2bdacb45606b78655dc5d35b6c65c1c9b741871e3fff68a9813d1b3307ded417b5abd5b2584cfb7eb5a50966ff5711065fb9a10664941e03c0b672ee8fb WHIRLPOOL 29b96f6f6ce6745489caa4325e7763ad5e18db4371d18213e915cea8846e350341a914fc0db203912861ab7442dc4d5a9b10ab188b9c873e461aeae79485585b
+EBUILD munin-2.0.8-r1.ebuild 11057 SHA256 2f1a81932a08e68bb1690e2eaf110a4f3e2c917493aa6038327536d3ec6edcd9 SHA512 b229725bbe81add1dbc08c51b4922f5b676e597970af77e8bb827caa2431fe6b599a52498f5b47520ac5b4447eb7bae8b932d8e50e3f33f958af7d03a5ac492f WHIRLPOOL ad355ff9665749cac4f1c27f645f0250166404c8f492faeefa249d9e7a822bb2b82368a140d7df0237fe0238e16081601cdcc647aa2c25017dd7a1f8dbb1b07a
+MISC ChangeLog 26457 SHA256 1e371f1ea193639557e30ac6914b194c624ec6ce07ff59ce1401570399dd2db9 SHA512 9df0c6523c72590584ce59eaec078a70f552dcb52eabeadb08f8587ad85a2b2102b86d92346ff49d520f659cc460e5b0cc90b353a115f1f4057959991862205a WHIRLPOOL c50a824edcf3d2bedca43ef8d5a0c1a8b9108c3fa643f65ec186fa956810987da8a49aff382f62312076991a1c13a446dddf6c4dc3f4ce86da70529476911771
 MISC metadata.xml 3824 SHA256 5b838f6ccb778750cbcc41052480daaa9ebcbee5ee38ab66b054472b6313d177 SHA512 277f3ab9589982617b60ce8ea63802288dc4ff5368416a942f3670804a8e0a4cd481b2d0ff91302be040d2aba4f66a2e11b0c181164e6285dc33b150b263da60 WHIRLPOOL 7486ffd90f12e32a9feb557b4937397317cfd4325e5ffdf1dbaa749a90f3c47f797baea306585ac4a200e4a23901da1de10a9f0b951a15bd27f8a7c876c504a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQnT8jAAoJEBzRPIrUMBNCl7wIAJ3XoLWkXf8WeVaWt1UfFC9A
-YOdQcx+gM+bUYkRXQKRepQ0wYlMKnCC5TdZWVCPE+uiN1KTdDsOKTuGd6l04De8w
-SIACJU4sfxQgF4DO8Hzl8+byOf6DRRHDGzQ4KY0yzHbwAK79EQYktTsdZ3cJKduy
-XB7QtWAPPmYArhqUqJJBzwTRdS8Ggl92nS4jptY884u6GG4srUwSlCImfIDAD+q7
-I1Z1q9xd4C+jORYNsxVyPWIt+7aa/twyPuAOylussuHwlCI0Fq2kJ3mcdcqweEWE
-S+3sYLNyohYNJV4WgYIdIDQYiHfqX+SPgfL6c8HBheT5aRzqzj4IsrrOhmDGzEk=
-=0Oz+
+iQEcBAEBCAAGBQJQoAPJAAoJEBzRPIrUMBNCtDsH/iZBmgWojhn9qxknwgGWxxpa
+HVRDjjQ7l5qmqcT0tPNcrWKuMuwAsWTPx9z7ctgrbG4LoZISRTkwhflk4vJeH+cR
+NHMv9W2Sb3z7GpYymTGhk8IPUaZA3ey9EBx8Xsv6CfjTw5/7vtk4iKRPSRgoGLzD
+5c5XlaHTVHyJfzgiRMc3o03QILniynOsT5hZNciOca1D20WMnquD1uInVVwsTi6z
+W2fqekcZ7/Sb9EnBsa9eoNSkHLZDO+jJgS4IclmsyPqkM2i1oICq1CMBwNgrATqg
+vVKt+y6Vn8E4nA3vilkFJ2zfg/pP07TvnZGc/wOkWyDYhRouJ5EBtXVxNTWLq3M=
+=S05P
 -----END PGP SIGNATURE-----