libsemanage-2.8-8

- Always set errno to 0 before calling getpwent()
- Set selinux policy root around calls to selinux_boolean_sub

.gitignore

@@ -140,9 +140,3 @@ libsemanage-2.0.45.tgz
 /libsemanage-2.8-rc2.tar.gz
 /libsemanage-2.8-rc3.tar.gz
 /libsemanage-2.8.tar.gz
-/libsemanage-2.9-rc1.tar.gz
-/libsemanage-2.9-rc2.tar.gz
-/libsemanage-2.9.tar.gz
-/libsemanage-3.0-rc1.tar.gz
-/libsemanage-3.0.tar.gz
-/libsemanage-3.1.tar.gz

0001-libsemanage-Remove-legacy-and-duplicate-symbols.patch

@@ -1,233 +0,0 @@
-From b46406de8a93abe10e685c422597516517c0bff3 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Fri, 9 Oct 2020 15:00:50 +0200
-Subject: [PATCH] libsemanage: Remove legacy and duplicate symbols
-
-Versioned duplicate symbols cause problems for LTO. These symbols were
-introduced during the CIL integration several releases ago and were only
-consumed by other SELinux userspace components.
-
-Related: https://github.com/SELinuxProject/selinux/issues/245
-
-Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
----
- libsemanage/include/semanage/modules.h |   2 +-
- libsemanage/src/libsemanage.map        |   5 --
- libsemanage/src/modules.c              | 100 +------------------------
- libsemanage/src/modules.h              |   9 +--
- libsemanage/src/semanageswig_python.i  |   2 -
- 5 files changed, 4 insertions(+), 114 deletions(-)
-
-diff --git a/libsemanage/include/semanage/modules.h b/libsemanage/include/semanage/modules.h
-index ac4039314857..b51f61f033d5 100644
---- a/libsemanage/include/semanage/modules.h
-+++ b/libsemanage/include/semanage/modules.h
-@@ -33,7 +33,7 @@ typedef struct semanage_module_key semanage_module_key_t;
-  */
- 
- extern int semanage_module_install(semanage_handle_t *,
--				   char *module_data, size_t data_len, char *name, char *ext_lang);
-+				   char *module_data, size_t data_len, const char *name, const char *ext_lang);
- extern int semanage_module_install_file(semanage_handle_t *,
- 					const char *module_name);
- extern int semanage_module_remove(semanage_handle_t *, char *module_name);
-diff --git a/libsemanage/src/libsemanage.map b/libsemanage/src/libsemanage.map
-index 1375a8ca0ea7..4bec06aaae27 100644
---- a/libsemanage/src/libsemanage.map
-+++ b/libsemanage/src/libsemanage.map
-@@ -167,18 +167,13 @@ LIBSEMANAGE_1.0 {
-     semanage_mls_enabled;
-     semanage_module_disable;
-     semanage_module_enable;
--    semanage_module_get_enabled;
-     semanage_module_get_name;
-     semanage_module_get_version;
-     semanage_module_info_datum_destroy;
--    semanage_module_install;
--    semanage_module_install_base;
--    semanage_module_install_base_file;
-     semanage_module_install_file;
-     semanage_module_list;
-     semanage_module_list_nth;
-     semanage_module_remove;
--    semanage_module_upgrade;
-     semanage_module_upgrade_file;
-     semanage_msg_get_channel;
-     semanage_msg_get_fname;
-diff --git a/libsemanage/src/modules.c b/libsemanage/src/modules.c
-index 6d3eb60ae462..8b36801038df 100644
---- a/libsemanage/src/modules.c
-+++ b/libsemanage/src/modules.c
-@@ -42,70 +42,7 @@
- #include "modules.h"
- #include "debug.h"
- 
--asm(".symver semanage_module_get_enabled_1_1,semanage_module_get_enabled@@LIBSEMANAGE_1.1");
--asm(".symver semanage_module_get_enabled_1_0,semanage_module_get_enabled@LIBSEMANAGE_1.0");
--asm(".symver semanage_module_install_pp,semanage_module_install@LIBSEMANAGE_1.0");
--asm(".symver semanage_module_install_hll,semanage_module_install@@LIBSEMANAGE_1.1");
--
--/* Takes a module stored in 'module_data' and parses its headers.
-- * Sets reference variables 'module_name' to module's name and
-- * '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.
-- */
--static int parse_module_headers(semanage_handle_t * sh, char *module_data,
--				size_t data_len, char **module_name, char **version)
--{
--	struct sepol_policy_file *pf;
--	int file_type;
--	*version = NULL;
--
--	if (sepol_policy_file_create(&pf)) {
--		ERR(sh, "Out of memory!");
--		return -1;
--	}
--	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 ||
--	    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;
--	}
--	sepol_policy_file_free(pf);
--	if (file_type != SEPOL_POLICY_MOD) {
--		ERR(sh, "Data did not represent a pp module. Please upgrade to the latest version of libsemanage to support hll modules.");
--		return -2;
--	}
--
--	return 0;
--}
--
--/* This function is used to preserve ABI compatibility with
-- * versions of semodule using LIBSEMANAGE_1.0
-- */
--int semanage_module_install_pp(semanage_handle_t * sh,
--			    char *module_data, size_t data_len)
--{
--	char *name = NULL;
--	char *version = NULL;
--	int status;
--
--	if ((status = parse_module_headers(sh, module_data, data_len, &name, &version)) != 0) {
--		goto cleanup;
--	}
--
--	status = semanage_module_install_hll(sh, module_data, data_len, name, "pp");
--
--cleanup:
--	free(name);
--	free(version);
--	return status;
--}
--
--int semanage_module_install_hll(semanage_handle_t * sh,
-+int semanage_module_install(semanage_handle_t * sh,
- 			    char *module_data, size_t data_len, const char *name, const char *ext_lang)
- {
- 	if (sh->funcs->install == NULL) {
-@@ -160,16 +97,6 @@ int semanage_module_extract(semanage_handle_t * sh,
- 	return sh->funcs->extract(sh, modkey, extract_cil, mapped_data, data_len, modinfo);
- }
- 
--/* Legacy function that remains to preserve ABI
-- * compatibility. Please use semanage_module_install instead.
-- */
--int semanage_module_upgrade(semanage_handle_t * sh,
--			    char *module_data, size_t data_len)
--{
--	return semanage_module_install_pp(sh, module_data, data_len);
--	
--}
--
- /* Legacy function that remains to preserve ABI
-  * compatibility. Please use semanage_module_install_file instead.
-  */
-@@ -179,24 +106,6 @@ int semanage_module_upgrade_file(semanage_handle_t * sh,
- 	return semanage_module_install_file(sh, module_name);
- }
- 
--/* Legacy function that remains to preserve ABI
-- * compatibility. Please use semanage_module_install instead.
-- */
--int semanage_module_install_base(semanage_handle_t * sh,
--				 char *module_data, size_t data_len)
--{
--	return semanage_module_install_pp(sh, module_data, data_len);
--}
--
--/* Legacy function that remains to preserve ABI
-- * compatibility. Please use semanage_module_install_file instead.
-- */
--int semanage_module_install_base_file(semanage_handle_t * sh,
--				 const char *module_name)
--{
--	return semanage_module_install_file(sh, module_name);
--}
--
- int semanage_module_remove(semanage_handle_t * sh, char *module_name)
- {
- 	if (sh->funcs->remove == NULL) {
-@@ -780,7 +689,7 @@ int semanage_module_key_set_priority(semanage_handle_t *sh,
- }
- 
- 
--int semanage_module_get_enabled_1_1(semanage_handle_t *sh,
-+int semanage_module_get_enabled(semanage_handle_t *sh,
- 				const semanage_module_key_t *modkey,
- 				int *enabled)
- {
-@@ -800,11 +709,6 @@ int semanage_module_get_enabled_1_1(semanage_handle_t *sh,
- 	return sh->funcs->get_enabled(sh, modkey, enabled);
- }
- 
--int semanage_module_get_enabled_1_0(semanage_module_info_t *modinfo)
--{
--	return modinfo->enabled;
--}
--
- int semanage_module_set_enabled(semanage_handle_t *sh,
- 				const semanage_module_key_t *modkey,
- 				int enabled)
-diff --git a/libsemanage/src/modules.h b/libsemanage/src/modules.h
-index 2d3576fb15df..64d4a157f5ca 100644
---- a/libsemanage/src/modules.h
-+++ b/libsemanage/src/modules.h
-@@ -26,16 +26,9 @@
- 
- #include "semanage/modules.h"
- 
--int semanage_module_install_pp(semanage_handle_t * sh,
--			    char *module_data, size_t data_len);
--int semanage_module_install_hll(semanage_handle_t * sh,
--			    char *module_data, size_t data_len, const char *name, const char *ext_lang);
--int semanage_module_upgrade(semanage_handle_t * sh,
--			    char *module_data, size_t data_len);
-+
- int semanage_module_upgrade_file(semanage_handle_t * sh,
- 				 const char *module_name);
--int semanage_module_install_base(semanage_handle_t * sh,
--				 char *module_data, size_t data_len);
- int semanage_module_install_base_file(semanage_handle_t * sh,
- 				 const char *module_name);
- 
-diff --git a/libsemanage/src/semanageswig_python.i b/libsemanage/src/semanageswig_python.i
-index 8dd79fc24213..5f0113966962 100644
---- a/libsemanage/src/semanageswig_python.i
-+++ b/libsemanage/src/semanageswig_python.i
-@@ -30,8 +30,6 @@
- %}
- 
- %include "stdint.i"
--%ignore semanage_module_install_pp;
--%ignore semanage_module_install_hll;
- 
- %wrapper %{
- 
--- 
-2.29.0
-

0002-libsemanage-Drop-deprecated-functions.patch

@@ -1,100 +0,0 @@
-From c08b73d7183e2dbab0ba43c3df32f4214abbc9c6 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Fri, 9 Oct 2020 15:00:51 +0200
-Subject: [PATCH] libsemanage: Drop deprecated functions
-
-semanage_module_enable() and semanage_module_disable() were deprecated
-by commit 9fbc6d14418f ("libsemanage: add back original module
-enable/disable functions for ABI compatability") in 2014 in order to
-preserve ABI compatibility. As we the libsemanage ABI is changed by the
-previous commit, it makes sense to drop them completely.
-
-Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
----
- libsemanage/src/libsemanage.map |  2 --
- libsemanage/src/modules.c       | 56 ---------------------------------
- 2 files changed, 58 deletions(-)
-
-diff --git a/libsemanage/src/libsemanage.map b/libsemanage/src/libsemanage.map
-index 4bec06aaae27..3ea7b60f97bb 100644
---- a/libsemanage/src/libsemanage.map
-+++ b/libsemanage/src/libsemanage.map
-@@ -165,8 +165,6 @@ LIBSEMANAGE_1.0 {
-     semanage_is_connected;
-     semanage_is_managed;
-     semanage_mls_enabled;
--    semanage_module_disable;
--    semanage_module_enable;
-     semanage_module_get_name;
-     semanage_module_get_version;
-     semanage_module_info_datum_destroy;
-diff --git a/libsemanage/src/modules.c b/libsemanage/src/modules.c
-index 8b36801038df..b6dd456cac32 100644
---- a/libsemanage/src/modules.c
-+++ b/libsemanage/src/modules.c
-@@ -734,62 +734,6 @@ int semanage_module_set_enabled(semanage_handle_t *sh,
- }
- 
- 
--/* This function exists only for ABI compatibility. It has been deprecated and
-- * should not be used. Instead, use semanage_module_set_enabled() */
--int semanage_module_enable(semanage_handle_t *sh, char *module_name)
--{
--	int rc = -1;
--	semanage_module_key_t *modkey = NULL;
--
--	rc = semanage_module_key_create(sh, &modkey);
--	if (rc != 0)
--		goto exit;
--
--	rc = semanage_module_key_set_name(sh, modkey, module_name);
--	if (rc != 0)
--		goto exit;
--
--	rc = semanage_module_set_enabled(sh, modkey, 1);
--	if (rc != 0)
--		goto exit;
--
--	rc = 0;
--
--exit:
--	semanage_module_key_destroy(sh, modkey);
--	free(modkey);
--
--	return rc;
--}
--
--/* This function exists only for ABI compatibility. It has been deprecated and
-- * should not be used. Instead, use semanage_module_set_enabled() */
--int semanage_module_disable(semanage_handle_t *sh, char *module_name)
--{
--	int rc = -1;
--	semanage_module_key_t *modkey = NULL;
--
--	rc = semanage_module_key_create(sh, &modkey);
--	if (rc != 0)
--		goto exit;
--
--	rc = semanage_module_key_set_name(sh, modkey, module_name);
--	if (rc != 0)
--		goto exit;
--
--	rc = semanage_module_set_enabled(sh, modkey, 0);
--	if (rc != 0)
--		goto exit;
--
--	rc = 0;
--
--exit:
--	semanage_module_key_destroy(sh, modkey);
--	free(modkey);
--
--	return rc;
--}
--
- /* Converts a string to a priority
-  *
-  * returns -1 if str is not a valid priority.
--- 
-2.29.0
-

0003-libsemanage-Bump-libsemanage.so-version.patch

@@ -1,45 +0,0 @@
-From 6ebb35d261eaa8701b53b9f68184b05de8dfd868 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Fri, 9 Oct 2020 15:00:52 +0200
-Subject: [PATCH] libsemanage: Bump libsemanage.so version
-
-Previous commits removed some symbols and broke ABI, therefore we need to change
-SONAME.
-
-See the following quotes from distribution guidelines:
-
-https://www.debian.org/doc/debian-policy/ch-sharedlibs.html#run-time-shared-libraries
-
-Every time the shared library ABI changes in a way that may break
-binaries linked against older versions of the shared library, the SONAME
-of the library and the corresponding name for the binary package
-containing the runtime shared library should change.
-
-https://docs.fedoraproject.org/en-US/packaging-guidelines/#_downstream_so_name_versioning
-
-When new versions of the library are released, you should use an ABI
-comparison tool to check for ABI differences in the built shared
-libraries. If it detects any incompatibilities, bump the n number by
-one.
-
-Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
----
- libsemanage/src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile
-index a0eb3747d74b..ab6cae51f5c3 100644
---- a/libsemanage/src/Makefile
-+++ b/libsemanage/src/Makefile
-@@ -32,7 +32,7 @@ YACC = bison
- YFLAGS = -d
- 
- VERSION = $(shell cat ../VERSION)
--LIBVERSION = 1
-+LIBVERSION = 2
- 
- LIBA=libsemanage.a
- TARGET=libsemanage.so
--- 
-2.29.0
-

0004-libsemanage-Fix-RESOURCE_LEAK-and-USE_AFTER_FREE-cov.patch

@@ -1,66 +0,0 @@
-From fc966a746653cc15a14d1e1a80f01fc2f567ee08 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Wed, 7 Nov 2018 18:17:34 +0100
-Subject: [PATCH] libsemanage: Fix RESOURCE_LEAK and USE_AFTER_FREE coverity
- scan defects
-
----
- libsemanage/src/direct_api.c | 21 ++++++++-------------
- 1 file changed, 8 insertions(+), 13 deletions(-)
-
-diff --git a/libsemanage/src/direct_api.c b/libsemanage/src/direct_api.c
-index d2b91fb24292..f445cd4d6fb5 100644
---- a/libsemanage/src/direct_api.c
-+++ b/libsemanage/src/direct_api.c
-@@ -1028,7 +1028,7 @@ static int semanage_direct_write_langext(semanage_handle_t *sh,
- 
- 	fp = NULL;
- 
--	ret = 0;
-+	return 0;
- 
- cleanup:
- 	if (fp != NULL) fclose(fp);
-@@ -2184,7 +2184,6 @@ cleanup:
- 	semanage_module_info_destroy(sh, modinfo);
- 	free(modinfo);
- 
--	if (fp != NULL) fclose(fp);
- 	return status;
- }
- 
-@@ -2349,16 +2348,6 @@ static int semanage_direct_get_module_info(semanage_handle_t *sh,
- 	free(tmp);
- 	tmp = NULL;
- 
--	if (fclose(fp) != 0) {
--		ERR(sh,
--		    "Unable to close %s module lang ext file.",
--		    (*modinfo)->name);
--		status = -1;
--		goto cleanup;
--	}
--
--	fp = NULL;
--
- 	/* lookup enabled/disabled status */
- 	ret = semanage_module_get_path(sh,
- 				       *modinfo,
-@@ -2402,7 +2391,13 @@ cleanup:
- 		free(modinfos);
- 	}
- 
--	if (fp != NULL) fclose(fp);
-+	if (fp != NULL && fclose(fp) != 0) {
-+		ERR(sh,
-+		    "Unable to close %s module lang ext file.",
-+		    (*modinfo)->name);
-+		status = -1;
-+	}
-+
- 	return status;
- }
- 
--- 
-2.29.0
-

0005-libsemanage-genhomedircon-check-usepasswd.patch

@@ -1,35 +0,0 @@
-From 511f8bbf779e10152d5af491e8b6a408b8ad666c Mon Sep 17 00:00:00 2001
-From: Vit Mojzis <vmojzis@redhat.com>
-Date: Fri, 30 Oct 2020 17:42:17 +0100
-Subject: [PATCH] libsemanage/genhomedircon: check usepasswd
-
-Only add user homedir contexts when usepasswd = True
-
-Resolves:
-   # grep usepasswd /etc/selinux/semanage.conf
-   usepasswd=False
-   # useradd -Z unconfined_u -d /tmp test
-   # matchpathcon /tmp
-   /tmp	unconfined_u:object_r:user_home_dir_t:s0
-
-Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
----
- libsemanage/src/genhomedircon.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libsemanage/src/genhomedircon.c b/libsemanage/src/genhomedircon.c
-index d08c88de99a7..18d3d99a1254 100644
---- a/libsemanage/src/genhomedircon.c
-+++ b/libsemanage/src/genhomedircon.c
-@@ -1332,7 +1332,7 @@ static int write_context_file(genhomedircon_settings_t * s, FILE * out)
- 			s->fallback->home = NULL;
- 		}
- 	}
--	if (user_context_tpl || username_context_tpl) {
-+	if ((s->usepasswd) && (user_context_tpl || username_context_tpl)) {
- 		if (write_username_context(s, out, username_context_tpl,
- 					   s->fallback) != STATUS_SUCCESS) {
- 			retval = STATUS_ERR;
--- 
-2.29.2
-

gating.yaml

@@ -1,16 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-

libsemanage-fedora.patch

@@ -0,0 +1,407 @@
+diff --git libsemanage-2.8/src/boolean_record.c libsemanage-2.8/src/boolean_record.c
+index 665c022..c234094 100644
+--- libsemanage-2.8/src/boolean_record.c
++++ libsemanage-2.8/src/boolean_record.c
+@@ -6,7 +6,9 @@
+  * Implements: record_key_t (Database Record Key)
+  */
+ 
++#include <string.h>
+ #include <sepol/boolean_record.h>
++#include "handle_internal.h"
+ 
+ typedef sepol_bool_t semanage_bool_t;
+ typedef sepol_bool_key_t semanage_bool_key_t;
+@@ -84,10 +86,58 @@ hidden_def(semanage_bool_get_name)
+ int semanage_bool_set_name(semanage_handle_t * handle,
+ 			   semanage_bool_t * boolean, const char *name)
+ {
+-	int rc;
+-	char *subname = selinux_boolean_sub(name);
++	int rc = -1;
++	const char *prefix = semanage_root();
++	const char *storename = handle->conf->store_path;
++	const char *selinux_root = selinux_policy_root();
++	char *oldroot;
++	char *olddir;
++	char *subname = NULL;
++	char *newroot = NULL;
++	char *end;
++
++	if (!selinux_root)
++		return -1;
++
++	oldroot = strdup(selinux_root);
++	if (!oldroot)
++		return -1;
++	olddir = strdup(oldroot);
++	if (!olddir)
++		goto out;
++	end = strrchr(olddir, '/');
++	if (!end)
++		goto out;
++	end++;
++	*end = '\0';
++	rc = asprintf(&newroot, "%s%s%s", prefix, olddir, storename);
++	if (rc < 0)
++		goto out;
++
++	if (strcmp(oldroot, newroot)) {
++		rc = selinux_set_policy_root(newroot);
++		if (rc)
++			goto out;
++	}
++
++	subname = selinux_boolean_sub(name);
++	if (!subname) {
++		rc = -1;
++		goto out;
++	}
++
++	if (strcmp(oldroot, newroot)) {
++		rc = selinux_set_policy_root(oldroot);
++		if (rc)
++			goto out;
++	}
++
+ 	rc = sepol_bool_set_name(handle->sepolh, boolean, subname);
++out:
+ 	free(subname);
++	free(oldroot);
++	free(olddir);
++	free(newroot);
+ 	return rc;
+ }
+ 
+diff --git libsemanage-2.8/src/direct_api.c libsemanage-2.8/src/direct_api.c
+index c58961b..8e4d116 100644
+--- libsemanage-2.8/src/direct_api.c
++++ libsemanage-2.8/src/direct_api.c
+@@ -1028,7 +1028,7 @@ static int semanage_direct_write_langext(semanage_handle_t *sh,
+ 
+ 	fp = NULL;
+ 
+-	ret = 0;
++	return 0;
+ 
+ cleanup:
+ 	if (fp != NULL) fclose(fp);
+@@ -2177,7 +2177,6 @@ cleanup:
+ 	semanage_module_info_destroy(sh, modinfo);
+ 	free(modinfo);
+ 
+-	if (fp != NULL) fclose(fp);
+ 	return status;
+ }
+ 
+@@ -2342,16 +2341,6 @@ static int semanage_direct_get_module_info(semanage_handle_t *sh,
+ 	free(tmp);
+ 	tmp = NULL;
+ 
+-	if (fclose(fp) != 0) {
+-		ERR(sh,
+-		    "Unable to close %s module lang ext file.",
+-		    (*modinfo)->name);
+-		status = -1;
+-		goto cleanup;
+-	}
+-
+-	fp = NULL;
+-
+ 	/* lookup enabled/disabled status */
+ 	ret = semanage_module_get_path(sh,
+ 				       *modinfo,
+@@ -2395,7 +2384,13 @@ cleanup:
+ 		free(modinfos);
+ 	}
+ 
+-	if (fp != NULL) fclose(fp);
++	if (fp != NULL && fclose(fp) != 0) {
++		ERR(sh,
++		    "Unable to close %s module lang ext file.",
++		    (*modinfo)->name);
++		status = -1;
++	}
++
+ 	return status;
+ }
+ 
+diff --git libsemanage-2.8/src/genhomedircon.c libsemanage-2.8/src/genhomedircon.c
+index 3e61b51..ac37667 100644
+--- libsemanage-2.8/src/genhomedircon.c
++++ libsemanage-2.8/src/genhomedircon.c
+@@ -361,7 +361,11 @@ static semanage_list_t *get_home_dirs(genhomedircon_settings_t * s)
+ 
+ 	errno = 0;
+ 	setpwent();
+-	while ((pwbuf = getpwent()) != NULL) {
++	while (1) {
++		errno = 0;
++		pwbuf = getpwent();
++		if (pwbuf == NULL)
++			break;
+ 		if (pwbuf->pw_uid < minuid || pwbuf->pw_uid > maxuid)
+ 			continue;
+ 		if (!semanage_list_find(shells, pwbuf->pw_shell))
+@@ -403,7 +407,6 @@ static semanage_list_t *get_home_dirs(genhomedircon_settings_t * s)
+ 		}
+ 		free(path);
+ 		path = NULL;
+-		errno = 0;
+ 	}
+ 
+ 	if (errno) {
+@@ -1074,10 +1077,20 @@ static int get_group_users(genhomedircon_settings_t * s,
+ 
+ 	const char *grname = selogin + 1;
+ 
+-	if (getgrnam_r(grname, &grstorage, grbuf,
+-			(size_t) grbuflen, &group) != 0) {
+-		goto cleanup;
++	errno = 0;
++	while (
++		(retval = getgrnam_r(grname, &grstorage, grbuf, (size_t) grbuflen, &group)) != 0 &&
++		errno == ERANGE
++	) {
++		char *new_grbuf;
++		grbuflen *= 2;
++		new_grbuf = realloc(grbuf, grbuflen);
++		if (new_grbuf == NULL)
++			goto cleanup;
++		grbuf = new_grbuf;
+ 	}
++	if (retval == -1)
++		goto cleanup;
+ 
+ 	if (group == NULL) {
+ 		ERR(s->h_semanage, "Can't find group named %s\n", grname);
+@@ -1101,7 +1114,11 @@ static int get_group_users(genhomedircon_settings_t * s,
+ 	}
+ 
+ 	setpwent();
+-	while ((pw = getpwent()) != NULL) {
++	while (1) {
++		errno = 0;
++		pw = getpwent();
++		if (pw == NULL)
++			break;
+ 		// skip users who also have this group as their
+ 		// primary group
+ 		if (lfind(pw->pw_name, group->gr_mem, &nmembers,
+diff --git libsemanage-2.8/src/handle.c libsemanage-2.8/src/handle.c
+index a6567bd..e5109ae 100644
+--- libsemanage-2.8/src/handle.c
++++ libsemanage-2.8/src/handle.c
+@@ -58,6 +58,8 @@ const char * semanage_root(void)
+ 	return private_semanage_root;
+ }
+ 
++hidden_def(semanage_root);
++
+ semanage_handle_t *semanage_handle_create(void)
+ {
+ 	semanage_handle_t *sh = NULL;
+diff --git libsemanage-2.8/src/handle_internal.h libsemanage-2.8/src/handle_internal.h
+index 66ce270..d4b4d9c 100644
+--- libsemanage-2.8/src/handle_internal.h
++++ libsemanage-2.8/src/handle_internal.h
+@@ -5,8 +5,9 @@
+ #include "dso.h"
+ 
+ hidden_proto(semanage_begin_transaction)
+-    hidden_proto(semanage_handle_destroy)
+-    hidden_proto(semanage_reload_policy)
+-    hidden_proto(semanage_access_check)
+-    hidden_proto(semanage_set_root)
++hidden_proto(semanage_handle_destroy)
++hidden_proto(semanage_reload_policy)
++hidden_proto(semanage_access_check)
++hidden_proto(semanage_set_root)
++hidden_proto(semanage_root)
+ #endif
+diff --git libsemanage-2.8/src/semanage_store.c libsemanage-2.8/src/semanage_store.c
+index f1984c5..58dded6 100644
+--- libsemanage-2.8/src/semanage_store.c
++++ libsemanage-2.8/src/semanage_store.c
+@@ -541,14 +541,18 @@ int semanage_create_store(semanage_handle_t * sh, int create)
+ 	struct stat sb;
+ 	const char *path = semanage_files[SEMANAGE_ROOT];
+ 	int fd;
++	mode_t mask;
+ 
+ 	if (stat(path, &sb) == -1) {
+ 		if (errno == ENOENT && create) {
++			mask = umask(0077);
+ 			if (mkdir(path, S_IRWXU) == -1) {
++				umask(mask);
+ 				ERR(sh, "Could not create module store at %s.",
+ 				    path);
+ 				return -2;
+ 			}
++			umask(mask);
+ 		} else {
+ 			if (create)
+ 				ERR(sh,
+@@ -567,12 +571,15 @@ int semanage_create_store(semanage_handle_t * sh, int create)
+ 	path = semanage_path(SEMANAGE_ACTIVE, SEMANAGE_TOPLEVEL);
+ 	if (stat(path, &sb) == -1) {
+ 		if (errno == ENOENT && create) {
++			mask = umask(0077);
+ 			if (mkdir(path, S_IRWXU) == -1) {
++				umask(mask);
+ 				ERR(sh,
+ 				    "Could not create module store, active subdirectory at %s.",
+ 				    path);
+ 				return -2;
+ 			}
++			umask(mask);
+ 		} else {
+ 			ERR(sh,
+ 			    "Could not read from module store, active subdirectory at %s.",
+@@ -590,12 +597,15 @@ int semanage_create_store(semanage_handle_t * sh, int create)
+ 	path = semanage_path(SEMANAGE_ACTIVE, SEMANAGE_MODULES);
+ 	if (stat(path, &sb) == -1) {
+ 		if (errno == ENOENT && create) {
++			mask = umask(0077);
+ 			if (mkdir(path, S_IRWXU) == -1) {
++				umask(mask);
+ 				ERR(sh,
+ 				    "Could not create module store, active modules subdirectory at %s.",
+ 				    path);
+ 				return -2;
+ 			}
++			umask(mask);
+ 		} else {
+ 			ERR(sh,
+ 			    "Could not read from module store, active modules subdirectory at %s.",
+@@ -613,11 +623,14 @@ int semanage_create_store(semanage_handle_t * sh, int create)
+ 	path = semanage_files[SEMANAGE_READ_LOCK];
+ 	if (stat(path, &sb) == -1) {
+ 		if (errno == ENOENT && create) {
++			mask = umask(0077);
+ 			if ((fd = creat(path, S_IRUSR | S_IWUSR)) == -1) {
++				umask(mask);
+ 				ERR(sh, "Could not create lock file at %s.",
+ 				    path);
+ 				return -2;
+ 			}
++			umask(mask);
+ 			close(fd);
+ 		} else {
+ 			ERR(sh, "Could not read lock file at %s.", path);
+@@ -763,6 +776,7 @@ static int semanage_copy_dir_flags(const char *src, const char *dst, int flag)
+ 	struct stat sb;
+ 	struct dirent **names = NULL;
+ 	char path[PATH_MAX], path2[PATH_MAX];
++	mode_t mask;
+ 
+ 	if ((len = scandir(src, &names, semanage_filename_select, NULL)) == -1) {
+ 		fprintf(stderr, "Could not read the contents of %s: %s\n", src, strerror(errno));
+@@ -770,10 +784,13 @@ static int semanage_copy_dir_flags(const char *src, const char *dst, int flag)
+ 	}
+ 
+ 	if (stat(dst, &sb) != 0) {
++		mask = umask(0077);
+ 		if (mkdir(dst, S_IRWXU) != 0) {
++			umask(mask);
+ 			fprintf(stderr, "Could not create %s: %s\n", dst, strerror(errno));
+ 			goto cleanup;
+ 		}
++		umask(mask);
+ 	}
+ 
+ 	for (i = 0; i < len; i++) {
+@@ -785,14 +802,20 @@ static int semanage_copy_dir_flags(const char *src, const char *dst, int flag)
+ 		}
+ 		snprintf(path2, sizeof(path2), "%s/%s", dst, names[i]->d_name);
+ 		if (S_ISDIR(sb.st_mode)) {
++			mask = umask(0077);
+ 			if (mkdir(path2, 0700) == -1 ||
+ 			    semanage_copy_dir_flags(path, path2, flag) == -1) {
++				umask(mask);
+ 				goto cleanup;
+ 			}
++			umask(mask);
+ 		} else if (S_ISREG(sb.st_mode) && flag == 1) {
++			mask = umask(0077);
+ 			if (semanage_copy_file(path, path2, sb.st_mode) < 0) {
++				umask(mask);
+ 				goto cleanup;
+ 			}
++			umask(mask);
+ 		}
+ 	}
+ 	retval = 0;
+@@ -872,16 +895,20 @@ int semanage_mkdir(semanage_handle_t *sh, const char *path)
+ {
+ 	int status = 0;
+ 	struct stat sb;
++	mode_t mask;
+ 
+ 	/* check if directory already exists */
+ 	if (stat(path, &sb) != 0) {
+ 		/* make the modules directory */
++		mask = umask(0077);
+ 		if (mkdir(path, S_IRWXU) != 0) {
++			umask(mask);
+ 			ERR(sh, "Cannot make directory at %s", path);
+ 			status = -1;
+ 			goto cleanup;
+ 
+ 		}
++		umask(mask);
+ 	}
+ 	else {
+ 		/* check that it really is a directory */
+@@ -906,6 +933,7 @@ int semanage_make_sandbox(semanage_handle_t * sh)
+ 	const char *sandbox = semanage_path(SEMANAGE_TMP, SEMANAGE_TOPLEVEL);
+ 	struct stat buf;
+ 	int errsv;
++	mode_t mask;
+ 
+ 	if (stat(sandbox, &buf) == -1) {
+ 		if (errno != ENOENT) {
+@@ -922,12 +950,15 @@ int semanage_make_sandbox(semanage_handle_t * sh)
+ 		}
+ 	}
+ 
++	mask = umask(0077);
+ 	if (mkdir(sandbox, S_IRWXU) == -1 ||
+ 	    semanage_copy_dir(semanage_path(SEMANAGE_ACTIVE, SEMANAGE_TOPLEVEL),
+ 			      sandbox) == -1) {
++		umask(mask);
+ 		ERR(sh, "Could not copy files to sandbox %s.", sandbox);
+ 		goto cleanup;
+ 	}
++	umask(mask);
+ 	return 0;
+ 
+       cleanup:
+diff --git libsemanage-2.8/src/seusers_local.c libsemanage-2.8/src/seusers_local.c
+index 413ebdd..a79e2d3 100644
+--- libsemanage-2.8/src/seusers_local.c
++++ libsemanage-2.8/src/seusers_local.c
+@@ -71,17 +71,18 @@ static int semanage_seuser_audit(semanage_handle_t * handle,
+ 	const char *sep = "-";
+ 	int rc = -1;
+ 	strcpy(msg, "login");
++	if (previous) {
++		name = semanage_seuser_get_name(previous);
++		psename = semanage_seuser_get_sename(previous);
++		pmls = semanage_seuser_get_mlsrange(previous);
++		proles = semanage_user_roles(handle, psename);
++	}
+ 	if (seuser) {
+ 		name = semanage_seuser_get_name(seuser);
+ 		sename = semanage_seuser_get_sename(seuser);
+ 		mls = semanage_seuser_get_mlsrange(seuser);
+ 		roles = semanage_user_roles(handle, sename);
+ 	}
+-	if (previous) {
+-		psename = semanage_seuser_get_sename(previous);
+-		pmls = semanage_seuser_get_mlsrange(previous);
+-		proles = semanage_user_roles(handle, psename);
+-	}
+ 	if (audit_type != AUDIT_ROLE_REMOVE) {
+ 		if (sename && (!psename || strcmp(psename, sename) != 0)) {
+ 			strcat(msg,sep);

libsemanage.spec

@@ -1,36 +1,31 @@
-%define libsepolver 3.1-5
-%define libselinuxver 3.1-5
+%define libsepolver 2.8-3
+%define libselinuxver 2.8-6
 
-Summary: SELinux binary policy manipulation library
+Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 3.1
-Release: 5%{?dist}
+Version: 2.8
+Release: 8%{?dist}
 License: LGPLv2+
-Source0: https://github.com/SELinuxProject/selinux/releases/download/20200710/libsemanage-3.1.tar.gz
-# fedora-selinux/selinux: git format-patch -N libsemanage-3.1 -- libsemanage
-# i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done
-# Patch list start
-Patch0001: 0001-libsemanage-Remove-legacy-and-duplicate-symbols.patch
-Patch0002: 0002-libsemanage-Drop-deprecated-functions.patch
-Patch0003: 0003-libsemanage-Bump-libsemanage.so-version.patch
-Patch0004: 0004-libsemanage-Fix-RESOURCE_LEAK-and-USE_AFTER_FREE-cov.patch
-Patch0005: 0005-libsemanage-genhomedircon-check-usepasswd.patch
-# Patch list end
+Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/libsemanage-2.8.tar.gz
+# download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh
+# run:
+# $ VERSION=2.8 ./make-fedora-selinux-patch.sh libsemanage
+# HEAD https://github.com/fedora-selinux/selinux/commit/10767636b5d9b8f3fa3cf3815e860f4ca4fcb247
+Patch1: libsemanage-fedora.patch
 URL: https://github.com/SELinuxProject/selinux/wiki
 Source1: semanage.conf
 
-BuildRequires: gcc make
+BuildRequires: gcc
 BuildRequires: libselinux-devel >= %{libselinuxver} swig
 BuildRequires: libsepol-devel >= %{libsepolver} 
 BuildRequires: audit-libs-devel
-BuildRequires: bison flex bzip2-devel
+BuildRequires: python2 python2-devel bison flex bzip2-devel
 
 BuildRequires: python3
 BuildRequires: python3-devel
 
 Requires: bzip2-libs audit-libs
 Requires: libselinux%{?_isa} >= %{libselinuxver}
-Obsoletes: libsemanage-compat = 3.1-4
 
 %description
 Security-enhanced Linux is a feature of the Linux® kernel and a number
@@ -64,6 +59,19 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 The semanage-devel package contains the libraries and header files
 needed for developing applications that manipulate binary policies. 
 
+%package -n python2-libsemanage
+%{?python_provide:%python_provide python2-libsemanage}
+# Remove before F30
+Provides: %{name}-python = %{version}-%{release}
+Provides: %{name}-python%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-python < %{version}-%{release}
+Summary: semanage python bindings for libsemanage
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description -n python2-libsemanage
+The libsemanage-python package contains the python bindings for developing 
+SELinux management applications. 
+
 %package -n python3-libsemanage
 Summary: semanage python 3 bindings for libsemanage
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -79,12 +87,11 @@ The libsemanage-python3 package contains the python 3 bindings for developing
 SELinux management applications.
 
 %prep
-%autosetup -n libsemanage-%{version} -p 2
+%autosetup -n libsemanage-%{version} -p 1
 
 
 %build
-%set_build_flags
-CFLAGS="$CFLAGS -fno-semantic-interposition"
+export LDFLAGS="%{?__global_ldflags}"
 
 # To support building the Python wrapper against multiple Python runtimes
 # Define a function, for how to perform a "build" of the python wrapper against
@@ -95,14 +102,17 @@ BuildPythonWrapper() {
   # Perform the build from the upstream Makefile:
   make \
     PYTHON=$BinaryName \
-    LIBDIR="%{_libdir}" SHLIBDIR="%{_lib}" \
+    CFLAGS="%{optflags}" LIBDIR="%{_libdir}" SHLIBDIR="%{_lib}" \
     pywrap
 }
 
 make clean
-make swigify
-%make_build LIBDIR="%{_libdir}" SHLIBDIR="%{_lib}" all
+make CFLAGS="%{optflags}" swigify
+make CFLAGS="%{optflags}" LIBDIR="%{_libdir}" SHLIBDIR="%{_lib}" all
 
+BuildPythonWrapper \
+  %{__python2}
+  
 BuildPythonWrapper \
   %{__python3}
 
@@ -120,22 +130,28 @@ mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_includedir} 
 mkdir -p ${RPM_BUILD_ROOT}%{_sharedstatedir}/selinux
 mkdir -p ${RPM_BUILD_ROOT}%{_sharedstatedir}/selinux/tmp
-%make_install LIBDIR="%{_libdir}" SHLIBDIR="%{_libdir}"
+make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="%{_libdir}" SHLIBDIR="%{_libdir}" install
+
+InstallPythonWrapper \
+  %{__python2} \
+  .so
 
 InstallPythonWrapper \
   %{__python3} \
   $(python3-config --extension-suffix)
   
 cp %{SOURCE1} ${RPM_BUILD_ROOT}/etc/selinux/semanage.conf
+ln -sf  %{_libdir}/libsemanage.so.1 ${RPM_BUILD_ROOT}/%{_libdir}/libsemanage.so
+
+sed -i '1s%\(#! */usr/bin/python\)\([^3].*\|\)$%\13\2%' %{buildroot}%{_libexecdir}/selinux/semanage_migrate_store
 
 %files
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %dir %{_sysconfdir}/selinux
 %config(noreplace) %{_sysconfdir}/selinux/semanage.conf
-%{_libdir}/libsemanage.so.2
+%{_libdir}/libsemanage.so.1
 %{_mandir}/man5/*
-%{_mandir}/ru/man5/*
 %dir %{_libexecdir}/selinux
 %dir %{_sharedstatedir}/selinux
 %dir %{_sharedstatedir}/selinux/tmp
@@ -152,6 +168,10 @@ cp %{SOURCE1} ${RPM_BUILD_ROOT}/etc/selinux/semanage.conf
 %{_includedir}/semanage/*.h
 %{_mandir}/man3/*
 
+%files -n python2-libsemanage
+%{python2_sitearch}/_semanage.so
+%{python2_sitearch}/semanage.py*
+
 %files -n python3-libsemanage
 %{python3_sitearch}/*.so
 %{python3_sitearch}/semanage.py*
@@ -159,64 +179,6 @@ cp %{SOURCE1} ${RPM_BUILD_ROOT}/etc/selinux/semanage.conf
 %{_libexecdir}/selinux/semanage_migrate_store
 
 %changelog
-* Fri Nov 20 2020 Petr Lautrbach <plautrba@redhat.com> - 3.1-5
-- Drop and obsolete libsemanage-compat
-- genhomedircon: check usepasswd
-
-* Fri Oct 30 2020 Petr Lautrbach <plautrba@redhat.com> - 3.1-4
-- Drop deprecated functions and duplicated symbols
-- Change library version to libsemanage.so.2
-- Temporary ship -compat with libsemanage.so.1
-- Based on upstream db0f2f382e31
-- Re-enable lto flags
-
-* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 3.1-2
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-- Use -fno-semantic-interposition and more make macros
-
-* Fri Jul 10 2020 Petr Lautrbach <plautrba@redhat.com> - 3.1-1
-- SELinux userspace 3.1 release
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.0-4
-- Rebuilt for Python 3.9
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 22 2020 Ondrej Mosnacek <omosnace@redhat.com> - 3.0-2
-- Enable policy optimization
-
-* Fri Dec  6 2019 Petr Lautrbach <plautrba@redhat.com> - 3.0-1
-- SELinux userspace 3.0 release
-
-* Mon Nov 11 2019 Petr Lautrbach <plautrba@redhat.com> - 3.0-0.rc1.1
-- SELinux userspace 3.0-rc1 release candidate
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.9-5
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Sun Aug 18 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.9-4
-- Rebuilt for Python 3.8
-
-* Tue Aug 13 2019 Petr Lautrbach <plautrba@redhat.com> - 2.9-3
-- Drop python2-libsemanage (#1738466)
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Mar 18 2019 Petr Lautrbach <plautrba@redhat.com> - 2.9-1
-- SELinux userspace 2.9 release
-
-* Mon Mar 11 2019 Petr Lautrbach <plautrba@redhat.com> - 2.9-0.rc2.1
-- SELinux userspace 2.9-rc2 release
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-0.rc1.1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jan 25 2019 Petr Lautrbach <plautrba@redhat.com> - 2.9-0.rc1.1
-- SELinux userspace 2.9-rc1 release
-
 * Mon Jan 21 2019 Petr Lautrbach <plautrba@redhat.com> - 2.8-8
 - Always set errno to 0 before calling getpwent()
 - Set selinux policy root around calls to selinux_boolean_sub

semanage.conf

@@ -50,7 +50,6 @@ usepasswd=False
 bzip-small=true
 bzip-blocksize=5
 ignoredirs=/root
-optimize-policy=true
 
 [sefcontext_compile]
 path = /usr/sbin/sefcontext_compile

sources

@@ -1 +1 @@
-SHA512 (libsemanage-3.1.tar.gz) = 8609ca7d13b5c603677740f2b14558fea3922624af182d20d618237ba11fcf2559fab82fc68d1efa6ff118f064d426f005138521652c761de92cd66150102197
+SHA512 (libsemanage-2.8.tar.gz) = 53f09c79da168a79b853f55e0f1c20a96229df9d82929c514bcaf72697446ae836f7f0457fc0056d2418cc6d0712157faf0152881518fe84a1b1b9b9af17e7ef

tests/tests.yml

@@ -8,7 +8,9 @@
     repositories:
       - repo: "https://src.fedoraproject.org/tests/selinux.git"
         dest: "selinux"
-        fmf_filter: "tier: 1 | component: libsemanage & tags: generic"
+    tests:
+    - selinux/libsemanage/sanity-tests
+    - selinux/libsemanage/verify-options-in-semanage-conf
     required_packages:
     - libsemanage             # Required for sanity-tests
     - libsemanage-devel       # Required for sanity-tests
@@ -21,5 +23,3 @@
     - policycoreutils-python-utils  # Required for verify-options-in-semanage-conf
     - selinux-policy          # Required for verify-options-in-semanage-conf
     - selinux-policy-devel    # Required for verify-options-in-semanage-conf
-    - lksctp-tools            # sctp_test
-    - psmisc                  # sctp_test