Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport fixes for 4.4.4. #115

Merged
merged 10 commits into from
Dec 7, 2023
Merged

Backport fixes for 4.4.4. #115

merged 10 commits into from
Dec 7, 2023

Conversation

pebenito
Copy link
Member

@pebenito pebenito commented Dec 6, 2023

No description provided.

bachradsusi and others added 8 commits December 6, 2023 13:01
https://doc.qt.io/qtforpython-6/considerations.html#the-new-python-enums

In PyQt5, it's possible to use members of enums in the same scope as
enums, e.g. Qt.red. This is not possible in PyQt6, but both PyQt5 and
PyQt6 support the new python enums - Qt.GlobalColor.red

This change prepares the code for the future transition to PyQt6.

Signed-off-by: Petr Lautrbach <lautrbach@redhat.com>
Avoid potential truncations and compiler warnings:

    setools/policyrep.c: In function ‘__pyx_f_7setools_9policyrep_13SELinuxPolicy__rebuild_attrs_from_map’:
    setools/policyrep.c:88248:33: warning: comparison of integer expressions of different signedness: ‘int’ and ‘uint32_t’ {aka ‘unsigned int’} [-Wsign-compare]
    88248 |       __pyx_t_7 = ((__pyx_v_bit < ebitmap_length((&(__pyx_v_self->handle->p.attr_type_map[__pyx_v_i])))) != 0);
          |                                 ^
    setools/policyrep.c:88356:33: warning: comparison of integer expressions of different signedness: ‘int’ and ‘uint32_t’ {aka ‘unsigned int’} [-Wsign-compare]
    88356 |       __pyx_t_7 = ((__pyx_v_bit < ebitmap_length((&__pyx_v_tmp_type->types))) != 0);
          |                                 ^

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
In libsepol 3.6 the member name holding the value of the struct
`cond_expr_t` has been changed from `bool` to `boolean`.

Check on the availability macro to support building against older and
newer libsepol versions.

Fixes: SELinuxProject#110

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
3.6-3.8 no longer supported.

Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
@pebenito
Copy link
Member Author

pebenito commented Dec 6, 2023

cc @bachradsusi

Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
@pebenito pebenito merged commit a04b015 into SELinuxProject:4.4 Dec 7, 2023
9 checks passed
@pebenito pebenito deleted the 4.4 branch December 7, 2023 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants