apparmor:master

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

Branch merges

Branch information

Name:
master
Repository:
lp:apparmor

Recent commits

1af84c4... by Steve Beattie on 2020-02-24

Translations: merge updates from launchpad

Omnibus collection of translations updates through 2020/02/22

Signed-off-by: Steve Beattie <email address hidden>

ba232c0... by Launchpad Translations on behalf of apparmor-dev <Unknown> on 2020-02-22

Launchpad automatic translations update.

33b48e7... by Launchpad Translations on behalf of apparmor-dev <Unknown> on 2020-02-21

Launchpad automatic translations update.

300e348... by Launchpad Translations on behalf of apparmor-dev <Unknown> on 2020-02-19

Launchpad automatic translations update.

Signed-off-by: Steve Beattie <email address hidden>

9bccf45... by John Johansen <email address hidden> on 2020-02-20

Merge usr.sbin.dnsmasq: add configuration files created by openresolv

See https://roy.marples.name/projects/openresolv/configuration.html#dnsmasq .

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

d9275d6... by Christian Boltz <email address hidden> on 2020-02-20

Merge branch 'run-fix' into 'master'

Add trailing slash to the run variable definition

See merge request apparmor/apparmor!456

Acked-by: Christian Boltz <email address hidden>

8b92f50... by nl6720 <email address hidden> on 2020-02-20

usr.sbin.dnsmasq: add configuration files created by openresolv

See https://roy.marples.name/projects/openresolv/configuration.html#dnsmasq .

Signed-off-by: nl6720 <email address hidden>

ef591a6... by nl6720 <email address hidden> on 2020-02-20

Add trailing slash to the run variable definition

Signed-off-by: nl6720 <email address hidden>

2cb9324... by John Johansen <email address hidden> on 2020-02-20

Merge usr.sbin.smbd: add usershare directory

See https://wiki.archlinux.org/index.php/Samba#Enable_Usershares .

AFAIK the `/var/lib/samba/usershares` directory is also used by Ubuntu.

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

6b6146d... by John Johansen <email address hidden> on 2020-02-20

Merge Add "run" variable

Split off from !212 . Add and use `@{run}`.

Also update a couple of profiles that don't use `@{PROC}`

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