new upstream release

(Portage version: 2.0.53_rc5)

6 files changed, 13 insertions, 169 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 25c48d83da23..6996f1317783 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/setools
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.38 2005/10/08 03:57:33 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.39 2005/10/12 22:55:09 pebenito Exp $
+
+*setools-2.1.3 (12 Oct 2005)
+
+  12 Oct 2005; Chris PeBenito <pebenito@gentoo.org> -setools-2.1.0.ebuild,
+  -setools-2.1.1.ebuild, +setools-2.1.3.ebuild:
+  New upstream release.
 
   08 Oct 2005; Chris PeBenito <pebenito@gentoo.org> setools-2.1.2.ebuild:
   Mark stable.
diff --git a/app-admin/setools/files/digest-setools-2.1.0 b/app-admin/setools/files/digest-setools-2.1.0
deleted file mode 100644
index a55780eac598..000000000000
--- a/app-admin/setools/files/digest-setools-2.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b4f9fda61546477d92b70cf63e8a3c0b setools-2.1.0.tar.bz2 1221189
diff --git a/app-admin/setools/files/digest-setools-2.1.1 b/app-admin/setools/files/digest-setools-2.1.1
deleted file mode 100644
index 22cda8fa7620..000000000000
--- a/app-admin/setools/files/digest-setools-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b90ea097e39d01695cfc4033623d322e setools-2.1.1.tar.bz2 1249669
diff --git a/app-admin/setools/files/digest-setools-2.1.3 b/app-admin/setools/files/digest-setools-2.1.3
new file mode 100644
index 000000000000..0ce134a6f3c7
--- /dev/null
+++ b/app-admin/setools/files/digest-setools-2.1.3
@@ -0,0 +1 @@
+MD5 a5f2f96e392922f85e0fe077daadd90a setools-2.1.3.tar.bz2 1401249
diff --git a/app-admin/setools/setools-2.1.0.ebuild b/app-admin/setools/setools-2.1.0.ebuild
deleted file mode 100644
index 1d3aade7b7d3..000000000000
--- a/app-admin/setools/setools-2.1.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-2.1.0.ebuild,v 1.3 2005/09/07 21:25:53 pebenito Exp $
-
-DESCRIPTION="SELinux policy tools"
-HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
-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}
-
-	# 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
-
-	# generate the file contexts from the template
-	sed -e 's:SEUSER_BINDIR:/usr/bin:' \
-		-e 's:SEUSER_INSTALL_LIBDIR:/usr/share/setools:' \
-		< ${S}/policy/seuser_template.fc > ${S}/policy/seuser.fc
-
-	# dont chcon or install -Z
-	sed -i -e '/object_r/d' ${S}/secmds/Makefile
-	sed -i -e '/object_r/d' ${S}/seuser/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
-
-	# adjust policy settings in seuser.conf
-	echo "policy_dir         ${POLICYDIR}" > ${S}/seuser/seuser.conf
-	echo "policy.conf        ${POLICYDIR}/policy.conf" >> ${S}/seuser/seuser.conf
-	echo "file_contexts_file ${POLICYDIR}/file_contexts/file_contexts" >> ${S}/seuser/seuser.conf
-	echo "user_file          ${POLICYDIR}/users" >> ${S}/seuser/seuser.conf
-}
-
-src_compile() {
-	cd ${S}
-
-	if useq X; then
-		make all || die
-	else
-		make all-nogui || die
-	fi
-}
-
-src_install() {
-	cd ${S}
-
-	dodoc COPYING ChangeLog-setools README
-
-	# some of the Makefiles are broken, and will fail
-	# if ${D}/usr/bin is nonexistant
-	dodir /usr/bin
-
-	# command line tools
-	make DESTDIR=${D} install-secmds \
-		|| die "secmds install failed."
-
-	if useq X; then
-		# graphical tools
-		make DESTDIR=${D} install-apol install-sepcut install-seaudit install-sediffx \
-			|| die "Graphical tool install failed."
-	fi
-
-	if useq selinux; then
-		if useq X; then
-			make DESTDIR=${D} install-seuserx \
-				|| die "seuserx install failed."
-		else
-			make DESTDIR=${D} install-seuser \
-				|| die "seuser install failed."
-		fi
-
-		insinto ${POLICYDIR}/domains/program
-		doins ${S}/policy/seuser.te
-		insinto ${POLICYDIR}/file_contexts/program
-		doins ${S}/policy/seuser.fc
-	fi
-}
-
-pkg_postinst() {
-	if useq selinux; then
-		einfo "A policy for the seuser program has been installed into"
-		einfo "${POLICYDIR}.  Please reload your policy and relabel"
-		einfo "setools:  rlpkg setools"
-	fi
-}
diff --git a/app-admin/setools/setools-2.1.1.ebuild b/app-admin/setools/setools-2.1.3.ebuild
index 441635e4602b..fd3bcf9768c6 100644
--- a/app-admin/setools/setools-2.1.1.ebuild
+++ b/app-admin/setools/setools-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-2.1.1.ebuild,v 1.2 2005/09/07 21:25:53 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-2.1.3.ebuild,v 1.1 2005/10/12 22:55:09 pebenito Exp $
 
 DESCRIPTION="SELinux policy tools"
 HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
@@ -40,14 +40,8 @@ src_unpack() {
 	# enable debug if requested
 	useq debug && sed -i -e '/^DEBUG/s/0/1/' ${S}/Makefile
 
-	# generate the file contexts from the template
-	sed -e 's:SEUSER_BINDIR:/usr/bin:' \
-		-e 's:SEUSER_INSTALL_LIBDIR:/usr/share/setools:' \
-		< ${S}/policy/seuser_template.fc > ${S}/policy/seuser.fc
-
 	# dont chcon or install -Z
 	sed -i -e '/object_r/d' ${S}/secmds/Makefile
-	sed -i -e '/object_r/d' ${S}/seuser/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
@@ -58,12 +52,6 @@ src_unpack() {
 			-e '/^SE_CMDS/s/searchcon//' \
 			-e '/^SE_CMDS/s/indexcon//' ${S}/secmds/Makefile
 	fi
-
-	# adjust policy settings in seuser.conf
-	echo "policy_dir         ${POLICYDIR}" > ${S}/seuser/seuser.conf
-	echo "policy.conf        ${POLICYDIR}/policy.conf" >> ${S}/seuser/seuser.conf
-	echo "file_contexts_file ${POLICYDIR}/file_contexts/file_contexts" >> ${S}/seuser/seuser.conf
-	echo "user_file          ${POLICYDIR}/users" >> ${S}/seuser/seuser.conf
 }
 
 src_compile() {
@@ -79,42 +67,13 @@ src_compile() {
 src_install() {
 	cd ${S}
 
-	dodoc COPYING ChangeLog-setools README
-
 	# some of the Makefiles are broken, and will fail
 	# if ${D}/usr/bin is nonexistant
 	dodir /usr/bin
 
-	# command line tools
-	make DESTDIR=${D} install-secmds \
-		|| die "secmds install failed."
-
-	if useq X; then
-		# graphical tools
-		make DESTDIR=${D} install-apol install-sepcut install-seaudit install-sediffx \
-			|| die "Graphical tool install failed."
-	fi
-
-	if useq selinux; then
-		if useq X; then
-			make DESTDIR=${D} install-seuserx \
-				|| die "seuserx install failed."
-		else
-			make DESTDIR=${D} install-seuser \
-				|| die "seuser install failed."
-		fi
-
-		insinto ${POLICYDIR}/domains/program
-		doins ${S}/policy/seuser.te
-		insinto ${POLICYDIR}/file_contexts/program
-		doins ${S}/policy/seuser.fc
-	fi
-}
-
-pkg_postinst() {
-	if useq selinux; then
-		einfo "A policy for the seuser program has been installed into"
-		einfo "${POLICYDIR}.  Please reload your policy and relabel"
-		einfo "setools:  rlpkg setools"
+	if use X; then
+		make DESTDIR=${D} install || die "install failed."
+	else
+		make DESTDIR=${D} install-nogui || die "install failed."
 	fi
 }