[28332] in Source-Commits
apparmor-config commit: Tweak X to use the correct xauth path on trusty
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jul 9 10:17:38 2014
Date: Wed, 9 Jul 2014 10:17:31 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201407091417.s69EHVG8025297@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/apparmor-config/commit/85819962b197f7ab13fa178e0608f248dbc3b722
commit 85819962b197f7ab13fa178e0608f248dbc3b722
Author: Jonathan Reed <jdreed@mit.edu>
Date: Wed Jul 9 10:07:19 2014 -0400
Tweak X to use the correct xauth path on trusty
As of Trusty, lightdm's xauthority is in /run/lightdm/$USER,
named 'xauthority', not in /run/lightdm/authority, named "$(id -u)",
where apparmor expects it to be. Workaround for LP:1339727
debian/changelog | 7 +++++++
debian/transform_X.debathena | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3577e14..5d4b90a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debathena-apparmor-config (1.2.9.1) unstable; urgency=low
+
+ * And fix an upstream bug (LP: #1339727) which configures the wrong
+ location for lightdm-generated xauth files.
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 09 Jul 2014 10:06:38 -0400
+
debathena-apparmor-config (1.2.9) unstable; urgency=low
* Further transform the xdg-desktop profile to allow access to dconf
diff --git a/debian/transform_X.debathena b/debian/transform_X.debathena
index 73f8815..128a2b5 100755
--- a/debian/transform_X.debathena
+++ b/debian/transform_X.debathena
@@ -1,2 +1,2 @@
#!/usr/bin/perl -p0
-s|^(\s*)(owner )?\@\{HOME\}/.Xauthority\s+r,$|$&\n$1/var/run/athena-sessions/xauth-* r,|m or die;
+s|^(\s*)(owner )?\@\{HOME\}/.Xauthority\s+r,$|$&\n$1/var/run/athena-sessions/xauth-* r,\n$1# And on stock trusty (see LP #1339727)\n$1owner /run/lightdm/*/xauthority r,\n|m or die;
