mirror of
https://github.com/openwrt/packages.git
synced 2025-12-21 19:14:30 +04:00
selinux-python: update to 3.8.1
Update to latest 3.8.1 version and drop upstreamed patch[1].
[1] 1a29c28afb
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
@@ -6,12 +6,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=selinux-python
|
PKG_NAME:=selinux-python
|
||||||
PKG_VERSION:=3.5
|
PKG_VERSION:=3.8.1
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
|
||||||
PKG_HASH:=8245bb4dae59333461f19ca0c79a829081f07972fa5e3ad4c2b2b917dd71d96b
|
PKG_HASH:=749025bfa4aa0e009bf3ffc455d565a18d4db71cfe796be4405821717206c25a
|
||||||
|
|
||||||
PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||||
PKG_LICENSE:=GPL-2.0-only
|
PKG_LICENSE:=GPL-2.0-only
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
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
|
|
||||||
Reference in New Issue
Block a user