[28335] in Source-Commits
Re: apparmor-config commit: Tweak X to use the correct xauth path
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jul 9 11:18:46 2014
From: Jonathan D Reed <jdreed@MIT.EDU>
To: Benjamin J Kaduk <kaduk@MIT.EDU>
CC: "source-commits@MIT.EDU" <source-commits@MIT.EDU>
Date: Wed, 9 Jul 2014 15:18:41 +0000
Message-ID: <859B75E6-9C41-4A13-AFF5-8D5322D5E207@mit.edu>
In-Reply-To: <alpine.GSO.1.10.1407091111090.21571@multics.mit.edu>
Content-Language: en-US
Content-Type: text/plain; charset="Windows-1252"
Content-ID: <F99DB6F707E0B44AA609828ADD2FE936@exchange.mit.edu>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Yes, that was deliberate, in an effort to make the file a bit more readable and make it clear what we changed and what we didn’t. Otherwise, it looked like we added the lines that follow it (gdm &c.) because of this LP bug. I should have noted it in the commit log.
On Jul 9, 2014, at 11:11 AM, Benjamin Kaduk <kaduk@MIT.EDU> wrote:
> 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
