Initial commit of 2.0 libsepol.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.24-gentoo-r3 x86_64

5 files changed, 109 insertions, 6 deletions

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index e74df72fb9c0..c3ca869745a8 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -3,13 +3,15 @@ Hash: SHA1
 
 AUX compat.py 461 RMD160 ae776a51f27564321845126c39874eab953a41cd SHA1 229eea09e82b4e93150ece0f0621ac4581ccb00b SHA256 d3b3efe9b9fd946c917a6faccca715c4056748b9c861080fe6f6d7cfbaf87f50
 DIST libselinux-1.34.14.tgz 135588 RMD160 8d5556f83fca6a1aa725e36ad7f77546e7cf6be7 SHA1 7d9650495c41762a11061bc15edc7343e63d238e SHA256 b515495bfe185b1e11c64b68e94a895141b98af59c6e7b2de36ec202fd911a91
+DIST libselinux-2.0.71.tar.gz 167729 RMD160 82d7df1fb2c5da3d60d44fbed5b6be88ae6c4cfb SHA1 862001d54037152c9ad202488d4076fd37fddbc1 SHA256 6f99a13a0d83c2c14fbaef4fe3a4683213101d2350f4cf88e0770d00924c86f2
 EBUILD libselinux-1.34.14.ebuild 1514 RMD160 aca3927407a97258386dde096d15f5c8c070526a SHA1 f9250bb964013db4afea728abae698241e62087d SHA256 9e8c37664750e2bb118e7d9f80796e74ca369d03211b50132f608aa73e8fc47f
-MISC ChangeLog 8494 RMD160 1795454224a32739943a8c177e45fff722b413ef SHA1 097a5c1909a70aa90192f9d74a3f358d956b625a SHA256 6888a7dcea9b1fbeac5b2647ac7f6ed23426b13db398e858d5cf40697224dae6
+EBUILD libselinux-2.0.71.ebuild 1816 RMD160 7cd3540b2346143ca7149d4b6107c62c02969ed5 SHA1 a537c0b9e59d2ecd870c31533fd333e2d8ca812c SHA256 36ef18de694b9db232683d6e52861a4804b25888afd4f74e93491ed511fcb6d0
+MISC ChangeLog 8647 RMD160 6fff9868c450a46b6c2670490a68b2070b0d1b00 SHA1 721109f695dc87b8710c32c5b29cc3e0ba611d21 SHA256 f7604a193a776ca86f1aec62479b4f1046aff6e3809c36a40e2fc44637d4974f
 MISC metadata.xml 537 RMD160 6adcd5fc653db8ad7780299214875297beb9c931 SHA1 9eccef643426b27d5e8c445ab25113c1c44542b1 SHA256 e691ecff0c45ccbd6cf813fbd7f23e489dabad664e89e6b21b8c7c1785550f9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+8TAACgkQQU4yORhF8iA6iQCgvlcb0u+Qt6Snpyc1/JWcza6l
-MdAAoIy7s+35tRfJrc3PUsS/Ap+JIdKU
-=sIG0
+iEYEARECAAYFAkjlkEMACgkQXifbxvYVSbSITgCcDot3brkHrUDkmmXSvD5hdUP9
+eUMAnj5SyTy36PFNYb9QEI0/NyYvdJr+
+=BJKO
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsepol/ChangeLog b/sys-libs/libsepol/ChangeLog
index 2383fafb8e45..9ddc04e24159 100644
--- a/sys-libs/libsepol/ChangeLog
+++ b/sys-libs/libsepol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libsepol
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.31 2008/09/10 17:34:19 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.32 2008/10/03 03:20:02 pebenito Exp $
+
+*libsepol-2.0.32 (03 Oct 2008)
+
+  03 Oct 2008; Chris PeBenito <pebenito@gentoo.org>
+  +files/libsepol-2.0.32-expand_rule.diff, +libsepol-2.0.32.ebuild:
+  Initial commit of 2.0 libsepol.
 
   10 Sep 2008; Chris PeBenito <pebenito@gentoo.org> libsepol-1.16.11.ebuild:
   Tests cannot be run in the ebuild, they are supposed to be ran on the full
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 84933bcde75e..1ee4921fcd8d 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libsepol-1.12.2.diff 981 RMD160 e3213aeafb0b61c32748bb59ca345b3e722f083a SHA1 bef9fe38ef93ed389000e26d6c21a168729bf8b8 SHA256 470c5ee1325d1d632892344f23b76e54f5e67b151e4f73abeceb701b802edeae
+AUX libsepol-2.0.32-expand_rule.diff 1330 RMD160 751ee7e7bbb38a2e9b0773fe6e6d858590116e7a SHA1 3fd8b0f339fb90e4f00d2088a0fe252b764a41ac SHA256 2a7577eed0c2ba87936f8851d70b020f0ad0d16c5c66717ce2ec8cde7c2ba56d
 DIST libsepol-1.16.11.tgz 184630 RMD160 a1c100d99a4c19cf8947264d4865e1752585280b SHA1 5cd4acf9dadad4be43f7f4c688d21b8e10bfe7aa SHA256 9fea2789399f95ada3c2c2b91ade0893d673da72eb0f7f1f2883ea53333b2bec
+DIST libsepol-2.0.32.tar.gz 189663 RMD160 7baf263024446f608eecd1ecc4d8106e01765688 SHA1 482b13b721da2954ffeef9f8ed3b2e4ea1953cad SHA256 ed6ca0e33b14fc5ffbf4aa5515131625248f307e7fc837b1e4fb9c717e6b8672
 EBUILD libsepol-1.16.11.ebuild 1059 RMD160 b899ce64b78cc7068fe447e5973b80b810143c4b SHA1 dd2a1e9f1c67565c39314d5b427c77ebd04c3e84 SHA256 5fa59197201665121bf734da1974ed0c07da9aedb34aa2e7b6a8456fd7e5a798
-MISC ChangeLog 4314 RMD160 eed2cce63845210634b091d41ab4a1ee341c1445 SHA1 2b127e9c41e722bf3a8b78e88840909e7fb8135c SHA256 8f28f27419aa8185ed7093c667166d53055b76b6b379bb0476457494296137fb
+EBUILD libsepol-2.0.32.ebuild 1110 RMD160 5f116f09249a5dea7dae7d2e74310723f9ca597b SHA1 621aa710c099c8ef0deebd3f391dfd689513b523 SHA256 9bb818773259044eb557488ff4f665a459cc45c2f3ac3f571a066f6442578eed
+MISC ChangeLog 4501 RMD160 17482bbf0f5dd76690a3a28c031a4adefd170f81 SHA1 e46052447825611dbac7946841c72e086813975f SHA256 a623b185478f1cd773df84e0facd081a0d74142e511ffcfaf302b3ed814a9e6b
 MISC metadata.xml 300 RMD160 36b5466d0f61dbc147eb3e2ffd94d1a6afed35ac SHA1 e18750d941907a5c15baf781d8e6786961cde972 SHA256 7fe4b477cb4f8b93c9e5bb63336688933259ff619f743fb2647479a59227dc2b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjlj2gACgkQXifbxvYVSbS0NACdHAG1bHibXDGlH7CAAjlQda4Z
+a1IAoKFq95Pazv7yWDwWCg6TpkQ5WHU4
+=p3dw
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libsepol/files/libsepol-2.0.32-expand_rule.diff b/sys-libs/libsepol/files/libsepol-2.0.32-expand_rule.diff
new file mode 100644
index 000000000000..a9e1b77d1b19
--- /dev/null
+++ b/sys-libs/libsepol/files/libsepol-2.0.32-expand_rule.diff
@@ -0,0 +1,39 @@
+diff -purN libsepol-2.0.32.orig/src/expand.c libsepol-2.0.32/src/expand.c
+--- libsepol-2.0.32.orig/src/expand.c	2008-08-26 09:40:22.000000000 -0400
++++ libsepol-2.0.32/src/expand.c	2008-09-19 19:36:39.918510539 -0400
+@@ -1917,6 +1917,35 @@ int expand_convert_type_set(policydb_t *
+ 	return 0;
+ }
+ 
++/* Expand a rule into a given avtab - checking for conflicting type
++ * rules.  Return 1 on success, 0 if the rule conflicts with something
++ * (and hence was not added), or -1 on error. */
++int expand_rule(sepol_handle_t * handle,
++		policydb_t * source_pol,
++		avrule_t * source_rule, avtab_t * dest_avtab,
++		cond_av_list_t ** cond, cond_av_list_t ** other, int enabled)
++{
++	int retval;
++	ebitmap_t stypes, ttypes;
++
++	if (source_rule->specified & AVRULE_NEVERALLOW)
++		return 1;
++
++	ebitmap_init(&stypes);
++	ebitmap_init(&ttypes);
++
++	if (type_set_expand(&source_rule->stypes, &stypes, source_pol, 1))
++		return -1;
++	if (type_set_expand(&source_rule->ttypes, &ttypes, source_pol, 1))
++		return -1;
++	retval = expand_rule_helper(handle, source_pol, NULL,
++				    source_rule, dest_avtab,
++				    cond, other, enabled, &stypes, &ttypes);
++	ebitmap_destroy(&stypes);
++	ebitmap_destroy(&ttypes);
++	return retval;
++}
++
+ int role_set_expand(role_set_t * x, ebitmap_t * r, policydb_t * p, uint32_t * rolemap)
+ {
+ 	unsigned int i;
diff --git a/sys-libs/libsepol/libsepol-2.0.32.ebuild b/sys-libs/libsepol/libsepol-2.0.32.ebuild
new file mode 100644
index 000000000000..e0f110a415a3
--- /dev/null
+++ b/sys-libs/libsepol/libsepol-2.0.32.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.0.32.ebuild,v 1.1 2008/10/03 03:20:02 pebenito Exp $
+
+IUSE=""
+
+inherit multilib eutils
+
+BUGFIX_PATCH="${FILESDIR}/libsepol-2.0.32-expand_rule.diff"
+
+DESCRIPTION="SELinux binary policy representation library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/current/devel/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+
+DEPEND="virtual/libc"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	[ ! -z "$BUGFIX_PATCH" ] && epatch "${BUGFIX_PATCH}"
+
+	# fix up paths for multilib
+	sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" src/Makefile \
+		|| die "Fix for multilib LIBDIR failed."
+	sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" src/Makefile \
+		|| die "Fix for multilib SHLIBDIR failed."
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+}