fix for bug #88248

(Portage version: 2.0.51.19)

6 files changed, 33 insertions, 185 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 122037375657..b2ee4db4364b 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.31 2005/03/29 19:24:28 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.32 2005/04/09 16:50:53 pebenito Exp $
+
+*setools-2.0-r1 (09 Apr 2005)
+
+  09 Apr 2005; Chris PeBenito <pebenito@gentoo.org> +setools-2.0-r1.ebuild:
+  Fix for bug #88248.
 
   29 Mar 2005; Chris PeBenito <pebenito@gentoo.org> setools-2.0.ebuild:
   Mark stable.
diff --git a/app-admin/setools/files/digest-setools-1.4.1-r1 b/app-admin/setools/files/digest-setools-1.4.1-r1
deleted file mode 100644
index bd7d91ad0ea5..000000000000
--- a/app-admin/setools/files/digest-setools-1.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6afb10ee33873892772cdaa7f04a136a setools-1.4.1.tgz 912658
diff --git a/app-admin/setools/files/digest-setools-1.5.1 b/app-admin/setools/files/digest-setools-1.5.1
deleted file mode 100644
index 322517834f82..000000000000
--- a/app-admin/setools/files/digest-setools-1.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98b540b77f1554ff24b5ea62de32c0db setools-1.5.1.tgz 981238
diff --git a/app-admin/setools/files/digest-setools-2.0-r1 b/app-admin/setools/files/digest-setools-2.0-r1
new file mode 100644
index 000000000000..5e0d57a4a6e9
--- /dev/null
+++ b/app-admin/setools/files/digest-setools-2.0-r1
@@ -0,0 +1 @@
+MD5 3f03b184d1e50735bba6084212abcf74 setools-2.0.tar.bz2 1223363
diff --git a/app-admin/setools/setools-1.4.1-r1.ebuild b/app-admin/setools/setools-1.4.1-r1.ebuild
deleted file mode 100644
index 57fdd38a9561..000000000000
--- a/app-admin/setools/setools-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,150 +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-1.4.1-r1.ebuild,v 1.2 2005/01/01 11:25:12 eradicator Exp $
-
-DESCRIPTION="SELinux policy tools"
-HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
-SRC_URI="http://www.tresys.com/Downloads/selinux-tools/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="X gtk selinux"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	dev-libs/libxml2
-	dev-util/pkgconfig
-	selinux? ( sys-libs/libselinux )
-	X? ( dev-lang/tk gtk? ( >=gnome-base/libglade-2.0 ) )"
-
-RDEPEND="dev-libs/libxml2
-	selinux? ( sys-libs/libselinux )
-	X? (
-		dev-lang/tk
-		>=dev-tcltk/bwidget-1.4.1
-		gtk? ( >=gnome-base/libglade-2.0 )
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fix the Makefile to listen to portage CFLAGS
-	sed -i -e "s:-O2:-O2 ${CFLAGS}:" ${S}/Makefile
-
-	# fix up the scripts we're going to install
-	sed -i -e 's:local/selinux/::g' ${S}/seuser/seuseradd
-	sed -i -e 's:local/selinux/::g' ${S}/seuser/seuserdel
-	sed -i -e 's:local/selinux/::g' ${S}/seuser/seusermod
-
-	# we will manually install policy
-#	sed -i -e "s: policy-install::g" ${S}/seuser/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 '/chcon/d' ${S}/secmds/Makefile
-	sed -i -e '/chcon/d' ${S}/seuser/Makefile
-	sed -i -e 's,-Z system_u:object_r:seuser_exec_t,,g' ${S}/seuser/Makefile
-	sed -i -e 's,-Z system_u:object_r:seuser_conf_t,,g' ${S}/seuser/Makefile
-	sed -i -e 's,-Z system_u:object_r:policy_src_t,,g' ${S}/seuser/Makefile
-
-	# dont do findcon or replcon if USE=-selinux
-	if ! use selinux; then
-		sed -i -e '/^SE_CMDS/s/replcon//' ${S}/secmds/Makefile
-		sed -i -e '/^SE_CMDS/s/findcon//' ${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}
-
-	# build command line tools
-	make all-nogui || die "command line tools compile failed"
-
-	if use X; then
-		make apol sepcut seuserx \
-			|| die "apol, sepcut, or seuserx compile failed"
-
-		if use gtk; then
-			make seaudit || die "seaudit compile failed."
-		fi
-
-	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 use X; then
-		# graphical tools
-
-		make DESTDIR=${D} install-apol install-sepcut \
-			|| die "apol and sepcut install failed."
-
-		if use gtk; then
-			make DESTDIR=${D} install-seaudit \
-				|| die "seaudit install failed."
-		fi
-	fi
-
-	if use selinux; then
-		if use 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() {
-	einfo "Installed tools:"
-	echo
-	einfo "seinfo"
-	einfo "sesearch"
-	if use X; then
-		einfo "apol"
-		einfo "sepcut"
-		use gtk && einfo "seaudit"
-	fi
-	if use selinux; then
-		einfo "findcon"
-		einfo "replcon"
-		einfo "seuser"
-		use X && einfo "seuserx"
-		einfo "seuseradd"
-		einfo "seuserdel"
-		einfo "seusermod"
-		echo
-		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-1.5.1.ebuild b/app-admin/setools/setools-2.0-r1.ebuild
index 5facef2395a6..ae6f5546db73 100644
--- a/app-admin/setools/setools-1.5.1.ebuild
+++ b/app-admin/setools/setools-2.0-r1.ebuild
@@ -1,37 +1,46 @@
 # 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-1.5.1.ebuild,v 1.3 2005/03/04 13:59:21 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-2.0-r1.ebuild,v 1.1 2005/04/09 16:50:53 pebenito Exp $
 
 DESCRIPTION="SELinux policy tools"
 HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
-SRC_URI="http://www.tresys.com/Downloads/selinux-tools/${P}.tgz"
+SRC_URI="http://www.tresys.com/Downloads/selinux-tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ~amd64"
-IUSE="X gtk selinux"
+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 gtk? ( >=gnome-base/libglade-2.0 ) )"
+	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
-		gtk? ( >=gnome-base/libglade-2.0 )
+		>=gnome-base/libglade-2.0
 	)"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# fix for bug #88248
+	sed -i -e '/capability\.h/d' ${S}/libapol/cond.c
+
 	# fix the Makefile to listen to portage CFLAGS
-	sed -i -e "s:-O2:${CFLAGS}:" ${S}/Makefile
+	sed -i -e "/^CFLAGS/s/-O2/${CFLAGS}/g" ${S}/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:' \
@@ -44,7 +53,7 @@ src_unpack() {
 	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 ! use selinux; then
+	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//' \
@@ -62,17 +71,10 @@ src_unpack() {
 src_compile() {
 	cd ${S}
 
-	# build command line tools
-	make all-nogui || die "command line tools compile failed"
-
-	if use X; then
-		make apol sepcut seuserx \
-			|| die "apol, sepcut, or seuserx compile failed"
-
-		if use gtk; then
-			make seaudit || die "seaudit compile failed."
-		fi
-
+	if useq X; then
+		make all || die
+	else
+		make all-nogui || die
 	fi
 }
 
@@ -89,22 +91,14 @@ src_install() {
 	make DESTDIR=${D} install-secmds \
 		|| die "secmds install failed."
 
-	if use X; then
+	if useq X; then
 		# graphical tools
-
-		make DESTDIR=${D} install-apol install-sepcut \
-			|| die "apol and sepcut install failed."
-
-		if use gtk; then
-			make DESTDIR=${D} install-seaudit \
-				|| die "seaudit install failed."
-#			make DESTDIR=${D} -C seaudit install-logwatch-service \
-#				|| die "logwatch install failed."
-		fi
+		make DESTDIR=${D} install-apol install-sepcut install-seaudit install-sediffx \
+			|| die "Graphical tool install failed."
 	fi
 
-	if use selinux; then
-		if use X; then
+	if useq selinux; then
+		if useq X; then
 			make DESTDIR=${D} install-seuserx \
 				|| die "seuserx install failed."
 		else
@@ -120,7 +114,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use selinux; then
+	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"