[28334] in Source-Commits
Re: apparmor-config commit: Tweak X to use the correct xauth path
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Wed Jul 9 11:12:05 2014
Date: Wed, 9 Jul 2014 11:11:55 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201407091417.s69EHVG8025297@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1407091111090.21571@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII
On Wed, 9 Jul 2014, Jonathan D Reed wrote:
> 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
>
> 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;
This looks to add a trailing newline in the replacement string where there
was not previously one. I can't imagine that it matters, though.
-Ben
