new upstream version

4 files changed, 140 insertions, 2 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 475545a3cd00..1ec77300d66d 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/setools
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.5 2003/11/20 21:31:03 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.6 2003/12/22 20:15:02 pebenito Exp $
+
+*setools-1.1 (22 Dec 2003)
+
+  22 Dec 2003; Chris PeBenito <pebenito@gentoo.org> setools-1.1.ebuild:
+  New upstream version. Now X is optional, as there are command line tools. Also
+  has a new optional gtk log analyzer for audit messages.
 
   20 Nov 2003; Chris PeBenito <pebenito@gentoo.org> setools-1.0.1.ebuild:
   Mark stable
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 59eb1051df24..6ae9ab82521c 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,6 +1,8 @@
 MD5 8fb317db54d945003dde0f10ae0f84a5 setools-1.0.1.ebuild 2164
 MD5 418c2991b69fcf9d551aba29ae6f2b2e metadata.xml 505
 MD5 e4bea5189288e3b3c3dbe08b0991f60c setools-1.0.ebuild 2162
-MD5 0a2e25b96174515dfb4408874d144579 ChangeLog 808
+MD5 61c14d4efc4967fd3f55f270ad7a52de ChangeLog 1048
+MD5 acfcfe6d3319bdc75f971a403cfeb8a9 setools-1.1.ebuild 3074
 MD5 5564aa4a7b6c1f09a6b07813defbedd5 files/digest-setools-1.0.1 62
 MD5 e67f17b9d1144c47594fc42147520b6d files/digest-setools-1.0 60
+MD5 471bf4cba5a334dcb65b4451a1b0ce07 files/digest-setools-1.1 60
diff --git a/app-admin/setools/files/digest-setools-1.1 b/app-admin/setools/files/digest-setools-1.1
new file mode 100644
index 000000000000..f90717ac5681
--- /dev/null
+++ b/app-admin/setools/files/digest-setools-1.1
@@ -0,0 +1 @@
+MD5 3e3030b84e9ef4dd74ec1a915ee0c4d2 setools-1.1.tgz 687517
diff --git a/app-admin/setools/setools-1.1.ebuild b/app-admin/setools/setools-1.1.ebuild
new file mode 100644
index 000000000000..dd2354659e08
--- /dev/null
+++ b/app-admin/setools/setools-1.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.1.ebuild,v 1.1 2003/12/22 20:15:02 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"
+S="${WORKDIR}/${P}"
+KEYWORDS="~x86"
+IUSE="X gtk selinux"
+
+DEPEND="sys-devel/bison
+	sys-devel/flex
+	X? ( dev-lang/tk gtk? ( >=gnome-base/libglade-2.0 ) )"
+
+RDEPEND="X? (
+		dev-lang/tk
+		>=dev-tcltk/bwidget-1.4.1
+		gtk? ( >=gnome-base/libglade-2.0 )
+	)"
+
+# adjust for tcl/tk versions
+has_version '>=dev-lang/tk-8.4' \
+	&& TCL_LIBS="-ltk8.4 -ltcl8.4 -lfl -lm -dl" \
+	|| TCL_LIBS="-ltk8.3 -ltcl8.3 -lfl -lm -dl"
+
+src_unpack() {
+	unpack ${A}
+
+	# 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 file contexts
+	sed -i -e 's:local/selinux/::' -e 's:local/::' ${S}/policy/seuser.fc
+}
+
+src_compile() {
+	cd ${S}
+
+	# build command line tools
+	make all-nogui || die "command line tools compile failed"
+
+	if use X; then
+		# adjust for tcl/tk versions
+
+		make TCL_LIBS="${TCL_LIBS}" 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 TCL_LIBS="${TCL_LIBS}" 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 TCL_LIBS="${TCL_LIBS}" 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:"
+	einfo " "
+	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"
+		einfo " "
+		einfo "A policy for the seuser program has been installed into"
+		einfo "${POLICYDIR}.  Please reload your policy at relabel"
+		einfo "setools:  rlpkg setools"
+	fi
+}