commit: eed549ec62dcbf9a5b22003df16c8d5a10551815 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> AuthorDate: Tue Oct 4 04:53:11 2016 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Tue Oct 4 05:05:54 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed549ec
sys-libs/libsemanage: Add patch to fix loading base module Package-Manager: portage-2.3.0 ...-Fixes-bug-preventing-the-installation-of.patch | 98 ++++++++++++++++++++++ ....6_rc1.ebuild => libsemanage-2.6_rc1-r1.ebuild} | 1 + 2 files changed, 99 insertions(+) diff --git a/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch b/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch new file mode 100644 index 00000000..8f99b76 --- /dev/null +++ b/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch @@ -0,0 +1,98 @@ +From 9d25ca61603a2eed08d1b58b25c81f878c729474 Mon Sep 17 00:00:00 2001 +From: James Carter <[email protected]> +Date: Mon, 3 Oct 2016 14:15:40 -0400 +Subject: [PATCH] libsemanage: Fixes bug preventing the installation of base + modules + +Commit 7a728e46 changed module installation so that a module pp would +be installed using its module name instead of its filename and a warning +would be printed if they were different. With this change, base modules +could no longer be installed because of the way error handling was done. + +This change fixes the error handling, so that when a base module is +installed it will be installed using its filename (since it does not +have a module name). + +Based on bug report by Jason Zaman + +Signed-off-by: James Carter <[email protected]> +--- + libsemanage/src/direct_api.c | 39 ++++++++++++++------------------------- + 1 file changed, 14 insertions(+), 25 deletions(-) + +diff --git a/libsemanage/src/direct_api.c b/libsemanage/src/direct_api.c +index 3719cb1..e5c72cd 100644 +--- libsemanage/src/direct_api.c ++++ libsemanage/src/direct_api.c +@@ -368,7 +368,7 @@ static int semanage_direct_begintrans(semanage_handle_t * sh) + * 'version' to module's version. The caller is responsible for + * free()ing 'module_name', and 'version'; they will be + * set to NULL upon entering this function. Returns 0 on success, -1 +- * if out of memory, or -2 if data did not represent a module. ++ * if out of memory. + */ + static int parse_module_headers(semanage_handle_t * sh, char *module_data, + size_t data_len, char **module_name, +@@ -384,23 +384,10 @@ static int parse_module_headers(semanage_handle_t * sh, char *module_data, + } + sepol_policy_file_set_mem(pf, module_data, data_len); + sepol_policy_file_set_handle(pf, sh->sepolh); +- if (module_data == NULL || +- data_len == 0 || ++ if (module_data != NULL && data_len > 0) + sepol_module_package_info(pf, &file_type, module_name, +- version) == -1) { +- sepol_policy_file_free(pf); +- ERR(sh, "Could not parse module data."); +- return -2; +- } ++ version); + sepol_policy_file_free(pf); +- if (file_type != SEPOL_POLICY_MOD) { +- if (file_type == SEPOL_POLICY_BASE) +- ERR(sh, +- "Received a base module, expected a non-base module."); +- else +- ERR(sh, "Data did not represent a module."); +- return -2; +- } + + return 0; + } +@@ -1608,22 +1595,24 @@ static int semanage_direct_install_file(semanage_handle_t * sh, + lang_ext = separator + 1; + } + +- if (strcmp(lang_ext, "pp") != 0) { ++ if (strcmp(lang_ext, "pp") == 0) { ++ retval = parse_module_headers(sh, data, data_len, &module_name, &version); ++ free(version); ++ if (retval != 0) ++ goto cleanup; ++ } ++ ++ if (module_name == NULL) { + module_name = strdup(filename); + if (module_name == NULL) { + ERR(sh, "No memory available for module_name.\n"); + retval = -1; + goto cleanup; + } +- } else { +- if ((retval = parse_module_headers(sh, data, data_len, &module_name, &version)) != 0) +- goto cleanup; +- +- if (strcmp(module_name, filename) != 0) +- fprintf(stderr, "Warning: SELinux userspace will refer to the module from %s as %s rather than %s\n", install_filename, module_name, filename); +- +- free(version); ++ } else if (strcmp(module_name, filename) != 0) { ++ fprintf(stderr, "Warning: SELinux userspace will refer to the module from %s as %s rather than %s\n", install_filename, module_name, filename); + } ++ + retval = semanage_direct_install(sh, data, data_len, module_name, lang_ext); + + cleanup: +-- +2.7.3 + diff --git a/sys-libs/libsemanage/libsemanage-2.6_rc1.ebuild b/sys-libs/libsemanage/libsemanage-2.6_rc1-r1.ebuild similarity index 98% rename from sys-libs/libsemanage/libsemanage-2.6_rc1.ebuild rename to sys-libs/libsemanage/libsemanage-2.6_rc1-r1.ebuild index 76b2430..daaa79f 100644 --- a/sys-libs/libsemanage/libsemanage-2.6_rc1.ebuild +++ b/sys-libs/libsemanage/libsemanage-2.6_rc1-r1.ebuild @@ -72,6 +72,7 @@ src_prepare() { echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf" echo "bzip-small=true" >> "${S}/src/semanage.conf" + eapply "${FILESDIR}/${PN}-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch" eapply "${FILESDIR}"/${PN}-2.6-build-paths.patch eapply_user
