new upstream setools release

(Portage version: 2.1.2_pre3-r2)
 (Signed Manifest commit)

6 files changed, 15 insertions, 294 deletions

diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index d71cb7f57c74..986580ad5512 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -5,46 +5,34 @@ AUX apol_tcl_fc.c.diff 1077 RMD160 1db09fde3eb402aa9fe92c0740568bdef7b7586d SHA1
 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
-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
-MD5 b43b53ae0a8be2bb1a022f7e174fe92f setools-2.3.ebuild 1649
-RMD160 e805c46486043dee3c2bace2a7a19bf6d14c8cc9 setools-2.3.ebuild 1649
-SHA256 450b7e9fddb82ccd9605fea988a067defbbdc4fa807be38fbe6aa4c6b772ae50 setools-2.3.ebuild 1649
+DIST setools-3.0.tar.bz2 1284736 RMD160 2e318bc83f31b299268753a349771017e0c1dcab SHA1 13a74e500fe9b5091a9ffaead636be4865ed8fa7 SHA256 afe6151ad63a7348ba3412da6a7319946ce0251e9d1c809608887777fc077757
 EBUILD setools-2.4.ebuild 1813 RMD160 4b064ecf873502f919ed3cc1307f79740faa9978 SHA1 2367bb3ce420172ad9b79e18e1b2257a89657046 SHA256 e491874af3d2788e5458241bff10e281d68bcab2ed8bf2140b5347d2bacfb243
 MD5 db1dc75c55b3988442d3db962c5b1b45 setools-2.4.ebuild 1813
 RMD160 4b064ecf873502f919ed3cc1307f79740faa9978 setools-2.4.ebuild 1813
 SHA256 e491874af3d2788e5458241bff10e281d68bcab2ed8bf2140b5347d2bacfb243 setools-2.4.ebuild 1813
-MISC ChangeLog 6156 RMD160 d5026c899a4e647e78578004d51e46fcf0cc3c22 SHA1 01c290e909600d9aa3ff627b2a04bb908632589b SHA256 54f11a1324022b23f4934d47162006d56b4f48aa06ca2d80ec1e21f1a53c29d2
-MD5 3f930fabda2f482d07642cfc27e8fabb ChangeLog 6156
-RMD160 d5026c899a4e647e78578004d51e46fcf0cc3c22 ChangeLog 6156
-SHA256 54f11a1324022b23f4934d47162006d56b4f48aa06ca2d80ec1e21f1a53c29d2 ChangeLog 6156
+EBUILD setools-3.0.ebuild 1489 RMD160 a195ad8f670fa6b5ecf5f8a86fd411b6da27acb2 SHA1 e477202816e49ce6d57f9c311060ffb7bade56e4 SHA256 999193497770b11a6a6fb22d6fb88527d3e13da2458c653bd393bf0bf0ffbcc5
+MD5 ec7ce3d10a09701bf1782d90ceb2856a setools-3.0.ebuild 1489
+RMD160 a195ad8f670fa6b5ecf5f8a86fd411b6da27acb2 setools-3.0.ebuild 1489
+SHA256 999193497770b11a6a6fb22d6fb88527d3e13da2458c653bd393bf0bf0ffbcc5 setools-3.0.ebuild 1489
+MISC ChangeLog 6359 RMD160 d3f370c3dd3bea51395dbca62adcc19e5c21c213 SHA1 17971cee1d57161e3d88d149e7e471f155bd828c SHA256 c37d7cfa4e46c4961db81a974d2f47af0d76d7adc789bb858e70a130e1bda3cc
+MD5 74578f677d2e70c5b54abcd578e2c14d ChangeLog 6359
+RMD160 d3f370c3dd3bea51395dbca62adcc19e5c21c213 ChangeLog 6359
+SHA256 c37d7cfa4e46c4961db81a974d2f47af0d76d7adc789bb858e70a130e1bda3cc ChangeLog 6359
 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
-MD5 ed1b98717ae185328af09c8127668fdf files/digest-setools-2.2 65
-RMD160 46d92b8604f28d0d9887746a113a0b6f1b716be6 files/digest-setools-2.2 65
-SHA256 155f1bdd26a1073a3c933f681ef4ab57c20e6b8bce967d614bb0ef866e66f841 files/digest-setools-2.2 65
-MD5 693c230244369bbbf80aa9c6458e414c files/digest-setools-2.3 241
-RMD160 b2d3934446003d3c5d8d618d0ade9fb2db785b69 files/digest-setools-2.3 241
-SHA256 c42ae9c90644810a48365604b1f4a307dc91c0f11766360f37f0a358b84987ed files/digest-setools-2.3 241
 MD5 1218149fe3d782ffed7cfe6acccc57e1 files/digest-setools-2.4 241
 RMD160 36de5bff7a9e98d84943c641c5850c8d884b78ea files/digest-setools-2.4 241
 SHA256 811243990123214e2538e8eb6c76563a12ef88783ce20336b5d1c96f9c46272c files/digest-setools-2.4 241
+MD5 c3a9743b5ad229df6bf46ac20f479478 files/digest-setools-3.0 241
+RMD160 4bc05401c4a793054b53e46110482e8d4a2e049e files/digest-setools-3.0 241
+SHA256 f62a98d3000dec0af1d46cb5335c8927d26066bc81bd8196be4ce77eb399f18d files/digest-setools-3.0 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFB0du3gmyzsILbxIRAgZIAJ4gLgiCwoRwnavGA1Z5ukC4vDXfJACgtzI2
-uVbLaYvM5O8X8HWXjgfkXkk=
-=PV4a
+iD8DBQFFNZ8+3gmyzsILbxIRAmvcAKCK4gkA6i86jkz/qvV7lFPWxiGrmwCgt3Tf
+hiO/FZIXrfc/UhIXixODi+U=
+=rl/F
 -----END PGP SIGNATURE-----
diff --git a/app-admin/setools/files/digest-setools-2.2 b/app-admin/setools/files/digest-setools-2.2
deleted file mode 100644
index cc7f2ab3a41d..000000000000
--- a/app-admin/setools/files/digest-setools-2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3fc1af44bcf8ef0714f48c91509ad95 setools-2.2.tar.bz2 1370889
diff --git a/app-admin/setools/files/digest-setools-2.3 b/app-admin/setools/files/digest-setools-2.3
deleted file mode 100644
index 73c634e8851c..000000000000
--- a/app-admin/setools/files/digest-setools-2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fcb16faa702a3e0b51276803bd736401 setools-2.3.tar.bz2 1143599
-RMD160 a3f9739acaab6f3d17aaddcbd9962b284a008a70 setools-2.3.tar.bz2 1143599
-SHA256 89ae5778a1792c999c2f29ffcd35815c58c72a116d6e4ee2039deb9b3268caec setools-2.3.tar.bz2 1143599
diff --git a/app-admin/setools/files/setools-2.2-nogui.diff b/app-admin/setools/files/setools-2.2-nogui.diff
deleted file mode 100644
index a71d3c54ddcd..000000000000
--- a/app-admin/setools/files/setools-2.2-nogui.diff
+++ /dev/null
@@ -1,105 +0,0 @@
-Index: seaudit/Makefile
-===================================================================
---- seaudit/Makefile	(revision 3303)
-+++ seaudit/Makefile	(revision 3304)
-@@ -7,8 +7,6 @@
- 
- CFLAGS	          += -DDEFAULT_LOG='"$(DEFAULT_LOG_FILE)"' 
- CFLAGS            += -DINSTALL_LIBDIR='"$(INSTALL_LIBDIR)"'
--CFLAGS            += -DSEAUDIT_GUI_VERSION_STRING='"$(shell cat SEAUDIT_GUI_VERSION)"'
--CFLAGS            += -DSEREPORT_VERSION_NUM='"$(shell cat SEAUDIT_REPORT_VERSION)"'
- 
- SEAUDIT_REPORT_BACKEND  = report.o
- 
-@@ -57,8 +55,14 @@
- 	$(MAKE) -C ../libapol libapolso
- 
- %.o:  %.c 
--	$(CC) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $<
-+	$(CC) $(CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $<
- 
-+$(OBJS): CFLAGS += $(GTK_CFLAGS)
-+
-+seaudit.o: CFLAGS += -DSEAUDIT_GUI_VERSION_STRING='"$(shell cat SEAUDIT_GUI_VERSION)"'
-+
-+seaudit-report.o: CFLAGS += -DSEREPORT_VERSION_NUM='"$(shell cat SEAUDIT_REPORT_VERSION)"'
-+
- install: seaudit seaudit-report
- 	install -m 755 seaudit $(BINDIR)
- 	install -m 755 seaudit-report $(BINDIR)
-Index: sediff/sediff.c
-===================================================================
---- sediff/sediff.c	(revision 3303)
-+++ sediff/sediff.c	(revision 3304)
-@@ -10,7 +10,6 @@
-  
- /* libapol */
- #include "util.h"
--#include "sediff_rename_types.h"
- #include <policy.h>
- #include <policy-io.h>
- #include <policy-query.h>
-Index: sediff/Makefile
-===================================================================
---- sediff/Makefile	(revision 3303)
-+++ sediff/Makefile	(revision 3304)
-@@ -7,11 +7,6 @@
- GTK_LIBS        = `pkg-config --libs libglade-2.0`
- GLADE_FILES     = sediff.glade
- 
--CFLAGS  	+= -DSEDIFF_VERSION_NUM='"$(shell cat SEDIFF_VERSION)"'
--CFLAGS  	+= -DSEDIFF_GUI_VERSION_NUM='"$(shell cat SEDIFF_GUI_VERSION)"'
--CFLAGS  	+= -DSEDIFF_GUI_VERSION_NUM='"$(shell cat SEDIFF_GUI_VERSION)"'
--
--
- all: libapol sediff sediffx
- 
- sediff: sediff.o $(LIBAPOL) 
-@@ -29,8 +24,13 @@
- 	install -m 644 sediff_help.txt $(INSTALL_LIBDIR)
- 
- %.o:  %.c
--	$(CC) $(CFLAGS) $(GTK_CFLAGS) $(INCLUDE) -c $<
-+	$(CC) $(CFLAGS) $(INCLUDE) -c $<
- 
-+$(GUI-OBJS): CFLAGS += $(GTK_CFLAGS)
-+sediff.o: CFLAGS += -DSEDIFF_VERSION_NUM='"$(shell cat SEDIFF_VERSION)"'
-+sediff_gui.o: CFLAGS += -DSEDIFF_VERSION_NUM='"$(shell cat SEDIFF_VERSION)"'
-+sediff_gui.o: CFLAGS += -DSEDIFF_GUI_VERSION_NUM='"$(shell cat SEDIFF_GUI_VERSION)"'
-+
- libapol:
- 	$(MAKE) -C .. libapol
- 
-Index: secmds/Makefile
-===================================================================
---- secmds/Makefile	(revision 3303)
-+++ secmds/Makefile	(revision 3304)
-@@ -22,13 +22,6 @@
- SE_CMDS += $(SELINUX_TOOLS)
- endif
- 
--CFLAGS  	+= -DSEINFO_VERSION_NUM='"$(shell cat SEINFO_VERSION)"'
--CFLAGS  	+= -DSESEARCH_VERSION_NUM='"$(shell cat SESEARCH_VERSION)"'
--CFLAGS          += -DREPLCON_VERSION_NUM='"$(shell cat REPLCON_VERSION)"'
--CFLAGS          += -DFINDCON_VERSION_NUM='"$(shell cat FINDCON_VERSION)"'
--CFLAGS          += -DINDEXCON_VERSION_NUM='"$(shell cat INDEXCON_VERSION)"'
--CFLAGS          += -DSEARCHCON_VERSION_NUM='"$(shell cat SEARCHCON_VERSION)"'
--CFLAGS          += -DAPOL_DEFAULT_PERM_MAP="\"/usr/share/setools/apol_perm_mapping\""
- 
- SHELL = /bin/sh
- 
-@@ -79,6 +72,14 @@
- %.o:  %.c
- 	$(CC) $(CFLAGS) $(INCLUDE) -c $<
- 
-+seinfo.o: CFLAGS += -DSEINFO_VERSION_NUM='"$(shell cat SEINFO_VERSION)"'
-+sesearch.o: CFLAGS += -DSESEARCH_VERSION_NUM='"$(shell cat SESEARCH_VERSION)"'
-+replcon.o: CFLAGS += -DREPLCON_VERSION_NUM='"$(shell cat REPLCON_VERSION)"'
-+findcon.o: CFLAGS += -DFINDCON_VERSION_NUM='"$(shell cat FINDCON_VERSION)"'
-+indexcon.o: CFLAGS += -DINDEXCON_VERSION_NUM='"$(shell cat INDEXCON_VERSION)"'
-+searchcon.o: CFLAGS += -DSEARCHCON_VERSION_NUM='"$(shell cat SEARCHCON_VERSION)"'
-+flowtool.o: CFLAGS += -DAPOL_DEFAULT_PERM_MAP="\"/usr/share/setools/apol_perm_mapping\""
-+
- libapol:
- 	$(MAKE) -C .. libapol
- 
diff --git a/app-admin/setools/setools-2.2.ebuild b/app-admin/setools/setools-2.2.ebuild
deleted file mode 100644
index 7fe0af44dc4e..000000000000
--- a/app-admin/setools/setools-2.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.2.ebuild,v 1.4 2006/01/02 05:38:51 pebenito Exp $
-
-inherit eutils
-
-DESCRIPTION="SELinux policy tools"
-HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
-SRC_URI="http://www.tresys.com/files/setools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-IUSE="X debug selinux"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	dev-libs/libxml2
-	dev-util/pkgconfig
-	selinux? ( sys-libs/libselinux )
-	X? (
-		dev-lang/tk
-		>=gnome-base/libglade-2.0
-	)"
-
-RDEPEND="dev-libs/libxml2
-	selinux? ( sys-libs/libselinux )
-	X? (
-		dev-lang/tk
-		>=dev-tcltk/bwidget-1.4.1
-		>=gnome-base/libglade-2.0
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/setools-2.2-nogui.diff
-
-	# fix the Makefile to listen to portage CFLAGS
-	sed -i -e "/^CFLAGS/s/-O2/${CFLAGS}/g" ${S}/Makefile
-	sed -i -e "/^CFLAGS/s/-O2/${CFLAGS}/" ${S}/libsefs/sqlite/Makefile
-
-	# enable debug if requested
-	useq debug && sed -i -e '/^DEBUG/s/0/1/' ${S}/Makefile
-
-	# dont chcon or install -Z
-	sed -i -e '/object_r/d' ${S}/secmds/Makefile
-	sed -i -e 's,-Z system_u:object_r:etc_t,,g' ${S}/seaudit/Makefile
-
-	# dont do findcon, replcon, searchcon, or indexcon if USE=-selinux
-	if ! useq selinux; then
-		sed -i -e '/^USE_LIBSELINUX/s/1/0/' ${S}/Makefile
-		sed -i -e '/^SE_CMDS/s/replcon//' \
-			-e '/^SE_CMDS/s/findcon//' \
-			-e '/^SE_CMDS/s/searchcon//' \
-			-e '/^SE_CMDS/s/indexcon//' ${S}/secmds/Makefile
-	fi
-}
-
-src_compile() {
-	cd ${S}
-
-	if useq X; then
-		make all || die
-	else
-		make all-nogui || die
-	fi
-}
-
-src_install() {
-	cd ${S}
-
-	# some of the Makefiles are broken, and will fail
-	# if ${D}/usr/bin is nonexistant
-	dodir /usr/bin
-
-	if use X; then
-		make DESTDIR=${D} install || die "install failed."
-	else
-		make DESTDIR=${D} install-nogui || die "install failed."
-	fi
-}
diff --git a/app-admin/setools/setools-2.3.ebuild b/app-admin/setools/setools-2.3.ebuild
deleted file mode 100644
index 9fac8b683ab8..000000000000
--- a/app-admin/setools/setools-2.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.3.ebuild,v 1.1 2006/02/03 13:52:01 pebenito Exp $
-
-inherit eutils
-
-DESCRIPTION="SELinux policy tools"
-HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
-SRC_URI="http://www.tresys.com/files/setools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="X debug selinux"
-
-S="${WORKDIR}/${PN}"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	dev-libs/libxml2
-	dev-util/pkgconfig
-	selinux? ( sys-libs/libselinux )
-	X? (
-		dev-lang/tk
-		>=gnome-base/libglade-2.0
-	)"
-
-RDEPEND="dev-libs/libxml2
-	selinux? ( sys-libs/libselinux )
-	X? (
-		dev-lang/tk
-		>=dev-tcltk/bwidget-1.4.1
-		>=gnome-base/libglade-2.0
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# enable debug if requested
-	useq debug && sed -i -e '/^DEBUG/s/0/1/' ${S}/Makefile
-
-	# dont do findcon, replcon, searchcon, or indexcon if USE=-selinux
-	if ! useq selinux; then
-		sed -i -e '/^USE_LIBSELINUX/s/1/0/' ${S}/Makefile
-		sed -i -e '/^SE_CMDS/s/replcon//' \
-			-e '/^SE_CMDS/s/findcon//' \
-			-e '/^SE_CMDS/s/searchcon//' \
-			-e '/^SE_CMDS/s/indexcon//' ${S}/secmds/Makefile
-	fi
-}
-
-src_compile() {
-	cd ${S}
-
-	if useq X; then
-		make CC_DEFINES="${CFLAGS}" all || die
-	else
-		make CC_DEFINES="${CFLAGS}" all-nogui || die
-	fi
-}
-
-src_install() {
-	cd ${S}
-
-	# some of the Makefiles are broken, and will fail
-	# if ${D}/usr/bin is nonexistant
-	dodir /usr/bin
-
-	if use X; then
-		make DESTDIR=${D} install || die "install failed."
-	else
-		make DESTDIR=${D} install-nogui || die "install failed."
-	fi
-}