From 1a48e42dcf4cf8ec8d2848b3518490e1c0154482 Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@redhat.com>
Date: Jan 28 2013 00:55:20 +0000
Subject: Update to latest patches from eparis/Upstream


---

diff --git a/libsepol-rhat.patch b/libsepol-rhat.patch
index 8fae03e..efe98bf 100644
--- a/libsepol-rhat.patch
+++ b/libsepol-rhat.patch
@@ -93,7 +93,7 @@ index 16c89f3..84cfaf8 100644
  		}
  	}
 diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c
-index 2003eb6..0ca8448 100644
+index 2003eb6..81dcbba 100644
 --- a/libsepol/src/expand.c
 +++ b/libsepol/src/expand.c
 @@ -49,6 +49,82 @@ typedef struct expand_state {
@@ -345,69 +345,7 @@ index 2003eb6..0ca8448 100644
  		ERR(state->handle, "Error mapping booleans");
  		return -1;
  	}
-@@ -2037,14 +2160,13 @@ static int ocontext_copy_xen(expand_state_t *state)
- 			else
- 				state->out->ocontexts[i] = n;
- 			l = n;
-+			if (context_copy(&n->context[0], &c->context[0],
-+				state)) {
-+				ERR(state->handle, "Out of memory!");
-+				return -1;
-+			}
- 			switch (i) {
- 			case OCON_XEN_ISID:
--				if (c->context[0].user == 0) {
--					ERR(state->handle,
--					    "Missing context for %s initial sid",
--					    c->u.name);
--					return -1;
--				}
- 				n->sid[0] = c->sid[0];
- 				break;
- 			case OCON_XEN_PIRQ:
-@@ -2067,11 +2189,6 @@ static int ocontext_copy_xen(expand_state_t *state)
- 				ERR(state->handle, "Unknown ocontext");
- 				return -1;
- 			}
--			if (context_copy(&n->context[0], &c->context[0],
--				state)) {
--				ERR(state->handle, "Out of memory!");
--				return -1;
--			}
- 		}
- 	}
- 	return 0;
-@@ -2096,14 +2213,12 @@ static int ocontext_copy_selinux(expand_state_t *state)
- 			else
- 				state->out->ocontexts[i] = n;
- 			l = n;
-+			if (context_copy(&n->context[0], &c->context[0], state)) {
-+				ERR(state->handle, "Out of memory!");
-+				return -1;
-+			}
- 			switch (i) {
- 			case OCON_ISID:
--				if (c->context[0].user == 0) {
--					ERR(state->handle,
--					    "Missing context for %s initial sid",
--					    c->u.name);
--					return -1;
--				}
- 				n->sid[0] = c->sid[0];
- 				break;
- 			case OCON_FS:	/* FALLTHROUGH */
-@@ -2147,10 +2262,6 @@ static int ocontext_copy_selinux(expand_state_t *state)
- 				ERR(state->handle, "Unknown ocontext");
- 				return -1;
- 			}
--			if (context_copy(&n->context[0], &c->context[0], state)) {
--				ERR(state->handle, "Out of memory!");
--				return -1;
--			}
- 		}
- 	}
- 	return 0;
-@@ -2188,9 +2299,15 @@ static int genfs_copy(expand_state_t * state)
+@@ -2188,9 +2311,15 @@ static int genfs_copy(expand_state_t * state)
  		memset(newgenfs, 0, sizeof(genfs_t));
  		newgenfs->fstype = strdup(genfs->fstype);
  		if (!newgenfs->fstype) {
@@ -423,7 +361,7 @@ index 2003eb6..0ca8448 100644
  
  		l = NULL;
  		for (c = genfs->head; c; c = c->next) {
-@@ -2203,6 +2320,7 @@ static int genfs_copy(expand_state_t * state)
+@@ -2203,6 +2332,7 @@ static int genfs_copy(expand_state_t * state)
  			newc->u.name = strdup(c->u.name);
  			if (!newc->u.name) {
  				ERR(state->handle, "Out of memory!");
@@ -431,7 +369,7 @@ index 2003eb6..0ca8448 100644
  				return -1;
  			}
  			newc->v.sclass = c->v.sclass;
-@@ -2213,12 +2331,6 @@ static int genfs_copy(expand_state_t * state)
+@@ -2213,12 +2343,6 @@ static int genfs_copy(expand_state_t * state)
  				newgenfs->head = newc;
  			l = newc;
  		}
@@ -444,7 +382,7 @@ index 2003eb6..0ca8448 100644
  	}
  	return 0;
  }
-@@ -3009,7 +3121,8 @@ int expand_module(sepol_handle_t * handle,
+@@ -3009,7 +3133,8 @@ int expand_module(sepol_handle_t * handle,
  	}
  
  	cond_optimize_lists(state.out->cond_list);
diff --git a/libsepol.spec b/libsepol.spec
index 4c17ff0..b48296f 100644
--- a/libsepol.spec
+++ b/libsepol.spec
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
 Version: 2.1.8
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -99,6 +99,9 @@ exit 0
 /%{_lib}/libsepol.so.1
 
 %changelog
+* Sun Jan 27 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.8-8
+- Update to latest patches from eparis/Upstream
+
 * Fri Jan 25 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.8-7
 - Update to latest patches from eparis/Upstream