Stabilization of r3, and make r4 available for testing

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

4 files changed, 45 insertions, 19 deletions

diff --git a/sec-policy/selinux-nagios/ChangeLog b/sec-policy/selinux-nagios/ChangeLog
index be92f1e2abe2..4f8bef01fc20 100644
--- a/sec-policy/selinux-nagios/ChangeLog
+++ b/sec-policy/selinux-nagios/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nagios
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/ChangeLog,v 1.43 2014/05/29 20:23:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/ChangeLog,v 1.44 2014/08/01 21:04:13 swift Exp $
+
+*selinux-nagios-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nagios-2.20140311-r4.ebuild, selinux-nagios-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-nagios-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index f47a501af9f1..8cfe320a2ed0 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -8,6 +8,7 @@ DIST patchbundle-selinux-base-policy-2.20130424-r4.tar.bz2 293227 SHA256 b5b115d
 DIST patchbundle-selinux-base-policy-2.20140311-r1.tar.bz2 259943 SHA256 0444ad505802b730dcc47daae8341de4f1a2f1cfebf85d90fcfe057cbc7aeb4f SHA512 d660442fdb92227a08d453a6e5678dfa63c1fe16172d05bc04ccc2a3e0860ec494a5747fa7baab794171e3bc6738b507e05b01485d3ed7e32ec2e2bd36fca5dd WHIRLPOOL 262421e7bbd1561e326f0616a36b8f3084a3bee4225526c00b1031a98dd31ca8d7266f3e696069bd8d347327ffebb86c08abe5924e4b917f9cf1128ddd74e4bc
 DIST patchbundle-selinux-base-policy-2.20140311-r2.tar.bz2 265878 SHA256 344e9c6c9f4466cbe39c067f4af902c25bb17d20431e0e19521490a92f41d80f SHA512 54b5092791038f97f7fd7dfe0d6becc3070171b2b114ecaff38c904c1392885756ce201663004bf4e6621236a77045828229fe2c5de317ba63da59786a99f312 WHIRLPOOL 27cd3eb4a15098d156af22c9f61ba02f0784a2eab49992b3a27777b5d60a76b6bc04e2cca81729176b779628886ca1ce13d89f865de3aa7380f1c9ef7682d3ce
 DIST patchbundle-selinux-base-policy-2.20140311-r3.tar.bz2 268783 SHA256 1d2f1d090a61e96ee26c63ebc0d37d1aa7f7c826b2885fd28bde2d0c81a500b0 SHA512 ef3eb5143f4343675c6e5219c6bad1b5cbc3c885088c0389974d7106e8da949843e1504edcea39888d14a20a8d6cf4032e24fa5891e7fa678abf7d9c7cef3762 WHIRLPOOL 5c875dfb043c0076bde48a2f7f1051e3475316578c46688e2e94bd79e0130bdc9cc5719e9fb2e5c3bca52e97e5d4773546cec1ae21bd0a0d37b5a57ac4adf483
+DIST patchbundle-selinux-base-policy-2.20140311-r4.tar.bz2 272598 SHA256 86c4e0aae81adf76054bbb74dd19a19022dbc2139a6adfcb3710dd679e5aecd1 SHA512 81b4ee890baf01f1b55a70f46454b3f77a7dbbcd3e860e309162389a34be056bfe82d3fb9f7b843a8476b2b1fb5919d534402c2f06eeb9390b33b3e6745ca444 WHIRLPOOL 8a4503d201d465b049757764ca0c209b03b66ba2af8cb7e979354c2d35e1c5b428d9a1876a606a765702c50bb725fe4f53a9384bbb205f9f51ca28d59aaa9416
 DIST refpolicy-2.20130424.tar.bz2 649845 SHA256 6039ba854f244a39dc727cc7db25632f7b933bb271c803772d754d4354f5aef4 SHA512 82ab38bc3425eb4b7d50c42564ebc28603e32e6f3266da164502f0cdc3a2f6bfe457518297824cb78f6f94211f9823fbc7254bb9e1d9df1cc7f284d326299705 WHIRLPOOL ba7539261a072d33e34afb940a1899ccdb2493c3b11eea3b166b9eb565478fd93cf580d09ef016f799a5dd5a4452086a623f9b3f38fbfb9a812e6e31bcd68e25
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 EBUILD selinux-nagios-2.20130424-r1.ebuild 454 SHA256 431c721167440d7ccf2b3445bfaa0177f6fbbebc70486141b41e50c1c5375fd5 SHA512 e31ce890777266f0f7b5e8f13c0e573b38b4adb4edaa90c1651f109bff00cd016a8ef6cfc7330ee3f38df55b0b17eec7fd3d70911b28fdf3f13b15447262122f WHIRLPOOL 90e54da16d2f7281b25258a3bf90581774ac7a2bf2cf5aa901b88375405c040f2c40200c239f97c1c95fd8b9bcf806d32786794d4f8771825e0fdac76eaef00f
@@ -16,24 +17,25 @@ EBUILD selinux-nagios-2.20130424-r3.ebuild 456 SHA256 8dc6021d3c9b1547061ef0cd18
 EBUILD selinux-nagios-2.20130424-r4.ebuild 454 SHA256 7509e3c2a4e62538e388646b1ea5689aa507b5d168b4d834c34dbbf34df5a2e0 SHA512 fa3699628e5da6ef5788c0e23a55f3f59b98cd25c48879cd828bf13d384028c8590f661e805bb7398058490ba6c00fc96d7cdecfdc5829ad33e5ac20d9f6d8ac WHIRLPOOL 025d527f6cabe18d2c51e409b080ea0e26ae4c145730c27b0e06c6d7b5351122491bbcb226c0c3875ffbdd093c3b415f73b7a77e5018c614fcc13e87943b4e33
 EBUILD selinux-nagios-2.20140311-r1.ebuild 454 SHA256 1068a9ecf8e644b95c0995e6f319fc4bea3ca680ab6b8c05f3cc955fe501e47e SHA512 528bd209b0c90e6ba6431e8d05f2bb4c557f377dc1275e71a2d52724c02e5d5bec0eeeb7428d90407e2c3d4ed0d9842243d245293563d829951432992d269e04 WHIRLPOOL 75e6604b0615764f40dd48a3f89873a5775f2953d807e9314a3e4ef011df7d7d430e16c3bcac36c4972a7c01c4c6292fe2250a6349f97718484e7b488f198ae6
 EBUILD selinux-nagios-2.20140311-r2.ebuild 454 SHA256 95d666bbbccae56f17f0b90c110d6797c80f8ba28d13735d20f745a50909fa42 SHA512 d46ddbc7e21d96b8fb61763a0b4a268cdee053d0db969ab79207d380cd2b20fd61ffa9c4b93ece6705a5b9a626711bcc8cb9510afdad4dee3dd5d8801b0efbbb WHIRLPOOL f66aeb577eb7f4fe0050cf4d9216ef6d37734012c01f5bb141348c59af4c169e41ebf8de480c32a554e0069d9fba968905c9b6e9355d700c5a86acd6b7afee3a
-EBUILD selinux-nagios-2.20140311-r3.ebuild 456 SHA256 a9b3684cf12d584f3c273b1888a8c3332db48698be9151bdc014235e56232464 SHA512 7b6b1ec509318553833c5d5b5216c8f2c4ecfe25b490817d2e33f8b81205770248b97018b4b25a614cf6f212800b955052cd34e3edbb97bfbe6e16e41d642749 WHIRLPOOL 9a06ef93665804682c4b309cf908fc69b88fdf4f793712d4387ab9d72501debba80b4fbba12f5af026d76f333cc46043d91bb47462cff6aec46ee41e741f23c3
+EBUILD selinux-nagios-2.20140311-r3.ebuild 454 SHA256 de3f4149ff30d0e074f188fb19cf266624b29e83252d1c9e174025afa2bc8e08 SHA512 758d7b21d3d4251eae6a242eb81550cb17c956c7c50d8e1d68487b16645344c6a7f661bc19ff5120fd9a66dce0a462d2b6417d5a95383eb69c46ceec6de675e1 WHIRLPOOL de4748e4bc326290234a95c21cc75bf836331127e1d4c4c446912966f5640ad922f5165acadbe74d927824d6cf4ddee365321a9e0aef20f42e774a98c00f97d0
+EBUILD selinux-nagios-2.20140311-r4.ebuild 456 SHA256 dd0b62ed7cae6fb34a978b02cf11a34cdb572140c7b029b75dad649da546dcb3 SHA512 b7c9bea6884050d97c6cc68a0668a5e71ae10b41a785f5776051e7d0c7effb89614bfe495645b039d627ffbf6fec4f409ce1b4e63361879a162ae2396685a14e WHIRLPOOL 8543ceb607b769003625ec16e460a47e049d536f5fe5557d3f896b0cc0396dc83449fba5154a8e55bc0a47824e26dfec880f03da93f2aeeee6cd3d98ee5f8765
 EBUILD selinux-nagios-9999.ebuild 427 SHA256 60f9ae280c9c1c82af5ff64a902014e4f9069b3ff248f8df22e504d588cbea69 SHA512 18c7923cbff3feb28f2ba9db526478a0909aa5361c47dc11ac954f8d8aa5eb52d3e9bea0018b6a8faed73fe5e8a94716c34c3bab43857a290e255de27c9647c0 WHIRLPOOL b6acb16e3d8a74e0a0186a0af4bb3bbc12c34a51427235bb6aaec7b096c069f6d33b49b3497a86245a5a01d81194bad2fc2b22ae9cbe285f11e7937de77a6814
-MISC ChangeLog 6538 SHA256 aa907cf248580785d89a40fa45ae27149b9ee85b6f0a3a06d14038c6f4089148 SHA512 f4a8f610a11caa3625b7d43b013ce12c2a52befd0762d1388efb07a98138da337ac14af060ed4fc32a1b60da6c5e97943d2a57173ed7a483c28fd284a9b662f5 WHIRLPOOL 0be9c2d2c2c2806e5ab5529813f317374aa1fef06ad9a0b16c80145caa08b72e53a6f4ccb147c0becda731266084bbc12c27a7bab221d9b225b10f6d74bbe1f0
+MISC ChangeLog 6767 SHA256 2ccaf7715d5a7870c4535aa1861d1bf4a28316bc24b23b630791b12b0ed85802 SHA512 cc709feb20fe65a541fb7a2b2b76a03bef962e48496b3e3ab99cf885265d2521331ff24c7917a52700f0c920d0d2f88e124d2b6fa5e9752f68aeb29435f75e2a WHIRLPOOL eec11446337e9127d03a391a8e2a1276901fc30365e29f3318773316b2b85dbd8d70981a5158e82c351441c70a1897029627ab94a3733c12cea1cb688d43fa93
 MISC metadata.xml 230 SHA256 4b2780b5258cf4a9bf47d433f6e923644c503d89d1cc15ea6bea154a9bcd7723 SHA512 9c7a08f69c5f630a8115c4618f9d29b2c7325b8f58543b29bace84443a01ca25b34dcb863d8856fb4571dd79d690dabcdb50a0c08ae5f0511e9895043b300d68 WHIRLPOOL 4ce4fc473a3d12f082713389ecf12cb0106d90201b978f8060a56121ed18d521679b39f45b44c1a708263b27eba01ba86a6808f039a1b81f2f10f1055488e6a6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTh5fdAAoJEC7dUkA7aK9H254QAITqAy1vuO0NcaAgC8TD60AV
-w9xdH5/fjtT026kgiz4CFITw7LVlO0+mgmwenyp8PTva/hw+2NywocrqS8idppVO
-bBrETyaIH3BxaFI5BUxdKgnWQyYh22YiQfoCKbLJR22zqMkjpNzwkOEXO406filY
-KK1PbPopZyZxFf9krDn5A2cAkjlG1m1V9KdyDLzZrYihe0yP36UaxXN0ocdU3V4w
-Qyo5c6ilx8kTWRCz40kKVFy8jTliHn2szODeko8Ws30SGk31YpMcZEo5mHIqpYmJ
-dqOvgE2543nvMOuR2hu7mKAoxV75lrD95xB1unONzd1Uy7pl5XQQZb797tTdyfG4
-QsH6S5QzVBFiGzeZBatdluNjTe0Qh1jxzd+463ngqXwp6k7w/OuQbu+0Vjtsmt7u
-OaiforBvOohynO8OcVs6aw9aU6kGi+YsaOosomR9xSiplzkjQkHWLnBth1ax2bWT
-x/P4MaW4bOx+wt4TZgCsi1REWBB+i+JvLGQlGRQA3q8fuTXsgCYNLrpWzao7dLgD
-ofyWpSgrSmdHa3vkJPxkWyu9pWvBcZl2/1qo6PPc0/D/cSJ5GX9vaS9Dnn52fdXO
-VC9GoLbz4NuTk+WEr19G0H8IwN+bFJv2pVZmG9TRub9aSXPwg10ml+p1XfHTE6N4
-e94iUHPhzmwaX7yJxShp
-=bGMZ
+iQIcBAEBCAAGBQJT3AFtAAoJEC7dUkA7aK9HKewQAJmudm2aGAh6qFZIltnTeVV9
+shjDnJukykWWmRAL8a0heIW9WobsabzOycPountRQCLmI52IGUoJvsdCW1XpHhx3
+0NTDRc6JMyxg1XFw4GoULQekt7FvxyVBw7u/lWD/g91ROMpJRzMUBdo0ZFptsjim
+dqcqfMgxdT1PTs2a2XwzzGiGETkBH3S/52SXj3VH1pPsslQ5ddBjmj6Yk3bsO4JR
+XMBZfhPXf5eQLhy7Ey87SNRnZimRBLYgFa5OQQhDZWTl4ph6tFgeMfewnwS+3aL/
+3OKCC8RdhdAJcbjWWPzz0ISm8SD/O6wvjtNVkuVlf////8Ay/7L6TLd7OUrd3uiE
+48Lc+85bsXJhTAev0EMreQkZ5fPD+p1ZkxgoRJE9wMVtbD5hpDOU6GB/4mtf7itR
+QUl5W9xAe4LLTCSeRKXFQeUYDyMYpg1VxdjdufzpF0isEJtdEsK3jO/erz79mYnx
+xYgaTLzKzneqRIvL3+80hhAfX2y7ekmg5uXYe4L0xNfVyRFf9j9tF/QMJzM6hhTP
+ALUvRN/bObQZPA45xZ5gq45bsDx/wRerUehtgRAba9ke0+9NX/E0CdCWRN6iJF1n
+xItTcWM1tKH3wL7us9GSR1Ypwx2mF1rrvuHZxxyVdXKvG+iCOULyNFzJqsD781Ps
+8rDhwcglQnxBFy5meQlk
+=qHCD
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r3.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r3.ebuild
index 64f66c77d911..ed56ae4fd096 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:13 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 "
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r4.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2ff966bba5eb
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:13 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nagios"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nagios"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"