From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id +PSsOL7JkF+PSwAA0tVLHw (envelope-from ) for ; Wed, 21 Oct 2020 23:52:30 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id QB1pNL7JkF9uXwAAB5/wlQ (envelope-from ) for ; Wed, 21 Oct 2020 23:52:30 +0000 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 804B2940112 for ; Wed, 21 Oct 2020 23:52:29 +0000 (UTC) Received: from localhost ([::1]:33750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVNu8-00065C-EA for larch@yhetil.org; Wed, 21 Oct 2020 19:52:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVNti-000650-6D for guix-patches@gnu.org; Wed, 21 Oct 2020 19:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39334) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVNth-0002ir-So for guix-patches@gnu.org; Wed, 21 Oct 2020 19:52:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kVNth-0000sr-P9 for guix-patches@gnu.org; Wed, 21 Oct 2020 19:52:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39807] [PATCH] guix: pack: Only wrap executable files. Resent-From: Eric Bavier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Oct 2020 23:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 39807@debbugs.gnu.org Received: via spool by 39807-submit@debbugs.gnu.org id=B39807.16033243123382 (code B ref 39807); Wed, 21 Oct 2020 23:52:01 +0000 Received: (at 39807) by debbugs.gnu.org; 21 Oct 2020 23:51:52 +0000 Received: from localhost ([127.0.0.1]:50880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVNtT-0000sP-Cq for submit@debbugs.gnu.org; Wed, 21 Oct 2020 19:51:52 -0400 Received: from mout01.posteo.de ([185.67.36.65]:56095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVNtP-0000s5-9R for 39807@debbugs.gnu.org; Wed, 21 Oct 2020 19:51:45 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 0C2B516005C for <39807@debbugs.gnu.org>; Thu, 22 Oct 2020 01:51:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1603324297; bh=AiZzfEULFg/kD3PSh00A4xwUD2wGU+uQqatdwQV8M34=; h=Subject:From:To:Cc:Date:From; b=oAxNm+ZCS5RnbjmJ16zToCkAlu5o+OmKhYZrsYccdYyE/wMEo85wW74tLWHYQ+ZBR OOf2VnzPyRtLDtzr+QM3UKBTWe/VEFM0T7d+rJB4Y2R51eqYuGZIjuQdoP/XwUQyod YNpLAXWyZF0jZC5vnZIGRrsRL5YD+3te3JzMFIGag3YynlOuhJqEqt9QiqgoivL9uC ewZ30AFlsMCPJYLaD+tzT4x5IwJuX7lPXT2pkaO3dNmyr+jM+L0TLfD6fJ01naikWX e/+m+rvLJTcS3Qx85Vu9O7BlcQARkMkbPPHLvk2sQvaKHuIuDrcbqhdqFzWU6FOK7o 7REEJA0eSh95w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4CGnMW65Z6z6tmf; Thu, 22 Oct 2020 01:51:35 +0200 (CEST) Message-ID: From: Eric Bavier Date: Wed, 21 Oct 2020 18:51:31 -0500 In-Reply-To: <87mu0fxo4e.fsf@gnu.org> References: <3ace941f920d87da65de6e4fdc16add5b9725434.camel@posteo.net> <83416910901e77b537b64de392ee02598ccd72ff.camel@posteo.net> <87wnzk7xs0.fsf@gnu.org> <69f5446e2accd24cd1de9e3964373ab525b0875d.camel@posteo.net> <87pn5b383l.fsf@gnu.org> <48f280214fca0f8bd17aeff46c42ee76a04c90f2.camel@posteo.net> <87mu0fxo4e.fsf@gnu.org> Content-Type: multipart/mixed; boundary="=-wNcb9CCvVcBOKsfw/AyM" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=posteo.net header.s=2017 header.b=oAxNm+ZC; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.19 X-TUID: if2fFhT9V+w7 --=-wNcb9CCvVcBOKsfw/AyM Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit On Wed, 2020-10-21 at 23:31 +0200, Ludovic Courtès wrote: > Hi, > > Eric Bavier skribis: > > > On Wed, 2020-10-21 at 17:35 +0200, Ludovic Courtès wrote: > > > Hi Eric, > > > > > > Eric Bavier skribis: > > > > > > > (mkdir-p (dirname result)) > > > > (apply invoke #$compiler "-std=gnu99" "-static" "-Os" "-g0" "-Wall" > > > > "run.c" "-o" result > > > > + (string-append "-DWRAPPER_PROGRAM=\"" result "\"") > > > > > > Can we just write (canonical-path result) here? That way we wouldn’t > > > need ‘find-input-files’ and related changes. > > > > > > > Guile's canonicalize-path will raise and error if the path does not > > already exist. We could create a dummy file at result, then call > > canonicalize-path? but that seems clumsier than forming a canonical > > name in the first place? > > The patch you sent has ‘find-files’ use ‘stat’ instead of the trailing > slash. It introduces a difference: by using ‘stat’ all the way, it > follows all symlinks, not just the higher-level ones. I don’t know if > this could have undesired implications, like wrapping the same file > twice because there’s a symlink pointing to it. (Or am I too paranoid?) > > To be on the safe side, we could write: > > (string-append (canonical-path (dirname) result) "/" result) > > WDYT? I don't like the "stat" change either. Paranoia is not misplaced, I think. Following are current two patches. I can add copyright to run-in- namespace.c if you think it's needed. `~Eric --=-wNcb9CCvVcBOKsfw/AyM Content-Disposition: attachment; filename*0=0001-guix-pack-Fix-offset-calculation-for-store-directory.pat; filename*1=ch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-guix-pack-Fix-offset-calculation-for-store-directory.patch"; charset="UTF-8" RnJvbSA3Y2FhZWEwYjIxZTViOTc4MzZiMWE0MGE0NGVmZDJmMzhkYmFiN2FlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFcmljIEJhdmllciA8YmF2aWVyQG1lbWJlci5mc2Yub3JnPgpE YXRlOiBXZWQsIDIxIE9jdCAyMDIwIDE4OjMzOjUyIC0wNTAwClN1YmplY3Q6IFtQQVRDSCAxLzJd IGd1aXg6IHBhY2s6IEZpeCBvZmZzZXQgY2FsY3VsYXRpb24gZm9yIHN0b3JlIGRpcmVjdG9yeQog bW91bnQgcG9pbnQuCgpGaXhlcyB3cmFwcGluZyBvZiBub24tcGFja2FnZSB0aGluZ3MsIHdoZXJl IHRoZSB0YXJnZXQgc3RvcmUgZGlyZWN0b3J5IG1heQpkaWZmZXIgaW4gbGVuZ3RoIGZyb20gdGhl IG9yaWdpbmFsLgoKKiBndWl4L3NjcmlwdHMvcGFjay5zY20gKHdyYXBwZWQtcGFja2FnZSk8YnVp bGQtd3JhcHBlcj46IERlZmluZQpXUkFQUEVSX1BST0dSQU0gbWFjcm8gd2l0aCB3cmFwcGVyJ3Mg ZmlsZSBuYW1lLgoqIGdudS9wYWNrYWdlcy9hdXgtZmlsZXMvcnVuLWluLW5hbWVzcGFjZS5jICht YWluKTogT2Zmc2V0IGluZGV4IGJ5IGxlbiBvZgp0aGF0IGZpbGUgbmFtZS4KLS0tCiBnbnUvcGFj a2FnZXMvYXV4LWZpbGVzL3J1bi1pbi1uYW1lc3BhY2UuYyB8IDIgKy0KIGd1aXgvc2NyaXB0cy9w YWNrLnNjbSAgICAgICAgICAgICAgICAgICAgIHwgNiArKysrKy0KIDIgZmlsZXMgY2hhbmdlZCwg NiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdl cy9hdXgtZmlsZXMvcnVuLWluLW5hbWVzcGFjZS5jIGIvZ251L3BhY2thZ2VzL2F1eC1maWxlcy9y dW4taW4tbmFtZXNwYWNlLmMKaW5kZXggNTJhMTZhNTM2Mi4uOTQ3ZmYwMmRkYSAxMDA2NDQKLS0t IGEvZ251L3BhY2thZ2VzL2F1eC1maWxlcy9ydW4taW4tbmFtZXNwYWNlLmMKKysrIGIvZ251L3Bh Y2thZ2VzL2F1eC1maWxlcy9ydW4taW4tbmFtZXNwYWNlLmMKQEAgLTYyMCw3ICs2MjAsNyBAQCBt YWluIChpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAvKiBTRUxGIGlzIHNvbWV0aGluZyBsaWtl ICIvaG9tZS9sdWRvLy5sb2NhbC9nbnUvc3RvcmUv4oCmLWZvby9iaW4vbHMiIGFuZCB3ZQogICAg ICB3YW50IHRvIGV4dHJhY3QgIi9ob21lL2x1ZG8vLmxvY2FsL2dudS9zdG9yZSIuICAqLwogICBz aXplX3QgaW5kZXggPSBzdHJsZW4gKHNlbGYpCi0gICAgLSBzdHJsZW4gKCJAV1JBUFBFRF9QUk9H UkFNQCIpICsgc3RybGVuIChvcmlnaW5hbF9zdG9yZSk7CisgICAgLSBzdHJsZW4gKFdSQVBQRVJf UFJPR1JBTSkgKyBzdHJsZW4gKG9yaWdpbmFsX3N0b3JlKTsKICAgY2hhciAqc3RvcmUgPSBzdHJk dXAgKHNlbGYpOwogICBzdG9yZVtpbmRleF0gPSAnXDAnOwogCmRpZmYgLS1naXQgYS9ndWl4L3Nj cmlwdHMvcGFjay5zY20gYi9ndWl4L3NjcmlwdHMvcGFjay5zY20KaW5kZXggYTVhNzBkNTE2Mi4u ZjAyZjM2NjJhNSAxMDA2NDQKLS0tIGEvZ3VpeC9zY3JpcHRzL3BhY2suc2NtCisrKyBiL2d1aXgv c2NyaXB0cy9wYWNrLnNjbQpAQCAtNSw2ICs1LDcgQEAKIDs7OyBDb3B5cmlnaHQgwqkgMjAxOCBD aHJpcyBNYXJ1c2ljaCA8Y21tYXJ1c2ljaEBnbWFpbC5jb20+CiA7OzsgQ29weXJpZ2h0IMKpIDIw MTggRWZyYWltIEZsYXNobmVyIDxlZnJhaW1AZmxhc2huZXIuY28uaWw+CiA7OzsgQ29weXJpZ2h0 IMKpIDIwMjAgVG9iaWFzIEdlZXJpbmNreC1SaWNlIDxtZUB0b2JpYXMuZ3I+Cis7OzsgQ29weXJp Z2h0IMKpIDIwMjAgRXJpYyBCYXZpZXIgPGJhdmllckBwb3N0ZW8ubmV0PgogOzs7CiA7OzsgVGhp cyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCiA7OzsKQEAgLTg0Nyw3ICs4NDgsNyBAQCBsYXN0 IHJlc29ydCBmb3IgcmVsb2NhdGlvbi4iCiAgICAgICAgICAgICAgICgoIkBTVE9SRV9ESVJFQ1RP UllAIikgKCVzdG9yZS1kaXJlY3RvcnkpKSkKIAogICAgICAgICAgICAgKGxldCogKChiYXNlICAg KHN0cmlwLXN0b3JlLXByZWZpeCBwcm9ncmFtKSkKLSAgICAgICAgICAgICAgICAgICAocmVzdWx0 IChzdHJpbmctYXBwZW5kIHRhcmdldCAiLyIgYmFzZSkpCisgICAgICAgICAgICAgICAgICAgKHJl c3VsdCAoc3RyaW5nLWFwcGVuZCB0YXJnZXQgYmFzZSkpCiAgICAgICAgICAgICAgICAgICAgKHBy b290ICAjJChhbmQgcHJvb3Q/CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgI34o c3RyaW5nLWRyb3AKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjJChmaWxl LWFwcGVuZCAocHJvb3QpICIvYmluL3Byb290IikKQEAgLTg1Niw2ICs4NTcsOSBAQCBsYXN0IHJl c29ydCBmb3IgcmVsb2NhdGlvbi4iCiAgICAgICAgICAgICAgIChta2Rpci1wIChkaXJuYW1lIHJl c3VsdCkpCiAgICAgICAgICAgICAgIChhcHBseSBpbnZva2UgIyRjb21waWxlciAiLXN0ZD1nbnU5 OSIgIi1zdGF0aWMiICItT3MiICItZzAiICItV2FsbCIKICAgICAgICAgICAgICAgICAgICAgICJy dW4uYyIgIi1vIiByZXN1bHQKKyAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICIt RFdSQVBQRVJfUFJPR1JBTT1cIiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChjYW5vbmljYWxpemUtcGF0aCAoZGlybmFtZSByZXN1bHQpKSAiLyIKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChiYXNlbmFtZSByZXN1bHQpICJcIiIpCiAgICAgICAgICAg ICAgICAgICAgICAoYXBwZW5kIChpZiBwcm9vdAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKGxpc3QgKHN0cmluZy1hcHBlbmQgIi1EUFJPT1RfUFJPR1JBTT1cIiIKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByb290ICJcIiIp KQotLSAKMi4yOC4wCgo= --=-wNcb9CCvVcBOKsfw/AyM Content-Disposition: attachment; filename="0002-guix-pack-Only-wrap-executable-files.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0002-guix-pack-Only-wrap-executable-files.patch"; charset="UTF-8" RnJvbSA4NWJkOTYyZTkyOTkyNGIwMTZhODVkM2EwYjNkZmY0MzRlYmU4ZGUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFcmljIEJhdmllciA8YmF2aWVyQG1lbWJlci5mc2Yub3JnPgpE YXRlOiBNb24sIDI0IEZlYiAyMDIwIDIzOjQ3OjAyIC0wNjAwClN1YmplY3Q6IFtQQVRDSCAyLzJd IGd1aXg6IHBhY2s6IE9ubHkgd3JhcCBleGVjdXRhYmxlIGZpbGVzLgoKKiBndWl4L3NjcmlwdHMv cGFjay5zY20gKHdyYXBwZWQtcGFja2FnZSk8YnVpbGQ+OiBCdWlsZCB3cmFwcGVycyBmb3IKZXhl Y3V0YWJsZSBmaWxlcyBhbmQgc3ltbGluayBvdGhlcnMuCiogdGVzdHMvZ3VpeC1wYWNrLXJlbG9j YXRhYmxlLnNoOiBUZXN0IHJlbG9jYXRhYmxlIGV4YW1wbGUgb2YgbWl4ZWQKZXhlY3V0YWJsZSBh bmQgbm9uLWV4ZWN1dGFibGUgZmlsZXMuCi0tLQogZ3VpeC9zY3JpcHRzL3BhY2suc2NtICAgICAg ICAgIHwgMzAgKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tCiB0ZXN0cy9ndWl4LXBhY2st cmVsb2NhdGFibGUuc2ggfCAyNSArKysrKysrKysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNo YW5nZWQsIDQ2IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ3Vp eC9zY3JpcHRzL3BhY2suc2NtIGIvZ3VpeC9zY3JpcHRzL3BhY2suc2NtCmluZGV4IGYwMmYzNjYy YTUuLjhlNjk0ZWRiYmUgMTAwNjQ0Ci0tLSBhL2d1aXgvc2NyaXB0cy9wYWNrLnNjbQorKysgYi9n dWl4L3NjcmlwdHMvcGFjay5zY20KQEAgLTc0OSwxMiArNzQ5LDEzIEBAIGxhc3QgcmVzb3J0IGZv ciByZWxvY2F0aW9uLiIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChndWl4IGVsZikp KQogICAgICAgI34oYmVnaW4KICAgICAgICAgICAodXNlLW1vZHVsZXMgKGd1aXggYnVpbGQgdXRp bHMpCi0gICAgICAgICAgICAgICAgICAgICAgICgoZ3VpeCBidWlsZCB1bmlvbikgIzpzZWxlY3Qg KHJlbGF0aXZlLWZpbGUtbmFtZSkpCisgICAgICAgICAgICAgICAgICAgICAgICgoZ3VpeCBidWls ZCB1bmlvbikgIzpzZWxlY3QgKHN5bWxpbmstcmVsYXRpdmUpKQogICAgICAgICAgICAgICAgICAg ICAgICAoZ3VpeCBlbGYpCiAgICAgICAgICAgICAgICAgICAgICAgIChndWl4IGJ1aWxkIGdyZW1s aW4pCiAgICAgICAgICAgICAgICAgICAgICAgIChpY2UtOSBiaW5hcnktcG9ydHMpCiAgICAgICAg ICAgICAgICAgICAgICAgIChpY2UtOSBmdHcpCiAgICAgICAgICAgICAgICAgICAgICAgIChpY2Ut OSBtYXRjaCkKKyAgICAgICAgICAgICAgICAgICAgICAgKGljZS05IHJlY2VpdmUpCiAgICAgICAg ICAgICAgICAgICAgICAgIChzcmZpIHNyZmktMSkKICAgICAgICAgICAgICAgICAgICAgICAgKHJu cnMgYnl0ZXZlY3RvcnMpKQogCkBAIC04NzQsMTYgKzg3NSwyNyBAQCBsYXN0IHJlc29ydCBmb3Ig cmVsb2NhdGlvbi4iCiAgICAgICAgICAgKG1rZGlyIHRhcmdldCkKICAgICAgICAgICAoZm9yLWVh Y2ggKGxhbWJkYSAoZmlsZSkKICAgICAgICAgICAgICAgICAgICAgICAodW5sZXNzIChtZW1iZXIg ZmlsZSAnKCIuIiAiLi4iICJiaW4iICJzYmluIiAibGliZXhlYyIpKQotICAgICAgICAgICAgICAg ICAgICAgICAgKGxldCAoKGZpbGUqIChzdHJpbmctYXBwZW5kIGlucHV0ICIvIiBmaWxlKSkpCi0g ICAgICAgICAgICAgICAgICAgICAgICAgIChzeW1saW5rIChyZWxhdGl2ZS1maWxlLW5hbWUgdGFy Z2V0IGZpbGUqKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFw cGVuZCB0YXJnZXQgIi8iIGZpbGUpKSkpKQorICAgICAgICAgICAgICAgICAgICAgICAgKHN5bWxp bmstcmVsYXRpdmUgKHN0cmluZy1hcHBlbmQgaW5wdXQgICIvIiBmaWxlKQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgdGFyZ2V0ICIvIiBm aWxlKSkpKQogICAgICAgICAgICAgICAgICAgICAoc2NhbmRpciBpbnB1dCkpCiAKLSAgICAgICAg ICAoZm9yLWVhY2ggYnVpbGQtd3JhcHBlcgotICAgICAgICAgICAgICAgICAgICA7OyBOb3RlOiBU cmFpbGluZyBzbGFzaCBpbiBjYXNlIHRoZXNlIGFyZSBzeW1saW5rcy4KLSAgICAgICAgICAgICAg ICAgICAgKGFwcGVuZCAoZmluZC1maWxlcyAoc3RyaW5nLWFwcGVuZCBpbnB1dCAiL2Jpbi8iKSkK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZmluZC1maWxlcyAoc3RyaW5nLWFwcGVuZCBp bnB1dCAiL3NiaW4vIikpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgKGZpbmQtZmlsZXMg KHN0cmluZy1hcHBlbmQgaW5wdXQgIi9saWJleGVjLyIpKSkpKSkpCisgICAgICAgICAgKHJlY2Vp dmUgKGV4ZWN1dGFibGVzIG90aGVycykKKyAgICAgICAgICAgICAgKHBhcnRpdGlvbiBleGVjdXRh YmxlLWZpbGU/CisJCQkgOzsgTm90ZTogVHJhaWxpbmcgc2xhc2ggaW4gY2FzZSB0aGVzZSBhcmUg c3ltbGlua3MuCisgICAgICAgICAgICAgICAgICAgICAgICAgKGFwcGVuZCAoZmluZC1maWxlcyAo c3RyaW5nLWFwcGVuZCBpbnB1dCAiL2Jpbi8iKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChmaW5kLWZpbGVzIChzdHJpbmctYXBwZW5kIGlucHV0ICIvc2Jpbi8iKSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChmaW5kLWZpbGVzIChzdHJpbmctYXBwZW5kIGlu cHV0ICIvbGliZXhlYy8iKSkpKQorICAgICAgICAgICAgOzsgV3JhcCBvbmx5IGV4ZWN1dGFibGVz LCBzaW5jZSB0aGUgd3JhcHBlciB3aWxsIGV2ZW50dWFsbHkgbmVlZAorICAgICAgICAgICAgOzsg dG8gZXhlY3ZlIHRoZW0uICBFLmcuIGdpdCdzICJsaWJleGVjIiBkaXJlY3RvcnkgY29udGFpbnMg bWFueQorICAgICAgICAgICAgOzsgc2hlbGwgc2NyaXB0cyB0aGF0IGFyZSBzb3VyY2UnZCBmcm9t IGVsc2V3aGVyZSwgd2hpY2ggZmFpbHMgaWYKKyAgICAgICAgICAgIDs7IHRoZXkgYXJlIHdyYXBw ZWQuCisgICAgICAgICAgICAoZm9yLWVhY2ggYnVpbGQtd3JhcHBlciBleGVjdXRhYmxlcykKKyAg ICAgICAgICAgIDs7IExpbmsgYW55IG90aGVyIG5vbi1leGVjdXRhYmxlIGZpbGVzCisgICAgICAg ICAgICAoZm9yLWVhY2ggKGxhbWJkYSAob2xkKQorICAgICAgICAgICAgICAgICAgICAgICAgKGxl dCAoKG5ldyAoc3RyaW5nLWFwcGVuZCB0YXJnZXQgKHN0cmlwLXN0b3JlLXByZWZpeCBvbGQpKSkp CisgICAgICAgICAgICAgICAgICAgICAgICAgIChta2Rpci1wIChkaXJuYW1lIG5ldykpCisgICAg ICAgICAgICAgICAgICAgICAgICAgIChzeW1saW5rLXJlbGF0aXZlIG9sZCBuZXcpKSkKKyAgICAg ICAgICAgICAgICAgICAgICBvdGhlcnMpKSkpKQogCiAgIChjb21wdXRlZC1maWxlIChzdHJpbmct YXBwZW5kCiAgICAgICAgICAgICAgICAgICAoY29uZCAoKHBhY2thZ2U/IHBhY2thZ2UpCmRpZmYg LS1naXQgYS90ZXN0cy9ndWl4LXBhY2stcmVsb2NhdGFibGUuc2ggYi90ZXN0cy9ndWl4LXBhY2st cmVsb2NhdGFibGUuc2gKaW5kZXggYTk2MGVjZDIwOS4uNWFjOGNkYzcxOCAxMDA2NDQKLS0tIGEv dGVzdHMvZ3VpeC1wYWNrLXJlbG9jYXRhYmxlLnNoCisrKyBiL3Rlc3RzL2d1aXgtcGFjay1yZWxv Y2F0YWJsZS5zaApAQCAtMSw1ICsxLDYgQEAKICMgR05VIEd1aXggLS0tIEZ1bmN0aW9uYWwgcGFj a2FnZSBtYW5hZ2VtZW50IGZvciBHTlUKICMgQ29weXJpZ2h0IMKpIDIwMTgsIDIwMTksIDIwMjAg THVkb3ZpYyBDb3VydMOocyA8bHVkb0BnbnUub3JnPgorIyBDb3B5cmlnaHQgwqkgMjAyMCBFcmlj IEJhdmllciA8YmF2aWVyQHBvc3Rlby5uZXQ+CiAjCiAjIFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdO VSBHdWl4LgogIwpAQCAtOTgsNiArOTksNyBAQCBjYXNlICJgdW5hbWUgLW1gIiBpbgogCXJ1bl93 aXRob3V0X3N0b3JlIEdVSVhfRVhFQ1VUSU9OX0VOR0lORT0iZmFrZWNocm9vdCIgXAogCSIkdGVz dF9kaXJlY3RvcnkvQmluL3NlZCIgLS12ZXJzaW9uID4gIiR0ZXN0X2RpcmVjdG9yeS9vdXRwdXQi CiAJZ3JlcCAnR05VIHNlZCcgIiR0ZXN0X2RpcmVjdG9yeS9vdXRwdXQiCisJdW5zZXQgR1VJWF9F WEVDVVRJT05fRU5HSU5FCiAKIAljaG1vZCAtUmYgK3cgIiR0ZXN0X2RpcmVjdG9yeSI7IHJtIC1y ZiAiJHRlc3RfZGlyZWN0b3J5Ii8qCiAKQEAgLTEzMyw4ICsxMzUsMzEgQEAgZXNhYwogdGFyYmFs bD0iYGd1aXggcGFjayAtUiAtUyAvc2hhcmU9c2hhcmUgZ3JvZmY6ZG9jYCIKIChjZCAiJHRlc3Rf ZGlyZWN0b3J5IjsgdGFyIHhmICIkdGFyYmFsbCIpCiB0ZXN0IC1kICIkdGVzdF9kaXJlY3Rvcnkv c2hhcmUvZG9jL2dyb2ZmL2h0bWwiCitjaG1vZCAtUmYgK3cgIiR0ZXN0X2RpcmVjdG9yeSI7IHJt IC1yZiAiJHRlc3RfZGlyZWN0b3J5Ii8qCiAKICMgRW5zdXJlICctUicgYXBwbGllcyB0byBwcm9w YWdhdGVkIGlucHV0cy4gIEZhaWxpbmcgdG8gZG8gdGhhdCwgaXQgd291bGQgZmFpbAogIyB3aXRo IGEgcHJvZmlsZSBjb2xsaXNpb24gZXJyb3IgaW4gdGhpcyBjYXNlIGJlY2F1c2UgJ3B5dGhvbi1z Y2lweScKICMgcHJvcGFnYXRlcyAncHl0aG9uLW51bXB5Jy4gIFNlZSA8aHR0cHM6Ly9idWdzLmdu dS5vcmcvNDI1MTA+LgogZ3VpeCBwYWNrIC1SUiBweXRob24tbnVtcHkgcHl0aG9uLXNjaXB5IC0t bm8tZ3JhZnRzIC1uCisKKyMgQ2hlY2sgdGhhdCBwYWNrYWdlcyB0aGF0IG1peCBleGVjdXRhYmxl IGFuZCBzdXBwb3J0IGZpbGVzIChlLmcuIGdpdCkgaW4gdGhlCisjICJiaW5hcnkiIGRpcmVjdG9y aWVzIHN0aWxsIHdvcmsgYWZ0ZXIgd3JhcHBlZC4KK2NhdCA+IiR0ZXN0X2RpcmVjdG9yeS9tYW5p ZmVzdC5zY20iIDw8J0VPRicKKyh1c2UtbW9kdWxlcyAoZ3VpeCkgKGd1aXggcHJvZmlsZXMpCisg ICAgICAgICAgICAgKGdudSBwYWNrYWdlcyBib290c3RyYXApKQorKG1hbmlmZXN0CisgKGxpc3Qg KG1hbmlmZXN0LWVudHJ5CisJKG5hbWUgInRlc3QiKSAodmVyc2lvbiAiMCIpCisJKGl0ZW0gKGZp bGUtdW5pb24gInRlc3QiCisJCQkgIGAoKCJiaW4vaGVsbG8iCisJCQkgICAgICwocHJvZ3JhbS1m aWxlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImhlbGxvIgorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICN+KGJlZ2luIChkaXNwbGF5IChsb2FkICIuLi9saWJleGVjL21z ZyIpKShuZXdsaW5lKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjOmd1aWxlICVi b290c3RyYXAtZ3VpbGUpKQorCQkJICAgICgibGliZXhlYy9tc2ciCisJCQkgICAgICwocGxhaW4t ZmlsZSAibXNnIiAiNDIiKSkpKSkpKSkKK0VPRgordGFyYmFsbD0iYGd1aXggcGFjayAtUlIgLVMg L29wdD0gLW0gJHRlc3RfZGlyZWN0b3J5L21hbmlmZXN0LnNjbWAiCisoY2QgIiR0ZXN0X2RpcmVj dG9yeSI7IHRhciB4dmYgIiR0YXJiYWxsIikKK3J1bl93aXRob3V0X3N0b3JlICIkdGVzdF9kaXJl Y3Rvcnkvb3B0L2Jpbi9oZWxsbyIgPiAiJHRlc3RfZGlyZWN0b3J5L291dHB1dCIKK3Rlc3QgImBj YXQgJHRlc3RfZGlyZWN0b3J5L291dHB1dGAiID0gIjQyIgotLSAKMi4yOC4wCgo= --=-wNcb9CCvVcBOKsfw/AyM--