Supporting the SELINUX_GIT_* variables

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

6 files changed, 47 insertions, 38 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 91e1f5770ae2..ae9ddf289813 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sec-policy/selinux-base-policy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.146 2014/08/05 09:23:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.147 2014/08/06 10:20:35 swift Exp $
+
+  06 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  selinux-base-policy-9999.ebuild:
+  Supporting the SELINUX_GIT_* variables
 
   05 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   -selinux-base-policy-2.20130424-r1.ebuild,
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 112990100180..59d4f871294f 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -12,23 +12,23 @@ EBUILD selinux-base-policy-2.20140311-r1.ebuild 3842 SHA256 7ade39bc56c0f5709444
 EBUILD selinux-base-policy-2.20140311-r2.ebuild 3842 SHA256 4e8fd70bdccf6ebe7dfac5653f04daca037f6260a731b7843bea78d474a02774 SHA512 8b6c3ef63ddfeb2961a3cb485a472775056903698140b456788766eef410f89dadedea5331b0831f22e75390c14a3cda3be9f20cc57211c16f1551c5cc7aa1f4 WHIRLPOOL 434bb884e4818324c8fdc0a3e32b0472db759e357774fb3891248a2057d5f6f3c870068c6725641d706d812b6e84263950935ba97e0ca373dfe7816a30c5d9cf
 EBUILD selinux-base-policy-2.20140311-r3.ebuild 3842 SHA256 2d3062fef28e7d4c196d1fc58f67dd375ed50559f49f04a4813602ec5c62f9e8 SHA512 1c70c28174b19f5cbe133bf1ca2417054836f5135af4afebdcf2c286f5fec8cc235568bc95fc576f08fae00338f04ed09b6b86df4e64e9e2bf5d27e8b7a9ff52 WHIRLPOOL 2566012f7972999b05c570aa1faaee97b27c7f60c9c69488e5ed40fb19620bc4ccbad6bc59ebd8faeaf51d49c9224de6e6bec3c900eeb98674cd894b0489d839
 EBUILD selinux-base-policy-2.20140311-r4.ebuild 3844 SHA256 15b1a60872c468e5e323987b1d56a08f8839757a50e77d90822bebe3a8e4e794 SHA512 c3080b9cdfeeb59272d51aed107f3fb9823a875dc10336e0a65e13470c154c02a6905246108ffb85cff7324e745440dd80135c3129a0908421a9be9862da2868 WHIRLPOOL 8f4f17e533c628d9783c60049397aad29ecb6e74871842870e220fbc18360b5353fb311fb927e8540ff4f9d0c57748c5eb2d15eba4ef6561a488a34d262c7edf
-EBUILD selinux-base-policy-9999.ebuild 3456 SHA256 af2b7bed584ea40d6a5fae8d16b301a38fbad2b1e170a9104081aeb69f124b10 SHA512 73519926a5556a0c53fefb5eca2a530a1924fbaf5583eb5ffa745aef2ec5f7a319b6e4dcd03902d551d2b286653145ff5c6beed3c00c5c891bacade2b5c6b3b4 WHIRLPOOL e6fe306db8eb6b637cc8e27e75413ee534da55483ad3fee5062168cba90e509292847b3d5bbe266e35fe9b007441571d452e97c45431cf9d5cba81a523080152
-MISC ChangeLog 32468 SHA256 98d5dd8155b9b9d5fdee0d7f35f20efff06e7341d2c7ad1deb10d97ec5e689a3 SHA512 66f3106d7424d8ba6532f8ce2a0765fc92a4adbc68640068de590c2247c68755db46c48706f81084a7ae52c1169f9b52db5612b2cad70821c9dee5b1ff1edbd6 WHIRLPOOL 440c0a98ad0b77170b1396708cfe78c9e50e4e454daa17b0d47b1eb067b4e7521cabe4780509f436450bdfcfa2eeac758d7790664dc56bcf85dfea36837912fb
+EBUILD selinux-base-policy-9999.ebuild 3589 SHA256 ac3e60ab7ee484b67f965692e0444a0bfe2d89a3ab991888e78a7f19fe3634b6 SHA512 edf9265887d5e6e722eb65f8b1d0357152fa12d20d7d19996b042f0b9499fa94a76a9c62db15fd18d63bfffc82923f05f2eb10f64fc6bea73fb1f66c62334faa WHIRLPOOL e8e6f41223f76dc950e6b00f84f8f737afe7e168b0205b8431e7565c89255fb00294787bcec1ab11645a1387f30af54e8453fd02ee06778951909386a7f24a57
+MISC ChangeLog 32594 SHA256 da0529864126fab35ae702f107689b46dfefa98f5f1b9f4b048cfb199528c25a SHA512 76ee1d0eb73fb8c18f07472c357301fee2c2d12fcb3272fb5404517b328980d866c1c7f6123d77544e5b453ac0aae87616323e2ad30930db234556588aa3413f WHIRLPOOL fd2912d64eeed70fbb89e912d380f9b35e385b3f0d410bb13e1903d135792b95a6f582aa565dc63aa45c69e7dbc5691031ac942e5d44590d66ac5683bc6325a5
 MISC metadata.xml 448 SHA256 4babd5e53785136aa79ee0737a89af1fc49c4fc144aba0f6163d6f85215f57e2 SHA512 7e747c9dbae3eaee62a284824a68039961264540e0633e617aaabaeef2e83f4623863d29ee26c2e4738ac706d3824914f530f8e2b990ac7f06aa8f6e4cae9964 WHIRLPOOL 733957f76ca89c6fdd08060a368048276247994db56cf8325e69b896a07dc5e576ca124f3190079b169ec078a2e69156d4b12e6c6cc94328248705779f357bc4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT4KKGAAoJEC7dUkA7aK9H66oP/1FXh/3nFmWQ3bcZGtoc8uVp
-0V8Z3Z5ZQwKHk3gg+boLr3V7AUmBJuwDk7fM8af4RkAwabvsjbJeO326oLRDV2UI
-NvjElgivreFVriL3GJQIFF6vifEkWs/uGusxzWfvvPzdlVyHdO/b0yPQ3TOLp2a3
-AihK+fl+ZF9P46v6RPMO5MPtLCgTDDBLlK0f87K1cg6gE2f0Zv9kpmbG4urzx8Mq
-gCIzGcmq2w159DotYbcLWbXY8G6K8UmoCKqVKxH1SzOsqfesy827wUs6jN78gMjQ
-D/klj9kUELiOo2sLjIoRFM9hm3kyY/mOPSWYCcJNP2UYMZLJgBA8khGu62lCI6AA
-+rpMfPIyEb+SEV+qXQ94lYoADMJ7FScUwC4VjMgBhqebDAW7txf35so5JGs0pgkh
-mifK+nT+w88+HbXUG3boI8F1AQM8Csc2ntyPu8ctOSacsPXbT3E//8QaHFNpmM3j
-e53X4KKEWcb90srjYMxQuZwGtSznGavEzqy6O87VdGgW2uDYstfD6ReGH0j/7lIH
-fvPpkrlttNzpwqdxcYBvNcz4qhrQSRGcjDxZVQ9BaHwUQR7mfPJksZH82DltoLGM
-PzrfITYzF2lOwRiGI6GcflbRfn62MKlyLMOR1Cqy5tdXI+JGYfTNoIQNSzxrrFma
-2CW18s0TX1fF+Odg2SNs
-=wZkr
+iQIcBAEBCAAGBQJT4gEbAAoJEC7dUkA7aK9HYoUP/1HXAVg7BSpYflgc9ZP/kIdL
+wZunZvJisRD+HXsANt+fuunTNFI9ZK6aKjSpaIcZntFyeoIFkgT3FQQeV6i1oA2p
+5/FX4koqCSElLAVEVVRJmFPpQZx5wyATti3zNR0NEjccgFTb+YmOyihDgIpr0UaO
+LE/dfRhUtbv+qF2/WsiI9sUkgbey/+KE3u2vx2j2CQ8WNSh3Ix05RsEEMwxWYT5O
+rxjuBlR3M1hI5f73RQwcr9UpyWYQhnYKF2BY8Yk2K8Y3nRHxW9E5XHTAqJLCPDXJ
+iw0ijHAD/tGDP2y+IgPgc14cDp+M/4PxXauU8OE2duP/o5i+qmo87NnmgsEv080U
+Z7mFTnA1dRmuXBB9DjWK/cij+keJCHbfpE70BmBrNK7m9L+cNwQ5BZs+Fu1akwsz
+/pRAWSCvHl8y8JedyHRtnLAqCG8Bbtdb2f7JpyJWISzXV/DKS514uzcc8Lp5qShG
+RZbnlc3ICBwWf31q4xNj0dPxJFeERbA3au+5Ake/VV9P4wqV2VqJjH7nwsh6DJjt
+z8P1Axs7TPFdVFnARhvwSW18o7L8LWGmMVn2cEo9wIHP3LNoQfzbpLFxrVBbWGp1
+wdendk7z+Jyz3N1iryy9uHaWDm+ldQ8FBTUVdzYbrKtY+iZzyQ1pR1R58eYZxUwD
+4JoQ+YDjE5shk2rM+LME
+=iY0+
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index ca15abf27742..76d8ecaf6011 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild,v 1.7 2013/07/20 21:30:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild,v 1.8 2014/08/06 10:20:35 swift Exp $
 EAPI="4"
 
 inherit eutils git-2
@@ -14,7 +14,8 @@ BASEPOL="9999"
 RDEPEND="=sec-policy/selinux-base-9999"
 PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
 DEPEND=""
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/hardened-refpolicy.git"
+EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://git.overlays.gentoo.org/proj/hardened-refpolicy.git https://git.overlays.gentoo.org/gitroot/proj/hardened-refpolicy.git}"
+EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
 EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
 KEYWORDS=""
 
diff --git a/sec-policy/selinux-base/ChangeLog b/sec-policy/selinux-base/ChangeLog
index c4989d8383d0..2df30d1f7baa 100644
--- a/sec-policy/selinux-base/ChangeLog
+++ b/sec-policy/selinux-base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sec-policy/selinux-base
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.46 2014/08/05 09:23:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.47 2014/08/06 10:20:02 swift Exp $
+
+  06 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-base-9999.ebuild:
+  Supporting the SELINUX_GIT_* variables
 
   05 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   -selinux-base-2.20130424-r1.ebuild, -selinux-base-2.20130424-r2.ebuild,
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index 6b0c47e71771..9bb9e145d076 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -11,23 +11,23 @@ EBUILD selinux-base-2.20140311-r1.ebuild 4500 SHA256 f79b925d17d5ab4d68301ead1ca
 EBUILD selinux-base-2.20140311-r2.ebuild 4500 SHA256 706f0ed52ae8617bf6d349daeba3dab3660dab5fc361c11f33779c0ab6562518 SHA512 97f8ea114ca4974c3f8ba0ae53cf12aa2e68a270e7e424caff49179024e27aa0344d1c9b9bf005709c1f79c53f384ab9ba9bd1d49960980ec885593916b221fc WHIRLPOOL c7b6bfff7047f22951693881d4117ec33f3bffa4ed2255cf669b9890f16a3b05b56d412747afe2b12ac7f65b11e65f1d0b4fa07d8141e0263a8d52e48c3658ae
 EBUILD selinux-base-2.20140311-r3.ebuild 4500 SHA256 b80c252890a682a023fc212e3fecb631f51d0315a52b1931732562fb1a9e687c SHA512 167a1488e191791e9f12bb3e585608625cb6ac812d5a3d6379f907657d1832cc472a626ea308be0c0f2d94c31ed0fa13749b881b79eaeb2dbb3ab146c0b2d2f3 WHIRLPOOL 00a345a9a7bf273326d5a84d659aa13a61d56bbd57fa12f07873315e06e5f7f29921cf673dbc4a8172374f54ae0bf875dfc3164cb275c791b4040833aef7413c
 EBUILD selinux-base-2.20140311-r4.ebuild 4502 SHA256 cf21cd4dd2f3edf00ec863a24ba10aec99e7abcd70f3eb011d84c9647f449332 SHA512 90c0a5fd5f0c1d694ef34584cdc84136bb441a8d16f75b28f8e52ff9c9eb4ee61a578a1aa10a5621d7f14460c23f54d231d009a9770368734cda74da2a882cdd WHIRLPOOL adc40163bc672d7f513d85e3805108ceb011c51e9acf2fce0d0b594e64d6059f4c45bfaf8972706af02de5413a80376ff531229fec1d3ffa54d764a3fe25b192
-EBUILD selinux-base-9999.ebuild 4179 SHA256 2fae8dae1816224ba23c76cf595bb92c61816d9378ced42e187de2a1d2a07f3f SHA512 01621a086577cc7378b66c61a368b3e8df2648ed1ec843e006302aeb50d07a7e69c8f26b1b8243287e05ff32ca208168f0521e07399b11ce5c56d8ec464c2a57 WHIRLPOOL f46949ae06095e8c4dd7e69cd5747c1d16cd1230710308e219a7eeb32bd4303d36be502a55831234491029af9a1d4f80aaf0a4f712050a46d895f93eda3f4d6d
-MISC ChangeLog 8026 SHA256 471300f29c95129f24b7f3c0a8f262441f9a00d8bf9988acec6dcef37c61f3cc SHA512 d65c22b1893edc5250c3a4565e36c6f7753c517fc1fa986d0962f96a1077977cb22f37a28097426b822c1117695dc36c33dcbde4d5745c9e46b1bd67d0df076d WHIRLPOOL 698959a96898fa86ebdc102ec41a0bb4db1206919f142c7228f6ce29e718ccaa931a8d342eb9c3956c89830ec6c58298e179da2cf108a8b1c5fbeef833ef5807
+EBUILD selinux-base-9999.ebuild 4312 SHA256 b30b65b1b034efba22d3aa91dd26d0c8b0444e9f77b3b8c705127f078472d3c3 SHA512 80ff3b6cdc68a15ec189b3903144a9953ce0d28309612346eaf79ba8b56e4743acba337e1321386db98a5277ccc2042588bcb28ab36d3b38f6f18d2d3cec6003 WHIRLPOOL 39f00ac8c96b00ab5e762bb59c2d26789a27bd9691be29319e66c876fdeaa684babd625d459f2f8660895f5b74b794cd5d12b51138246ef142b8bd892a9be7a7
+MISC ChangeLog 8143 SHA256 14d1d2577475404b18ab79680b244d2a3463a3127aa75a75fbcc223cce84b747 SHA512 25be6886f36d5b5fb7c2820e193eb112514f63ce5802bbbb2b344e7acd3403e6d676c70b73964499c4823fd48fa8a936c4db245e8b7fc550bdad0c1e5706f858 WHIRLPOOL c122147cd4cc85f168d071fee42647561a93b345fa39a6adb2d04afabc73da1c8e5f2b28f7cab771824653293860f5ca6e3e0b161fb7c945cbe1cd4f2a66c031
 MISC metadata.xml 753 SHA256 2542c8e9c994b3b2699d601ba980a8daef2288b5ad199867764f607978ddee67 SHA512 d5e803494fe0831fdddada0f1f464c941d93896afa19d9d1005daa8a4ebea7b20f905e6d0d89dd10ff1aceaee0c7c41c190f16b68bf4466c0f75d3a6110b8df0 WHIRLPOOL cd2535802ffacbdae1ff1787aa203311330202cb08df488dae59b178b102b818766d2320fe62de3cf7710047e8cafa6a41963381655d9fd5fb4c75a232decd52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT4KKGAAoJEC7dUkA7aK9HdzsQAJo+uMRAIrPvgKB2LSFwUAXi
-FvfQ21N7kMgXKTQF9vDFgCE/lQfe6T2PyWfmuhxOPbOE5aDejK8HCp1/TY5Rs5++
-gwGi+jqR2T2Ujt0ISLMQTzJfj3NQSCjbfJ9dOqZZvRZDYkJPcif5U9AZRHMUDC2P
-JKQlju8V/so4v16h+9Luwrw/iiy6T1uQBqh5Ng8QwWKWjQtbNzovEQfdggYmWitu
-EiWekfSKkVR7fq/5Mv9/raWa0blcoRAYlt9X5n3U+0I5Q/hUJTNr7zeezQ9tmlEh
-yHCefvYcby9ESgjxyUHimfyIvlGQaGdSYa9ZswVpx2knUEPY5CmtxLRgXUefU4FX
-lvveORfNnJF+NEa5Ai6+GImYdv1a4ShuU1HH/04JA4ABk/xOvXiTTMZ1J0D8JOH/
-eiF2nwP091Wp05EKrJiacSTkHOZIW6DxIItQ5+HTS71cMN+yw8watJWj6h+4c/Va
-5DPNvPBirRePqzHwUIbLkMV39o95yic48kfbL/DhLtaW0LxTZ2n16lvQx271JXQQ
-4ZqTOzspjYt1adH7JpJHJIxSbPCwnvnSWVY5CTbNRFRQ0cgCPmpI5+Ymir/UB26z
-TPLFXvQedbqVlEjO5AvZbAc0Q87kl8bkLxOspStIWOsXOGY5WnrkW4t7q6oRU3YM
-rr/RkAWoC9nVMZ6z042I
-=pkl1
+iQIcBAEBCAAGBQJT4gD8AAoJEC7dUkA7aK9H5AMQAI6vEJX45iDihK2CXg9HDVZJ
+JAAm2wleRYAVe9nw7b5oJd8KUUSKUVmGMUlmCvs/NgfjtCgLpZI0HIBDevRm4tQl
+/v8wNoCVhy1khAPINcDrpS3D++O2YZAPIMlbCRYbc2YE/dc5rafpJzAOLLIlDQiy
+pRokxr5mPXyA2tLdIZjDwsaPBjpOeKllqdY8e0Ue/UQOK4qVIH31lLMGZAkU3GjQ
+/7HtkwSKt5Xb8+SzOAjGIRhYa0myW1x0KeWPYi2/KuFk5ZMy//x9FOc6qQ8bIs3b
+O+6OpISeiPwAxSlkpL4ENTvSKLecmcz2a/8E98Tb042LkeMngfiYxtcxH01uyWjY
+ZaZdzk8WiC5PR5pBSMVkI8kGmJu0EtJPD/iOQYLlTpFgbsyWhhjY83/s2irJQsGD
+7Yx1ohb/15UifAhBNK+5GFTi5IdWczh5+6wS+dJmJpyaoKrI25AFgIDYIIS9BaWB
+IyKjYFCBv40dfW6jmKse9XL2+uSB/yuyUN6YILTQJM45v7xYfHU8Ke9rgRnlfW8M
+pVNt1xVV5zJ8LCdfkTqpocyooVefHugQzczt61FCZQF7Pahl83+3uyKRoXjF8+n4
+y0GzBlvlUzZsPTOZ34MQgInSLLTWcyizGlFc845AezfrLEyUwEzjDP7J7nw6/+14
+r1ldxDNHjqqHjUCwll36
+=0xAz
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild
index 90f110f04721..100952d86a3f 100644
--- a/sec-policy/selinux-base/selinux-base-9999.ebuild
+++ b/sec-policy/selinux-base/selinux-base-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-9999.ebuild,v 1.7 2013/08/15 09:39:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-9999.ebuild,v 1.8 2014/08/06 10:20:02 swift Exp $
 EAPI="4"
 
 inherit eutils git-2
@@ -9,7 +9,8 @@ IUSE="+peer_perms +open_perms +ubac +unconfined doc"
 
 DESCRIPTION="Gentoo base policy for SELinux"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/hardened-refpolicy.git"
+EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://git.overlays.gentoo.org/proj/hardened-refpolicy.git https://git.overlays.gentoo.org/gitroot/proj/hardened-refpolicy.git}"
+EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
 EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
 LICENSE="GPL-2"
 SLOT="0"