add compile fix for selinux base policy

Package-Manager: portage-2.1.2.3

4 files changed, 121 insertions, 13 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 01603bc0dcd9..59d3fd039261 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sec-policy/selinux-base-policy
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.56 2007/03/29 23:37:50 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.57 2007/03/30 13:29:49 pebenito Exp $
+
+  30 Mar 2007; Chris PeBenito <pebenito@gentoo.org>
+  +files/selinux-base-policy-20070329.diff,
+  selinux-base-policy-20070329.ebuild:
+  Compile fix.
 
 *selinux-base-policy-20070329 (29 Mar 2007)
 
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 8b3e3e50adac..f48b4e87e8ca 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -13,6 +13,10 @@ AUX modules.conf.targeted 670 RMD160 8b36b672f70e932eeaa3288d6251d6ad79be10f3 SH
 MD5 3de3bf4aae74324df77dc14a55556b59 files/modules.conf.targeted 670
 RMD160 8b36b672f70e932eeaa3288d6251d6ad79be10f3 files/modules.conf.targeted 670
 SHA256 b774c2d7175f2d4f73ac7068b3c62bbaa1b6e5f92294dfdee2afdf0d2ccff8b3 files/modules.conf.targeted 670
+AUX selinux-base-policy-20070329.diff 2822 RMD160 164c86d9eb814ada83499f529445d7360b634988 SHA1 22d4240dd4e8d4018e61e2d0d25c810bc0eeaa2b SHA256 6e45238d3baf2771dddb6d0323d3e012c657458d686564577b043199b0336d59
+MD5 42025827a922b0ef8706fb0fbd37cb7a files/selinux-base-policy-20070329.diff 2822
+RMD160 164c86d9eb814ada83499f529445d7360b634988 files/selinux-base-policy-20070329.diff 2822
+SHA256 6e45238d3baf2771dddb6d0323d3e012c657458d686564577b043199b0336d59 files/selinux-base-policy-20070329.diff 2822
 DIST refpolicy-20061114.tar.bz2 305094 RMD160 804a4afc8078e60980a670da94a10f0eec45e590 SHA1 f7158e904e3e14bcf5cc7399731de0e0fb31669f SHA256 78addcf3f5f2e04f2354c007c40b1346b7e72589ca5a257c6e2b11852250cf02
 DIST refpolicy-20070329.tar.bz2 313327 RMD160 1d30ae525f3d7b429d100f9b7d1bd43395ba0612 SHA1 d4b9d59772300886e664aedd3041729807298741 SHA256 e0c82834a62b584578250230651a49c00a13e6be8689611326f6fac06e2d88fa
 DIST selinux-base-policy-20051022.tar.bz2 78419 RMD160 4affcd3707c7b5395ba09f2e038d1f43fbe9be7d SHA1 afb92f46c44ce461bf313d6198701db3c6e63679 SHA256 a3570f9fa484f39bc756414f6f19b93d85bf0e2b1a8d0ae4831e012ba8f2b54e
@@ -24,14 +28,14 @@ EBUILD selinux-base-policy-20061114.ebuild 2754 RMD160 2c8b83643cbff5185d9826e59
 MD5 44e5d5749c7a0d6a3c8511e3758ed7bb selinux-base-policy-20061114.ebuild 2754
 RMD160 2c8b83643cbff5185d9826e59d974b23732cc4fe selinux-base-policy-20061114.ebuild 2754
 SHA256 f6494045084454ffe1ab99cd11c6f811358b5e164b624284201ea453ba13bee9 selinux-base-policy-20061114.ebuild 2754
-EBUILD selinux-base-policy-20070329.ebuild 2760 RMD160 4a8a771763fb1ea20522ae9cadd6acf3f87d8a28 SHA1 b8fecf420cfff973716730660ae493c8f7aa9614 SHA256 34cf782b77821cab5bd72e450baf12bd6bdd196a248fa2cdddfcebc11b4c15fd
-MD5 9017534ff57c220fb5376cde8cddfbfe selinux-base-policy-20070329.ebuild 2760
-RMD160 4a8a771763fb1ea20522ae9cadd6acf3f87d8a28 selinux-base-policy-20070329.ebuild 2760
-SHA256 34cf782b77821cab5bd72e450baf12bd6bdd196a248fa2cdddfcebc11b4c15fd selinux-base-policy-20070329.ebuild 2760
-MISC ChangeLog 13230 RMD160 6f93f4a604304c6600754ea931516e54e283eb8c SHA1 badd13f271856215eb84c873c34f963559e8af80 SHA256 d56a54cc200b72397231ba8e9f8c52a8860768507b9cbc9e6f558f9864c7bb0b
-MD5 64424e064b4e762d2a139e296543dff9 ChangeLog 13230
-RMD160 6f93f4a604304c6600754ea931516e54e283eb8c ChangeLog 13230
-SHA256 d56a54cc200b72397231ba8e9f8c52a8860768507b9cbc9e6f558f9864c7bb0b ChangeLog 13230
+EBUILD selinux-base-policy-20070329.ebuild 2817 RMD160 90110d20807cc5d3655150d7aa1aa88fc7a6da07 SHA1 182dd6e6d5f5f4b641f1b441a4068d35703c1f33 SHA256 7eb2672c3e9fc899ba06dec2f636e60f666d48182e262e28ed3708aa5ae00f4c
+MD5 bb9be737df01b47ae7c72dab465585cd selinux-base-policy-20070329.ebuild 2817
+RMD160 90110d20807cc5d3655150d7aa1aa88fc7a6da07 selinux-base-policy-20070329.ebuild 2817
+SHA256 7eb2672c3e9fc899ba06dec2f636e60f666d48182e262e28ed3708aa5ae00f4c selinux-base-policy-20070329.ebuild 2817
+MISC ChangeLog 13381 RMD160 4947b35d561c7cf937ff5269e95f1f57ef0c2980 SHA1 36c74e0760750c24e8c00ef0741dd3f0afa703be SHA256 2758f78a0906cee42ddf24db6239250992b5429058dd76c643ae37e86defe094
+MD5 ac34307f5ca00f7c5e4f29108f7fbc97 ChangeLog 13381
+RMD160 4947b35d561c7cf937ff5269e95f1f57ef0c2980 ChangeLog 13381
+SHA256 2758f78a0906cee42ddf24db6239250992b5429058dd76c643ae37e86defe094 ChangeLog 13381
 MISC metadata.xml 473 RMD160 2bc7b92e3958e9371896025467bd896501fe19bf SHA1 e5a10b5fddb435fa3d58ef67a1952ae5a0262f72 SHA256 c45743d603ee47355e9d7b1b14d850678825e9c1252d96ec44ce21ac0b2a55b9
 MD5 808b5f7f5d6654666e9193672d463229 metadata.xml 473
 RMD160 2bc7b92e3958e9371896025467bd896501fe19bf metadata.xml 473
@@ -48,7 +52,7 @@ SHA256 fffef656a94635f2d523c21011c808a605cb409f5d1447004847aa247e063dab files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGDE4nj3aojXnnRpoRAvaQAKCxqT7i7KCH0Ls8G8E0ng8bSOIYjACfT1ME
-Mks+HBOEgxVLmXIccP7I4IU=
-=fkXG
+iD8DBQFGDREdj3aojXnnRpoRAh+XAKCuEd67tvvRTaE21I3UCzc3nD8HkQCguxH8
+rR2Cu0l/tVm/c/XDweH/MWw=
+=8IWk
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base-policy/files/selinux-base-policy-20070329.diff b/sec-policy/selinux-base-policy/files/selinux-base-policy-20070329.diff
new file mode 100644
index 000000000000..4a6f55cdc7df
--- /dev/null
+++ b/sec-policy/selinux-base-policy/files/selinux-base-policy-20070329.diff
@@ -0,0 +1,96 @@
+Index: policy/support/loadable_module.spt
+===================================================================
+--- policy/support/loadable_module.spt	(revision 2248)
++++ policy/support/loadable_module.spt	(revision 2249)
+@@ -128,10 +128,10 @@
+ # This needs to be reworked so expressions
+ # with parentheses can work.
+ 
+-define(`delcare_required_symbols',`
++define(`declare_required_symbols',`
+ ifelse(regexp($1, `\w'), -1, `', `dnl
+ bool regexp($1, `\(\w+\)', `\1');
+-delcare_required_symbols(regexp($1, `\w+\(.*\)', `\1'))dnl
++declare_required_symbols(regexp($1, `\w+\(.*\)', `\1'))dnl
+ ') dnl
+ ')
+ 
+@@ -140,16 +140,7 @@
+ # Tunable declaration
+ #
+ define(`gen_tunable',`
+-	ifdef(`self_contained_policy',`
+-		bool $1 dflt_or_overr(`$1'_conf,$2);
+-	',`
+-		# loadable module tunable
+-		# declaration will go here
+-		# instead of bool when
+-		# loadable modules support
+-		# tunables
+-		bool $1 dflt_or_overr(`$1'_conf,$2);
+-	')
++	bool $1 dflt_or_overr(`$1'_conf,$2);
+ ')
+ 
+ ##############################
+@@ -157,24 +148,12 @@
+ # Tunable policy handling
+ #
+ define(`tunable_policy',`
+-	ifdef(`self_contained_policy',`
+-		if (`$1') {
+-			$2
+-		ifelse(`$3',`',`',`} else {
+-			$3
+-		')}
+-	',`
+-		# structure for tunables
+-		# will go here instead of a
+-		# conditional when loadable
+-		# modules support tunables
+-		gen_require(`
+-			delcare_required_symbols(`$1')
+-		')
+-		if (`$1') {
+-			$2
+-		ifelse(`$3',`',`',`} else {
+-			$3
+-		')}
++	gen_require(`
++		declare_required_symbols(`$1')
+ 	')
++	if (`$1') {
++		$2
++	ifelse(`$3',`',`',`} else {
++		$3
++	')}
+ ')
+Index: support/comment_move_decl.sed
+===================================================================
+--- support/comment_move_decl.sed	(revision 2248)
++++ support/comment_move_decl.sed	(revision 2249)
+@@ -5,9 +5,10 @@
+ /require \{/,/} # end require/b nextline
+ /optional \{/,/} # end optional/b nextline
+ 
+-/^[[:blank:]]*(attribute|type(alias)?) /	s/^/# this line was moved by the build process: &/
++/^[[:blank:]]*(attribute|type(alias)?) /s/^/# this line was moved by the build process: &/
+ /^[[:blank:]]*(port|node|netif|genfs)con /s/^/# this line was moved by the build process: &/
+ /^[[:blank:]]*fs_use_(xattr|task|trans) /s/^/# this line was moved by the build process: &/
+ /^[[:blank:]]*sid /s/^/# this line was moved by the build process: &/
++/^[[:blank:]]*bool /s/^/# this line was moved by the build process: &/
+ 
+ :nextline
+Index: support/get_type_attr_decl.sed
+===================================================================
+--- support/get_type_attr_decl.sed	(revision 2248)
++++ support/get_type_attr_decl.sed	(revision 2249)
+@@ -5,7 +5,7 @@
+ /require \{/,/} # end require/b nextline
+ /optional \{/,/} # end optional/b nextline
+ 
+-/^[[:blank:]]*(attribute|type(alias)?) /{
++/^[[:blank:]]*(attribute|type(alias)?|bool) /{
+ 	s/^[[:blank:]]+//
+ 	p
+ }
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20070329.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20070329.ebuild
index 2e212327d399..3a754916f03a 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20070329.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20070329.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-20070329.ebuild,v 1.1 2007/03/29 23:37:50 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20070329.ebuild,v 1.2 2007/03/30 13:29:49 pebenito Exp $
 
 IUSE=""
 
@@ -27,6 +27,9 @@ src_unpack() {
 
 	unpack ${A}
 
+	cd ${S}/refpolicy
+	epatch ${FILESDIR}/${PN}-${PV}.diff
+
 	for i in ${POLICY_TYPES}; do
 		mkdir -p ${S}/${i}/policy
 		cp ${FILESDIR}/modules.conf.${i} ${S}/${i}/policy/modules.conf