- Upgrade to upstream

Merged getdefaultcon utility from Dan Walsh.

.cvsignore

@@ -101,3 +101,4 @@ libselinux-1.33.1.tgz
 libselinux-1.33.2.tgz
 libselinux-1.33.3.tgz
 libselinux-1.33.4.tgz
+libselinux-1.33.5.tgz

libselinux-rhat.patch

@@ -553,87 +553,3 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/togglesebool.8 libse
  .SH "SEE ALSO"
 -booleans(8), getsebool(8), setsebool(8)
 +selinux(8), booleans(8), getsebool(8), setsebool(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libselinux-1.33.4/utils/getdefaultcon.c
---- nsalibselinux/utils/getdefaultcon.c	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-1.33.4/utils/getdefaultcon.c	2007-01-15 16:21:55.000000000 -0500
-@@ -0,0 +1,80 @@
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <selinux/selinux.h>
-+#include <selinux/get_context_list.h>
-+
-+void usage(char *name, char *detail, int rc)
-+{
-+	fprintf(stderr, "usage:  %s [-l level] user fromcon\n", name);
-+	if (detail)
-+		fprintf(stderr, "%s:  %s\n", name, detail);
-+	exit(rc);
-+}
-+
-+int main(int argc, char **argv)
-+{
-+	security_context_t usercon = NULL, cur_context = NULL;
-+	char *user = NULL, *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL;
-+	int ret, opt;
-+
-+	while ((opt = getopt(argc, argv, "l:r:")) > 0) {
-+		switch (opt) {
-+		case 'l':
-+			level = strdup(optarg);
-+			break;
-+		case 'r':
-+			role = strdup(optarg);
-+			break;
-+		default:
-+			usage(argv[0], "invalid option", 1);
-+		}
-+	}
-+
-+	if (((argc - optind) < 1) || ((argc - optind) > 2))
-+		usage(argv[0], "invalid number of arguments", 2);
-+
-+	/* If selinux isn't available, bail out. */
-+	if (!is_selinux_enabled()) {
-+		fprintf(stderr,
-+			"%s may be used only on a SELinux kernel.\n", argv[0]);
-+		return 1;
-+	}
-+
-+	user = argv[optind];
-+
-+	/* If a context wasn't passed, use the current context. */
-+	if (((argc - optind) < 2)) {
-+		if (getcon(&cur_context) < 0) {
-+			fprintf(stderr, "Couldn't get current context.\n");
-+			return 2;
-+		}
-+	} else
-+		cur_context = argv[optind + 1];
-+
-+	if (getseuserbyname(user, &seuser, &dlevel)==0) {
-+		if (! level) level=dlevel;
-+		if (role != NULL && role[0]) 
-+			ret=get_default_context_with_rolelevel(seuser, role, level,cur_context,&usercon);
-+		else
-+			ret=get_default_context_with_level(seuser, level, cur_context,&usercon);
-+	}
-+	if (ret < 0)
-+		perror(argv[0]);
-+	else
-+		printf("%s: %s from %s %s %s %s -> %s\n", argv[0], user, cur_context, seuser, role, level, usercon);
-+
-+
-+	free(role);
-+	free(seuser);
-+	if (level != dlevel) free(level);
-+	free(dlevel);
-+	free(usercon);
-+
-+	return 0;
-+}

libselinux.spec

@@ -1,8 +1,8 @@
 %define libsepolver 1.15.2-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.33.4
-Release: 3%{?dist}
+Version: 1.33.5
+Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -121,6 +121,10 @@ exit 0
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Mon Jan 15 2007 Dan Walsh <dwalsh@redhat.com> - 1.33.5-1
+- Upgrade to upstream
+	* Merged getdefaultcon utility from Dan Walsh.
+
 * Mon Jan 15 2007 Dan Walsh <dwalsh@redhat.com> - 1.33.4-3
 - Add Ulrich NSCD__GETSERV and NSCD__SHMEMGRP for Uli
 

sources

@@ -1 +1 @@
-08762379de2242926854080dad649b67  libselinux-1.33.4.tgz
+f571eebdbef792b55cce6a7401d0a0c2  libselinux-1.33.5.tgz