new upstream bugfix release

6 files changed, 12 insertions, 61 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 2ffb1e0c53f6..286a902d9f7f 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.8 2003/12/29 03:04:58 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.9 2004/01/06 23:56:57 pebenito Exp $
+
+*setools-1.1.1 (06 Jan 2004)
+
+  06 Jan 2004; Chris PeBenito <pebenito@gentoo.org> setools-1.1.1.ebuild:
+  New upstream bugfix release.
 
   28 Dec 2003; Chris PeBenito <pebenito@gentoo.org> setools-1.1.ebuild:
   Eliminate install -Z. The context option is not needed, and causes sandbox
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index fd39c3cac95a..9223314e7449 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,7 +1,6 @@
 MD5 8fb317db54d945003dde0f10ae0f84a5 setools-1.0.1.ebuild 2164
-MD5 315752744631aab1d2a24d62d5d7620b ChangeLog 1406
-MD5 dbe2500548552f7465de3d5b3fa90eb7 setools-1.1.ebuild 3301
+MD5 6de3a616ee49eade7cc05a2b3d56faed ChangeLog 1542
+MD5 5e59cf2598a964bcf76a34787cf0a96c setools-1.1.1.ebuild 3186
 MD5 418c2991b69fcf9d551aba29ae6f2b2e metadata.xml 505
-MD5 a8fb0b7e830355d9de617df14ceaf43b files/setools-1.1-fix_noX.diff 1328
-MD5 471bf4cba5a334dcb65b4451a1b0ce07 files/digest-setools-1.1 60
 MD5 5564aa4a7b6c1f09a6b07813defbedd5 files/digest-setools-1.0.1 62
+MD5 021e046b2976f4ea4e1b48546b8ba7ee files/digest-setools-1.1.1 62
diff --git a/app-admin/setools/files/digest-setools-1.1 b/app-admin/setools/files/digest-setools-1.1
deleted file mode 100644
index f90717ac5681..000000000000
--- a/app-admin/setools/files/digest-setools-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3e3030b84e9ef4dd74ec1a915ee0c4d2 setools-1.1.tgz 687517
diff --git a/app-admin/setools/files/digest-setools-1.1.1 b/app-admin/setools/files/digest-setools-1.1.1
new file mode 100644
index 000000000000..f18b5c059932
--- /dev/null
+++ b/app-admin/setools/files/digest-setools-1.1.1
@@ -0,0 +1 @@
+MD5 b0147413a6d28dd9d281fc8e41e124ea setools-1.1.1.tgz 687548
diff --git a/app-admin/setools/files/setools-1.1-fix_noX.diff b/app-admin/setools/files/setools-1.1-fix_noX.diff
deleted file mode 100644
index 22cb78179843..000000000000
--- a/app-admin/setools/files/setools-1.1-fix_noX.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -urN setools-1.1.orig/libapol/Makefile setools-1.1/libapol/Makefile
---- setools-1.1.orig/libapol/Makefile	2003-11-05 08:55:44.000000000 -0600
-+++ setools-1.1/libapol/Makefile	2003-12-22 19:58:01.000000000 -0600
-@@ -3,21 +3,14 @@
- LIB-OBJ	= policy.o policy-query.o policy-io.o queue.o util.o clone.o 
- LIB-OBJ += y.tab.o lex.yy.o avl-util.o policy-avl.o render.o analysis.o 
- LIB-OBJ += perm-map.o cond.o 
--LIB-OBJ-TCL = apol_tcl.o
- 
- 
- libapol: ../lib/libapol.a
- 
--libapol-tcl: ../lib/libapol-tcl.a
--
--
- ../lib/libapol.a: ../lib $(LIB-OBJ) 
- 	 ar cr $@ $(LIB-OBJ) 
- 
- 
--../lib/libapol-tcl.a: ../lib $(LIB-OBJ-TCL) 
--	 ar cr $@ $(LIB-OBJ-TCL) 
--
- %.o:  %.c 
- 	$(CC) $(CFLAGS) -c $<
- 
-diff -urN setools-1.1.orig/libseuser/Makefile setools-1.1/libseuser/Makefile
---- setools-1.1.orig/libseuser/Makefile	2003-10-10 13:23:23.000000000 -0500
-+++ setools-1.1/libseuser/Makefile	2003-12-22 19:58:24.000000000 -0600
-@@ -1,20 +1,14 @@
- # libseuser and libseuser-tcl
- 
--LIB-OBJ		= seuser_tcl.o seuser_db.o 
--LIB-OBJ-TCL = $(LIB-OBJ) seuser_tcl.o
-+LIB-OBJ		= seuser_db.o 
- 
- 
- 
- libseuser: ../lib/libseuser.a
- 
--libseuser-tcl: ../lib/libseuser-tcl.a
--
- ../lib/libseuser.a: ../lib $(LIB-OBJ) 
- 	 ar cr $@ $(LIB-OBJ) 
- 	 
--../lib/libseuser-tcl.a: ../lib $(LIB-OBJ-TCL) 
--	 ar cr $@ $(LIB-OBJ-TCL)
--
- %.o:  %.c 
- 	$(CC) $(CFLAGS) -c $<
- 
diff --git a/app-admin/setools/setools-1.1.ebuild b/app-admin/setools/setools-1.1.1.ebuild
index 8e54cfbd21ab..1d3e59ba25df 100644
--- a/app-admin/setools/setools-1.1.ebuild
+++ b/app-admin/setools/setools-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1.ebuild,v 1.5 2003/12/29 03:04:58 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.1.1.ebuild,v 1.1 2004/01/06 23:56:57 pebenito Exp $
 
 DESCRIPTION="SELinux policy tools"
 HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
@@ -48,9 +48,6 @@ src_unpack() {
 	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
-
-	# makefiles are broken, fix to not build tcl stuff for non X
-	use X || epatch ${FILESDIR}/setools-1.1-fix_noX.diff
 }
 
 src_compile() {