From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id YKtaEtQNZGPaNgAAbAwnHQ (envelope-from ) for ; Thu, 03 Nov 2022 19:52:04 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 8AA0EtQNZGOCVAEAauVa8A (envelope-from ) for ; Thu, 03 Nov 2022 19:52:04 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E88CF24B7E for ; Thu, 3 Nov 2022 19:52:03 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqfJa-0001Y4-8e; Thu, 03 Nov 2022 14:51:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqfIv-0001AN-Ed for bug-guix@gnu.org; Thu, 03 Nov 2022 14:51:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oqfIt-00007g-Gw for bug-guix@gnu.org; Thu, 03 Nov 2022 14:51:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oqfIt-0003zE-D6 for bug-guix@gnu.org; Thu, 03 Nov 2022 14:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#58861: [PATCH] shell: Fix '--emulate-fhs' sometimes not including 'glibc-for-fhs'. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 03 Nov 2022 18:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58861 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 58861@debbugs.gnu.org Received: via spool by 58861-submit@debbugs.gnu.org id=B58861.166750143415273 (code B ref 58861); Thu, 03 Nov 2022 18:51:03 +0000 Received: (at 58861) by debbugs.gnu.org; 3 Nov 2022 18:50:34 +0000 Received: from localhost ([127.0.0.1]:50688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oqfIP-0003yF-JI for submit@debbugs.gnu.org; Thu, 03 Nov 2022 14:50:34 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:32989) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oqfIL-0003xy-FZ for 58861@debbugs.gnu.org; Thu, 03 Nov 2022 14:50:30 -0400 Date: Thu, 03 Nov 2022 18:50:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1667501422; x=1667760622; bh=dTjgPZVJoQsANpSL/6+pgs01yQ6cTeQNQrlBboC9bSs=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=B9vLvzMG7c2jHT5p+u4bp3UbLFdgxHfZTeImPD9QSTLx2VJgZmhu5FeRaxG0REA7q s6h6ktJ15yWFNXIGxK8wLTIQr9PQcfkIRk0Ry/XeSsj7w9UTH9keo5/gBz0WfI7rxL Ir4h+Mr25iQIfLzzjS3AotxhrBfZ/Ldo2SKn7K67rKy+dE9HAKeebpgUqUR5w95QjF pLnFU45mN0cgXHA97kVjO3UO7Fo5E1O1FsKkeSFAfUMlB2W7faxzUrQqxYky4xDtWD kQHzp8+VzEiknhYyIg1xlkQlWLWeyLYD64/hEYhiqIKz2pQh6CCeFY11m+cUpet8/1 fiCQvSQD7eBdA== Message-ID: <87pme3dg9s.fsf@protonmail.com> In-Reply-To: <87sfj1tkwy.fsf@gnu.org> References: <87tu3n9oxd.fsf@protonmail.com> <87sfj1tkwy.fsf@gnu.org> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_6eXvRSle6BMPe2QR6AnfdwD6d6fGyRmlZcSberDuMA" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "bug-Guix" Reply-to: John Kehayias From: John Kehayias via Bug reports for GNU Guix Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1667501524; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=dTjgPZVJoQsANpSL/6+pgs01yQ6cTeQNQrlBboC9bSs=; b=NLsXNGCarg+ToOoPP7hJ6rtt9PidnVvk4Jn+mIQJq08TGjVtYrbBRpsxbHFF6wN1W8P+Fg zG1ypQ9OM2IY80kjOPm2V0OrZgkYhh3CK252UcYhXMGoLfoC1sIK0Zqo2p0+S8c4TwHtzo /cP7TNIU1EcQnrX6Cibtzb7tOGlz3Jd+7BnLj+taFfdtjthqTw8cbuIvSIgEGqghQAddzu dhXuGlCwjzetvJ1oAJX6vPU4E/DWq7SS/hw/8R3f8SXOieuoUyMHAcFMbkcAjrmAoJEB6a Ta7Gi4e6b+mbQycTxvCZlB+UeYq6R0uU8d9+7FULBcaJeTA8AgHHZpHgHPLdzQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1667501524; a=rsa-sha256; cv=none; b=L5L0yJF8JXH/MD/KPO+pzAOqyZ2sF4Mtc0HpRbJViWlXRedZl0l3eBAKwV2hLsTJnnuka3 DTA7O/fTiyeUoEZF/v5XYICX/Nw6v2v/RuOxrwu7AQJB17BXZK1naV7qdh+cjNKA81Tdu7 rK+UxJNmf1NadKgeWmz3xtdxE9J1N+1jZQ272Zjo4vhu0w1tqVj0nQg9hF2fp81N2g33YT ZYQDDA5OaV1jPLjDL76ZKa79kAv//A7xA8nzYOmPRECkdWdY5sU5b0s4vCP20SksgUdhDd 2PVbk8u9aIXdgRyXbkaI6G86udJLjgv27irCGWDkzvl2s+bPLS2k+jd0YxesxA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=B9vLvzMG; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.89 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=B9vLvzMG; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: E88CF24B7E X-Spam-Score: -1.89 X-Migadu-Scanner: scn1.migadu.com X-TUID: joVlJj65EJFF This is a multi-part message in MIME format. --b1_6eXvRSle6BMPe2QR6AnfdwD6d6fGyRmlZcSberDuMA Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludo=E2=80=99, On Wed, Nov 02, 2022 at 04:50 PM, Ludovic Court=C3=A8s wrote: > Hi John, > > John Kehayias skribis: > >> After commit >> >> I noticed a changed in behavior of guix shell with the emulate-fhs optio= n for a >> container. I tracked it down to the wrong glibc package appearing in the= container, i.e. >> the standard Guix version rather than glibc-for-fhs (which reads a globa= l ld cache). >> >> The cause I believe is related to , n= amely that >> package input order for a profile can matter. But it is slightly differe= nt here since >> the glibc-for-fhs package is added internally. >> >> We can see this demonstrated by comparing the FHS container with a -D in= put so that a >> glibc package is implicitly included (here from the gnu-build-system): >> >> =E2=9D=AF guix shell -CFD hello coreutils >> john@narya ~/Files/UPenn/canvasgrading [env]$ ls /lib/ld* -la >> lrwxrwxrwx 1 65534 overflow 69 Jan 1 1970 /lib/ld-2.33.so -> >> /gnu/store/5h2w4qi9hk1qzzgi1w83220ydslinr4s-glibc-2.33/lib/ld-2.33.so >> lrwxrwxrwx 1 65534 overflow 79 Jan 1 1970 /lib/ld-linux-x86-64.so.2 -> >> /gnu/store/5h2w4qi9hk1qzzgi1w83220ydslinr4s-glibc-2.33/lib/ld-linux-x86-= 64.so.2 > > How about fixing it by moving the (alist-cons 'expression =E2=80=A6) thin= g right > before the =E2=80=98options-with-caching=E2=80=99 call in =E2=80=98parse-= args=E2=80=99? > > That way it would no longer be sensitive to the position of =E2=80=98-F= =E2=80=99 on the > command line. > Good idea, that worked! I didn't think right away of an easier way of doing= this, so I added another let binding to easily check for '--emulate-fhs' i= n the parsed arguments. > Could you give it a try and add a test? > I added a test that explicitly includes 'glibc' in the 'guix shell' invocat= ion and checked the link to '/lib/libc.so' was from 'glibc-for-fhs'. Again,= not sure if there is a better way here, but the test does pass now and fai= ls without the change you proposed. I also checked against the examples I g= ave originally and looked good there too. Patch attached. I included an explanation (and link) of this bug and the fi= x in the commit message. Thanks and let me know if there is anything to improve here! John --b1_6eXvRSle6BMPe2QR6AnfdwD6d6fGyRmlZcSberDuMA Content-Type: text/x-patch; name=0001-shell-Fix-emulate-fhs-sometimes-not-including-glibc-.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-shell-Fix-emulate-fhs-sometimes-not-including-glibc-.patch RnJvbSA3MmJlNGExNWExMDkxNmFlOGQ1MWRmYjI5OThkNjE3OWJjNTdiZTU5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogSm9obiBLZWhheWlhcyA8am9obi5rZWhheWlhc0Bwcm90b25t YWlsLmNvbT4NCkRhdGU6IFRodSwgMyBOb3YgMjAyMiAxNDoyNTowOSAtMDQwMA0KU3ViamVjdDog W1BBVENIXSBzaGVsbDogRml4ICctLWVtdWxhdGUtZmhzJyBzb21ldGltZXMgbm90IGluY2x1ZGlu Zw0KICdnbGliYy1mb3ItZmhzJy4NCg0KRml4ZXMgPGh0dHBzOi8vaXNzdWVzLmd1aXguZ251Lm9y Zy81ODg2MT4uDQoNClByZXZpb3VzbHkgdGhlIG9yZGVyIG9mIHRoZSBvcHRpb25zIGdpdmluZyB0 byAnZ3VpeCBzaGVsbCcgY291bGQgbWVhbiB0aGF0IHRoZQ0KJ2dsaWJjLWZvci1maHMnIHBhY2th Z2UgaW5jbHVkZWQgd2l0aCB0aGUgJy0tZW11bGF0ZS1maHMnIG9wdGlvbiB3b3VsZCBub3QNCmFw cGVhciBpbiB0aGUgY29udGFpbmVyLiAgRm9yIGV4YW1wbGUsIHVzaW5nIHRoZSBkZXZlbG9wbWVu dCBvcHRpb24gd2l0aCBhDQpwYWNrYWdlIHVzaW5nIHRoZSAnZ251LWJ1aWxkLXN5c3RlbScsIGUu Zy4gJ2d1aXggc2hlbGwgLUNGRCBoZWxsbycsIHdvdWxkDQppbmNsdWRlIHRoZSByZWd1bGFyICdn bGliYycgcGFja2FnZS4gIFRoZSBvcHRpb24gb3JkZXJlZCBtYXR0ZXJlZDogJ2d1aXggc2hlbGwN Ci1DRCBoZWxsbyAtRicgd291bGQgaW5jbHVkZSB0aGUgZXhwZWN0ZWQgJ2dsaWJjLWZvci1maHMn LiAgV2UgZml4IHRoaXMgYnkNCmhhdmluZyAnZ2xpYmMtZm9yLWZocycgYWRkZWQgdG8gdGhlIHBh Y2thZ2UgbGlzdCBqdXN0IGJlZm9yZSBjYWxsaW5nDQonb3B0aW9ucy13aXRoLWNhY2hpbmcnIHNv IHRoZSBvcHRpb24gb3JkZXIgZ2l2ZW4gYnkgdGhlIHVzZXIgZG9lcyBub3QgbWF0dGVyLg0KDQoq IGd1aXgvc2NyaXB0cy9zaGVsbC5zY20gKCVvcHRpb25zKTogTW92ZSB0aGUgJy0tZW11bGF0ZS1m aHMnIChleHByZXNzaW9uDQouIC4uLikgY29tcG9uZW50IGZyb20gaGVyZS4uLg0KKHBhcnNlLWFy Z3MpOiAuLi4gdG8gaGVyZS4NCiogdGVzdHMvZ3VpeC1lbnZpcm9ubWVudC1jb250YWluZXIuc2g6 IEFkZCBhIHRlc3QgdG8gY2hlY2sgdGhhdA0KJ2dsaWJjLWZvci1maHMnIGlzIGluIHRoZSBjb250 YWluZXIgZXZlbiB3aGVuICdnbGliYycgaXMgaW5jbHVkZWQgaW4gdGhlICdndWl4DQpzaGVsbCcg cGFja2FnZSBsaXN0Lg0KLS0tDQogZ3VpeC9zY3JpcHRzL3NoZWxsLnNjbSAgICAgICAgICAgICAg fCAyNiArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQ0KIHRlc3RzL2d1aXgtZW52aXJvbm1lbnQt Y29udGFpbmVyLnNoIHwgMTAgKysrKysrKysrKw0KIDIgZmlsZXMgY2hhbmdlZCwgMjQgaW5zZXJ0 aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pDQoNCmRpZmYgLS1naXQgYS9ndWl4L3NjcmlwdHMvc2hl bGwuc2NtIGIvZ3VpeC9zY3JpcHRzL3NoZWxsLnNjbQ0KaW5kZXggYTI4MzY2MjlhZC4uZjMzNGJk NTdhZSAxMDA2NDQNCi0tLSBhL2d1aXgvc2NyaXB0cy9zaGVsbC5zY20NCisrKyBiL2d1aXgvc2Ny aXB0cy9zaGVsbC5zY20NCkBAIC0xNDMsMTYgKzE0Myw3IEBAIChkZWZpbmUgJW9wdGlvbnMNCiAN CiAgICAgICAgICAgICAgIChvcHRpb24gJygjXEYgImVtdWxhdGUtZmhzIikgI2YgI2YNCiAgICAg ICAgICAgICAgICAgICAgICAgKGxhbWJkYSAob3B0IG5hbWUgYXJnIHJlc3VsdCkNCi0gICAgICAg ICAgICAgICAgICAgICAgICAobGV0ICgocmVzdWx0DQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDs7IEZvciBhbiBGSFMtY29udGFpbmVyLCBhZGQgdGhlIChoaWRkZW4pDQotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDs7IHBhY2thZ2UgZ2xpYmMtZm9yLWZocyB3aGljaCB1 c2VzIHRoZSBnbG9iYWwNCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgY2FjaGUg YXQgL2V0Yy9sZC5zby5jYWNoZS4NCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFs aXN0LWNvbnMNCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdleHByZXNzaW9uDQot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnKGFkLWhvYy1wYWNrYWdlDQotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICIoQEAgKGdudSBwYWNrYWdlcyBiYXNlKSBnbGli Yy1mb3ItZmhzKSIpDQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQpKSkN Ci0gICAgICAgICAgICAgICAgICAgICAgICAgKGFsaXN0LWNvbnMgJ2VtdWxhdGUtZmhzPyAjdCBy ZXN1bHQpKSkpKQ0KKyAgICAgICAgICAgICAgICAgICAgICAgIChhbGlzdC1jb25zICdlbXVsYXRl LWZocz8gI3QgcmVzdWx0KSkpKQ0KICAgICAgICAgKGZpbHRlci1tYXAgKGxhbWJkYSAob3B0KQ0K ICAgICAgICAgICAgICAgICAgICAgICAoYW5kIChub3QgKGFueSAobGFtYmRhIChuYW1lKQ0KICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChtZW1iZXIgbmFtZSB0by1yZW1v dmUpKQ0KQEAgLTE3Myw4ICsxNjQsMTkgQEAgKGRlZmluZSAocGFyc2UtYXJncyBhcmdzKQ0KICAg OzsgVGhlICctLScgdG9rZW4gaXMgdXNlZCB0byBzZXBhcmF0ZSB0aGUgY29tbWFuZCB0byBydW4g ZnJvbSB0aGUgcmVzdCBvZg0KICAgOzsgdGhlIG9wZXJhbmRzLg0KICAgKGxldCAoKGFyZ3MgY29t bWFuZCAoYnJlYWsgKGN1dCBzdHJpbmc9PyAiLS0iIDw+KSBhcmdzKSkpDQotICAgIChsZXQgKChv cHRzIChwYXJzZS1jb21tYW5kLWxpbmUgYXJncyAlb3B0aW9ucyAobGlzdCAlZGVmYXVsdC1vcHRp b25zKQ0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICM6YXJndW1lbnQtaGFu ZGxlciBoYW5kbGUtYXJndW1lbnQpKSkNCisgICAgKGxldCogKChhcmdzLXBhcnNlZCAocGFyc2Ut Y29tbWFuZC1saW5lIGFyZ3MgJW9wdGlvbnMgKGxpc3QgJWRlZmF1bHQtb3B0aW9ucykNCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICM6YXJndW1lbnQtaGFuZGxl ciBoYW5kbGUtYXJndW1lbnQpKQ0KKyAgICAgICAgICAgOzsgRm9yIGFuIEZIUy1jb250YWluZXIs IGFkZCB0aGUgKGhpZGRlbikgcGFja2FnZSBnbGliYy1mb3ItZmhzDQorICAgICAgICAgICA7OyB3 aGljaCB1c2VzIHRoZSBnbG9iYWwgY2FjaGUgYXQgL2V0Yy9sZC5zby5jYWNoZS4gIFdlIGhhbmRs ZQ0KKyAgICAgICAgICAgOzsgYWRkaW5nIHRoaXMgcGFja2FnZSBoZXJlIHRvIGVuc3VyZSBpdCB3 aWxsIGFsd2F5cyBhcHBlYXIgaW4gdGhlDQorICAgICAgICAgICA7OyBjb250YWluZXIgYXMgaXQg aXMgdGhlIGZpcnN0IHBhY2thZ2UgaW4gT1BUUy4NCisgICAgICAgICAgIChvcHRzIChpZiAoYXNz b2MtcmVmIGFyZ3MtcGFyc2VkICdlbXVsYXRlLWZocz8pDQorICAgICAgICAgICAgICAgICAgICAg KGFsaXN0LWNvbnMNCisgICAgICAgICAgICAgICAgICAgICAgJ2V4cHJlc3Npb24NCisgICAgICAg ICAgICAgICAgICAgICAgJyhhZC1ob2MtcGFja2FnZQ0KKyAgICAgICAgICAgICAgICAgICAgICAg ICIoQEAgKGdudSBwYWNrYWdlcyBiYXNlKSBnbGliYy1mb3ItZmhzKSIpDQorICAgICAgICAgICAg ICAgICAgICAgIGFyZ3MtcGFyc2VkKQ0KKyAgICAgICAgICAgICAgICAgICAgIGFyZ3MtcGFyc2Vk KSkpDQogICAgICAgKG9wdGlvbnMtd2l0aC1jYWNoaW5nDQogICAgICAgIChhdXRvLWRldGVjdC1t YW5pZmVzdA0KICAgICAgICAgKG1hdGNoIGNvbW1hbmQNCmRpZmYgLS1naXQgYS90ZXN0cy9ndWl4 LWVudmlyb25tZW50LWNvbnRhaW5lci5zaCBiL3Rlc3RzL2d1aXgtZW52aXJvbm1lbnQtY29udGFp bmVyLnNoDQppbmRleCBmMjMzYzNmY2MwLi5mYjJjMTliMTkzIDEwMDY0NA0KLS0tIGEvdGVzdHMv Z3VpeC1lbnZpcm9ubWVudC1jb250YWluZXIuc2gNCisrKyBiL3Rlc3RzL2d1aXgtZW52aXJvbm1l bnQtY29udGFpbmVyLnNoDQpAQCAtMSw1ICsxLDYgQEANCiAjIEdOVSBHdWl4IC0tLSBGdW5jdGlv bmFsIHBhY2thZ2UgbWFuYWdlbWVudCBmb3IgR05VDQogIyBDb3B5cmlnaHQgwqkgMjAxNSBEYXZp ZCBUaG9tcHNvbiA8ZGF2ZXRAZ251Lm9yZz4NCisjIENvcHlyaWdodCDCqSAyMDIyIEpvaG4gS2Vo YXlpYXMgPGpvaG4ua2VoYXlpYXNAcHJvdG9ubWFpbC5jb20+DQogIw0KICMgVGhpcyBmaWxlIGlz IHBhcnQgb2YgR05VIEd1aXguDQogIw0KQEAgLTIzMSwzICsyMzIsMTIgQEAgZ3VpeCBzaGVsbCAt QyAtLWVtdWxhdGUtZmhzIC0tYm9vdHN0cmFwIGd1aWxlLWJvb3RzdHJhcCBcDQogIyBUZXN0IHRo YXQgdGhlIGxkIGNhY2hlIHdhcyBnZW5lcmF0ZWQgYW5kIGNhbiBiZSBzdWNjZXNzZnVsbHkgcmVh ZC4NCiBndWl4IHNoZWxsIC1DRiAtLWJvb3RzdHJhcCBndWlsZS1ib290c3RyYXAgXA0KICAgICAg LS0gZ3VpbGUgLWMgJyhleGVjbHAgImxkY29uZmlnIiAibGRjb25maWciICItcCIpJw0KKw0KKyMg VGVzdCB0aGF0IHRoZSBwYWNrYWdlIGdsaWJjLWZvci1maHMgaXMgaW4gdGhlIGNvbnRhaW5lciBl dmVuIGlmIHRoZXJlIGlzIHRoZQ0KKyMgcmVndWxhciBnbGliYyBwYWNrYWdlIGZyb20gYW5vdGhl ciBzb3VyY2UuICBTZWUNCisjIDxodHRwczovL2lzc3Vlcy5ndWl4LmdudS5vcmcvNTg4NjE+Lg0K K2d1aXggc2hlbGwgLUNGIC0tYm9vdHN0cmFwIGd1aWxlLWJvb3RzdHJhcCBnbGliYyBcDQorICAg ICAtLSBndWlsZSAtYyAnKGV4aXQgKGlmIChzdHJpbmctY29udGFpbnMgKHJlYWRsaW5rICIvbGli L2xpYmMuc28iKQ0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAiZ2xpYmMtZm9yLWZocyIp DQorICAgICAgICAgICAgICAgICAgICAgICAgICAgMA0KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgIDEpKScNCi0tIA0KMi4zOC4wDQoNCg== --b1_6eXvRSle6BMPe2QR6AnfdwD6d6fGyRmlZcSberDuMA--