On 12/4/2023 1:37 PM, Petr Lautrbach wrote:
Christian Göttsche <cgzones@xxxxxxxxxxxxxx> writes:
On Mon, 4 Dec 2023 at 19:20, James Carter <jwcart2@xxxxxxxxx> wrote:
On Mon, Dec 4, 2023 at 11:46 AM Petr Lautrbach <lautrbach@xxxxxxxxxx> wrote:
This reverts commit 893b50c6ce661f3ee339145e76a0bbfa199671c3.
61f21385004 ("libsepol: rename struct member") broke build of SETools:
setools/policyrep.c: In function ‘__pyx_pf_7setools_9policyrep_23ConditionalExprIterator___next__’:
setools/policyrep.c:27857:138: error: ‘cond_expr_t’ {aka ‘struct cond_expr’} has no member named ‘bool’; did you mean ‘boolean’?
27857 | __pyx_t_3 = __pyx_f_7setools_9policyrep_13SELinuxPolicy_boolean_value_to_datum(__pyx_v_self->__pyx_base.policy, (__pyx_v_self->curr->bool - 1)); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 336, __pyx_L1_error)
| ^~~~
|
Signed-off-by: Petr Lautrbach <lautrbach@xxxxxxxxxx>
Also need to revert 513fc1570c16924080740b23fa34343ef64a90c0
Plus there is a couple of new uses in policy_validate.c and one in
checkpolicy/policy_define.c that need to be corrected.
Thanks,
Jim
Could you consider https://github.com/SELinuxProject/setools/pull/113
as an alternative?
Nice, thanks!
I need to test it, but it looks good.
For me, this is better solution than reverting all the patches.
But we need to release SETools together with SELinux userspace 3.6.
Chris, is it feasible to release SETools with the proposed change on
this Wednesday or a week later?
Yes, that can be done.
--
Chris PeBenito
