# ChangeLog for app-admin/setools
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.93 2014/08/05 10:06:33 swift Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.94 2015/02/12 18:04:48 perfinion Exp $
+
+*setools-3.3.8-r6 (12 Feb 2015)
+
+ 12 Feb 2015; Jason Zaman <perfinion@gentoo.org>
+ +files/setools3-userspace-2.4-compatibility.patch, +setools-3.3.8-r6.ebuild:
+ fix compile error with 2.4 userland, bug 539462
05 Aug 2014; Sven Vermeulen <swift@gentoo.org> -setools-3.3.8-r2.ebuild,
-setools-3.3.8-r4.ebuild:
AUX fix-check-role_set_expand-libsepol-2.1.0.patch 1150 SHA256 8b9bcb857a77ae446721a4c7387493d74500bced0c6e2fc967c991a488122b3f SHA512 4e944cf6ff52792429004a432ea84f6fa0605418abff34a87bff21861e95a75e7a0da2860e49cf8ca54466ddb96d4693f765ca59659aa9ed38b95df0d3a73d3d WHIRLPOOL aabb28a97e57d343ece582080ce0b4a2dba8ae12147052f759da28cb4a567affdcaae8735129b5b28126b125f2ecd83f6ee5a163c6dfbbb137ecff2b0339f7e3
AUX fix-implicit-def-fstat.patch 441 SHA256 3d0c55580056353ab3ca575899fb8f669d0b7a3f00f62dedf3a643a7e0ea8a9b SHA512 f9780fe4ff1e637ff6c2669fcc2cce18b269eeacde30064dc92711d6c4fcfe177e6d3884fd5f88db2e67ea803fbd32edc8f524f33103c53300c4477a8cf24eb4 WHIRLPOOL 766826b2c2564fd1e59af137ba1a57ca89eaa21e7d7462546780264b26f34465424c43789d173d1124a2534a4dc67a682857733f0436096efc031611b23fb25f
+AUX setools3-userspace-2.4-compatibility.patch 4245 SHA256 02bb2496f1c33177099ee025be3c297eec718dfe41565695e21056e165d4d626 SHA512 7f8bd3b48c23ea596d521c5a2d71fd714767167df24ee3cdf20b41ab19b077af267e83dec0db4ac9ef3333af26beb4c5e040607e3d33429c2ca96ae827da692b WHIRLPOOL f0752e5c4a5b5124af6be5cfdb9d29c7655983283b5bb71ef2976126231dc3115390f212375765a41dca5d9384b0c914457e7a5c93ed40a2ac9cc902563b9060
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
DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371
EBUILD setools-3.3.8-r5.ebuild 4556 SHA256 5c050294face07b984e68334867961fb5ae595517c26ba7b46baa7bc1a98e444 SHA512 4ed547cd0d97b53dc7f798a967780ffde9cda669402dd46f12bb1862092c51c3a6be6415fe8fc03f4d48d19c2f684a0169d92002689a977eda5c3f165597725e WHIRLPOOL b95f4c9973ab5826a43e06cb460b477c6135a2775a86fbd71bfb9d3696ba33d7606afea7d93235b381e2d7b0bf1340ce42fae94fa810cf1ff550d14ae42ffe6d
-MISC ChangeLog 12670 SHA256 3fcb877987d1f946cdf768fd53e6c6dea3b5bcddd02e8888e8618a08ce4223c0 SHA512 3843913e28eea217af6f23445375384b83b266fa36239ccda5c44e9ea7e346b920a40860ebd854214160bf10a2957fd6fd320a81cccead284e76988a22664e06 WHIRLPOOL 13bb43e0a2539dfe0fe7f0cabf0eaa51f7a0f5bc946bc532f653416324ef01306b48ba337069d748ae9f07f5b11c2a1c76ecc733c46326de35cbfb9089d75764
+EBUILD setools-3.3.8-r6.ebuild 4636 SHA256 dd353ab4dea6c3ad3a0ab21260771a3817aefc8228690818e7a63b4c903085cc SHA512 7bd3728bc02d0756c22318c6878801ad846a035bd2140491d38faa9e3a9bc827c1845d6dd2fe5f6d48911b7be80629e76b680a712a2c18603f5e2aa474b3cef1 WHIRLPOOL 2e1eb142fd528a4c48ac99a583918aa7dcef4b7e4d448c3c02b5b26e8a1c82b5411b5901cdf857dad268ceb93b578700db314af22caf07425af47b73e38e721d
+MISC ChangeLog 12887 SHA256 90be7d0cd84f5794f19a432caadf372bb114983483be468aa643391e6726a7ae SHA512 622aa65688dbd6f05fe3831c9bbc99b9c60769bc4f9aef0d5707798db931eeb5214f2067e334f098b1c05116e768b89dca2e22a7936e687f507a25ad04e67f88 WHIRLPOOL 735b802833ca6f414127425d05532edce8dede3db6c4af701238ec2f07d603d0a9aa57d8635e4a3ed898793bf5da7b5543ad5441979980402508cb86611b9982
MISC metadata.xml 228 SHA256 bbcb1daec06953b214112a968d7691679891d41b620789200450e8fabf533951 SHA512 23a02e7ab38822642d81150177d3ce4d24f8aef3e422ba71bc8a9a04e777a2d462f45f4de839fcf39d32207fe60799b890157f90b1aedf5c4369656dc6303851 WHIRLPOOL 7e866656536cb45b9efd876bda1455a6554c5019647ff7d600fe0efb905d4e6102ee1d3041943f411505628e9c0d8d5e14d784589538d93a5d68064c526a2aac
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQIcBAEBCAAGBQJT4KxWAAoJEC7dUkA7aK9Hu9kP/30R7vcY8WjLp66CntSzPX4/
-NiEor/ee9d/O17jDwpi80dz0Qv9t7IKXal09C8GSYLgRZIW+6ta6biOObwEL9FBT
-BjehAvYNaNO3nqauy2boW5yMsPeA9KjyszcKfQj9T30dDK0Mvbc2VnNClatWTQFf
-W0hY/qKDXi6w1NZA7rqZdJZ6NyRHrmCJp7y4ujqhhjKwMJVunzHBGfnq9v3SxpmU
-7sfN5ioQHmJc4HY1IF4ylXb3kzGsE3B1IOVre2HRqWYh9S8HXFoOVXy7Vye7sR+4
-1CqCdBj989flh+R8dMgTZ60TjA7DuOoMyUrnc+Bv1ROdkkTljeNqX51tycYyp0ZR
-TNxT45qTFaZmwabtMkXlB/ZNwPk8yzs5QbAuetu//buXjYSgyzswy37zJl5l6+22
-Ev6dada3AfBwRcvz1MzMTx3QlIlb/fy/2eSvsqxpxYrVCEcrHwnN8jE6Rz3hC6ZI
-1tqfNaEMVwYkoNFGHDBMprd9Ng5EZ7hwfGl2JNHw04Zii1FFV4xE5QRPLfUSFMcJ
-9Dba73tj8L5YUiBA00xVxbNqyKwxZoHsk+PTpiF+xpPKYI/l3J1VUCUcqAp5oOqP
-V3c/eJvoTV7jMWa4PTEtPYjB/iECl74FlasbOOb8IfyAbYELfjFTYZ5ui5TSKWjb
-MgAxRlGM6s7s1e+OdsSb
-=m6ZI
+iQJ8BAEBCABmBQJU3OtGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vn4UP+gOh8/O5acBZJLeQA+Wx61uk
+/KyKZfUMnHEMhdM5kyWKDEVC3goda7aEfkzGXGfzVkf3XELRnEbZPEILy+mx7GOh
+g+U5cgfKyzekiDYUSxFpFZhPdkbVPkazwjvTztMY3jWqMgCcJYMy/fMbhQqUQldt
+ybX2CTU1VVKNNvMWC5H7MPgejhx8EzYPa+CDnpjfjjAza6Uy3eXRfwxLe7094MmM
+KswNYu/4/0fq2ABNV8caR1E/rKPrsQJ+UyulOvpHwd6byRxRKA6InkCU4S9WWzaU
+Ke9Z/zCV4ZcRmhOgfdwqj+z3fzcXmk904AhMihPCJ7h7GKTjsSItd0Pvs2qUYap0
+48m92G27E4ISrl6ypIkVMDmoxp1vOgnskfCyTXz85LtgqakdltC1lFB4vJrlJWfP
+7PIHU9H9TL1PV77j6eNmUgxuu/NaipaBQ5fbv0Zx+RRoGXqv3K5ZvFwpByXMV08b
+Z1+e/F61PJs/2TNjpB5523xzZmQRWJ8Fgh+6kl4KT9Xsw+Zu6bTGAwUB5q1mKcIF
+y9XaRBDqbi7gnLX7BobpFTI+JT/mwiy7kBmXny2R/8zY1gW2EIhNf7pqOg3e3iY3
+MGNY3kKd4MuQTKMdJmVFcqbz9yk2l6Utg7lg7zU98qIcvhwxzVEYLCH7sVltLUmq
+LpJamoRarTYN82Nl4vt1
+=e5dE
-----END PGP SIGNATURE-----
--- /dev/null
+From f1e5b208d507171968ca4d2eeefd7980f1004a3c Mon Sep 17 00:00:00 2001
+From: Chris PeBenito <cpebenito@tresys.com>
+Date: Thu, 12 Feb 2015 08:55:12 -0500
+Subject: [PATCH] Update for 2015-02-02 Userspace release (2.4)
+
+SETools now requires libsepol 2.4 and libselinux 2.4.
+---
+ configure.ac | 6 +++---
+ libqpol/src/policy_define.c | 4 ++--
+ libqpol/src/policy_extend.c | 4 ++--
+ libqpol/src/syn_rule_query.c | 6 +++---
+ secmds/replcon.cc | 2 +-
+ 5 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 80395e6..ae20da7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,9 +25,9 @@ libseaudit_version=4.5
+ setoolsdir='${prefix}/share/setools-3.3'
+ javadir='${prefix}/share/java'
+
+-version_min_sepol_major=1
+-version_min_sepol_minor=12
+-version_min_sepol_patch=27
++version_min_sepol_major=2
++version_min_sepol_minor=4
++version_min_sepol_patch=0
+
+ dnl *** end of tunable values ***
+
+diff --git a/libqpol/src/policy_define.c b/libqpol/src/policy_define.c
+index 229779c..15f70ba 100644
+--- a/libqpol/src/policy_define.c
++++ b/libqpol/src/policy_define.c
+@@ -1661,7 +1661,7 @@ int define_compute_type_helper(int which, avrule_t ** rule)
+ goto bad;
+ }
+ class_perm_node_init(perm);
+- perm->class = i + 1;
++ perm->tclass = i + 1;
+ perm->data = datum->s.value;
+ perm->next = avrule->perms;
+ avrule->perms = perm;
+@@ -1901,7 +1901,7 @@ int define_te_avtab_helper(int which, avrule_t ** rule)
+ goto out;
+ }
+ class_perm_node_init(cur_perms);
+- cur_perms->class = i + 1;
++ cur_perms->tclass = i + 1;
+ if (!perms)
+ perms = cur_perms;
+ if (tail)
+diff --git a/libqpol/src/policy_extend.c b/libqpol/src/policy_extend.c
+index 5325a87..1417271 100644
+--- a/libqpol/src/policy_extend.c
++++ b/libqpol/src/policy_extend.c
+@@ -843,7 +843,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_
+ for (class_node = rule->perms; class_node; class_node = class_node->next) {
+ key.rule_type = rule->specified;
+ key.source_val = key.target_val = i + 1;
+- key.class_val = class_node->class;
++ key.class_val = class_node->tclass;
+ key.cond = cond;
+ if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule))
+ goto err;
+@@ -856,7 +856,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_
+ key.rule_type = rule->specified;
+ key.source_val = i + 1;
+ key.target_val = j + 1;
+- key.class_val = class_node->class;
++ key.class_val = class_node->tclass;
+ key.cond = cond;
+ if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule))
+ goto err;
+diff --git a/libqpol/src/syn_rule_query.c b/libqpol/src/syn_rule_query.c
+index 3e63204..d7578f1 100644
+--- a/libqpol/src/syn_rule_query.c
++++ b/libqpol/src/syn_rule_query.c
+@@ -67,7 +67,7 @@ static void *syn_rule_class_state_get_cur(const qpol_iterator_t * iter)
+ return NULL;
+ }
+
+- return db->class_val_to_struct[srcs->cur->class - 1];
++ return db->class_val_to_struct[srcs->cur->tclass - 1];
+ }
+
+ static int syn_rule_class_state_next(qpol_iterator_t * iter)
+@@ -465,10 +465,10 @@ int qpol_syn_avrule_get_perm_iter(const qpol_policy_t * policy, const qpol_syn_a
+ }
+
+ for (node = internal_rule->perms; node; node = node->next) {
+- for (i = 0; i < db->class_val_to_struct[node->class - 1]->permissions.nprim; i++) {
++ for (i = 0; i < db->class_val_to_struct[node->tclass - 1]->permissions.nprim; i++) {
+ if (!(node->data & (1 << i)))
+ continue;
+- tmp = sepol_av_to_string(db, node->class, (sepol_access_vector_t) (1 << i));
++ tmp = sepol_av_to_string(db, node->tclass, (sepol_access_vector_t) (1 << i));
+ if (tmp) {
+ tmp++; /* remove prepended space */
+ for (cur = 0; cur < perm_list_sz; cur++)
+diff --git a/secmds/replcon.cc b/secmds/replcon.cc
+index 34f7c1a..307c39f 100644
+--- a/secmds/replcon.cc
++++ b/secmds/replcon.cc
+@@ -60,7 +60,7 @@ static struct option const longopts[] = {
+ {NULL, 0, NULL, 0}
+ };
+
+-extern int lsetfilecon_raw(const char *, security_context_t) __attribute__ ((weak));
++extern int lsetfilecon_raw(const char *, const char *) __attribute__ ((weak));
+
+ /**
+ * As that setools must work with older libselinux versions that may
--- /dev/null
+# Copyright 1999-2015 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-r6.ebuild,v 1.1 2015/02/12 18:04:48 perfinion Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools java-pkg-opt-2 python-r1 eutils
+
+DESCRIPTION="SELinux policy tools"
+HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
+SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.bz2
+ http://dev.gentoo.org/~swift/patches/setools/${P}-01-fedora-patches.tar.gz
+ http://dev.gentoo.org/~swift/patches/setools/${P}-03-gentoo-patches.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X debug java python"
+
+DEPEND=">=sys-devel/automake-1.12.1
+ >=sys-libs/libsepol-2.4
+ >=sys-libs/libselinux-2.4
+ sys-devel/bison
+ sys-devel/flex
+ >=dev-db/sqlite-3.2:3
+ dev-libs/libxml2:2
+ virtual/pkgconfig
+ java? (
+ dev-lang/swig:1
+ >=virtual/jdk-1.4
+ )
+ python? (
+ ${PYTHON_DEPS}
+ dev-lang/swig:1
+ )
+ X? (
+ >=dev-lang/tk-8.4.9
+ >=gnome-base/libglade-2.0
+ >=x11-libs/gtk+-2.8:2
+ )"
+
+RDEPEND=">=sys-libs/libsepol-2.1.4
+ >=sys-libs/libselinux-2.3
+ >=dev-db/sqlite-3.2:3
+ dev-libs/libxml2:2
+ java? ( >=virtual/jre-1.4 )
+ X? (
+ >=dev-lang/tk-8.4.9
+ >=dev-tcltk/bwidget-1.8
+ >=gnome-base/libglade-2.0
+ >=x11-libs/gtk+-2.8:2
+ )"
+
+RESTRICT="test"
+# setools dirs that contain python code to build
+PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python"
+
+pkg_setup() {
+ local myld=$(tc-getLD)
+
+ if use java; then
+ java-pkg-opt-2_pkg_setup
+ fi
+
+ ${myld} -v | grep -q "GNU gold" && \
+ ewarn "Bug #467136 shows us that the gold linker doesn't work with setools for now."
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/setools3-userspace-2.4-compatibility.patch"
+
+ EPATCH_MULTI_MSG="Applying various (Fedora-provided) setools fixes... " \
+ EPATCH_SUFFIX="patch" \
+ EPATCH_SOURCE="${WORKDIR}" \
+ EPATCH_FORCE="yes" \
+ epatch
+
+ EPATCH_MULTI_MSG="Applying various (Gentoo) setool fixes... " \
+ EPATCH_SUFFIX="patch" \
+ EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+ EPATCH_EXCLUDE="0010-fix-lsetfilecon_raw-call-bug-509532.patch 0005-update-on-py_functions-for-python3.patch" \
+ EPATCH_FORCE="yes" \
+ epatch
+
+ # Disable broken check for SWIG version.
+ sed -e "s/AC_PROG_SWIG(2.0.0)/AC_PROG_SWIG/" -i configure.ac || die "sed failed"
+ # Use swig1.3
+ sed -e 's/AC_PATH_PROG(\[SWIG\],\[swig\])/AC_PATH_PROG([SWIG],[swig1.3])/' -i m4/ac_pkg_swig.m4 || die "failed to set swig1.3"
+ # 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
+
+ local dir
+ for dir in ${PYTHON_DIRS}; do
+ # Python bindings are built/installed manually.
+ sed -e "s/MAYBE_PYSWIG = python/MAYBE_PYSWIG =/" -i ${dir%python}Makefile.am || die "sed failed"
+ # Make PYTHON_LDFLAGS replaceable during running `make`.
+ sed -e "/^AM_LDFLAGS =/s/@PYTHON_LDFLAGS@/\$(PYTHON_LDFLAGS)/" -i ${dir}/Makefile.am || die "sed failed"
+ done
+
+ # bug #424581, Need to use MKDIR_P for automake 1.12+.
+ find . -name 'Makefile.*' -exec sed -i -e 's:mkdir_p:MKDIR_P:g' {} + || die;
+
+ eautoreconf
+
+ # Disable byte-compilation of Python modules.
+ echo '#!/bin/sh' > py-compile
+
+ epatch_user
+}
+
+src_configure() {
+ econf \
+ --with-java-prefix=${JAVA_HOME} \
+ --disable-selinux-check \
+ --disable-bwidget-check \
+ $(use_enable python swig-python) \
+ $(use_enable java swig-java) \
+ $(use_enable X swig-tcl) \
+ $(use_enable X gui) \
+ $(use_enable debug)
+
+ # work around swig c99 issues. it does not require
+ # c99 anyway.
+ sed -i -e 's/-std=gnu99//' "${S}/libseaudit/swig/python/Makefile"
+}
+
+src_compile() {
+ emake LD="$(tc-getLD).bfd" || die "Failed to build setools"
+
+ if use python; then
+ building() {
+ python_export PYTHON_INCLUDEDIR
+ python_export PYTHON_SITEDIR
+ python_export PYTHON_LIBS
+ emake LD="$(tc-getLD).bfd" \
+ SWIG_PYTHON_CPPFLAGS="-I${PYTHON_INCLUDEDIR}" \
+ PYTHON_LDFLAGS="${PYTHON_LIBS}" \
+ pyexecdir="${PYTHON_SITEDIR}" \
+ pythondir="${PYTHON_SITEDIR}" \
+ -C ${1};
+ }
+ local dir
+ for dir in ${PYTHON_DIRS}; do
+ python_foreach_impl building ${dir};
+ done
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ if use python; then
+ installation() {
+ python_export PYTHON_SITEDIR
+ emake DESTDIR="${D}" \
+ pyexecdir="${PYTHON_SITEDIR}" \
+ pythondir="${PYTHON_SITEDIR}" \
+ -C ${1} install
+ }
+
+ local dir
+ for dir in ${PYTHON_DIRS}; do
+ python_foreach_impl installation ${dir};
+ done
+ fi
+}
projects / gentoo.git / commitdiff