diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2018-08-30 14:34:40 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2018-08-30 14:34:47 +1200 |
| commit | b87f114ebeb760b7a86dc64b5b40959cf502851d (patch) | |
| tree | 2238848fb40dc40e164fe26bb8a6438f6b813468 | |
| parent | 712a0254baf2bedf0370affbb3b54bc68c2aafc2 (diff) | |
| download | lightdm-git-b87f114ebeb760b7a86dc64b5b40959cf502851d.tar.gz | |
Merge in released changes
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/0001-Add-support-for-usr-merge-in-the-apparmor-profile.-L.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 34 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 45eb24a2..72eebc26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lightdm (1.26.0-0ubuntu2) cosmic; urgency=medium + + * Cherrypick upstream PR to add support for usr-merge in apparmor + profile. LP: #1784023 + + -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 21 Aug 2018 00:05:28 +0100 + lightdm (1.26.0-0ubuntu1) bionic; urgency=medium * debian/control: diff --git a/debian/patches/0001-Add-support-for-usr-merge-in-the-apparmor-profile.-L.patch b/debian/patches/0001-Add-support-for-usr-merge-in-the-apparmor-profile.-L.patch new file mode 100644 index 00000000..a06bc3b5 --- /dev/null +++ b/debian/patches/0001-Add-support-for-usr-merge-in-the-apparmor-profile.-L.patch @@ -0,0 +1,26 @@ +From b44fd6e0ba228b093eb694e1243592df32a988a5 Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov <xnox@ubuntu.com> +Date: Mon, 20 Aug 2018 23:58:23 +0100 +Subject: [PATCH] Add support for usr-merge in the apparmor profile. (LP: + #1784023) + +--- + data/apparmor/abstractions/lightdm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/apparmor/abstractions/lightdm b/data/apparmor/abstractions/lightdm +index 4be3d4a3..f4b67811 100644 +--- a/data/apparmor/abstractions/lightdm ++++ b/data/apparmor/abstractions/lightdm +@@ -23,7 +23,7 @@ + + / r, + /bin/ rmix, +- /bin/fusermount Px, ++ /{,usr/}bin/fusermount Px, + /bin/** rmix, + /cdrom/ rmix, + /cdrom/** rmix, +-- +2.17.1 + diff --git a/debian/patches/series b/debian/patches/series index d3ba2550..874d9eb6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 04_language_handling.patch 05_translate_debian_files.patch autologin-session-workaround.patch +0001-Add-support-for-usr-merge-in-the-apparmor-profile.-L.patch |