From 3ce9ebf4a9c82da94ac65ba2d66eb6c66be66327 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Dec 04 2008 20:19:01 +0000 Subject: Add semanage_mls_enabled() interface from Stephen Smalley. --- diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch index dc302b3..0f72991 100644 --- a/libsemanage-rhat.patch +++ b/libsemanage-rhat.patch @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.28/include/semanage/modules.h +diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.30/include/semanage/modules.h --- nsalibsemanage/include/semanage/modules.h 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.28/include/semanage/modules.h 2008-10-13 12:35:22.000000000 -0400 ++++ libsemanage-2.0.30/include/semanage/modules.h 2008-12-04 15:15:23.000000000 -0500 @@ -30,10 +30,16 @@ int semanage_module_install(semanage_handle_t *, @@ -18,9 +18,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h l int semanage_module_remove(semanage_handle_t *, char *module_name); /* semanage_module_info is for getting information on installed -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-2.0.28/src/Makefile +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-2.0.30/src/Makefile --- nsalibsemanage/src/Makefile 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.28/src/Makefile 2008-10-13 12:35:22.000000000 -0400 ++++ libsemanage-2.0.30/src/Makefile 2008-12-04 15:15:23.000000000 -0500 @@ -54,7 +54,7 @@ ranlib $@ @@ -30,9 +30,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-2.0 ln -sf $@ $(TARGET) conf-scan.c: conf-scan.l conf-parse.h -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.28/src/direct_api.c ---- nsalibsemanage/src/direct_api.c 2008-09-15 12:20:44.000000000 -0400 -+++ libsemanage-2.0.28/src/direct_api.c 2008-10-13 16:36:51.000000000 -0400 +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.30/src/direct_api.c +--- nsalibsemanage/src/direct_api.c 2008-11-14 17:10:15.000000000 -0500 ++++ libsemanage-2.0.30/src/direct_api.c 2008-12-04 15:15:23.000000000 -0500 @@ -50,6 +50,7 @@ #include "semanage_store.h" #include "database_policydb.h" @@ -501,20 +501,21 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage if (type == SEPOL_POLICY_MOD) { (*modinfo)[*num_modules].name = name; (*modinfo)[*num_modules].version = version; -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.h libsemanage-2.0.28/src/direct_api.h ---- nsalibsemanage/src/direct_api.h 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.28/src/direct_api.h 2008-10-13 12:35:22.000000000 -0400 -@@ -37,4 +37,7 @@ +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.h libsemanage-2.0.30/src/direct_api.h +--- nsalibsemanage/src/direct_api.h 2008-11-14 17:10:15.000000000 -0500 ++++ libsemanage-2.0.30/src/direct_api.h 2008-12-04 15:15:23.000000000 -0500 +@@ -37,6 +37,7 @@ int semanage_direct_access_check(struct semanage_handle *sh); +-int semanage_direct_mls_enabled(struct semanage_handle *sh); +#include +size_t bunzip(FILE *f, char **data); -+ + #endif -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.28/src/genhomedircon.c +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.30/src/genhomedircon.c --- nsalibsemanage/src/genhomedircon.c 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.28/src/genhomedircon.c 2008-10-13 12:35:22.000000000 -0400 ++++ libsemanage-2.0.30/src/genhomedircon.c 2008-12-04 15:16:11.000000000 -0500 @@ -487,7 +487,6 @@ const char *role_prefix) { @@ -531,9 +532,22 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libseman {NULL, NULL} }; Ustr *line = USTR_NULL; -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.28/src/libsemanage.map ---- nsalibsemanage/src/libsemanage.map 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.28/src/libsemanage.map 2008-10-13 12:35:22.000000000 -0400 +@@ -794,6 +792,12 @@ + * /root */ + continue; + } ++ if (strcmp(pwent->pw_dir, "/root") == 0) { ++ /* don't relabel / genhomdircon checked to see if root ++ * was the user and if so, set his home directory to ++ * /root */ ++ continue; ++ } + if (push_user_entry(&head, name, seuname, + prefix, pwent->pw_dir) != STATUS_SUCCESS) { + *errors = STATUS_ERR; +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.30/src/libsemanage.map +--- nsalibsemanage/src/libsemanage.map 2008-11-14 17:10:15.000000000 -0500 ++++ libsemanage-2.0.30/src/libsemanage.map 2008-12-04 15:15:23.000000000 -0500 @@ -3,8 +3,10 @@ semanage_is_managed; semanage_connect; semanage_disconnect; semanage_msg_*; @@ -547,9 +561,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libseman semanage_module_list; semanage_module_info_datum_destroy; semanage_module_list_nth; semanage_module_get_name; semanage_module_get_version; semanage_select_store; -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.28/src/modules.c +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.30/src/modules.c --- nsalibsemanage/src/modules.c 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.28/src/modules.c 2008-10-13 12:35:22.000000000 -0400 ++++ libsemanage-2.0.30/src/modules.c 2008-12-04 15:15:23.000000000 -0500 @@ -52,6 +52,25 @@ return sh->funcs->install(sh, module_data, data_len); } @@ -628,9 +642,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2. int semanage_module_remove(semanage_handle_t * sh, char *module_name) { if (sh->funcs->remove == NULL) { -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.28/src/policy.h +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.30/src/policy.h --- nsalibsemanage/src/policy.h 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.28/src/policy.h 2008-10-13 12:35:22.000000000 -0400 ++++ libsemanage-2.0.30/src/policy.h 2008-12-04 15:15:23.000000000 -0500 @@ -49,8 +49,14 @@ /* Install a policy module */ int (*install) (struct semanage_handle *, char *, size_t); @@ -656,18 +670,18 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0 }; /* Should be backend independent */ -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.28/src/semanage.conf +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.30/src/semanage.conf --- nsalibsemanage/src/semanage.conf 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.28/src/semanage.conf 2008-10-13 12:35:22.000000000 -0400 ++++ libsemanage-2.0.30/src/semanage.conf 2008-12-04 15:15:23.000000000 -0500 @@ -35,4 +35,4 @@ # given in . Change this setting if a different # version is necessary. #policy-version = 19 - +expand-check=0 -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.28/src/semanage_store.c ---- nsalibsemanage/src/semanage_store.c 2008-09-15 12:20:44.000000000 -0400 -+++ libsemanage-2.0.28/src/semanage_store.c 2008-10-13 12:57:29.000000000 -0400 +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.30/src/semanage_store.c +--- nsalibsemanage/src/semanage_store.c 2008-11-11 16:13:18.000000000 -0500 ++++ libsemanage-2.0.30/src/semanage_store.c 2008-12-04 15:15:23.000000000 -0500 @@ -440,6 +440,8 @@ char tmp[PATH_MAX]; char buf[4192]; @@ -677,7 +691,7 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsema n = snprintf(tmp, PATH_MAX, "%s.tmp", dst); if (n < 0 || n >= PATH_MAX) return -1; -@@ -1522,16 +1524,26 @@ +@@ -1523,16 +1525,26 @@ ERR(sh, "Could not open module file %s for reading.", filename); goto cleanup; } diff --git a/libsemanage.spec b/libsemanage.spec index 89f6ab1..6de44a6 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -90,7 +90,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/python*/site-packages/* %changelog -* Fri Nov 14 2008 Dan Walsh - 2.0.30-1 +* Thu Dec 4 2008 Dan Walsh - 2.0.30-1 * Add semanage_mls_enabled() interface from Stephen Smalley. * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.0.29-2