apparmor:apparmor-3.0

Last commit made on 2022-08-09
Get this branch:
git clone -b apparmor-3.0 https://git.launchpad.net/apparmor

Branch merges

Branch information

Name:
apparmor-3.0
Repository:
lp:apparmor

Recent commits

0ead606... by John Johansen

Prepoare for AppArmor 3.0.7 release

- update version file

Signed-off-by: John Johansen <email address hidden>

20c28f2... by Georgia Garcia

Merge Fix setuptools version detection in buildpath.py

libraries/libapparmor/swig/python/test/buildpath.py:
The changes introduced in
https://gitlab.com/apparmor/apparmor/-/commit/cc7f549665282c0a527d5424a6f9d726c50ddbb1
targetted a wrong setuptools version (61.2).
The change in build directory naming has been introduced with 62.0.

Fixes #259
Fixes #39

Closes #39 and #259
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/904
Approved-by: Georgia Garcia <email address hidden>
Merged-by: Georgia Garcia <email address hidden>

(cherry picked from commit a555ccd9f414ef5f274b45826645d94e450b368c)

fda39098 Fix setuptools version detection in buildpath.py
1ff0c2c7 Use basepath.py in profiles Makefile

702c282... by John Johansen

Prepare for AppArmor 3.0.6 release

  - update version file

Signed-off-by: John Johansen <email address hidden>

822db76... by John Johansen <email address hidden>

Merge abstraction/exo-open: Remove dbus deny rule

Abstractions should not generally include deny rules as this can unduly
constrain profiles which include them due to the precedent matching rules
between deny vs allow rules. Also as per the comment, this is not required
for exo-open to work, so simply omit it from the abstraction for
now. Finally, in Ubuntu, the evince profile includes the exo-open
abstraction and this deny rule causes evince to fail to initialise
correctly as it then assumes it cannot use gvfs.

Signed-off-by: Alex Murray <email address hidden>

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/884
Approved-by: John Johansen <email address hidden>
Merged-by: John Johansen <email address hidden>
(cherry picked from commit d7e3f33aa861ad59dcf95aee58fa8414126a8baa)
Signed-off-by: John Johansen <email address hidden>

e341495... by Georgia Garcia

parser: fix LTO build

The previous fix for LTO builds in b6d3daa7 did not take into
consideration that LTO support could be added through CFLAGS,in which
case the fix would not be applied.

This patch applied the fix -flto-partition=none even if CFLAGS is
already defined.

Signed-off-by: Georgia Garcia <email address hidden>
Closes #214
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/901
Acked-by: John Johansen <email address hidden>
Merged-by: Georgia Garcia <email address hidden>
(cherry picked from commit 0afc2cbb84775cb6f5d64bca85c225baf0d1c2f9)

8668d4a... by Christian Boltz

Merge dirtest.sh: don't rely on apparmor_parser -N's output sort order to be deterministic

I've seen this test fail because "apparmor_parser -N" returned the expected
lines, but in a different order than what's expected (dirtest.out).

To fix this, sort both the expected and actual output.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/900
Approved-by: Jon Tourville <email address hidden>
Approved-by: Christian Boltz <email address hidden>
Merged-by: Christian Boltz <email address hidden>

(cherry picked from commit 1f3a817c11d429684756266ee67accdbcfb73d08)

c0815d0e dirtest.sh: don't rely on apparmor_parser -N's output sort order to be deterministic

704c82c... by John Johansen

Prepare for AppArmor 3.0.5 release

  - update version file
  - bump library version

Signed-off-by: John Johansen <email address hidden>

bcda237... by Christian Boltz

Merge [3.0] Support setuptools >= 61.2 in Python tests

Fix for #253, by mirroring the change from https://github.com/pypa/setuptools/pull/3258/commits/1c23f5e1e4b18b50081cbabb2dea22bf345f5894

This is the 3.0 version of https://gitlab.com/apparmor/apparmor/-/merge_requests/897, with the difference that the 3.0 branch already has `python3-setuptools` in `.gitlab-ci.yml` and therefore doesn't need the commit that updates `.gitlab-ci.yml`.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/899
Approved-by: Georgia Garcia <email address hidden>
Merged-by: Christian Boltz <email address hidden>

8485770... by Ben Greiner <email address hidden>

reviewed edits

(cherry picked from commit d442584a0a724266b0cc2f3cc5c1b346debf1cdf)

cc7f549... by Ben Greiner <email address hidden>

use new build_platlib path with setuptools >= 61.2

(cherry picked from commit 47d68dac0f3f74cde37e02e9b4634992219714ed)