[libsepol] Additional fix for default transitioning labeling for semodule

[Daniel J Walsh]

commit f39b887832d291312afbefed556e420f2cc9b6bd
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Thu Dec 15 17:06:11 2011 -0500

    Additional fix for default transitioning labeling for semodule

 libsepol-rhat.patch |   22 ++++++++++++++++++----
 libsepol.spec       |    5 ++++-
 2 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/libsepol-rhat.patch b/libsepol-rhat.patch
index fc8ab46..cd9831e 100644
--- a/libsepol-rhat.patch
+++ b/libsepol-rhat.patch
@@ -152,10 +152,24 @@ index ee9675b..01d3231 100644
  	    hashtab_map(cladatum->permissions.table, permission_copy_callback,
  			state);
 diff --git a/libsepol/src/policydb.c b/libsepol/src/policydb.c
-index 136b450..3f0008b 100644
+index 136b450..a84de2f 100644
 --- a/libsepol/src/policydb.c
 +++ b/libsepol/src/policydb.c
-@@ -228,6 +228,13 @@ static struct policydb_compat_info policydb_compat[] = {
+@@ -151,6 +151,13 @@ static struct policydb_compat_info policydb_compat[] = {
+ 	 .target_platform = SEPOL_TARGET_SELINUX,
+ 	},
+ 	{
++	 .type = POLICY_KERN,
++	 .version = POLICYDB_VERSION_NEW_OBJECT_DEFAULTS,
++	 .sym_num = SYM_NUM,
++	 .ocon_num = OCON_NODE6 + 1,
++	 .target_platform = SEPOL_TARGET_SELINUX,
++	},
++	{
+ 	 .type = POLICY_BASE,
+ 	 .version = MOD_POLICYDB_VERSION_BASE,
+ 	 .sym_num = SYM_NUM,
+@@ -228,6 +235,13 @@ static struct policydb_compat_info policydb_compat[] = {
  	 .target_platform = SEPOL_TARGET_SELINUX,
  	},
  	{
@@ -169,7 +183,7 @@ index 136b450..3f0008b 100644
  	 .type = POLICY_MOD,
  	 .version = MOD_POLICYDB_VERSION_BASE,
  	 .sym_num = SYM_NUM,
-@@ -304,6 +311,13 @@ static struct policydb_compat_info policydb_compat[] = {
+@@ -304,6 +318,13 @@ static struct policydb_compat_info policydb_compat[] = {
  	 .ocon_num = 0,
  	 .target_platform = SEPOL_TARGET_SELINUX,
  	},
@@ -183,7 +197,7 @@ index 136b450..3f0008b 100644
  };
  
  #if 0
-@@ -2064,6 +2078,18 @@ static int class_read(policydb_t * p, hashtab_t h, struct policy_file *fp)
+@@ -2064,6 +2085,18 @@ static int class_read(policydb_t * p, hashtab_t h, struct policy_file *fp)
  			goto bad;
  	}
  
diff --git a/libsepol.spec b/libsepol.spec
index 693fb33..d15499d 100644
--- a/libsepol.spec
+++ b/libsepol.spec
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
 Version: 2.1.4
-Release: 3%{?dist}
+Release: 4%{?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
+* Thu Dec 15 2011 Dan Walsh <dwalsh at redhat.com> - 2.1.4-4
+- Additional fix for default transitioning labeling for semodule
+
 * Thu Dec 15 2011 Dan Walsh <dwalsh at redhat.com> - 2.1.4-3
 - Add Eparis patch for handling of default transition labeling