From 05bd40847cd140fc208333835ace70db0fe5ca4b Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Thu, 11 Jan 2007 19:20:27 +0000
Subject: [PATCH] - Upstream wanted some minor changes, upgrading to keep api
 the same - Upgrade to upstream #200110

---
 .cvsignore            |  1 +
 libselinux-rhat.patch | 80 +++++++++++++++++++++++++++++++++++++++++++
 libselinux.spec       |  1 -
 sources               |  2 +-
 4 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ec2b407..4e0c6f9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -100,3 +100,4 @@ libselinux-1.32.tgz
 libselinux-1.33.1.tgz
 libselinux-1.33.2.tgz
 libselinux-1.33.3.tgz
+libselinux-1.33.4.tgz
diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index 7d50ad0..7b0cc71 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -1,3 +1,4 @@
+Binary files nsalibselinux/debugsources.list and libselinux-1.33.3/debugsources.list differ
 diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.33.3/include/selinux/selinux.h
 --- nsalibselinux/include/selinux/selinux.h	2006-11-16 17:15:18.000000000 -0500
 +++ libselinux-1.33.3/include/selinux/selinux.h	2007-01-09 09:49:51.000000000 -0500
@@ -184,6 +185,85 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libsel
      hidden_proto(matchpathcon_init_prefix)
      hidden_proto(selinux_users_path)
      hidden_proto(selinux_usersconf_path);
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libselinux-1.33.3/utils/getdefaultcon.c
+--- nsalibselinux/utils/getdefaultcon.c	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-1.33.3/utils/getdefaultcon.c	2007-01-09 14:55:19.000000000 -0500
+@@ -0,0 +1,75 @@
++#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;
++	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, &level)==0) {
++		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(usercon);
++
++	return 0;
++}
 diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-1.33.3/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2007-01-04 17:01:41.000000000 -0500
 +++ libselinux-1.33.3/utils/matchpathcon.c	2007-01-09 09:49:51.000000000 -0500
diff --git a/libselinux.spec b/libselinux.spec
index f9b55f1..46f2abd 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -99,7 +99,6 @@ exit 0
 %{_sbindir}/getenforce
 %{_sbindir}/getsebool
 %{_sbindir}/matchpathcon
-%{_sbindir}/getdefaultcon
 %{_sbindir}/selinuxenabled
 %{_sbindir}/setenforce
 %{_sbindir}/togglesebool
diff --git a/sources b/sources
index c1ccca1..4a15ace 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11ea5b86dcea249dfa5c48940c98b1b6  libselinux-1.33.3.tgz
+08762379de2242926854080dad649b67  libselinux-1.33.4.tgz