apparmor:apparmor-2.11

Last commit made on 2020-02-03
Get this branch:
git clone -b apparmor-2.11 https://git.launchpad.net/apparmor

Branch merges

Branch information

Name:
apparmor-2.11
Repository:
lp:apparmor

Recent commits

b995a03... by Christian Boltz <email address hidden> on 2020-02-03

Merge branch 'run-uuidd-request' into 'master'

abstractions/base: allow read access to /run/uuidd/request

See merge request apparmor/apparmor!445

Acked-by: John Johansen <email address hidden> for 2.11..master
Acked-by: Christian Boltz <email address hidden> for 2.11..master

(cherry picked from commit 80bf9209296417a1a65fe03130530e1303a4d6c7)

45fffc12 abstractions/base: allow read access to /run/uuidd/request

d7d3f40... by Christian Boltz <email address hidden> on 2020-02-03

Merge branch 'gnome-abstraction-more-mimeapps' into 'master'

abstractions/gnome: also allow /etc/xdg/mimeapps.list

See merge request apparmor/apparmor!444

Acked-by: John Johansen <email address hidden> for 2.11..master
Acked-by: Christian Boltz <email address hidden> for 2.11..master

(cherry picked from commit 3becbbab2c47b2c4d57ecce2674af690b1888ba9)

67cf4fa3 abstractions/gnome: also allow /etc/xdg/mimeapps.list

cb72e56... by Christian Boltz <email address hidden> on 2020-02-03

Merge branch 'ecryptfs-top-dir' into 'master'

abstractions/base: allow read access to top-level ecryptfs directories

See merge request apparmor/apparmor!443

Acked-by: John Johansen <email address hidden> for 2.11..master
Acked-by: Christian Boltz <email address hidden> for 2.11..master

(cherry picked from commit 24895ea302d06684b4fda1c538e04fb9e6d0f287)

fbd8981e abstractions/base: allow read access to top-level ecryptfs directories

0d261bf... by Ian Johnson on 2020-01-30

docs: fix typo in man doc of unix rules

Signed-off-by: John Johansen <email address hidden>
Acked-by: Steve Beattie <email address hidden>
(cherry picked from commit f4220a19bec57a2d3d7d92984e9030197605c0dd)

a19a962... by Christian Boltz <email address hidden> on 2020-01-10

Merge branch 'cboltz-backport-tunables-share' into 'apparmor-2.12'

[2.11+2.12] Backport tunables/share to 2.11 and 2.12 branch

See merge request apparmor/apparmor!446

Acked-by: John Johansen <email address hidden>

(cherry picked from commit 6784de4ba1dcc1a818ba2a289f4978faf7a7ddc2)

99e2d38c Backport tunables/share to 2.11 and 2.12 branch

84daf8a... by John Johansen <email address hidden> on 2019-12-11

 gnome abstraction: allow reading per-user themes from $XDG_DATA_HOME

Bug-Debian: https://bugs.debian.org/930031

As per https://developer.gnome.org/gtk3/stable/ch32s03.html, since GTK+ 3.6, $XDG_DATA_HOME/themes is preferred over $HOME/.themes. We already support the latter, let's also support the former.

PR: https://gitlab.com/apparmor/apparmor/merge_requests/442
Acked-by: John Johansen <email address hidden>

(cherry picked from commit 098f0a7b5fa0acec7f8f148705d6fe520ccf059b)

852c1e76 gnome abstraction: allow reading per-user themes from $XDG_DATA_HOME

b62627d... by John Johansen <email address hidden> on 2019-11-28

 Enable CI for the 2.11 branch

This adds a copy of the current .gitlab-ci.yml from master to the 2.11 branch to enable CI checks.

PR: https://gitlab.com/apparmor/apparmor/merge_requests/438
Acked-by: John Johansen <email address hidden>

b2945bf... by Christian Boltz on 2019-11-27

Enable CI for the 2.11 branch

This adds a copy of the current .gitlab-ci.yml from master to the 2.11
branch to enable CI checks.

514a338... by John Johansen <email address hidden> on 2019-11-27

 [2.11] fix utils test failures

Fix two test failures in the 2.11 branch:

    utils: fixup test-aa.py tests that fail due to usr-merge
    drop owner restriction from backported libapparmor test_multi profile (not supported in 2.11)

See the individual commit for details.

PR: https://gitlab.com/apparmor/apparmor/merge_requests/437
Acked-by: John Johansen <email address hidden>

dd74758... by Steve Beattie on 2019-02-01

utils: fixup test-aa.py tests that fail due to usr-merge

Signed-off-by: Steve Beattie <email address hidden>
(cherry picked from commit 45c26214ccc21c55bdc27d0d7ab34927650721a3)