new upstream release

Package-Manager: portage-2.0.51.22-r2

5 files changed, 14 insertions, 46 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index ad16c559f1ea..3a9d2e7aeee6 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.35 2005/05/20 02:44:41 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.36 2005/09/07 00:28:24 pebenito Exp $
+
+*setools-2.1.2 (07 Sep 2005)
+
+  07 Sep 2005; Chris PeBenito <pebenito@gentoo.org> +setools-2.1.2.ebuild:
+  New upstream release.
 
 *setools-2.1.1 (20 May 2005)
 
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 072a5a319b1e..aac97246d2ef 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,8 +1,8 @@
 MD5 418c2991b69fcf9d551aba29ae6f2b2e metadata.xml 505
-MD5 79e737155d3100677f8c837566608d8b setools-2.0-r1.ebuild 3206
 MD5 3807b1244bbd040914bf27ba414db4a4 setools-2.1.0.ebuild 3203
 MD5 95822410d9d028b9619ff061fc392591 setools-2.1.1.ebuild 3206
-MD5 c3f3d2b3697f7dee3cb4eb0bf182edd2 ChangeLog 4568
-MD5 224e84466ac339413624a81279600711 files/digest-setools-2.0-r1 65
+MD5 8ff5cb4c0ba91bef709585525c9407b0 ChangeLog 4698
+MD5 68bef499e1fc264958fb219d684bade5 setools-2.1.2.ebuild 2028
 MD5 9df77ddbd782b94775d9f1157b7fecdb files/digest-setools-2.1.0 67
 MD5 cf2208a1067357ca34b33aaaa0663e43 files/digest-setools-2.1.1 67
+MD5 d5e3ea2528cfdcc54874e15ff5d5fbf2 files/digest-setools-2.1.2 67
diff --git a/app-admin/setools/files/digest-setools-2.0-r1 b/app-admin/setools/files/digest-setools-2.0-r1
deleted file mode 100644
index 5e0d57a4a6e9..000000000000
--- a/app-admin/setools/files/digest-setools-2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f03b184d1e50735bba6084212abcf74 setools-2.0.tar.bz2 1223363
diff --git a/app-admin/setools/files/digest-setools-2.1.2 b/app-admin/setools/files/digest-setools-2.1.2
new file mode 100644
index 000000000000..71fd5c688543
--- /dev/null
+++ b/app-admin/setools/files/digest-setools-2.1.2
@@ -0,0 +1 @@
+MD5 a5d70325cc16e9815a6e624727f00e16 setools-2.1.2.tar.bz2 1388995
diff --git a/app-admin/setools/setools-2.0-r1.ebuild b/app-admin/setools/setools-2.1.2.ebuild
index 7fbc31ad8c21..b93e054cde05 100644
--- a/app-admin/setools/setools-2.0-r1.ebuild
+++ b/app-admin/setools/setools-2.1.2.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.0-r1.ebuild,v 1.2 2005/04/21 14:19:21 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-2.1.2.ebuild,v 1.1 2005/09/07 00:28:24 pebenito Exp $
 
 DESCRIPTION="SELinux policy tools"
 HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
@@ -8,7 +8,7 @@ SRC_URI="http://www.tresys.com/Downloads/selinux-tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc amd64"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="X debug selinux"
 
 DEPEND="sys-devel/bison
@@ -33,23 +33,15 @@ 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 "/^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
@@ -60,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() {
@@ -93,30 +79,7 @@ src_install() {
 
 	if useq X; then
 		# graphical tools
-		make DESTDIR=${D} install-apol install-sepcut install-seaudit install-sediffx \
+		make DESTDIR=${D} install-apol 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
 }