Merge lp:~intrigeri/apparmor-profiles/gdm-pulseaudio-v2 into lp:apparmor-profiles

Proposed by intrigeri
Status: Merged
Merged at revision: 131
Proposed branch: lp:~intrigeri/apparmor-profiles/gdm-pulseaudio-v2
Merge into: lp:apparmor-profiles
Diff against target: 37 lines (+11/-2)
1 file modified
ubuntu/14.10/usr.bin.pulseaudio (+11/-2)
To merge this branch: bzr merge lp:~intrigeri/apparmor-profiles/gdm-pulseaudio-v2
Reviewer Review Type Date Requested Status
AppArmor Developers Pending
Review via email: mp+228399@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Seth Arnold (seth-arnold) wrote :

On Sat, Jul 26, 2014 at 03:15:33PM -0000, intrigeri wrote:
> intrigeri has proposed merging lp:~intrigeri/apparmor-profiles/gdm-pulseaudio-v2 into lp:apparmor-profiles.

Looks good to me, thanks.

Acked-by: Seth Arnold <email address hidden>

> === modified file 'ubuntu/14.10/usr.bin.pulseaudio'
> --- ubuntu/14.10/usr.bin.pulseaudio 2014-07-17 15:33:08 +0000
> +++ ubuntu/14.10/usr.bin.pulseaudio 2014-07-26 15:14:38 +0000
> @@ -21,8 +21,9 @@
>
> @{HOME}/.esd_auth rwk,
> @{HOME}/.pulse-cookie rwk,
> - @{HOME}/.pulse/ rw,
> - @{HOME}/.pulse/* rw,
> + @{HOME}/.config/pulse/cookie rwk,
> + @{HOME}/{.config/pulse,.pulse}/ rw,
> + @{HOME}/{.config/pulse,.pulse}/* rw,
>
> /run/pulse/ rw,
> /run/pulse/.pulse-cookie rwk,
> @@ -31,6 +32,10 @@
> /run/pulse/pid rwk,
> /run/udev/data/+sound:card* r,
>
> + # logind
> + /run/systemd/users/* r,
> + /run/user/*/dconf/user k,
> +
> /sys/bus/ r,
> /sys/class/ r,
> /sys/class/sound/ r,
> @@ -50,6 +55,10 @@
> /usr/lib/pulse-[2-9].[0-9]/modules/*.so mr,
> /usr/lib/pulseaudio/pulse/gconf-helper Cx,
>
> + owner /var/lib/gdm3/.config/pulse/ rw,
> + owner /var/lib/gdm3/.config/pulse/* rw,
> + owner /var/lib/gdm3/.config/pulse/cookie rwk,
> +
> owner /var/lib/lightdm/.Xauthority r,
> owner /var/lib/lightdm/.esd_auth rwk,
> owner /var/lib/lightdm/.pulse-cookie rwk,
>

> --
> AppArmor mailing list
> <email address hidden>
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor

Revision history for this message
intrigeri (intrigeri) wrote :

> Looks good to me, thanks.

Thanks for the review.

> Acked-by: Seth Arnold <email address hidden>

Sorry, newbie question, I'm not fully familiar with the review'n'merge process yet: what's the next thing to do to get this branch merged, and who is supposed to do it?

Revision history for this message
Seth Arnold (seth-arnold) wrote :

> > Looks good to me, thanks.
>
> Thanks for the review.
>
> > Acked-by: Seth Arnold <email address hidden>
>
> Sorry, newbie question, I'm not fully familiar with the review'n'merge process
> yet: what's the next thing to do to get this branch merged, and who is
> supposed to do it?

Thanks for pointing this out; I assumed that you had checkin privs and would check it in yourself. :) We can fix that later I guess...

Thanks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu/14.10/usr.bin.pulseaudio'
2--- ubuntu/14.10/usr.bin.pulseaudio 2014-07-17 15:33:08 +0000
3+++ ubuntu/14.10/usr.bin.pulseaudio 2014-07-26 15:14:38 +0000
4@@ -21,8 +21,9 @@
5
6 @{HOME}/.esd_auth rwk,
7 @{HOME}/.pulse-cookie rwk,
8- @{HOME}/.pulse/ rw,
9- @{HOME}/.pulse/* rw,
10+ @{HOME}/.config/pulse/cookie rwk,
11+ @{HOME}/{.config/pulse,.pulse}/ rw,
12+ @{HOME}/{.config/pulse,.pulse}/* rw,
13
14 /run/pulse/ rw,
15 /run/pulse/.pulse-cookie rwk,
16@@ -31,6 +32,10 @@
17 /run/pulse/pid rwk,
18 /run/udev/data/+sound:card* r,
19
20+ # logind
21+ /run/systemd/users/* r,
22+ /run/user/*/dconf/user k,
23+
24 /sys/bus/ r,
25 /sys/class/ r,
26 /sys/class/sound/ r,
27@@ -50,6 +55,10 @@
28 /usr/lib/pulse-[2-9].[0-9]/modules/*.so mr,
29 /usr/lib/pulseaudio/pulse/gconf-helper Cx,
30
31+ owner /var/lib/gdm3/.config/pulse/ rw,
32+ owner /var/lib/gdm3/.config/pulse/* rw,
33+ owner /var/lib/gdm3/.config/pulse/cookie rwk,
34+
35 owner /var/lib/lightdm/.Xauthority r,
36 owner /var/lib/lightdm/.esd_auth rwk,
37 owner /var/lib/lightdm/.pulse-cookie rwk,

Subscribers

People subscribed via source and target branches

to status/vote changes: