Add in support for epatch_user in selinux-base, allowing users to patch interface definitions

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xCDBA2FDB

4 files changed, 17 insertions, 9 deletions

diff --git a/sec-policy/selinux-base/ChangeLog b/sec-policy/selinux-base/ChangeLog
index d55d4003a66e..a1a4d356136d 100644
--- a/sec-policy/selinux-base/ChangeLog
+++ b/sec-policy/selinux-base/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sec-policy/selinux-base
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.30 2013/05/06 14:46:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.31 2013/05/07 09:21:02 swift Exp $
+
+  07 May 2013; Sven Vermeulen <swift@gentoo.org>
+  selinux-base-2.20130424-r1.ebuild, selinux-base-9999.ebuild:
+  Add in support for epatch_user (to support interface patching)
 
 *selinux-base-2.20130424-r1 (06 May 2013)
 
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index 63a4828018c9..daa9c534193a 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -19,14 +19,14 @@ EBUILD selinux-base-2.20120725-r5.ebuild 4172 SHA256 f3c0f93115e49debdbf2ddb9b94
 EBUILD selinux-base-2.20120725-r7.ebuild 4174 SHA256 e7b94afe300457fd8295584d2e397e4f62732aa99cc5f5053944e785f067b614 SHA512 548c1b40af94ea34d473a34c6d17ba3c7bb52ba18e03b56b47f6a05d18b0ac55258f1fd1c2e68994c667113c840b0227f85beafebc4f6541bdcf3ea5d16a3806 WHIRLPOOL 1a4b367062999ab4a5f50e3268e74be700255f214c2f6b0a3980e43e6416df5a2a7a23f2716647f6ee24eb7f4a01b8b7db9e12f5e15c84759df2d709e9ca5142
 EBUILD selinux-base-2.20120725-r8.ebuild 4168 SHA256 56b1379b8849ee4c610aff727467fe477e89619d6af7172a6098f3a544d69609 SHA512 1138a9216299eac2d0bdd8cf3e5041613bafd878f1e4172d97e972099f981fa3633534abef1c85c0d678e65618fca2aa2e7307c43bfb9979ac1f8e1f65450eea WHIRLPOOL 65f4abb795749d0bd090a7cf52cc305eca349fd1287af1d963b29f571d6e5d97ee90bf3ef0b748e7e223a9f672fd27007ae0ba8e3f07488f0ecdbf8b9452eb12
 EBUILD selinux-base-2.20120725-r9.ebuild 4452 SHA256 5bae3574a7be5837858a354c3587ca475bd209ef59e15b48dc2060a4e4194bee SHA512 07aa6e752df0b5c24ade53494b1b04d724011dd5e5c219a31e819bc1b465de6537b4791dd49a16b8b65a84a80b0b2ec567708dd163e27278a7706cfa7584c005 WHIRLPOOL c35df4248120889a6b0ee84bb1eaeed8bac3d7ea4873dc79de5cd31185abf98479cfa96b2ef01c725e26ccede4599b53330c6d35e508630f258b9146b0708a53
-EBUILD selinux-base-2.20130424-r1.ebuild 4477 SHA256 48f1fe48bdcd8ac5f8654e853bde291faa408b1dd9fcce7aa2f5d2635666e238 SHA512 4882c4ee31364ccc1267bafed31972ce45890f9ac9aec1a9d30b06d6589391c86aa81356470f566a214362df9997a571a14256f85f9649ab7d7fd5ce22b6e4e1 WHIRLPOOL 9e46c8f96a14c6fe8684c80bd1826018a8ce928f9827eb31e71a55ed5df1e7f0e4683e06599b4cec70f7d85207eae35c16dbb1cead4ee470f758f8d7b2d5fa7c
-EBUILD selinux-base-9999.ebuild 4154 SHA256 f8c4aeb3e145bb6f3128d18fc33f62dc0b8c0a31b9e73e9f88aa2fa314cc949c SHA512 fd5f1f6fc8f4cd1a7218ffab49ecf2fec492fe41b0d1aef20e592a0668aaaa6d224a6bd06c96f9281b2ce373e83918a1961cdd5d94bb97eccdb761b01d148dd9 WHIRLPOOL 2c7a64c5c8fee9a728dcfbbcd3ea2c4fae053eef7f3e6661769c93070637878a817033073d6e81fad62d137c99b99bca2bc1469aaedbb177a1f2a9f1715928cc
-MISC ChangeLog 5326 SHA256 ab904acfccac0e27f2dec3fb8b6f992d4ec3e91268c191335d54f19944f17663 SHA512 aab38e6071753619905cb43d5a00b3ba734a657c267d276eb68d4dc2e07b8226d21d4c17a7d5bfe26000f4b767e0b83bfe8a16a4490339fdeed3251407af4334 WHIRLPOOL c67634753b85d6e338e5a398ce49389597e49a2b3d824c50af4c28ba14d29c43b9c85adf543ee98a5c58458d8f4b38c70ceedc7e14567f245d559cf53a1a7302
+EBUILD selinux-base-2.20130424-r1.ebuild 4491 SHA256 d3d665c3dd3688e37435cbb028936c20c6497b337a6cd79fe41cd1f0f7230c8f SHA512 f50d8d6b21c8b50ff7d9891fb32ca26409526be76fccbc4b03eebf3ba63519d51c62c840ee66840f0daf9b7e8403b708ca20c09f66609c0723005aa78911148a WHIRLPOOL 04efdf675a63916db33bbe795eed2df61304650859018acccf30d4ba08c7dbb6ef47646a14d964fa521a6b673cb38fb5688a34a7c0eb4faced56fdb9254a4387
+EBUILD selinux-base-9999.ebuild 4168 SHA256 f48585c88a4a9f43fbf816244109dc522ae922dbddfca1c4b439de3a28cd3ea2 SHA512 55682deb8674faac0514fa056c1c9244a14d1479ec208eb40067bafd42badcec87d4abb28fe9e36e876919d8b9cd4de2a3f51bf5a9ccf3492d942778f0e85c0b WHIRLPOOL a36b1ef5136e40af7e8d7e18749a9d892f961703ad4168300a0f0ab137bfcc93d7c0a36fc5d6deb7ec0b8e3159ddba21ffcb7b5b8a3828cd2b458ca6d782afa0
+MISC ChangeLog 5504 SHA256 eb389bc548eaea14565eb7c2cb0de6ae167acea7f046e6493a9bba732209077a SHA512 07c569dc5c35849dbccf0b039030da5c76915289e64daa9e087b8e67f3089031c26f3d5d378a11eb8f60eff438da382207aaef52d81b36b7006f9bf14ad68c34 WHIRLPOOL 4c13de2cfa4a1463d7d28f94ab14f8c6f8f81907089aacde72bcb71aa75418343feb07e201b0a3a4426c6d719c6fdedc48b710c96a06fa20d805756b6a6722fc
 MISC metadata.xml 753 SHA256 2542c8e9c994b3b2699d601ba980a8daef2288b5ad199867764f607978ddee67 SHA512 d5e803494fe0831fdddada0f1f464c941d93896afa19d9d1005daa8a4ebea7b20f905e6d0d89dd10ff1aceaee0c7c41c190f16b68bf4466c0f75d3a6110b8df0 WHIRLPOOL cd2535802ffacbdae1ff1787aa203311330202cb08df488dae59b178b102b818766d2320fe62de3cf7710047e8cafa6a41963381655d9fd5fb4c75a232decd52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGHwmsACgkQXfqz7M26L9tsjgCeIyMMDd73JloDw5ZdfK2+wZDz
-bcsAnAmeyuTBJ8uRhi2Km+GNy+Zk9qGL
-=VZNW
+iEYEAREIAAYFAlGIx1EACgkQXfqz7M26L9uwAQCfVqXTlEZZnUnajQ74uUZF2U67
+D0cAnA97ClFPrjIgFeo4yqCYVmfWZuti
+=E43k
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base/selinux-base-2.20130424-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20130424-r1.ebuild
index 2b3173f49831..8e38cb0eaa2c 100644
--- a/sec-policy/selinux-base/selinux-base-2.20130424-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20130424-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20130424-r1.ebuild,v 1.1 2013/05/06 14:46:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20130424-r1.ebuild,v 1.2 2013/05/07 09:21:02 swift Exp $
 EAPI="4"
 
 inherit eutils
@@ -43,6 +43,8 @@ src_prepare() {
 		"${S}/refpolicy/config/appconfig-mls/default_contexts"
 	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
 		"${S}/refpolicy/config/appconfig-mcs/default_contexts"
+
+	epatch_user
 }
 
 src_configure() {
diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild
index 539bd9304319..bca490ac624c 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
 # 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.5 2013/04/11 11:57:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-9999.ebuild,v 1.6 2013/05/07 09:21:02 swift Exp $
 EAPI="4"
 
 inherit eutils git-2
@@ -39,6 +39,8 @@ src_prepare() {
 		"${S}/refpolicy/config/appconfig-mls/default_contexts"
 	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
 		"${S}/refpolicy/config/appconfig-mcs/default_contexts"
+
+	epatch_user
 }
 
 src_configure() {