From 15aa870b5dd837a455d9c1ea73599b13c6ddbfe2 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Dec 07 2007 01:18:18 +0000
Subject: - Update to upstream

Fix genhomedircon handling of shells and missing user context template from
    Dan Walsh.
Copy the store path in semanage_select_store from Dan Walsh.

---

diff --git a/.cvsignore b/.cvsignore
index 25854e2..1f66837 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -90,3 +90,4 @@ libsemanage-2.0.10.tgz
 libsemanage-2.0.11.tgz
 libsemanage-2.0.12.tgz
 libsemanage-2.0.14.tgz
+libsemanage-2.0.15.tgz
diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch
index dbd1ad1..640c451 100644
--- a/libsemanage-rhat.patch
+++ b/libsemanage-rhat.patch
@@ -1,75 +1,9 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.14/src/genhomedircon.c
---- nsalibsemanage/src/genhomedircon.c	2007-10-05 13:09:53.000000000 -0400
-+++ libsemanage-2.0.14/src/genhomedircon.c	2007-12-03 15:47:19.000000000 -0500
-@@ -130,11 +130,13 @@
- 	char *temp = NULL;
- 	semanage_list_t *list = NULL;
- 	size_t buff_len = 0;
-+	int len;
- 
- 	shells = fopen(PATH_SHELLS_FILE, "r");
- 	if (!shells)
- 		return default_shell_list();
--	while (getline(&temp, &buff_len, shells) >= 0) {
-+	while ((len = getline(&temp, &buff_len, shells)) > 0) {
-+		if (temp[len-1] == '\n') temp[len-1] = 0;
- 		if (strcmp(temp, PATH_NOLOGIN_SHELL)) {
- 			if (semanage_list_push(&list, temp)) {
- 				free(temp);
-@@ -790,7 +792,7 @@
- 	homedir_context_tpl = make_template(s, &HOME_DIR_PRED);
- 	homeroot_context_tpl = make_template(s, &HOME_ROOT_PRED);
- 	user_context_tpl = make_template(s, &USER_CONTEXT_PRED);
--	if (!homedir_context_tpl || !homeroot_context_tpl || !user_context_tpl) {
-+	if (!homedir_context_tpl || !homeroot_context_tpl) {
- 		retval = STATUS_ERR;
- 		goto done;
- 	}
-@@ -828,16 +830,18 @@
- 
- 		ustr_sc_free(&temp);
- 	}
--	if (write_user_context(s, out, user_context_tpl,
--			       ".*", s->fallback_user,
--			       s->fallback_user_prefix) != STATUS_SUCCESS) {
--		retval = STATUS_ERR;
--		goto done;
--	}
-+	if (user_context_tpl) {
-+		if (write_user_context(s, out, user_context_tpl,
-+				       ".*", s->fallback_user,
-+				       s->fallback_user_prefix) != STATUS_SUCCESS) {
-+			retval = STATUS_ERR;
-+			goto done;
-+		}
- 
--	if (write_gen_home_dir_context(s, out, user_context_tpl,
--				       homedir_context_tpl) != STATUS_SUCCESS) {
--		retval = STATUS_ERR;
-+		if (write_gen_home_dir_context(s, out, user_context_tpl,
-+					       homedir_context_tpl) != STATUS_SUCCESS) {
-+			retval = STATUS_ERR;
-+		}
- 	}
- 
-       done:
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.14/src/handle.c
---- nsalibsemanage/src/handle.c	2007-08-20 19:15:37.000000000 -0400
-+++ libsemanage-2.0.14/src/handle.c	2007-11-10 06:21:33.000000000 -0500
-@@ -27,6 +27,7 @@
- #include <assert.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #include <sys/time.h>
- 
- #include "direct_api.h"
-@@ -131,7 +132,7 @@
- 
- 	/* This just sets the storename to what the user requests, no 
- 	   verification of existance will be done until connect */
--	sh->conf->store_path = storename;
-+	sh->conf->store_path = strdup(storename);
- 	sh->conf->store_type = storetype;
- 
- 	return;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.15/src/semanage.conf
+--- nsalibsemanage/src/semanage.conf	2007-07-16 14:20:38.000000000 -0400
++++ libsemanage-2.0.15/src/semanage.conf	2007-12-06 20:14:21.000000000 -0500
+@@ -35,4 +35,4 @@
+ # given in <sepol/policydb.h>.  Change this setting if a different
+ # version is necessary.
+ #policy-version = 19
+-
++expand-check=0
diff --git a/libsemanage.spec b/libsemanage.spec
index 011b6c0..b6b298d 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -2,8 +2,8 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.14
-Release: 5%{?dist}
+Version: 2.0.15
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -78,6 +78,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec 6 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.15-1
+- Update to upstream
+	* Fix genhomedircon handling of shells and missing user context template from Dan Walsh.
+	* Copy the store path in semanage_select_store from Dan Walsh.
+
+- Add expand-check=0 to semanage.conf
+
 * Mon Dec 3 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.14-5
 - Fix handling of /etc/shells so genhomedircon will work
 
diff --git a/sources b/sources
index 3dd5026..d87e583 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8ab010248ca7e297986e65a7d22fb79  libsemanage-2.0.14.tgz
+380bc815d15127e4c18eb0656aedd26c  libsemanage-2.0.15.tgz