mirror of
https://github.com/openwrt/packages.git
synced 2025-02-07 09:19:51 +00:00
6bd71dac0c
* Added packages:
* python3-seobject
Contains the seobject.py library file which was previously included
in selinux-semanage
* selinux-sepolicy
Contains the sepolicy and sepolgen tools which were previously
included in python3-sepolicy
* selinux-sepolgen-ifgen
Contains the sepolgen-ifgen tool which was previously included in
selinux-audit2allow
* selinux-python
A meta-package to install all tools
* Change the python3-sepolgen data_dir from /usr/share/sepolgen to
/etc/sepolgen (updated 0001-sepolgen-adjust-data_dir.patch), and add
the directory to conffiles
By default, the sepolgen-ifgen tool writes to a file named
"interface_info" in the data directory, to be read by the audit2allow
tool. The header comment in the perm_map file also suggests that the
file is customizable.
The best place for these files would be in /var/lib, but /etc is more
appropriate than /usr.
* Remove gui files from python3-sepolicy (0003-sepolicy-no-gui.patch)
* Fix ModuleNotFoundError raised by sepolicy
(0004-sepolicy-fix-get_os_version-except.patch)
Patch has been submitted upstream:
https://lore.kernel.org/selinux/20230619063217.3165462-1-jeffery.to@gmail.com/
* Update package titles, descriptions, and dependencies
* Use Py3Package to build Python bytecode and source packages
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
commit 80ba6c49dec9c2c48775e70a4d4564ba5e59eea1
|
|
Author: Jeffery To <jeffery.to@gmail.com>
|
|
Date: Mon Jun 19 14:15:45 2023 +0800
|
|
|
|
python/sepolicy: Fix get_os_version except clause
|
|
|
|
This adds more exceptions to be handled by the except clause in
|
|
`get_os_version()`:
|
|
|
|
* If the `distro` package is not installed, then `import distro` raises
|
|
a `ModuleNotFoundError` exception.
|
|
|
|
* The distro documentation[1] lists `OSError` and `UnicodeError` as
|
|
exceptions that can be raised.
|
|
|
|
* Older versions of distro (<= 1.6.0) may also raise
|
|
`subprocessCalledProcessError`[2].
|
|
|
|
[1]: https://github.com/python-distro/distro/blob/v1.8.0/src/distro/distro.py#L749-L753
|
|
[2]: https://github.com/python-distro/distro/blob/v1.6.0/distro.py#L726-L728
|
|
|
|
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
|
|
|
|
--- a/sepolicy/sepolicy/__init__.py
|
|
+++ b/sepolicy/sepolicy/__init__.py
|
|
@@ -1240,11 +1240,12 @@ def boolean_desc(boolean):
|
|
|
|
|
|
def get_os_version():
|
|
+ import subprocess
|
|
system_release = ""
|
|
try:
|
|
import distro
|
|
system_release = distro.name(pretty=True)
|
|
- except IOError:
|
|
+ except (ModuleNotFoundError, OSError, IOError, UnicodeError, subprocess.CalledProcessError):
|
|
system_release = "Misc"
|
|
|
|
return system_release
|