mark stable rm old

6 files changed, 9 insertions, 344 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 4ac091836fc7..135aff4044e6 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.4 2003/08/14 22:03:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.5 2003/08/16 01:05:57 pebenito Exp $
+
+  15 Aug 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.0.ebuild,
+  libselinux-1.1-r1.ebuild, files/libselinux-1.0-gentoo.diff:
+  Mark stable
 
 *libselinux-1.1-r1 (14 Aug 2003)
 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 5f0dd0e08d32..babd85b8af8e 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,9 +1,6 @@
-MD5 717f87e8763e0467b99cf5568fd27f91 libselinux-1.0.ebuild 746
 MD5 36bf0405b9d81999a4c53df2e5b6c748 metadata.xml 270
-MD5 12ff4bcba69d24d762f7364466d5d9e0 ChangeLog 959
-MD5 75ee2f2b1f54b606e2c3504243bba749 libselinux-1.1-r1.ebuild 835
-MD5 fa6cb6d507ae7a7c1b4ccc7e673d37cc files/digest-libselinux-1.0 62
-MD5 0618c08091c01107cf53015a85ac3fcb files/libselinux-1.0-gentoo.diff 8902
+MD5 30b6437b80204c07e7ca15ae73e173c6 ChangeLog 1111
+MD5 1e8ccb0f14e261fd1a960c1e3abe208c libselinux-1.1-r1.ebuild 833
 MD5 ee2480e816c5fb6bdc78e94cf0a4d1f5 files/libselinux-1.1-gentoo.diff 1242
 MD5 4276fc22ccd5de38cc3ce45f83343f68 files/digest-libselinux-1.1-r1 62
 MD5 9fbf39a4f64f805072e80f9a38d0c56f files/libselinux-1.1-linkfix.diff 430
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.0 b/sys-libs/libselinux/files/digest-libselinux-1.0
deleted file mode 100644
index a81daf3114e8..000000000000
--- a/sys-libs/libselinux/files/digest-libselinux-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8674a0f54e155573f1d7867b2c1e5564 libselinux-1.0.tgz 22466
diff --git a/sys-libs/libselinux/files/libselinux-1.0-gentoo.diff b/sys-libs/libselinux/files/libselinux-1.0-gentoo.diff
deleted file mode 100644
index 86d81bfb4b04..000000000000
--- a/sys-libs/libselinux/files/libselinux-1.0-gentoo.diff
+++ /dev/null
@@ -1,297 +0,0 @@
-diff -urN libselinux-1.0.orig/Makefile libselinux-1.0/Makefile
---- libselinux-1.0.orig/Makefile	2003-06-09 14:22:55.000000000 -0500
-+++ libselinux-1.0/Makefile	2003-08-03 20:01:16.000000000 -0500
-@@ -1,6 +1,6 @@
- all: 
--	$(MAKE) -C src 
--	$(MAKE) -C utils
-+	$(MAKE) -C src EXTRA_CFLAGS="$(EXTRA_CFLAGS)"
-+	$(MAKE) -C utils EXTRA_CFLAGS="$(EXTRA_CFLAGS)"
- 
- install: 
- 	$(MAKE) -C include install
-diff -urN libselinux-1.0.orig/src/Makefile libselinux-1.0/src/Makefile
---- libselinux-1.0.orig/src/Makefile	2003-07-07 07:53:40.000000000 -0500
-+++ libselinux-1.0/src/Makefile	2003-08-03 20:01:35.000000000 -0500
-@@ -9,7 +9,7 @@
- TARGET=libselinux.so
- LIBSO=$(TARGET).$(LIBVERSION)
- OBJS= $(patsubst %.c,%.o,$(wildcard *.c))
--CFLAGS = -Wall
-+CFLAGS = -Wall $(EXTRA_CFLAGS)
- override CFLAGS += -fPIC -I../include 
- 
- all: $(LIBA) $(LIBSO)
-diff -urN libselinux-1.0.orig/utils/Makefile libselinux-1.0/utils/Makefile
---- libselinux-1.0.orig/utils/Makefile	2003-07-07 07:53:42.000000000 -0500
-+++ libselinux-1.0/utils/Makefile	2003-08-03 20:01:58.000000000 -0500
-@@ -2,7 +2,7 @@
- PREFIX ?= $(DESTDIR)/usr
- BINDIR ?= $(PREFIX)/bin
- 
--CFLAGS = -Wall
-+CFLAGS = -Wall $(EXTRA_CFLAGS)
- override CFLAGS += -I../include
- LDLIBS += -L../src -lselinux -lattr
- 
-Index: libselinux/src/compute_av.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-2.5/libselinux/src/compute_av.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 compute_av.c
---- libselinux/src/compute_av.c	14 Jul 2003 17:11:31 -0000	1.1.1.1
-+++ libselinux/src/compute_av.c	17 Jul 2003 14:49:01 -0000
-@@ -37,7 +37,7 @@
- 		goto out2;
- 
- 	memset(buf, 0, len);
--	ret = read(fd, buf, len);
-+	ret = read(fd, buf, len-1);
- 	if (ret < 0)
- 		goto out2;
- 
-Index: libselinux/src/compute_create.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-2.5/libselinux/src/compute_create.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 compute_create.c
---- libselinux/src/compute_create.c	14 Jul 2003 17:11:31 -0000	1.1.1.1
-+++ libselinux/src/compute_create.c	17 Jul 2003 14:49:01 -0000
-@@ -35,7 +35,7 @@
- 		goto out2;
- 
- 	memset(buf, 0, size);
--	ret = read(fd, buf, size);
-+	ret = read(fd, buf, size-1);
- 	if (ret < 0)
- 		goto out2;
- 
-Index: libselinux/src/compute_relabel.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-2.5/libselinux/src/compute_relabel.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 compute_relabel.c
---- libselinux/src/compute_relabel.c	14 Jul 2003 17:11:31 -0000	1.1.1.1
-+++ libselinux/src/compute_relabel.c	17 Jul 2003 14:49:01 -0000
-@@ -35,7 +35,7 @@
- 		goto out2;
- 
- 	memset(buf, 0, size);
--	ret = read(fd, buf, size);
-+	ret = read(fd, buf, size-1);
- 	if (ret < 0)
- 		goto out2;
- 
-Index: libselinux/src/compute_user.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-2.5/libselinux/src/compute_user.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 compute_user.c
---- libselinux/src/compute_user.c	14 Jul 2003 17:11:31 -0000	1.1.1.1
-+++ libselinux/src/compute_user.c	17 Jul 2003 14:49:01 -0000
-@@ -36,7 +36,7 @@
- 		goto out2;
- 
- 	memset(buf, 0, size);
--	ret = read(fd, buf, size);
-+	ret = read(fd, buf, size-1);
- 	if (ret < 0)
- 		goto out2;
- 
-Index: libselinux/src/fgetfilecon.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-2.5/libselinux/src/fgetfilecon.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 fgetfilecon.c
---- libselinux/src/fgetfilecon.c	14 Jul 2003 17:11:31 -0000	1.1.1.1
-+++ libselinux/src/fgetfilecon.c	17 Jul 2003 14:49:01 -0000
-@@ -13,13 +13,13 @@
- 	size_t size;
- 	ssize_t ret;
- 
--	size = INITCONTEXTLEN;
-+	size = INITCONTEXTLEN+1;
- 	buf = malloc(size);
- 	if (!buf) 
- 		return -1;
- 	memset(buf, 0, size);
- 
--	ret = fgetxattr(fd, XATTR_NAME_SELINUX, buf, size);
-+	ret = fgetxattr(fd, XATTR_NAME_SELINUX, buf, size-1);
- 	if (ret < 0 && errno == ERANGE) {
- 		char *newbuf;
- 
-@@ -27,13 +27,14 @@
- 		if (size < 0)
- 			goto out;
- 
-+		size++;
- 		newbuf = realloc(buf, size);
- 		if (!newbuf)
- 			goto out;
- 
- 		buf = newbuf;
- 		memset(buf, 0, size);
--		ret = fgetxattr(fd, XATTR_NAME_SELINUX, buf, size); 
-+		ret = fgetxattr(fd, XATTR_NAME_SELINUX, buf, size-1); 
- 	}
- out:			
- 	if (ret < 0)
-Index: libselinux/src/getcon.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-2.5/libselinux/src/getcon.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 getcon.c
---- libselinux/src/getcon.c	14 Jul 2003 17:11:31 -0000	1.1.1.1
-+++ libselinux/src/getcon.c	17 Jul 2003 14:49:01 -0000
-@@ -26,7 +26,7 @@
- 	}
- 	memset(buf, 0, size);
- 
--	ret = read(fd, buf, size);
-+	ret = read(fd, buf, size-1);
- 	if (ret < 0)
- 		goto out2;
- 
-Index: libselinux/src/getexeccon.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-2.5/libselinux/src/getexeccon.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 getexeccon.c
---- libselinux/src/getexeccon.c	14 Jul 2003 17:11:31 -0000	1.1.1.1
-+++ libselinux/src/getexeccon.c	17 Jul 2003 14:49:01 -0000
-@@ -26,7 +26,7 @@
- 	}
- 	memset(buf, 0, size);
- 
--	ret = read(fd, buf, size);
-+	ret = read(fd, buf, size-1);
- 	if (ret < 0)
- 		goto out2;
- 
-Index: libselinux/src/getfilecon.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-2.5/libselinux/src/getfilecon.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 getfilecon.c
---- libselinux/src/getfilecon.c	14 Jul 2003 17:11:31 -0000	1.1.1.1
-+++ libselinux/src/getfilecon.c	17 Jul 2003 14:49:01 -0000
-@@ -13,13 +13,13 @@
- 	size_t size;
- 	ssize_t ret;
- 
--	size = INITCONTEXTLEN;
-+	size = INITCONTEXTLEN+1;
- 	buf = malloc(size);
- 	if (!buf) 
- 		return -1;
- 	memset(buf, 0, size);
- 
--	ret = getxattr(path, XATTR_NAME_SELINUX, buf, size);
-+	ret = getxattr(path, XATTR_NAME_SELINUX, buf, size-1);
- 	if (ret < 0 && errno == ERANGE) {
- 		char *newbuf;
- 
-@@ -27,13 +27,14 @@
- 		if (size < 0)
- 			goto out;
- 
-+		size++;
- 		newbuf = realloc(buf, size);
- 		if (!newbuf)
- 			goto out;
- 
- 		buf = newbuf;
- 		memset(buf, 0, size);
--		ret = getxattr(path, XATTR_NAME_SELINUX, buf, size); 
-+		ret = getxattr(path, XATTR_NAME_SELINUX, buf, size-1); 
- 	}
- out:			
- 	if (ret < 0)
-Index: libselinux/src/getfscreatecon.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-2.5/libselinux/src/getfscreatecon.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 getfscreatecon.c
---- libselinux/src/getfscreatecon.c	14 Jul 2003 17:11:31 -0000	1.1.1.1
-+++ libselinux/src/getfscreatecon.c	17 Jul 2003 14:49:01 -0000
-@@ -26,7 +26,7 @@
- 	}
- 	memset(buf, 0, size);
- 
--	ret = read(fd, buf, size);
-+	ret = read(fd, buf, size-1);
- 	if (ret < 0)
- 		goto out2;
- 
-Index: libselinux/src/getpidcon.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-2.5/libselinux/src/getpidcon.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 getpidcon.c
---- libselinux/src/getpidcon.c	14 Jul 2003 17:11:31 -0000	1.1.1.1
-+++ libselinux/src/getpidcon.c	17 Jul 2003 14:49:01 -0000
-@@ -30,7 +30,7 @@
- 	}
- 	memset(buf, 0, size);
- 
--	ret = read(fd, buf, size);
-+	ret = read(fd, buf, size-1);
- 	if (ret < 0)
- 		goto out2;
- 
-Index: libselinux/src/getprevcon.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-2.5/libselinux/src/getprevcon.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 getprevcon.c
---- libselinux/src/getprevcon.c	14 Jul 2003 17:11:31 -0000	1.1.1.1
-+++ libselinux/src/getprevcon.c	17 Jul 2003 14:49:01 -0000
-@@ -26,7 +26,7 @@
- 	}
- 	memset(buf, 0, size);
- 
--	ret = read(fd, buf, size);
-+	ret = read(fd, buf, size-1);
- 	if (ret < 0)
- 		goto out2;
- 
-Index: libselinux/src/lgetfilecon.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-2.5/libselinux/src/lgetfilecon.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 lgetfilecon.c
---- libselinux/src/lgetfilecon.c	14 Jul 2003 17:11:31 -0000	1.1.1.1
-+++ libselinux/src/lgetfilecon.c	17 Jul 2003 14:49:01 -0000
-@@ -13,13 +13,13 @@
- 	size_t size;
- 	ssize_t ret;
- 
--	size = INITCONTEXTLEN;
-+	size = INITCONTEXTLEN+1;
- 	buf = malloc(size);
- 	if (!buf) 
- 		return -1;
- 	memset(buf, 0, size);
- 
--	ret = lgetxattr(path, XATTR_NAME_SELINUX, buf, size);
-+	ret = lgetxattr(path, XATTR_NAME_SELINUX, buf, size-1);
- 	if (ret < 0 && errno == ERANGE) {
- 		char *newbuf;
- 
-@@ -27,13 +27,14 @@
- 		if (size < 0)
- 			goto out;
- 
-+		size++;
- 		newbuf = realloc(buf, size);
- 		if (!newbuf)
- 			goto out;
- 
- 		buf = newbuf;
- 		memset(buf, 0, size);
--		ret = lgetxattr(path, XATTR_NAME_SELINUX, buf, size); 
-+		ret = lgetxattr(path, XATTR_NAME_SELINUX, buf, size-1); 
- 	}
- out:			
- 	if (ret < 0)
diff --git a/sys-libs/libselinux/libselinux-1.0.ebuild b/sys-libs/libselinux/libselinux-1.0.ebuild
deleted file mode 100644
index 9fd47ce4d8bb..000000000000
--- a/sys-libs/libselinux/libselinux-1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.0.ebuild,v 1.1 2003/08/04 04:19:16 pebenito Exp $
-
-IUSE=""
-
-DESCRIPTION="SELinux library (libselinux)"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-DEPEND="virtual/glibc
-	!sys-apps/selinux-small
-	sys-apps/attr"
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	cd ${S}/src
-	emake EXTRA_CFLAGS="${CFLAGS}"
-
-	cd ${S}/utils
-	emake EXTRA_CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
-
diff --git a/sys-libs/libselinux/libselinux-1.1-r1.ebuild b/sys-libs/libselinux/libselinux-1.1-r1.ebuild
index c0fd80ffd549..86877892f001 100644
--- a/sys-libs/libselinux/libselinux-1.1-r1.ebuild
+++ b/sys-libs/libselinux/libselinux-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.1-r1.ebuild,v 1.1 2003/08/14 22:03:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.1-r1.ebuild,v 1.2 2003/08/16 01:05:57 pebenito Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND="virtual/glibc
 	sys-apps/attr"