[27907] in Source-Commits

home help back first fref pref prev next nref lref last post

apparmor-config commit: Make apparmor-config work with trusty

daemon@ATHENA.MIT.EDU (Victor Vasiliev)
Thu Mar 27 15:53:46 2014

Date: Thu, 27 Mar 2014 15:53:38 -0400
From: Victor Vasiliev <vasilvv@MIT.EDU>
Message-Id: <201403271953.s2RJrcUj030932@drugstore.mit.edu>
To: source-commits@MIT.EDU

https://github.com/mit-athena/apparmor-config/commit/8c0735129a29b914f13848ea52d74575315408a0
commit 8c0735129a29b914f13848ea52d74575315408a0
Author: Victor Vasiliev <vasilvv@mit.edu>
Date:   Thu Mar 27 01:32:53 2014 -0400

    Make apparmor-config work with trusty
    
    This reflects added "owner" modifier in /etc/apparmor.d/abstractions/X

 debian/changelog             |    6 ++++++
 debian/transform_X.debathena |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c62019..cb1c458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debathena-apparmor-config (1.2.7) unstable; urgency=low
+
+  * Reflect apparmor configuration changes in Ubuntu 14.04
+
+ -- Victor Vasiliev <vasilvv@mit.edu>  Thu, 27 Mar 2014 01:32:04 -0400
+
 debathena-apparmor-config (1.2.6) unstable; urgency=low
 
   * Depend explicitly on CUPS
diff --git a/debian/transform_X.debathena b/debian/transform_X.debathena
index 667dade..73f8815 100755
--- a/debian/transform_X.debathena
+++ b/debian/transform_X.debathena
@@ -1,2 +1,2 @@
 #!/usr/bin/perl -p0
-s|^(\s*)\@\{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,|m or die;

home help back first fref pref prev next nref lref last post