|
|
- From 6cfc6eeec22d3c9ffae413819654359b76680150 Mon Sep 17 00:00:00 2001
- From: John Johansen <john@jjmx.net>
- Date: Fri, 13 Aug 2021 20:13:59 +0000
- Subject: [PATCH] Merge Update abstractions/python and profiles for python 3.10
-
- Add support for python 3.10 in abstractions and profiles.
-
- Fixes: https://gitlab.com/apparmor/apparmor/-/issues/187
- MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/783
- Acked-by: John Johansen <john.johansen@canonical.com>
- (cherry picked from commit 31fda3eee7b1e5f936b31d3578ed596789d5fcce)
- Signed-off-by: John Johansen <john.johansen@canonical.com>
- ---
- profiles/apparmor.d/abstractions/python | 18 +++++++++---------
- profiles/apparmor.d/lsb_release | 2 +-
- .../profiles/extras/usr.bin.chromium-browser | 4 ++--
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
- --- a/profiles/apparmor.d/abstractions/python
- +++ b/profiles/apparmor.d/abstractions/python
- @@ -12,18 +12,18 @@
-
- abi <abi/3.0>,
-
- - /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/**.{pyc,so} mr,
- - /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/**.{egg,py,pth} r,
- - /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/{site,dist}-packages/ r,
- + /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/**.{pyc,so} mr,
- + /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/**.{egg,py,pth} r,
- + /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/{site,dist}-packages/ r,
- /usr/lib{,32,64}/python3.[0-9]/lib-dynload/*.so mr,
-
- - /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/**.{pyc,so} mr,
- - /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/**.{egg,py,pth} r,
- - /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/{site,dist}-packages/ r,
- - /usr/local/lib{,32,64}/python3.[0-9]/lib-dynload/*.so mr,
- + /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/**.{pyc,so} mr,
- + /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/**.{egg,py,pth} r,
- + /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/{site,dist}-packages/ r,
- + /usr/local/lib{,32,64}/python3.{1,}[0-9]/lib-dynload/*.so mr,
-
- # Site-wide configuration
- - /etc/python{2.[4-7],3.[0-9]}/** r,
- + /etc/python{2.[4-7],3.[0-9],3.1[0-9]}/** r,
-
- # shared python paths
- /usr/share/{pyshared,pycentral,python-support}/** r,
- @@ -36,7 +36,7 @@
- /usr/lib/wx/python/*.pth r,
-
- # python build configuration and headers
- - /usr/include/python{2.[4-7],3.[0-9]}*/pyconfig.h r,
- + /usr/include/python{2.[4-7],3.[0-9],3.1[0-9]}*/pyconfig.h r,
-
- # Include additions to the abstraction
- include if exists <abstractions/python.d>
- --- a/profiles/apparmor.d/lsb_release
- +++ b/profiles/apparmor.d/lsb_release
- @@ -18,7 +18,7 @@ profile lsb_release {
- /dev/tty rw,
-
- /usr/bin/lsb_release r,
- - /usr/bin/python3.[0-9] mr,
- + /usr/bin/python3.{1,}[0-9] mr,
-
- /etc/debian_version r,
- /etc/default/apport r,
- --- a/profiles/apparmor/profiles/extras/usr.bin.chromium-browser
- +++ b/profiles/apparmor/profiles/extras/usr.bin.chromium-browser
- @@ -267,9 +267,9 @@ profile chromium_browser /usr/lib/@{chro
- /usr/share/distro-info/** r,
- /var/lib/dpkg/** r,
-
- - /usr/local/lib/python3.[0-9]/dist-packages/ r,
- + /usr/local/lib/python3.{1,}[0-9]/dist-packages/ r,
- /usr/bin/ r,
- - /usr/bin/python3.[0-9] mr,
- + /usr/bin/python3.{1,}[0-9] mr,
- }
-
- profile sandbox {
|
