new upstream version

4 files changed, 159 insertions, 5 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 1301a2b92b61..5268ac400beb 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/setools
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.20 2004/06/21 17:59:55 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.21 2004/06/21 18:22:15 pebenito Exp $
+
+*setools-1.4 (21 Jun 2004)
+
+  21 Jun 2004; Chris PeBenito <pebenito@gentoo.org> +setools-1.4.ebuild:
+  New upstream version.
 
   21 Jun 2004; Chris PeBenito <pebenito@gentoo.org> setools-1.3.1.ebuild:
   Fix for compiles that are USE="-selinux".
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 944a8917580c..fefda236de50 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c4a40a77b86728d96aa2215985805220 ChangeLog 2840
+MD5 76e898b53c0ff24f7b0d15f5fe12c116 ChangeLog 2966
+MD5 38c41cdc7b5e2ec3658ae25a4e95c877 setools-1.4.ebuild 3785
 MD5 418c2991b69fcf9d551aba29ae6f2b2e metadata.xml 505
 MD5 2c34ec28bdfbd13f7d33f48f7ee151da setools-1.3.1.ebuild 3729
 MD5 1bfbc399d1a514ceb99ce8364a062fb4 files/digest-setools-1.3.1 62
+MD5 8547d53d117cb2a639a90e564be9d449 files/digest-setools-1.4 60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFA1yIxGFJQsIJWJy4RAj1xAJ9WcPL7XxBRvz+rkzN7kt66+qChJQCghELh
-vRRLFeCNaNisdd4hAPiwS14=
-=jCOM
+iD8DBQFA1ydjGFJQsIJWJy4RAj9tAJ9Dt5ozMUWORt25fooy25nvaPGzmwCfXliD
+33GgEM0SorUE9hbv+VkhNQc=
+=NnZP
 -----END PGP SIGNATURE-----
diff --git a/app-admin/setools/files/digest-setools-1.4 b/app-admin/setools/files/digest-setools-1.4
new file mode 100644
index 000000000000..5a05e6d0b83b
--- /dev/null
+++ b/app-admin/setools/files/digest-setools-1.4
@@ -0,0 +1 @@
+MD5 ee3e7a28eea7ba7bb9956abab738cbde setools-1.4.tgz 912826
diff --git a/app-admin/setools/setools-1.4.ebuild b/app-admin/setools/setools-1.4.ebuild
new file mode 100644
index 000000000000..ce3ee1e805bf
--- /dev/null
+++ b/app-admin/setools/setools-1.4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.4.ebuild,v 1.1 2004/06/21 18:22:15 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"
+
+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
+	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 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 paths in 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 '/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
+}