mark stable

8 files changed, 8 insertions, 356 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 3446ee596604..a5fa8b782b5b 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,9 @@
 # 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.13 2003/12/06 20:13:37 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.14 2003/12/16 20:42:08 pebenito Exp $
+
+  16 Dec 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.4.ebuild:
+  Mark stable.
 
 *libselinux-1.4 (06 Dec 2003)
 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index aecd6c3d9298..c7cd74125203 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,9 +1,4 @@
-MD5 cbc22ebaafc91da4527d23513037305c ChangeLog 2414
-MD5 fcb168638bdf3d7fdd68cc5a4b083826 libselinux-1.2-r2.ebuild 997
-MD5 c6c3c432b148535f627a75302bb82f15 libselinux-1.4.ebuild 805
 MD5 652c5e8a0a081bf4317359f04f65a603 metadata.xml 537
-MD5 ed35b412c4b957fe6121ea3d8d0a01ac files/digest-libselinux-1.2-r2 62
+MD5 4577c55886a07b7c8a0ed385e81ad15e ChangeLog 2505
+MD5 1fa636b67a02ffdda35c03060408f5fc libselinux-1.4.ebuild 802
 MD5 52c01658c738734a87d8de5c63d62644 files/digest-libselinux-1.4 62
-MD5 be018c3c6dab771a2ca39a7d5897f091 files/libselinux-1.2-attr.diff 4446
-MD5 740bc8d55ebd8f695dd659ef63aef072 files/libselinux-1.2-const.diff 5020
-MD5 ef5854592774ac33f6427e1d8651edf8 files/libselinux-1.2-gentoo.diff 1591
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.2-r2 b/sys-libs/libselinux/files/digest-libselinux-1.2-r2
deleted file mode 100644
index 32663d6490ab..000000000000
--- a/sys-libs/libselinux/files/digest-libselinux-1.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8a568affa7da710ca3218f034daf583 libselinux-1.2.tgz 22880
diff --git a/sys-libs/libselinux/files/libselinux-1.2-attr.diff b/sys-libs/libselinux/files/libselinux-1.2-attr.diff
deleted file mode 100644
index c99dd1c65641..000000000000
--- a/sys-libs/libselinux/files/libselinux-1.2-attr.diff
+++ /dev/null
@@ -1,128 +0,0 @@
-Index: libselinux/src/Makefile
-===================================================================
-RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/Makefile,v
-retrieving revision 1.14
-diff -u -r1.14 Makefile
---- libselinux/src/Makefile	8 Oct 2003 19:30:44 -0000	1.14
-+++ libselinux/src/Makefile	9 Oct 2003 19:45:08 -0000
-@@ -20,7 +20,7 @@
- 	ranlib $@
- 
- $(LIBSO): $(OBJS)
--	$(CC) $(LDFLAGS) -shared -o $@ $^ -lattr -Wl,-soname,$(LIBSO) 
-+	$(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,$(LIBSO) 
- 	ln -sf $@ $(TARGET) 
- 
- %.o:  %.c
-Index: libselinux/src/fgetfilecon.c
-===================================================================
-RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/fgetfilecon.c,v
-retrieving revision 1.4
-diff -u -r1.4 fgetfilecon.c
---- libselinux/src/fgetfilecon.c	17 Jul 2003 14:03:27 -0000	1.4
-+++ libselinux/src/fgetfilecon.c	9 Oct 2003 19:44:51 -0000
-@@ -4,7 +4,7 @@
- #include <selinux/selinux.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "policy.h"
- 
- int fgetfilecon(int fd, security_context_t *context)
-Index: libselinux/src/fsetfilecon.c
-===================================================================
-RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/fsetfilecon.c,v
-retrieving revision 1.1
-diff -u -r1.1 fsetfilecon.c
---- libselinux/src/fsetfilecon.c	28 Apr 2003 14:09:37 -0000	1.1
-+++ libselinux/src/fsetfilecon.c	9 Oct 2003 19:44:51 -0000
-@@ -4,7 +4,7 @@
- #include <selinux/selinux.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "policy.h"
- 
- int fsetfilecon(int fd, security_context_t context)
-Index: libselinux/src/getfilecon.c
-===================================================================
-RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/getfilecon.c,v
-retrieving revision 1.4
-diff -u -r1.4 getfilecon.c
---- libselinux/src/getfilecon.c	17 Jul 2003 14:03:28 -0000	1.4
-+++ libselinux/src/getfilecon.c	9 Oct 2003 19:44:51 -0000
-@@ -4,7 +4,7 @@
- #include <selinux/selinux.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "policy.h"
- 
- int getfilecon(const char *path, security_context_t *context)
-Index: libselinux/src/lgetfilecon.c
-===================================================================
-RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/lgetfilecon.c,v
-retrieving revision 1.4
-diff -u -r1.4 lgetfilecon.c
---- libselinux/src/lgetfilecon.c	17 Jul 2003 14:03:28 -0000	1.4
-+++ libselinux/src/lgetfilecon.c	9 Oct 2003 19:44:51 -0000
-@@ -4,7 +4,7 @@
- #include <selinux/selinux.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "policy.h"
- 
- int lgetfilecon(const char *path, security_context_t *context)
-Index: libselinux/src/lsetfilecon.c
-===================================================================
-RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/lsetfilecon.c,v
-retrieving revision 1.1
-diff -u -r1.1 lsetfilecon.c
---- libselinux/src/lsetfilecon.c	28 Apr 2003 14:09:37 -0000	1.1
-+++ libselinux/src/lsetfilecon.c	9 Oct 2003 19:44:51 -0000
-@@ -4,7 +4,7 @@
- #include <selinux/selinux.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "policy.h"
- 
- int lsetfilecon(const char *path, security_context_t context)
-Index: libselinux/src/setfilecon.c
-===================================================================
-RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/setfilecon.c,v
-retrieving revision 1.1
-diff -u -r1.1 setfilecon.c
---- libselinux/src/setfilecon.c	28 Apr 2003 14:09:37 -0000	1.1
-+++ libselinux/src/setfilecon.c	9 Oct 2003 19:44:51 -0000
-@@ -4,7 +4,7 @@
- #include <selinux/selinux.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "policy.h"
- 
- int setfilecon(const char *path, security_context_t context)
-Index: libselinux/utils/Makefile
-===================================================================
-RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/utils/Makefile,v
-retrieving revision 1.5
-diff -u -r1.5 Makefile
---- libselinux/utils/Makefile	7 Jul 2003 12:53:42 -0000	1.5
-+++ libselinux/utils/Makefile	9 Oct 2003 19:45:14 -0000
-@@ -4,7 +4,7 @@
- 
- CFLAGS = -Wall
- override CFLAGS += -I../include
--LDLIBS += -L../src -lselinux -lattr
-+LDLIBS += -L../src -lselinux 
- 
- TARGETS=$(patsubst %.c,%,$(wildcard *.c))
- 
diff --git a/sys-libs/libselinux/files/libselinux-1.2-const.diff b/sys-libs/libselinux/files/libselinux-1.2-const.diff
deleted file mode 100644
index 344807533ad1..000000000000
--- a/sys-libs/libselinux/files/libselinux-1.2-const.diff
+++ /dev/null
@@ -1,131 +0,0 @@
---- include/selinux/get_context_list.h
-+++ include/selinux/get_context_list.h	2003/10/03 06:17:18
-@@ -13,7 +13,7 @@
-    customizable preferences.  Returns number of entries in *conary.
-    If 'fromcon' is NULL, defaults to current context.
-    Caller must free via freeconary. */
--extern int get_ordered_context_list(char *user, 
-+extern int get_ordered_context_list(const char *user, 
- 				    security_context_t fromcon,
- 				    security_context_t **list);
- 
-@@ -24,7 +24,7 @@
-    If 'fromcon' is NULL, defaults to current context.
-    Returns 0 on success or -1 otherwise.
-    Caller must free via freecon. */
--extern int get_default_context(char* user, 
-+extern int get_default_context(const char* user, 
- 			       security_context_t fromcon,
- 			       security_context_t *newcon);
- 
-@@ -39,6 +39,7 @@
-    if a list of authorized contexts could not be obtained. 
-    Caller must free via freecon.
-    Returns 0 on success or -1 otherwise. */
--extern int manual_user_enter_context(char *user, security_context_t *newcon);
-+extern int manual_user_enter_context(const char *user,
-+				     security_context_t *newcon);
- 
- #endif
---- include/selinux/selinux.h
-+++ include/selinux/selinux.h	2003/10/03 06:19:39
-@@ -98,7 +98,7 @@
- /* Compute the set of reachable user contexts and set *con to refer to 
-    the NULL-terminated array of contexts.  Caller must free via freeconary. */
- extern int security_compute_user(security_context_t scon,
--				 char *username,
-+				 const char *username,
- 				 security_context_t **con);
- 
- /* Load a policy configuration. */
---- src/compute_user.c
-+++ src/compute_user.c	2003/10/03 06:19:00
-@@ -10,7 +10,7 @@
- #include "policy.h"
- 
- int security_compute_user(security_context_t scon,
--			  char *user,
-+			  const char *user,
- 			  security_context_t **con)
- {
- 	char **ary;
---- src/get_context_list.c
-+++ src/get_context_list.c	2003/10/03 06:17:18
-@@ -10,7 +10,7 @@
- #define USERPRIORITY 1
- #define SYSTEMPRIORITY 2
- 
--int get_default_context(char* user, 
-+int get_default_context(const char* user, 
- 			security_context_t fromcon,
- 			security_context_t *newcon)
- {
-@@ -112,7 +112,7 @@
- 		      pri_list.  The number of elements stored in pri_list 
- 		      is returned.
- */
--static int list_from_string (char *instr, char *user, 
-+static int list_from_string (char *instr, const char *user, 
-                              security_context_t *pri_list, 
-                              int pri_length)
- {
-@@ -170,7 +170,7 @@
-                       in pri_list or -1 on error.
- */
- static int get_context_list (FILE *infile, security_context_t fromcon, 
--                             char *user, security_context_t *pri_list, 
-+                             const char *user, security_context_t *pri_list, 
-                              int pri_length)
- {
-     int ret_val = 0;        /* Used for return values                    */
-@@ -197,7 +197,7 @@
-                          system configuration file.  The number of contexts placed
-                          in pri_list is returned.
-  */
--static int get_config_priority (security_context_t fromcon, char *user, 
-+static int get_config_priority (security_context_t fromcon, const char *user, 
-                          security_context_t *pri_list, int pri_length, int which,
-                          int default_user_flag)
- {
-@@ -346,7 +346,7 @@
-     return ret_val;
- }
- 
--int get_ordered_context_list (char *user, 
-+int get_ordered_context_list (const char *user, 
- 			      security_context_t fromcon, 
- 			      security_context_t **list)
- {
-@@ -376,7 +376,7 @@
- 	    freefrom = 1;
-     }
- 
--    rc = security_compute_user(fromcon, (char*)user, &init_list);
-+    rc = security_compute_user(fromcon, user, &init_list);
-     if (rc < 0) {
- 	    /* Retry with the default SELinux user identity. */
- 	    rc = security_compute_user(fromcon, 
---- src/query_user_context.c
-+++ src/query_user_context.c	2003/10/03 06:17:18
-@@ -109,7 +109,7 @@
-  *                     context chosen by the user into usercon.  Returns 0
-  *                     on success.
-  */
--int manual_user_enter_context (char *user, security_context_t *newcon)
-+int manual_user_enter_context (const char *user, security_context_t *newcon)
- {
-     char response[10];     /* Used to get yes or no answers from user */
-     char role[100];        /* The role requested by the user          */
-@@ -120,9 +120,9 @@
-     int  levellen = 100;
-     int mls_enabled = 0;
- 
--    context_t new_context; /* The new context chosen by the user      */
--    char *user_context;    /* String value of the user's context      */
--    int done = 0;          /* true if a valid sid has been obtained   */
-+    context_t new_context;     /* The new context chosen by the user     */
-+    char *user_context = NULL; /* String value of the user's context     */
-+    int done = 0;              /* true if a valid sid has been obtained  */
- 
-     /* Initialize the context.  How this is done depends on whether
-        or not MLS is enabled                                        */
diff --git a/sys-libs/libselinux/files/libselinux-1.2-gentoo.diff b/sys-libs/libselinux/files/libselinux-1.2-gentoo.diff
deleted file mode 100644
index 3018120c66dd..000000000000
--- a/sys-libs/libselinux/files/libselinux-1.2-gentoo.diff
+++ /dev/null
@@ -1,46 +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
- 
-diff -urN libselinux-1.2.orig/src/Makefile libselinux-1.2/src/Makefile
---- libselinux-1.2.orig/src/Makefile	2003-08-27 10:36:19.000000000 -0500
-+++ libselinux-1.2/src/Makefile	2003-10-06 11:38:38.000000000 -0500
-@@ -1,5 +1,5 @@
- # Installation directories.
--PREFIX ?= $(DESTDIR)/usr
-+PREFIX ?= $(DESTDIR)/
- LIBDIR ?= $(PREFIX)/lib
- 
- LIBVERSION = 1
diff --git a/sys-libs/libselinux/libselinux-1.2-r2.ebuild b/sys-libs/libselinux/libselinux-1.2-r2.ebuild
deleted file mode 100644
index f4bb983dda3a..000000000000
--- a/sys-libs/libselinux/libselinux-1.2-r2.ebuild
+++ /dev/null
@@ -1,40 +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.2-r2.ebuild,v 1.2 2003/10/29 16:04:13 method Exp $
-
-IUSE=""
-
-DESCRIPTION="SELinux library (libselinux)"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-
-DEPEND="sys-apps/attr"
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/libselinux-1.2-gentoo.diff
-	epatch ${FILESDIR}/libselinux-1.2-const.diff
-
-	# use sys-apps/attr with headers older than 2.4.20
-	has_version '>=sys-kernel/linux-headers-2.4.20' && epatch ${FILESDIR}/libselinux-1.2-attr.diff
-}
-
-src_compile() {
-	cd ${S}/src
-	emake EXTRA_CFLAGS="${CFLAGS}" || die "libselinux compile failed."
-
-	cd ${S}/utils
-	emake EXTRA_CFLAGS="${CFLAGS}" || die "Utilities compile failed."
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
-
diff --git a/sys-libs/libselinux/libselinux-1.4.ebuild b/sys-libs/libselinux/libselinux-1.4.ebuild
index f29f5fd5113a..3ac258aeeb8d 100644
--- a/sys-libs/libselinux/libselinux-1.4.ebuild
+++ b/sys-libs/libselinux/libselinux-1.4.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.4.ebuild,v 1.1 2003/12/06 20:13:37 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.4.ebuild,v 1.2 2003/12/16 20:42:08 pebenito Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
 
 DEPEND="sys-libs/glibc"