* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
@ 2016-06-01 13:19 Jason Zaman
0 siblings, 0 replies; 10+ messages in thread
From: Jason Zaman @ 2016-06-01 13:19 UTC (permalink / raw
To: gentoo-commits
commit: 7518cf8e636099691658a2a9668a9ca21d9c7f4d
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 1 13:16:48 2016 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 13:19:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7518cf8e
app-admin/setools: drop 4.0.0
Package-Manager: portage-2.2.28
app-admin/setools/Manifest | 1 -
.../setools/files/setools-4.0.0-remove-gui.patch | 18 --------
app-admin/setools/setools-4.0.0.ebuild | 54 ----------------------
3 files changed, 73 deletions(-)
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 491a828..c1d439d 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -2,5 +2,4 @@ DIST setools-3.3.8-01-fedora-patches.tar.gz 1128 SHA256 420b852d4209d07b73cec845
DIST setools-3.3.8-03-gentoo-patches.tar.gz 6584 SHA256 8eac460b7dc2ee5e2f23148cdbf187316edd78ce0ec7ebbb6b0f68d6ad33d86a SHA512 5458dab5775b558e287f946c299753be5cb5eb6c1c2b9df0e32c7cfa758bb5316d142aa6338d3019f5f1eeb72876e4d5ed4939b0dbfe7b7e01c08a19a086bacc WHIRLPOOL e1afa6bb28f3aee2f3acdc66efd8ca02548c4f8e5707052ea455f1db558126f069d63278251630ee68bf4987157279161006975cb14d44055492228fa476cd72
DIST setools-3.3.8-04-gentoo-patches.tar.bz2 94986 SHA256 9a8a43ac97606fde9b2610ceed65f640638929853f871ce530982bedfd919b64 SHA512 39bf00b6aaf31821c6e2e2fb4c460dd1914fba4bf8385acebedf88f1533da990f1fb925dd49d75827aebef3f394a50a1edea46a07204193b58c65a066a064e6a WHIRLPOOL 4a92e4cf6930584de931c5d0805815aacd1c1af4434ca8e73414eda33588a55ef8d7bdfe4195be642889eee480128cbe12d1c5612e07ea304021b230e0b74816
DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371
-DIST setools-4.0.0.tar.gz 408231 SHA256 6946e725ec7163f4017ffcb0cd4c39056fc41309857a86383c0f34912726125b SHA512 5eb3ddc00ef7878f39eb7afb379ec441ab33210ceec1457db3412a0f5d6939952cc66031e998f9c3df1da874b781f355d7442a2c505aa636b4aa7b486f8c7826 WHIRLPOOL 1bdaaf1a323a51df4b8eadea70a251d22c78c53b552f8f24bb2441c939f6a06b536be30609da4a086beaa66434a425d890ff111d763b1f65fe49649452d70d2a
DIST setools-4.0.1.tar.gz 399888 SHA256 4c2049877f2f68e4485b72bc280fe20127b49a019169a2cf1d8295c908bdcdfe SHA512 d0a36cfddc6a6f47ecaa8402141271558e97467b6c449d18b98bf6fe894189f29a32fb672e3ff573efdb44964bd361283c68c2906d02f8a9c1269b6b71903bc2 WHIRLPOOL 017e709c113b28175787249af8aa1dcc99a5034eadcc76e97a394f9f89afcc1e7fe3eeb8ec105c541a6260d8a2eb4b1aa8155ba2297ecdf6d640ba112857a442
diff --git a/app-admin/setools/files/setools-4.0.0-remove-gui.patch b/app-admin/setools/files/setools-4.0.0-remove-gui.patch
deleted file mode 100644
index e8cd6f5..0000000
--- a/app-admin/setools/files/setools-4.0.0-remove-gui.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- setools-4.0.0/setup.py.orig 2016-05-05 01:11:19.204938821 +0800
-+++ setools-4.0.0/setup.py 2016-05-05 01:18:48.852004644 +0800
-@@ -162,12 +162,10 @@
- 'build_lex': LexCommand,
- 'build_ext': BuildExtCommand,
- 'build_qhc': QtHelpCommand},
-- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
-- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-+ packages=['setools', 'setools.diff', 'setools.policyrep'],
-+ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
- data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1") ),
-- (join(sys.prefix, 'share/setools'), glob.glob("data/*.ui") +
-- ["data/perm_map", "qhc/apol.qhc"] ),
-- (join(sys.prefix, 'share/setools/icons'), glob.glob("data/icons/*.png"))],
-+ (join(sys.prefix, 'share/setools'), ["data/perm_map"] ),],
- ext_modules=ext_py_mods,
- test_suite='tests',
- license='GPLv2+, LGPLv2.1+',
diff --git a/app-admin/setools/setools-4.0.0.ebuild b/app-admin/setools/setools-4.0.0.ebuild
deleted file mode 100644
index 231ba7f..0000000
--- a/app-admin/setools/setools-4.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
-else
- SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="X debug test"
-
-RDEPEND="${PYTHON_DEPS}
- >=sys-libs/libselinux-2.4:=[${PYTHON_USEDEP}]
- >=dev-python/networkx-1.8[${PYTHON_USEDEP}]
- app-arch/bzip2:=
- dev-libs/libpcre:=
- X? (
- dev-python/PyQt5
- dev-qt/qtchooser
- )"
-
-DEPEND="${RDEPEND}
- >=dev-lang/swig-2.0.12:0
- sys-devel/bison
- sys-devel/flex
- >=sys-libs/libsepol-2.4
- test? (
- python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] )
- dev-python/tox[${PYTHON_USEDEP}]
- )"
-
-python_prepare_all() {
- sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
-
- use X || local PATCHES=( "${FILESDIR}"/setools-4.0.0-remove-gui.patch )
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- esetup.py test
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
@ 2017-08-10 8:41 Jason Zaman
0 siblings, 0 replies; 10+ messages in thread
From: Jason Zaman @ 2017-08-10 8:41 UTC (permalink / raw
To: gentoo-commits
commit: 20646c92bf82660eae521dfcad1284eebb2fbf7c
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 08:37:12 2017 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Aug 10 08:38:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20646c92
app-admin/setools: fix remove gui 4.1.1 patch
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-admin/setools/files/setools-4.1.1-remove-gui.patch | 18 ++++++++++++++++++
app-admin/setools/setools-4.1.1.ebuild | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/app-admin/setools/files/setools-4.1.1-remove-gui.patch b/app-admin/setools/files/setools-4.1.1-remove-gui.patch
new file mode 100644
index 00000000000..1bb78f5fd96
--- /dev/null
+++ b/app-admin/setools/files/setools-4.1.1-remove-gui.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 2ca44c9..0c8a0d9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -180,10 +180,10 @@ setup(name='setools',
+ 'build_lex': LexCommand,
+ 'build_ext': BuildExtCommand,
+ 'build_qhc': QtHelpCommand},
+- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
+- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++ packages=['setools', 'setools.diff', 'setools.policyrep'],
++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+ data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
+- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
++ package_data={'setools': ['perm_map']},
+ ext_modules=ext_py_mods,
+ test_suite='tests',
+ license='GPLv2+, LGPLv2.1+',
diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild
index f1e79d0d936..708c8a7e7d6 100644
--- a/app-admin/setools/setools-4.1.1.ebuild
+++ b/app-admin/setools/setools-4.1.1.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
python_prepare_all() {
sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
- use X || local PATCHES=( "${FILESDIR}"/setools-4.1.0-remove-gui.patch )
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
distutils-r1_python_prepare_all
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
@ 2019-08-19 6:01 Jason Zaman
0 siblings, 0 replies; 10+ messages in thread
From: Jason Zaman @ 2019-08-19 6:01 UTC (permalink / raw
To: gentoo-commits
commit: 1fba38d6b078a8ba3aa5513e5076f443a731d1ea
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 05:53:09 2019 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 06:01:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fba38d6
app-admin/setools: fix 4.2.2 remove gui patch
Closes: https://bugs.gentoo.org/692360
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
app-admin/setools/files/setools-4.2.2-remove-gui.patch | 18 ++++++++++++++++++
app-admin/setools/setools-4.2.2.ebuild | 3 ++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/app-admin/setools/files/setools-4.2.2-remove-gui.patch b/app-admin/setools/files/setools-4.2.2-remove-gui.patch
new file mode 100644
index 00000000000..58579bf5a00
--- /dev/null
+++ b/app-admin/setools/files/setools-4.2.2-remove-gui.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index ac8a876..84001a8 100644
+--- a/setup.py
++++ b/setup.py
+@@ -134,10 +134,10 @@ setup(name='setools',
+ author_email='pebenito@ieee.org',
+ url='https://github.com/SELinuxProject/setools',
+ cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
+- packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
+- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++ packages=['setools', 'setools.diff'],
++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+ data_files=[('share/man/man1', glob.glob("man/*.1"))],
+- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
++ package_data={'setools': ['perm_map']},
+ 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.2.2.ebuild b/app-admin/setools/setools-4.2.2.ebuild
index f186598f7c0..22da7166d07 100644
--- a/app-admin/setools/setools-4.2.2.ebuild
+++ b/app-admin/setools/setools-4.2.2.ebuild
@@ -20,6 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
IUSE="X test"
+S="${WORKDIR}/${PN}"
RDEPEND="${PYTHON_DEPS}
>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
@@ -40,7 +41,7 @@ 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 || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
distutils-r1_python_prepare_all
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
@ 2019-08-19 7:34 Jason Zaman
0 siblings, 0 replies; 10+ messages in thread
From: Jason Zaman @ 2019-08-19 7:34 UTC (permalink / raw
To: gentoo-commits
commit: fdb745604c565aa304fb3f4f420c1b87689c96b4
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 07:33:04 2019 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 07:33:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb74560
app-admin/setools: Fix patch for 4.2.1
Closes: https://bugs.gentoo.org/677560
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
app-admin/setools/files/setools-4.2.0-remove-gui.patch | 18 ------------------
app-admin/setools/setools-4.2.1.ebuild | 2 +-
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/app-admin/setools/files/setools-4.2.0-remove-gui.patch b/app-admin/setools/files/setools-4.2.0-remove-gui.patch
deleted file mode 100644
index 748b33c9a5d..00000000000
--- a/app-admin/setools/files/setools-4.2.0-remove-gui.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index e075a00..3f8f959 100644
---- a/setup.py
-+++ b/setup.py
-@@ -134,10 +134,10 @@ setup(name='setools',
- author_email='pebenito@ieee.org',
- url='https://github.com/SELinuxProject/setools',
- cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
-- packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
-- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-+ packages=['setools', 'setools.diff'],
-+ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
- data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
-- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
-+ package_data={'setools': ['perm_map']},
- 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.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild
index b1bf0e666c9..3e80e5e19f6 100644
--- a/app-admin/setools/setools-4.2.1.ebuild
+++ b/app-admin/setools/setools-4.2.1.ebuild
@@ -40,7 +40,7 @@ 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 || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
distutils-r1_python_prepare_all
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
@ 2020-09-15 3:41 Jason Zaman
0 siblings, 0 replies; 10+ messages in thread
From: Jason Zaman @ 2020-09-15 3:41 UTC (permalink / raw
To: gentoo-commits
commit: a2677b8ee540c538e3cb5ebafbb3984518c1665e
Author: Jonathan Davies <jpds <AT> protonmail <DOT> com>
AuthorDate: Tue Sep 1 19:33:00 2020 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 03:40:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2677b8e
app-admin/setools: Version bump to 4.3.0.
Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
app-admin/setools/Manifest | 1 +
app-admin/setools/files/setools-4.3.0-remove-gui.patch | 16 ++++++++++++++++
.../{setools-9999.ebuild => setools-4.3.0.ebuild} | 6 +++---
app-admin/setools/setools-9999.ebuild | 6 +++---
4 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 8c9e34e2529..bd5ba05e8cf 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1 +1,2 @@
DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
+DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
diff --git a/app-admin/setools/files/setools-4.3.0-remove-gui.patch b/app-admin/setools/files/setools-4.3.0-remove-gui.patch
new file mode 100644
index 00000000000..85abbf5a7aa
--- /dev/null
+++ b/app-admin/setools/files/setools-4.3.0-remove-gui.patch
@@ -0,0 +1,16 @@
+--- a/setup.py
++++ b/setup.py
+@@ -146,10 +146,10 @@ setup(name='setools',
+ author_email='pebenito@ieee.org',
+ url='https://github.com/SELinuxProject/setools',
+ cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
+- packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
+- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++ packages=['setools', 'setools.diff'],
++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+ data_files=installed_data,
+- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
++ package_data={'setools': ['perm_map']},
+ 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-9999.ebuild b/app-admin/setools/setools-4.3.0.ebuild
similarity index 90%
copy from app-admin/setools/setools-9999.ebuild
copy to app-admin/setools/setools-4.3.0.ebuild
index 88bea390204..fd1fb1b07fa 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-4.3.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7} )
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
inherit distutils-r1
@@ -42,7 +42,7 @@ 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 || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.3.0-remove-gui.patch )
distutils-r1_python_prepare_all
}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 88bea390204..fd1fb1b07fa 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7} )
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
inherit distutils-r1
@@ -42,7 +42,7 @@ 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 || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.3.0-remove-gui.patch )
distutils-r1_python_prepare_all
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
@ 2020-12-18 3:31 Jason Zaman
0 siblings, 0 replies; 10+ messages in thread
From: Jason Zaman @ 2020-12-18 3:31 UTC (permalink / raw
To: gentoo-commits
commit: b97e7fc3b3ec02c9c5e607b67222cbaa45099202
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 03:08:49 2020 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 03:08:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b97e7fc3
app-admin/setools: Drop old
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
app-admin/setools/Manifest | 1 -
.../setools/files/setools-4.2.2-remove-gui.patch | 18 --------
app-admin/setools/setools-4.2.2.ebuild | 51 ----------------------
3 files changed, 70 deletions(-)
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index bd5ba05e8cf..e834e07f6e9 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,2 +1 @@
-DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
diff --git a/app-admin/setools/files/setools-4.2.2-remove-gui.patch b/app-admin/setools/files/setools-4.2.2-remove-gui.patch
deleted file mode 100644
index 58579bf5a00..00000000000
--- a/app-admin/setools/files/setools-4.2.2-remove-gui.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index ac8a876..84001a8 100644
---- a/setup.py
-+++ b/setup.py
-@@ -134,10 +134,10 @@ setup(name='setools',
- author_email='pebenito@ieee.org',
- url='https://github.com/SELinuxProject/setools',
- cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
-- packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
-- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-+ packages=['setools', 'setools.diff'],
-+ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
- data_files=[('share/man/man1', glob.glob("man/*.1"))],
-- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
-+ package_data={'setools': ['perm_map']},
- 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.2.2.ebuild b/app-admin/setools/setools-4.2.2.ebuild
deleted file mode 100644
index 74dd28424fe..00000000000
--- a/app-admin/setools/setools-4.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-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"
-else
- SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
- KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="X test"
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/${PN}"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-python/networkx-2.0[${PYTHON_USEDEP}]
- >=sys-libs/libsepol-2.8:=
- >=sys-libs/libselinux-2.8:=
- X? (
- dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
- )"
-
-DEPEND="${RDEPEND}
- >=dev-python/cython-0.27
- test? (
- sys-apps/checkpolicy
- )"
-
-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.2.2-remove-gui.patch )
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- esetup.py test
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
@ 2021-09-19 13:24 Jason Zaman
0 siblings, 0 replies; 10+ messages in thread
From: Jason Zaman @ 2021-09-19 13:24 UTC (permalink / raw
To: gentoo-commits
commit: 9f71727658471fee1873b279387edf2ebaf10d76
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 13:17:19 2021 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 13:22:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f717276
app-admin/setools: Make NetworkX dep optional
selinux commit ba23ba068364ab11ff51f52bd1e20e3c63798a62
"python: Import specific modules from setools for less deps"
Makes userspace tools only need specific parts of setools so that the
NetworkX dep can be dropped for minimal installations.
Unfortunately the __init__ still imports the parts which require
NetworkX. Wrap them in try except to guard for missing NetworkX.
Bug: https://bugs.gentoo.org/809038
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
...01-__init__.py-Make-NetworkX-dep-optional.patch | 62 ++++++++++++++++++++++
...ols-4.4.0-r1.ebuild => setools-4.4.0-r2.ebuild} | 3 +-
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch b/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch
new file mode 100644
index 00000000000..3137f1a89f9
--- /dev/null
+++ b/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch
@@ -0,0 +1,62 @@
+From 32eed2ae8fcd868179a317d48cfd61d828c834df Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Sun, 19 Sep 2021 14:12:44 +0200
+Subject: [PATCH] __init__.py: Make NetworkX dep optional
+
+selinux commit ba23ba068364ab11ff51f52bd1e20e3c63798a62
+"python: Import specific modules from setools for less deps"
+Makes userspace tools only need specific parts of setools so that the
+NetworkX dep can be dropped for minimal installations.
+Unfortunately the __init__ still imports the parts which require
+NetworkX. Wrap them in try except to guard for missing NetworkX.
+
+$ semanage export
+Traceback (most recent call last):
+ File "/usr/lib/python-exec/python3.9/semanage", line 29, in <module>
+ import seobject
+ File "/usr/lib/python3.9/site-packages/seobject.py", line 33, in <module>
+ import sepolicy
+ File "/usr/lib/python3.9/site-packages/sepolicy/__init__.py", line 15, in <module>
+ from setools.boolquery import BoolQuery
+ File "/usr/lib/python3.9/site-packages/setools/__init__.py", line 94, in <module>
+ from .infoflow import InfoFlowAnalysis
+ File "/usr/lib/python3.9/site-packages/setools/infoflow.py", line 24, in <module>
+ import networkx as nx
+ModuleNotFoundError: No module named 'networkx'
+
+Bug: https://bugs.gentoo.org/809038
+Signed-off-by: Jason Zaman <jason@perfinion.com>
+---
+ setools/__init__.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/setools/__init__.py b/setools/__init__.py
+index d72d343..e583737 100644
+--- a/setools/__init__.py
++++ b/setools/__init__.py
+@@ -91,11 +91,20 @@ from .pcideviceconquery import PcideviceconQuery
+ from .devicetreeconquery import DevicetreeconQuery
+
+ # Information Flow Analysis
+-from .infoflow import InfoFlowAnalysis
++try:
++ from .infoflow import InfoFlowAnalysis
++except ImportError:
++ # NetworkX is optional
++ pass
++
+ from .permmap import PermissionMap, RuleWeight, Mapping
+
+ # Domain Transition Analysis
+-from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition
++try:
++ from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition
++except ImportError:
++ # NetworkX is optional
++ pass
+
+ # Policy difference
+ from .diff import PolicyDifference
+--
+2.32.0
+
diff --git a/app-admin/setools/setools-4.4.0-r1.ebuild b/app-admin/setools/setools-4.4.0-r2.ebuild
similarity index 89%
rename from app-admin/setools/setools-4.4.0-r1.ebuild
rename to app-admin/setools/setools-4.4.0-r2.ebuild
index 5ae05f843c9..54c34d2b8fc 100644
--- a/app-admin/setools/setools-4.4.0-r1.ebuild
+++ b/app-admin/setools/setools-4.4.0-r2.ebuild
@@ -44,7 +44,8 @@ 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 || local PATCHES=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
+ local 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
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
@ 2022-04-09 2:55 Jason Zaman
0 siblings, 0 replies; 10+ messages in thread
From: Jason Zaman @ 2022-04-09 2:55 UTC (permalink / raw
To: gentoo-commits
commit: d881fc3d5ddc12ff562d994a62b53d61c009dd9f
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 01:54:13 2022 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 02:54:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d881fc3d
app-admin/setools: Drop old
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
app-admin/setools/Manifest | 1 -
.../setools/files/setools-4.3.0-remove-gui.patch | 16 -------
app-admin/setools/setools-4.3.0.ebuild | 50 ----------------------
3 files changed, 67 deletions(-)
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 8e30ccb5acea..56a07eb8e38a 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,2 +1 @@
-DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
DIST setools-4.4.0.tar.bz2 275218 BLAKE2B f716a78dd628e0309d3802f2155ef3a045dd8ebee7dec42be9f8b5fc0069b0df4e3d827b0a0cc03f7f02f5a3dff1d7ab7e4eee0d83d6cf4c87af82fe756a9321 SHA512 2ec92d7a6e30261549b6a8d2f17175d4a7d8313ef0cd81f4a19a91c53fe0107bac9a89c19dd67a4c534ee51ec520590795b4312f9e03e69fdf1763b0c35291f8
diff --git a/app-admin/setools/files/setools-4.3.0-remove-gui.patch b/app-admin/setools/files/setools-4.3.0-remove-gui.patch
deleted file mode 100644
index 85abbf5a7aa3..000000000000
--- a/app-admin/setools/files/setools-4.3.0-remove-gui.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -146,10 +146,10 @@ setup(name='setools',
- author_email='pebenito@ieee.org',
- url='https://github.com/SELinuxProject/setools',
- cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
-- packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
-- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-+ packages=['setools', 'setools.diff'],
-+ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
- data_files=installed_data,
-- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
-+ package_data={'setools': ['perm_map']},
- 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.3.0.ebuild b/app-admin/setools/setools-4.3.0.ebuild
deleted file mode 100644
index 19992dacb4a2..000000000000
--- a/app-admin/setools/setools-4.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-
-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"
-else
- SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="X test"
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/${PN}"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-python/networkx-2.0[${PYTHON_USEDEP}]
- >=sys-libs/libsepol-2.8:=
- >=sys-libs/libselinux-2.8:=
- X? (
- dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27
- test? (
- sys-apps/checkpolicy
- )"
-
-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.3.0-remove-gui.patch )
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- esetup.py test
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
@ 2023-07-27 7:07 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-07-27 7:07 UTC (permalink / raw
To: gentoo-commits
commit: 1ee9417567fe86de5aa2e53159575bc73376b950
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 06:34:49 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 06:53:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee94175
app-admin/setools: backport cython-3 fix, use d_e_t, set DISTUTILS_EXT
Closes: https://bugs.gentoo.org/898664
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../setools/files/setools-4.4.1-cython3.patch | 43 ++++++++++++++++++++++
...setools-9999.ebuild => setools-4.4.1-r1.ebuild} | 15 +++++---
app-admin/setools/setools-9999.ebuild | 14 ++++---
3 files changed, 62 insertions(+), 10 deletions(-)
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 <chpebeni@linux.microsoft.com>
+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 <chpebeni@linux.microsoft.com>
+--- 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-9999.ebuild b/app-admin/setools/setools-4.4.1-r1.ebuild
similarity index 85%
copy from app-admin/setools/setools-9999.ebuild
copy to app-admin/setools/setools-4.4.1-r1.ebuild
index ebd2c04ae49c..b2f3219fe402 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-4.4.1-r1.ebuild
@@ -2,7 +2,9 @@
# 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
@@ -41,15 +43,18 @@ BDEPEND=">=dev-python/cython-0.27[${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 || local PATCHES=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
+ use X || local PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
distutils-r1_python_prepare_all
}
-
-python_test() {
- esetup.py test
-}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index ebd2c04ae49c..4f18e7303d13 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -2,7 +2,9 @@
# 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
@@ -41,15 +43,17 @@ BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
sys-apps/checkpolicy
)"
+PATCHES=(
+ "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.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 || local PATCHES=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
+ use X || local PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
distutils-r1_python_prepare_all
}
-
-python_test() {
- esetup.py test
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
@ 2023-10-01 15:26 Kenton Groombridge
0 siblings, 0 replies; 10+ messages in thread
From: Kenton Groombridge @ 2023-10-01 15:26 UTC (permalink / raw
To: gentoo-commits
commit: 660f8800a5e53b81328e1800e07df39bc16046a8
Author: Kenton Groombridge <concord <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 1 15:24:06 2023 +0000
Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org>
CommitDate: Sun Oct 1 15:25:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=660f8800
app-admin/setools: drop 4.4.0-r3, 4.4.1, 4.4.1-r1
Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org>
app-admin/setools/Manifest | 2 -
...01-__init__.py-Make-NetworkX-dep-optional.patch | 62 ----------------------
.../setools/files/setools-4.4.0-remove-gui.patch | 16 ------
app-admin/setools/metadata.xml | 3 --
app-admin/setools/setools-4.4.0-r3.ebuild | 55 -------------------
app-admin/setools/setools-4.4.1-r1.ebuild | 60 ---------------------
app-admin/setools/setools-4.4.1.ebuild | 56 -------------------
7 files changed, 254 deletions(-)
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 603bd4cea940..ebb92c6431fe 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,3 +1 @@
-DIST setools-4.4.0.tar.bz2 275218 BLAKE2B f716a78dd628e0309d3802f2155ef3a045dd8ebee7dec42be9f8b5fc0069b0df4e3d827b0a0cc03f7f02f5a3dff1d7ab7e4eee0d83d6cf4c87af82fe756a9321 SHA512 2ec92d7a6e30261549b6a8d2f17175d4a7d8313ef0cd81f4a19a91c53fe0107bac9a89c19dd67a4c534ee51ec520590795b4312f9e03e69fdf1763b0c35291f8
-DIST setools-4.4.1.tar.bz2 262328 BLAKE2B 328a54b8efd570fad03b27a9e52b7c573e0afb6fe23a245ad248fe8931dd737729aac5d9b6371c163d1939043a777b69cf78091cde8c33e5ef7670110615285e SHA512 af1844f7f7232729eb7e93f6680775818cda93532c62524c5385a4ac7437c51bdb58ebd970a9f61f6e1b018367853d35303d3c5ee1cc087e0e26e893be42d559
DIST setools-4.4.2.tar.bz2 261962 BLAKE2B 7c8e47d8c15f1eb72d93da5d3ae1a64e857ed0a75e1a47bbad9e4b0d11180581d9e4705ebe942e460acbc4d68261f06f9b03a8c4af1516cc388c201e30dca75e SHA512 4e8cba61ca28459387d862136a2d8ee0914c4bcd254a6d39792cbfcbbf7e58cb82223c05d66c114b08aebbd75c11cef11517c51f674ddb3c1913dc85414546c1
diff --git a/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch b/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch
deleted file mode 100644
index 3137f1a89f9a..000000000000
--- a/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 32eed2ae8fcd868179a317d48cfd61d828c834df Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Sun, 19 Sep 2021 14:12:44 +0200
-Subject: [PATCH] __init__.py: Make NetworkX dep optional
-
-selinux commit ba23ba068364ab11ff51f52bd1e20e3c63798a62
-"python: Import specific modules from setools for less deps"
-Makes userspace tools only need specific parts of setools so that the
-NetworkX dep can be dropped for minimal installations.
-Unfortunately the __init__ still imports the parts which require
-NetworkX. Wrap them in try except to guard for missing NetworkX.
-
-$ semanage export
-Traceback (most recent call last):
- File "/usr/lib/python-exec/python3.9/semanage", line 29, in <module>
- import seobject
- File "/usr/lib/python3.9/site-packages/seobject.py", line 33, in <module>
- import sepolicy
- File "/usr/lib/python3.9/site-packages/sepolicy/__init__.py", line 15, in <module>
- from setools.boolquery import BoolQuery
- File "/usr/lib/python3.9/site-packages/setools/__init__.py", line 94, in <module>
- from .infoflow import InfoFlowAnalysis
- File "/usr/lib/python3.9/site-packages/setools/infoflow.py", line 24, in <module>
- import networkx as nx
-ModuleNotFoundError: No module named 'networkx'
-
-Bug: https://bugs.gentoo.org/809038
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- setools/__init__.py | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/setools/__init__.py b/setools/__init__.py
-index d72d343..e583737 100644
---- a/setools/__init__.py
-+++ b/setools/__init__.py
-@@ -91,11 +91,20 @@ from .pcideviceconquery import PcideviceconQuery
- from .devicetreeconquery import DevicetreeconQuery
-
- # Information Flow Analysis
--from .infoflow import InfoFlowAnalysis
-+try:
-+ from .infoflow import InfoFlowAnalysis
-+except ImportError:
-+ # NetworkX is optional
-+ pass
-+
- from .permmap import PermissionMap, RuleWeight, Mapping
-
- # Domain Transition Analysis
--from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition
-+try:
-+ from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition
-+except ImportError:
-+ # NetworkX is optional
-+ pass
-
- # Policy difference
- from .diff import PolicyDifference
---
-2.32.0
-
diff --git a/app-admin/setools/files/setools-4.4.0-remove-gui.patch b/app-admin/setools/files/setools-4.4.0-remove-gui.patch
deleted file mode 100644
index 01b40adb29db..000000000000
--- a/app-admin/setools/files/setools-4.4.0-remove-gui.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/setup.py 2021-03-17 22:56:42.016632635 +0000
-+++ b/setup.py 2021-03-17 23:02:33.625713629 +0000
-@@ -139,10 +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']},
-+ package_data={'setools': ['perm_map']},
- ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
- annotate=cython_annotate,
- compiler_directives={"language_level": 3,
diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml
index 9e77647c601c..2367a4105f5c 100644
--- a/app-admin/setools/metadata.xml
+++ b/app-admin/setools/metadata.xml
@@ -5,9 +5,6 @@
<email>selinux@gentoo.org</email>
<name>SELinux Team</name>
</maintainer>
- <use>
- <flag name="infoflow">Depend on <pkg>dev-python/networkx</pkg> to use seinfoflow</flag>
- </use>
<upstream>
<remote-id type="github">SELinuxProject/setools</remote-id>
</upstream>
diff --git a/app-admin/setools/setools-4.4.0-r3.ebuild b/app-admin/setools/setools-4.4.0-r3.ebuild
deleted file mode 100644
index 7281dedc3904..000000000000
--- a/app-admin/setools/setools-4.4.0-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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
-
-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"
-else
- SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
- KEYWORDS="amd64 arm arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="test infoflow X"
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/${PN}"
-
-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-3[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- >=dev-python/networkx-2.0[${PYTHON_USEDEP}]
- sys-apps/checkpolicy
- )"
-
-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"
-
- local 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
-}
-
-python_test() {
- esetup.py test
-}
diff --git a/app-admin/setools/setools-4.4.1-r1.ebuild b/app-admin/setools/setools-4.4.1-r1.ebuild
deleted file mode 100644
index b47388f73018..000000000000
--- a/app-admin/setools/setools-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
deleted file mode 100644
index 52dcc404d73c..000000000000
--- a/app-admin/setools/setools-4.4.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{10..11} )
-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
- )"
-
-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"
-
- 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
-}
-
-python_test() {
- esetup.py test
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-10-01 15:26 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-01 15:26 [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/ Kenton Groombridge
-- strict thread matches above, loose matches on Subject: below --
2023-07-27 7:07 Sam James
2022-04-09 2:55 Jason Zaman
2021-09-19 13:24 Jason Zaman
2020-12-18 3:31 Jason Zaman
2020-09-15 3:41 Jason Zaman
2019-08-19 7:34 Jason Zaman
2019-08-19 6:01 Jason Zaman
2017-08-10 8:41 Jason Zaman
2016-06-01 13:19 Jason Zaman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox