Fixes to hopefully take care of #133028

Package-Manager: portage-2.1.1

4 files changed, 65 insertions, 17 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 19449aa9410d..84cf49760404 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/setools
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.45 2006/05/09 03:57:04 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.46 2006/09/11 23:48:19 pebenito Exp $
+
+  11 Sep 2006; Chris PeBenito <pebenito@gentoo.org>
+  +files/apol_tcl_fc.c.diff, setools-2.4.ebuild:
+  Fixes to hopefully take care of #133028
 
 *setools-2.4 (09 May 2006)
 
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 2df786965bde..3d8091883d79 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,27 +1,34 @@
-AUX setools-2.2-nogui.diff 3821 RMD160 75dcdbacfd27b3afd3cd1f42dea31dc6f31f6892 SHA1 2c1f9715123151f698cca8f69a3542d5d4cc0a92 SHA256 0ac06e7259a188fbef436bc6715c088086b4be9f27c3627f85e7f206a0c1e60d size 3821
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX apol_tcl_fc.c.diff 1077 RMD160 1db09fde3eb402aa9fe92c0740568bdef7b7586d SHA1 350110b8beb653b6c7b5052530de3d34ae88fc1e SHA256 3457cbba134699babd6882655cfc1957fb0768591690736c4a67c71310ac09b9
+MD5 88bfa9c3aaf1cce7cc0a98a7e40187e2 files/apol_tcl_fc.c.diff 1077
+RMD160 1db09fde3eb402aa9fe92c0740568bdef7b7586d files/apol_tcl_fc.c.diff 1077
+SHA256 3457cbba134699babd6882655cfc1957fb0768591690736c4a67c71310ac09b9 files/apol_tcl_fc.c.diff 1077
+AUX setools-2.2-nogui.diff 3821 RMD160 75dcdbacfd27b3afd3cd1f42dea31dc6f31f6892 SHA1 2c1f9715123151f698cca8f69a3542d5d4cc0a92 SHA256 0ac06e7259a188fbef436bc6715c088086b4be9f27c3627f85e7f206a0c1e60d
 MD5 e7f3c1619fcbcf575ad7dee10f250108 files/setools-2.2-nogui.diff 3821
 RMD160 75dcdbacfd27b3afd3cd1f42dea31dc6f31f6892 files/setools-2.2-nogui.diff 3821
 SHA256 0ac06e7259a188fbef436bc6715c088086b4be9f27c3627f85e7f206a0c1e60d files/setools-2.2-nogui.diff 3821
-DIST setools-2.2.tar.bz2 1370889 size 1370889
-DIST setools-2.3.tar.bz2 1143599 RMD160 a3f9739acaab6f3d17aaddcbd9962b284a008a70 SHA256 89ae5778a1792c999c2f29ffcd35815c58c72a116d6e4ee2039deb9b3268caec size 1143599
-DIST setools-2.4.tar.bz2 1181584 RMD160 67c77950a4138300a3da4f17ab0d51b2d482bc18 SHA256 fcd0bc7390275cce8b4c0dbf8cc3471c3ab73724b1b373d40625cc477794fc2e size 1181584
-EBUILD setools-2.2.ebuild 1935 RMD160 1c8b67016a0fe1bfa4c30a66168e18bb67f0aba8 SHA1 cfea262cf487b8f9f146571374a02b16bf560a4e SHA256 90719f09bfc566104ab372f93a3bb644e2f5728f606163d6b2c154f6cbe6bb7e size 1935
+DIST setools-2.2.tar.bz2 1370889
+DIST setools-2.3.tar.bz2 1143599 RMD160 a3f9739acaab6f3d17aaddcbd9962b284a008a70 SHA256 89ae5778a1792c999c2f29ffcd35815c58c72a116d6e4ee2039deb9b3268caec
+DIST setools-2.4.tar.bz2 1181584 RMD160 67c77950a4138300a3da4f17ab0d51b2d482bc18 SHA1 3dd26552388180087b11884857c3f5e5c8058acf SHA256 fcd0bc7390275cce8b4c0dbf8cc3471c3ab73724b1b373d40625cc477794fc2e
+EBUILD setools-2.2.ebuild 1935 RMD160 1c8b67016a0fe1bfa4c30a66168e18bb67f0aba8 SHA1 cfea262cf487b8f9f146571374a02b16bf560a4e SHA256 90719f09bfc566104ab372f93a3bb644e2f5728f606163d6b2c154f6cbe6bb7e
 MD5 a268d0c9b61d5d4bdd08e243cbac52c9 setools-2.2.ebuild 1935
 RMD160 1c8b67016a0fe1bfa4c30a66168e18bb67f0aba8 setools-2.2.ebuild 1935
 SHA256 90719f09bfc566104ab372f93a3bb644e2f5728f606163d6b2c154f6cbe6bb7e setools-2.2.ebuild 1935
-EBUILD setools-2.3.ebuild 1649 RMD160 e805c46486043dee3c2bace2a7a19bf6d14c8cc9 SHA1 1ff10fd8abeac8e1e1b3b9265d8a614940a4464b SHA256 450b7e9fddb82ccd9605fea988a067defbbdc4fa807be38fbe6aa4c6b772ae50 size 1649
+EBUILD setools-2.3.ebuild 1649 RMD160 e805c46486043dee3c2bace2a7a19bf6d14c8cc9 SHA1 1ff10fd8abeac8e1e1b3b9265d8a614940a4464b SHA256 450b7e9fddb82ccd9605fea988a067defbbdc4fa807be38fbe6aa4c6b772ae50
 MD5 b43b53ae0a8be2bb1a022f7e174fe92f setools-2.3.ebuild 1649
 RMD160 e805c46486043dee3c2bace2a7a19bf6d14c8cc9 setools-2.3.ebuild 1649
 SHA256 450b7e9fddb82ccd9605fea988a067defbbdc4fa807be38fbe6aa4c6b772ae50 setools-2.3.ebuild 1649
-EBUILD setools-2.4.ebuild 1604 RMD160 9e8a8fb8c669bce8bb28adf2e73430b363e1568f SHA1 3ce12d88900c56bdb8f13a0a8e9f26f65bd6a7a8 SHA256 5945ff9a095e6410ca21c8e933dffcba7f8b1ebabc4d116aa5949c87a64aa519 size 1604
-MD5 e78c7c12b8cea2eebb51a3abf1b8a51c setools-2.4.ebuild 1604
-RMD160 9e8a8fb8c669bce8bb28adf2e73430b363e1568f setools-2.4.ebuild 1604
-SHA256 5945ff9a095e6410ca21c8e933dffcba7f8b1ebabc4d116aa5949c87a64aa519 setools-2.4.ebuild 1604
-MISC ChangeLog 5924 RMD160 a4e3ee64547b422def5d0318f46e87b622783f49 SHA1 f1439b1cc25667d156e5a020d42253caa5aea61d SHA256 f5eef6d102c8e28b2141272a967551764fdf6138e0c584588409a30b8f10e1c7 size 5924
-MD5 b3703140c2158336d78f9f0015f56b68 ChangeLog 5924
-RMD160 a4e3ee64547b422def5d0318f46e87b622783f49 ChangeLog 5924
-SHA256 f5eef6d102c8e28b2141272a967551764fdf6138e0c584588409a30b8f10e1c7 ChangeLog 5924
-MISC metadata.xml 369 RMD160 c37d0796a65a30cccd5d520514223758d68cff47 SHA1 47f913e33c294a7287f04669b9c5279009be7fdf SHA256 58f5b1ba9b602226f7a76b1ebd8edc824e3488f5c9bce9cc53fc2b9dcf2ef84f size 369
+EBUILD setools-2.4.ebuild 1816 RMD160 102aac26410c6da8a01c5b9fb094e8204794aba9 SHA1 b7ec9bc3db423318089590442710fa204801d686 SHA256 52e48461b166b7565c84e051fc7c4e9921ab534b36d879d3dfeb3ed160923878
+MD5 4c25dccbed355f5c410434367bd08221 setools-2.4.ebuild 1816
+RMD160 102aac26410c6da8a01c5b9fb094e8204794aba9 setools-2.4.ebuild 1816
+SHA256 52e48461b166b7565c84e051fc7c4e9921ab534b36d879d3dfeb3ed160923878 setools-2.4.ebuild 1816
+MISC ChangeLog 6068 RMD160 de274a62945ed021fb5de8821091f126b326ee51 SHA1 d895133a5467e0b2aadf07284bc9cdad24585af8 SHA256 06c8e806a027966853475ca1560ef56b1e5d4d9078c3777b53f59fa23ab392d2
+MD5 c780ca529199da717dfd637df05665bb ChangeLog 6068
+RMD160 de274a62945ed021fb5de8821091f126b326ee51 ChangeLog 6068
+SHA256 06c8e806a027966853475ca1560ef56b1e5d4d9078c3777b53f59fa23ab392d2 ChangeLog 6068
+MISC metadata.xml 369 RMD160 c37d0796a65a30cccd5d520514223758d68cff47 SHA1 47f913e33c294a7287f04669b9c5279009be7fdf SHA256 58f5b1ba9b602226f7a76b1ebd8edc824e3488f5c9bce9cc53fc2b9dcf2ef84f
 MD5 f5d096116ff7743b040148ced68e4f7b metadata.xml 369
 RMD160 c37d0796a65a30cccd5d520514223758d68cff47 metadata.xml 369
 SHA256 58f5b1ba9b602226f7a76b1ebd8edc824e3488f5c9bce9cc53fc2b9dcf2ef84f metadata.xml 369
@@ -34,3 +41,10 @@ SHA256 c42ae9c90644810a48365604b1f4a307dc91c0f11766360f37f0a358b84987ed files/di
 MD5 1218149fe3d782ffed7cfe6acccc57e1 files/digest-setools-2.4 241
 RMD160 36de5bff7a9e98d84943c641c5850c8d884b78ea files/digest-setools-2.4 241
 SHA256 811243990123214e2538e8eb6c76563a12ef88783ce20336b5d1c96f9c46272c files/digest-setools-2.4 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFBfW33gmyzsILbxIRAlB4AJ9HN0JOb0tHFTvf486KN401J3OTTACfca83
+yjOGU5pGbJkCGCXP6QboPyA=
+=W9KC
+-----END PGP SIGNATURE-----
diff --git a/app-admin/setools/files/apol_tcl_fc.c.diff b/app-admin/setools/files/apol_tcl_fc.c.diff
new file mode 100644
index 000000000000..a8543746ab95
--- /dev/null
+++ b/app-admin/setools/files/apol_tcl_fc.c.diff
@@ -0,0 +1,24 @@
+diff -ur a/libapol/apol_tcl_fc.c b/libapol/apol_tcl_fc.c
+--- a/libapol/apol_tcl_fc.c	2006-04-11 17:27:18.000000000 -0300
++++ b/libapol/apol_tcl_fc.c	2006-05-12 17:11:07.000000000 -0300
+@@ -178,16 +178,16 @@
+  */
+ static int Apol_Search_FC_Index_DB(ClientData clientData, Tcl_Interp *interp, int argc, CONST char *argv[])
+ {	
++#ifndef LIBSEFS
++	Tcl_SetResult(interp, "You need to build apol with libsefs to use this feature!", TCL_STATIC);
++	return TCL_ERROR;
++#else		
+ 	sefs_search_keys_t search_keys;
+ 	CONST char **object_classes = NULL, **types = NULL, **users = NULL,
+ 	    **ranges, **paths = NULL;
+ 	int retval = TCL_ERROR;
+ 	Tcl_Obj *result_obj = Tcl_NewListObj(0, NULL);
+ 
+-#ifndef LIBSEFS
+-	Tcl_SetResult(interp, "You need to build apol with libsefs to use this feature!", TCL_STATIC);
+-	return TCL_ERROR;
+-#else		
+ 	memset(&search_keys, 0, sizeof(search_keys));
+ 	if (argc != 10) {
+ 		Tcl_SetResult(interp, "Need a list of users, list of types, list of object classes, list of ranges, list of paths, user_regex, type_regex, range_regex, and path_regex", TCL_STATIC);
diff --git a/app-admin/setools/setools-2.4.ebuild b/app-admin/setools/setools-2.4.ebuild
index 1f994443d04c..472e9b46707a 100644
--- a/app-admin/setools/setools-2.4.ebuild
+++ b/app-admin/setools/setools-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-2.4.ebuild,v 1.1 2006/05/09 03:57:04 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-2.4.ebuild,v 1.2 2006/09/11 23:48:19 pebenito Exp $
 
 inherit eutils
 
@@ -37,6 +37,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	epatch ${FILESDIR}/apol_tcl_fc.c.diff
+
 	# enable debug if requested
 	useq debug && sed -i -e '/^DEBUG/s/0/1/' ${S}/Makefile
 
@@ -47,6 +49,10 @@ src_unpack() {
 			-e '/^SE_CMDS/s/findcon//' \
 			-e '/^SE_CMDS/s/searchcon//' \
 			-e '/^SE_CMDS/s/indexcon//' ${S}/secmds/Makefile
+
+		# sechecker won't compile w/o libselinux
+		sed -i -e '/^all-nogui/s/sechecker//' ${S}/Makefile
+		sed -i -r -e '/^install-sechecker/!s/install-sechecker//' ${S}/Makefile
 	fi
 }