From a12f416baa722b8bda57c0d527fb28b3d06b2aeb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 27 Jul 2023 10:33:45 +0100 Subject: gentoo auto-resync : 27:07:2023 - 10:33:45 --- app-admin/setools/Manifest | 11 ++-- .../setools/files/setools-4.4.1-cython3.patch | 43 +++++++++++++++ .../setools/files/setools-4.4.2-remove-gui.patch | 18 +++++++ app-admin/setools/setools-4.4.0-r3.ebuild | 2 +- app-admin/setools/setools-4.4.1-r1.ebuild | 60 +++++++++++++++++++++ app-admin/setools/setools-4.4.1.ebuild | 6 +-- app-admin/setools/setools-4.4.2.ebuild | 61 ++++++++++++++++++++++ app-admin/setools/setools-9999.ebuild | 20 +++---- 8 files changed, 205 insertions(+), 16 deletions(-) create mode 100644 app-admin/setools/files/setools-4.4.1-cython3.patch create mode 100644 app-admin/setools/files/setools-4.4.2-remove-gui.patch create mode 100644 app-admin/setools/setools-4.4.1-r1.ebuild create mode 100644 app-admin/setools/setools-4.4.2.ebuild (limited to 'app-admin/setools') diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest index 7643903f67d5..7cc2ee1b49ac 100644 --- a/app-admin/setools/Manifest +++ b/app-admin/setools/Manifest @@ -1,8 +1,13 @@ AUX 0001-__init__.py-Make-NetworkX-dep-optional.patch 2242 BLAKE2B 63815b66a6b5051ca084fcb265a6eb573f4738288376dada16c86c04ae3dbf4d58ff33583ff323d1096b321f0d410ae3b956b9e82caf710f78baf82db1a769fb SHA512 eac87e9335643b5e2f0de05b6e03c03d250c799e994edd52368b3a50e201beeebfbf40b7bf016200648fadf9c3d5c3708ac94ff158ea327cf2ea73f773ac8653 AUX setools-4.4.0-remove-gui.patch 1015 BLAKE2B f81872b140107337466e1d57bfd3c1935adca838756a0c1a2c4f2d0f42b7ae0ecb60d5c6db0889998bca96d46c08979d03e989a79461bb6ceb3c7bd4ee6fa56f SHA512 6e2b3d0dafbb4b0966f04cd592fc14800755ea4f585ab4d1bf0516cd25f16185b0923045762ce88df47f7264481fb9dd6588efc38d7280e14b5f015192f12924 +AUX setools-4.4.1-cython3.patch 1853 BLAKE2B 7a7d5ae303d135cf69be3dfac99cace7afdb345835338f47570629c0cb31be8878abe042e010a18d73313b71035b7b2c77a9b57921a4a5600f1fd1c41a141ad1 SHA512 4892b69a14e0f45c89c397f1840af88b79903ccf50aa7e51c4d6dda9be0a2572e21de40f5f44071ab2a61cf0bba9bc8f5a0a8fba9e84c013db4812bab5257df3 +AUX setools-4.4.2-remove-gui.patch 1131 BLAKE2B 54f1258b4b8318f02fd8ef14c4377eacb42254a406b4b9f339b94b0958da352bda028b4b49871ebcdaf1dfc4e37e51f5a0dd346c288270c149d828981c2b5413 SHA512 a827c435072f4a35c165a2492f18c4689144f352ff8fa84ca840dd4b31c59dbd4d4e7c249ad54fb60616e00daad5bc245604041c710141650f80cba01c9cecb0 DIST setools-4.4.0.tar.bz2 275218 BLAKE2B f716a78dd628e0309d3802f2155ef3a045dd8ebee7dec42be9f8b5fc0069b0df4e3d827b0a0cc03f7f02f5a3dff1d7ab7e4eee0d83d6cf4c87af82fe756a9321 SHA512 2ec92d7a6e30261549b6a8d2f17175d4a7d8313ef0cd81f4a19a91c53fe0107bac9a89c19dd67a4c534ee51ec520590795b4312f9e03e69fdf1763b0c35291f8 DIST setools-4.4.1.tar.bz2 262328 BLAKE2B 328a54b8efd570fad03b27a9e52b7c573e0afb6fe23a245ad248fe8931dd737729aac5d9b6371c163d1939043a777b69cf78091cde8c33e5ef7670110615285e SHA512 af1844f7f7232729eb7e93f6680775818cda93532c62524c5385a4ac7437c51bdb58ebd970a9f61f6e1b018367853d35303d3c5ee1cc087e0e26e893be42d559 -EBUILD setools-4.4.0-r3.ebuild 1535 BLAKE2B 7b85d3a00eb3d2d98c84b569db8af423e9f6787e3b9763bb7eff553d27a326c11c78d2f684f15f359f506a25e9e0f7bbd71fe3310352c1e744a8f36f3c778c08 SHA512 07b8bee101fd9ecdb5d69de1f868944352456ea30aedf0884a378308811171aba5211a5eeb9e7181dc03670a6252ca7cfff0d39b7b80c022bd9fc815c6d98ceb -EBUILD setools-4.4.1.ebuild 1567 BLAKE2B 75d5a18809c0fb21ca8a076897104a5bdb2f6c7ec0160f44cc3c0215795630cf8799a2663e6978dd8165b67d7b9d7847d847dc2528e284b22ce275d57bd50e0e SHA512 7d4ce343449a41975fd97330ef48fdb29a7293640d611e0864b39355340b02651e80092798d6fc9c90e956c60737a4e76825ac6e5873cc783753d1c9eacb668f -EBUILD setools-9999.ebuild 1483 BLAKE2B 607e0d6a67ac2b86334c6ca3783671a5604de23987c10918eaa377216a02fb74274656e62420d6b2be24da25055beb31e88b3aebfc6cc6d6c2878f9c90cc2b48 SHA512 1217d70670e372141c0f64197bc6ccc5ca26d4f3dbd00b8c2079ec592da254f1e5973067ea2b4261df2b018130e42101c85c6556a6f8699b8675c661ee80acee +DIST setools-4.4.2.tar.bz2 261962 BLAKE2B 7c8e47d8c15f1eb72d93da5d3ae1a64e857ed0a75e1a47bbad9e4b0d11180581d9e4705ebe942e460acbc4d68261f06f9b03a8c4af1516cc388c201e30dca75e SHA512 4e8cba61ca28459387d862136a2d8ee0914c4bcd254a6d39792cbfcbbf7e58cb82223c05d66c114b08aebbd75c11cef11517c51f674ddb3c1913dc85414546c1 +EBUILD setools-4.4.0-r3.ebuild 1531 BLAKE2B ebccb7eb8569d94c4d8ae698187b9aee2d408dd46c6567660b1bee18413f0facb189a6570eaed3648635da8c8f618717c6fd3f2971b003c6cde8e609a67ff527 SHA512 08644fdd5cb3b58c3851ea8a768a72999dc52bed1fdc2dafd5405f2c20c82f7af94395dba526b5dbdf2d4151d37050ec2c3924ec9833d19feb4238f521046131 +EBUILD setools-4.4.1-r1.ebuild 1606 BLAKE2B f424a9dcd2a6f81c20fbcbcf8cf9ed0952bed261aec4e181a36a4e5b745cf495e6715dfe0b8d20a5acd42ef8d9169fef8cb4035a5b8c4029b0ff314446985884 SHA512 01784528d02358e203ceb84cd933d785d72da993b5417f59fef876d62a718c34a2168c1e027c8b963b83821b23484f190d69e14ff22a5efcbd2358d7e5471d1d +EBUILD setools-4.4.1.ebuild 1556 BLAKE2B dc1b91a3b87d1c87b723c406e08019c9c81332dfec3ab33aac3d0c337955b5d0152cca4c1dceb9dfa2a1832314b3f17bc2600473b796d71477625a317e93df6d SHA512 cf77f52a1530aea3f2fd771c9eb0c6ecfc7814bf8296fe81ac5cfd9fdee48571d877d672559529a52bbe8392bc0b8e4498ffcc429c570251ab7b7aca5cdfb4c0 +EBUILD setools-4.4.2.ebuild 1412 BLAKE2B 2c7a928a7ecf200e0e2a4fe502c158e99b6c39434929ee3e0719719ec1b0f77aaef19dcda60752ba8f736c076689c4633f7eeec618b628b8439c4acb9d4d190d SHA512 abb9ef330008f43d2a36bd135225e432039460a1834e29ce637aa342cfe6bfbf6e83a463abe16b6c0f59996e2c8eb319b6c145ded5fea6d533351802787b5d60 +EBUILD setools-9999.ebuild 1358 BLAKE2B 4a31ac9f1ef8527c1758f48785d69e871deb6ee44090fbdbd6328b9c1e6311eb841adb834ecc999de599a4a99750216c010be8d455b6da8833232ea10bab54bb SHA512 2eb6d7d003bf9522aab274bcf32043c4459e1d3c97e0cc3f85ea2bb9cc11e8bd6946b6b1879f8dbb26337ba8abf83cdec42041fe60085b5a21725ba9912d6ecf MISC metadata.xml 440 BLAKE2B 5ff05dac3cb6a27d99c7ebb2e4425afaef2275aaff5e109feff6870e2e51c55c27dd8baa3d6ad3a2a9a292a20ece18dfb2f0ad61e30cd1dc7b74afaf20d0104c SHA512 f61bdc193e411a635c35e7244fad44b68061c56fa26a1b995f79fb46784d09f52bd85bcbc8caec5043390a72d8548fb4ac0dd84cd4a613dbbdb5fd49e3efa71f diff --git a/app-admin/setools/files/setools-4.4.1-cython3.patch b/app-admin/setools/files/setools-4.4.1-cython3.patch new file mode 100644 index 000000000000..386b92f44576 --- /dev/null +++ b/app-admin/setools/files/setools-4.4.1-cython3.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/898664 +https://github.com/SELinuxProject/setools/pull/105/commits/fc443b5a0379f3644e071a458e996ea6115ccba3 +(cherry-picked from https://github.com/SELinuxProject/setools/commit/31e104c3a9ca97038e09d3a4549fe2b8c8df36e8) + +From fc443b5a0379f3644e071a458e996ea6115ccba3 Mon Sep 17 00:00:00 2001 +From: Chris PeBenito +Date: Mon, 17 Jul 2023 16:08:21 -0400 +Subject: [PATCH] SELinuxPolicy: Add explicit cast for libspol message + callback. + +Cython 3.0 is more strict. The change fixes this issue: + +setools/policyrep/selinuxpolicy.pxi:685:46: Cannot assign type 'void (void *, sepol_handle_t *, const char *, ...) except *' to 'msg_callback' + +Additionally, the msg_callback is not typedef-ed in sepol/debug.h, so it must +be explicitly defined in sepol.pxd for the casting to work. + +Signed-off-by: Chris PeBenito +--- a/setools/policyrep/selinuxpolicy.pxi ++++ b/setools/policyrep/selinuxpolicy.pxi +@@ -668,7 +668,7 @@ cdef class SELinuxPolicy: + if self.sh == NULL: + raise MemoryError + +- sepol.sepol_msg_set_callback(self.sh, sepol_logging_callback, self.handle) ++ sepol.sepol_msg_set_callback(self.sh, sepol_logging_callback, self.handle) + + if sepol.sepol_policydb_create(&self.handle) < 0: + raise MemoryError +--- a/setools/policyrep/sepol.pxd ++++ b/setools/policyrep/sepol.pxd +@@ -16,8 +16,10 @@ cdef extern from "": + void sepol_handle_destroy(sepol_handle_t *sh) + + ++ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...) ++ ++ + cdef extern from "": +- ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...) + void sepol_msg_set_callback(sepol_handle * handle, msg_callback cb, void *cb_arg) + + diff --git a/app-admin/setools/files/setools-4.4.2-remove-gui.patch b/app-admin/setools/files/setools-4.4.2-remove-gui.patch new file mode 100644 index 000000000000..49d16ec66b56 --- /dev/null +++ b/app-admin/setools/files/setools-4.4.2-remove-gui.patch @@ -0,0 +1,18 @@ +--- a/setup.py ++++ b/setup.py +@@ -139,12 +139,10 @@ setup(name='setools', + 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'], +- 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', +- '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/app-admin/setools/setools-4.4.0-r3.ebuild b/app-admin/setools/setools-4.4.0-r3.ebuild index 924ac01580d1..7281dedc3904 100644 --- a/app-admin/setools/setools-4.4.0-r3.ebuild +++ b/app-admin/setools/setools-4.4.0-r3.ebuild @@ -33,7 +33,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] +BDEPEND="=dev-python/networkx-2.0[${PYTHON_USEDEP}] diff --git a/app-admin/setools/setools-4.4.1-r1.ebuild b/app-admin/setools/setools-4.4.1-r1.ebuild new file mode 100644 index 000000000000..b47388f73018 --- /dev/null +++ b/app-admin/setools/setools-4.4.1-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_EXT=1 +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Policy Analysis Tools for SELinux" +HOMEPAGE="https://github.com/SELinuxProject/setools/wiki" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git" + S="${WORKDIR}/${P}" +else + SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S="${WORKDIR}/${PN}" +fi + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +IUSE="test infoflow X" +RESTRICT="!test? ( test )" + +RDEPEND="${PYTHON_DEPS} + dev-python/setuptools[${PYTHON_USEDEP}] + >=sys-libs/libsepol-3.2:= + >=sys-libs/libselinux-3.2:= + infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] ) + X? ( + dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + >=dev-python/networkx-2.0[${PYTHON_USEDEP}] + sys-apps/checkpolicy + )" + +PATCHES=( + "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch + "${FILESDIR}"/${P}-cython3.patch +) + +distutils_enable_tests setup.py + +python_prepare_all() { + sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror" + sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ + die "failed to set lib_dirs" + + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) + distutils-r1_python_prepare_all +} diff --git a/app-admin/setools/setools-4.4.1.ebuild b/app-admin/setools/setools-4.4.1.ebuild index a69ec8eb95c8..52dcc404d73c 100644 --- a/app-admin/setools/setools-4.4.1.ebuild +++ b/app-admin/setools/setools-4.4.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 @@ -46,8 +46,8 @@ python_prepare_all() { sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ die "failed to set lib_dirs" - local PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch ) - use X || local PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) + PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch ) + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) distutils-r1_python_prepare_all } diff --git a/app-admin/setools/setools-4.4.2.ebuild b/app-admin/setools/setools-4.4.2.ebuild new file mode 100644 index 000000000000..b56099e25e94 --- /dev/null +++ b/app-admin/setools/setools-4.4.2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) + +inherit distutils-r1 + +DESCRIPTION="Policy Analysis Tools for SELinux" +HOMEPAGE="https://github.com/SELinuxProject/setools/wiki" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git" + S="${WORKDIR}/${P}" +else + SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S="${WORKDIR}/${PN}" +fi + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +IUSE="test X" +RESTRICT="!test? ( test )" + +RDEPEND="${PYTHON_DEPS} + dev-python/setuptools[${PYTHON_USEDEP}] + >=sys-libs/libsepol-3.2:= + >=sys-libs/libselinux-3.2:= + X? ( + dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] + test? ( + >=dev-python/networkx-2.0[${PYTHON_USEDEP}] + sys-apps/checkpolicy + )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.4.1-cython3.patch +) + +distutils_enable_tests pytest + +python_prepare_all() { + sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ + die "failed to set lib_dirs" + + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch ) + distutils-r1_python_prepare_all +} + +python_test() { + rm -rf setools || die + epytest +} diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild index c9dbd1d564e9..2d9636b33744 100644 --- a/app-admin/setools/setools-9999.ebuild +++ b/app-admin/setools/setools-9999.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +EAPI="8" + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 @@ -22,34 +24,34 @@ fi LICENSE="GPL-2 LGPL-2.1" SLOT="0" -IUSE="test infoflow X" +IUSE="test X" RESTRICT="!test? ( test )" RDEPEND="${PYTHON_DEPS} dev-python/setuptools[${PYTHON_USEDEP}] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= - infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] ) X? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] test? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] sys-apps/checkpolicy )" +distutils_enable_tests pytest + python_prepare_all() { - sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror" sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ die "failed to set lib_dirs" - use X || local PATCHES=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch ) distutils-r1_python_prepare_all } python_test() { - esetup.py test + rm -rf setools || die + epytest } -- cgit v1.2.3