commit: e83faeafed615ba030c50309a8ad9ebe312f86f5 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> AuthorDate: Sun May 5 20:50:10 2024 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Sun May 5 20:50:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e83faeaf
app-admin/setools: drop 4.4.2 Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> app-admin/setools/Manifest | 1 - .../setools/files/setools-4.4.1-cython3.patch | 43 --------------- app-admin/setools/setools-4.4.2.ebuild | 61 ---------------------- 3 files changed, 105 deletions(-) diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest index 5c758f3470ff..dafa5d1085b1 100644 --- a/app-admin/setools/Manifest +++ b/app-admin/setools/Manifest @@ -1,3 +1,2 @@ -DIST setools-4.4.2.tar.bz2 261962 BLAKE2B 7c8e47d8c15f1eb72d93da5d3ae1a64e857ed0a75e1a47bbad9e4b0d11180581d9e4705ebe942e460acbc4d68261f06f9b03a8c4af1516cc388c201e30dca75e SHA512 4e8cba61ca28459387d862136a2d8ee0914c4bcd254a6d39792cbfcbbf7e58cb82223c05d66c114b08aebbd75c11cef11517c51f674ddb3c1913dc85414546c1 DIST setools-4.4.4.tar.bz2 262867 BLAKE2B d64605ef050a2d51531e2a180bff086da536aa8d5e5c8cb96a81e137f575d089f9e9ec117cf0de9864f07174d92258b27ebf8fbc462714ef50bbd6d9f80d0a60 SHA512 ef72a7244ba0c724c4aea3afc40d71427e9c0592715f81cccaa8917e96836a88807ea78039c11c261dd3b4d72294accd76ab4bd37447cd500772030245db3c6e DIST setools-4.5.1.tar.bz2 264998 BLAKE2B 479cec6f541c1e7125d641928ba49aee949e538612a478840cec2d70106dcf9f7fa5b8049c9d18c560587670ee624a3a744714667d52b99cff24c51e72026db7 SHA512 1045c223423fcb056ffbc2f93c4dc0ccc6ae078ce7d2acbe3a3c65de19440fe801b5b9f71038cde62bf9851f52d868c845aafbe33691ee531cf9854217e061d8 diff --git a/app-admin/setools/files/setools-4.4.1-cython3.patch b/app-admin/setools/files/setools-4.4.1-cython3.patch deleted file mode 100644 index 386b92f44576..000000000000 --- a/app-admin/setools/files/setools-4.4.1-cython3.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 <[email protected]> -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 <[email protected]> ---- 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.msg_callback>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 "<sepol/handle.h>": - void sepol_handle_destroy(sepol_handle_t *sh) - - -+ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...) -+ -+ - cdef extern from "<sepol/debug.h>": -- 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/setools-4.4.2.ebuild b/app-admin/setools/setools-4.4.2.ebuild deleted file mode 100644 index a0fdba4cdd9d..000000000000 --- a/app-admin/setools/setools-4.4.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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 -}
