diff --git a/.cvsignore b/.cvsignore index 692ecda..21c57a4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -112,3 +112,7 @@ libsemanage-2.0.36.tgz libsemanage-2.0.37.tgz libsemanage-2.0.38.tgz libsemanage-2.0.39.tgz +libsemanage-2.0.40.tgz +libsemanage-2.0.41.tgz +libsemanage-2.0.42.tgz +libsemanage-2.0.43.tgz diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch index d13023e..c1e58fb 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.38/include/semanage/modules.h +diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.43/include/semanage/modules.h --- nsalibsemanage/include/semanage/modules.h 2009-01-13 08:45:35.000000000 -0500 -+++ libsemanage-2.0.38/include/semanage/modules.h 2009-09-20 07:35:51.000000000 -0400 ++++ libsemanage-2.0.43/include/semanage/modules.h 2009-12-16 16:07:43.000000000 -0500 @@ -40,10 +40,12 @@ char *module_data, size_t data_len); int semanage_module_install_base_file(semanage_handle_t *, @@ -22,21 +22,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h l +int semanage_module_get_enabled(semanage_module_info_t *); #endif -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/conf-parse.y libsemanage-2.0.38/src/conf-parse.y ---- nsalibsemanage/src/conf-parse.y 2009-08-05 15:10:56.000000000 -0400 -+++ libsemanage-2.0.38/src/conf-parse.y 2009-09-20 07:35:51.000000000 -0400 -@@ -263,7 +263,7 @@ - calloc(1, sizeof(*(current_conf->load_policy)))) == NULL) { - return -1; - } -- if ((conf->load_policy->path = strdup("/usr/sbin/load_policy")) == NULL) { -+ if ((conf->load_policy->path = strdup("/sbin/load_policy")) == NULL) { - return -1; - } - conf->load_policy->args = NULL; -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.38/src/direct_api.c +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.43/src/direct_api.c --- nsalibsemanage/src/direct_api.c 2009-09-17 08:59:43.000000000 -0400 -+++ libsemanage-2.0.38/src/direct_api.c 2009-09-20 07:35:51.000000000 -0400 ++++ libsemanage-2.0.43/src/direct_api.c 2009-12-16 16:07:43.000000000 -0500 @@ -66,6 +66,8 @@ static int semanage_direct_install_base(semanage_handle_t * sh, char *base_data, size_t data_len); @@ -208,9 +196,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage (*num_modules)++; } else { /* file was not a module, so don't report it */ -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.38/src/genhomedircon.c +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.43/src/genhomedircon.c --- nsalibsemanage/src/genhomedircon.c 2009-09-17 08:59:43.000000000 -0400 -+++ libsemanage-2.0.38/src/genhomedircon.c 2009-09-20 07:41:58.000000000 -0400 ++++ libsemanage-2.0.43/src/genhomedircon.c 2009-12-16 16:07:43.000000000 -0500 @@ -310,6 +310,10 @@ } if (strcmp(pwbuf->pw_dir, "/") == 0) @@ -232,9 +220,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libseman 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.38/src/libsemanage.map ---- nsalibsemanage/src/libsemanage.map 2009-07-07 15:32:32.000000000 -0400 -+++ libsemanage-2.0.38/src/libsemanage.map 2009-09-20 07:35:51.000000000 -0400 +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.43/src/libsemanage.map +--- nsalibsemanage/src/libsemanage.map 2009-10-29 15:21:39.000000000 -0400 ++++ libsemanage-2.0.43/src/libsemanage.map 2009-12-16 16:07:43.000000000 -0500 @@ -6,10 +6,13 @@ semanage_module_install; semanage_module_install_file; semanage_module_upgrade; semanage_module_upgrade_file; @@ -249,9 +237,21 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libseman semanage_reload_policy; semanage_set_reload; semanage_set_rebuild; semanage_user_*; semanage_bool_*; semanage_seuser_*; semanage_iface_*; semanage_port_*; semanage_context_*; -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/module_internal.h libsemanage-2.0.38/src/module_internal.h +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-2.0.43/src/Makefile +--- nsalibsemanage/src/Makefile 2009-12-01 15:46:50.000000000 -0500 ++++ libsemanage-2.0.43/src/Makefile 2009-12-16 16:07:47.000000000 -0500 +@@ -47,7 +47,7 @@ + LOBJS= $(patsubst %.c,%.lo,$(SRCS)) conf-scan.lo conf-parse.lo + CFLAGS ?= -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wno-unused-parameter + +-override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE ++override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -fPIC + + SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ + +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/module_internal.h libsemanage-2.0.43/src/module_internal.h --- nsalibsemanage/src/module_internal.h 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.38/src/module_internal.h 2009-09-20 07:35:51.000000000 -0400 ++++ libsemanage-2.0.43/src/module_internal.h 2009-12-16 16:07:43.000000000 -0500 @@ -6,6 +6,7 @@ hidden_proto(semanage_module_get_name) @@ -260,9 +260,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/module_internal.h libsem hidden_proto(semanage_module_info_datum_destroy) hidden_proto(semanage_module_list_nth) #endif -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.38/src/modules.c +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.43/src/modules.c --- nsalibsemanage/src/modules.c 2009-09-17 08:59:43.000000000 -0400 -+++ libsemanage-2.0.38/src/modules.c 2009-09-20 07:35:51.000000000 -0400 ++++ libsemanage-2.0.43/src/modules.c 2009-12-16 16:07:43.000000000 -0500 @@ -154,6 +154,40 @@ return sh->funcs->install_base_file(sh, module_name); } @@ -318,9 +318,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2. const char *semanage_module_get_version(semanage_module_info_t * modinfo) { return modinfo->version; -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.h libsemanage-2.0.38/src/modules.h +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.h libsemanage-2.0.43/src/modules.h --- nsalibsemanage/src/modules.h 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.38/src/modules.h 2009-09-20 07:35:51.000000000 -0400 ++++ libsemanage-2.0.43/src/modules.h 2009-12-16 16:07:43.000000000 -0500 @@ -26,6 +26,7 @@ struct semanage_module_info { char *name; /* Key */ @@ -329,9 +329,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.h libsemanage-2. }; #endif -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.38/src/policy.h +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.43/src/policy.h --- nsalibsemanage/src/policy.h 2009-01-13 08:45:35.000000000 -0500 -+++ libsemanage-2.0.38/src/policy.h 2009-09-20 07:35:51.000000000 -0400 ++++ libsemanage-2.0.43/src/policy.h 2009-12-16 16:07:43.000000000 -0500 @@ -58,6 +58,12 @@ /* Upgrade a policy module */ int (*upgrade_file) (struct semanage_handle *, const char *); @@ -345,18 +345,18 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0 /* Remove a policy module */ int (*remove) (struct semanage_handle *, char *); -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.38/src/semanage.conf +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.43/src/semanage.conf --- nsalibsemanage/src/semanage.conf 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.38/src/semanage.conf 2009-09-20 07:35:51.000000000 -0400 ++++ libsemanage-2.0.43/src/semanage.conf 2009-12-16 16:07:43.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.38/src/semanage_store.c ---- nsalibsemanage/src/semanage_store.c 2009-08-05 15:10:56.000000000 -0400 -+++ libsemanage-2.0.38/src/semanage_store.c 2009-09-20 07:35:51.000000000 -0400 +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.43/src/semanage_store.c +--- nsalibsemanage/src/semanage_store.c 2009-10-29 15:21:39.000000000 -0400 ++++ libsemanage-2.0.43/src/semanage_store.c 2009-12-16 16:07:43.000000000 -0500 @@ -57,6 +57,8 @@ #include "debug.h" @@ -459,9 +459,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsema -1 || semanage_load_module(sh, base_filename, base) == -1) { goto cleanup; } -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.38/src/semanage_store.h +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.43/src/semanage_store.h --- nsalibsemanage/src/semanage_store.h 2009-07-07 15:32:32.000000000 -0400 -+++ libsemanage-2.0.38/src/semanage_store.h 2009-09-20 07:35:51.000000000 -0400 ++++ libsemanage-2.0.43/src/semanage_store.h 2009-12-16 16:07:43.000000000 -0500 @@ -128,4 +128,6 @@ size_t buf_len, char **sorted_buf, size_t * sorted_buf_len); diff --git a/libsemanage.spec b/libsemanage.spec index 00758c5..09e4105 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -3,7 +3,7 @@ Summary: SELinux binary policy manipulation library Name: libsemanage Version: 2.0.43 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz diff --git a/sources b/sources index 8a5ee9a..e38a8f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -706e61f0081bb8522589481db873b0d1 libsemanage-2.0.39.tgz +fb11e8dfb69cefbd014419804df82294 libsemanage-2.0.43.tgz