diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch index 3143eee..a26233f 100644 --- a/libsemanage-rhat.patch +++ b/libsemanage-rhat.patch @@ -1,35 +1,13 @@ -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.6.13/src/semanage_store.c ---- nsalibsemanage/src/semanage_store.c 2006-08-03 11:22:25.000000000 -0400 -+++ libsemanage-1.6.13/src/semanage_store.c 2006-08-10 14:30:56.000000000 -0400 -@@ -1052,14 +1052,16 @@ - - snprintf(store_hd, PATH_MAX, "%s%s", storepath, running_hd); - if (semanage_copy_file(active_hd, store_hd, sh->conf->file_mode) == -1) { -- ERR(sh, "Could not copy %s to %s.", active_hd, store_hd); -- goto cleanup; -+ INFO(sh, "Non-fatal error: Could not copy %s to %s.", -+ active_hd, store_hd); -+ /* Non-fatal; fall through */ +--- libsemanage-1.6.16/src/semanage_store.c~ 2006-08-23 13:57:48.000000000 -0400 ++++ libsemanage-1.6.16/src/semanage_store.c 2006-09-29 10:41:08.000000000 -0400 +@@ -1106,6 +1106,10 @@ + goto skip_reload; + } } ++ else ++ if (errno == ENOENT && ++ strcmp(really_active_store, storepath) != 0) ++ goto skip_reload; - snprintf(store_fc, PATH_MAX, "%s%s", storepath, running_fc); - if (semanage_copy_file(active_fc, store_fc, sh->conf->file_mode) == -1) { -- ERR(sh, "Could not copy %s to %s.", active_fc, store_fc); -- goto cleanup; -+ INFO(sh, "Non-fatal error: Could not copy %s to %s.", -+ active_fc, store_fc); -+ /* Non-fatal; fall through */ - } - - snprintf(store_seusers, PATH_MAX, "%s%s", storepath, running_seusers); -@@ -1072,8 +1074,8 @@ - - snprintf(store_nc, PATH_MAX, "%s%s", storepath, running_nc); - if (semanage_copy_file(active_nc, store_nc, sh->conf->file_mode) == -1) { -- ERR(sh, "Could not copy %s to %s.", active_nc, store_nc); -- goto cleanup; -+ INFO(sh, "Could not copy %s to %s.", active_nc, store_nc); -+ /* Non-fatal; fall through */ - } - - if (!sh->do_reload) + if (semanage_reload_policy(sh)) { + goto cleanup; diff --git a/libsemanage.spec b/libsemanage.spec index 79ed9f6..b01e96a 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -3,7 +3,7 @@ Summary: SELinux binary policy manipulation library Name: libsemanage Version: 1.6.16 -Release: 2 +Release: 3 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz