diff --git a/utils/setools/Makefile b/utils/setools/Makefile index e4cf10e689..b4f8afd76a 100644 --- a/utils/setools/Makefile +++ b/utils/setools/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=setools -PKG_VERSION:=4.4.4 +PKG_VERSION:=4.5.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/SELinuxProject/setools/releases/download/$(PKG_VERSION) -PKG_HASH:=3c5fa76a674fe3f6890d900df59b9d142e4b63c9ffbde653904f90ed6e666ef9 +PKG_HASH:=25e47d00bbffd6046f55409c9ba3b08d9b1d5788cc159ea247d9e0ced8e482e7 PKG_BUILD_DEPENDS:=python-cython/host # Cython>=0.27 diff --git a/utils/setools/patches/010-no-gui.patch b/utils/setools/patches/010-no-gui.patch index 54f03c3162..efe1834469 100644 --- a/utils/setools/patches/010-no-gui.patch +++ b/utils/setools/patches/010-no-gui.patch @@ -1,16 +1,19 @@ --- a/setup.py +++ b/setup.py -@@ -139,10 +139,10 @@ setup(name='setools', +@@ -70,13 +70,10 @@ setup(name='setools', + author='Chris PeBenito', author_email='pebenito@ieee.org', url='https://github.com/SELinuxProject/setools', - cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand}, -- packages=['setools', 'setools.checker', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'], +- packages=['setools', 'setools.checker', 'setools.diff', 'setoolsgui', 'setoolsgui.widgets', +- 'setoolsgui.widgets.criteria', 'setoolsgui.widgets.details', +- 'setoolsgui.widgets.models', 'setoolsgui.widgets.views'], - scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'], + packages=['setools', 'setools.checker', 'setools.diff'], + scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'], data_files=installed_data, -- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map', -+ package_data={'setools': ['perm_map', - 'policyrep.pyi', - 'py.typed']}, +- package_data={'': ['*.css', '*.html'], +- 'setools': ['perm_map', 'policyrep.pyi', 'py.typed']}, ++ package_data={'setools': ['perm_map', 'policyrep.pyi', 'py.typed']}, ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'], + annotate=cython_annotate, + compiler_directives={"language_level": 3, diff --git a/utils/setools/patches/030-remove-host-paths.patch b/utils/setools/patches/030-remove-host-paths.patch index bec9be9d63..99b65e78e0 100644 --- a/utils/setools/patches/030-remove-host-paths.patch +++ b/utils/setools/patches/030-remove-host-paths.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -79,7 +79,7 @@ class QtHelpCommand(Command): +@@ -11,7 +11,7 @@ import os.path # Library linkage