Update selinux support

app-admin/setools/Manifest

@@ -1,4 +1,16 @@
-DIST setools-3.3.8-01-fedora-patches.tar.gz 1128 SHA256 420b852d4209d07b73cec84586e000e7a6a719135ea677711abf97d420840bb6 SHA512 1aa2cc50c307929b522e029a552bfd545aef07656d1983289b0ea9be67aa94c07272a59c17630fc09fd79b06845ada318cdfa48d6cc243a24026e015c23b9634 WHIRLPOOL 25ae2b15fb15060fd0d34c55f4cc098b70a3a616f5334b092657a9c5df037b7fcf00fd185f33ba142e47d46c36b2fb7e9434021d6e987832fe833367a50d7449
-DIST setools-3.3.8-03-gentoo-patches.tar.gz 6584 SHA256 8eac460b7dc2ee5e2f23148cdbf187316edd78ce0ec7ebbb6b0f68d6ad33d86a SHA512 5458dab5775b558e287f946c299753be5cb5eb6c1c2b9df0e32c7cfa758bb5316d142aa6338d3019f5f1eeb72876e4d5ed4939b0dbfe7b7e01c08a19a086bacc WHIRLPOOL e1afa6bb28f3aee2f3acdc66efd8ca02548c4f8e5707052ea455f1db558126f069d63278251630ee68bf4987157279161006975cb14d44055492228fa476cd72
+AUX setools-3.3.8-no-check-file.patch 558 SHA256 ce1b798f8e1129d2b893dc7de2d9c3fed5a4785f03c55b14a1c7e2d9fec0b037 SHA512 25051dcbb94ddeed623aba598235cb1caaedbb7071dd997c58575ed3cc8266c4421cf070d8f10d5ec6804167bef969fab7227a0241daf7f92e30e1bff0d89080 WHIRLPOOL 85ac00cfac831f22a112fb8420eeaabf1c4d3653ecfb958e68079adb061f773827711ddcce89dfc77d702d8c9460c626ec7c9852cd37e1e01e4eeaa4bcddca28
+AUX setools-3.3.8-policy-max.patch 1051 SHA256 64f06c91af9be789f4e6b6db9f585d76a09670bcb9a5f56e2dd848a89b647bfb SHA512 9eacd76d450b6e68d85f14c4d38cb9370a7cd435610c209d83063b3ddc7bb45f8bd75b1aa8573991e021d4af4205646465b3c2b19ac89296bb7e43147eb0775b WHIRLPOOL 9892fdf63f5a6e27d35edda4ccd984a131c9d96efe458170b8269e2e20e72e2adad412f315fc388774004e1c6ae4af3946d5c8237bcee5c90a65b3cd4b58f854
+AUX setools-4.0.1-remove-gui.patch 1031 SHA256 7aa70f25d6c6b3e45cd5773b1d5f9d26f69535b909249a92c596642807fa3171 SHA512 982c0cd43bdf9473df5dd9584d199bbf1bc71bfee284a2f4e7e800c877bb62bbb6aca03ae3099e481c0538bf3f12d425ca23e19763b1b58c647e9749925283ef WHIRLPOOL 4263180a8ae0c8876ad6fb532e6520b614857c6731bca38169e7a06339e9c32d24d2c4fb2f6111d5573dc23d8480a7e3c3984f22e347940d37549fdeb9390a24
+AUX setools-4.1.0-remove-gui.patch 881 SHA256 383d543b29cb26cbf584f713431a0aea6c3c40ec0a5678cec6eef4754f8b4447 SHA512 b931b0cb7d33e22465c1be849990f2bef07eebdd48ad72d22e5fb2cfa853f6ad2f19a722423db72a4578676376c7d23be557c9932cfe457087a68960f04d15d0 WHIRLPOOL 0561ff8d29bc2b5439083694b5fcf889cb5e0e4de76a2d2ed626958b1b26b4fa38ca7804c397530df5a444ba31d50fa6ae006d26a4fbc28e4724f55bd276b542
+AUX setools-4.1.1-remove-gui.patch 890 SHA256 4189b0c3d7d9cc68e9b1305796c8d4b27a23dc3a1d91b4cebe82eb679cc4bc5e SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6 WHIRLPOOL 965ff603e6f3d72b247c3c5383ccd5d1b5577045d139b1bb69311229253acd279022b6adc135a94395be1db179895e58dd1cae3e30d8b6cd3a2e69b17d90749d
 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.1.tar.gz 399888 SHA256 4c2049877f2f68e4485b72bc280fe20127b49a019169a2cf1d8295c908bdcdfe SHA512 d0a36cfddc6a6f47ecaa8402141271558e97467b6c449d18b98bf6fe894189f29a32fb672e3ff573efdb44964bd361283c68c2906d02f8a9c1269b6b71903bc2 WHIRLPOOL 017e709c113b28175787249af8aa1dcc99a5034eadcc76e97a394f9f89afcc1e7fe3eeb8ec105c541a6260d8a2eb4b1aa8155ba2297ecdf6d640ba112857a442
+DIST setools-4.1.1.tar.gz 461649 SHA256 46a927ea2b163cbe1d35cc35da43e45853e13720c7e02d4cf75a498783c19610 SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04 WHIRLPOOL a2982268bb6f407f080718cf841eed097b62e09f5cdb972850d2de7da09562bf0e1b3092fbfd6770ee03aa8146c637241a9ea44618b7fd1c0d8da393c1b9d9f2
+EBUILD setools-3.3.8-r7.ebuild 3686 SHA256 42023e25980739373b010a3a57f0d75ad745c5029bdf479161649869a4024ea5 SHA512 984ceb81a0fd293e16097cbbf8aba94ad2418095cd21de4ac322c02ea77d1a64cce97ddceaa8495b1f6a02fe927511532d54572a8c88888014796529ade6126c WHIRLPOOL 7740c289841cdeb0a658c27f1520cc1cb2ccaf482e1f2a81b670b73a0f1619eeefbed7aca42759fbebabd8a7b708a0ec205f5f8525a01e0db2fc7731469e41a6
+EBUILD setools-4.0.1.ebuild 1245 SHA256 f4e02c54ba171978d081536d924388adb8a5b5805da2ce7466158cf90af001d3 SHA512 1803bfdb18d0fb1278c24ed5272bbb55327381debc023fce62f9897c1d863a8afe4d509c0514bd24f52ac77ba7d64702ee6bce4ed33467bf0bf72a3ba778efb3 WHIRLPOOL f9fdf299061afd5dcc207e6430bdc71d345c6fc78b655c7c9420db317188121f435f38c27a5b15eb52602c0d41fcdc435d8adb5a8bff9f81064460fd266871c4
+EBUILD setools-4.1.1.ebuild 1309 SHA256 e0a042409713dfa40f0dd8d459d16494c39252c695393d19dbd12ff9c7c9657c SHA512 8013267116ab4ad01152f1b28575f96f1213670ec1de7d82ccb89ad225b1af3c828733d25e68681e00823bef429a5f8bdb270dce8be4bfd24da4397506c308ce WHIRLPOOL 2d91775a1b01391082fddd74b26ad6fdef22bab2731a177e27c7cf37ba50fb66bc2c2ca80d8303808495ec84a545e002df969f2471b5b92b0cf5f1090ae9c6a6
+EBUILD setools-9999.ebuild 1311 SHA256 06f28c36f24c9273c19c1b1640ef84a3f71314c22b60aaffacbc752f1192896e SHA512 8eaf4dc0b43c38adc6e206eccb60f52e34e1049e29a8ba51ce035f61307ee28a513867732ac8fe03f0a6e02adadc9c9b7afdd3f1edecd2f5e7918a64bbf2b9e6 WHIRLPOOL 4bc2f7776424e86e9da53349d26a8b2bbb4aaef62a6626a351753abb59bd53abb3e828f9512844b1a31afdc4beac7dd83a9e19fa68ef109e3e3b06efe09346b4
+MISC ChangeLog 5140 SHA256 8e79850635caf36462120694daa381d14b742f63a8a3cbd0ff2cc2ee132ce204 SHA512 05e8c3a148150d3f849955ecbf6ba2afe26250c0589ace0cf9747a33ff27f191af0ad5dbd83a5e1bc5aa230c9c639e8c2319ae797dd939ba5b7ac1d42cb68854 WHIRLPOOL f9ff886df693422539a6cd39265d506e3577bcaa55e9d8ef306f79d3943a9e8ec422c19ef0021dacde802a8ee8740ac9793487cd139bc1f3242f3ece8bffd7a0
+MISC ChangeLog-2015 14070 SHA256 bec7f864d78e8ce6fe5154849b5812b59997d667d135bbea4303712caba86ec1 SHA512 427cb0ec019f621f26153c1ba61da38b40d8c3de05f7a70a6361b5eab6f66a96fd9f17f01a7a2662040b7914ffb0dcf4e57272a472f81de01dda76785800202f WHIRLPOOL 9408d6ebc29caa71b2795377d710007628657cf48f895f9787d7d544eb32b8badddfd1c3014f4250729c314cd4525aada13a262689a18ed77edeadfaffb0ef99
+MISC metadata.xml 403 SHA256 dd38714f015f8ddee0a34b8d9711e68f388d63f6057e8a9b13b9152b1185297c SHA512 be645abfaf1149e2f2a9b7f0613b61f015df81a16bc6dde593513aa2ba7b4a9a8fba65520b53a2511ba65c022258f48bcd2aed3f85c273a35c94359e358a8fa6 WHIRLPOOL ed51a619b4afb53017e26d3b273463e641beb0aed9f6fcce5c6c7137e4b1b2016262cce0f0ecfa9f4072f7037f25ad50ad036dc040cb359c4fad8a50f05c75ec

app-admin/setools/files/setools-3.3.8-no-check-file.patch

@@ -0,0 +1,15 @@
+there's no real need to run AC_CHECK_FILE to see if a file exists.  if the
+static link fails later on, then the static lib didn't exist.  this also
+breaks cross-compiling.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -448,8 +448,6 @@
+               sepol_srcdir="")
+ if test "x${sepol_srcdir}" = "x"; then
+    sepol_srcdir=${sepol_devel_libdir}
+-   AC_CHECK_FILE([${sepol_srcdir}/libsepol.a],,
+-      AC_MSG_ERROR([make sure libsepol-static is installed]))
+ else
+    AC_MSG_CHECKING([for compatible sepol source tree])
+    sepol_version=${sepol_srcdir}/VERSION

app-admin/setools/files/support-cross-build.patch → app-admin/setools/files/setools-3.3.8-policy-max.patch

@@ -1,7 +1,9 @@
-diff -ur setools-3.3.8.orig/configure.ac setools-3.3.8/configure.ac
---- setools-3.3.8.orig/configure.ac	2013-01-16 08:36:24.000000000 -0800
-+++ setools-3.3.8/configure.ac	2015-06-11 15:01:16.476072420 -0700
-@@ -593,25 +593,6 @@
+trying to run compiled code fails when cross-compiling.
+probe the value using the preprocessor instead.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -621,21 +621,8 @@
  	        sepol_new_errcodes="yes",
                  sepol_new_errcodes="no")
 
@@ -20,10 +22,8 @@ diff -ur setools-3.3.8.orig/configure.ac setools-3.3.8/configure.ac
 -}])],
 -    sepol_policy_version_max=`cat conftest.data`,
 -    AC_MSG_FAILURE([could not determine maximum libsepol policy version]))
--AC_DEFINE_UNQUOTED(SEPOL_POLICY_VERSION_MAX, ${sepol_policy_version_max}, [maximum policy version supported by libsepol])
--CFLAGS="${sepol_save_CFLAGS}"
--CPPFLAGS="${sepol_save_CPPFLAGS}"
--
- if test ${use_selinux} = "yes"; then
- dnl Locate selinux policy root directory
-     AC_MSG_CHECKING([for selinux policy root])
++printf "#include <sepol/policydb/policydb.h>\nPOLICYDB_VERSION_MAX\n" > conftest.c
++sepol_policy_version_max=`${CPP} -E -P ${CPPFLAGS} conftest.c | tail -1`
+ AC_DEFINE_UNQUOTED(SEPOL_POLICY_VERSION_MAX, ${sepol_policy_version_max}, [maximum policy version supported by libsepol])
+ CFLAGS="${sepol_save_CFLAGS}"
+ CPPFLAGS="${sepol_save_CPPFLAGS}"

app-admin/setools/files/setools-4.0.1-remove-gui.patch

@@ -0,0 +1,17 @@
+--- setools-4.0.1/setup.py.orig	2016-05-22 19:50:02.586000000 +0200
++++ setools-4.0.1/setup.py	2016-05-22 19:50:56.107000000 +0200
+@@ -163,11 +163,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'), ["data/perm_map"] ),],
+       ext_modules=ext_py_mods,
+       test_suite='tests',
+       license='GPLv2+, LGPLv2.1+',

app-admin/setools/files/setools-4.1.0-remove-gui.patch

@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 4e7645c..aa3895a 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'], 'setools': ['perm_map']},
++      package_data={'setools': ['perm_map']},
+       ext_modules=ext_py_mods,
+       test_suite='tests',
+       license='GPLv2+, LGPLv2.1+',

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+',

app-admin/setools/metadata.xml

@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer type="project">
+		<email>[email protected]</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>SELinux policy analysis tools.</longdescription>
+	<upstream>
+		<remote-id type="github">TresysTechnology/setools</remote-id>
+	</upstream>
+	<use>
+		<flag name="networkx">Enable support for <pkg>dev-python/networkx</pkg></flag>
+		<flag name="python">Enable support for <pkg>python</pkg></flag>
+	</use>
 </pkgmetadata>

app-admin/setools/setools-3.3.8-r7.ebuild

@@ -1,21 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v 1.6 2015/05/10 09:06:14 perfinion Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 python3_4 )
 
 inherit autotools java-pkg-opt-2 python-r1 eutils toolchain-funcs
 
 DESCRIPTION="SELinux policy tools"
-HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
+HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
 SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.bz2
-	http://dev.gentoo.org/~perfinion/patches/setools/${P}-04-gentoo-patches.tar.bz2"
+	https://dev.gentoo.org/~perfinion/patches/setools/${P}-04-gentoo-patches.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 IUSE="X debug java python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMONDEPEND=">=sys-libs/libsepol-2.4
 	>=sys-libs/libselinux-2.4
@@ -52,14 +52,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/support-cross-build.patch"
-
 	EPATCH_MULTI_MSG="Applying various (Gentoo) setool fixes... " \
 	EPATCH_SUFFIX="patch" \
 	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
 	EPATCH_FORCE="yes" \
 	epatch
 
+	epatch "${FILESDIR}"/${PN}-3.3.8-no-check-file.patch
+	epatch "${FILESDIR}"/${PN}-3.3.8-policy-max.patch
+
 	# Fix build failure due to double __init__.py installation
 	sed -e "s/^wrappedpy_DATA = qpol.py \$(pkgpython_PYTHON)/wrappedpy_DATA = qpol.py/" -i libqpol/swig/python/Makefile.am || die
 	# Disable broken check for SWIG version. Bug #542032
@@ -87,7 +88,6 @@ src_configure() {
 		--with-java-prefix=${JAVA_HOME} \
 		--disable-selinux-check \
 		--disable-bwidget-check \
-		--with-sepol-devel=${ROOT}/usr \
 		$(use_enable python swig-python) \
 		$(use_enable java swig-java) \
 		$(use_enable X swig-tcl) \