From 554824b9dade25d2b6e20996ae580823c8aeae21 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Tue, 12 Apr 2011 13:11:15 -0400 Subject: [PATCH] Latest patches --- libsepol-rhat.patch | 23 +++++++---------------- libsepol.spec | 4 ++-- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/libsepol-rhat.patch b/libsepol-rhat.patch index 99ac273..90aabfe 100644 --- a/libsepol-rhat.patch +++ b/libsepol-rhat.patch @@ -1,5 +1,5 @@ diff --git a/libsepol/include/sepol/policydb/policydb.h b/libsepol/include/sepol/policydb/policydb.h -index 94b8609..7b23a16 100644 +index 94b8609..eebf1a9 100644 --- a/libsepol/include/sepol/policydb/policydb.h +++ b/libsepol/include/sepol/policydb/policydb.h @@ -136,6 +136,16 @@ typedef struct role_allow { @@ -64,31 +64,22 @@ index 94b8609..7b23a16 100644 extern void role_datum_init(role_datum_t * x); extern void role_datum_destroy(role_datum_t * x); -@@ -633,10 +660,11 @@ extern int policydb_set_target_platform(policydb_t *p, int platform); +@@ -632,6 +659,7 @@ extern int policydb_set_target_platform(policydb_t *p, int platform); + #define POLICYDB_VERSION_POLCAP 22 #define POLICYDB_VERSION_PERMISSIVE 23 #define POLICYDB_VERSION_BOUNDARY 24 ++#define POLICYDB_VERSION_FILENAME_TRANS 25 #define POLICYDB_VERSION_ROLETRANS 26 -+#define POLICYDB_VERSION_FILENAME_TRANS 27 /* Range of policy versions we understand*/ - #define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE --#define POLICYDB_VERSION_MAX POLICYDB_VERSION_ROLETRANS -+#define POLICYDB_VERSION_MAX POLICYDB_VERSION_FILENAME_TRANS - - /* Module versions and specific changes*/ - #define MOD_POLICYDB_VERSION_BASE 4 -@@ -649,9 +677,10 @@ extern int policydb_set_target_platform(policydb_t *p, int platform); +@@ -648,6 +676,7 @@ extern int policydb_set_target_platform(policydb_t *p, int platform); + #define MOD_POLICYDB_VERSION_PERMISSIVE 8 #define MOD_POLICYDB_VERSION_BOUNDARY 9 #define MOD_POLICYDB_VERSION_BOUNDARY_ALIAS 10 ++#define MOD_POLICYDB_VERSION_FILENAME_TRANS 11 #define MOD_POLICYDB_VERSION_ROLETRANS 12 -+#define MOD_POLICYDB_VERSION_FILENAME_TRANS 13 #define MOD_POLICYDB_VERSION_MIN MOD_POLICYDB_VERSION_BASE --#define MOD_POLICYDB_VERSION_MAX MOD_POLICYDB_VERSION_ROLETRANS -+#define MOD_POLICYDB_VERSION_MAX MOD_POLICYDB_VERSION_FILENAME_TRANS - - #define POLICYDB_CONFIG_MLS 1 - diff --git a/libsepol/src/avrule_block.c b/libsepol/src/avrule_block.c index 8d1f8f6..16c89f3 100644 --- a/libsepol/src/avrule_block.c diff --git a/libsepol.spec b/libsepol.spec index 1ff2d76..0188541 100644 --- a/libsepol.spec +++ b/libsepol.spec @@ -1,7 +1,7 @@ Summary: SELinux binary policy manipulation library Name: libsepol Version: 2.0.43 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz @@ -99,7 +99,7 @@ exit 0 /%{_lib}/libsepol.so.1 %changelog -* Tue Apr 29 2011 Dan Walsh 2.0.43-2 +* Tue Apr 29 2011 Dan Walsh 2.0.43-3 - re-add Erics patch for filename transitions * Tue Apr 29 2011 Dan Walsh 2.0.43-1