mirror of
git://git.yoctoproject.org/meta-selinux
synced 2026-01-01 13:58:04 +00:00
979b3caf98
ChangeLog: https://github.com/SELinuxProject/selinux/releases/tag/3.9 * Support static-only builds with DISABLE_SHARED=y * Add restore option to modify user and role portions * setfiles: Add -U option to modify user and role portions * semanage.conf: Add relabel_store config option * semodule: Add [-g PATH |--config=PATH] for an alternate path for the semanage config * libselinux: Fix local literal fcontext definitions priority * libselinux: Fix order for path substitutions * libsepol: Add new 'netif_wildcard' policy capability * checkpolicy: Add support for wildcard netifcon names * libsepol: Allow multiple policycap statements * libsepol: Support genfs_seclabel_wildcard * Replace all links to selinuxproject.org * Bug fixes Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
62 lines
2.7 KiB
Diff
62 lines
2.7 KiB
Diff
From 845f081ba3dab6c27aeac12ab20a45250fd9a8e6 Mon Sep 17 00:00:00 2001
|
|
From: Yi Zhao <yi.zhao@windriver.com>
|
|
Date: Tue, 24 Sep 2024 14:07:41 +0800
|
|
Subject: [PATCH] sepolicy: set conf.substitutions['releasever'] to empty str
|
|
when releasever is None
|
|
|
|
For some distributions (e.g. Yocto) that do not provide
|
|
system-release/distribution-release file, libdnf can not get releasever
|
|
variable, causing conf.substitutions['releasever'] to not be set.
|
|
This will cause 'sepolicy generate' command to fail with the following
|
|
error on these distributions:
|
|
|
|
$ sepolicy generate --init /usr/local/bin/foo
|
|
Traceback (most recent call last):
|
|
File "/usr/bin/sepolicy", line 702, in <module>
|
|
args.func(args)
|
|
File "/usr/bin/sepolicy", line 569, in generate
|
|
mypolicy.gen_writeable()
|
|
File "/usr/lib/python3.12/site-packages/sepolicy/generate.py", line 1302, in gen_writeable
|
|
self.__extract_rpms()
|
|
File "/usr/lib/python3.12/site-packages/sepolicy/generate.py", line 1268, in __extract_rpms
|
|
base.read_all_repos()
|
|
File "/usr/lib/python3.12/site-packages/dnf/base.py", line 554, in read_all_repos
|
|
for repo in reader:
|
|
^^^^^^
|
|
File "/usr/lib/python3.12/site-packages/dnf/conf/read.py", line 42, in __iter__
|
|
for r in self._get_repos(self.conf.config_file_path):
|
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
File "/usr/lib/python3.12/site-packages/dnf/conf/read.py", line 109, in _get_repos
|
|
parser.setSubstitutions(substs)
|
|
File "/usr/lib/python3.12/site-packages/libdnf/conf.py", line 1643, in setSubstitutions
|
|
return _conf.ConfigParser_setSubstitutions(self, substitutions)
|
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
TypeError: in method 'ConfigParser_setSubstitutions', argument 2 of type 'std::map< std::string,std::string,std::less< std::string >,std::allocator< std::pair< std::string const,std::string > > > const &'
|
|
|
|
Set conf.substitutions['releasever'] to empty str if releasever is None.
|
|
|
|
Upstream-Status: Submitted [https://github.com/SELinuxProject/selinux/pull/444]
|
|
|
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
---
|
|
python/sepolicy/sepolicy/generate.py | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py
|
|
index adf65f27..56923dc4 100644
|
|
--- a/python/sepolicy/sepolicy/generate.py
|
|
+++ b/python/sepolicy/sepolicy/generate.py
|
|
@@ -1265,6 +1265,9 @@ allow %s_t %s_t:%s_socket name_%s;
|
|
import dnf
|
|
|
|
with dnf.Base() as base:
|
|
+ if base.conf.substitutions.get('releasever') is None:
|
|
+ base.conf.substitutions['releasever'] = ''
|
|
+
|
|
base.read_all_repos()
|
|
base.fill_sack(load_system_repo=True)
|
|
|
|
--
|
|
2.34.1
|
|
|