Fix seuser.fc install.

5 files changed, 12 insertions, 153 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index dc72fa49e297..978c096614b9 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/setools
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.24 2004/08/22 15:55:33 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.25 2004/09/16 01:26:59 pebenito Exp $
+
+*setools-1.4.1-r1 (15 Sep 2004)
+
+  15 Sep 2004; Chris PeBenito <pebenito@gentoo.org> -setools-1.3.1.ebuild,
+  +setools-1.4.1-r1.ebuild, -setools-1.4.1.ebuild:
+  Fix seuser.fc install.
 
 *setools-1.4.1 (22 Aug 2004)
 
diff --git a/app-admin/setools/files/digest-setools-1.3.1 b/app-admin/setools/files/digest-setools-1.3.1
deleted file mode 100644
index 17043a1bb315..000000000000
--- a/app-admin/setools/files/digest-setools-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8011d692292d00e1c66b61aecb8b21a setools-1.3.1.tgz 887208
diff --git a/app-admin/setools/files/digest-setools-1.4.1 b/app-admin/setools/files/digest-setools-1.4.1-r1
index bd7d91ad0ea5..bd7d91ad0ea5 100644
--- a/app-admin/setools/files/digest-setools-1.4.1
+++ b/app-admin/setools/files/digest-setools-1.4.1-r1
diff --git a/app-admin/setools/setools-1.3.1.ebuild b/app-admin/setools/setools-1.3.1.ebuild
deleted file mode 100644
index 9172969f6eaf..000000000000
--- a/app-admin/setools/setools-1.3.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.3.1.ebuild,v 1.5 2004/06/25 03:02:44 agriffis 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"
-IUSE="X gtk selinux"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	dev-libs/libxml2
-	dev-util/pkgconfig
-	X? ( dev-lang/tk gtk? ( >=gnome-base/libglade-2.0 ) )"
-RDEPEND="dev-libs/libxml2
-	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 for tcl/tk version
-	has_version '=dev-lang/tk-8.4*' && \
-		sed -i -e 's:8.3:8.4:' ${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
-
-	# fix up the file contexts
-	sed -i -e 's:/usr/apol:/usr/share/setools:' ${S}/policy/seuser.fc
-
-	# dont chcon or install -Z
-	sed -i -e '/chcon/d' ${S}/secmds/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
-		einfo "Disabling replcon and findcon"
-		sed -i -e '/^SE_CMDS/s/replcon//' ${S}/secmds/Makefile
-		sed -i -e '/^SE_CMDS/s/findcon//' ${S}/secmds/Makefile
-	fi
-
-	# set policy dir in seuser.conf
-	sed -i -e '/^policy_dir/d' -e '/^user_file/d' ${S}/seuser/seuser.conf
-	echo "policy_dir ${POLICYDIR}" >> ${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 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 "findcon"
-	einfo "replcon"
-	einfo "seinfo"
-	einfo "sesearch"
-	if use X; then
-		einfo "apol"
-		einfo "sepcut"
-		use gtk && einfo "seaudit"
-	fi
-	if use selinux; then
-		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.4.1.ebuild b/app-admin/setools/setools-1.4.1-r1.ebuild
index 11978eeee74d..441666d6febc 100644
--- a/app-admin/setools/setools-1.4.1.ebuild
+++ b/app-admin/setools/setools-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.ebuild,v 1.1 2004/08/22 15:55:33 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.4.1-r1.ebuild,v 1.1 2004/09/16 01:26:59 pebenito Exp $
 
 DESCRIPTION="SELinux policy tools"
 HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
@@ -41,8 +41,10 @@ src_unpack() {
 	# we will manually install policy
 #	sed -i -e "s: policy-install::g" ${S}/seuser/Makefile
 
-	# fix up the paths in the file contexts
-#	sed -i -e 's:/usr/apol:/usr/share/setools:' ${S}/policy/seuser.fc
+	# 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