~ubuntu-branches/ubuntu/maverick/apparmor/maverick

« back to all changes in this revision

Viewing changes to debian/patches/0008-lp601583.patch

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge
  • Date: 2010-08-11 09:24:23 UTC
  • Revision ID: james.westby@ubuntu.com-20100811092423-9n5mwfla0014ou49
Tags: 2.5.1~pre1393-0ubuntu5
* debian/patches/0007-lp605835.patch: allow ca-certificates in ssl_certs
  abstraction (LP: #605835)
* debian/patches/0008-lp601583.patch: adjust X abstraction for newer gdm
  (LP: #601583)
* debian/patches/0009-lp565753.patch: add ubuntu-feed-readers abstraction
  and have ubuntu-browsers.d/multimedia use it (LP: #565753)
* debian/apparmor.config: don't try to read in the existing value from
  /etc/apparmor.d/tunables/home.d/ubuntu, but instead always use what is
  in debconf. (LP: #561694)
* add aa-update-browser for giving a programmatic way to update browser
  profiles to use browser abstractions
  - add debian/aa-update-browser
  - add debian/aa-update-browser.8
  - debian/rules: install aa-update-browser*
* debian/patches/0003-ubuntu-browsers-d.patch: updated to generalize java
  child profile names
* debian/patches/0010-fix-release.patch: update common/Make.rules to use
  Canonical Ltd in generated documentation

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Origin: http://bazaar.launchpad.net/~apparmor-dev/apparmor/master/revision/1467
 
2
Description: allow /var/run/gdm/*/database in X abstraction
 
3
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/601583
 
4
 
 
5
Index: apparmor-2.5.1~pre1393/profiles/apparmor.d/abstractions/X
 
6
===================================================================
 
7
--- apparmor-2.5.1~pre1393.orig/profiles/apparmor.d/abstractions/X      2010-08-11 10:00:17.000000000 -0500
 
8
+++ apparmor-2.5.1~pre1393/profiles/apparmor.d/abstractions/X   2010-08-11 10:00:55.000000000 -0500
 
9
@@ -17,7 +17,8 @@
 
10
   @{HOME}/.ICEauthority r,
 
11
 
 
12
   # .Xauthority files required for X connections, per user
 
13
-  @{HOME}/.Xauthority        r,
 
14
+  @{HOME}/.Xauthority           r,
 
15
+  owner /var/run/gdm/*/database r,
 
16
 
 
17
   # the unix socket to use to connect to the display
 
18
   /tmp/.X11-unix/*           w,