mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-05 08:45:22 +00:00
609fe42e75
Fix for #253, by mirroring the change from1c23f5e1e4On top of that, fix setuptools version detection in buildpath.py. libraries/libapparmor/swig/python/test/buildpath.py: The changes introduced incc7f549665targetted a wrong setuptools version (61.2). The change in build directory naming has been introduced with 62.0. Fixes #259 Fixes #39 The first 3 commits are based on https://gitlab.com/apparmor/apparmor/-/merge_requests/897, the other two come from https://gitlab.com/apparmor/apparmor/-/merge_requests/904. Since there are several differences between 2.13 and >= 3.0, I had to adjust the patches at several places. I propose this MR for 2.11, 2.12 and 2.13. MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/910 Approved-by: John Johansen <john@jjmx.net> Merged-by: John Johansen <john@jjmx.net> (cherry picked from commit3c047517a4) Signed-off-by: John Johansen <john.johansen@canonical.com>