From unknown Sat Aug 16 15:55:25 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#50179 <50179@debbugs.gnu.org> To: bug#50179 <50179@debbugs.gnu.org> Subject: Status: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode Reply-To: bug#50179 <50179@debbugs.gnu.org> Date: Sat, 16 Aug 2025 22:55:25 +0000 retitle 50179 [PATCH] Add support for "bright" ANSI colors to ansi-color an= d term-mode reassign 50179 emacs submitter 50179 Jim Porter severity 50179 wishlist tag 50179 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 24 00:03:05 2021 Received: (at submit) by debbugs.gnu.org; 24 Aug 2021 04:03:05 +0000 Received: from localhost ([127.0.0.1]:42895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mINeS-0002Kb-Od for submit@debbugs.gnu.org; Tue, 24 Aug 2021 00:03:05 -0400 Received: from lists.gnu.org ([209.51.188.17]:40158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mINeO-0002K9-9l for submit@debbugs.gnu.org; Tue, 24 Aug 2021 00:03:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mINeO-00069a-2x for bug-gnu-emacs@gnu.org; Tue, 24 Aug 2021 00:03:00 -0400 Received: from mail-ua1-x92a.google.com ([2607:f8b0:4864:20::92a]:41554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mINeM-0005r7-2P for bug-gnu-emacs@gnu.org; Tue, 24 Aug 2021 00:02:59 -0400 Received: by mail-ua1-x92a.google.com with SMTP id 75so9779410uav.8 for ; Mon, 23 Aug 2021 21:02:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=C3NxAfVxUYt1kpKR3/poy0TMpHxibuFy+gJyrWOTKPo=; b=kKXxg86VaiUH+OdA15Sr6XwIKnbO5GdAbGX21KlQKKlyFUhEguT5c7xQql/vdamKlE tSVOurIgUtlK9PqdhlbsFUnmAt092HiBrEPEDScB8gVNIxbu0NCxEfqFtDN5646oB76i 4vXKlAO9qBgeq4RvUi5gYuJiGfyU2QxyG0TaTDl+lzDKGuMwU8UEOuOQICHbGJZWRupl 5id1a+75J68sixaFBzC+PR9d4NM6tEnTTe//HTC2T5djiUrAGLu9NOQ5Bt6ZDkDmg0Vs ainB/V858V7TeGJ26QHAnfR9YpMSzubTTW0V9ueUpDXuhpp7xoxojH7zEajAQiD4Essd hD2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=C3NxAfVxUYt1kpKR3/poy0TMpHxibuFy+gJyrWOTKPo=; b=Nk4yZ7L3j71NfsBeiMKIkrs1/u6cbP2RHUMlujONABVSkI1q17tghIKp2r4xLHPqrr lJxMQtcGTN3mR9sXIHjSk5RXWXuIjqdJ57Dy9QTWZNxb0FrlD6/xWIY9Ltd/12zOa7DT R48IWj5t/XOl+k6GU0lbvDZx4C5RtteXYuMngPkpUbVIaGtZnsoO4XTX6UanxW7FNvLA IP4dInqPcKCIuEpSuBiEP2pPqJ9Zi8CcIJ6fXg/S6HoFghM96kZ90gsmfSFwJh6WisdK nNpmVwGp2QYWTHt8obRfmsClLJ+9cQpmWimts6rl8xWdQcOAQ1Y4erIyzzHetzeOTpN7 R/gw== X-Gm-Message-State: AOAM5322Y0gkUCAm1dT1E5Chpc0PTqn319Tarr6yTJe9UbSz/AdZFvtw hkLrCT6mZR28jX1+acg+uUY9Ub6/ajBmXu/sCIjUC7ex1nU= X-Google-Smtp-Source: ABdhPJwywyqCXYrNNqz/+ltEHGsZ0d0mn3uA0fKrx1qOYNLaqkb6l/XftMI50ohjfnsN8aZjYcO+8E9tgf2cl9sk3g4= X-Received: by 2002:a67:e343:: with SMTP id s3mr26648996vsm.33.1629777776802; Mon, 23 Aug 2021 21:02:56 -0700 (PDT) MIME-Version: 1.0 From: Jim Porter Date: Mon, 23 Aug 2021 21:02:46 -0700 Message-ID: Subject: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode To: bug-gnu-emacs@gnu.org Content-Type: multipart/mixed; boundary="00000000000073295805ca463576" Received-SPF: pass client-ip=2607:f8b0:4864:20::92a; envelope-from=jporterbugs@gmail.com; helo=mail-ua1-x92a.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) BAYES_40=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --00000000000073295805ca463576 Content-Type: text/plain; charset="UTF-8" Note: My copyright assignment paperwork is out of date, but I've already sent a message to assign@ to get it updated. Thus, these patches won't be able to merge right away. However, I wanted to start the review process now so that there's plenty of time for back-and-forth before Emacs 28.1 is released. With the administrative issues out of the way... these patches provide support for "bright" ANSI colors (SGR 90-97 and 100-107 for foreground and background, respectively)[1]. Most of the complexity here is due to the new defcustoms `*-bold-is-bright'. Enabling this results in ANSI "bold" text (SGR 1) to be rendered in the bright color palette (as well as being bold). This is a pretty common option in terminal emulators; all the ones I looked at[2] support it, and it's often the default behavior. For me, the main benefit of this option is so I can easily match the color palettes between Emacs and my terminal emulator. I've split this into two patches, one for 'ansi-color' and one for 'term-mode'. Despite the similarity in functionality, the implementations are pretty different. It might be nice if they could be unified somehow, but that may be more trouble than it's worth... - Jim [1] https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_(Select_Graphic_Rendition)_parameters [2] gnome-terminal, alacritty, and PuTTY --00000000000073295805ca463576 Content-Type: application/octet-stream; name="0001-Add-support-for-bright-ANSI-colors-in-ansi-color.patch" Content-Disposition: attachment; filename="0001-Add-support-for-bright-ANSI-colors-in-ansi-color.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kspjjv560 RnJvbSA3YmRhZjI0NGVjMWFiYTljYWJhZWI4YmUzY2JmZjdjNWI3OThmNGU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5jb20+CkRh dGU6IE1vbiwgMjMgQXVnIDIwMjEgMTc6NTE6MDUgLTA3MDAKU3ViamVjdDogW1BBVENIIDEvMl0g QWRkIHN1cHBvcnQgZm9yICJicmlnaHQiIEFOU0kgY29sb3JzIGluIGFuc2ktY29sb3IKCiogbGlz cC9hbnNpLWNvbG9yLmVsIChhbnNpLWJyaWdodC1jb2xvci1uYW1lcy12ZWN0b3IpOiBOZXcgZGVm Y3VzdG9tLgooYW5zaS1jb2xvci1ib2xkLWlzLWJyaWdodCk6IE5ldyBkZWZjdXN0b20uCihhbnNp LWNvbG9yLS1maW5kLWZhY2UpOiBTb3J0IEFOU0kgY29kZXMgYW5kIGNoZWNrCidhbnNpLWNvbG9y LWJvbGQtaXMtYnJpZ2h0Jy4KKGFuc2ktY29sb3ItYXBwbHktc2VxdWVuY2UpOiBTdXBwb3J0IGJy aWdodCBBTlNJIGNvbG9ycy4KKGFuc2ktY29sb3ItLWZpbGwtY29sb3ItbWFwKTogTmV3IGZ1bmN0 aW9uLgooYW5zaS1jb2xvci1tYWtlLWNvbG9yLW1hcCk6IEFkZCBicmlnaHQgQU5TSSBjb2xvcnMu CihhbnNpLWNvbG9yLWdldC1mYWNlLTEpOiBBZGQgQlJJR0hUIHBhcmFtZXRlci4KKiB0ZXN0L2xp c3AvYW5zaS1jb2xvci10ZXN0cy5lbAooYW5zaS1jb2xvci1hcHBseS1vbi1yZWdpb24tYm9sZC1p cy1icmlnaHQtdGVzdCk6IE5ldyBmdW5jdGlvbi4KLS0tCiBldGMvTkVXUyAgICAgICAgICAgICAg ICAgICAgICB8ICAgNyArKwogbGlzcC9hbnNpLWNvbG9yLmVsICAgICAgICAgICAgfCAxMTYgKysr KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogdGVzdC9saXNwL2Fuc2ktY29sb3ItdGVz dHMuZWwgfCAgNTEgKysrKysrKysrKysrKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDE0MCBpbnNlcnRp b25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ldGMvTkVXUyBiL2V0Yy9ORVdT CmluZGV4IGIyMjFmMTM2MjQuLmI4ZTc3YmVlNjggMTAwNjQ0Ci0tLSBhL2V0Yy9ORVdTCisrKyBi L2V0Yy9ORVdTCkBAIC0zNzUsNiArMzc1LDEzIEBAIGVtdWxhdG9ycyBieSB1c2luZyB0aGUgbmV3 IGlucHV0LW1ldGEtbW9kZSB3aXRoIHRoZSBzcGVjaWFsIHZhbHVlCiBUaGlzIHBhcmFtZXRlciwg c2ltaWxhciB0byAnZHJhZy13aXRoLWhlYWRlci1saW5lJywgYWxsb3dzIG1vdmluZyBmcmFtZXMK IGJ5IGRyYWdnaW5nIHRoZSB0YWIgbGluZXMgb2YgdGhlaXIgdG9wbW9zdCB3aW5kb3dzIHdpdGgg dGhlIG1vdXNlLgogCistLS0KKyoqICdhbnNpLWNvbG9yJyBub3cgc3VwcG9ydHMgImJyaWdodCIg Y29sb3IgY29kZXMuCisiQnJpZ2h0IiBBTlNJIGNvbG9yIGNvZGVzIGFyZSBub3cgZGlzcGxheWVk IHdoZW4gYXBwbHlpbmcgQU5TSSBjb2xvcgorZmlsdGVycyB1c2luZyB0aGUgY29sb3IgdmFsdWVz IGRlZmluZWQgaW4gJ2Fuc2ktYnJpZ2h0LWNvbG9yLW5hbWVzLXZlY3RvcicuCitJbiBhZGRpdGlv biwgYm9sZCB0ZXh0IHdpdGggcmVndWxhciBBTlNJIGNvbG9ycyBjYW4gYmUgZGlzcGxheWVkIGFz CisiYnJpZ2h0IiBpZiAnYW5zaS1jb2xvci1ib2xkLWlzLWJyaWdodCcgaXMgbm9uLW5pbC4KKwog DAogKiBFZGl0aW5nIENoYW5nZXMgaW4gRW1hY3MgMjguMQogCmRpZmYgLS1naXQgYS9saXNwL2Fu c2ktY29sb3IuZWwgYi9saXNwL2Fuc2ktY29sb3IuZWwKaW5kZXggNzlkYzgyMWVhMS4uMjM3NDkz MDRhMCAxMDA2NDQKLS0tIGEvbGlzcC9hbnNpLWNvbG9yLmVsCisrKyBiL2xpc3AvYW5zaS1jb2xv ci5lbApAQCAtMTUwLDYgKzE1MCw0OCBAQCBhbnNpLWNvbG9yLW5hbWVzLXZlY3RvcgogICA6dmVy c2lvbiAiMjQuNCIgOyBkZWZhdWx0IGNvbG9ycyBjb3BpZWQgZnJvbSBgeHRlcm0tc3RhbmRhcmQt Y29sb3JzJwogICA6Z3JvdXAgJ2Fuc2ktY29sb3JzKQogCisoZGVmY3VzdG9tIGFuc2ktYnJpZ2h0 LWNvbG9yLW5hbWVzLXZlY3RvcgorICBbImdyYXkzMCIgInJlZDIiICJncmVlbjIiICJ5ZWxsb3cy IiAiYmx1ZTEiICJtYWdlbnRhMiIgImN5YW4yIiAid2hpdGUiXQorICAiQ29sb3JzIHVzZWQgZm9y IFNHUiBjb250cm9sIHNlcXVlbmNlcyBkZXRlcm1pbmluZyBhIFwiYnJpZ2h0XCIgY29sb3IuCitU aGlzIHZlY3RvciBob2xkcyB0aGUgY29sb3JzIHVzZWQgZm9yIFNHUiBjb250cm9sIHNlcXVlbmNl cyBwYXJhbWV0ZXJzCis5MCB0byA5NyAoYnJpZ2h0IGZvcmVncm91bmQgY29sb3JzKSBhbmQgMTAw IHRvIDEwNyAoYnJpZ2h0YmFja2dyb3VuZAorY29sb3JzKS4KKworUGFyYW1ldGVyICAgQ29sb3IK KyAgOTAgIDEwMCAgIGJyaWdodCBibGFjaworICA5MSAgMTAxICAgYnJpZ2h0IHJlZAorICA5MiAg MTAyICAgYnJpZ2h0IGdyZWVuCisgIDkzICAxMDMgICBicmlnaHQgeWVsbG93CisgIDk0ICAxMDQg ICBicmlnaHQgYmx1ZQorICA5NSAgMTA1ICAgYnJpZ2h0IG1hZ2VudGEKKyAgOTYgIDEwNiAgIGJy aWdodCBjeWFuCisgIDk3ICAxMDcgICBicmlnaHQgd2hpdGUKKworVGhpcyB2ZWN0b3IgaXMgdXNl ZCBieSBgYW5zaS1jb2xvci1tYWtlLWNvbG9yLW1hcCcgdG8gY3JlYXRlIGEgY29sb3IKK21hcC4g IFRoaXMgY29sb3IgbWFwIGlzIHN0b3JlZCBpbiB0aGUgdmFyaWFibGUgYGFuc2ktY29sb3ItbWFw Jy4KKworRWFjaCBlbGVtZW50IG1heSBhbHNvIGJlIGEgY29ucyBjZWxsIHdoZXJlIHRoZSBjYXIg YW5kIGNkciBzcGVjaWZ5IHRoZQorZm9yZWdyb3VuZCBhbmQgYmFja2dyb3VuZCBjb2xvcnMsIHJl c3BlY3RpdmVseS4iCisgIDp0eXBlICcodmVjdG9yIChjaG9pY2UgY29sb3IgKGNvbnMgY29sb3Ig Y29sb3IpKQorICAgICAgICAgICAgICAgICAoY2hvaWNlIGNvbG9yIChjb25zIGNvbG9yIGNvbG9y KSkKKyAgICAgICAgICAgICAgICAgKGNob2ljZSBjb2xvciAoY29ucyBjb2xvciBjb2xvcikpCisg ICAgICAgICAgICAgICAgIChjaG9pY2UgY29sb3IgKGNvbnMgY29sb3IgY29sb3IpKQorICAgICAg ICAgICAgICAgICAoY2hvaWNlIGNvbG9yIChjb25zIGNvbG9yIGNvbG9yKSkKKyAgICAgICAgICAg ICAgICAgKGNob2ljZSBjb2xvciAoY29ucyBjb2xvciBjb2xvcikpCisgICAgICAgICAgICAgICAg IChjaG9pY2UgY29sb3IgKGNvbnMgY29sb3IgY29sb3IpKQorICAgICAgICAgICAgICAgICAoY2hv aWNlIGNvbG9yIChjb25zIGNvbG9yIGNvbG9yKSkpCisgIDpzZXQgJ2Fuc2ktY29sb3ItbWFwLXVw ZGF0ZQorICA6aW5pdGlhbGl6ZSAnY3VzdG9tLWluaXRpYWxpemUtZGVmYXVsdAorICA6dmVyc2lv biAiMjguMSIKKyAgOmdyb3VwICdhbnNpLWNvbG9ycykKKworKGRlZmN1c3RvbSBhbnNpLWNvbG9y LWJvbGQtaXMtYnJpZ2h0IG5pbAorICAiSWYgc2V0IHRvIG5vbi1uaWwsIGNvbWJpbmluZyBBTlNJ IGJvbGQgYW5kIGEgY29sb3IgcHJvZHVjZXMgdGhlIGJyaWdodAordmVyc2lvbiBvZiB0aGF0IGNv bG9yLiIKKyAgOnR5cGUgJ2Jvb2xlYW4KKyAgOnZlcnNpb24gIjI4LjEiCisgIDpncm91cCAnYW5z aS1jb2xvcnMpCisKIChkZWZjb25zdCBhbnNpLWNvbG9yLWNvbnRyb2wtc2VxLXJlZ2V4cAogICA7 OyBTZWUgRUNNQSA0OCwgc2VjdGlvbiA1LjQgIkNvbnRyb2wgU2VxdWVuY2VzIi4KICAgIlxlXFxb W1x4MzAtXHgzRl0qW1x4MjAtXHgyRl0qW1x4NDAtXHg3RV0iCkBAIC0zMDQsOSArMzQ2LDE0IEBA IGFuc2ktY29sb3ItZmlsdGVyLWFwcGx5CiAKIChkZWZ1biBhbnNpLWNvbG9yLS1maW5kLWZhY2Ug KGNvZGVzKQogICAiUmV0dXJuIHRoZSBmYWNlIGNvcnJlc3BvbmRpbmcgdG8gQ09ERVMuIgotICAo bGV0IChmYWNlcykKKyAgOzsgU29ydCB0aGUgY29kZXMgaW4gYXNjZW5kaW5nIG9yZGVyIHRvIGNh biBndWFyYW50ZWUgdGhhdCAiYm9sZCIgY29tZXMKKyAgOzsgYmVmb3JlIGFueSBvZiB0aGUgY29s b3JzLiAgVGhpcyBlbnN1cmVzIHRoYXQgYGFuc2ktY29sb3ItYm9sZC1pcy1icmlnaHQnCisgIDs7 IGlzIGFwcGxpZWQgY29ycmVjdGx5LgorICAobGV0IChmYWNlcyBicmlnaHQgKGNvZGVzIChzb3J0 IChjb3B5LXNlcXVlbmNlIGNvZGVzKSAjJzwpKSkKICAgICAod2hpbGUgY29kZXMKLSAgICAgIChs ZXQgKChmYWNlIChhbnNpLWNvbG9yLWdldC1mYWNlLTEgKHBvcCBjb2RlcykpKSkKKyAgICAgIChs ZXQgKChmYWNlIChhbnNpLWNvbG9yLWdldC1mYWNlLTEgKHBvcCBjb2RlcykgYnJpZ2h0KSkpCisg ICAgICAgICh3aGVuIChhbmQgYW5zaS1jb2xvci1ib2xkLWlzLWJyaWdodCAoZXEgZmFjZSAnYm9s ZCkpCisgICAgICAgICAgKHNldHEgYnJpZ2h0IHQpKQogCTs7IEluIHRoZSAoZGVmYXVsdCB1bmRl cmxpbmUpIGZhY2UsIHNheSwgdGhlIHZhbHVlIG9mIHRoZQogCTs7ICJ1bmRlcmxpbmUiIGF0dHJp YnV0ZSBvZiB0aGUgYGRlZmF1bHQnIGZhY2Ugd2lucy4KIAkodW5sZXNzIChlcSBmYWNlICdkZWZh dWx0KQpAQCAtNTcwLDExICs2MTcsMTEgQEAgYW5zaS1jb2xvci1hcHBseS1zZXF1ZW5jZQogCiBG b3IgZWFjaCBuZXcgY29kZSwgdGhlIGZvbGxvd2luZyBoYXBwZW5zOiBpZiBpdCBpcyAxLTcsIGFk ZCBpdCB0bwogdGhlIGxpc3Qgb2YgY29kZXM7IGlmIGl0IGlzIDIxLTI1IG9yIDI3LCBkZWxldGUg YXBwcm9wcmlhdGUKLXBhcmFtZXRlcnMgZnJvbSB0aGUgbGlzdCBvZiBjb2RlczsgaWYgaXQgaXMg MzAtMzcgcmVzcC4gMzksIHRoZQotZm9yZWdyb3VuZCBjb2xvciBjb2RlIGlzIHJlcGxhY2VkIG9y IGFkZGVkIHJlc3AuIGRlbGV0ZWQ7IGlmIGl0Ci1pcyA0MC00NyByZXNwLiA0OSwgdGhlIGJhY2tn cm91bmQgY29sb3IgY29kZSBpcyByZXBsYWNlZCBvciBhZGRlZAotcmVzcC4gZGVsZXRlZDsgYW55 IG90aGVyIGNvZGUgaXMgZGlzY2FyZGVkIHRvZ2V0aGVyIHdpdGggdGhlIG9sZAotY29kZXMuCUZp bmFsbHksIHRoZSBzbyBjaGFuZ2VkIGxpc3Qgb2YgY29kZXMgaXMgcmV0dXJuZWQuIgorcGFyYW1l dGVycyBmcm9tIHRoZSBsaXN0IG9mIGNvZGVzOyBpZiBpdCBpcyAzMC0zNyAob3IgOTAtOTcpIHJl c3AuIDM5LAordGhlIGZvcmVncm91bmQgY29sb3IgY29kZSBpcyByZXBsYWNlZCBvciBhZGRlZCBy ZXNwLiBkZWxldGVkOyBpZiBpdAoraXMgNDAtNDcgKG9yIDEwMC0xMDcpIHJlc3AuIDQ5LCB0aGUg YmFja2dyb3VuZCBjb2xvciBjb2RlIGlzIHJlcGxhY2VkCitvciBhZGRlZCByZXNwLiBkZWxldGVk OyBhbnkgb3RoZXIgY29kZSBpcyBkaXNjYXJkZWQgdG9nZXRoZXIgd2l0aCB0aGUKK29sZCBjb2Rl cy4gIEZpbmFsbHksIHRoZSBzbyBjaGFuZ2VkIGxpc3Qgb2YgY29kZXMgaXMgcmV0dXJuZWQuIgog ICAobGV0ICgobmV3LWNvZGVzIChhbnNpLWNvbG9yLXBhcnNlLXNlcXVlbmNlIGVzY2FwZS1zZXF1 ZW5jZSkpKQogICAgICh3aGlsZSBuZXctY29kZXMKICAgICAgIChsZXQqICgobmV3IChwb3AgbmV3 LWNvZGVzKSkKQEAgLTU5MSw3ICs2MzgsNyBAQCBhbnNpLWNvbG9yLWFwcGx5LXNlcXVlbmNlCiAJ CQkJCSgyMiAocmVtcSAxIGNvZGVzKSkKIAkJCQkJKDI1IChyZW1xIDYgY29kZXMpKQogCQkJCQko XyBjb2RlcykpKSkpCi0JCSgob3IgMyA0KSAobGV0ICgociAobW9kIG5ldyAxMCkpKQorCQkoKG9y IDMgNCA5IDEwKSAobGV0ICgociAobW9kIG5ldyAxMCkpKQogCQkJICAgICh1bmxlc3MgKD0gciA4 KQogCQkJICAgICAgKGxldCAoYmVnKQogCQkJCSh3aGlsZSAoYW5kIGNvZGVzICgvPSBxICgvIChj YXIgY29kZXMpIDEwKSkpCkBAIC02MDMsNiArNjUwLDE5IEBAIGFuc2ktY29sb3ItYXBwbHktc2Vx dWVuY2UKIAkJKF8gbmlsKSkpKSkKICAgICBjb2RlcykpCiAKKyhkZWZ1biBhbnNpLWNvbG9yLS1m aWxsLWNvbG9yLW1hcCAobWFwIG1hcC1pbmRleCBwcm9wZXJ0eSB2ZWN0b3IgZ2V0LWNvbG9yKQor ICAiRmlsbCBhIHJhbmdlIG9mIGNvbG9yIHZhbHVlcyBmcm9tIFZFQ1RPUiBhbmQgc3RvcmUgaW4g TUFQLgorCitTdGFydCBmaWxsaW5nIE1BUCBmcm9tIE1BUC1JTkRFWCwgYW5kIG1ha2UgZmFjZXMg Zm9yIFBST1BFUlRZIChgZm9yZWdyb3VuZCcKK29yIGBiYWNrZ3JvdW5kJykuIEdFVC1DT0xPUiBp cyBhIGZ1bmN0aW9uIHRha2luZyBhbiBlbGVtZW50IG9mIFZFQ1RPUiBhbmQKK3JldHVybmluZyB0 aGUgY29sb3IgdmFsdWUgdG8gdXNlLiIKKyAgKG1hcGMKKyAgIChsYW1iZGEgKGUpCisgICAgIChh c2V0IG1hcCBtYXAtaW5kZXgKKyAgICAgICAgICAgKGFuc2ktY29sb3ItbWFrZS1mYWNlIHByb3Bl cnR5IChmdW5jYWxsIGdldC1jb2xvciBlKSkpCisgICAgIChzZXRxIG1hcC1pbmRleCAoMSsgbWFw LWluZGV4KSkgKQorICAgdmVjdG9yKSkKKwogKGRlZnVuIGFuc2ktY29sb3ItbWFrZS1jb2xvci1t YXAgKCkKICAgIkNyZWF0ZXMgYSB2ZWN0b3Igb2YgZmFjZSBkZWZpbml0aW9ucyBhbmQgcmV0dXJu cyBpdC4KIApAQCAtNjExLDcgKzY3MSw3IEBAIGFuc2ktY29sb3ItbWFrZS1jb2xvci1tYXAKIAog VGhlIGZhY2UgZGVmaW5pdGlvbnMgYXJlIGJhc2VkIHVwb24gdGhlIHZhcmlhYmxlcwogYGFuc2kt Y29sb3ItZmFjZXMtdmVjdG9yJyBhbmQgYGFuc2ktY29sb3ItbmFtZXMtdmVjdG9yJy4iCi0gIChs ZXQgKChtYXAgKG1ha2UtdmVjdG9yIDUwIG5pbCkpCisgIChsZXQgKChtYXAgKG1ha2UtdmVjdG9y IDExMCBuaWwpKQogICAgICAgICAoaW5kZXggMCkpCiAgICAgOzsgbWlzY2VsbGFuZW91cyBhdHRy aWJ1dGVzCiAgICAgKG1hcGMKQEAgLTYyMCwyMyArNjgwLDIxIEBAIGFuc2ktY29sb3ItbWFrZS1j b2xvci1tYXAKICAgICAgICAoc2V0cSBpbmRleCAoMSsgaW5kZXgpKSApCiAgICAgIGFuc2ktY29s b3ItZmFjZXMtdmVjdG9yKQogICAgIDs7IGZvcmVncm91bmQgYXR0cmlidXRlcwotICAgIChzZXRx IGluZGV4IDMwKQotICAgIChtYXBjCi0gICAgIChsYW1iZGEgKGUpCi0gICAgICAgKGFzZXQgbWFw IGluZGV4Ci0gICAgICAgICAgICAgKGFuc2ktY29sb3ItbWFrZS1mYWNlICdmb3JlZ3JvdW5kCi0g ICAgICAgICAgICAgICAgICAgICAgICAgKGlmIChjb25zcCBlKSAoY2FyIGUpIGUpKSkKLSAgICAg ICAoc2V0cSBpbmRleCAoMSsgaW5kZXgpKSApCi0gICAgIGFuc2ktY29sb3ItbmFtZXMtdmVjdG9y KQorICAgIChhbnNpLWNvbG9yLS1maWxsLWNvbG9yLW1hcAorICAgICBtYXAgMzAgJ2ZvcmVncm91 bmQgYW5zaS1jb2xvci1uYW1lcy12ZWN0b3IKKyAgICAgKGxhbWJkYSAoZSkgKGlmIChjb25zcCBl KSAoY2FyIGUpIGUpKSkKICAgICA7OyBiYWNrZ3JvdW5kIGF0dHJpYnV0ZXMKLSAgICAoc2V0cSBp bmRleCA0MCkKLSAgICAobWFwYwotICAgICAobGFtYmRhIChlKQotICAgICAgIChhc2V0IG1hcCBp bmRleAotICAgICAgICAgICAgIChhbnNpLWNvbG9yLW1ha2UtZmFjZSAnYmFja2dyb3VuZAotICAg ICAgICAgICAgICAgICAgICAgICAgIChpZiAoY29uc3AgZSkgKGNkciBlKSBlKSkpCi0gICAgICAg KHNldHEgaW5kZXggKDErIGluZGV4KSkgKQotICAgICBhbnNpLWNvbG9yLW5hbWVzLXZlY3RvcikK KyAgICAoYW5zaS1jb2xvci0tZmlsbC1jb2xvci1tYXAKKyAgICAgbWFwIDQwICdiYWNrZ3JvdW5k IGFuc2ktY29sb3ItbmFtZXMtdmVjdG9yCisgICAgIChsYW1iZGEgKGUpIChpZiAoY29uc3AgZSkg KGNkciBlKSBlKSkpCisgICAgOzsgYnJpZ2h0IGZvcmVncm91bmQgYXR0cmlidXRlcworICAgIChh bnNpLWNvbG9yLS1maWxsLWNvbG9yLW1hcAorICAgICBtYXAgOTAgJ2ZvcmVncm91bmQgYW5zaS1i cmlnaHQtY29sb3ItbmFtZXMtdmVjdG9yCisgICAgIChsYW1iZGEgKGUpIChpZiAoY29uc3AgZSkg KGNhciBlKSBlKSkpCisgICAgOzsgYnJpZ2h0IGJhY2tncm91bmQgYXR0cmlidXRlcworICAgIChh bnNpLWNvbG9yLS1maWxsLWNvbG9yLW1hcAorICAgICBtYXAgMTAwICdiYWNrZ3JvdW5kIGFuc2kt YnJpZ2h0LWNvbG9yLW5hbWVzLXZlY3RvcgorICAgICAobGFtYmRhIChlKSAoaWYgKGNvbnNwIGUp IChjZHIgZSkgZSkpKQogICAgIG1hcCkpCiAKIChkZWZ2YXIgYW5zaS1jb2xvci1tYXAgKGFuc2kt Y29sb3ItbWFrZS1jb2xvci1tYXApCkBAIC02NjAsOSArNzE4LDEzIEBAIGFuc2ktY29sb3ItbWFw LXVwZGF0ZQogICAoc2V0LWRlZmF1bHQgc3ltYm9sIHZhbHVlKQogICAoc2V0cSBhbnNpLWNvbG9y LW1hcCAoYW5zaS1jb2xvci1tYWtlLWNvbG9yLW1hcCkpKQogCi0oZGVmdW4gYW5zaS1jb2xvci1n ZXQtZmFjZS0xIChhbnNpLWNvZGUpCisoZGVmdW4gYW5zaS1jb2xvci1nZXQtZmFjZS0xIChhbnNp LWNvZGUgJm9wdGlvbmFsIGJyaWdodCkKICAgIkdldCBmYWNlIGRlZmluaXRpb24gZnJvbSBgYW5z aS1jb2xvci1tYXAnLgotQU5TSS1DT0RFIGlzIHVzZWQgYXMgYW4gaW5kZXggaW50byB0aGUgdmVj dG9yLiIKK0FOU0ktQ09ERSBpcyB1c2VkIGFzIGFuIGluZGV4IGludG8gdGhlIHZlY3Rvci4gIEJS SUdIVCwgaWYgbm9uLW5pbCwKK3JlcXVlc3RzIFwiYnJpZ2h0XCIgQU5TSSBjb2xvcnMsIGV2ZW4g aWYgQU5TSS1DT0RFIGlzIGEgbm9ybWFsLWludGVuc2l0eQorY29sb3IuIgorICAod2hlbiAoYW5k IGJyaWdodCAoPD0gMzAgYW5zaS1jb2RlIDQ5KSkKKyAgICAoc2V0cSBhbnNpLWNvZGUgKCsgYW5z aS1jb2RlIDYwKSkpCiAgIChjb25kaXRpb24tY2FzZSBuaWwKICAgICAgIChhcmVmIGFuc2ktY29s b3ItbWFwIGFuc2ktY29kZSkKICAgICAoYXJncy1vdXQtb2YtcmFuZ2UgbmlsKSkpCmRpZmYgLS1n aXQgYS90ZXN0L2xpc3AvYW5zaS1jb2xvci10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9hbnNpLWNvbG9y LXRlc3RzLmVsCmluZGV4IDEwN2RjOGU0MDAuLmM5NDU2MWJkYTEgMTAwNjQ0Ci0tLSBhL3Rlc3Qv bGlzcC9hbnNpLWNvbG9yLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9hbnNpLWNvbG9yLXRlc3Rz LmVsCkBAIC0yNSwxNyArMjUsNTQgQEAKIDs7OyBDb2RlOgogCiAocmVxdWlyZSAnYW5zaS1jb2xv cikKKyhldmFsLXdoZW4tY29tcGlsZSAocmVxdWlyZSAnY2wtbGliKSkKIAotKGRlZnZhciB0ZXN0 LXN0cmluZ3MgJygoIlxlWzMzbUhlbGxvIFdvcmxkXGVbMG0iIC4gIkhlbGxvIFdvcmxkIikKLSAg ICAgICAgICAgICAgICAgICAgICAgKCJcZVsxbVxlWzNtXGVbNW1ib2xkIGl0YWxpY3MgYmxpbmtc ZVswbSIgLiAiYm9sZCBpdGFsaWNzIGJsaW5rIikpKQorKGRlZnZhciB5ZWxsb3cgKGFyZWYgYW5z aS1jb2xvci1uYW1lcy12ZWN0b3IgMykpCisoZGVmdmFyIGJyaWdodC15ZWxsb3cgKGFyZWYgYW5z aS1icmlnaHQtY29sb3ItbmFtZXMtdmVjdG9yIDMpKQorCisoZGVmdmFyIHRlc3Qtc3RyaW5ncwor ICBgKCgiXGVbMzNtSGVsbG8gV29ybGRcZVswbSIgIkhlbGxvIFdvcmxkIgorICAgICAoZm9yZWdy b3VuZC1jb2xvciAuICx5ZWxsb3cpKQorICAgICgiXGVbNDNtSGVsbG8gV29ybGRcZVswbSIgIkhl bGxvIFdvcmxkIgorICAgICAoYmFja2dyb3VuZC1jb2xvciAuICx5ZWxsb3cpKQorICAgICgiXGVb OTNtSGVsbG8gV29ybGRcZVswbSIgIkhlbGxvIFdvcmxkIgorICAgICAoZm9yZWdyb3VuZC1jb2xv ciAuICxicmlnaHQteWVsbG93KSkKKyAgICAoIlxlWzEwM21IZWxsbyBXb3JsZFxlWzBtIiAiSGVs bG8gV29ybGQiCisgICAgIChiYWNrZ3JvdW5kLWNvbG9yIC4gLGJyaWdodC15ZWxsb3cpKQorICAg ICgiXGVbMTszM21IZWxsbyBXb3JsZFxlWzBtIiAiSGVsbG8gV29ybGQiCisgICAgIChib2xkIChm b3JlZ3JvdW5kLWNvbG9yIC4gLHllbGxvdykpCisgICAgIChib2xkIChmb3JlZ3JvdW5kLWNvbG9y IC4gLGJyaWdodC15ZWxsb3cpKSkKKyAgICAoIlxlWzMzOzFtSGVsbG8gV29ybGRcZVswbSIgIkhl bGxvIFdvcmxkIgorICAgICAoYm9sZCAoZm9yZWdyb3VuZC1jb2xvciAuICx5ZWxsb3cpKQorICAg ICAoYm9sZCAoZm9yZWdyb3VuZC1jb2xvciAuICxicmlnaHQteWVsbG93KSkpCisgICAgKCJcZVsx bVxlWzMzbUhlbGxvIFdvcmxkXGVbMG0iICJIZWxsbyBXb3JsZCIKKyAgICAgKGJvbGQgKGZvcmVn cm91bmQtY29sb3IgLiAseWVsbG93KSkKKyAgICAgKGJvbGQgKGZvcmVncm91bmQtY29sb3IgLiAs YnJpZ2h0LXllbGxvdykpKQorICAgICgiXGVbMzNtXGVbMW1IZWxsbyBXb3JsZFxlWzBtIiAiSGVs bG8gV29ybGQiCisgICAgIChib2xkIChmb3JlZ3JvdW5kLWNvbG9yIC4gLHllbGxvdykpCisgICAg IChib2xkIChmb3JlZ3JvdW5kLWNvbG9yIC4gLGJyaWdodC15ZWxsb3cpKSkKKyAgICAoIlxlWzFt XGVbM21cZVs1bWJvbGQgaXRhbGljcyBibGlua1xlWzBtIiAiYm9sZCBpdGFsaWNzIGJsaW5rIgor ICAgICAoYm9sZCBpdGFsaWMgc3VjY2VzcykpKSkKIAogKGVydC1kZWZ0ZXN0IGFuc2ktY29sb3It YXBwbHktb24tcmVnaW9uLXRlc3QgKCkKLSAgICAoZG9saXN0IChwYWlyIHRlc3Qtc3RyaW5ncykK LSAgICAgICh3aXRoLXRlbXAtYnVmZmVyCi0gICAgICAgIChpbnNlcnQgKGNhciBwYWlyKSkKKyAg KHBjYXNlLWRvbGlzdCAoYCgsaW5wdXQgLHRleHQgLGZhY2UpIHRlc3Qtc3RyaW5ncykKKyAgICAo d2l0aC10ZW1wLWJ1ZmZlcgorICAgICAgKGluc2VydCBpbnB1dCkKKyAgICAgIChhbnNpLWNvbG9y LWFwcGx5LW9uLXJlZ2lvbiAocG9pbnQtbWluKSAocG9pbnQtbWF4KSkKKyAgICAgIChzaG91bGQg KGVxdWFsIChidWZmZXItc3RyaW5nKSB0ZXh0KSkKKyAgICAgIChzaG91bGQgKGVxdWFsIChnZXQt Y2hhci1wcm9wZXJ0eSAocG9pbnQtbWluKSAnZmFjZSkgZmFjZSkpCisgICAgICAoc2hvdWxkIChu b3QgKGVxdWFsIChvdmVybGF5cy1hdCAocG9pbnQtbWluKSkgbmlsKSkpKSkpCisKKyhlcnQtZGVm dGVzdCBhbnNpLWNvbG9yLWFwcGx5LW9uLXJlZ2lvbi1ib2xkLWlzLWJyaWdodC10ZXN0ICgpCisg IChwY2FzZS1kb2xpc3QgKGAoLGlucHV0ICx0ZXh0ICxmYWNlICxicmlnaHQtZmFjZSkgdGVzdC1z dHJpbmdzKQorICAgICh3aXRoLXRlbXAtYnVmZmVyCisgICAgICAobGV0ICgoYW5zaS1jb2xvci1i b2xkLWlzLWJyaWdodCB0KSkKKyAgICAgICAgKGluc2VydCBpbnB1dCkKICAgICAgICAgKGFuc2kt Y29sb3ItYXBwbHktb24tcmVnaW9uIChwb2ludC1taW4pIChwb2ludC1tYXgpKQotICAgICAgICAo c2hvdWxkIChlcXVhbCAoYnVmZmVyLXN0cmluZykgKGNkciBwYWlyKSkpCi0gICAgICAgIChzaG91 bGQgKG5vdCAoZXF1YWwgKG92ZXJsYXlzLWF0IChwb2ludC1taW4pKSBuaWwpKSkpKSkKKyAgICAg ICAgKHNob3VsZCAoZXF1YWwgKGJ1ZmZlci1zdHJpbmcpIHRleHQpKQorICAgICAgICAoc2hvdWxk IChlcXVhbCAoZ2V0LWNoYXItcHJvcGVydHkgKHBvaW50LW1pbikgJ2ZhY2UpCisgICAgICAgICAg ICAgICAgICAgICAgIChvciBicmlnaHQtZmFjZSBmYWNlKSkpCisgICAgICAgIChzaG91bGQgKG5v dCAoZXF1YWwgKG92ZXJsYXlzLWF0IChwb2ludC1taW4pKSBuaWwpKSkpKSkpCiAKIChlcnQtZGVm dGVzdCBhbnNpLWNvbG9yLWFwcGx5LW9uLXJlZ2lvbi1wcmVzZXJ2aW5nLXRlc3QgKCkKICAgICAo ZG9saXN0IChwYWlyIHRlc3Qtc3RyaW5ncykKLS0gCjIuMjUuMQoK --00000000000073295805ca463576 Content-Type: application/octet-stream; name="0002-Add-support-for-bright-ANSI-colors-in-term-mode.patch" Content-Disposition: attachment; filename="0002-Add-support-for-bright-ANSI-colors-in-term-mode.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kspjjv5b1 RnJvbSA2ODA5OGM4ZjVmZjI3ZjMwZjgzNTk1MzIxNGZiMTc3Y2RhMGE3YTVlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5jb20+CkRh dGU6IE1vbiwgMjMgQXVnIDIwMjEgMjA6MTI6MTAgLTA3MDAKU3ViamVjdDogW1BBVENIIDIvMl0g QWRkIHN1cHBvcnQgZm9yICJicmlnaHQiIEFOU0kgY29sb3JzIGluIHRlcm0tbW9kZQoKKiBsaXN0 L3Rlcm0uZWwgKGFuc2ktdGVybS1jb2xvci12ZWN0b3IpOiBBZGQgbmV3IGZhY2VzLgoodGVybS1j b2xvci13aGl0ZSk6IFR3ZWFrIGNvbG9ycy4KKHRlcm0tY29sb3ItYnJpZ2h0LSopOiBOZXcgZmFj ZXMuCih0ZXJtLWNvbG9yLWJvbGQtaXMtYnJpZ2h0KTogTmV3IGRlZmN1c3RvbS4KKHRlcm0tLW1h eWJlLWJyaWdodGVuLWNvbG9yKTogTmV3IGZ1bmN0aW9uLgoodGVybS1oYW5kbGUtY29sb3JzLWFy cmF5KTogSGFuZGxlIGJyaWdodCBjb2xvcnMuCiogdGVzdC9saXNwL3Rlcm0tdGVzdHMuZWwgKHRl cm0tY29sb3JzLCB0ZXJtLWNvbG9ycy1ib2xkLWlzLWJyaWdodCk6Ck5ldyBmdW5jdGlvbnMuCi0t LQogZXRjL05FV1MgICAgICAgICAgICAgICAgfCAgIDcgKysKIGxpc3AvdGVybS5lbCAgICAgICAg ICAgIHwgMTQwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIHRlc3Qv bGlzcC90ZXJtLXRlc3RzLmVsIHwgIDU5ICsrKysrKysrKysrKysrKystCiAzIGZpbGVzIGNoYW5n ZWQsIDE3NCBpbnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ldGMv TkVXUyBiL2V0Yy9ORVdTCmluZGV4IGI4ZTc3YmVlNjguLmRkYzczZDAxYWYgMTAwNjQ0Ci0tLSBh L2V0Yy9ORVdTCisrKyBiL2V0Yy9ORVdTCkBAIC0yMzY3LDYgKzIzNjcsMTMgQEAgYmFzZWQgb24g dGhlIGN1cnJlbnQgd2luZG93IHNpemUuICBJbiBwcmV2aW91cyB2ZXJzaW9ucyBvZiBFbWFjcywg dGhpcwogd2FzIGFsd2F5cyBkb25lIChhbmQgdGhhdCBjb3VsZCBsZWFkIHRvIG9kZCBkaXNwbGF5 cyB3aGVuIHJlc2l6aW5nIHRoZQogd2luZG93IGFmdGVyIHN0YXJ0aW5nKS4gIFRoaXMgdmFyaWFi bGUgZGVmYXVsdHMgdG8gbmlsLgogCistLS0KKyoqKiAndGVybS1tb2RlJyBub3cgc3VwcG9ydHMg ImJyaWdodCIgY29sb3IgY29kZXMuCisiQnJpZ2h0IiBBTlNJIGNvbG9yIGNvZGVzIGFyZSBub3cg ZGlzcGxheWVkIHVzaW5nIHRoZSBjb2xvciB2YWx1ZXMKK2RlZmluZWQgaW4gJ3Rlcm0tY29sb3It YnJpZ2h0LSonLiAgSW4gYWRkaXRpb24sIGJvbGQgdGV4dCB3aXRoIHJlZ3VsYXIKK0FOU0kgY29s b3JzIGNhbiBiZSBkaXNwbGF5ZWQgYXMgImJyaWdodCIgaWYgJ3Rlcm0tY29sb3ItYm9sZC1pcy1i cmlnaHQnCitpcyBub24tbmlsLgorCiAqKiBXaWRnZXQKIAogKysrCmRpZmYgLS1naXQgYS9saXNw L3Rlcm0uZWwgYi9saXNwL3Rlcm0uZWwKaW5kZXggYjM4NzBhODE0ZC4uMzk4YjYxYjYzMCAxMDA2 NDQKLS0tIGEvbGlzcC90ZXJtLmVsCisrKyBiL2xpc3AvdGVybS5lbApAQCAtNzI3LDcgKzcyNywx NSBAQCBhbnNpLXRlcm0tY29sb3ItdmVjdG9yCiAgICB0ZXJtLWNvbG9yLWJsdWUKICAgIHRlcm0t Y29sb3ItbWFnZW50YQogICAgdGVybS1jb2xvci1jeWFuCi0gICB0ZXJtLWNvbG9yLXdoaXRlXSkK KyAgIHRlcm0tY29sb3Itd2hpdGUKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LWJsYWNrCisgICB0ZXJt LWNvbG9yLWJyaWdodC1yZWQKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LWdyZWVuCisgICB0ZXJtLWNv bG9yLWJyaWdodC15ZWxsb3cKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LWJsdWUKKyAgIHRlcm0tY29s b3ItYnJpZ2h0LW1hZ2VudGEKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LWN5YW4KKyAgIHRlcm0tY29s b3ItYnJpZ2h0LXdoaXRlXSkKIAogKGRlZmN1c3RvbSB0ZXJtLWRlZmF1bHQtZmctY29sb3Igbmls CiAgICJJZiBub24tbmlsLCBkZWZhdWx0IGNvbG9yIGZvciBmb3JlZ3JvdW5kIGluIFRlcm0gbW9k ZS4iCkBAIC03OTcsMTAgKzgwNSw1NyBAQCB0ZXJtLWNvbG9yLWN5YW4KICAgOmdyb3VwICd0ZXJt KQogCiAoZGVmZmFjZSB0ZXJtLWNvbG9yLXdoaXRlCi0gICcoKHQgOmZvcmVncm91bmQgIndoaXRl IiA6YmFja2dyb3VuZCAid2hpdGUiKSkKKyAgJygodCA6Zm9yZWdyb3VuZCAiZ3JleTkwIiA6YmFj a2dyb3VuZCAiZ3JheTkwIikpCiAgICJGYWNlIHVzZWQgdG8gcmVuZGVyIHdoaXRlIGNvbG9yIGNv ZGUuIgogICA6Z3JvdXAgJ3Rlcm0pCiAKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0LWJsYWNr CisgICcoKHQgOmZvcmVncm91bmQgImdyYXkzMCIgOmJhY2tncm91bmQgImdyYXkzMCIpKQorICAi RmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgYmxhY2sgY29sb3IgY29kZS4iCisgIDpncm91cCAn dGVybSkKKworKGRlZmZhY2UgdGVybS1jb2xvci1icmlnaHQtcmVkCisgICcoKHQgOmZvcmVncm91 bmQgInJlZDIiIDpiYWNrZ3JvdW5kICJyZWQyIikpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJy aWdodCByZWQgY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybSkKKworKGRlZmZhY2UgdGVybS1j b2xvci1icmlnaHQtZ3JlZW4KKyAgJygodCA6Zm9yZWdyb3VuZCAiZ3JlZW4yIiA6YmFja2dyb3Vu ZCAiZ3JlZW4yIikpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJyaWdodCBncmVlbiBjb2xvciBj b2RlLiIKKyAgOmdyb3VwICd0ZXJtKQorCisoZGVmZmFjZSB0ZXJtLWNvbG9yLWJyaWdodC15ZWxs b3cKKyAgJygodCA6Zm9yZWdyb3VuZCAieWVsbG93MiIgOmJhY2tncm91bmQgInllbGxvdzIiKSkK KyAgIkZhY2UgdXNlZCB0byByZW5kZXIgYnJpZ2h0IHllbGxvdyBjb2xvciBjb2RlLiIKKyAgOmdy b3VwICd0ZXJtKQorCisoZGVmZmFjZSB0ZXJtLWNvbG9yLWJyaWdodC1ibHVlCisgICcoKHQgOmZv cmVncm91bmQgImJsdWUxIiA6YmFja2dyb3VuZCAiYmx1ZTEiKSkKKyAgIkZhY2UgdXNlZCB0byBy ZW5kZXIgYnJpZ2h0IGJsdWUgY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybSkKKworKGRlZmZh Y2UgdGVybS1jb2xvci1icmlnaHQtbWFnZW50YQorICAnKCh0IDpmb3JlZ3JvdW5kICJtYWdlbnRh MiIgOmJhY2tncm91bmQgIm1hZ2VudGEyIikpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJyaWdo dCBtYWdlbnRhIGNvbG9yIGNvZGUuIgorICA6Z3JvdXAgJ3Rlcm0pCisKKyhkZWZmYWNlIHRlcm0t Y29sb3ItYnJpZ2h0LWN5YW4KKyAgJygodCA6Zm9yZWdyb3VuZCAiY3lhbjIiIDpiYWNrZ3JvdW5k ICJjeWFuMiIpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgY3lhbiBjb2xvciBjb2Rl LiIKKyAgOmdyb3VwICd0ZXJtKQorCisoZGVmZmFjZSB0ZXJtLWNvbG9yLWJyaWdodC13aGl0ZQor ICAnKCh0IDpmb3JlZ3JvdW5kICJ3aGl0ZSIgOmJhY2tncm91bmQgIndoaXRlIikpCisgICJGYWNl IHVzZWQgdG8gcmVuZGVyIGJyaWdodCB3aGl0ZSBjb2xvciBjb2RlLiIKKyAgOmdyb3VwICd0ZXJt KQorCisoZGVmY3VzdG9tIHRlcm0tY29sb3ItYm9sZC1pcy1icmlnaHQgbmlsCisgICJJZiBzZXQg dG8gbm9uLW5pbCwgY29tYmluaW5nIEFOU0kgYm9sZCBhbmQgYSBjb2xvciBwcm9kdWNlcyB0aGUg YnJpZ2h0Cit2ZXJzaW9uIG9mIHRoYXQgY29sb3IuIgorICA6Z3JvdXAgJ3Rlcm0KKyAgOnR5cGUg J2Jvb2xlYW4KKyAgOnZlcnNpb24gIjI4LjEiKQorCiAoZGVmY3VzdG9tIHRlcm0tYnVmZmVyLW1h eGltdW0tc2l6ZSA4MTkyCiAgICJUaGUgbWF4aW11bSBzaXplIGluIGxpbmVzIGZvciB0ZXJtIGJ1 ZmZlcnMuCiBUZXJtIGJ1ZmZlcnMgYXJlIHRydW5jYXRlZCBmcm9tIHRoZSB0b3AgdG8gYmUgbm8g Z3JlYXRlciB0aGFuIHRoaXMgbnVtYmVyLgpAQCAtMzIyNSw2ICszMjgwLDE1IEBAIHRlcm0tcmVz ZXQtdGVybWluYWwKICAgOzsgRklYTUU6IE5vIGlkZWEgd2h5IHRoaXMgaXMgaGVyZSwgaXQgbG9v a3Mgd3JvbmcuICAtLVN0ZWYKICAgKHNldHEgdGVybS1hbnNpLWZhY2UtYWxyZWFkeS1kb25lIG5p bCkpCiAKKyhkZWZ1biB0ZXJtLS1tYXliZS1icmlnaHRlbi1jb2xvciAoY29sb3IgYm9sZCkKKyAg IlBvc3NpYmx5IGNvbnZlcnQgQ09MT1IgdG8gaXRzIGJyaWdodCB2YXJpYW50LgorQ09MT1IgaXMg YW4gaW5kZXggaW50byBgYW5zaS10ZXJtLWNvbG9yLXZlY3RvcicuICBJZiBCT0xEIGFuZAorYHRl cm0tY29sb3ItYm9sZC1pcy1icmlnaHQnIGFyZSBub24tbmlsIGFuZCBDT0xPUiBpcyBhIHJlZ3Vs YXIgY29sb3IsCityZXR1cm4gdGhlIGJyaWdodCB2ZXJzaW9uIG9mIENPTE9SOyBvdGhlcndpc2Us IHJldHVybiBDT0xPUi4iCisgIChpZiAoYW5kIHRlcm0tY29sb3ItYm9sZC1pcy1icmlnaHQgYm9s ZCAoPD0gMSBjb2xvciA4KSkKKyAgICAgICgrIGNvbG9yIDgpCisgICAgY29sb3IpKQorCiA7OyBO ZXcgZnVuY3Rpb24gdG8gZGVhbCB3aXRoIGFuc2kgY29sb3JpemVkIG91dHB1dCwgYXMgeW91IGNh biBzZWUgeW91IGNhbgogOzsgaGF2ZSBhbnkgYm9sZC91bmRlcmxpbmUvZmcvYmcvcmV2ZXJzZSBj b21iaW5hdGlvbi4gLW1tCiAKQEAgLTMyNjQsNiArMzMyOCwxMCBAQCB0ZXJtLWhhbmRsZS1jb2xv cnMtYXJyYXkKICAgICgoYW5kICg+PSBwYXJhbWV0ZXIgMzApICg8PSBwYXJhbWV0ZXIgMzcpKQog ICAgIChzZXRxIHRlcm0tYW5zaS1jdXJyZW50LWNvbG9yICgtIHBhcmFtZXRlciAyOSkpKQogCisg ICA7OyBCcmlnaHQgZm9yZWdyb3VuZAorICAgKChhbmQgKD49IHBhcmFtZXRlciA5MCkgKDw9IHBh cmFtZXRlciA5NykpCisgICAgKHNldHEgdGVybS1hbnNpLWN1cnJlbnQtY29sb3IgKC0gcGFyYW1l dGVyIDgxKSkpCisKICAgIDs7IFJlc2V0IGZvcmVncm91bmQKICAgICgoZXEgcGFyYW1ldGVyIDM5 KQogICAgIChzZXRxIHRlcm0tYW5zaS1jdXJyZW50LWNvbG9yIDApKQpAQCAtMzI3Miw2ICszMzQw LDEwIEBAIHRlcm0taGFuZGxlLWNvbG9ycy1hcnJheQogICAgKChhbmQgKD49IHBhcmFtZXRlciA0 MCkgKDw9IHBhcmFtZXRlciA0NykpCiAgICAgKHNldHEgdGVybS1hbnNpLWN1cnJlbnQtYmctY29s b3IgKC0gcGFyYW1ldGVyIDM5KSkpCiAKKyAgIDs7IEJyaWdodCBmb3JlZ3JvdW5kCisgICAoKGFu ZCAoPj0gcGFyYW1ldGVyIDEwMCkgKDw9IHBhcmFtZXRlciAxMDcpKQorICAgIChzZXRxIHRlcm0t YW5zaS1jdXJyZW50LWJnLWNvbG9yICgtIHBhcmFtZXRlciA5MSkpKQorCiAgICA7OyBSZXNldCBi YWNrZ3JvdW5kCiAgICAoKGVxIHBhcmFtZXRlciA0OSkKICAgICAoc2V0cSB0ZXJtLWFuc2ktY3Vy cmVudC1iZy1jb2xvciAwKSkKQEAgLTMyOTAsMzcgKzMzNjIsNDMgQEAgdGVybS1oYW5kbGUtY29s b3JzLWFycmF5CiAgIDs7ICAgICAgICAgIHRlcm0tYW5zaS1jdXJyZW50LWJnLWNvbG9yKQogCiAg ICh1bmxlc3MgdGVybS1hbnNpLWZhY2UtYWxyZWFkeS1kb25lCi0gICAgKGlmIHRlcm0tYW5zaS1j dXJyZW50LWludmlzaWJsZQotICAgICAgICAobGV0ICgoY29sb3IKLSAgICAgICAgICAgICAgIChp ZiB0ZXJtLWFuc2ktY3VycmVudC1yZXZlcnNlCi0gICAgICAgICAgICAgICAgICAgKGZhY2UtZm9y ZWdyb3VuZAotICAgICAgICAgICAgICAgICAgICAoZWx0IGFuc2ktdGVybS1jb2xvci12ZWN0b3Ig dGVybS1hbnNpLWN1cnJlbnQtY29sb3IpCi0gICAgICAgICAgICAgICAgICAgIG5pbCAnZGVmYXVs dCkKLSAgICAgICAgICAgICAgICAgKGZhY2UtYmFja2dyb3VuZAotICAgICAgICAgICAgICAgICAg KGVsdCBhbnNpLXRlcm0tY29sb3ItdmVjdG9yIHRlcm0tYW5zaS1jdXJyZW50LWJnLWNvbG9yKQot ICAgICAgICAgICAgICAgICAgbmlsICdkZWZhdWx0KSkpKQotICAgICAgICAgIChzZXRxIHRlcm0t Y3VycmVudC1mYWNlCi0gICAgICAgICAgICAgICAgKGxpc3QgOmJhY2tncm91bmQgY29sb3IKLSAg ICAgICAgICAgICAgICAgICAgICA6Zm9yZWdyb3VuZCBjb2xvcikpCi0gICAgICAgICAgKSA7OyBO byBuZWVkIHRvIGJvdGhlciB3aXRoIGFueXRoaW5nIGVsc2UgaWYgaXQncyBpbnZpc2libGUuCi0g ICAgICAoc2V0cSB0ZXJtLWN1cnJlbnQtZmFjZQotICAgICAgICAgICAgKGxpc3QgOmZvcmVncm91 bmQKLSAgICAgICAgICAgICAgICAgIChmYWNlLWZvcmVncm91bmQKLSAgICAgICAgICAgICAgICAg ICAoZWx0IGFuc2ktdGVybS1jb2xvci12ZWN0b3IgdGVybS1hbnNpLWN1cnJlbnQtY29sb3IpCi0g ICAgICAgICAgICAgICAgICAgbmlsICdkZWZhdWx0KQotICAgICAgICAgICAgICAgICAgOmJhY2tn cm91bmQKLSAgICAgICAgICAgICAgICAgIChmYWNlLWJhY2tncm91bmQKLSAgICAgICAgICAgICAg ICAgICAoZWx0IGFuc2ktdGVybS1jb2xvci12ZWN0b3IgdGVybS1hbnNpLWN1cnJlbnQtYmctY29s b3IpCi0gICAgICAgICAgICAgICAgICAgbmlsICdkZWZhdWx0KQotICAgICAgICAgICAgICAgICAg OmludmVyc2UtdmlkZW8gdGVybS1hbnNpLWN1cnJlbnQtcmV2ZXJzZSkpCi0KLSAgICAgICh3aGVu IHRlcm0tYW5zaS1jdXJyZW50LWJvbGQKKyAgICAobGV0ICgoY3VycmVudC1jb2xvciAodGVybS0t bWF5YmUtYnJpZ2h0ZW4tY29sb3IKKyAgICAgICAgICAgICAgICAgICAgICAgICAgdGVybS1hbnNp LWN1cnJlbnQtY29sb3IKKyAgICAgICAgICAgICAgICAgICAgICAgICAgdGVybS1hbnNpLWN1cnJl bnQtYm9sZCkpCisgICAgICAgICAgKGN1cnJlbnQtYmctY29sb3IgKHRlcm0tLW1heWJlLWJyaWdo dGVuLWNvbG9yCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRlcm0tYW5zaS1jdXJyZW50 LWJnLWNvbG9yCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRlcm0tYW5zaS1jdXJyZW50 LWJvbGQpKSkKKyAgICAgIChpZiB0ZXJtLWFuc2ktY3VycmVudC1pbnZpc2libGUKKyAgICAgICAg ICAobGV0ICgoY29sb3IKKyAgICAgICAgICAgICAgICAgKGlmIHRlcm0tYW5zaS1jdXJyZW50LXJl dmVyc2UKKyAgICAgICAgICAgICAgICAgICAgIChmYWNlLWZvcmVncm91bmQKKyAgICAgICAgICAg ICAgICAgICAgICAoZWx0IGFuc2ktdGVybS1jb2xvci12ZWN0b3IgY3VycmVudC1jb2xvcikKKyAg ICAgICAgICAgICAgICAgICAgICBuaWwgJ2RlZmF1bHQpCisgICAgICAgICAgICAgICAgICAgKGZh Y2UtYmFja2dyb3VuZAorICAgICAgICAgICAgICAgICAgICAoZWx0IGFuc2ktdGVybS1jb2xvci12 ZWN0b3IgY3VycmVudC1iZy1jb2xvcikKKyAgICAgICAgICAgICAgICAgICAgbmlsICdkZWZhdWx0 KSkpKQorICAgICAgICAgICAgKHNldHEgdGVybS1jdXJyZW50LWZhY2UKKyAgICAgICAgICAgICAg ICAgIChsaXN0IDpiYWNrZ3JvdW5kIGNvbG9yCisgICAgICAgICAgICAgICAgICAgICAgICA6Zm9y ZWdyb3VuZCBjb2xvcikpCisgICAgICAgICAgICApIDs7IE5vIG5lZWQgdG8gYm90aGVyIHdpdGgg YW55dGhpbmcgZWxzZSBpZiBpdCdzIGludmlzaWJsZS4KICAgICAgICAgKHNldHEgdGVybS1jdXJy ZW50LWZhY2UKLSAgICAgICAgICAgICAgYCgsdGVybS1jdXJyZW50LWZhY2UgOmluaGVyaXQgdGVy bS1ib2xkKSkpCisgICAgICAgICAgICAgIChsaXN0IDpmb3JlZ3JvdW5kCisgICAgICAgICAgICAg ICAgICAgIChmYWNlLWZvcmVncm91bmQKKyAgICAgICAgICAgICAgICAgICAgIChlbHQgYW5zaS10 ZXJtLWNvbG9yLXZlY3RvciBjdXJyZW50LWNvbG9yKQorICAgICAgICAgICAgICAgICAgICAgbmls ICdkZWZhdWx0KQorICAgICAgICAgICAgICAgICAgICA6YmFja2dyb3VuZAorICAgICAgICAgICAg ICAgICAgICAoZmFjZS1iYWNrZ3JvdW5kCisgICAgICAgICAgICAgICAgICAgICAoZWx0IGFuc2kt dGVybS1jb2xvci12ZWN0b3IgY3VycmVudC1iZy1jb2xvcikKKyAgICAgICAgICAgICAgICAgICAg IG5pbCAnZGVmYXVsdCkKKyAgICAgICAgICAgICAgICAgICAgOmludmVyc2UtdmlkZW8gdGVybS1h bnNpLWN1cnJlbnQtcmV2ZXJzZSkpCisKKyAgICAgICAgKHdoZW4gdGVybS1hbnNpLWN1cnJlbnQt Ym9sZAorICAgICAgICAgIChzZXRxIHRlcm0tY3VycmVudC1mYWNlCisgICAgICAgICAgICAgICAg YCgsdGVybS1jdXJyZW50LWZhY2UgOmluaGVyaXQgdGVybS1ib2xkKSkpCiAKLSAgICAgICh3aGVu IHRlcm0tYW5zaS1jdXJyZW50LXVuZGVybGluZQotICAgICAgICAoc2V0cSB0ZXJtLWN1cnJlbnQt ZmFjZQotICAgICAgICAgICAgICBgKCx0ZXJtLWN1cnJlbnQtZmFjZSA6aW5oZXJpdCB0ZXJtLXVu ZGVybGluZSkpKSkpCisgICAgICAgICh3aGVuIHRlcm0tYW5zaS1jdXJyZW50LXVuZGVybGluZQor ICAgICAgICAgIChzZXRxIHRlcm0tY3VycmVudC1mYWNlCisgICAgICAgICAgICAgICAgYCgsdGVy bS1jdXJyZW50LWZhY2UgOmluaGVyaXQgdGVybS11bmRlcmxpbmUpKSkpKSkKIAogICA7OwkobWVz c2FnZSAiRGVidWcgJVMiIHRlcm0tY3VycmVudC1mYWNlKQogICA7OyBGSVhNRTogc2hvdWxkbid0 IHdlIHNldCB0ZXJtLWFuc2ktZmFjZS1hbHJlYWR5LWRvbmUgdG8gdCBoZXJlPyAgLS1TdGVmCmRp ZmYgLS1naXQgYS90ZXN0L2xpc3AvdGVybS10ZXN0cy5lbCBiL3Rlc3QvbGlzcC90ZXJtLXRlc3Rz LmVsCmluZGV4IDUwYWMzNzBiNWIuLmE2MWQwOTM5ZWEgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC90 ZXJtLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC90ZXJtLXRlc3RzLmVsCkBAIC0yOCw2ICsyOCw0 NSBAQAogKGRlZnZhciB0ZXJtLWhlaWdodCkgICAgICAgICAgICAgICAgICAgIDsgTnVtYmVyIG9m IGxpbmVzIGluIHdpbmRvdy4KIChkZWZ2YXIgdGVybS13aWR0aCkgICAgICAgICAgICAgICAgICAg ICA7IE51bWJlciBvZiBjb2x1bW5zIGluIHdpbmRvdy4KIAorKGRlZnZhciB5ZWxsb3ctZmctcHJv cHMKKyAgJyg6Zm9yZWdyb3VuZCAieWVsbG93MyIgOmJhY2tncm91bmQgInVuc3BlY2lmaWVkLWJn IiA6aW52ZXJzZS12aWRlbyBuaWwpKQorKGRlZnZhciB5ZWxsb3ctYmctcHJvcHMKKyAgJyg6Zm9y ZWdyb3VuZCAidW5zcGVjaWZpZWQtZmciIDpiYWNrZ3JvdW5kICJ5ZWxsb3czIiA6aW52ZXJzZS12 aWRlbyBuaWwpKQorKGRlZnZhciBicmlnaHQteWVsbG93LWZnLXByb3BzCisgICcoOmZvcmVncm91 bmQgInllbGxvdzIiIDpiYWNrZ3JvdW5kICJ1bnNwZWNpZmllZC1iZyIgOmludmVyc2UtdmlkZW8g bmlsKSkKKyhkZWZ2YXIgYnJpZ2h0LXllbGxvdy1iZy1wcm9wcworICAnKDpmb3JlZ3JvdW5kICJ1 bnNwZWNpZmllZC1mZyIgOmJhY2tncm91bmQgInllbGxvdzIiIDppbnZlcnNlLXZpZGVvIG5pbCkp CisKKyhkZWZ2YXIgYW5zaS10ZXN0LXN0cmluZ3MKKyAgYCgoIlxlWzMzbUhlbGxvIFdvcmxkXGVb MG0iCisgICAgICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdmb250LWxvY2stZmFjZSB5ZWxs b3ctZmctcHJvcHMpKQorICAgICgiXGVbNDNtSGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChwcm9w ZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1mYWNlIHllbGxvdy1iZy1wcm9wcykpCisg ICAgKCJcZVs5M21IZWxsbyBXb3JsZFxlWzBtIgorICAgICAsKHByb3BlcnRpemUgIkhlbGxvIFdv cmxkIiAnZm9udC1sb2NrLWZhY2UgYnJpZ2h0LXllbGxvdy1mZy1wcm9wcykpCisgICAgKCJcZVsx MDNtSGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2Zv bnQtbG9jay1mYWNlIGJyaWdodC15ZWxsb3ctYmctcHJvcHMpKQorICAgICgiXGVbMTszM21IZWxs byBXb3JsZFxlWzBtIgorICAgICAsKHByb3BlcnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2Nr LWZhY2UKKyAgICAgICAgICAgICAgICAgIGAoLHllbGxvdy1mZy1wcm9wcyA6aW5oZXJpdCB0ZXJt LWJvbGQpKQorICAgICAsKHByb3BlcnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UK KyAgICAgICAgICAgICAgICAgIGAoLGJyaWdodC15ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQgdGVy bS1ib2xkKSkpCisgICAgKCJcZVszMzsxbUhlbGxvIFdvcmxkXGVbMG0iCisgICAgICwocHJvcGVy dGl6ZSAiSGVsbG8gV29ybGQiICdmb250LWxvY2stZmFjZQorICAgICAgICAgICAgICAgICAgYCgs eWVsbG93LWZnLXByb3BzIDppbmhlcml0IHRlcm0tYm9sZCkpCisgICAgICwocHJvcGVydGl6ZSAi SGVsbG8gV29ybGQiICdmb250LWxvY2stZmFjZQorICAgICAgICAgICAgICAgICAgYCgsYnJpZ2h0 LXllbGxvdy1mZy1wcm9wcyA6aW5oZXJpdCB0ZXJtLWJvbGQpKSkKKyAgICAoIlxlWzFtXGVbMzNt SGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQt bG9jay1mYWNlCisgICAgICAgICAgICAgICAgICBgKCx5ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQg dGVybS1ib2xkKSkKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1m YWNlCisgICAgICAgICAgICAgICAgICBgKCxicmlnaHQteWVsbG93LWZnLXByb3BzIDppbmhlcml0 IHRlcm0tYm9sZCkpKQorICAgICgiXGVbMzNtXGVbMW1IZWxsbyBXb3JsZFxlWzBtIgorICAgICAs KHByb3BlcnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UKKyAgICAgICAgICAgICAg ICAgIGAoLHllbGxvdy1mZy1wcm9wcyA6aW5oZXJpdCB0ZXJtLWJvbGQpKQorICAgICAsKHByb3Bl cnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UKKyAgICAgICAgICAgICAgICAgIGAo LGJyaWdodC15ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQgdGVybS1ib2xkKSkpKSkKKwogKGRlZnVu IHRlcm0tdGVzdC1zY3JlZW4tZnJvbS1pbnB1dCAod2lkdGggaGVpZ2h0IGlucHV0ICZvcHRpb25h bCByZXR1cm4tdmFyKQogICAod2l0aC10ZW1wLWJ1ZmZlcgogICAgICh0ZXJtLW1vZGUpCkBAIC00 OCw3ICs4Nyw3IEBAIHRlcm0tdGVzdC1zY3JlZW4tZnJvbS1pbnB1dAogICAgICAgICAgICAgICAg IChtYXBjIChsYW1iZGEgKGlucHV0KSAodGVybS1lbXVsYXRlLXRlcm1pbmFsIHByb2MgaW5wdXQp KSBpbnB1dCkKICAgICAgICAgICAgICAgKHRlcm0tZW11bGF0ZS10ZXJtaW5hbCBwcm9jIGlucHV0 KSkKICAgICAgIChpZiByZXR1cm4tdmFyIChidWZmZXItbG9jYWwtdmFsdWUgcmV0dXJuLXZhciAo Y3VycmVudC1idWZmZXIpKQotICAgICAgICAoYnVmZmVyLXN1YnN0cmluZy1uby1wcm9wZXJ0aWVz IChwb2ludC1taW4pIChwb2ludC1tYXgpKSkpKSkKKyAgICAgICAgKGJ1ZmZlci1zdWJzdHJpbmcg KHBvaW50LW1pbikgKHBvaW50LW1heCkpKSkpKQogCiAoZXJ0LWRlZnRlc3QgdGVybS1zaW1wbGUt bGluZXMgKCkKICAgKHNraXAtdW5sZXNzIChub3QgKG1lbXEgc3lzdGVtLXR5cGUgJyh3aW5kb3dz LW50IG1zLWRvcykpKSkKQEAgLTc3LDYgKzExNiwyNCBAQCB0ZXJtLWxpbmUtd3JhcAogICAgICAg ICAgICAodGVybS10ZXN0LXNjcmVlbi1mcm9tLWlucHV0IDQwIDEyIChsZXQgKChzdHIgKG1ha2Ut c3RyaW5nIDMwID9hKSkpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAobGlzdCBzdHIgc3RyKSkpKSkpCiAKKyhlcnQtZGVmdGVzdCB0ZXJtLWNvbG9ycyAo KQorICAoc2tpcC11bmxlc3MgKG5vdCAobWVtcSBzeXN0ZW0tdHlwZSAnKHdpbmRvd3MtbnQgbXMt ZG9zKSkpKQorICAocGNhc2UtZG9saXN0IChgKCxzdHIgLGV4cGVjdGVkKSBhbnNpLXRlc3Qtc3Ry aW5ncykKKyAgICAobGV0ICgocmVzdWx0ICh0ZXJtLXRlc3Qtc2NyZWVuLWZyb20taW5wdXQgNDAg MTIgc3RyKSkpCisgICAgICAoc2hvdWxkIChlcXVhbCByZXN1bHQgZXhwZWN0ZWQpKQorICAgICAg KHNob3VsZCAoZXF1YWwgKHRleHQtcHJvcGVydGllcy1hdCAwIHJlc3VsdCkKKyAgICAgICAgICAg ICAgICAgICAgICh0ZXh0LXByb3BlcnRpZXMtYXQgMCBleHBlY3RlZCkpKSkpKQorCisoZXJ0LWRl ZnRlc3QgdGVybS1jb2xvcnMtYm9sZC1pcy1icmlnaHQgKCkKKyAgKHNraXAtdW5sZXNzIChub3Qg KG1lbXEgc3lzdGVtLXR5cGUgJyh3aW5kb3dzLW50IG1zLWRvcykpKSkKKyAgKGxldCAoKHRlcm0t Y29sb3ItYm9sZC1pcy1icmlnaHQgdCkpCisgICAgKHBjYXNlLWRvbGlzdCAoYCgsc3RyICxleHBl Y3RlZCAsYnJpZ2h0LWV4cGVjdGVkKSBhbnNpLXRlc3Qtc3RyaW5ncykKKyAgICAgIChsZXQgKChl eHBlY3RlZCAob3IgYnJpZ2h0LWV4cGVjdGVkIGV4cGVjdGVkKSkKKyAgICAgICAgICAgIChyZXN1 bHQgKHRlcm0tdGVzdC1zY3JlZW4tZnJvbS1pbnB1dCA0MCAxMiBzdHIpKSkKKyAgICAgICAgKHNo b3VsZCAoZXF1YWwgcmVzdWx0IGV4cGVjdGVkKSkKKyAgICAgICAgKHNob3VsZCAoZXF1YWwgKHRl eHQtcHJvcGVydGllcy1hdCAwIHJlc3VsdCkKKyAgICAgICAgICAgICAgICAgICAgICAgKHRleHQt cHJvcGVydGllcy1hdCAwIGV4cGVjdGVkKSkpKSkpKQorCiAoZXJ0LWRlZnRlc3QgdGVybS1jdXJz b3ItbW92ZW1lbnQgKCkKICAgKHNraXAtdW5sZXNzIChub3QgKG1lbXEgc3lzdGVtLXR5cGUgJyh3 aW5kb3dzLW50IG1zLWRvcykpKSkKICAgOzsgQWJzb2x1dGUgcG9zaXRpb25pbmcuCi0tIAoyLjI1 LjEKCg== --00000000000073295805ca463576-- From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 24 08:07:17 2021 Received: (at 50179) by debbugs.gnu.org; 24 Aug 2021 12:07:17 +0000 Received: from localhost ([127.0.0.1]:43374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIVD2-0007Bd-PA for submit@debbugs.gnu.org; Tue, 24 Aug 2021 08:07:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIVD0-0007BP-DB for 50179@debbugs.gnu.org; Tue, 24 Aug 2021 08:07:14 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33660) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIVCv-0004g0-2j; Tue, 24 Aug 2021 08:07:09 -0400 Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:3233 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIVCu-0001bP-My; Tue, 24 Aug 2021 08:07:09 -0400 Date: Tue, 24 Aug 2021 15:07:01 +0300 Message-Id: <838s0rvyfu.fsf@gnu.org> From: Eli Zaretskii To: Jim Porter In-Reply-To: (message from Jim Porter on Mon, 23 Aug 2021 21:02:46 -0700) Subject: Re: bug#50179: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode References: X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50179 Cc: 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Jim Porter > Date: Mon, 23 Aug 2021 21:02:46 -0700 > > With the administrative issues out of the way... these patches provide > support for "bright" ANSI colors (SGR 90-97 and 100-107 for foreground > and background, respectively)[1]. Most of the complexity here is due > to the new defcustoms `*-bold-is-bright'. Enabling this results in > ANSI "bold" text (SGR 1) to be rendered in the bright color palette > (as well as being bold). This is a pretty common option in terminal > emulators; all the ones I looked at[2] support it, and it's often the > default behavior. For me, the main benefit of this option is so I can > easily match the color palettes between Emacs and my terminal > emulator. > > I've split this into two patches, one for 'ansi-color' and one for > 'term-mode'. Despite the similarity in functionality, the > implementations are pretty different. It might be nice if they could > be unified somehow, but that may be more trouble than it's worth... Thanks, please see some comments below. > +(defcustom ansi-bright-color-names-vector > + ["gray30" "red2" "green2" "yellow2" "blue1" "magenta2" "cyan2" "white"] > + "Colors used for SGR control sequences determining a \"bright\" color. > +This vector holds the colors used for SGR control sequences parameters > +90 to 97 (bright foreground colors) and 100 to 107 (brightbackground > +colors). I wouldn't offer a customizable list for this: users have no particular reason to redefine standard colors. > (defun ansi-color--find-face (codes) > "Return the face corresponding to CODES." > - (let (faces) > + ;; Sort the codes in ascending order to can guarantee that "bold" comes ^^^^^^^^^^^^^^^^ Something wrong with the wording here. > (term-color-bright-*): New faces. Please name the new faces explicitly. > +(defcustom term-color-bold-is-bright nil > + "If set to non-nil, combining ANSI bold and a color produces the bright > +version of that color." > + :group 'term > + :type 'boolean > + :version "28.1") Do we really need 2 separate knobs for these two features? How probable is it that the same user will want to have bright colors in one package, but not in the other? From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 24 13:38:22 2021 Received: (at 50179) by debbugs.gnu.org; 24 Aug 2021 17:38:22 +0000 Received: from localhost ([127.0.0.1]:45118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIaNS-0003lT-Bv for submit@debbugs.gnu.org; Tue, 24 Aug 2021 13:38:22 -0400 Received: from mail-ua1-f54.google.com ([209.85.222.54]:43643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIaNR-0003lH-C4 for 50179@debbugs.gnu.org; Tue, 24 Aug 2021 13:38:21 -0400 Received: by mail-ua1-f54.google.com with SMTP id j31so5584519uad.10 for <50179@debbugs.gnu.org>; Tue, 24 Aug 2021 10:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=i3sCoPKU3DJGW4Diek13Hk2cqVKBGojZGD8uEXp8A0g=; b=iJ8lPHMgq4WjIVIkQjy34Yvf+3SSbrMCqu0A53pYJmVdecrJVykm47qeAfNkwDFsMS KpJe7UVG6dUetbSzKUKAoit3gkwf3tsxWZJp0IdbIfoYeNJQR+uR6qUlsdLG9+DsdQRl HQG8sC6ziHIncjnjAltR85FYEMzqm8JuD2UXOaIR191OOVise9gmG+ByL5JJpuAMd7nz SHyut1+qohPIEBvV0G5C2M/GaRMk9y9mp68FUxLEDc70UL+aiiWC934eoJQhU6xaZePc 97jk+D/gj1ovhxomZdUbzhy2n7NrClR9ExzoigUG8GGxs1uqS6dscYQbiW8jEfJ2mCnC WscA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=i3sCoPKU3DJGW4Diek13Hk2cqVKBGojZGD8uEXp8A0g=; b=dY9paz0wpjjC4P3nf+xZY7r0mECd51uOxGpfzrMdcKM51pPDmUO7rqDH4xMvEpwBzT rdFiiS3Zw0NyIAAfWihTqT9bPC0gvMJWbF227SPtweqU8cX6k2XkXxwz2EhmYlgPGhvk AVEHInyEQxxQjlW3tp0uehlQ6RaXHgJWVRd/9kY4PFRWobB9mjWC6gbXWgZkqe6R0UME Esu1u0NyyJPAyDmSoQjnJFD9mea/NIBWQhDmdgP+wkZL9C2qmUs+fuKdSlLz89ESHp2J wZljm2G675UEvArAQivHy8xxO/8x+iy+ZH2+JdVauPge7cmdP/rGzW3fy6I7qnfc/w/W PnCg== X-Gm-Message-State: AOAM531e1WXzjIwrhuwn7FGtY1ATkjBJ1apQ8I/1k6KdCU6Ha+mutm9m zpqtRFH+Hcyve/0ft1ulvuDk3eu/7odqD/D36RE= X-Google-Smtp-Source: ABdhPJwGjxXlsusNg+50O9f2K1eGvOx6bFqcJQOp2FgQ4Vaiq6scCJo7aNupqfkfgWEhMgqYPwc7CiKhpjQ0vlUJDTs= X-Received: by 2002:a67:e343:: with SMTP id s3mr29359855vsm.33.1629826695851; Tue, 24 Aug 2021 10:38:15 -0700 (PDT) MIME-Version: 1.0 References: <838s0rvyfu.fsf@gnu.org> In-Reply-To: <838s0rvyfu.fsf@gnu.org> From: Jim Porter Date: Tue, 24 Aug 2021 10:38:06 -0700 Message-ID: Subject: Re: bug#50179: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode To: Eli Zaretskii Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50179 Cc: 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Tue, Aug 24, 2021 at 5:07 AM Eli Zaretskii wrote: > > > +(defcustom ansi-bright-color-names-vector > > + ["gray30" "red2" "green2" "yellow2" "blue1" "magenta2" "cyan2" "white"] > > + "Colors used for SGR control sequences determining a \"bright\" color. > > +This vector holds the colors used for SGR control sequences parameters > > +90 to 97 (bright foreground colors) and 100 to 107 (brightbackground > > +colors). > > I wouldn't offer a customizable list for this: users have no > particular reason to redefine standard colors. I made this a defcustom because `ansi-color-faces-vector' and `ansi-color-names-vector' are defcustoms too. More practically speaking, I'd want to customize this new variable to make these colors match the Emacs theme I use. I chose colors in this patch to complement `ansi-color-names-vector', but they'd clash with my theme. > > +(defcustom term-color-bold-is-bright nil > > + "If set to non-nil, combining ANSI bold and a color produces the bright > > +version of that color." > > + :group 'term > > + :type 'boolean > > + :version "28.1") > > Do we really need 2 separate knobs for these two features? How > probable is it that the same user will want to have bright colors in > one package, but not in the other? I doubt anyone would want to control these independently. It'd be nice to have a single defcustom for this, but I wasn't sure where it should go in that case. Would it be ok to use `ansi-color-bold-is-bright' (from patch 1 in `ansi-color.el') in `term.el'? I see that `term.el` requires `comint.el', which requires `ansi-color.el', so `term.el' should see it without changing what gets loaded. (It might even be nice to use the same definitions for the colors in both `ansi-color.el' and `term.el', but that would take a bit of work to migrate users'/themes' customizations. Maybe that's something to do for Emacs 29 so I have time to figure out a good migration path.) From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 24 13:59:56 2021 Received: (at 50179) by debbugs.gnu.org; 24 Aug 2021 17:59:56 +0000 Received: from localhost ([127.0.0.1]:45152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIaiK-0004IS-Cd for submit@debbugs.gnu.org; Tue, 24 Aug 2021 13:59:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIaiG-0004I1-Bf for 50179@debbugs.gnu.org; Tue, 24 Aug 2021 13:59:53 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:45528) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIaiB-0000iN-46; Tue, 24 Aug 2021 13:59:47 -0400 Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:1217 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIaiA-00063S-Mf; Tue, 24 Aug 2021 13:59:47 -0400 Date: Tue, 24 Aug 2021 20:59:40 +0300 Message-Id: <83zgt6vi43.fsf@gnu.org> From: Eli Zaretskii To: Jim Porter In-Reply-To: (message from Jim Porter on Tue, 24 Aug 2021 10:38:06 -0700) Subject: Re: bug#50179: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode References: <838s0rvyfu.fsf@gnu.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50179 Cc: 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Jim Porter > Date: Tue, 24 Aug 2021 10:38:06 -0700 > Cc: 50179@debbugs.gnu.org > > > I wouldn't offer a customizable list for this: users have no > > particular reason to redefine standard colors. > > I made this a defcustom because `ansi-color-faces-vector' and > `ansi-color-names-vector' are defcustoms too. More practically > speaking, I'd want to customize this new variable to make these colors > match the Emacs theme I use. I chose colors in this patch to > complement `ansi-color-names-vector', but they'd clash with my theme. How can named colors change with the theme? Faces can, but colors are absolute. Bright-yellow is the same color whatever the theme. At least IMO. I wonder if others think otherwise. > > > +(defcustom term-color-bold-is-bright nil > > > + "If set to non-nil, combining ANSI bold and a color produces the bright > > > +version of that color." > > > + :group 'term > > > + :type 'boolean > > > + :version "28.1") > > > > Do we really need 2 separate knobs for these two features? How > > probable is it that the same user will want to have bright colors in > > one package, but not in the other? > > I doubt anyone would want to control these independently. It'd be nice > to have a single defcustom for this, but I wasn't sure where it should > go in that case. If we agree to have a single defcustom, then where to put it is secondary. > Would it be ok to use `ansi-color-bold-is-bright' > (from patch 1 in `ansi-color.el') in `term.el'? Yes, why not? Thanks. From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 24 15:00:13 2021 Received: (at 50179) by debbugs.gnu.org; 24 Aug 2021 19:00:13 +0000 Received: from localhost ([127.0.0.1]:45253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIbef-0005vd-Dx for submit@debbugs.gnu.org; Tue, 24 Aug 2021 15:00:13 -0400 Received: from mail-ua1-f42.google.com ([209.85.222.42]:43980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIbec-0005uK-T3 for 50179@debbugs.gnu.org; Tue, 24 Aug 2021 15:00:11 -0400 Received: by mail-ua1-f42.google.com with SMTP id j31so5838003uad.10 for <50179@debbugs.gnu.org>; Tue, 24 Aug 2021 12:00:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=duDSmaLKLenOOH1mv+5x83JS9NVaVZu5kJ84mu330iU=; b=hvr2EUAuAKH8Yf9LRUNlRh9quK6xi+FHbbxzk64f48dDZesoQ2cZWuskZvhba6gRUg Hlq3HSdQmdjgWs0KbxO/rYCYw4+p6EsFitoI4cVH5Y5ZANFINhKR1Xhj8L7AGm7rYDAM MK7wCyTGO3bhHTPcctFfwZkr8vB+OIY2gc+Htg7lALP7uT4hEBxeKRh27fjB3bmP1C/g 4wRwG/5SlZ0x6Nw/I5v0u2nhOrcx5M7E22a5DKIHdaoR4QWFHcpL1e5C3d2eFp0QBBQt x9pXttxOGjrEc8q1l5vX7xPV8tBJlF92V9rOkzMtNTylCG/tBzPjUgntpYbnEaW87duL 60JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=duDSmaLKLenOOH1mv+5x83JS9NVaVZu5kJ84mu330iU=; b=cE5oLjuFBrGVjof9vwiSoFvF1kqoMtLPZaWk1eLZKPdyKtyT/550WJHXb47mdRR5kR 9VzbAelPbYUbCwSP/UeWktyQwR/FvjSoo1QOOUq+JUUrSDrkXhdDngnwSw/gAjhkW3yg g+CJIm471xzhnhTNOghVQ6a1Mrp37QEx6p/Rqn8zu3I8oFmAIGoghumwrS0HTlm3CnBF tnn87/j6lgWvJaDSvjsWVM+Jr6SZKxsEsD/yoehGAzImImGeeZ/Bit3LVYyZj3qghzW6 ZrIf/KdADQxKDQlQb+4X1tYegAqicc02mVWD3ftqbpV7h4cR4tQJEAHvPcF8W69rkYTY 39XA== X-Gm-Message-State: AOAM531CZd+yIF/M4nTg57kK86fNqWzYRMx1UlbNAteO2YZGi1/ojpTF 5w2LmfvW/+848EPqrs8i/cy3CZeMISaTGhoSC4E= X-Google-Smtp-Source: ABdhPJysJPjsZNAfFSaejmiuLf4vF8HsMIAGhCiS/QpL6kpCbjbIAUpsGd1+F5Nw1G5lSn/wvExvPK4bsYZ8PQBow4U= X-Received: by 2002:a05:6102:22d5:: with SMTP id a21mr28758974vsh.32.1629831605015; Tue, 24 Aug 2021 12:00:05 -0700 (PDT) MIME-Version: 1.0 References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> In-Reply-To: <83zgt6vi43.fsf@gnu.org> From: Jim Porter Date: Tue, 24 Aug 2021 11:59:53 -0700 Message-ID: Subject: Re: bug#50179: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode To: Eli Zaretskii Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50179 Cc: 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Tue, Aug 24, 2021 at 10:59 AM Eli Zaretskii wrote: > > > From: Jim Porter > > Date: Tue, 24 Aug 2021 10:38:06 -0700 > > Cc: 50179@debbugs.gnu.org > > > > > I wouldn't offer a customizable list for this: users have no > > > particular reason to redefine standard colors. > > > > I made this a defcustom because `ansi-color-faces-vector' and > > `ansi-color-names-vector' are defcustoms too. More practically > > speaking, I'd want to customize this new variable to make these colors > > match the Emacs theme I use. I chose colors in this patch to > > complement `ansi-color-names-vector', but they'd clash with my theme. > > How can named colors change with the theme? Faces can, but colors are > absolute. Bright-yellow is the same color whatever the theme. At > least IMO. I wonder if others think otherwise. The colors in `ansi-bright-color-names-vector' are just the color values that get used to set face attributes on bits of text. They (and the values in the other defcustoms mentioned above) get compiled into `ansi-color-map', which contains entries like `(foreground-color . "yellow2")'. Those then get applied as face attributes onto the relevant text. While you'd always want bright-yellow to be some kind of bright-looking yellow, the exact RGB value for that is just a matter of preference. In particular, a theme might need to adjust these color values so that there's appropriate contrast between ANSI-colorized text and the default foreground/background color specified by the theme. > > Would it be ok to use `ansi-color-bold-is-bright' > > (from patch 1 in `ansi-color.el') in `term.el'? > > Yes, why not? Mostly just my relative unfamiliarity with the preferred way to do things here. `ansi-color.el' and `term.el' seemed very independent of each other, and I wasn't sure if there was a particular reason for that. I'll just use `ansi-color-bold-is-bright' for both patches then. From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 24 18:54:11 2021 Received: (at 50179) by debbugs.gnu.org; 24 Aug 2021 22:54:11 +0000 Received: from localhost ([127.0.0.1]:45357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIfJ5-0007Zy-4l for submit@debbugs.gnu.org; Tue, 24 Aug 2021 18:54:11 -0400 Received: from mail-ua1-f53.google.com ([209.85.222.53]:42568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIfJ2-0007Zl-W9 for 50179@debbugs.gnu.org; Tue, 24 Aug 2021 18:54:09 -0400 Received: by mail-ua1-f53.google.com with SMTP id m39so13251176uad.9 for <50179@debbugs.gnu.org>; Tue, 24 Aug 2021 15:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=0UJEhjDew0Oo53TI8daWyTRNimdGHYKarw0Hknhw0i8=; b=i5FLk+X40Kqt8BRQZdjk4ZGs4prkOQgcsz14xO3P9HDKpowmy85JgNwl3ONDNBua8J QFNJ202BbtbNT0z55vHcyjkvkPsNcTVNJ5sYl95mFSIkVqcyoYCkSA7x8u4/HbE/0RzK ESJ14ZXogHx4L4D38arbFQ5mxAcKveSdx7Skkb0J8SrhWVRsJ3PjGvMsJJ3hiMqGxCyX JC3HtnTzwPUrNwe9KuL2gJ6X9AOy8PSEMUfE0W9jcWD62LYog48/PUPY0jaSOhIdGooJ Q1BWvr5mDovm8GazvIYtVCnIUNS4DVqQrHrrafht86oaXFUJRspK+3gAy0ciCZtXHTA3 aOXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=0UJEhjDew0Oo53TI8daWyTRNimdGHYKarw0Hknhw0i8=; b=abYO0EJgHK2f4GcsU4Sc2ZGpVcLpS+bvt3GkyvUESq58pe7cIReaj2CAdLa3pJKYGV tsRM30Qhj0HA2FaE4kNqyOiyu7tZA0PFOfrsmZCS5rVPlzbiBrCHzAxSLPMDeDC8/Xeh mnqc5Y8mp0/IMMNFumR7h6LJMQZJ7cI27wQIQ+BVppw5AHTHu7KyIBoP95uPrg3ke3cA pTh/CYwTh6I5uUyXeHLMXJk+Y4AXZMcuwv1vo12b7/Zf3g3sqk5lEbSIRkU7BbK5fhj+ WyUqmBRuo4fHHhDJWRJO+ekUQxlUBt0aY/3cXUszwQEBLPY5QtPV2gvO6tG9y7SAR+IU khRQ== X-Gm-Message-State: AOAM531SLayAaDaK++l4u0H4Us15MFB+HZS8+t+BK2n1zxgxC2zs6mIa FGfMyQHmqY+7sm99TL+TuQ0Vg8MhpFV9swBdTqA= X-Google-Smtp-Source: ABdhPJzP7bBZvbWabzVd8a/PyeFhBkygieju6PjKvsfQIoV8kOub4kh2jREktlm/9Uuu6Y6mb1BSbipSykRcWIBL3h8= X-Received: by 2002:ab0:3561:: with SMTP id e1mr152734uaa.5.1629845643243; Tue, 24 Aug 2021 15:54:03 -0700 (PDT) MIME-Version: 1.0 References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> In-Reply-To: From: Jim Porter Date: Tue, 24 Aug 2021 15:53:52 -0700 Message-ID: Subject: Re: bug#50179: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode To: Eli Zaretskii Content-Type: multipart/mixed; boundary="0000000000009ad6e405ca56027f" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50179 Cc: 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --0000000000009ad6e405ca56027f Content-Type: text/plain; charset="UTF-8" Ok, here are updated patches addressing your comments. I fixed the grammatical error in the comment, improved the commit message for the second patch, and switched to using `ansi-color-bold-is-bright' in both files. I left `ansi-bright-color-names-vector' as a defcustom though, since I think that's the right thing to do there (see my previous message), but I can change that later if we agree on a different/better route there. --0000000000009ad6e405ca56027f Content-Type: application/octet-stream; name="0001-Add-support-for-bright-ANSI-colors-in-ansi-color.patch" Content-Disposition: attachment; filename="0001-Add-support-for-bright-ANSI-colors-in-ansi-color.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ksqnwi1s0 RnJvbSBiOTI0YTU3ZTA2ZDY2ZDFjOTYwZWU4N2QwM2ZkOWNkYWNlZGVjMWE0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5jb20+CkRh dGU6IE1vbiwgMjMgQXVnIDIwMjEgMTc6NTE6MDUgLTA3MDAKU3ViamVjdDogW1BBVENIIDEvMl0g QWRkIHN1cHBvcnQgZm9yICJicmlnaHQiIEFOU0kgY29sb3JzIGluIGFuc2ktY29sb3IKCiogbGlz cC9hbnNpLWNvbG9yLmVsIChhbnNpLWJyaWdodC1jb2xvci1uYW1lcy12ZWN0b3IpOiBOZXcgZGVm Y3VzdG9tLgooYW5zaS1jb2xvci1ib2xkLWlzLWJyaWdodCk6IE5ldyBkZWZjdXN0b20uCihhbnNp LWNvbG9yLS1maW5kLWZhY2UpOiBTb3J0IEFOU0kgY29kZXMgYW5kIGNoZWNrCidhbnNpLWNvbG9y LWJvbGQtaXMtYnJpZ2h0Jy4KKGFuc2ktY29sb3ItYXBwbHktc2VxdWVuY2UpOiBTdXBwb3J0IGJy aWdodCBBTlNJIGNvbG9ycy4KKGFuc2ktY29sb3ItLWZpbGwtY29sb3ItbWFwKTogTmV3IGZ1bmN0 aW9uLgooYW5zaS1jb2xvci1tYWtlLWNvbG9yLW1hcCk6IEFkZCBicmlnaHQgQU5TSSBjb2xvcnMu CihhbnNpLWNvbG9yLWdldC1mYWNlLTEpOiBBZGQgQlJJR0hUIHBhcmFtZXRlci4KKiB0ZXN0L2xp c3AvYW5zaS1jb2xvci10ZXN0cy5lbAooYW5zaS1jb2xvci1hcHBseS1vbi1yZWdpb24tYm9sZC1p cy1icmlnaHQtdGVzdCk6IE5ldyBmdW5jdGlvbi4KLS0tCiBldGMvTkVXUyAgICAgICAgICAgICAg ICAgICAgICB8ICAgNyArKwogbGlzcC9hbnNpLWNvbG9yLmVsICAgICAgICAgICAgfCAxMTYgKysr KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogdGVzdC9saXNwL2Fuc2ktY29sb3ItdGVz dHMuZWwgfCAgNTEgKysrKysrKysrKysrKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDE0MCBpbnNlcnRp b25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ldGMvTkVXUyBiL2V0Yy9ORVdT CmluZGV4IGIyMjFmMTM2MjQuLmI4ZTc3YmVlNjggMTAwNjQ0Ci0tLSBhL2V0Yy9ORVdTCisrKyBi L2V0Yy9ORVdTCkBAIC0zNzUsNiArMzc1LDEzIEBAIGVtdWxhdG9ycyBieSB1c2luZyB0aGUgbmV3 IGlucHV0LW1ldGEtbW9kZSB3aXRoIHRoZSBzcGVjaWFsIHZhbHVlCiBUaGlzIHBhcmFtZXRlciwg c2ltaWxhciB0byAnZHJhZy13aXRoLWhlYWRlci1saW5lJywgYWxsb3dzIG1vdmluZyBmcmFtZXMK IGJ5IGRyYWdnaW5nIHRoZSB0YWIgbGluZXMgb2YgdGhlaXIgdG9wbW9zdCB3aW5kb3dzIHdpdGgg dGhlIG1vdXNlLgogCistLS0KKyoqICdhbnNpLWNvbG9yJyBub3cgc3VwcG9ydHMgImJyaWdodCIg Y29sb3IgY29kZXMuCisiQnJpZ2h0IiBBTlNJIGNvbG9yIGNvZGVzIGFyZSBub3cgZGlzcGxheWVk IHdoZW4gYXBwbHlpbmcgQU5TSSBjb2xvcgorZmlsdGVycyB1c2luZyB0aGUgY29sb3IgdmFsdWVz IGRlZmluZWQgaW4gJ2Fuc2ktYnJpZ2h0LWNvbG9yLW5hbWVzLXZlY3RvcicuCitJbiBhZGRpdGlv biwgYm9sZCB0ZXh0IHdpdGggcmVndWxhciBBTlNJIGNvbG9ycyBjYW4gYmUgZGlzcGxheWVkIGFz CisiYnJpZ2h0IiBpZiAnYW5zaS1jb2xvci1ib2xkLWlzLWJyaWdodCcgaXMgbm9uLW5pbC4KKwog DAogKiBFZGl0aW5nIENoYW5nZXMgaW4gRW1hY3MgMjguMQogCmRpZmYgLS1naXQgYS9saXNwL2Fu c2ktY29sb3IuZWwgYi9saXNwL2Fuc2ktY29sb3IuZWwKaW5kZXggNzlkYzgyMWVhMS4uMGRjOWE1 MjM4OCAxMDA2NDQKLS0tIGEvbGlzcC9hbnNpLWNvbG9yLmVsCisrKyBiL2xpc3AvYW5zaS1jb2xv ci5lbApAQCAtMTUwLDYgKzE1MCw0OCBAQCBhbnNpLWNvbG9yLW5hbWVzLXZlY3RvcgogICA6dmVy c2lvbiAiMjQuNCIgOyBkZWZhdWx0IGNvbG9ycyBjb3BpZWQgZnJvbSBgeHRlcm0tc3RhbmRhcmQt Y29sb3JzJwogICA6Z3JvdXAgJ2Fuc2ktY29sb3JzKQogCisoZGVmY3VzdG9tIGFuc2ktYnJpZ2h0 LWNvbG9yLW5hbWVzLXZlY3RvcgorICBbImdyYXkzMCIgInJlZDIiICJncmVlbjIiICJ5ZWxsb3cy IiAiYmx1ZTEiICJtYWdlbnRhMiIgImN5YW4yIiAid2hpdGUiXQorICAiQ29sb3JzIHVzZWQgZm9y IFNHUiBjb250cm9sIHNlcXVlbmNlcyBkZXRlcm1pbmluZyBhIFwiYnJpZ2h0XCIgY29sb3IuCitU aGlzIHZlY3RvciBob2xkcyB0aGUgY29sb3JzIHVzZWQgZm9yIFNHUiBjb250cm9sIHNlcXVlbmNl cyBwYXJhbWV0ZXJzCis5MCB0byA5NyAoYnJpZ2h0IGZvcmVncm91bmQgY29sb3JzKSBhbmQgMTAw IHRvIDEwNyAoYnJpZ2h0YmFja2dyb3VuZAorY29sb3JzKS4KKworUGFyYW1ldGVyICAgQ29sb3IK KyAgOTAgIDEwMCAgIGJyaWdodCBibGFjaworICA5MSAgMTAxICAgYnJpZ2h0IHJlZAorICA5MiAg MTAyICAgYnJpZ2h0IGdyZWVuCisgIDkzICAxMDMgICBicmlnaHQgeWVsbG93CisgIDk0ICAxMDQg ICBicmlnaHQgYmx1ZQorICA5NSAgMTA1ICAgYnJpZ2h0IG1hZ2VudGEKKyAgOTYgIDEwNiAgIGJy aWdodCBjeWFuCisgIDk3ICAxMDcgICBicmlnaHQgd2hpdGUKKworVGhpcyB2ZWN0b3IgaXMgdXNl ZCBieSBgYW5zaS1jb2xvci1tYWtlLWNvbG9yLW1hcCcgdG8gY3JlYXRlIGEgY29sb3IKK21hcC4g IFRoaXMgY29sb3IgbWFwIGlzIHN0b3JlZCBpbiB0aGUgdmFyaWFibGUgYGFuc2ktY29sb3ItbWFw Jy4KKworRWFjaCBlbGVtZW50IG1heSBhbHNvIGJlIGEgY29ucyBjZWxsIHdoZXJlIHRoZSBjYXIg YW5kIGNkciBzcGVjaWZ5IHRoZQorZm9yZWdyb3VuZCBhbmQgYmFja2dyb3VuZCBjb2xvcnMsIHJl c3BlY3RpdmVseS4iCisgIDp0eXBlICcodmVjdG9yIChjaG9pY2UgY29sb3IgKGNvbnMgY29sb3Ig Y29sb3IpKQorICAgICAgICAgICAgICAgICAoY2hvaWNlIGNvbG9yIChjb25zIGNvbG9yIGNvbG9y KSkKKyAgICAgICAgICAgICAgICAgKGNob2ljZSBjb2xvciAoY29ucyBjb2xvciBjb2xvcikpCisg ICAgICAgICAgICAgICAgIChjaG9pY2UgY29sb3IgKGNvbnMgY29sb3IgY29sb3IpKQorICAgICAg ICAgICAgICAgICAoY2hvaWNlIGNvbG9yIChjb25zIGNvbG9yIGNvbG9yKSkKKyAgICAgICAgICAg ICAgICAgKGNob2ljZSBjb2xvciAoY29ucyBjb2xvciBjb2xvcikpCisgICAgICAgICAgICAgICAg IChjaG9pY2UgY29sb3IgKGNvbnMgY29sb3IgY29sb3IpKQorICAgICAgICAgICAgICAgICAoY2hv aWNlIGNvbG9yIChjb25zIGNvbG9yIGNvbG9yKSkpCisgIDpzZXQgJ2Fuc2ktY29sb3ItbWFwLXVw ZGF0ZQorICA6aW5pdGlhbGl6ZSAnY3VzdG9tLWluaXRpYWxpemUtZGVmYXVsdAorICA6dmVyc2lv biAiMjguMSIKKyAgOmdyb3VwICdhbnNpLWNvbG9ycykKKworKGRlZmN1c3RvbSBhbnNpLWNvbG9y LWJvbGQtaXMtYnJpZ2h0IG5pbAorICAiSWYgc2V0IHRvIG5vbi1uaWwsIGNvbWJpbmluZyBBTlNJ IGJvbGQgYW5kIGEgY29sb3IgcHJvZHVjZXMgdGhlIGJyaWdodAordmVyc2lvbiBvZiB0aGF0IGNv bG9yLiIKKyAgOnR5cGUgJ2Jvb2xlYW4KKyAgOnZlcnNpb24gIjI4LjEiCisgIDpncm91cCAnYW5z aS1jb2xvcnMpCisKIChkZWZjb25zdCBhbnNpLWNvbG9yLWNvbnRyb2wtc2VxLXJlZ2V4cAogICA7 OyBTZWUgRUNNQSA0OCwgc2VjdGlvbiA1LjQgIkNvbnRyb2wgU2VxdWVuY2VzIi4KICAgIlxlXFxb W1x4MzAtXHgzRl0qW1x4MjAtXHgyRl0qW1x4NDAtXHg3RV0iCkBAIC0zMDQsOSArMzQ2LDE0IEBA IGFuc2ktY29sb3ItZmlsdGVyLWFwcGx5CiAKIChkZWZ1biBhbnNpLWNvbG9yLS1maW5kLWZhY2Ug KGNvZGVzKQogICAiUmV0dXJuIHRoZSBmYWNlIGNvcnJlc3BvbmRpbmcgdG8gQ09ERVMuIgotICAo bGV0IChmYWNlcykKKyAgOzsgU29ydCB0aGUgY29kZXMgaW4gYXNjZW5kaW5nIG9yZGVyIHRvIGd1 YXJhbnRlZSB0aGF0ICJib2xkIiBjb21lcyBiZWZvcmUKKyAgOzsgYW55IG9mIHRoZSBjb2xvcnMu ICBUaGlzIGVuc3VyZXMgdGhhdCBgYW5zaS1jb2xvci1ib2xkLWlzLWJyaWdodCcgaXMKKyAgOzsg YXBwbGllZCBjb3JyZWN0bHkuCisgIChsZXQgKGZhY2VzIGJyaWdodCAoY29kZXMgKHNvcnQgKGNv cHktc2VxdWVuY2UgY29kZXMpICMnPCkpKQogICAgICh3aGlsZSBjb2RlcwotICAgICAgKGxldCAo KGZhY2UgKGFuc2ktY29sb3ItZ2V0LWZhY2UtMSAocG9wIGNvZGVzKSkpKQorICAgICAgKGxldCAo KGZhY2UgKGFuc2ktY29sb3ItZ2V0LWZhY2UtMSAocG9wIGNvZGVzKSBicmlnaHQpKSkKKyAgICAg ICAgKHdoZW4gKGFuZCBhbnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0IChlcSBmYWNlICdib2xkKSkK KyAgICAgICAgICAoc2V0cSBicmlnaHQgdCkpCiAJOzsgSW4gdGhlIChkZWZhdWx0IHVuZGVybGlu ZSkgZmFjZSwgc2F5LCB0aGUgdmFsdWUgb2YgdGhlCiAJOzsgInVuZGVybGluZSIgYXR0cmlidXRl IG9mIHRoZSBgZGVmYXVsdCcgZmFjZSB3aW5zLgogCSh1bmxlc3MgKGVxIGZhY2UgJ2RlZmF1bHQp CkBAIC01NzAsMTEgKzYxNywxMSBAQCBhbnNpLWNvbG9yLWFwcGx5LXNlcXVlbmNlCiAKIEZvciBl YWNoIG5ldyBjb2RlLCB0aGUgZm9sbG93aW5nIGhhcHBlbnM6IGlmIGl0IGlzIDEtNywgYWRkIGl0 IHRvCiB0aGUgbGlzdCBvZiBjb2RlczsgaWYgaXQgaXMgMjEtMjUgb3IgMjcsIGRlbGV0ZSBhcHBy b3ByaWF0ZQotcGFyYW1ldGVycyBmcm9tIHRoZSBsaXN0IG9mIGNvZGVzOyBpZiBpdCBpcyAzMC0z NyByZXNwLiAzOSwgdGhlCi1mb3JlZ3JvdW5kIGNvbG9yIGNvZGUgaXMgcmVwbGFjZWQgb3IgYWRk ZWQgcmVzcC4gZGVsZXRlZDsgaWYgaXQKLWlzIDQwLTQ3IHJlc3AuIDQ5LCB0aGUgYmFja2dyb3Vu ZCBjb2xvciBjb2RlIGlzIHJlcGxhY2VkIG9yIGFkZGVkCi1yZXNwLiBkZWxldGVkOyBhbnkgb3Ro ZXIgY29kZSBpcyBkaXNjYXJkZWQgdG9nZXRoZXIgd2l0aCB0aGUgb2xkCi1jb2Rlcy4JRmluYWxs eSwgdGhlIHNvIGNoYW5nZWQgbGlzdCBvZiBjb2RlcyBpcyByZXR1cm5lZC4iCitwYXJhbWV0ZXJz IGZyb20gdGhlIGxpc3Qgb2YgY29kZXM7IGlmIGl0IGlzIDMwLTM3IChvciA5MC05NykgcmVzcC4g MzksCit0aGUgZm9yZWdyb3VuZCBjb2xvciBjb2RlIGlzIHJlcGxhY2VkIG9yIGFkZGVkIHJlc3Au IGRlbGV0ZWQ7IGlmIGl0CitpcyA0MC00NyAob3IgMTAwLTEwNykgcmVzcC4gNDksIHRoZSBiYWNr Z3JvdW5kIGNvbG9yIGNvZGUgaXMgcmVwbGFjZWQKK29yIGFkZGVkIHJlc3AuIGRlbGV0ZWQ7IGFu eSBvdGhlciBjb2RlIGlzIGRpc2NhcmRlZCB0b2dldGhlciB3aXRoIHRoZQorb2xkIGNvZGVzLiAg RmluYWxseSwgdGhlIHNvIGNoYW5nZWQgbGlzdCBvZiBjb2RlcyBpcyByZXR1cm5lZC4iCiAgIChs ZXQgKChuZXctY29kZXMgKGFuc2ktY29sb3ItcGFyc2Utc2VxdWVuY2UgZXNjYXBlLXNlcXVlbmNl KSkpCiAgICAgKHdoaWxlIG5ldy1jb2RlcwogICAgICAgKGxldCogKChuZXcgKHBvcCBuZXctY29k ZXMpKQpAQCAtNTkxLDcgKzYzOCw3IEBAIGFuc2ktY29sb3ItYXBwbHktc2VxdWVuY2UKIAkJCQkJ KDIyIChyZW1xIDEgY29kZXMpKQogCQkJCQkoMjUgKHJlbXEgNiBjb2RlcykpCiAJCQkJCShfIGNv ZGVzKSkpKSkKLQkJKChvciAzIDQpIChsZXQgKChyIChtb2QgbmV3IDEwKSkpCisJCSgob3IgMyA0 IDkgMTApIChsZXQgKChyIChtb2QgbmV3IDEwKSkpCiAJCQkgICAgKHVubGVzcyAoPSByIDgpCiAJ CQkgICAgICAobGV0IChiZWcpCiAJCQkJKHdoaWxlIChhbmQgY29kZXMgKC89IHEgKC8gKGNhciBj b2RlcykgMTApKSkKQEAgLTYwMyw2ICs2NTAsMTkgQEAgYW5zaS1jb2xvci1hcHBseS1zZXF1ZW5j ZQogCQkoXyBuaWwpKSkpKQogICAgIGNvZGVzKSkKIAorKGRlZnVuIGFuc2ktY29sb3ItLWZpbGwt Y29sb3ItbWFwIChtYXAgbWFwLWluZGV4IHByb3BlcnR5IHZlY3RvciBnZXQtY29sb3IpCisgICJG aWxsIGEgcmFuZ2Ugb2YgY29sb3IgdmFsdWVzIGZyb20gVkVDVE9SIGFuZCBzdG9yZSBpbiBNQVAu CisKK1N0YXJ0IGZpbGxpbmcgTUFQIGZyb20gTUFQLUlOREVYLCBhbmQgbWFrZSBmYWNlcyBmb3Ig UFJPUEVSVFkgKGBmb3JlZ3JvdW5kJworb3IgYGJhY2tncm91bmQnKS4gR0VULUNPTE9SIGlzIGEg ZnVuY3Rpb24gdGFraW5nIGFuIGVsZW1lbnQgb2YgVkVDVE9SIGFuZAorcmV0dXJuaW5nIHRoZSBj b2xvciB2YWx1ZSB0byB1c2UuIgorICAobWFwYworICAgKGxhbWJkYSAoZSkKKyAgICAgKGFzZXQg bWFwIG1hcC1pbmRleAorICAgICAgICAgICAoYW5zaS1jb2xvci1tYWtlLWZhY2UgcHJvcGVydHkg KGZ1bmNhbGwgZ2V0LWNvbG9yIGUpKSkKKyAgICAgKHNldHEgbWFwLWluZGV4ICgxKyBtYXAtaW5k ZXgpKSApCisgICB2ZWN0b3IpKQorCiAoZGVmdW4gYW5zaS1jb2xvci1tYWtlLWNvbG9yLW1hcCAo KQogICAiQ3JlYXRlcyBhIHZlY3RvciBvZiBmYWNlIGRlZmluaXRpb25zIGFuZCByZXR1cm5zIGl0 LgogCkBAIC02MTEsNyArNjcxLDcgQEAgYW5zaS1jb2xvci1tYWtlLWNvbG9yLW1hcAogCiBUaGUg ZmFjZSBkZWZpbml0aW9ucyBhcmUgYmFzZWQgdXBvbiB0aGUgdmFyaWFibGVzCiBgYW5zaS1jb2xv ci1mYWNlcy12ZWN0b3InIGFuZCBgYW5zaS1jb2xvci1uYW1lcy12ZWN0b3InLiIKLSAgKGxldCAo KG1hcCAobWFrZS12ZWN0b3IgNTAgbmlsKSkKKyAgKGxldCAoKG1hcCAobWFrZS12ZWN0b3IgMTEw IG5pbCkpCiAgICAgICAgIChpbmRleCAwKSkKICAgICA7OyBtaXNjZWxsYW5lb3VzIGF0dHJpYnV0 ZXMKICAgICAobWFwYwpAQCAtNjIwLDIzICs2ODAsMjEgQEAgYW5zaS1jb2xvci1tYWtlLWNvbG9y LW1hcAogICAgICAgIChzZXRxIGluZGV4ICgxKyBpbmRleCkpICkKICAgICAgYW5zaS1jb2xvci1m YWNlcy12ZWN0b3IpCiAgICAgOzsgZm9yZWdyb3VuZCBhdHRyaWJ1dGVzCi0gICAgKHNldHEgaW5k ZXggMzApCi0gICAgKG1hcGMKLSAgICAgKGxhbWJkYSAoZSkKLSAgICAgICAoYXNldCBtYXAgaW5k ZXgKLSAgICAgICAgICAgICAoYW5zaS1jb2xvci1tYWtlLWZhY2UgJ2ZvcmVncm91bmQKLSAgICAg ICAgICAgICAgICAgICAgICAgICAoaWYgKGNvbnNwIGUpIChjYXIgZSkgZSkpKQotICAgICAgIChz ZXRxIGluZGV4ICgxKyBpbmRleCkpICkKLSAgICAgYW5zaS1jb2xvci1uYW1lcy12ZWN0b3IpCisg ICAgKGFuc2ktY29sb3ItLWZpbGwtY29sb3ItbWFwCisgICAgIG1hcCAzMCAnZm9yZWdyb3VuZCBh bnNpLWNvbG9yLW5hbWVzLXZlY3RvcgorICAgICAobGFtYmRhIChlKSAoaWYgKGNvbnNwIGUpIChj YXIgZSkgZSkpKQogICAgIDs7IGJhY2tncm91bmQgYXR0cmlidXRlcwotICAgIChzZXRxIGluZGV4 IDQwKQotICAgIChtYXBjCi0gICAgIChsYW1iZGEgKGUpCi0gICAgICAgKGFzZXQgbWFwIGluZGV4 Ci0gICAgICAgICAgICAgKGFuc2ktY29sb3ItbWFrZS1mYWNlICdiYWNrZ3JvdW5kCi0gICAgICAg ICAgICAgICAgICAgICAgICAgKGlmIChjb25zcCBlKSAoY2RyIGUpIGUpKSkKLSAgICAgICAoc2V0 cSBpbmRleCAoMSsgaW5kZXgpKSApCi0gICAgIGFuc2ktY29sb3ItbmFtZXMtdmVjdG9yKQorICAg IChhbnNpLWNvbG9yLS1maWxsLWNvbG9yLW1hcAorICAgICBtYXAgNDAgJ2JhY2tncm91bmQgYW5z aS1jb2xvci1uYW1lcy12ZWN0b3IKKyAgICAgKGxhbWJkYSAoZSkgKGlmIChjb25zcCBlKSAoY2Ry IGUpIGUpKSkKKyAgICA7OyBicmlnaHQgZm9yZWdyb3VuZCBhdHRyaWJ1dGVzCisgICAgKGFuc2kt Y29sb3ItLWZpbGwtY29sb3ItbWFwCisgICAgIG1hcCA5MCAnZm9yZWdyb3VuZCBhbnNpLWJyaWdo dC1jb2xvci1uYW1lcy12ZWN0b3IKKyAgICAgKGxhbWJkYSAoZSkgKGlmIChjb25zcCBlKSAoY2Fy IGUpIGUpKSkKKyAgICA7OyBicmlnaHQgYmFja2dyb3VuZCBhdHRyaWJ1dGVzCisgICAgKGFuc2kt Y29sb3ItLWZpbGwtY29sb3ItbWFwCisgICAgIG1hcCAxMDAgJ2JhY2tncm91bmQgYW5zaS1icmln aHQtY29sb3ItbmFtZXMtdmVjdG9yCisgICAgIChsYW1iZGEgKGUpIChpZiAoY29uc3AgZSkgKGNk ciBlKSBlKSkpCiAgICAgbWFwKSkKIAogKGRlZnZhciBhbnNpLWNvbG9yLW1hcCAoYW5zaS1jb2xv ci1tYWtlLWNvbG9yLW1hcCkKQEAgLTY2MCw5ICs3MTgsMTMgQEAgYW5zaS1jb2xvci1tYXAtdXBk YXRlCiAgIChzZXQtZGVmYXVsdCBzeW1ib2wgdmFsdWUpCiAgIChzZXRxIGFuc2ktY29sb3ItbWFw IChhbnNpLWNvbG9yLW1ha2UtY29sb3ItbWFwKSkpCiAKLShkZWZ1biBhbnNpLWNvbG9yLWdldC1m YWNlLTEgKGFuc2ktY29kZSkKKyhkZWZ1biBhbnNpLWNvbG9yLWdldC1mYWNlLTEgKGFuc2ktY29k ZSAmb3B0aW9uYWwgYnJpZ2h0KQogICAiR2V0IGZhY2UgZGVmaW5pdGlvbiBmcm9tIGBhbnNpLWNv bG9yLW1hcCcuCi1BTlNJLUNPREUgaXMgdXNlZCBhcyBhbiBpbmRleCBpbnRvIHRoZSB2ZWN0b3Iu IgorQU5TSS1DT0RFIGlzIHVzZWQgYXMgYW4gaW5kZXggaW50byB0aGUgdmVjdG9yLiAgQlJJR0hU LCBpZiBub24tbmlsLAorcmVxdWVzdHMgXCJicmlnaHRcIiBBTlNJIGNvbG9ycywgZXZlbiBpZiBB TlNJLUNPREUgaXMgYSBub3JtYWwtaW50ZW5zaXR5Citjb2xvci4iCisgICh3aGVuIChhbmQgYnJp Z2h0ICg8PSAzMCBhbnNpLWNvZGUgNDkpKQorICAgIChzZXRxIGFuc2ktY29kZSAoKyBhbnNpLWNv ZGUgNjApKSkKICAgKGNvbmRpdGlvbi1jYXNlIG5pbAogICAgICAgKGFyZWYgYW5zaS1jb2xvci1t YXAgYW5zaS1jb2RlKQogICAgIChhcmdzLW91dC1vZi1yYW5nZSBuaWwpKSkKZGlmZiAtLWdpdCBh L3Rlc3QvbGlzcC9hbnNpLWNvbG9yLXRlc3RzLmVsIGIvdGVzdC9saXNwL2Fuc2ktY29sb3ItdGVz dHMuZWwKaW5kZXggMTA3ZGM4ZTQwMC4uYzk0NTYxYmRhMSAxMDA2NDQKLS0tIGEvdGVzdC9saXNw L2Fuc2ktY29sb3ItdGVzdHMuZWwKKysrIGIvdGVzdC9saXNwL2Fuc2ktY29sb3ItdGVzdHMuZWwK QEAgLTI1LDE3ICsyNSw1NCBAQAogOzs7IENvZGU6CiAKIChyZXF1aXJlICdhbnNpLWNvbG9yKQor KGV2YWwtd2hlbi1jb21waWxlIChyZXF1aXJlICdjbC1saWIpKQogCi0oZGVmdmFyIHRlc3Qtc3Ry aW5ncyAnKCgiXGVbMzNtSGVsbG8gV29ybGRcZVswbSIgLiAiSGVsbG8gV29ybGQiKQotICAgICAg ICAgICAgICAgICAgICAgICAoIlxlWzFtXGVbM21cZVs1bWJvbGQgaXRhbGljcyBibGlua1xlWzBt IiAuICJib2xkIGl0YWxpY3MgYmxpbmsiKSkpCisoZGVmdmFyIHllbGxvdyAoYXJlZiBhbnNpLWNv bG9yLW5hbWVzLXZlY3RvciAzKSkKKyhkZWZ2YXIgYnJpZ2h0LXllbGxvdyAoYXJlZiBhbnNpLWJy aWdodC1jb2xvci1uYW1lcy12ZWN0b3IgMykpCisKKyhkZWZ2YXIgdGVzdC1zdHJpbmdzCisgIGAo KCJcZVszM21IZWxsbyBXb3JsZFxlWzBtIiAiSGVsbG8gV29ybGQiCisgICAgIChmb3JlZ3JvdW5k LWNvbG9yIC4gLHllbGxvdykpCisgICAgKCJcZVs0M21IZWxsbyBXb3JsZFxlWzBtIiAiSGVsbG8g V29ybGQiCisgICAgIChiYWNrZ3JvdW5kLWNvbG9yIC4gLHllbGxvdykpCisgICAgKCJcZVs5M21I ZWxsbyBXb3JsZFxlWzBtIiAiSGVsbG8gV29ybGQiCisgICAgIChmb3JlZ3JvdW5kLWNvbG9yIC4g LGJyaWdodC15ZWxsb3cpKQorICAgICgiXGVbMTAzbUhlbGxvIFdvcmxkXGVbMG0iICJIZWxsbyBX b3JsZCIKKyAgICAgKGJhY2tncm91bmQtY29sb3IgLiAsYnJpZ2h0LXllbGxvdykpCisgICAgKCJc ZVsxOzMzbUhlbGxvIFdvcmxkXGVbMG0iICJIZWxsbyBXb3JsZCIKKyAgICAgKGJvbGQgKGZvcmVn cm91bmQtY29sb3IgLiAseWVsbG93KSkKKyAgICAgKGJvbGQgKGZvcmVncm91bmQtY29sb3IgLiAs YnJpZ2h0LXllbGxvdykpKQorICAgICgiXGVbMzM7MW1IZWxsbyBXb3JsZFxlWzBtIiAiSGVsbG8g V29ybGQiCisgICAgIChib2xkIChmb3JlZ3JvdW5kLWNvbG9yIC4gLHllbGxvdykpCisgICAgIChi b2xkIChmb3JlZ3JvdW5kLWNvbG9yIC4gLGJyaWdodC15ZWxsb3cpKSkKKyAgICAoIlxlWzFtXGVb MzNtSGVsbG8gV29ybGRcZVswbSIgIkhlbGxvIFdvcmxkIgorICAgICAoYm9sZCAoZm9yZWdyb3Vu ZC1jb2xvciAuICx5ZWxsb3cpKQorICAgICAoYm9sZCAoZm9yZWdyb3VuZC1jb2xvciAuICxicmln aHQteWVsbG93KSkpCisgICAgKCJcZVszM21cZVsxbUhlbGxvIFdvcmxkXGVbMG0iICJIZWxsbyBX b3JsZCIKKyAgICAgKGJvbGQgKGZvcmVncm91bmQtY29sb3IgLiAseWVsbG93KSkKKyAgICAgKGJv bGQgKGZvcmVncm91bmQtY29sb3IgLiAsYnJpZ2h0LXllbGxvdykpKQorICAgICgiXGVbMW1cZVsz bVxlWzVtYm9sZCBpdGFsaWNzIGJsaW5rXGVbMG0iICJib2xkIGl0YWxpY3MgYmxpbmsiCisgICAg IChib2xkIGl0YWxpYyBzdWNjZXNzKSkpKQogCiAoZXJ0LWRlZnRlc3QgYW5zaS1jb2xvci1hcHBs eS1vbi1yZWdpb24tdGVzdCAoKQotICAgIChkb2xpc3QgKHBhaXIgdGVzdC1zdHJpbmdzKQotICAg ICAgKHdpdGgtdGVtcC1idWZmZXIKLSAgICAgICAgKGluc2VydCAoY2FyIHBhaXIpKQorICAocGNh c2UtZG9saXN0IChgKCxpbnB1dCAsdGV4dCAsZmFjZSkgdGVzdC1zdHJpbmdzKQorICAgICh3aXRo LXRlbXAtYnVmZmVyCisgICAgICAoaW5zZXJ0IGlucHV0KQorICAgICAgKGFuc2ktY29sb3ItYXBw bHktb24tcmVnaW9uIChwb2ludC1taW4pIChwb2ludC1tYXgpKQorICAgICAgKHNob3VsZCAoZXF1 YWwgKGJ1ZmZlci1zdHJpbmcpIHRleHQpKQorICAgICAgKHNob3VsZCAoZXF1YWwgKGdldC1jaGFy LXByb3BlcnR5IChwb2ludC1taW4pICdmYWNlKSBmYWNlKSkKKyAgICAgIChzaG91bGQgKG5vdCAo ZXF1YWwgKG92ZXJsYXlzLWF0IChwb2ludC1taW4pKSBuaWwpKSkpKSkKKworKGVydC1kZWZ0ZXN0 IGFuc2ktY29sb3ItYXBwbHktb24tcmVnaW9uLWJvbGQtaXMtYnJpZ2h0LXRlc3QgKCkKKyAgKHBj YXNlLWRvbGlzdCAoYCgsaW5wdXQgLHRleHQgLGZhY2UgLGJyaWdodC1mYWNlKSB0ZXN0LXN0cmlu Z3MpCisgICAgKHdpdGgtdGVtcC1idWZmZXIKKyAgICAgIChsZXQgKChhbnNpLWNvbG9yLWJvbGQt aXMtYnJpZ2h0IHQpKQorICAgICAgICAoaW5zZXJ0IGlucHV0KQogICAgICAgICAoYW5zaS1jb2xv ci1hcHBseS1vbi1yZWdpb24gKHBvaW50LW1pbikgKHBvaW50LW1heCkpCi0gICAgICAgIChzaG91 bGQgKGVxdWFsIChidWZmZXItc3RyaW5nKSAoY2RyIHBhaXIpKSkKLSAgICAgICAgKHNob3VsZCAo bm90IChlcXVhbCAob3ZlcmxheXMtYXQgKHBvaW50LW1pbikpIG5pbCkpKSkpKQorICAgICAgICAo c2hvdWxkIChlcXVhbCAoYnVmZmVyLXN0cmluZykgdGV4dCkpCisgICAgICAgIChzaG91bGQgKGVx dWFsIChnZXQtY2hhci1wcm9wZXJ0eSAocG9pbnQtbWluKSAnZmFjZSkKKyAgICAgICAgICAgICAg ICAgICAgICAgKG9yIGJyaWdodC1mYWNlIGZhY2UpKSkKKyAgICAgICAgKHNob3VsZCAobm90IChl cXVhbCAob3ZlcmxheXMtYXQgKHBvaW50LW1pbikpIG5pbCkpKSkpKSkKIAogKGVydC1kZWZ0ZXN0 IGFuc2ktY29sb3ItYXBwbHktb24tcmVnaW9uLXByZXNlcnZpbmctdGVzdCAoKQogICAgIChkb2xp c3QgKHBhaXIgdGVzdC1zdHJpbmdzKQotLSAKMi4yNS4xCgo= --0000000000009ad6e405ca56027f Content-Type: application/octet-stream; name="0002-Add-support-for-bright-ANSI-colors-in-term-mode.patch" Content-Disposition: attachment; filename="0002-Add-support-for-bright-ANSI-colors-in-term-mode.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ksqnwi201 RnJvbSAzZTFkOTFlMzRhNTYzYmI3NTBhNDk4ZDRhNzU0MzNiM2FhYzFmMGU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5jb20+CkRh dGU6IFR1ZSwgMjQgQXVnIDIwMjEgMTU6NDY6MDYgLTA3MDAKU3ViamVjdDogW1BBVENIIDIvMl0g QWRkIHN1cHBvcnQgZm9yICJicmlnaHQiIEFOU0kgY29sb3JzIGluIHRlcm0tbW9kZQoKKiBsaXN0 L3Rlcm0uZWwgKGFuc2ktdGVybS1jb2xvci12ZWN0b3IpOiBBZGQgbmV3IGZhY2VzLgoodGVybS1j b2xvci13aGl0ZSk6IFR3ZWFrIGNvbG9ycy4KKHRlcm0tY29sb3ItYnJpZ2h0LWJsYWNrLCB0ZXJt LWNvbG9yLWJyaWdodC1yZWQsIHRlcm0tY29sb3ItYnJpZ2h0LWdyZWVuKQoodGVybS1jb2xvci1i cmlnaHQteWVsbG93LCB0ZXJtLWNvbG9yLWJyaWdodC1ibHVlKQoodGVybS1jb2xvci1icmlnaHQt bWFnZW50YSwgdGVybS1jb2xvci1icmlnaHQtY3lhbikKKHRlcm0tY29sb3ItYnJpZ2h0LXdoaXRl KTogTmV3IGZhY2VzLgoodGVybS0tbWF5YmUtYnJpZ2h0ZW4tY29sb3IpOiBOZXcgZnVuY3Rpb24u Cih0ZXJtLWhhbmRsZS1jb2xvcnMtYXJyYXkpOiBIYW5kbGUgYnJpZ2h0IGNvbG9ycy4KKiB0ZXN0 L2xpc3AvdGVybS10ZXN0cy5lbCAodGVybS1jb2xvcnMsIHRlcm0tY29sb3JzLWJvbGQtaXMtYnJp Z2h0KToKTmV3IGZ1bmN0aW9ucy4KLS0tCiBldGMvTkVXUyAgICAgICAgICAgICAgICB8ICAgNyAr KysKIGxpc3AvdGVybS5lbCAgICAgICAgICAgIHwgMTMzICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0KIHRlc3QvbGlzcC90ZXJtLXRlc3RzLmVsIHwgIDU5ICsrKysrKysr KysrKysrKysrLQogMyBmaWxlcyBjaGFuZ2VkLCAxNjcgaW5zZXJ0aW9ucygrKSwgMzIgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZXRjL05FV1MgYi9ldGMvTkVXUwppbmRleCBiOGU3N2JlZTY4 Li5lNWFhMDU1ZmI3IDEwMDY0NAotLS0gYS9ldGMvTkVXUworKysgYi9ldGMvTkVXUwpAQCAtMjM2 Nyw2ICsyMzY3LDEzIEBAIGJhc2VkIG9uIHRoZSBjdXJyZW50IHdpbmRvdyBzaXplLiAgSW4gcHJl dmlvdXMgdmVyc2lvbnMgb2YgRW1hY3MsIHRoaXMKIHdhcyBhbHdheXMgZG9uZSAoYW5kIHRoYXQg Y291bGQgbGVhZCB0byBvZGQgZGlzcGxheXMgd2hlbiByZXNpemluZyB0aGUKIHdpbmRvdyBhZnRl ciBzdGFydGluZykuICBUaGlzIHZhcmlhYmxlIGRlZmF1bHRzIHRvIG5pbC4KIAorLS0tCisqKiog J3Rlcm0tbW9kZScgbm93IHN1cHBvcnRzICJicmlnaHQiIGNvbG9yIGNvZGVzLgorIkJyaWdodCIg QU5TSSBjb2xvciBjb2RlcyBhcmUgbm93IGRpc3BsYXllZCB1c2luZyB0aGUgY29sb3IgdmFsdWVz CitkZWZpbmVkIGluICd0ZXJtLWNvbG9yLWJyaWdodC0qJy4gIEluIGFkZGl0aW9uLCBib2xkIHRl eHQgd2l0aCByZWd1bGFyCitBTlNJIGNvbG9ycyBjYW4gYmUgZGlzcGxheWVkIGFzICJicmlnaHQi IGlmICdhbnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0JworaXMgbm9uLW5pbC4KKwogKiogV2lkZ2V0 CiAKICsrKwpkaWZmIC0tZ2l0IGEvbGlzcC90ZXJtLmVsIGIvbGlzcC90ZXJtLmVsCmluZGV4IGIz ODcwYTgxNGQuLmVmMjUzMjE4MmMgMTAwNjQ0Ci0tLSBhL2xpc3AvdGVybS5lbAorKysgYi9saXNw L3Rlcm0uZWwKQEAgLTcyNyw3ICs3MjcsMTUgQEAgYW5zaS10ZXJtLWNvbG9yLXZlY3RvcgogICAg dGVybS1jb2xvci1ibHVlCiAgICB0ZXJtLWNvbG9yLW1hZ2VudGEKICAgIHRlcm0tY29sb3ItY3lh bgotICAgdGVybS1jb2xvci13aGl0ZV0pCisgICB0ZXJtLWNvbG9yLXdoaXRlCisgICB0ZXJtLWNv bG9yLWJyaWdodC1ibGFjaworICAgdGVybS1jb2xvci1icmlnaHQtcmVkCisgICB0ZXJtLWNvbG9y LWJyaWdodC1ncmVlbgorICAgdGVybS1jb2xvci1icmlnaHQteWVsbG93CisgICB0ZXJtLWNvbG9y LWJyaWdodC1ibHVlCisgICB0ZXJtLWNvbG9yLWJyaWdodC1tYWdlbnRhCisgICB0ZXJtLWNvbG9y LWJyaWdodC1jeWFuCisgICB0ZXJtLWNvbG9yLWJyaWdodC13aGl0ZV0pCiAKIChkZWZjdXN0b20g dGVybS1kZWZhdWx0LWZnLWNvbG9yIG5pbAogICAiSWYgbm9uLW5pbCwgZGVmYXVsdCBjb2xvciBm b3IgZm9yZWdyb3VuZCBpbiBUZXJtIG1vZGUuIgpAQCAtNzk3LDEwICs4MDUsNTAgQEAgdGVybS1j b2xvci1jeWFuCiAgIDpncm91cCAndGVybSkKIAogKGRlZmZhY2UgdGVybS1jb2xvci13aGl0ZQot ICAnKCh0IDpmb3JlZ3JvdW5kICJ3aGl0ZSIgOmJhY2tncm91bmQgIndoaXRlIikpCisgICcoKHQg OmZvcmVncm91bmQgImdyZXk5MCIgOmJhY2tncm91bmQgImdyYXk5MCIpKQogICAiRmFjZSB1c2Vk IHRvIHJlbmRlciB3aGl0ZSBjb2xvciBjb2RlLiIKICAgOmdyb3VwICd0ZXJtKQogCisoZGVmZmFj ZSB0ZXJtLWNvbG9yLWJyaWdodC1ibGFjaworICAnKCh0IDpmb3JlZ3JvdW5kICJncmF5MzAiIDpi YWNrZ3JvdW5kICJncmF5MzAiKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgYnJpZ2h0IGJsYWNr IGNvbG9yIGNvZGUuIgorICA6Z3JvdXAgJ3Rlcm0pCisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJp Z2h0LXJlZAorICAnKCh0IDpmb3JlZ3JvdW5kICJyZWQyIiA6YmFja2dyb3VuZCAicmVkMiIpKQor ICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgcmVkIGNvbG9yIGNvZGUuIgorICA6Z3JvdXAg J3Rlcm0pCisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0LWdyZWVuCisgICcoKHQgOmZvcmVn cm91bmQgImdyZWVuMiIgOmJhY2tncm91bmQgImdyZWVuMiIpKQorICAiRmFjZSB1c2VkIHRvIHJl bmRlciBicmlnaHQgZ3JlZW4gY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybSkKKworKGRlZmZh Y2UgdGVybS1jb2xvci1icmlnaHQteWVsbG93CisgICcoKHQgOmZvcmVncm91bmQgInllbGxvdzIi IDpiYWNrZ3JvdW5kICJ5ZWxsb3cyIikpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJyaWdodCB5 ZWxsb3cgY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybSkKKworKGRlZmZhY2UgdGVybS1jb2xv ci1icmlnaHQtYmx1ZQorICAnKCh0IDpmb3JlZ3JvdW5kICJibHVlMSIgOmJhY2tncm91bmQgImJs dWUxIikpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJyaWdodCBibHVlIGNvbG9yIGNvZGUuIgor ICA6Z3JvdXAgJ3Rlcm0pCisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0LW1hZ2VudGEKKyAg JygodCA6Zm9yZWdyb3VuZCAibWFnZW50YTIiIDpiYWNrZ3JvdW5kICJtYWdlbnRhMiIpKQorICAi RmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgbWFnZW50YSBjb2xvciBjb2RlLiIKKyAgOmdyb3Vw ICd0ZXJtKQorCisoZGVmZmFjZSB0ZXJtLWNvbG9yLWJyaWdodC1jeWFuCisgICcoKHQgOmZvcmVn cm91bmQgImN5YW4yIiA6YmFja2dyb3VuZCAiY3lhbjIiKSkKKyAgIkZhY2UgdXNlZCB0byByZW5k ZXIgYnJpZ2h0IGN5YW4gY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybSkKKworKGRlZmZhY2Ug dGVybS1jb2xvci1icmlnaHQtd2hpdGUKKyAgJygodCA6Zm9yZWdyb3VuZCAid2hpdGUiIDpiYWNr Z3JvdW5kICJ3aGl0ZSIpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgd2hpdGUgY29s b3IgY29kZS4iCisgIDpncm91cCAndGVybSkKKwogKGRlZmN1c3RvbSB0ZXJtLWJ1ZmZlci1tYXhp bXVtLXNpemUgODE5MgogICAiVGhlIG1heGltdW0gc2l6ZSBpbiBsaW5lcyBmb3IgdGVybSBidWZm ZXJzLgogVGVybSBidWZmZXJzIGFyZSB0cnVuY2F0ZWQgZnJvbSB0aGUgdG9wIHRvIGJlIG5vIGdy ZWF0ZXIgdGhhbiB0aGlzIG51bWJlci4KQEAgLTMyMjUsNiArMzI3MywxNSBAQCB0ZXJtLXJlc2V0 LXRlcm1pbmFsCiAgIDs7IEZJWE1FOiBObyBpZGVhIHdoeSB0aGlzIGlzIGhlcmUsIGl0IGxvb2tz IHdyb25nLiAgLS1TdGVmCiAgIChzZXRxIHRlcm0tYW5zaS1mYWNlLWFscmVhZHktZG9uZSBuaWwp KQogCisoZGVmdW4gdGVybS0tbWF5YmUtYnJpZ2h0ZW4tY29sb3IgKGNvbG9yIGJvbGQpCisgICJQ b3NzaWJseSBjb252ZXJ0IENPTE9SIHRvIGl0cyBicmlnaHQgdmFyaWFudC4KK0NPTE9SIGlzIGFu IGluZGV4IGludG8gYGFuc2ktdGVybS1jb2xvci12ZWN0b3InLiAgSWYgQk9MRCBhbmQKK2BhbnNp LWNvbG9yLWJvbGQtaXMtYnJpZ2h0JyBhcmUgbm9uLW5pbCBhbmQgQ09MT1IgaXMgYSByZWd1bGFy IGNvbG9yLAorcmV0dXJuIHRoZSBicmlnaHQgdmVyc2lvbiBvZiBDT0xPUjsgb3RoZXJ3aXNlLCBy ZXR1cm4gQ09MT1IuIgorICAoaWYgKGFuZCBhbnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0IGJvbGQg KDw9IDEgY29sb3IgOCkpCisgICAgICAoKyBjb2xvciA4KQorICAgIGNvbG9yKSkKKwogOzsgTmV3 IGZ1bmN0aW9uIHRvIGRlYWwgd2l0aCBhbnNpIGNvbG9yaXplZCBvdXRwdXQsIGFzIHlvdSBjYW4g c2VlIHlvdSBjYW4KIDs7IGhhdmUgYW55IGJvbGQvdW5kZXJsaW5lL2ZnL2JnL3JldmVyc2UgY29t YmluYXRpb24uIC1tbQogCkBAIC0zMjY0LDYgKzMzMjEsMTAgQEAgdGVybS1oYW5kbGUtY29sb3Jz LWFycmF5CiAgICAoKGFuZCAoPj0gcGFyYW1ldGVyIDMwKSAoPD0gcGFyYW1ldGVyIDM3KSkKICAg ICAoc2V0cSB0ZXJtLWFuc2ktY3VycmVudC1jb2xvciAoLSBwYXJhbWV0ZXIgMjkpKSkKIAorICAg OzsgQnJpZ2h0IGZvcmVncm91bmQKKyAgICgoYW5kICg+PSBwYXJhbWV0ZXIgOTApICg8PSBwYXJh bWV0ZXIgOTcpKQorICAgIChzZXRxIHRlcm0tYW5zaS1jdXJyZW50LWNvbG9yICgtIHBhcmFtZXRl ciA4MSkpKQorCiAgICA7OyBSZXNldCBmb3JlZ3JvdW5kCiAgICAoKGVxIHBhcmFtZXRlciAzOSkK ICAgICAoc2V0cSB0ZXJtLWFuc2ktY3VycmVudC1jb2xvciAwKSkKQEAgLTMyNzIsNiArMzMzMywx MCBAQCB0ZXJtLWhhbmRsZS1jb2xvcnMtYXJyYXkKICAgICgoYW5kICg+PSBwYXJhbWV0ZXIgNDAp ICg8PSBwYXJhbWV0ZXIgNDcpKQogICAgIChzZXRxIHRlcm0tYW5zaS1jdXJyZW50LWJnLWNvbG9y ICgtIHBhcmFtZXRlciAzOSkpKQogCisgICA7OyBCcmlnaHQgZm9yZWdyb3VuZAorICAgKChhbmQg KD49IHBhcmFtZXRlciAxMDApICg8PSBwYXJhbWV0ZXIgMTA3KSkKKyAgICAoc2V0cSB0ZXJtLWFu c2ktY3VycmVudC1iZy1jb2xvciAoLSBwYXJhbWV0ZXIgOTEpKSkKKwogICAgOzsgUmVzZXQgYmFj a2dyb3VuZAogICAgKChlcSBwYXJhbWV0ZXIgNDkpCiAgICAgKHNldHEgdGVybS1hbnNpLWN1cnJl bnQtYmctY29sb3IgMCkpCkBAIC0zMjkwLDM3ICszMzU1LDQzIEBAIHRlcm0taGFuZGxlLWNvbG9y cy1hcnJheQogICA7OyAgICAgICAgICB0ZXJtLWFuc2ktY3VycmVudC1iZy1jb2xvcikKIAogICAo dW5sZXNzIHRlcm0tYW5zaS1mYWNlLWFscmVhZHktZG9uZQotICAgIChpZiB0ZXJtLWFuc2ktY3Vy cmVudC1pbnZpc2libGUKLSAgICAgICAgKGxldCAoKGNvbG9yCi0gICAgICAgICAgICAgICAoaWYg dGVybS1hbnNpLWN1cnJlbnQtcmV2ZXJzZQotICAgICAgICAgICAgICAgICAgIChmYWNlLWZvcmVn cm91bmQKLSAgICAgICAgICAgICAgICAgICAgKGVsdCBhbnNpLXRlcm0tY29sb3ItdmVjdG9yIHRl cm0tYW5zaS1jdXJyZW50LWNvbG9yKQotICAgICAgICAgICAgICAgICAgICBuaWwgJ2RlZmF1bHQp Ci0gICAgICAgICAgICAgICAgIChmYWNlLWJhY2tncm91bmQKLSAgICAgICAgICAgICAgICAgIChl bHQgYW5zaS10ZXJtLWNvbG9yLXZlY3RvciB0ZXJtLWFuc2ktY3VycmVudC1iZy1jb2xvcikKLSAg ICAgICAgICAgICAgICAgIG5pbCAnZGVmYXVsdCkpKSkKLSAgICAgICAgICAoc2V0cSB0ZXJtLWN1 cnJlbnQtZmFjZQotICAgICAgICAgICAgICAgIChsaXN0IDpiYWNrZ3JvdW5kIGNvbG9yCi0gICAg ICAgICAgICAgICAgICAgICAgOmZvcmVncm91bmQgY29sb3IpKQotICAgICAgICAgICkgOzsgTm8g bmVlZCB0byBib3RoZXIgd2l0aCBhbnl0aGluZyBlbHNlIGlmIGl0J3MgaW52aXNpYmxlLgotICAg ICAgKHNldHEgdGVybS1jdXJyZW50LWZhY2UKLSAgICAgICAgICAgIChsaXN0IDpmb3JlZ3JvdW5k Ci0gICAgICAgICAgICAgICAgICAoZmFjZS1mb3JlZ3JvdW5kCi0gICAgICAgICAgICAgICAgICAg KGVsdCBhbnNpLXRlcm0tY29sb3ItdmVjdG9yIHRlcm0tYW5zaS1jdXJyZW50LWNvbG9yKQotICAg ICAgICAgICAgICAgICAgIG5pbCAnZGVmYXVsdCkKLSAgICAgICAgICAgICAgICAgIDpiYWNrZ3Jv dW5kCi0gICAgICAgICAgICAgICAgICAoZmFjZS1iYWNrZ3JvdW5kCi0gICAgICAgICAgICAgICAg ICAgKGVsdCBhbnNpLXRlcm0tY29sb3ItdmVjdG9yIHRlcm0tYW5zaS1jdXJyZW50LWJnLWNvbG9y KQotICAgICAgICAgICAgICAgICAgIG5pbCAnZGVmYXVsdCkKLSAgICAgICAgICAgICAgICAgIDpp bnZlcnNlLXZpZGVvIHRlcm0tYW5zaS1jdXJyZW50LXJldmVyc2UpKQotCi0gICAgICAod2hlbiB0 ZXJtLWFuc2ktY3VycmVudC1ib2xkCisgICAgKGxldCAoKGN1cnJlbnQtY29sb3IgKHRlcm0tLW1h eWJlLWJyaWdodGVuLWNvbG9yCisgICAgICAgICAgICAgICAgICAgICAgICAgIHRlcm0tYW5zaS1j dXJyZW50LWNvbG9yCisgICAgICAgICAgICAgICAgICAgICAgICAgIHRlcm0tYW5zaS1jdXJyZW50 LWJvbGQpKQorICAgICAgICAgIChjdXJyZW50LWJnLWNvbG9yICh0ZXJtLS1tYXliZS1icmlnaHRl bi1jb2xvcgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXJtLWFuc2ktY3VycmVudC1i Zy1jb2xvcgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXJtLWFuc2ktY3VycmVudC1i b2xkKSkpCisgICAgICAoaWYgdGVybS1hbnNpLWN1cnJlbnQtaW52aXNpYmxlCisgICAgICAgICAg KGxldCAoKGNvbG9yCisgICAgICAgICAgICAgICAgIChpZiB0ZXJtLWFuc2ktY3VycmVudC1yZXZl cnNlCisgICAgICAgICAgICAgICAgICAgICAoZmFjZS1mb3JlZ3JvdW5kCisgICAgICAgICAgICAg ICAgICAgICAgKGVsdCBhbnNpLXRlcm0tY29sb3ItdmVjdG9yIGN1cnJlbnQtY29sb3IpCisgICAg ICAgICAgICAgICAgICAgICAgbmlsICdkZWZhdWx0KQorICAgICAgICAgICAgICAgICAgIChmYWNl LWJhY2tncm91bmQKKyAgICAgICAgICAgICAgICAgICAgKGVsdCBhbnNpLXRlcm0tY29sb3ItdmVj dG9yIGN1cnJlbnQtYmctY29sb3IpCisgICAgICAgICAgICAgICAgICAgIG5pbCAnZGVmYXVsdCkp KSkKKyAgICAgICAgICAgIChzZXRxIHRlcm0tY3VycmVudC1mYWNlCisgICAgICAgICAgICAgICAg ICAobGlzdCA6YmFja2dyb3VuZCBjb2xvcgorICAgICAgICAgICAgICAgICAgICAgICAgOmZvcmVn cm91bmQgY29sb3IpKQorICAgICAgICAgICAgKSA7OyBObyBuZWVkIHRvIGJvdGhlciB3aXRoIGFu eXRoaW5nIGVsc2UgaWYgaXQncyBpbnZpc2libGUuCiAgICAgICAgIChzZXRxIHRlcm0tY3VycmVu dC1mYWNlCi0gICAgICAgICAgICAgIGAoLHRlcm0tY3VycmVudC1mYWNlIDppbmhlcml0IHRlcm0t Ym9sZCkpKQorICAgICAgICAgICAgICAobGlzdCA6Zm9yZWdyb3VuZAorICAgICAgICAgICAgICAg ICAgICAoZmFjZS1mb3JlZ3JvdW5kCisgICAgICAgICAgICAgICAgICAgICAoZWx0IGFuc2ktdGVy bS1jb2xvci12ZWN0b3IgY3VycmVudC1jb2xvcikKKyAgICAgICAgICAgICAgICAgICAgIG5pbCAn ZGVmYXVsdCkKKyAgICAgICAgICAgICAgICAgICAgOmJhY2tncm91bmQKKyAgICAgICAgICAgICAg ICAgICAgKGZhY2UtYmFja2dyb3VuZAorICAgICAgICAgICAgICAgICAgICAgKGVsdCBhbnNpLXRl cm0tY29sb3ItdmVjdG9yIGN1cnJlbnQtYmctY29sb3IpCisgICAgICAgICAgICAgICAgICAgICBu aWwgJ2RlZmF1bHQpCisgICAgICAgICAgICAgICAgICAgIDppbnZlcnNlLXZpZGVvIHRlcm0tYW5z aS1jdXJyZW50LXJldmVyc2UpKQorCisgICAgICAgICh3aGVuIHRlcm0tYW5zaS1jdXJyZW50LWJv bGQKKyAgICAgICAgICAoc2V0cSB0ZXJtLWN1cnJlbnQtZmFjZQorICAgICAgICAgICAgICAgIGAo LHRlcm0tY3VycmVudC1mYWNlIDppbmhlcml0IHRlcm0tYm9sZCkpKQogCi0gICAgICAod2hlbiB0 ZXJtLWFuc2ktY3VycmVudC11bmRlcmxpbmUKLSAgICAgICAgKHNldHEgdGVybS1jdXJyZW50LWZh Y2UKLSAgICAgICAgICAgICAgYCgsdGVybS1jdXJyZW50LWZhY2UgOmluaGVyaXQgdGVybS11bmRl cmxpbmUpKSkpKQorICAgICAgICAod2hlbiB0ZXJtLWFuc2ktY3VycmVudC11bmRlcmxpbmUKKyAg ICAgICAgICAoc2V0cSB0ZXJtLWN1cnJlbnQtZmFjZQorICAgICAgICAgICAgICAgIGAoLHRlcm0t Y3VycmVudC1mYWNlIDppbmhlcml0IHRlcm0tdW5kZXJsaW5lKSkpKSkpCiAKICAgOzsJKG1lc3Nh Z2UgIkRlYnVnICVTIiB0ZXJtLWN1cnJlbnQtZmFjZSkKICAgOzsgRklYTUU6IHNob3VsZG4ndCB3 ZSBzZXQgdGVybS1hbnNpLWZhY2UtYWxyZWFkeS1kb25lIHRvIHQgaGVyZT8gIC0tU3RlZgpkaWZm IC0tZ2l0IGEvdGVzdC9saXNwL3Rlcm0tdGVzdHMuZWwgYi90ZXN0L2xpc3AvdGVybS10ZXN0cy5l bAppbmRleCA1MGFjMzcwYjViLi5hNjFkMDkzOWVhIDEwMDY0NAotLS0gYS90ZXN0L2xpc3AvdGVy bS10ZXN0cy5lbAorKysgYi90ZXN0L2xpc3AvdGVybS10ZXN0cy5lbApAQCAtMjgsNiArMjgsNDUg QEAKIChkZWZ2YXIgdGVybS1oZWlnaHQpICAgICAgICAgICAgICAgICAgICA7IE51bWJlciBvZiBs aW5lcyBpbiB3aW5kb3cuCiAoZGVmdmFyIHRlcm0td2lkdGgpICAgICAgICAgICAgICAgICAgICAg OyBOdW1iZXIgb2YgY29sdW1ucyBpbiB3aW5kb3cuCiAKKyhkZWZ2YXIgeWVsbG93LWZnLXByb3Bz CisgICcoOmZvcmVncm91bmQgInllbGxvdzMiIDpiYWNrZ3JvdW5kICJ1bnNwZWNpZmllZC1iZyIg OmludmVyc2UtdmlkZW8gbmlsKSkKKyhkZWZ2YXIgeWVsbG93LWJnLXByb3BzCisgICcoOmZvcmVn cm91bmQgInVuc3BlY2lmaWVkLWZnIiA6YmFja2dyb3VuZCAieWVsbG93MyIgOmludmVyc2Utdmlk ZW8gbmlsKSkKKyhkZWZ2YXIgYnJpZ2h0LXllbGxvdy1mZy1wcm9wcworICAnKDpmb3JlZ3JvdW5k ICJ5ZWxsb3cyIiA6YmFja2dyb3VuZCAidW5zcGVjaWZpZWQtYmciIDppbnZlcnNlLXZpZGVvIG5p bCkpCisoZGVmdmFyIGJyaWdodC15ZWxsb3ctYmctcHJvcHMKKyAgJyg6Zm9yZWdyb3VuZCAidW5z cGVjaWZpZWQtZmciIDpiYWNrZ3JvdW5kICJ5ZWxsb3cyIiA6aW52ZXJzZS12aWRlbyBuaWwpKQor CisoZGVmdmFyIGFuc2ktdGVzdC1zdHJpbmdzCisgIGAoKCJcZVszM21IZWxsbyBXb3JsZFxlWzBt IgorICAgICAsKHByb3BlcnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UgeWVsbG93 LWZnLXByb3BzKSkKKyAgICAoIlxlWzQzbUhlbGxvIFdvcmxkXGVbMG0iCisgICAgICwocHJvcGVy dGl6ZSAiSGVsbG8gV29ybGQiICdmb250LWxvY2stZmFjZSB5ZWxsb3ctYmctcHJvcHMpKQorICAg ICgiXGVbOTNtSGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3Js ZCIgJ2ZvbnQtbG9jay1mYWNlIGJyaWdodC15ZWxsb3ctZmctcHJvcHMpKQorICAgICgiXGVbMTAz bUhlbGxvIFdvcmxkXGVbMG0iCisgICAgICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdmb250 LWxvY2stZmFjZSBicmlnaHQteWVsbG93LWJnLXByb3BzKSkKKyAgICAoIlxlWzE7MzNtSGVsbG8g V29ybGRcZVswbSIKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1m YWNlCisgICAgICAgICAgICAgICAgICBgKCx5ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQgdGVybS1i b2xkKSkKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1mYWNlCisg ICAgICAgICAgICAgICAgICBgKCxicmlnaHQteWVsbG93LWZnLXByb3BzIDppbmhlcml0IHRlcm0t Ym9sZCkpKQorICAgICgiXGVbMzM7MW1IZWxsbyBXb3JsZFxlWzBtIgorICAgICAsKHByb3BlcnRp emUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UKKyAgICAgICAgICAgICAgICAgIGAoLHll bGxvdy1mZy1wcm9wcyA6aW5oZXJpdCB0ZXJtLWJvbGQpKQorICAgICAsKHByb3BlcnRpemUgIkhl bGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UKKyAgICAgICAgICAgICAgICAgIGAoLGJyaWdodC15 ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQgdGVybS1ib2xkKSkpCisgICAgKCJcZVsxbVxlWzMzbUhl bGxvIFdvcmxkXGVbMG0iCisgICAgICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdmb250LWxv Y2stZmFjZQorICAgICAgICAgICAgICAgICAgYCgseWVsbG93LWZnLXByb3BzIDppbmhlcml0IHRl cm0tYm9sZCkpCisgICAgICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdmb250LWxvY2stZmFj ZQorICAgICAgICAgICAgICAgICAgYCgsYnJpZ2h0LXllbGxvdy1mZy1wcm9wcyA6aW5oZXJpdCB0 ZXJtLWJvbGQpKSkKKyAgICAoIlxlWzMzbVxlWzFtSGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChw cm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1mYWNlCisgICAgICAgICAgICAgICAg ICBgKCx5ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQgdGVybS1ib2xkKSkKKyAgICAgLChwcm9wZXJ0 aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1mYWNlCisgICAgICAgICAgICAgICAgICBgKCxi cmlnaHQteWVsbG93LWZnLXByb3BzIDppbmhlcml0IHRlcm0tYm9sZCkpKSkpCisKIChkZWZ1biB0 ZXJtLXRlc3Qtc2NyZWVuLWZyb20taW5wdXQgKHdpZHRoIGhlaWdodCBpbnB1dCAmb3B0aW9uYWwg cmV0dXJuLXZhcikKICAgKHdpdGgtdGVtcC1idWZmZXIKICAgICAodGVybS1tb2RlKQpAQCAtNDgs NyArODcsNyBAQCB0ZXJtLXRlc3Qtc2NyZWVuLWZyb20taW5wdXQKICAgICAgICAgICAgICAgICAo bWFwYyAobGFtYmRhIChpbnB1dCkgKHRlcm0tZW11bGF0ZS10ZXJtaW5hbCBwcm9jIGlucHV0KSkg aW5wdXQpCiAgICAgICAgICAgICAgICh0ZXJtLWVtdWxhdGUtdGVybWluYWwgcHJvYyBpbnB1dCkp CiAgICAgICAoaWYgcmV0dXJuLXZhciAoYnVmZmVyLWxvY2FsLXZhbHVlIHJldHVybi12YXIgKGN1 cnJlbnQtYnVmZmVyKSkKLSAgICAgICAgKGJ1ZmZlci1zdWJzdHJpbmctbm8tcHJvcGVydGllcyAo cG9pbnQtbWluKSAocG9pbnQtbWF4KSkpKSkpCisgICAgICAgIChidWZmZXItc3Vic3RyaW5nIChw b2ludC1taW4pIChwb2ludC1tYXgpKSkpKSkKIAogKGVydC1kZWZ0ZXN0IHRlcm0tc2ltcGxlLWxp bmVzICgpCiAgIChza2lwLXVubGVzcyAobm90IChtZW1xIHN5c3RlbS10eXBlICcod2luZG93cy1u dCBtcy1kb3MpKSkpCkBAIC03Nyw2ICsxMTYsMjQgQEAgdGVybS1saW5lLXdyYXAKICAgICAgICAg ICAgKHRlcm0tdGVzdC1zY3JlZW4tZnJvbS1pbnB1dCA0MCAxMiAobGV0ICgoc3RyIChtYWtlLXN0 cmluZyAzMCA/YSkpKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKGxpc3Qgc3RyIHN0cikpKSkpKQogCisoZXJ0LWRlZnRlc3QgdGVybS1jb2xvcnMgKCkK KyAgKHNraXAtdW5sZXNzIChub3QgKG1lbXEgc3lzdGVtLXR5cGUgJyh3aW5kb3dzLW50IG1zLWRv cykpKSkKKyAgKHBjYXNlLWRvbGlzdCAoYCgsc3RyICxleHBlY3RlZCkgYW5zaS10ZXN0LXN0cmlu Z3MpCisgICAgKGxldCAoKHJlc3VsdCAodGVybS10ZXN0LXNjcmVlbi1mcm9tLWlucHV0IDQwIDEy IHN0cikpKQorICAgICAgKHNob3VsZCAoZXF1YWwgcmVzdWx0IGV4cGVjdGVkKSkKKyAgICAgIChz aG91bGQgKGVxdWFsICh0ZXh0LXByb3BlcnRpZXMtYXQgMCByZXN1bHQpCisgICAgICAgICAgICAg ICAgICAgICAodGV4dC1wcm9wZXJ0aWVzLWF0IDAgZXhwZWN0ZWQpKSkpKSkKKworKGVydC1kZWZ0 ZXN0IHRlcm0tY29sb3JzLWJvbGQtaXMtYnJpZ2h0ICgpCisgIChza2lwLXVubGVzcyAobm90ICht ZW1xIHN5c3RlbS10eXBlICcod2luZG93cy1udCBtcy1kb3MpKSkpCisgIChsZXQgKCh0ZXJtLWNv bG9yLWJvbGQtaXMtYnJpZ2h0IHQpKQorICAgIChwY2FzZS1kb2xpc3QgKGAoLHN0ciAsZXhwZWN0 ZWQgLGJyaWdodC1leHBlY3RlZCkgYW5zaS10ZXN0LXN0cmluZ3MpCisgICAgICAobGV0ICgoZXhw ZWN0ZWQgKG9yIGJyaWdodC1leHBlY3RlZCBleHBlY3RlZCkpCisgICAgICAgICAgICAocmVzdWx0 ICh0ZXJtLXRlc3Qtc2NyZWVuLWZyb20taW5wdXQgNDAgMTIgc3RyKSkpCisgICAgICAgIChzaG91 bGQgKGVxdWFsIHJlc3VsdCBleHBlY3RlZCkpCisgICAgICAgIChzaG91bGQgKGVxdWFsICh0ZXh0 LXByb3BlcnRpZXMtYXQgMCByZXN1bHQpCisgICAgICAgICAgICAgICAgICAgICAgICh0ZXh0LXBy b3BlcnRpZXMtYXQgMCBleHBlY3RlZCkpKSkpKSkKKwogKGVydC1kZWZ0ZXN0IHRlcm0tY3Vyc29y LW1vdmVtZW50ICgpCiAgIChza2lwLXVubGVzcyAobm90IChtZW1xIHN5c3RlbS10eXBlICcod2lu ZG93cy1udCBtcy1kb3MpKSkpCiAgIDs7IEFic29sdXRlIHBvc2l0aW9uaW5nLgotLSAKMi4yNS4x Cgo= --0000000000009ad6e405ca56027f-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 25 03:06:44 2021 Received: (at 50179) by debbugs.gnu.org; 25 Aug 2021 07:06:44 +0000 Received: from localhost ([127.0.0.1]:45554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mImzk-0002jF-9O for submit@debbugs.gnu.org; Wed, 25 Aug 2021 03:06:44 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:47038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mImzj-0002iz-5d for 50179@debbugs.gnu.org; Wed, 25 Aug 2021 03:06:43 -0400 Received: by mail-wr1-f53.google.com with SMTP id f5so34757643wrm.13 for <50179@debbugs.gnu.org>; Wed, 25 Aug 2021 00:06:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=wpRiMrDQ7Vi4o5u2T1H6oE1NSjTz3HMTMDi95loYP18=; b=UYxR9z7owTYxd7plXxfcEyb7I26qFjbyzF5Cb4O2GhzRtNd4VDPpobqNqWO+MOok30 N1IfUXdyGZNOXO6Ht51TAs6asIkBp2MprqpseWuP+fr18BZavXqNBlxYSnJKK14O0P9n j4JdDoDF4lFOUBMhWaaPY2qNmNsRQUxNhVYREzjzVtPVDbAr0dHyaYXMoxuTqCT9tD7r t85VSAMkAg84c8zCNvdVYEK4vSHf3KVYVDfMib5IP9xm+XLVOVItp8LsOBq+3BKlrQ9R s8oWwe/vVEYv+myoxMYzBHevxAgMiPXIe9EJGlkGbmQI135m4TZu2kv+eldDK6RElUCF cujQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=wpRiMrDQ7Vi4o5u2T1H6oE1NSjTz3HMTMDi95loYP18=; b=qQO9iqmpDOhj07jTSEMhyqlMvKsRSiXSj04VQH+O3sZukSLxupk/E+FVBTGxX7o1aI jARzuyOWDda7EYh/5C7M+fxE8yB0hS1YM7Gbi1qepwLI7PfJ1wHN2QRejnKkhV3mgSJ2 vQbAa/oIzIEeOZShGe+/Toqz5oa6FY/qiYKAcHEc8ge3nxg4hD6vYuDw5gX6ztu7CW6Z BemLosC19CusrrSyyU/ysBY5o737zdy1NA3pGw4YWl9B4XA7+PPqH+985jlRWMDk2j7f 3vtMCccBMkiC+YZ7MSzBgqj0+Qg9GDHY4Jj39FR69tzkb5rSscaxR9HrephqhCSW2VG4 IJ1Q== X-Gm-Message-State: AOAM532BnCCZvn2XP/miA1ONuDHU0vpVBf/ArKGSSoABhl20qVGdXqz/ jvtbvvodEBQEtVTL9tjm9ILYtePKU8o= X-Google-Smtp-Source: ABdhPJxgtPG2MdgIb7CGetDiVP8gdrREtISuqBqkRfQ4pd2FDEoON4MUAxXFmEzluO3BEWlM9j5MEA== X-Received: by 2002:a5d:500d:: with SMTP id e13mr18496035wrt.413.1629875197028; Wed, 25 Aug 2021 00:06:37 -0700 (PDT) Received: from amdahl30 ([2a01:e0a:20e:d340:2ef0:5dff:fed2:7b49]) by smtp.gmail.com with ESMTPSA id n8sm3959979wmq.18.2021.08.25.00.06.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Aug 2021 00:06:36 -0700 (PDT) From: =?utf-8?Q?K=C3=A9vin_Le_Gouguec?= To: Eli Zaretskii Subject: Re: bug#50179: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> Date: Wed, 25 Aug 2021 09:06:35 +0200 In-Reply-To: <83zgt6vi43.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 24 Aug 2021 20:59:40 +0300") Message-ID: <87r1eic8as.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50179 Cc: Jim Porter , 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Eli Zaretskii writes: >> > I wouldn't offer a customizable list for this: users have no >> > particular reason to redefine standard colors. >> >> I made this a defcustom because `ansi-color-faces-vector' and >> `ansi-color-names-vector' are defcustoms too. More practically >> speaking, I'd want to customize this new variable to make these colors >> match the Emacs theme I use. I chose colors in this patch to >> complement `ansi-color-names-vector', but they'd clash with my theme. > > How can named colors change with the theme? Faces can, but colors are > absolute. Bright-yellow is the same color whatever the theme. At > least IMO. I wonder if others think otherwise. FWIW, a couple of Emacs's built-in themes set these ansi-color options. See e.g. the Modus themes, which are designed to meet WCAG's highest standards for colour contrast. Maybe there's an analogy to make with terminal emulators? Most of those (e.g. Konsole, Terminator, Xfce's) allow the user to customize the 16-color palette. Digging into the history of this 4-bit palette[1], it almost seems like no two consoles ever used the exact same colors, so these color names might not be as absolute as say, HTML color names[2]. [1] https://en.wikipedia.org/wiki/ANSI_escape_code#Colors [2] https://en.wikipedia.org/wiki/Web_colors#HTML_color_names From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 25 07:57:48 2021 Received: (at 50179) by debbugs.gnu.org; 25 Aug 2021 11:57:49 +0000 Received: from localhost ([127.0.0.1]:45982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIrXQ-0005RA-Ll for submit@debbugs.gnu.org; Wed, 25 Aug 2021 07:57:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIrXP-0005Qy-KI for 50179@debbugs.gnu.org; Wed, 25 Aug 2021 07:57:47 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43888) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIrXI-00030s-Nq; Wed, 25 Aug 2021 07:57:42 -0400 Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:3247 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIrXC-0005O9-8n; Wed, 25 Aug 2021 07:57:40 -0400 Date: Wed, 25 Aug 2021 14:57:30 +0300 Message-Id: <83lf4pvis5.fsf@gnu.org> From: Eli Zaretskii To: =?iso-8859-1?Q?K=E9vin?= Le Gouguec In-Reply-To: <87r1eic8as.fsf@gmail.com> (message from =?iso-8859-1?Q?K=E9v?= =?iso-8859-1?Q?in?= Le Gouguec on Wed, 25 Aug 2021 09:06:35 +0200) Subject: Re: bug#50179: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> <87r1eic8as.fsf@gmail.com> MIME-version: 1.0 Content-type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50179 Cc: jporterbugs@gmail.com, 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Kévin Le Gouguec > Cc: Jim Porter , 50179@debbugs.gnu.org > Date: Wed, 25 Aug 2021 09:06:35 +0200 > > Eli Zaretskii writes: > > >> I made this a defcustom because `ansi-color-faces-vector' and > >> `ansi-color-names-vector' are defcustoms too. More practically > >> speaking, I'd want to customize this new variable to make these colors > >> match the Emacs theme I use. I chose colors in this patch to > >> complement `ansi-color-names-vector', but they'd clash with my theme. > > > > How can named colors change with the theme? Faces can, but colors are > > absolute. Bright-yellow is the same color whatever the theme. At > > least IMO. I wonder if others think otherwise. > > FWIW, a couple of Emacs's built-in themes set these ansi-color options. > See e.g. the Modus themes, which are designed to meet WCAG's highest > standards for colour contrast. It's OK to set a variable. I was asking why would we want to offer users the opportunity to customize these translations. > Maybe there's an analogy to make with terminal emulators? Most of those > (e.g. Konsole, Terminator, Xfce's) allow the user to customize the > 16-color palette. Once again, if someone _really_ wants that, they can set a variable allright. I'm asking why would _we_ want that. > Digging into the history of this 4-bit palette[1], it almost seems like > no two consoles ever used the exact same colors, so these color names > might not be as absolute as say, HTML color names[2]. I don't see how this justifies a desfcustom, sorry. If there's no 110% consensus, we can choose whatever similar color we want. From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 25 08:04:23 2021 Received: (at 50179) by debbugs.gnu.org; 25 Aug 2021 12:04:23 +0000 Received: from localhost ([127.0.0.1]:45991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIrdi-0007jv-Kl for submit@debbugs.gnu.org; Wed, 25 Aug 2021 08:04:23 -0400 Received: from quimby.gnus.org ([95.216.78.240]:35746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIrdb-0007jb-QY for 50179@debbugs.gnu.org; Wed, 25 Aug 2021 08:04:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=PdcSUyjgR8AkAl6clYqW5iozbQY0XdQuBd1EPKwZ10I=; b=pOC3Ki8dmrgMYF87CzjO3Bd8gp cd1hi4LIRQqtpzCS1U0k74jNvoT7jxhoNC7G7H0NRUm81YUJIj4QQMrzH4kYBuRKUaz8QACLkLN9u YMqgF/dtlvJJD6KKObV0FyXt6l5dWemFPo/zFDdVH2jZVX//11pde+oRpDf8SeBM3xds=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mIrdQ-0003tR-T2; Wed, 25 Aug 2021 14:04:05 +0200 From: Lars Ingebrigtsen To: Jim Porter Subject: Re: bug#50179: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> Date: Wed, 25 Aug 2021 14:04:00 +0200 In-Reply-To: (Jim Porter's message of "Tue, 24 Aug 2021 15:53:52 -0700") Message-ID: <87a6l5k9xr.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jim Porter writes: > Ok, here are updated patches addressing your comments. I fixed the > grammatical error in the comment, improved the commit message for the > second patch, and switched to using `ansi-color-bold-is-b [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50179 Cc: Eli Zaretskii , 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Jim Porter writes: > Ok, here are updated patches addressing your comments. I fixed the > grammatical error in the comment, improved the commit message for the > second patch, and switched to using `ansi-color-bold-is-bright' in > both files. I left `ansi-bright-color-names-vector' as a defcustom > though, since I think that's the right thing to do there (see my > previous message), but I can change that later if we agree on a > different/better route there. Thanks; applied to Emacs 28. But unfortunately, I didn't notice the test failure until after pushing. :-/ 1 unexpected results: FAILED term-colors-bold-is-bright And the faces are: (font-lock-face ((:foreground "yellow3" :background "unspecified-bg" :inverse-video nil) :inherit term-bold)) (font-lock-face ((:foreground "yellow2" :background "unspecified-bg" :inverse-video nil) :inherit term-bold)) -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 25 12:42:19 2021 Received: (at 50179) by debbugs.gnu.org; 25 Aug 2021 16:42:19 +0000 Received: from localhost ([127.0.0.1]:47511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIvyh-00070L-2t for submit@debbugs.gnu.org; Wed, 25 Aug 2021 12:42:19 -0400 Received: from mail-ua1-f53.google.com ([209.85.222.53]:34455) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIvya-000704-JT for 50179@debbugs.gnu.org; Wed, 25 Aug 2021 12:42:13 -0400 Received: by mail-ua1-f53.google.com with SMTP id l24so94298uai.1 for <50179@debbugs.gnu.org>; Wed, 25 Aug 2021 09:42:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=k/1ENmVIu2xqf1ZtP+UC1hKlDuGoNa2B3DCWR6Z9iDQ=; b=VZsE5NwsdkuG9mZQl+8Z3jo+VcAFgg4Aw11KAU8zbPQ6zrGZ48Mqs2z5j47EjqG+aY JWDrXiiBOvHyAYqN7O+AneAOQI7DHWxpGYLMN8u61dQ1vNTFgZNT6xSEMnN2V7sZodye ilv8aTGPzIjhmzWZcrrZJZ7oRMsFFdNJRtAPb3CdKTBdZI4leVMYbI53xo4qFfSRVbxR 3RQc8qbKm+1+ZidUEW4uxbLoOtF+aBo+UFlSoHlQn6htZGib7kH8UJ2C8Qbf5OFSqghV Vr4iAeDmKPC2PVBr9Y8/YVlKLVdSco5FJelbruiLJhN1C9J+pDZeBZ9nRYIgrYvoYGQ2 te7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=k/1ENmVIu2xqf1ZtP+UC1hKlDuGoNa2B3DCWR6Z9iDQ=; b=iWt9lYrBHg4E08NKsA0GSwZECjWtKW6fP/+sbzoqgBtBiUnFdmAbuks+BphKPTtR/K i47xIW/E7cj+vUOh93MEQud3+pTRmNerP736bbe1hxj2ifs91+AReEEFx02DHsIvrI3Y 5wnmbG78RnIEVF3t8s5Cu4lwL0bQ8DYSCEzJKmjmNT7l7zLZXYlWOfvjdJWcSThL1wuj e7WNxHQI2OzotBoKQM+Izwe0GMC+OmD6F9RSkUEUXPKZGcJgUd8D9gNZIgN3iZL6SZ8i xxIZ6RoSevlDGZy69c7xAGBiW9uQTONz28BJkaYct2DxQMdsJ8S5VXWwmEqoE82cPM7H ogjA== X-Gm-Message-State: AOAM532EbRaXX/9DI/D97+p5jVyDWKpOQcP4ySa8Ziy9FoyEk0NpTPVM p015GR0e49SsbGkpBytUzPGcWzCBfbr5F8fdxkw= X-Google-Smtp-Source: ABdhPJyxYdxn2cy/D6POHYYHcXFjN9O0D4xj728nioCbN8QcNTsrcBu7TrSx9DvZU2oaxKbxLzrR+bMEizJUGwbTSG8= X-Received: by 2002:a9f:3189:: with SMTP id v9mr3102835uad.32.1629909721857; Wed, 25 Aug 2021 09:42:01 -0700 (PDT) MIME-Version: 1.0 References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> <87a6l5k9xr.fsf@gnus.org> In-Reply-To: <87a6l5k9xr.fsf@gnus.org> From: Jim Porter Date: Wed, 25 Aug 2021 09:41:52 -0700 Message-ID: Subject: Re: bug#50179: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode To: Lars Ingebrigtsen Content-Type: multipart/mixed; boundary="000000000000fcd7bd05ca64ed4d" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50179 Cc: Eli Zaretskii , 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000fcd7bd05ca64ed4d Content-Type: text/plain; charset="UTF-8" Oops, I ran the tests locally, but I think I forgot to rebuild term.elc, so naturally the tests passed without needing any changes. Here's a patch. However, I just want to be sure it's ok for these patches to merge. As mentioned in the original message, my copyright assignment is currently out of date. I contacted assign@ to get it updated, and I don't foresee any problems, but you never know with companies. If the maintainers are ok with the patch being in-tree despite this, then I'm ok with it too; I just wanted to be sure everyone was aware of the situation. On Wed, Aug 25, 2021 at 5:04 AM Lars Ingebrigtsen wrote: > > Jim Porter writes: > > > Ok, here are updated patches addressing your comments. I fixed the > > grammatical error in the comment, improved the commit message for the > > second patch, and switched to using `ansi-color-bold-is-bright' in > > both files. I left `ansi-bright-color-names-vector' as a defcustom > > though, since I think that's the right thing to do there (see my > > previous message), but I can change that later if we agree on a > > different/better route there. > > Thanks; applied to Emacs 28. But unfortunately, I didn't notice the > test failure until after pushing. :-/ > > 1 unexpected results: > FAILED term-colors-bold-is-bright > > And the faces are: > > (font-lock-face ((:foreground "yellow3" :background "unspecified-bg" > :inverse-video nil) :inherit term-bold)) > (font-lock-face ((:foreground "yellow2" :background "unspecified-bg" > :inverse-video nil) :inherit term-bold)) > > > -- > (domestic pets only, the antidote for overdose, milk.) > bloggy blog: http://lars.ingebrigtsen.no --000000000000fcd7bd05ca64ed4d Content-Type: application/octet-stream; name="0001-Update-a-test-that-got-missed-for-bug-50179.patch" Content-Disposition: attachment; filename="0001-Update-a-test-that-got-missed-for-bug-50179.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ksrq3xxy0 RnJvbSA4MDljNDIwY2JjNDJhZGYxYjVmMGQ3ZDhkMGY1MjlmNmFkN2IwOGY0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5jb20+CkRh dGU6IFdlZCwgMjUgQXVnIDIwMjEgMDk6MzU6NDkgLTA3MDAKU3ViamVjdDogW1BBVENIXSBVcGRh dGUgYSB0ZXN0IHRoYXQgZ290IG1pc3NlZCBmb3IgYnVnIzUwMTc5CgoqIHRlc3QvbGlzcC90ZXJt LXRlc3RzLmVsICh0ZXJtLWNvbG9ycy1ib2xkLWlzLWJyaWdodCk6IFNldAonYW5zaS1jb2xvci1i b2xkLWlzLWJyaWdodCcuCi0tLQogdGVzdC9saXNwL3Rlcm0tdGVzdHMuZWwgfCAyICstCiAxIGZp bGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS90 ZXN0L2xpc3AvdGVybS10ZXN0cy5lbCBiL3Rlc3QvbGlzcC90ZXJtLXRlc3RzLmVsCmluZGV4IGE2 MWQwOTM5ZWEuLmI2YTVlOWU4MTQgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC90ZXJtLXRlc3RzLmVs CisrKyBiL3Rlc3QvbGlzcC90ZXJtLXRlc3RzLmVsCkBAIC0xMjYsNyArMTI2LDcgQEAgdGVybS1j b2xvcnMKIAogKGVydC1kZWZ0ZXN0IHRlcm0tY29sb3JzLWJvbGQtaXMtYnJpZ2h0ICgpCiAgIChz a2lwLXVubGVzcyAobm90IChtZW1xIHN5c3RlbS10eXBlICcod2luZG93cy1udCBtcy1kb3MpKSkp Ci0gIChsZXQgKCh0ZXJtLWNvbG9yLWJvbGQtaXMtYnJpZ2h0IHQpKQorICAobGV0ICgoYW5zaS1j b2xvci1ib2xkLWlzLWJyaWdodCB0KSkKICAgICAocGNhc2UtZG9saXN0IChgKCxzdHIgLGV4cGVj dGVkICxicmlnaHQtZXhwZWN0ZWQpIGFuc2ktdGVzdC1zdHJpbmdzKQogICAgICAgKGxldCAoKGV4 cGVjdGVkIChvciBicmlnaHQtZXhwZWN0ZWQgZXhwZWN0ZWQpKQogICAgICAgICAgICAgKHJlc3Vs dCAodGVybS10ZXN0LXNjcmVlbi1mcm9tLWlucHV0IDQwIDEyIHN0cikpKQotLSAKMi4yNS4xCgo= --000000000000fcd7bd05ca64ed4d-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 25 12:47:04 2021 Received: (at 50179) by debbugs.gnu.org; 25 Aug 2021 16:47:04 +0000 Received: from localhost ([127.0.0.1]:47519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIw3M-0000M9-15 for submit@debbugs.gnu.org; Wed, 25 Aug 2021 12:47:04 -0400 Received: from quimby.gnus.org ([95.216.78.240]:38860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIw3K-0000Gz-JS for 50179@debbugs.gnu.org; Wed, 25 Aug 2021 12:47:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BQj1DiJWQZgxiplKgmt1CWia5/piqNUcwfof1aC5q4k=; b=AJBDt3jyZzMJQ393uxX5kb42Ul XhiPf30UF4fH5dx/T+Y2X41pTfetV0YNF0ZlkR3bvenGO//X5bQrOt63FjTJaW7/WiogZeH4vGAH3 2bwMtUY3wM62k5hUpZc76LL/E8ZS7bMbhaYJ7/jXzDBNhwa7QHFN0Q/fYaYOnciZoCUA=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mIw39-0006j3-MF; Wed, 25 Aug 2021 18:46:55 +0200 From: Lars Ingebrigtsen To: Jim Porter Subject: Re: bug#50179: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> <87a6l5k9xr.fsf@gnus.org> Date: Wed, 25 Aug 2021 18:46:51 +0200 In-Reply-To: (Jim Porter's message of "Wed, 25 Aug 2021 09:41:52 -0700") Message-ID: <87lf4p3210.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jim Porter writes: > Oops, I ran the tests locally, but I think I forgot to rebuild > term.elc, so naturally the tests passed without needing any changes. > Here's a patch. Thanks. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50179 Cc: Eli Zaretskii , 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Jim Porter writes: > Oops, I ran the tests locally, but I think I forgot to rebuild > term.elc, so naturally the tests passed without needing any changes. > Here's a patch. Thanks. > However, I just want to be sure it's ok for these patches to merge. As > mentioned in the original message, my copyright assignment is > currently out of date. Sorry; I did read that yesterday, but today I'd completely forgotten it again -- I did mean to wait until the paperwork was sorted. > I contacted assign@ to get it updated, and I don't foresee any > problems, but you never know with companies. If the maintainers are ok > with the patch being in-tree despite this, then I'm ok with it too; I > just wanted to be sure everyone was aware of the situation. Hm... perhaps the best thing to do would be to revert the two patches while waiting for the paperwork to be finalised. On the other hand, that's more churn in the VC. Uhm... I'm not sure whether we have a policy here. Eli? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 25 12:54:17 2021 Received: (at 50179) by debbugs.gnu.org; 25 Aug 2021 16:54:17 +0000 Received: from localhost ([127.0.0.1]:47527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIwAL-0000yi-6T for submit@debbugs.gnu.org; Wed, 25 Aug 2021 12:54:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIwAJ-0000yV-Lb for 50179@debbugs.gnu.org; Wed, 25 Aug 2021 12:54:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:53568) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIwAE-0005S5-9u; Wed, 25 Aug 2021 12:54:10 -0400 Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:1945 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIwAD-0005e8-PG; Wed, 25 Aug 2021 12:54:10 -0400 Date: Wed, 25 Aug 2021 19:54:08 +0300 Message-Id: <831r6hv51r.fsf@gnu.org> From: Eli Zaretskii To: Lars Ingebrigtsen In-Reply-To: <87lf4p3210.fsf@gnus.org> (message from Lars Ingebrigtsen on Wed, 25 Aug 2021 18:46:51 +0200) Subject: Re: bug#50179: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> <87a6l5k9xr.fsf@gnus.org> <87lf4p3210.fsf@gnus.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50179 Cc: jporterbugs@gmail.com, 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Lars Ingebrigtsen > Cc: Eli Zaretskii , 50179@debbugs.gnu.org > Date: Wed, 25 Aug 2021 18:46:51 +0200 > > > I contacted assign@ to get it updated, and I don't foresee any > > problems, but you never know with companies. If the maintainers are ok > > with the patch being in-tree despite this, then I'm ok with it too; I > > just wanted to be sure everyone was aware of the situation. > > Hm... perhaps the best thing to do would be to revert the two patches > while waiting for the paperwork to be finalised. On the other hand, > that's more churn in the VC. Uhm... I'm not sure whether we have a > policy here. Eli? I think we have to revert and wait for the paperwork to run to completion. From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 26 09:23:17 2021 Received: (at 50179) by debbugs.gnu.org; 26 Aug 2021 13:23:17 +0000 Received: from localhost ([127.0.0.1]:48582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJFLg-0000Lm-Pa for submit@debbugs.gnu.org; Thu, 26 Aug 2021 09:23:16 -0400 Received: from quimby.gnus.org ([95.216.78.240]:47272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJFLe-0000LY-U0 for 50179@debbugs.gnu.org; Thu, 26 Aug 2021 09:23:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/swpp63Xee38uaeEEiASjTBx9tGb/5oNE7IFz9jNdUs=; b=HgBMJOkA8Ng9AKm6lDdJ2y4z6f 5cowPF1h7ULMdgsf7BHptES8PB+U2w0q8SBnr/utkf/XDUhZavVCt4K04rySUYwGFd4XAXkWHItVP +pWrf/D+//RWziS+lnM6NoMlCPRA9/LjP2QROrMs/549tFr55vGaT/7OroDUJ5KgKTkQ=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mJFLU-00017f-2N; Thu, 26 Aug 2021 15:23:08 +0200 From: Lars Ingebrigtsen To: Eli Zaretskii Subject: Re: bug#50179: [PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> <87a6l5k9xr.fsf@gnus.org> <87lf4p3210.fsf@gnus.org> <831r6hv51r.fsf@gnu.org> Date: Thu, 26 Aug 2021 15:23:03 +0200 In-Reply-To: <831r6hv51r.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 25 Aug 2021 19:54:08 +0300") Message-ID: <87h7fc2vd4.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Eli Zaretskii writes: > I think we have to revert and wait for the paperwork to run to > completion. OK; now done. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50179 Cc: jporterbugs@gmail.com, 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Eli Zaretskii writes: > I think we have to revert and wait for the paperwork to run to > completion. OK; now done. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 18 14:58:25 2021 Received: (at 50179) by debbugs.gnu.org; 18 Sep 2021 18:58:25 +0000 Received: from localhost ([127.0.0.1]:36877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRfXc-0002OD-6W for submit@debbugs.gnu.org; Sat, 18 Sep 2021 14:58:25 -0400 Received: from mail-pj1-f51.google.com ([209.85.216.51]:45872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRfXY-0002Nz-OK for 50179@debbugs.gnu.org; Sat, 18 Sep 2021 14:58:22 -0400 Received: by mail-pj1-f51.google.com with SMTP id mv7-20020a17090b198700b0019c843e7233so6042415pjb.4 for <50179@debbugs.gnu.org>; Sat, 18 Sep 2021 11:58:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language; bh=dRJB+r9zNZtCEB9FYrmC4NGtzppnY2pZGTmbJ55mYdw=; b=WlkWOIp+qWJ8oS+9pmiChWOstNj87K5zmdkh3tMAn27NuIP5jCBreUiggAhQsW4Gyi cMgkITIMsF5LstzuK0UOotKc6Zc3exBidN6EV7TCOLdg+Y9Pp831KBRteMbOe5hEix1f /CUzFHIOGjD9yfRb3PKsirka8mx/+CWYtCgCBu468d6Xb6G3L4Vjun9eYxdywhdu1ZJ8 G+uCNYFFTiLYwjja7ocEMTDduN7wtLcXr/zTm8rrgpDspk07usokrfyVvIFkKIYqzI8w /+w6O14ghxmDRcwC4lDomDiVWpHqGZiibs6uF+34f0ZL0rhn6mwoIZwM2XrmfpXfDF0W h97Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language; bh=dRJB+r9zNZtCEB9FYrmC4NGtzppnY2pZGTmbJ55mYdw=; b=lYGGVjB55Sqs6zNEMrps3iCe+YhO59+3h5q0eZJECVBmk7q0AmQi5I6hXw3Up1hwGy 1eUA796WMOLmTbVkC3XppZl3Y7EFN8U8YRuGjRXnrtuAGZu1a2tp+UhflcQD/w8en4d6 xiPK3EU878gKiNdc6yaJYUG1vFioBJ6uG1XivkphnyoR1D1zNnMFMqS6eyXxi5I5rlB6 gy+idLilbWqBXhPVPOscVCNYnT5UtL9Lmdx9Pfc9Ez3uZFa/EM/+S8hEFX28c4T79SsK ZqTgrQlKhjVmfSvuR980sVqFhoZWIhG8uT21UDCA5pF8KWsoxys/BS+gtA44lWIG92Wl zUaw== X-Gm-Message-State: AOAM531FOHCs/TaIX/tm1kJ2PfpajHFZ54ksgit9a9IV6tTwnj1IlqaL e3gbYmmU07L+cDHsuVw5cqLK1rV33pI= X-Google-Smtp-Source: ABdhPJzz14ra0DCosUdoPwNw4XUsA7Q/D4NNrJzWMqYtSO6OMNiO59cQAzUk6BR7dUJnwlD58ZINPw== X-Received: by 2002:a17:90b:4c52:: with SMTP id np18mr27797242pjb.157.1631991494751; Sat, 18 Sep 2021 11:58:14 -0700 (PDT) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id mv6sm8690475pjb.16.2021.09.18.11.58.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 18 Sep 2021 11:58:14 -0700 (PDT) Subject: Re: bug#50179: [UPDATED PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode To: Lars Ingebrigtsen , Eli Zaretskii References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> <87a6l5k9xr.fsf@gnus.org> <87lf4p3210.fsf@gnus.org> <831r6hv51r.fsf@gnu.org> <87h7fc2vd4.fsf@gnus.org> From: Jim Porter Message-ID: Date: Sat, 18 Sep 2021 11:58:12 -0700 MIME-Version: 1.0 In-Reply-To: <87h7fc2vd4.fsf@gnus.org> Content-Type: multipart/mixed; boundary="------------B035213050D3DF1A7BA02CC4" Content-Language: en-US X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50179 Cc: 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------B035213050D3DF1A7BA02CC4 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 8/26/2021 6:23 AM, Lars Ingebrigtsen wrote: > Eli Zaretskii writes: > >> I think we have to revert and wait for the paperwork to run to >> completion. > > OK; now done. Ok, my paperwork is complete. I've attached updated patches that should apply cleanly again (I had to fix the merge to account for changes to NEWS). I also rolled my fix to the term.el tests and Eli's fix to include version info in the new term faces into the second patch. There's one further enhancement that might make sense here: currently, color values are set via a vector of strings for `ansi-color', whereas they're set via faces for `term-mode'. Would it be better to use faces for `ansi-color' too? Perhaps they should even be the *same* faces; is there any reason an Emacs user (or package) would want ANSI colors to be different between `ansi-color' and `term-mode'? If so, maybe each `term-color-FOO' face should inherit from the (hypothetical) corresponding `ansi-color-FOO' face? However, maybe there's a particular reason why `ansi-color' works this way that I'm not aware of. If the current way is best, that's fine by me too. Otherwise, just let me know and I can update the patches to include `ansi-color-FOO' faces. --------------B035213050D3DF1A7BA02CC4 Content-Type: text/plain; charset=UTF-8; name="0001-Add-support-for-bright-ANSI-colors-in-ansi-color.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Add-support-for-bright-ANSI-colors-in-ansi-color.patch" RnJvbSAxZTgzMGM2MzFiNGVjZDY5NmNjYTVhNmMzNzUzNGQ3ZWIyYjNmZWM2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IE1vbiwgMjMgQXVnIDIwMjEgMTc6NTE6MDUgLTA3MDAKU3ViamVjdDogW1BB VENIIDEvMl0gQWRkIHN1cHBvcnQgZm9yICJicmlnaHQiIEFOU0kgY29sb3JzIGluIGFuc2kt Y29sb3IKCiogbGlzcC9hbnNpLWNvbG9yLmVsIChhbnNpLWJyaWdodC1jb2xvci1uYW1lcy12 ZWN0b3IpOiBOZXcgZGVmY3VzdG9tLgooYW5zaS1jb2xvci1ib2xkLWlzLWJyaWdodCk6IE5l dyBkZWZjdXN0b20uCihhbnNpLWNvbG9yLS1maW5kLWZhY2UpOiBTb3J0IEFOU0kgY29kZXMg YW5kIGNoZWNrCidhbnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0Jy4KKGFuc2ktY29sb3ItYXBw bHktc2VxdWVuY2UpOiBTdXBwb3J0IGJyaWdodCBBTlNJIGNvbG9ycy4KKGFuc2ktY29sb3It LWZpbGwtY29sb3ItbWFwKTogTmV3IGZ1bmN0aW9uLgooYW5zaS1jb2xvci1tYWtlLWNvbG9y LW1hcCk6IEFkZCBicmlnaHQgQU5TSSBjb2xvcnMuCihhbnNpLWNvbG9yLWdldC1mYWNlLTEp OiBBZGQgQlJJR0hUIHBhcmFtZXRlci4KKiB0ZXN0L2xpc3AvYW5zaS1jb2xvci10ZXN0cy5l bAooYW5zaS1jb2xvci1hcHBseS1vbi1yZWdpb24tYm9sZC1pcy1icmlnaHQtdGVzdCk6IE5l dyBmdW5jdGlvbi4KLS0tCiBldGMvTkVXUyAgICAgICAgICAgICAgICAgICAgICB8ICAgOSAr KysKIGxpc3AvYW5zaS1jb2xvci5lbCAgICAgICAgICAgIHwgMTE2ICsrKysrKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0KIHRlc3QvbGlzcC9hbnNpLWNvbG9yLXRlc3RzLmVsIHwg IDUxICsrKysrKysrKysrKystLQogMyBmaWxlcyBjaGFuZ2VkLCAxNDIgaW5zZXJ0aW9ucygr KSwgMzQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZXRjL05FV1MgYi9ldGMvTkVXUwpp bmRleCA1MTVmOGJhYzU2Li45NGU4Mzc3MDVkIDEwMDY0NAotLS0gYS9ldGMvTkVXUworKysg Yi9ldGMvTkVXUwpAQCAtMjY1OSw2ICsyNjU5LDE1IEBAIHNlcXVlbmNlcy4KICoqKiAnY29t aW50LWRlbGV0ZS1vdXRwdXQnIGNhbiBub3cgc2F2ZSBkZWxldGVkIHRleHQgaW4gdGhlIGtp bGwtcmluZy4KIEludGVyYWN0aXZlbHksICdDLXUgQy1jIEMtbycgdHJpZ2dlcnMgdGhpcyBu ZXcgb3B0aW9uYWwgYmVoYXZpb3IuCiAKKyoqIGFuc2ktY29sb3IuZWwKKworLS0tCisqKiog U3VwcG9ydHMgZm9yICJicmlnaHQiIGNvbG9yIGNvZGVzLgorIkJyaWdodCIgQU5TSSBjb2xv ciBjb2RlcyBhcmUgbm93IGRpc3BsYXllZCB3aGVuIGFwcGx5aW5nIEFOU0kgY29sb3IKK2Zp bHRlcnMgdXNpbmcgdGhlIGNvbG9yIHZhbHVlcyBkZWZpbmVkIGluICdhbnNpLWJyaWdodC1j b2xvci1uYW1lcy12ZWN0b3InLgorSW4gYWRkaXRpb24sIGJvbGQgdGV4dCB3aXRoIHJlZ3Vs YXIgQU5TSSBjb2xvcnMgY2FuIGJlIGRpc3BsYXllZCBhcworImJyaWdodCIgaWYgJ2Fuc2kt Y29sb3ItYm9sZC1pcy1icmlnaHQnIGlzIG5vbi1uaWwuCisKICoqIEVSQwogCiAtLS0KZGlm ZiAtLWdpdCBhL2xpc3AvYW5zaS1jb2xvci5lbCBiL2xpc3AvYW5zaS1jb2xvci5lbAppbmRl eCA3OWIxYzk5MTJmLi5jNTRkODljMjkzIDEwMDY0NAotLS0gYS9saXNwL2Fuc2ktY29sb3Iu ZWwKKysrIGIvbGlzcC9hbnNpLWNvbG9yLmVsCkBAIC0xNTAsNiArMTUwLDQ4IEBAIGFuc2kt Y29sb3ItbmFtZXMtdmVjdG9yCiAgIDp2ZXJzaW9uICIyNC40IiA7IGRlZmF1bHQgY29sb3Jz IGNvcGllZCBmcm9tIGB4dGVybS1zdGFuZGFyZC1jb2xvcnMnCiAgIDpncm91cCAnYW5zaS1j b2xvcnMpCiAKKyhkZWZjdXN0b20gYW5zaS1icmlnaHQtY29sb3ItbmFtZXMtdmVjdG9yCisg IFsiZ3JheTMwIiAicmVkMiIgImdyZWVuMiIgInllbGxvdzIiICJibHVlMSIgIm1hZ2VudGEy IiAiY3lhbjIiICJ3aGl0ZSJdCisgICJDb2xvcnMgdXNlZCBmb3IgU0dSIGNvbnRyb2wgc2Vx dWVuY2VzIGRldGVybWluaW5nIGEgXCJicmlnaHRcIiBjb2xvci4KK1RoaXMgdmVjdG9yIGhv bGRzIHRoZSBjb2xvcnMgdXNlZCBmb3IgU0dSIGNvbnRyb2wgc2VxdWVuY2VzIHBhcmFtZXRl cnMKKzkwIHRvIDk3IChicmlnaHQgZm9yZWdyb3VuZCBjb2xvcnMpIGFuZCAxMDAgdG8gMTA3 IChicmlnaHRiYWNrZ3JvdW5kCitjb2xvcnMpLgorCitQYXJhbWV0ZXIgICBDb2xvcgorICA5 MCAgMTAwICAgYnJpZ2h0IGJsYWNrCisgIDkxICAxMDEgICBicmlnaHQgcmVkCisgIDkyICAx MDIgICBicmlnaHQgZ3JlZW4KKyAgOTMgIDEwMyAgIGJyaWdodCB5ZWxsb3cKKyAgOTQgIDEw NCAgIGJyaWdodCBibHVlCisgIDk1ICAxMDUgICBicmlnaHQgbWFnZW50YQorICA5NiAgMTA2 ICAgYnJpZ2h0IGN5YW4KKyAgOTcgIDEwNyAgIGJyaWdodCB3aGl0ZQorCitUaGlzIHZlY3Rv ciBpcyB1c2VkIGJ5IGBhbnNpLWNvbG9yLW1ha2UtY29sb3ItbWFwJyB0byBjcmVhdGUgYSBj b2xvcgorbWFwLiAgVGhpcyBjb2xvciBtYXAgaXMgc3RvcmVkIGluIHRoZSB2YXJpYWJsZSBg YW5zaS1jb2xvci1tYXAnLgorCitFYWNoIGVsZW1lbnQgbWF5IGFsc28gYmUgYSBjb25zIGNl bGwgd2hlcmUgdGhlIGNhciBhbmQgY2RyIHNwZWNpZnkgdGhlCitmb3JlZ3JvdW5kIGFuZCBi YWNrZ3JvdW5kIGNvbG9ycywgcmVzcGVjdGl2ZWx5LiIKKyAgOnR5cGUgJyh2ZWN0b3IgKGNo b2ljZSBjb2xvciAoY29ucyBjb2xvciBjb2xvcikpCisgICAgICAgICAgICAgICAgIChjaG9p Y2UgY29sb3IgKGNvbnMgY29sb3IgY29sb3IpKQorICAgICAgICAgICAgICAgICAoY2hvaWNl IGNvbG9yIChjb25zIGNvbG9yIGNvbG9yKSkKKyAgICAgICAgICAgICAgICAgKGNob2ljZSBj b2xvciAoY29ucyBjb2xvciBjb2xvcikpCisgICAgICAgICAgICAgICAgIChjaG9pY2UgY29s b3IgKGNvbnMgY29sb3IgY29sb3IpKQorICAgICAgICAgICAgICAgICAoY2hvaWNlIGNvbG9y IChjb25zIGNvbG9yIGNvbG9yKSkKKyAgICAgICAgICAgICAgICAgKGNob2ljZSBjb2xvciAo Y29ucyBjb2xvciBjb2xvcikpCisgICAgICAgICAgICAgICAgIChjaG9pY2UgY29sb3IgKGNv bnMgY29sb3IgY29sb3IpKSkKKyAgOnNldCAnYW5zaS1jb2xvci1tYXAtdXBkYXRlCisgIDpp bml0aWFsaXplICdjdXN0b20taW5pdGlhbGl6ZS1kZWZhdWx0CisgIDp2ZXJzaW9uICIyOC4x IgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzKQorCisoZGVmY3VzdG9tIGFuc2ktY29sb3ItYm9s ZC1pcy1icmlnaHQgbmlsCisgICJJZiBzZXQgdG8gbm9uLW5pbCwgY29tYmluaW5nIEFOU0kg Ym9sZCBhbmQgYSBjb2xvciBwcm9kdWNlcyB0aGUgYnJpZ2h0Cit2ZXJzaW9uIG9mIHRoYXQg Y29sb3IuIgorICA6dHlwZSAnYm9vbGVhbgorICA6dmVyc2lvbiAiMjguMSIKKyAgOmdyb3Vw ICdhbnNpLWNvbG9ycykKKwogKGRlZmNvbnN0IGFuc2ktY29sb3ItY29udHJvbC1zZXEtcmVn ZXhwCiAgIDs7IFNlZSBFQ01BIDQ4LCBzZWN0aW9uIDUuNCAiQ29udHJvbCBTZXF1ZW5jZXMi LgogICAiXGVcXFtbXHgzMC1ceDNGXSpbXHgyMC1ceDJGXSpbXHg0MC1ceDdFXSIKQEAgLTMw NCw5ICszNDYsMTQgQEAgYW5zaS1jb2xvci1maWx0ZXItYXBwbHkKIAogKGRlZnVuIGFuc2kt Y29sb3ItLWZpbmQtZmFjZSAoY29kZXMpCiAgICJSZXR1cm4gdGhlIGZhY2UgY29ycmVzcG9u ZGluZyB0byBDT0RFUy4iCi0gIChsZXQgKGZhY2VzKQorICA7OyBTb3J0IHRoZSBjb2RlcyBp biBhc2NlbmRpbmcgb3JkZXIgdG8gZ3VhcmFudGVlIHRoYXQgImJvbGQiIGNvbWVzIGJlZm9y ZQorICA7OyBhbnkgb2YgdGhlIGNvbG9ycy4gIFRoaXMgZW5zdXJlcyB0aGF0IGBhbnNpLWNv bG9yLWJvbGQtaXMtYnJpZ2h0JyBpcworICA7OyBhcHBsaWVkIGNvcnJlY3RseS4KKyAgKGxl dCAoZmFjZXMgYnJpZ2h0IChjb2RlcyAoc29ydCAoY29weS1zZXF1ZW5jZSBjb2RlcykgIyc8 KSkpCiAgICAgKHdoaWxlIGNvZGVzCi0gICAgICAobGV0ICgoZmFjZSAoYW5zaS1jb2xvci1n ZXQtZmFjZS0xIChwb3AgY29kZXMpKSkpCisgICAgICAobGV0ICgoZmFjZSAoYW5zaS1jb2xv ci1nZXQtZmFjZS0xIChwb3AgY29kZXMpIGJyaWdodCkpKQorICAgICAgICAod2hlbiAoYW5k IGFuc2ktY29sb3ItYm9sZC1pcy1icmlnaHQgKGVxIGZhY2UgJ2JvbGQpKQorICAgICAgICAg IChzZXRxIGJyaWdodCB0KSkKIAk7OyBJbiB0aGUgKGRlZmF1bHQgdW5kZXJsaW5lKSBmYWNl LCBzYXksIHRoZSB2YWx1ZSBvZiB0aGUKIAk7OyAidW5kZXJsaW5lIiBhdHRyaWJ1dGUgb2Yg dGhlIGBkZWZhdWx0JyBmYWNlIHdpbnMuCiAJKHVubGVzcyAoZXEgZmFjZSAnZGVmYXVsdCkK QEAgLTU3MCwxMSArNjE3LDExIEBAIGFuc2ktY29sb3ItYXBwbHktc2VxdWVuY2UKIAogRm9y IGVhY2ggbmV3IGNvZGUsIHRoZSBmb2xsb3dpbmcgaGFwcGVuczogaWYgaXQgaXMgMS03LCBh ZGQgaXQgdG8KIHRoZSBsaXN0IG9mIGNvZGVzOyBpZiBpdCBpcyAyMS0yNSBvciAyNywgZGVs ZXRlIGFwcHJvcHJpYXRlCi1wYXJhbWV0ZXJzIGZyb20gdGhlIGxpc3Qgb2YgY29kZXM7IGlm IGl0IGlzIDMwLTM3IHJlc3AuIDM5LCB0aGUKLWZvcmVncm91bmQgY29sb3IgY29kZSBpcyBy ZXBsYWNlZCBvciBhZGRlZCByZXNwLiBkZWxldGVkOyBpZiBpdAotaXMgNDAtNDcgcmVzcC4g NDksIHRoZSBiYWNrZ3JvdW5kIGNvbG9yIGNvZGUgaXMgcmVwbGFjZWQgb3IgYWRkZWQKLXJl c3AuIGRlbGV0ZWQ7IGFueSBvdGhlciBjb2RlIGlzIGRpc2NhcmRlZCB0b2dldGhlciB3aXRo IHRoZSBvbGQKLWNvZGVzLglGaW5hbGx5LCB0aGUgc28gY2hhbmdlZCBsaXN0IG9mIGNvZGVz IGlzIHJldHVybmVkLiIKK3BhcmFtZXRlcnMgZnJvbSB0aGUgbGlzdCBvZiBjb2RlczsgaWYg aXQgaXMgMzAtMzcgKG9yIDkwLTk3KSByZXNwLiAzOSwKK3RoZSBmb3JlZ3JvdW5kIGNvbG9y IGNvZGUgaXMgcmVwbGFjZWQgb3IgYWRkZWQgcmVzcC4gZGVsZXRlZDsgaWYgaXQKK2lzIDQw LTQ3IChvciAxMDAtMTA3KSByZXNwLiA0OSwgdGhlIGJhY2tncm91bmQgY29sb3IgY29kZSBp cyByZXBsYWNlZAorb3IgYWRkZWQgcmVzcC4gZGVsZXRlZDsgYW55IG90aGVyIGNvZGUgaXMg ZGlzY2FyZGVkIHRvZ2V0aGVyIHdpdGggdGhlCitvbGQgY29kZXMuICBGaW5hbGx5LCB0aGUg c28gY2hhbmdlZCBsaXN0IG9mIGNvZGVzIGlzIHJldHVybmVkLiIKICAgKGxldCAoKG5ldy1j b2RlcyAoYW5zaS1jb2xvci1wYXJzZS1zZXF1ZW5jZSBlc2NhcGUtc2VxdWVuY2UpKSkKICAg ICAod2hpbGUgbmV3LWNvZGVzCiAgICAgICAobGV0KiAoKG5ldyAocG9wIG5ldy1jb2Rlcykp CkBAIC01OTEsNyArNjM4LDcgQEAgYW5zaS1jb2xvci1hcHBseS1zZXF1ZW5jZQogCQkJCQko MjIgKHJlbXEgMSBjb2RlcykpCiAJCQkJCSgyNSAocmVtcSA2IGNvZGVzKSkKIAkJCQkJKF8g Y29kZXMpKSkpKQotCQkoKG9yIDMgNCkgKGxldCAoKHIgKG1vZCBuZXcgMTApKSkKKwkJKChv ciAzIDQgOSAxMCkgKGxldCAoKHIgKG1vZCBuZXcgMTApKSkKIAkJCSAgICAodW5sZXNzICg9 IHIgOCkKIAkJCSAgICAgIChsZXQgKGJlZykKIAkJCQkod2hpbGUgKGFuZCBjb2RlcyAoLz0g cSAoLyAoY2FyIGNvZGVzKSAxMCkpKQpAQCAtNjAzLDYgKzY1MCwxOSBAQCBhbnNpLWNvbG9y LWFwcGx5LXNlcXVlbmNlCiAJCShfIG5pbCkpKSkpCiAgICAgY29kZXMpKQogCisoZGVmdW4g YW5zaS1jb2xvci0tZmlsbC1jb2xvci1tYXAgKG1hcCBtYXAtaW5kZXggcHJvcGVydHkgdmVj dG9yIGdldC1jb2xvcikKKyAgIkZpbGwgYSByYW5nZSBvZiBjb2xvciB2YWx1ZXMgZnJvbSBW RUNUT1IgYW5kIHN0b3JlIGluIE1BUC4KKworU3RhcnQgZmlsbGluZyBNQVAgZnJvbSBNQVAt SU5ERVgsIGFuZCBtYWtlIGZhY2VzIGZvciBQUk9QRVJUWSAoYGZvcmVncm91bmQnCitvciBg YmFja2dyb3VuZCcpLiBHRVQtQ09MT1IgaXMgYSBmdW5jdGlvbiB0YWtpbmcgYW4gZWxlbWVu dCBvZiBWRUNUT1IgYW5kCityZXR1cm5pbmcgdGhlIGNvbG9yIHZhbHVlIHRvIHVzZS4iCisg IChtYXBjCisgICAobGFtYmRhIChlKQorICAgICAoYXNldCBtYXAgbWFwLWluZGV4CisgICAg ICAgICAgIChhbnNpLWNvbG9yLW1ha2UtZmFjZSBwcm9wZXJ0eSAoZnVuY2FsbCBnZXQtY29s b3IgZSkpKQorICAgICAoc2V0cSBtYXAtaW5kZXggKDErIG1hcC1pbmRleCkpICkKKyAgIHZl Y3RvcikpCisKIChkZWZ1biBhbnNpLWNvbG9yLW1ha2UtY29sb3ItbWFwICgpCiAgICJDcmVh dGVzIGEgdmVjdG9yIG9mIGZhY2UgZGVmaW5pdGlvbnMgYW5kIHJldHVybnMgaXQuCiAKQEAg LTYxMSw3ICs2NzEsNyBAQCBhbnNpLWNvbG9yLW1ha2UtY29sb3ItbWFwCiAKIFRoZSBmYWNl IGRlZmluaXRpb25zIGFyZSBiYXNlZCB1cG9uIHRoZSB2YXJpYWJsZXMKIGBhbnNpLWNvbG9y LWZhY2VzLXZlY3RvcicgYW5kIGBhbnNpLWNvbG9yLW5hbWVzLXZlY3RvcicuIgotICAobGV0 ICgobWFwIChtYWtlLXZlY3RvciA1MCBuaWwpKQorICAobGV0ICgobWFwIChtYWtlLXZlY3Rv ciAxMTAgbmlsKSkKICAgICAgICAgKGluZGV4IDApKQogICAgIDs7IG1pc2NlbGxhbmVvdXMg YXR0cmlidXRlcwogICAgIChtYXBjCkBAIC02MjAsMjMgKzY4MCwyMSBAQCBhbnNpLWNvbG9y LW1ha2UtY29sb3ItbWFwCiAgICAgICAgKHNldHEgaW5kZXggKDErIGluZGV4KSkgKQogICAg ICBhbnNpLWNvbG9yLWZhY2VzLXZlY3RvcikKICAgICA7OyBmb3JlZ3JvdW5kIGF0dHJpYnV0 ZXMKLSAgICAoc2V0cSBpbmRleCAzMCkKLSAgICAobWFwYwotICAgICAobGFtYmRhIChlKQot ICAgICAgIChhc2V0IG1hcCBpbmRleAotICAgICAgICAgICAgIChhbnNpLWNvbG9yLW1ha2Ut ZmFjZSAnZm9yZWdyb3VuZAotICAgICAgICAgICAgICAgICAgICAgICAgIChpZiAoY29uc3Ag ZSkgKGNhciBlKSBlKSkpCi0gICAgICAgKHNldHEgaW5kZXggKDErIGluZGV4KSkgKQotICAg ICBhbnNpLWNvbG9yLW5hbWVzLXZlY3RvcikKKyAgICAoYW5zaS1jb2xvci0tZmlsbC1jb2xv ci1tYXAKKyAgICAgbWFwIDMwICdmb3JlZ3JvdW5kIGFuc2ktY29sb3ItbmFtZXMtdmVjdG9y CisgICAgIChsYW1iZGEgKGUpIChpZiAoY29uc3AgZSkgKGNhciBlKSBlKSkpCiAgICAgOzsg YmFja2dyb3VuZCBhdHRyaWJ1dGVzCi0gICAgKHNldHEgaW5kZXggNDApCi0gICAgKG1hcGMK LSAgICAgKGxhbWJkYSAoZSkKLSAgICAgICAoYXNldCBtYXAgaW5kZXgKLSAgICAgICAgICAg ICAoYW5zaS1jb2xvci1tYWtlLWZhY2UgJ2JhY2tncm91bmQKLSAgICAgICAgICAgICAgICAg ICAgICAgICAoaWYgKGNvbnNwIGUpIChjZHIgZSkgZSkpKQotICAgICAgIChzZXRxIGluZGV4 ICgxKyBpbmRleCkpICkKLSAgICAgYW5zaS1jb2xvci1uYW1lcy12ZWN0b3IpCisgICAgKGFu c2ktY29sb3ItLWZpbGwtY29sb3ItbWFwCisgICAgIG1hcCA0MCAnYmFja2dyb3VuZCBhbnNp LWNvbG9yLW5hbWVzLXZlY3RvcgorICAgICAobGFtYmRhIChlKSAoaWYgKGNvbnNwIGUpIChj ZHIgZSkgZSkpKQorICAgIDs7IGJyaWdodCBmb3JlZ3JvdW5kIGF0dHJpYnV0ZXMKKyAgICAo YW5zaS1jb2xvci0tZmlsbC1jb2xvci1tYXAKKyAgICAgbWFwIDkwICdmb3JlZ3JvdW5kIGFu c2ktYnJpZ2h0LWNvbG9yLW5hbWVzLXZlY3RvcgorICAgICAobGFtYmRhIChlKSAoaWYgKGNv bnNwIGUpIChjYXIgZSkgZSkpKQorICAgIDs7IGJyaWdodCBiYWNrZ3JvdW5kIGF0dHJpYnV0 ZXMKKyAgICAoYW5zaS1jb2xvci0tZmlsbC1jb2xvci1tYXAKKyAgICAgbWFwIDEwMCAnYmFj a2dyb3VuZCBhbnNpLWJyaWdodC1jb2xvci1uYW1lcy12ZWN0b3IKKyAgICAgKGxhbWJkYSAo ZSkgKGlmIChjb25zcCBlKSAoY2RyIGUpIGUpKSkKICAgICBtYXApKQogCiAoZGVmdmFyIGFu c2ktY29sb3ItbWFwIChhbnNpLWNvbG9yLW1ha2UtY29sb3ItbWFwKQpAQCAtNjYwLDkgKzcx OCwxMyBAQCBhbnNpLWNvbG9yLW1hcC11cGRhdGUKICAgKHNldC1kZWZhdWx0IHN5bWJvbCB2 YWx1ZSkKICAgKHNldHEgYW5zaS1jb2xvci1tYXAgKGFuc2ktY29sb3ItbWFrZS1jb2xvci1t YXApKSkKIAotKGRlZnVuIGFuc2ktY29sb3ItZ2V0LWZhY2UtMSAoYW5zaS1jb2RlKQorKGRl ZnVuIGFuc2ktY29sb3ItZ2V0LWZhY2UtMSAoYW5zaS1jb2RlICZvcHRpb25hbCBicmlnaHQp CiAgICJHZXQgZmFjZSBkZWZpbml0aW9uIGZyb20gYGFuc2ktY29sb3ItbWFwJy4KLUFOU0kt Q09ERSBpcyB1c2VkIGFzIGFuIGluZGV4IGludG8gdGhlIHZlY3Rvci4iCitBTlNJLUNPREUg aXMgdXNlZCBhcyBhbiBpbmRleCBpbnRvIHRoZSB2ZWN0b3IuICBCUklHSFQsIGlmIG5vbi1u aWwsCityZXF1ZXN0cyBcImJyaWdodFwiIEFOU0kgY29sb3JzLCBldmVuIGlmIEFOU0ktQ09E RSBpcyBhIG5vcm1hbC1pbnRlbnNpdHkKK2NvbG9yLiIKKyAgKHdoZW4gKGFuZCBicmlnaHQg KDw9IDMwIGFuc2ktY29kZSA0OSkpCisgICAgKHNldHEgYW5zaS1jb2RlICgrIGFuc2ktY29k ZSA2MCkpKQogICAoY29uZGl0aW9uLWNhc2UgbmlsCiAgICAgICAoYXJlZiBhbnNpLWNvbG9y LW1hcCBhbnNpLWNvZGUpCiAgICAgKGFyZ3Mtb3V0LW9mLXJhbmdlIG5pbCkpKQpkaWZmIC0t Z2l0IGEvdGVzdC9saXNwL2Fuc2ktY29sb3ItdGVzdHMuZWwgYi90ZXN0L2xpc3AvYW5zaS1j b2xvci10ZXN0cy5lbAppbmRleCAxMDdkYzhlNDAwLi5jOTQ1NjFiZGExIDEwMDY0NAotLS0g YS90ZXN0L2xpc3AvYW5zaS1jb2xvci10ZXN0cy5lbAorKysgYi90ZXN0L2xpc3AvYW5zaS1j b2xvci10ZXN0cy5lbApAQCAtMjUsMTcgKzI1LDU0IEBACiA7OzsgQ29kZToKIAogKHJlcXVp cmUgJ2Fuc2ktY29sb3IpCisoZXZhbC13aGVuLWNvbXBpbGUgKHJlcXVpcmUgJ2NsLWxpYikp CiAKLShkZWZ2YXIgdGVzdC1zdHJpbmdzICcoKCJcZVszM21IZWxsbyBXb3JsZFxlWzBtIiAu ICJIZWxsbyBXb3JsZCIpCi0gICAgICAgICAgICAgICAgICAgICAgICgiXGVbMW1cZVszbVxl WzVtYm9sZCBpdGFsaWNzIGJsaW5rXGVbMG0iIC4gImJvbGQgaXRhbGljcyBibGluayIpKSkK KyhkZWZ2YXIgeWVsbG93IChhcmVmIGFuc2ktY29sb3ItbmFtZXMtdmVjdG9yIDMpKQorKGRl ZnZhciBicmlnaHQteWVsbG93IChhcmVmIGFuc2ktYnJpZ2h0LWNvbG9yLW5hbWVzLXZlY3Rv ciAzKSkKKworKGRlZnZhciB0ZXN0LXN0cmluZ3MKKyAgYCgoIlxlWzMzbUhlbGxvIFdvcmxk XGVbMG0iICJIZWxsbyBXb3JsZCIKKyAgICAgKGZvcmVncm91bmQtY29sb3IgLiAseWVsbG93 KSkKKyAgICAoIlxlWzQzbUhlbGxvIFdvcmxkXGVbMG0iICJIZWxsbyBXb3JsZCIKKyAgICAg KGJhY2tncm91bmQtY29sb3IgLiAseWVsbG93KSkKKyAgICAoIlxlWzkzbUhlbGxvIFdvcmxk XGVbMG0iICJIZWxsbyBXb3JsZCIKKyAgICAgKGZvcmVncm91bmQtY29sb3IgLiAsYnJpZ2h0 LXllbGxvdykpCisgICAgKCJcZVsxMDNtSGVsbG8gV29ybGRcZVswbSIgIkhlbGxvIFdvcmxk IgorICAgICAoYmFja2dyb3VuZC1jb2xvciAuICxicmlnaHQteWVsbG93KSkKKyAgICAoIlxl WzE7MzNtSGVsbG8gV29ybGRcZVswbSIgIkhlbGxvIFdvcmxkIgorICAgICAoYm9sZCAoZm9y ZWdyb3VuZC1jb2xvciAuICx5ZWxsb3cpKQorICAgICAoYm9sZCAoZm9yZWdyb3VuZC1jb2xv ciAuICxicmlnaHQteWVsbG93KSkpCisgICAgKCJcZVszMzsxbUhlbGxvIFdvcmxkXGVbMG0i ICJIZWxsbyBXb3JsZCIKKyAgICAgKGJvbGQgKGZvcmVncm91bmQtY29sb3IgLiAseWVsbG93 KSkKKyAgICAgKGJvbGQgKGZvcmVncm91bmQtY29sb3IgLiAsYnJpZ2h0LXllbGxvdykpKQor ICAgICgiXGVbMW1cZVszM21IZWxsbyBXb3JsZFxlWzBtIiAiSGVsbG8gV29ybGQiCisgICAg IChib2xkIChmb3JlZ3JvdW5kLWNvbG9yIC4gLHllbGxvdykpCisgICAgIChib2xkIChmb3Jl Z3JvdW5kLWNvbG9yIC4gLGJyaWdodC15ZWxsb3cpKSkKKyAgICAoIlxlWzMzbVxlWzFtSGVs bG8gV29ybGRcZVswbSIgIkhlbGxvIFdvcmxkIgorICAgICAoYm9sZCAoZm9yZWdyb3VuZC1j b2xvciAuICx5ZWxsb3cpKQorICAgICAoYm9sZCAoZm9yZWdyb3VuZC1jb2xvciAuICxicmln aHQteWVsbG93KSkpCisgICAgKCJcZVsxbVxlWzNtXGVbNW1ib2xkIGl0YWxpY3MgYmxpbmtc ZVswbSIgImJvbGQgaXRhbGljcyBibGluayIKKyAgICAgKGJvbGQgaXRhbGljIHN1Y2Nlc3Mp KSkpCiAKIChlcnQtZGVmdGVzdCBhbnNpLWNvbG9yLWFwcGx5LW9uLXJlZ2lvbi10ZXN0ICgp Ci0gICAgKGRvbGlzdCAocGFpciB0ZXN0LXN0cmluZ3MpCi0gICAgICAod2l0aC10ZW1wLWJ1 ZmZlcgotICAgICAgICAoaW5zZXJ0IChjYXIgcGFpcikpCisgIChwY2FzZS1kb2xpc3QgKGAo LGlucHV0ICx0ZXh0ICxmYWNlKSB0ZXN0LXN0cmluZ3MpCisgICAgKHdpdGgtdGVtcC1idWZm ZXIKKyAgICAgIChpbnNlcnQgaW5wdXQpCisgICAgICAoYW5zaS1jb2xvci1hcHBseS1vbi1y ZWdpb24gKHBvaW50LW1pbikgKHBvaW50LW1heCkpCisgICAgICAoc2hvdWxkIChlcXVhbCAo YnVmZmVyLXN0cmluZykgdGV4dCkpCisgICAgICAoc2hvdWxkIChlcXVhbCAoZ2V0LWNoYXIt cHJvcGVydHkgKHBvaW50LW1pbikgJ2ZhY2UpIGZhY2UpKQorICAgICAgKHNob3VsZCAobm90 IChlcXVhbCAob3ZlcmxheXMtYXQgKHBvaW50LW1pbikpIG5pbCkpKSkpKQorCisoZXJ0LWRl ZnRlc3QgYW5zaS1jb2xvci1hcHBseS1vbi1yZWdpb24tYm9sZC1pcy1icmlnaHQtdGVzdCAo KQorICAocGNhc2UtZG9saXN0IChgKCxpbnB1dCAsdGV4dCAsZmFjZSAsYnJpZ2h0LWZhY2Up IHRlc3Qtc3RyaW5ncykKKyAgICAod2l0aC10ZW1wLWJ1ZmZlcgorICAgICAgKGxldCAoKGFu c2ktY29sb3ItYm9sZC1pcy1icmlnaHQgdCkpCisgICAgICAgIChpbnNlcnQgaW5wdXQpCiAg ICAgICAgIChhbnNpLWNvbG9yLWFwcGx5LW9uLXJlZ2lvbiAocG9pbnQtbWluKSAocG9pbnQt bWF4KSkKLSAgICAgICAgKHNob3VsZCAoZXF1YWwgKGJ1ZmZlci1zdHJpbmcpIChjZHIgcGFp cikpKQotICAgICAgICAoc2hvdWxkIChub3QgKGVxdWFsIChvdmVybGF5cy1hdCAocG9pbnQt bWluKSkgbmlsKSkpKSkpCisgICAgICAgIChzaG91bGQgKGVxdWFsIChidWZmZXItc3RyaW5n KSB0ZXh0KSkKKyAgICAgICAgKHNob3VsZCAoZXF1YWwgKGdldC1jaGFyLXByb3BlcnR5IChw b2ludC1taW4pICdmYWNlKQorICAgICAgICAgICAgICAgICAgICAgICAob3IgYnJpZ2h0LWZh Y2UgZmFjZSkpKQorICAgICAgICAoc2hvdWxkIChub3QgKGVxdWFsIChvdmVybGF5cy1hdCAo cG9pbnQtbWluKSkgbmlsKSkpKSkpKQogCiAoZXJ0LWRlZnRlc3QgYW5zaS1jb2xvci1hcHBs eS1vbi1yZWdpb24tcHJlc2VydmluZy10ZXN0ICgpCiAgICAgKGRvbGlzdCAocGFpciB0ZXN0 LXN0cmluZ3MpCi0tIAoyLjI1LjEKCg== --------------B035213050D3DF1A7BA02CC4 Content-Type: text/plain; charset=UTF-8; name="0002-Add-support-for-bright-ANSI-colors-in-term-mode.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0002-Add-support-for-bright-ANSI-colors-in-term-mode.patch" RnJvbSAwZGVkZGNkNDA0NzQ2OTA3NWJmN2YzN2I5ODlmZTI4NDE5NmQ1ZDg1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFN1biwgMjkgQXVnIDIwMjEgMTA6NTU6NTggLTA3MDAKU3ViamVjdDogW1BB VENIIDIvMl0gQWRkIHN1cHBvcnQgZm9yICJicmlnaHQiIEFOU0kgY29sb3JzIGluIHRlcm0t bW9kZQoKKiBsaXN0L3Rlcm0uZWwgKGFuc2ktdGVybS1jb2xvci12ZWN0b3IpOiBBZGQgbmV3 IGZhY2VzLgoodGVybS1jb2xvci13aGl0ZSk6IFR3ZWFrIGNvbG9ycy4KKHRlcm0tY29sb3It YnJpZ2h0LWJsYWNrLCB0ZXJtLWNvbG9yLWJyaWdodC1yZWQsIHRlcm0tY29sb3ItYnJpZ2h0 LWdyZWVuKQoodGVybS1jb2xvci1icmlnaHQteWVsbG93LCB0ZXJtLWNvbG9yLWJyaWdodC1i bHVlKQoodGVybS1jb2xvci1icmlnaHQtbWFnZW50YSwgdGVybS1jb2xvci1icmlnaHQtY3lh bikKKHRlcm0tY29sb3ItYnJpZ2h0LXdoaXRlKTogTmV3IGZhY2VzLgoodGVybS0tbWF5YmUt YnJpZ2h0ZW4tY29sb3IpOiBOZXcgZnVuY3Rpb24uCih0ZXJtLWhhbmRsZS1jb2xvcnMtYXJy YXkpOiBIYW5kbGUgYnJpZ2h0IGNvbG9ycy4KKiB0ZXN0L2xpc3AvdGVybS10ZXN0cy5lbCAo dGVybS1jb2xvcnMsIHRlcm0tY29sb3JzLWJvbGQtaXMtYnJpZ2h0KToKTmV3IGZ1bmN0aW9u cy4KLS0tCiBldGMvTkVXUyAgICAgICAgICAgICAgICB8ICAgNyArKwogbGlzcC90ZXJtLmVs ICAgICAgICAgICAgfCAxNDEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLQogdGVzdC9saXNwL3Rlcm0tdGVzdHMuZWwgfCAgNTkgKysrKysrKysrKysrKysrKy0K IDMgZmlsZXMgY2hhbmdlZCwgMTc1IGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2V0Yy9ORVdTIGIvZXRjL05FV1MKaW5kZXggOTRlODM3NzA1ZC4uNDgw MmY0ZTU2OSAxMDA2NDQKLS0tIGEvZXRjL05FV1MKKysrIGIvZXRjL05FV1MKQEAgLTE0NzEs NiArMTQ3MSwxMyBAQCBiYXNlZCBvbiB0aGUgY3VycmVudCB3aW5kb3cgc2l6ZS4gIEluIHBy ZXZpb3VzIHZlcnNpb25zIG9mIEVtYWNzLCB0aGlzCiB3YXMgYWx3YXlzIGRvbmUgKGFuZCB0 aGF0IGNvdWxkIGxlYWQgdG8gb2RkIGRpc3BsYXlzIHdoZW4gcmVzaXppbmcgdGhlCiB3aW5k b3cgYWZ0ZXIgc3RhcnRpbmcpLiAgVGhpcyB2YXJpYWJsZSBkZWZhdWx0cyB0byBuaWwuCiAK Ky0tLQorKioqICd0ZXJtLW1vZGUnIG5vdyBzdXBwb3J0cyAiYnJpZ2h0IiBjb2xvciBjb2Rl cy4KKyJCcmlnaHQiIEFOU0kgY29sb3IgY29kZXMgYXJlIG5vdyBkaXNwbGF5ZWQgdXNpbmcg dGhlIGNvbG9yIHZhbHVlcworZGVmaW5lZCBpbiAndGVybS1jb2xvci1icmlnaHQtKicuICBJ biBhZGRpdGlvbiwgYm9sZCB0ZXh0IHdpdGggcmVndWxhcgorQU5TSSBjb2xvcnMgY2FuIGJl IGRpc3BsYXllZCBhcyAiYnJpZ2h0IiBpZiAnYW5zaS1jb2xvci1ib2xkLWlzLWJyaWdodCcK K2lzIG5vbi1uaWwuCisKICoqIEVzaGVsbAogCiAtLS0KZGlmZiAtLWdpdCBhL2xpc3AvdGVy bS5lbCBiL2xpc3AvdGVybS5lbAppbmRleCA0MmIyZTVhMjQ4Li5jMWEzZGIzNjUxIDEwMDY0 NAotLS0gYS9saXNwL3Rlcm0uZWwKKysrIGIvbGlzcC90ZXJtLmVsCkBAIC03MjcsNyArNzI3 LDE1IEBAIGFuc2ktdGVybS1jb2xvci12ZWN0b3IKICAgIHRlcm0tY29sb3ItYmx1ZQogICAg dGVybS1jb2xvci1tYWdlbnRhCiAgICB0ZXJtLWNvbG9yLWN5YW4KLSAgIHRlcm0tY29sb3It d2hpdGVdKQorICAgdGVybS1jb2xvci13aGl0ZQorICAgdGVybS1jb2xvci1icmlnaHQtYmxh Y2sKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LXJlZAorICAgdGVybS1jb2xvci1icmlnaHQtZ3Jl ZW4KKyAgIHRlcm0tY29sb3ItYnJpZ2h0LXllbGxvdworICAgdGVybS1jb2xvci1icmlnaHQt Ymx1ZQorICAgdGVybS1jb2xvci1icmlnaHQtbWFnZW50YQorICAgdGVybS1jb2xvci1icmln aHQtY3lhbgorICAgdGVybS1jb2xvci1icmlnaHQtd2hpdGVdKQogCiAoZGVmY3VzdG9tIHRl cm0tZGVmYXVsdC1mZy1jb2xvciBuaWwKICAgIklmIG5vbi1uaWwsIGRlZmF1bHQgY29sb3Ig Zm9yIGZvcmVncm91bmQgaW4gVGVybSBtb2RlLiIKQEAgLTc5NywxMCArODA1LDU4IEBAIHRl cm0tY29sb3ItY3lhbgogICA6Z3JvdXAgJ3Rlcm0pCiAKIChkZWZmYWNlIHRlcm0tY29sb3It d2hpdGUKLSAgJygodCA6Zm9yZWdyb3VuZCAid2hpdGUiIDpiYWNrZ3JvdW5kICJ3aGl0ZSIp KQorICAnKCh0IDpmb3JlZ3JvdW5kICJncmV5OTAiIDpiYWNrZ3JvdW5kICJncmF5OTAiKSkK ICAgIkZhY2UgdXNlZCB0byByZW5kZXIgd2hpdGUgY29sb3IgY29kZS4iCisgIDpncm91cCAn dGVybQorICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0 LWJsYWNrCisgICcoKHQgOmZvcmVncm91bmQgImdyYXkzMCIgOmJhY2tncm91bmQgImdyYXkz MCIpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgYmxhY2sgY29sb3IgY29kZS4i CisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIHRlcm0t Y29sb3ItYnJpZ2h0LXJlZAorICAnKCh0IDpmb3JlZ3JvdW5kICJyZWQyIiA6YmFja2dyb3Vu ZCAicmVkMiIpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgcmVkIGNvbG9yIGNv ZGUuIgorICA6Z3JvdXAgJ3Rlcm0KKyAgOnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSB0 ZXJtLWNvbG9yLWJyaWdodC1ncmVlbgorICAnKCh0IDpmb3JlZ3JvdW5kICJncmVlbjIiIDpi YWNrZ3JvdW5kICJncmVlbjIiKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgYnJpZ2h0IGdy ZWVuIGNvbG9yIGNvZGUuIgorICA6Z3JvdXAgJ3Rlcm0KKyAgOnZlcnNpb24gIjI4LjEiKQor CisoZGVmZmFjZSB0ZXJtLWNvbG9yLWJyaWdodC15ZWxsb3cKKyAgJygodCA6Zm9yZWdyb3Vu ZCAieWVsbG93MiIgOmJhY2tncm91bmQgInllbGxvdzIiKSkKKyAgIkZhY2UgdXNlZCB0byBy ZW5kZXIgYnJpZ2h0IHllbGxvdyBjb2xvciBjb2RlLiIKICAgOmdyb3VwICd0ZXJtKQogCiso ZGVmZmFjZSB0ZXJtLWNvbG9yLWJyaWdodC1ibHVlCisgICcoKHQgOmZvcmVncm91bmQgImJs dWUxIiA6YmFja2dyb3VuZCAiYmx1ZTEiKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgYnJp Z2h0IGJsdWUgY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAiMjgu MSIpCisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0LW1hZ2VudGEKKyAgJygodCA6Zm9y ZWdyb3VuZCAibWFnZW50YTIiIDpiYWNrZ3JvdW5kICJtYWdlbnRhMiIpKQorICAiRmFjZSB1 c2VkIHRvIHJlbmRlciBicmlnaHQgbWFnZW50YSBjb2xvciBjb2RlLiIKKyAgOmdyb3VwICd0 ZXJtCisgIDp2ZXJzaW9uICIyOC4xIikKKworKGRlZmZhY2UgdGVybS1jb2xvci1icmlnaHQt Y3lhbgorICAnKCh0IDpmb3JlZ3JvdW5kICJjeWFuMiIgOmJhY2tncm91bmQgImN5YW4yIikp CisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJyaWdodCBjeWFuIGNvbG9yIGNvZGUuIgorICA6 Z3JvdXAgJ3Rlcm0KKyAgOnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSB0ZXJtLWNvbG9y LWJyaWdodC13aGl0ZQorICAnKCh0IDpmb3JlZ3JvdW5kICJ3aGl0ZSIgOmJhY2tncm91bmQg IndoaXRlIikpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJyaWdodCB3aGl0ZSBjb2xvciBj b2RlLiIKKyAgOmdyb3VwICd0ZXJtCisgIDp2ZXJzaW9uICIyOC4xIikKKwogKGRlZmN1c3Rv bSB0ZXJtLWJ1ZmZlci1tYXhpbXVtLXNpemUgODE5MgogICAiVGhlIG1heGltdW0gc2l6ZSBp biBsaW5lcyBmb3IgdGVybSBidWZmZXJzLgogVGVybSBidWZmZXJzIGFyZSB0cnVuY2F0ZWQg ZnJvbSB0aGUgdG9wIHRvIGJlIG5vIGdyZWF0ZXIgdGhhbiB0aGlzIG51bWJlci4KQEAgLTMy MjUsNiArMzI4MSwxNSBAQCB0ZXJtLXJlc2V0LXRlcm1pbmFsCiAgIDs7IEZJWE1FOiBObyBp ZGVhIHdoeSB0aGlzIGlzIGhlcmUsIGl0IGxvb2tzIHdyb25nLiAgLS1TdGVmCiAgIChzZXRx IHRlcm0tYW5zaS1mYWNlLWFscmVhZHktZG9uZSBuaWwpKQogCisoZGVmdW4gdGVybS0tbWF5 YmUtYnJpZ2h0ZW4tY29sb3IgKGNvbG9yIGJvbGQpCisgICJQb3NzaWJseSBjb252ZXJ0IENP TE9SIHRvIGl0cyBicmlnaHQgdmFyaWFudC4KK0NPTE9SIGlzIGFuIGluZGV4IGludG8gYGFu c2ktdGVybS1jb2xvci12ZWN0b3InLiAgSWYgQk9MRCBhbmQKK2BhbnNpLWNvbG9yLWJvbGQt aXMtYnJpZ2h0JyBhcmUgbm9uLW5pbCBhbmQgQ09MT1IgaXMgYSByZWd1bGFyIGNvbG9yLAor cmV0dXJuIHRoZSBicmlnaHQgdmVyc2lvbiBvZiBDT0xPUjsgb3RoZXJ3aXNlLCByZXR1cm4g Q09MT1IuIgorICAoaWYgKGFuZCBhbnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0IGJvbGQgKDw9 IDEgY29sb3IgOCkpCisgICAgICAoKyBjb2xvciA4KQorICAgIGNvbG9yKSkKKwogOzsgTmV3 IGZ1bmN0aW9uIHRvIGRlYWwgd2l0aCBhbnNpIGNvbG9yaXplZCBvdXRwdXQsIGFzIHlvdSBj YW4gc2VlIHlvdSBjYW4KIDs7IGhhdmUgYW55IGJvbGQvdW5kZXJsaW5lL2ZnL2JnL3JldmVy c2UgY29tYmluYXRpb24uIC1tbQogCkBAIC0zMjY0LDYgKzMzMjksMTAgQEAgdGVybS1oYW5k bGUtY29sb3JzLWFycmF5CiAgICAoKGFuZCAoPj0gcGFyYW1ldGVyIDMwKSAoPD0gcGFyYW1l dGVyIDM3KSkKICAgICAoc2V0cSB0ZXJtLWFuc2ktY3VycmVudC1jb2xvciAoLSBwYXJhbWV0 ZXIgMjkpKSkKIAorICAgOzsgQnJpZ2h0IGZvcmVncm91bmQKKyAgICgoYW5kICg+PSBwYXJh bWV0ZXIgOTApICg8PSBwYXJhbWV0ZXIgOTcpKQorICAgIChzZXRxIHRlcm0tYW5zaS1jdXJy ZW50LWNvbG9yICgtIHBhcmFtZXRlciA4MSkpKQorCiAgICA7OyBSZXNldCBmb3JlZ3JvdW5k CiAgICAoKGVxIHBhcmFtZXRlciAzOSkKICAgICAoc2V0cSB0ZXJtLWFuc2ktY3VycmVudC1j b2xvciAwKSkKQEAgLTMyNzIsNiArMzM0MSwxMCBAQCB0ZXJtLWhhbmRsZS1jb2xvcnMtYXJy YXkKICAgICgoYW5kICg+PSBwYXJhbWV0ZXIgNDApICg8PSBwYXJhbWV0ZXIgNDcpKQogICAg IChzZXRxIHRlcm0tYW5zaS1jdXJyZW50LWJnLWNvbG9yICgtIHBhcmFtZXRlciAzOSkpKQog CisgICA7OyBCcmlnaHQgZm9yZWdyb3VuZAorICAgKChhbmQgKD49IHBhcmFtZXRlciAxMDAp ICg8PSBwYXJhbWV0ZXIgMTA3KSkKKyAgICAoc2V0cSB0ZXJtLWFuc2ktY3VycmVudC1iZy1j b2xvciAoLSBwYXJhbWV0ZXIgOTEpKSkKKwogICAgOzsgUmVzZXQgYmFja2dyb3VuZAogICAg KChlcSBwYXJhbWV0ZXIgNDkpCiAgICAgKHNldHEgdGVybS1hbnNpLWN1cnJlbnQtYmctY29s b3IgMCkpCkBAIC0zMjkwLDM3ICszMzYzLDQzIEBAIHRlcm0taGFuZGxlLWNvbG9ycy1hcnJh eQogICA7OyAgICAgICAgICB0ZXJtLWFuc2ktY3VycmVudC1iZy1jb2xvcikKIAogICAodW5s ZXNzIHRlcm0tYW5zaS1mYWNlLWFscmVhZHktZG9uZQotICAgIChpZiB0ZXJtLWFuc2ktY3Vy cmVudC1pbnZpc2libGUKLSAgICAgICAgKGxldCAoKGNvbG9yCi0gICAgICAgICAgICAgICAo aWYgdGVybS1hbnNpLWN1cnJlbnQtcmV2ZXJzZQotICAgICAgICAgICAgICAgICAgIChmYWNl LWZvcmVncm91bmQKLSAgICAgICAgICAgICAgICAgICAgKGVsdCBhbnNpLXRlcm0tY29sb3It dmVjdG9yIHRlcm0tYW5zaS1jdXJyZW50LWNvbG9yKQotICAgICAgICAgICAgICAgICAgICBu aWwgJ2RlZmF1bHQpCi0gICAgICAgICAgICAgICAgIChmYWNlLWJhY2tncm91bmQKLSAgICAg ICAgICAgICAgICAgIChlbHQgYW5zaS10ZXJtLWNvbG9yLXZlY3RvciB0ZXJtLWFuc2ktY3Vy cmVudC1iZy1jb2xvcikKLSAgICAgICAgICAgICAgICAgIG5pbCAnZGVmYXVsdCkpKSkKLSAg ICAgICAgICAoc2V0cSB0ZXJtLWN1cnJlbnQtZmFjZQotICAgICAgICAgICAgICAgIChsaXN0 IDpiYWNrZ3JvdW5kIGNvbG9yCi0gICAgICAgICAgICAgICAgICAgICAgOmZvcmVncm91bmQg Y29sb3IpKQotICAgICAgICAgICkgOzsgTm8gbmVlZCB0byBib3RoZXIgd2l0aCBhbnl0aGlu ZyBlbHNlIGlmIGl0J3MgaW52aXNpYmxlLgotICAgICAgKHNldHEgdGVybS1jdXJyZW50LWZh Y2UKLSAgICAgICAgICAgIChsaXN0IDpmb3JlZ3JvdW5kCi0gICAgICAgICAgICAgICAgICAo ZmFjZS1mb3JlZ3JvdW5kCi0gICAgICAgICAgICAgICAgICAgKGVsdCBhbnNpLXRlcm0tY29s b3ItdmVjdG9yIHRlcm0tYW5zaS1jdXJyZW50LWNvbG9yKQotICAgICAgICAgICAgICAgICAg IG5pbCAnZGVmYXVsdCkKLSAgICAgICAgICAgICAgICAgIDpiYWNrZ3JvdW5kCi0gICAgICAg ICAgICAgICAgICAoZmFjZS1iYWNrZ3JvdW5kCi0gICAgICAgICAgICAgICAgICAgKGVsdCBh bnNpLXRlcm0tY29sb3ItdmVjdG9yIHRlcm0tYW5zaS1jdXJyZW50LWJnLWNvbG9yKQotICAg ICAgICAgICAgICAgICAgIG5pbCAnZGVmYXVsdCkKLSAgICAgICAgICAgICAgICAgIDppbnZl cnNlLXZpZGVvIHRlcm0tYW5zaS1jdXJyZW50LXJldmVyc2UpKQotCi0gICAgICAod2hlbiB0 ZXJtLWFuc2ktY3VycmVudC1ib2xkCisgICAgKGxldCAoKGN1cnJlbnQtY29sb3IgKHRlcm0t LW1heWJlLWJyaWdodGVuLWNvbG9yCisgICAgICAgICAgICAgICAgICAgICAgICAgIHRlcm0t YW5zaS1jdXJyZW50LWNvbG9yCisgICAgICAgICAgICAgICAgICAgICAgICAgIHRlcm0tYW5z aS1jdXJyZW50LWJvbGQpKQorICAgICAgICAgIChjdXJyZW50LWJnLWNvbG9yICh0ZXJtLS1t YXliZS1icmlnaHRlbi1jb2xvcgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXJt LWFuc2ktY3VycmVudC1iZy1jb2xvcgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0 ZXJtLWFuc2ktY3VycmVudC1ib2xkKSkpCisgICAgICAoaWYgdGVybS1hbnNpLWN1cnJlbnQt aW52aXNpYmxlCisgICAgICAgICAgKGxldCAoKGNvbG9yCisgICAgICAgICAgICAgICAgIChp ZiB0ZXJtLWFuc2ktY3VycmVudC1yZXZlcnNlCisgICAgICAgICAgICAgICAgICAgICAoZmFj ZS1mb3JlZ3JvdW5kCisgICAgICAgICAgICAgICAgICAgICAgKGVsdCBhbnNpLXRlcm0tY29s b3ItdmVjdG9yIGN1cnJlbnQtY29sb3IpCisgICAgICAgICAgICAgICAgICAgICAgbmlsICdk ZWZhdWx0KQorICAgICAgICAgICAgICAgICAgIChmYWNlLWJhY2tncm91bmQKKyAgICAgICAg ICAgICAgICAgICAgKGVsdCBhbnNpLXRlcm0tY29sb3ItdmVjdG9yIGN1cnJlbnQtYmctY29s b3IpCisgICAgICAgICAgICAgICAgICAgIG5pbCAnZGVmYXVsdCkpKSkKKyAgICAgICAgICAg IChzZXRxIHRlcm0tY3VycmVudC1mYWNlCisgICAgICAgICAgICAgICAgICAobGlzdCA6YmFj a2dyb3VuZCBjb2xvcgorICAgICAgICAgICAgICAgICAgICAgICAgOmZvcmVncm91bmQgY29s b3IpKQorICAgICAgICAgICAgKSA7OyBObyBuZWVkIHRvIGJvdGhlciB3aXRoIGFueXRoaW5n IGVsc2UgaWYgaXQncyBpbnZpc2libGUuCiAgICAgICAgIChzZXRxIHRlcm0tY3VycmVudC1m YWNlCi0gICAgICAgICAgICAgIGAoLHRlcm0tY3VycmVudC1mYWNlIDppbmhlcml0IHRlcm0t Ym9sZCkpKQorICAgICAgICAgICAgICAobGlzdCA6Zm9yZWdyb3VuZAorICAgICAgICAgICAg ICAgICAgICAoZmFjZS1mb3JlZ3JvdW5kCisgICAgICAgICAgICAgICAgICAgICAoZWx0IGFu c2ktdGVybS1jb2xvci12ZWN0b3IgY3VycmVudC1jb2xvcikKKyAgICAgICAgICAgICAgICAg ICAgIG5pbCAnZGVmYXVsdCkKKyAgICAgICAgICAgICAgICAgICAgOmJhY2tncm91bmQKKyAg ICAgICAgICAgICAgICAgICAgKGZhY2UtYmFja2dyb3VuZAorICAgICAgICAgICAgICAgICAg ICAgKGVsdCBhbnNpLXRlcm0tY29sb3ItdmVjdG9yIGN1cnJlbnQtYmctY29sb3IpCisgICAg ICAgICAgICAgICAgICAgICBuaWwgJ2RlZmF1bHQpCisgICAgICAgICAgICAgICAgICAgIDpp bnZlcnNlLXZpZGVvIHRlcm0tYW5zaS1jdXJyZW50LXJldmVyc2UpKQorCisgICAgICAgICh3 aGVuIHRlcm0tYW5zaS1jdXJyZW50LWJvbGQKKyAgICAgICAgICAoc2V0cSB0ZXJtLWN1cnJl bnQtZmFjZQorICAgICAgICAgICAgICAgIGAoLHRlcm0tY3VycmVudC1mYWNlIDppbmhlcml0 IHRlcm0tYm9sZCkpKQogCi0gICAgICAod2hlbiB0ZXJtLWFuc2ktY3VycmVudC11bmRlcmxp bmUKLSAgICAgICAgKHNldHEgdGVybS1jdXJyZW50LWZhY2UKLSAgICAgICAgICAgICAgYCgs dGVybS1jdXJyZW50LWZhY2UgOmluaGVyaXQgdGVybS11bmRlcmxpbmUpKSkpKQorICAgICAg ICAod2hlbiB0ZXJtLWFuc2ktY3VycmVudC11bmRlcmxpbmUKKyAgICAgICAgICAoc2V0cSB0 ZXJtLWN1cnJlbnQtZmFjZQorICAgICAgICAgICAgICAgIGAoLHRlcm0tY3VycmVudC1mYWNl IDppbmhlcml0IHRlcm0tdW5kZXJsaW5lKSkpKSkpCiAKICAgOzsJKG1lc3NhZ2UgIkRlYnVn ICVTIiB0ZXJtLWN1cnJlbnQtZmFjZSkKICAgOzsgRklYTUU6IHNob3VsZG4ndCB3ZSBzZXQg dGVybS1hbnNpLWZhY2UtYWxyZWFkeS1kb25lIHRvIHQgaGVyZT8gIC0tU3RlZgpkaWZmIC0t Z2l0IGEvdGVzdC9saXNwL3Rlcm0tdGVzdHMuZWwgYi90ZXN0L2xpc3AvdGVybS10ZXN0cy5l bAppbmRleCA1MGFjMzcwYjViLi5iNmE1ZTllODE0IDEwMDY0NAotLS0gYS90ZXN0L2xpc3Av dGVybS10ZXN0cy5lbAorKysgYi90ZXN0L2xpc3AvdGVybS10ZXN0cy5lbApAQCAtMjgsNiAr MjgsNDUgQEAKIChkZWZ2YXIgdGVybS1oZWlnaHQpICAgICAgICAgICAgICAgICAgICA7IE51 bWJlciBvZiBsaW5lcyBpbiB3aW5kb3cuCiAoZGVmdmFyIHRlcm0td2lkdGgpICAgICAgICAg ICAgICAgICAgICAgOyBOdW1iZXIgb2YgY29sdW1ucyBpbiB3aW5kb3cuCiAKKyhkZWZ2YXIg eWVsbG93LWZnLXByb3BzCisgICcoOmZvcmVncm91bmQgInllbGxvdzMiIDpiYWNrZ3JvdW5k ICJ1bnNwZWNpZmllZC1iZyIgOmludmVyc2UtdmlkZW8gbmlsKSkKKyhkZWZ2YXIgeWVsbG93 LWJnLXByb3BzCisgICcoOmZvcmVncm91bmQgInVuc3BlY2lmaWVkLWZnIiA6YmFja2dyb3Vu ZCAieWVsbG93MyIgOmludmVyc2UtdmlkZW8gbmlsKSkKKyhkZWZ2YXIgYnJpZ2h0LXllbGxv dy1mZy1wcm9wcworICAnKDpmb3JlZ3JvdW5kICJ5ZWxsb3cyIiA6YmFja2dyb3VuZCAidW5z cGVjaWZpZWQtYmciIDppbnZlcnNlLXZpZGVvIG5pbCkpCisoZGVmdmFyIGJyaWdodC15ZWxs b3ctYmctcHJvcHMKKyAgJyg6Zm9yZWdyb3VuZCAidW5zcGVjaWZpZWQtZmciIDpiYWNrZ3Jv dW5kICJ5ZWxsb3cyIiA6aW52ZXJzZS12aWRlbyBuaWwpKQorCisoZGVmdmFyIGFuc2ktdGVz dC1zdHJpbmdzCisgIGAoKCJcZVszM21IZWxsbyBXb3JsZFxlWzBtIgorICAgICAsKHByb3Bl cnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UgeWVsbG93LWZnLXByb3BzKSkK KyAgICAoIlxlWzQzbUhlbGxvIFdvcmxkXGVbMG0iCisgICAgICwocHJvcGVydGl6ZSAiSGVs bG8gV29ybGQiICdmb250LWxvY2stZmFjZSB5ZWxsb3ctYmctcHJvcHMpKQorICAgICgiXGVb OTNtSGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIg J2ZvbnQtbG9jay1mYWNlIGJyaWdodC15ZWxsb3ctZmctcHJvcHMpKQorICAgICgiXGVbMTAz bUhlbGxvIFdvcmxkXGVbMG0iCisgICAgICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdm b250LWxvY2stZmFjZSBicmlnaHQteWVsbG93LWJnLXByb3BzKSkKKyAgICAoIlxlWzE7MzNt SGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2Zv bnQtbG9jay1mYWNlCisgICAgICAgICAgICAgICAgICBgKCx5ZWxsb3ctZmctcHJvcHMgOmlu aGVyaXQgdGVybS1ib2xkKSkKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2Zv bnQtbG9jay1mYWNlCisgICAgICAgICAgICAgICAgICBgKCxicmlnaHQteWVsbG93LWZnLXBy b3BzIDppbmhlcml0IHRlcm0tYm9sZCkpKQorICAgICgiXGVbMzM7MW1IZWxsbyBXb3JsZFxl WzBtIgorICAgICAsKHByb3BlcnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UK KyAgICAgICAgICAgICAgICAgIGAoLHllbGxvdy1mZy1wcm9wcyA6aW5oZXJpdCB0ZXJtLWJv bGQpKQorICAgICAsKHByb3BlcnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UK KyAgICAgICAgICAgICAgICAgIGAoLGJyaWdodC15ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQg dGVybS1ib2xkKSkpCisgICAgKCJcZVsxbVxlWzMzbUhlbGxvIFdvcmxkXGVbMG0iCisgICAg ICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdmb250LWxvY2stZmFjZQorICAgICAgICAg ICAgICAgICAgYCgseWVsbG93LWZnLXByb3BzIDppbmhlcml0IHRlcm0tYm9sZCkpCisgICAg ICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdmb250LWxvY2stZmFjZQorICAgICAgICAg ICAgICAgICAgYCgsYnJpZ2h0LXllbGxvdy1mZy1wcm9wcyA6aW5oZXJpdCB0ZXJtLWJvbGQp KSkKKyAgICAoIlxlWzMzbVxlWzFtSGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChwcm9wZXJ0 aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1mYWNlCisgICAgICAgICAgICAgICAgICBg KCx5ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQgdGVybS1ib2xkKSkKKyAgICAgLChwcm9wZXJ0 aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1mYWNlCisgICAgICAgICAgICAgICAgICBg KCxicmlnaHQteWVsbG93LWZnLXByb3BzIDppbmhlcml0IHRlcm0tYm9sZCkpKSkpCisKIChk ZWZ1biB0ZXJtLXRlc3Qtc2NyZWVuLWZyb20taW5wdXQgKHdpZHRoIGhlaWdodCBpbnB1dCAm b3B0aW9uYWwgcmV0dXJuLXZhcikKICAgKHdpdGgtdGVtcC1idWZmZXIKICAgICAodGVybS1t b2RlKQpAQCAtNDgsNyArODcsNyBAQCB0ZXJtLXRlc3Qtc2NyZWVuLWZyb20taW5wdXQKICAg ICAgICAgICAgICAgICAobWFwYyAobGFtYmRhIChpbnB1dCkgKHRlcm0tZW11bGF0ZS10ZXJt aW5hbCBwcm9jIGlucHV0KSkgaW5wdXQpCiAgICAgICAgICAgICAgICh0ZXJtLWVtdWxhdGUt dGVybWluYWwgcHJvYyBpbnB1dCkpCiAgICAgICAoaWYgcmV0dXJuLXZhciAoYnVmZmVyLWxv Y2FsLXZhbHVlIHJldHVybi12YXIgKGN1cnJlbnQtYnVmZmVyKSkKLSAgICAgICAgKGJ1ZmZl ci1zdWJzdHJpbmctbm8tcHJvcGVydGllcyAocG9pbnQtbWluKSAocG9pbnQtbWF4KSkpKSkp CisgICAgICAgIChidWZmZXItc3Vic3RyaW5nIChwb2ludC1taW4pIChwb2ludC1tYXgpKSkp KSkKIAogKGVydC1kZWZ0ZXN0IHRlcm0tc2ltcGxlLWxpbmVzICgpCiAgIChza2lwLXVubGVz cyAobm90IChtZW1xIHN5c3RlbS10eXBlICcod2luZG93cy1udCBtcy1kb3MpKSkpCkBAIC03 Nyw2ICsxMTYsMjQgQEAgdGVybS1saW5lLXdyYXAKICAgICAgICAgICAgKHRlcm0tdGVzdC1z Y3JlZW4tZnJvbS1pbnB1dCA0MCAxMiAobGV0ICgoc3RyIChtYWtlLXN0cmluZyAzMCA/YSkp KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxp c3Qgc3RyIHN0cikpKSkpKQogCisoZXJ0LWRlZnRlc3QgdGVybS1jb2xvcnMgKCkKKyAgKHNr aXAtdW5sZXNzIChub3QgKG1lbXEgc3lzdGVtLXR5cGUgJyh3aW5kb3dzLW50IG1zLWRvcykp KSkKKyAgKHBjYXNlLWRvbGlzdCAoYCgsc3RyICxleHBlY3RlZCkgYW5zaS10ZXN0LXN0cmlu Z3MpCisgICAgKGxldCAoKHJlc3VsdCAodGVybS10ZXN0LXNjcmVlbi1mcm9tLWlucHV0IDQw IDEyIHN0cikpKQorICAgICAgKHNob3VsZCAoZXF1YWwgcmVzdWx0IGV4cGVjdGVkKSkKKyAg ICAgIChzaG91bGQgKGVxdWFsICh0ZXh0LXByb3BlcnRpZXMtYXQgMCByZXN1bHQpCisgICAg ICAgICAgICAgICAgICAgICAodGV4dC1wcm9wZXJ0aWVzLWF0IDAgZXhwZWN0ZWQpKSkpKSkK KworKGVydC1kZWZ0ZXN0IHRlcm0tY29sb3JzLWJvbGQtaXMtYnJpZ2h0ICgpCisgIChza2lw LXVubGVzcyAobm90IChtZW1xIHN5c3RlbS10eXBlICcod2luZG93cy1udCBtcy1kb3MpKSkp CisgIChsZXQgKChhbnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0IHQpKQorICAgIChwY2FzZS1k b2xpc3QgKGAoLHN0ciAsZXhwZWN0ZWQgLGJyaWdodC1leHBlY3RlZCkgYW5zaS10ZXN0LXN0 cmluZ3MpCisgICAgICAobGV0ICgoZXhwZWN0ZWQgKG9yIGJyaWdodC1leHBlY3RlZCBleHBl Y3RlZCkpCisgICAgICAgICAgICAocmVzdWx0ICh0ZXJtLXRlc3Qtc2NyZWVuLWZyb20taW5w dXQgNDAgMTIgc3RyKSkpCisgICAgICAgIChzaG91bGQgKGVxdWFsIHJlc3VsdCBleHBlY3Rl ZCkpCisgICAgICAgIChzaG91bGQgKGVxdWFsICh0ZXh0LXByb3BlcnRpZXMtYXQgMCByZXN1 bHQpCisgICAgICAgICAgICAgICAgICAgICAgICh0ZXh0LXByb3BlcnRpZXMtYXQgMCBleHBl Y3RlZCkpKSkpKSkKKwogKGVydC1kZWZ0ZXN0IHRlcm0tY3Vyc29yLW1vdmVtZW50ICgpCiAg IChza2lwLXVubGVzcyAobm90IChtZW1xIHN5c3RlbS10eXBlICcod2luZG93cy1udCBtcy1k b3MpKSkpCiAgIDs7IEFic29sdXRlIHBvc2l0aW9uaW5nLgotLSAKMi4yNS4xCgo= --------------B035213050D3DF1A7BA02CC4-- From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 19 10:46:04 2021 Received: (at 50179) by debbugs.gnu.org; 19 Sep 2021 14:46:04 +0000 Received: from localhost ([127.0.0.1]:39497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRy4x-0003rl-Rd for submit@debbugs.gnu.org; Sun, 19 Sep 2021 10:46:04 -0400 Received: from quimby.gnus.org ([95.216.78.240]:41882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRy4t-0003r4-ED for 50179@debbugs.gnu.org; Sun, 19 Sep 2021 10:46:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vjeYVf6DbEcW0OWVysWgUF/o0l8s7+Ml6mW7ONN7L2g=; b=SWbaiaW4des9InPMMJpFGfrjgd 2s5/V/hBhmned3YfhHt98s4oJcqErPag+WKbXWTMEIATLtI8AlYuXr/jR8iDPR8qjs0i1bH/S8uix px3gDl0SCFyXUjj/jwSi/6E6vPYHhAjwBDbQ41E2UDESpu+laLgT0rf1hqTP0y2hA5mY=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mRy4k-0007zG-AH; Sun, 19 Sep 2021 16:45:52 +0200 From: Lars Ingebrigtsen To: Jim Porter Subject: Re: bug#50179: [UPDATED PATCH] Add support for "bright" ANSI colors to ansi-color and term-mode References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> <87a6l5k9xr.fsf@gnus.org> <87lf4p3210.fsf@gnus.org> <831r6hv51r.fsf@gnu.org> <87h7fc2vd4.fsf@gnus.org> Date: Sun, 19 Sep 2021 16:45:48 +0200 In-Reply-To: (Jim Porter's message of "Sat, 18 Sep 2021 11:58:12 -0700") Message-ID: <871r5kpqsj.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jim Porter writes: > There's one further enhancement that might make sense here: currently, > color values are set via a vector of strings for `ansi-color', whereas > they're set via faces for `term-mode'. Would it be b [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50179 Cc: Eli Zaretskii , 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Jim Porter writes: > There's one further enhancement that might make sense here: currently, > color values are set via a vector of strings for `ansi-color', whereas > they're set via faces for `term-mode'. Would it be better to use faces > for `ansi-color' too? Perhaps they should even be the *same* faces; is > there any reason an Emacs user (or package) would want ANSI colors to > be different between `ansi-color' and `term-mode'? If so, maybe each > `term-color-FOO' face should inherit from the (hypothetical) > corresponding `ansi-color-FOO' face? It seems like term.el was reworked in commit ae4969c2d69a74c896eb49c9a34aeb645ffed082 Author: Julien Danjou AuthorDate: Thu Jun 28 12:40:24 2012 +0200 to use faces instead of colour names, but ansi-color wasn't. Looking at the code in both ansi-color and term, I think it would indeed make sense to rework ansi-color to use faces, too, and inheriting like you suggest makes sense to me. (We generally prefer using faces instead of colour names these days.) But: > However, maybe there's a particular reason why `ansi-color' works this > way that I'm not aware of. If the current way is best, that's fine by > me too. Otherwise, just let me know and I can update the patches to > include `ansi-color-FOO' faces. I'm not really very familiar with ansi-color.el. Does anybody else have an opinion here? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 21 11:46:30 2021 Received: (at control) by debbugs.gnu.org; 21 Sep 2021 15:46:30 +0000 Received: from localhost ([127.0.0.1]:47554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mShyX-00053n-OB for submit@debbugs.gnu.org; Tue, 21 Sep 2021 11:46:30 -0400 Received: from mail-pj1-f50.google.com ([209.85.216.50]:36362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mShyR-0004sd-AO for control@debbugs.gnu.org; Tue, 21 Sep 2021 11:46:26 -0400 Received: by mail-pj1-f50.google.com with SMTP id z14-20020a17090a8b8e00b0019cc29ceef1so2296922pjn.1 for ; Tue, 21 Sep 2021 08:46:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:mime-version:date:message-id:subject:to; bh=RZS1qjz4jBR8TZbgl/RwgjxKacniF2e/e+G1I94BS/M=; b=19SJok2dTUAM3tJqkUl7SpmPNatExg2YHwBNMcAE8iMd7HLS2bICz/UM875JxEQg7G 2JxE94juMiloLnSJ1TkOh+MvCqJFEj+DEpJkz4IcGvsqpaj7ql7yqlzBs3L+5bNao4kN 81t0fukPC8Zb6fKZh6KFGrehjlpe6vpem7OLIxEU61i+3sZHyWWIsv440rEqKR7SMxc+ nLpOhorG3JNnI8ccCejOJKdDn74wp1mID+i0JR9Ez+tYy8PsngCm3ynIM74zqq2S+EdH V0sqm5kHH4UXg2WSdH6cBpU6i5Z5w8x2NbXMZ1eY7IqspzlMTr/rrCUMflbQkeUoO3OJ b4PA== X-Gm-Message-State: AOAM533K3rgr4kN4D0zWlGT+zTYrOk8TcP5FXaZQhbW6337efmvW7WLA kqTR0dipeoIaurPZrH+JgELao1Vls5g9lb7gai8AI9WT X-Google-Smtp-Source: ABdhPJxq+LzwMKxEYgejhExWuuLAXR8NnJcpxgWBsrlJJyn7qNQDVOYVLTMMqT/FGqFEPqx9TkLZ1zQxaaFK3rr+Pxk= X-Received: by 2002:a17:902:d505:b0:13d:b037:2087 with SMTP id b5-20020a170902d50500b0013db0372087mr9957775plg.22.1632239177568; Tue, 21 Sep 2021 08:46:17 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 21 Sep 2021 08:46:17 -0700 From: Stefan Kangas MIME-Version: 1.0 Date: Tue, 21 Sep 2021 08:46:17 -0700 Message-ID: Subject: control message for bug #50179 To: control@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) severity 50179 wishlist quit From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 22 15:40:10 2021 Received: (at 50179) by debbugs.gnu.org; 22 Sep 2021 19:40:10 +0000 Received: from localhost ([127.0.0.1]:51738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mT86C-0005Uq-9w for submit@debbugs.gnu.org; Wed, 22 Sep 2021 15:40:09 -0400 Received: from mail-pg1-f174.google.com ([209.85.215.174]:47019) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mT868-0005U9-BN for 50179@debbugs.gnu.org; Wed, 22 Sep 2021 15:40:06 -0400 Received: by mail-pg1-f174.google.com with SMTP id m21so3786651pgu.13 for <50179@debbugs.gnu.org>; Wed, 22 Sep 2021 12:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language; bh=EWA8RFffiiUPwDEo6LzGqZAW5QyUAhbvnYvZAYrEhIc=; b=bxwJ0D0jDddkAJvdkZyQIMI6MSUhft9eQGdSL3wFrWAz95x1V5uQKgnvGxXjvBWz48 OTPr529PRQb1DOR7JDGFlT1Qmulpe8qqYZgi0tDxduEyoEjSyjRgPochN0KXw5rMMtQA YwFCBcmJf4+x7AcHV/dIBC7p4JdFf/Kj92BSGa4Cr1LkoxyxeiBv93RPp72g9V/Po3OL QhsiUqHeazExHAaEotD9bhKzi6YdM8khE98peZalE2Ouz6OkxgVwFLxwJG/rP5rDwjI/ vxgZACpw7U+3Se0rtaUSLjfKpe3sGQMJr5syk/GIHuxGzMKmAiIeL5MZWxEUtzLJAC3o QTlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language; bh=EWA8RFffiiUPwDEo6LzGqZAW5QyUAhbvnYvZAYrEhIc=; b=2+XAfY+wkAzmI6NK//oDyDa7qQmtPRlTIamgssbGqUz6STBqt4Uudodh91t0QEGVd8 czkCsiN/NMacxHoQPPiUXfj84p6bllkBKgmf/bMEBueg/3oWGeiaB5TuTj/yRw27JNPZ 9EEdzWc+LKSykd3pkzXo/KssP1iUttPkp4WIqWpOKX2c/1lbSMCn0+FAt87rBPuuZqLj /KWacXLNM7dbzDqem87UulTd1xCep2o/x4BeVRA/O/URfSS5Z0oETFcbzcegTEn3PGzE eqY+OF7T3DKdJrwSupibdP1iosy6H4FkfhA7yCtjC3Te4T23V2RQHyk87RL044ww9SXP lERA== X-Gm-Message-State: AOAM533KfbP9tRlNJkN4vDcWhorkCZoGPSnhZPXBDakCfKbGKcBjWR+N xM7LeJjRU5ByO4vI1IH+nnvV5tP6KoY= X-Google-Smtp-Source: ABdhPJyRP2abY1xxJQOtTxZKo2afEMKkTCBMYUfgR/zSU1yHNpxMALot2ZE4dMLf+qHKmmv9nXzHHA== X-Received: by 2002:a63:778d:: with SMTP id s135mr567008pgc.290.1632339597266; Wed, 22 Sep 2021 12:39:57 -0700 (PDT) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id d14sm3326642pfq.61.2021.09.22.12.39.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Sep 2021 12:39:56 -0700 (PDT) Subject: Re: bug#50179: [WIP PATCH v3] Add support for "bright" ANSI colors to ansi-color and term-mode To: Lars Ingebrigtsen References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> <87a6l5k9xr.fsf@gnus.org> <87lf4p3210.fsf@gnus.org> <831r6hv51r.fsf@gnu.org> <87h7fc2vd4.fsf@gnus.org> <871r5kpqsj.fsf@gnus.org> From: Jim Porter Message-ID: <0e61dc90-c315-f3cd-df83-22b9ecb029c1@gmail.com> Date: Wed, 22 Sep 2021 12:39:55 -0700 MIME-Version: 1.0 In-Reply-To: <871r5kpqsj.fsf@gnus.org> Content-Type: multipart/mixed; boundary="------------B46408E9A6DA1B106410C7A4" Content-Language: en-US X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50179 Cc: 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------B46408E9A6DA1B106410C7A4 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 9/19/2021 7:45 AM, Lars Ingebrigtsen wrote: > It seems like term.el was reworked in > > commit ae4969c2d69a74c896eb49c9a34aeb645ffed082 > Author: Julien Danjou > AuthorDate: Thu Jun 28 12:40:24 2012 +0200 > > to use faces instead of colour names, but ansi-color wasn't. Looking at > the code in both ansi-color and term, I think it would indeed make sense > to rework ansi-color to use faces, too, and inheriting like you suggest > makes sense to me. (We generally prefer using faces instead of colour > names these days.) Since no one chimed in opposing this change, here's a WIP patch that adds faces to ansi-color. This removes the use for `ansi-color-map', since `ansi-color-get-face-1' does all the work now. I benchmarked this a bit and the performance seems on par with the old implementation, except when we fontify *more* stuff thanks to the support for additional ANSI escapes; in that case, it takes longer, scaling linearly with the amount that gets fontified. I also took the opportunity to redefine a couple of the faces. For example, ANSI SGR 7 (negative image) was defined to use the `error' face. Given that `:inverse-video' exists, that seems pretty suboptimal. I don't quite know what to do about man.el though. It has overrides for a few of the faces used by ansi-color. I could maintain that behavior fairly easily, but maybe it makes sense to have it use the defaults from ansi-color. More generally, I wonder what we should do to accommodate users of ansi-color who want to apply non-default faces for a specific case. I guess they could redefine `ansi-color-basic-faces-vector' and friends? That's basically how man.el used to work, and it wouldn't be hard to continue supporting that if we wanted. --------------B46408E9A6DA1B106410C7A4 Content-Type: text/plain; charset=UTF-8; name="0001-Add-support-for-bright-ANSI-colors-in-ansi-color.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Add-support-for-bright-ANSI-colors-in-ansi-color.patch" RnJvbSAzNGNkNzY3MjQxM2VjOGNmNDM5MTgwOTBiY2VhMDNjODY3NWJlNzRlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFdlZCwgMjIgU2VwIDIwMjEgMTI6MDI6MjggLTA3MDAKU3ViamVjdDogW1BB VENIIDEvMl0gQWRkIHN1cHBvcnQgZm9yICJicmlnaHQiIEFOU0kgY29sb3JzIGluIGFuc2kt Y29sb3IKCiogbGlzcC9hbnNpLWNvbG9yLmVsIChhbnNpLWNvbG9yLWJvbGQsIGFuc2ktY29s b3ItZmFpbnQsIGFuc2ktY29sb3ItaXRhbGljKQooYW5zaS1jb2xvci11bmRlcmxpbmUsIGFu c2ktY29sb3Itc2xvdy1ibGluaywgYW5zaS1jb2xvci1mYXN0LWJsaW5rKQooYW5zaS1jb2xv ci1pbnZlcnNlLCBhbnNpLWNvbG9yLXJlZCwgYW5zaS1jb2xvci1ncmVlbiwgYW5zaS1jb2xv ci15ZWxsb3cpCihhbnNpLWNvbG9yLWJsdWUsIGFuc2ktY29sb3ItbWFnZW50YSwgYW5zaS1j b2xvci1jeWFuLCBhbnNpLWNvbG9yLXdoaXRlKQooYW5zaS1jb2xvci1icmlnaHQtcmVkLCBh bnNpLWNvbG9yLWJyaWdodC1ncmVlbiwgYW5zaS1jb2xvci1icmlnaHQteWVsbG93KQooYW5z aS1jb2xvci1icmlnaHQtYmx1ZSwgYW5zaS1jb2xvci1icmlnaHQtbWFnZW50YSwgYW5zaS1j b2xvci1icmlnaHQtY3lhbikKKGFuc2ktY29sb3ItYnJpZ2h0LXdoaXRlKTogTmV3IGZhY2Vz LgooYW5zaS1jb2xvci1iYXNpYy1mYWNlcy12ZWN0b3IsIGFuc2ktY29sb3Itbm9ybWFsLWNv bG9ycy12ZWN0b3IpCihhbnNpLWNvbG9yLWJyaWdodC1jb2xvcnMtdmVjdG9yKTogTmV3IGNv bnN0YW50cy4KKGFuc2ktY29sb3ItZmFjZXMtdmVjdG9yLCBhbnNpLWNvbG9yLW5hbWVzLXZl Y3Rvcik6IFJlbW92ZWQuCihhbnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0KTogTmV3IGRlZmN1 c3RvbS4KKGFuc2ktY29sb3ItLWZpbmQtZmFjZSk6IFNvcnQgQU5TSSBjb2RlcyBhbmQgY2hl Y2sKJ2Fuc2ktY29sb3ItYm9sZC1pcy1icmlnaHQnLgooYW5zaS1jb2xvci1hcHBseS1zZXF1 ZW5jZSk6IFN1cHBvcnQgYnJpZ2h0IEFOU0kgY29sb3JzLgooYW5zaS1jb2xvci0tZmlsbC1j b2xvci1tYXApOiBOZXcgZnVuY3Rpb24uCihhbnNpLWNvbG9yLW1ha2UtY29sb3ItbWFwLCBh bnNpLWNvbG9yLW1hcCwgYW5zaS1jb2xvci1tYXAtdXBkYXRlKTogUmVtb3ZlZC4KKGFuc2kt Y29sb3ItZ2V0LWZhY2UtMSk6IEFkZCBCUklHSFQgcGFyYW1ldGVyLgoqIGxpc3AvbWFuLmVs IChNYW4tYW5zaS1jb2xvci1tYXApOiBSZW1vdmVkLgoqIHRlc3QvbGlzcC9hbnNpLWNvbG9y LXRlc3RzLmVsCihhbnNpLWNvbG9yLWFwcGx5LW9uLXJlZ2lvbi1ib2xkLWlzLWJyaWdodC10 ZXN0KTogTmV3IGZ1bmN0aW9uLgotLS0KIGV0Yy9ORVdTICAgICAgICAgICAgICAgICAgICAg IHwgIDE1ICsrCiBsaXNwL2Fuc2ktY29sb3IuZWwgICAgICAgICAgICB8IDM2NyArKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiBsaXNwL21hbi5lbCAgICAgICAgICAgICAg ICAgICB8ICAgOSArLQogdGVzdC9saXNwL2Fuc2ktY29sb3ItdGVzdHMuZWwgfCAgNTUgKysr Ky0KIDQgZmlsZXMgY2hhbmdlZCwgMzA3IGluc2VydGlvbnMoKyksIDEzOSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9ldGMvTkVXUyBiL2V0Yy9ORVdTCmluZGV4IGYyNzNiOGU4MmEu LmNmNjgyM2Y1MWIgMTAwNjQ0Ci0tLSBhL2V0Yy9ORVdTCisrKyBiL2V0Yy9ORVdTCkBAIC0y NzAzLDYgKzI3MDMsMjEgQEAgc2VxdWVuY2VzLgogKioqICdjb21pbnQtZGVsZXRlLW91dHB1 dCcgY2FuIG5vdyBzYXZlIGRlbGV0ZWQgdGV4dCBpbiB0aGUga2lsbC1yaW5nLgogSW50ZXJh Y3RpdmVseSwgJ0MtdSBDLWMgQy1vJyB0cmlnZ2VycyB0aGlzIG5ldyBvcHRpb25hbCBiZWhh dmlvci4KIAorKiogYW5zaS1jb2xvci5lbAorCistLS0KKyoqKiBDb2xvcnMgYXJlIG5vdyBk ZWZpbmVkIGJ5IGZhY2VzLgorQU5TSSBTR1IgY29kZXMgbm93IGhhdmUgY29ycmVzcG9uZGlu ZyBmYWNlcyB0byBkZXNjcmliZSB0aGVpcgorYXBwZWFyYW5jZSwgZS5nLiAnYW5zaS1jb2xv ci1ib2xkJy4KKworLS0tCisqKiogU3VwcG9ydCBmb3IgImJyaWdodCIgY29sb3IgY29kZXMu CisiQnJpZ2h0IiBBTlNJIGNvbG9yIGNvZGVzIGFyZSBub3cgZGlzcGxheWVkIHdoZW4gYXBw bHlpbmcgQU5TSSBjb2xvcgorZmlsdGVycyB1c2luZyB0aGUgY29sb3IgdmFsdWVzIGRlZmlu ZWQgYnkgdGhlIGZhY2VzCisnYW5zaS1jb2xvci1icmlnaHQtQ09MT1InLiAgSW4gYWRkaXRp b24sIGJvbGQgdGV4dCB3aXRoIHJlZ3VsYXIgQU5TSQorY29sb3JzIGNhbiBiZSBkaXNwbGF5 ZWQgYXMgImJyaWdodCIgaWYgJ2Fuc2ktY29sb3ItYm9sZC1pcy1icmlnaHQnIGlzCitub24t bmlsLgorCiAqKiBFUkMKIAogLS0tCmRpZmYgLS1naXQgYS9saXNwL2Fuc2ktY29sb3IuZWwg Yi9saXNwL2Fuc2ktY29sb3IuZWwKaW5kZXggNDMxNWE3ZjNjZS4uYWFiZGE3MTA2OCAxMDA2 NDQKLS0tIGEvbGlzcC9hbnNpLWNvbG9yLmVsCisrKyBiL2xpc3AvYW5zaS1jb2xvci5lbApA QCAtOTAsMzYgKzkwLDE3NyBAQCBhbnNpLWNvbG9ycwogICA6dmVyc2lvbiAiMjEuMSIKICAg Omdyb3VwICdwcm9jZXNzZXMpCiAKLShkZWZjdXN0b20gYW5zaS1jb2xvci1mYWNlcy12ZWN0 b3IKLSAgW2RlZmF1bHQgYm9sZCBkZWZhdWx0IGl0YWxpYyB1bmRlcmxpbmUgc3VjY2VzcyB3 YXJuaW5nIGVycm9yXQorKGRlZmZhY2UgYW5zaS1jb2xvci1ib2xkCisgICcoKHQgOmluaGVy aXQgJ2JvbGQpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBib2xkIHRleHQuIgorICA6Z3Jv dXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJzaW9uICIyOC4xIikKKworKGRlZmZhY2UgYW5zaS1j b2xvci1mYWludAorICAnKCh0IDp3ZWlnaHQgbGlnaHQpKQorICAiRmFjZSB1c2VkIHRvIHJl bmRlciBmYWludCB0ZXh0LiIKKyAgOmdyb3VwICdhbnNpLWNvbG9ycworICA6dmVyc2lvbiAi MjguMSIpCisKKyhkZWZmYWNlIGFuc2ktY29sb3ItaXRhbGljCisgICcoKHQgOmluaGVyaXQg J2l0YWxpYykpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGl0YWxpYyB0ZXh0LiIKKyAgOmdy b3VwICdhbnNpLWNvbG9ycworICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIGFuc2kt Y29sb3ItdW5kZXJsaW5lCisgICcoKHQgOmluaGVyaXQgJ3VuZGVybGluZSkpCisgICJGYWNl IHVzZWQgdG8gcmVuZGVyIHVuZGVybGluZWQgdGV4dC4iCisgIDpncm91cCAnYW5zaS1jb2xv cnMKKyAgOnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSBhbnNpLWNvbG9yLXNsb3ctYmxp bmsKKyAgJygodCA6Ym94ICg6bGluZS13aWR0aCAtMSkpKQorICAiRmFjZSB1c2VkIHRvIHJl bmRlciBzbG93bHkgYmxpbmtpbmcgdGV4dC4iCisgIDpncm91cCAnYW5zaS1jb2xvcnMKKyAg OnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSBhbnNpLWNvbG9yLWZhc3QtYmxpbmsKKyAg JygodCA6Ym94ICg6bGluZS13aWR0aCAtMSkpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBy YXBpZGx5IGJsaW5raW5nIHRleHQuIgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJz aW9uICIyOC4xIikKKworKGRlZmZhY2UgYW5zaS1jb2xvci1pbnZlcnNlCisgICcoKHQgOmlu dmVyc2UtdmlkZW8gdCkpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGludmVydGVkIHZpZGVv IHRleHQuIgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJzaW9uICIyOC4xIikKKwor KGRlZmZhY2UgYW5zaS1jb2xvci1ibGFjaworICAnKCh0IDpmb3JlZ3JvdW5kICJibGFjayIg OmJhY2tncm91bmQgImJsYWNrIikpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJsYWNrIGNv bG9yIGNvZGUuIgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJzaW9uICIyOC4xIikK KworKGRlZmZhY2UgYW5zaS1jb2xvci1yZWQKKyAgJygodCA6Zm9yZWdyb3VuZCAicmVkMyIg OmJhY2tncm91bmQgInJlZDMiKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgcmVkIGNvbG9y IGNvZGUuIgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJzaW9uICIyOC4xIikKKwor KGRlZmZhY2UgYW5zaS1jb2xvci1ncmVlbgorICAnKCh0IDpmb3JlZ3JvdW5kICJncmVlbjMi IDpiYWNrZ3JvdW5kICJncmVlbjMiKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgZ3JlZW4g Y29sb3IgY29kZS4iCisgIDpncm91cCAnYW5zaS1jb2xvcnMKKyAgOnZlcnNpb24gIjI4LjEi KQorCisoZGVmZmFjZSBhbnNpLWNvbG9yLXllbGxvdworICAnKCh0IDpmb3JlZ3JvdW5kICJ5 ZWxsb3czIiA6YmFja2dyb3VuZCAieWVsbG93MyIpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRl ciB5ZWxsb3cgY29sb3IgY29kZS4iCisgIDpncm91cCAnYW5zaS1jb2xvcnMKKyAgOnZlcnNp b24gIjI4LjEiKQorCisoZGVmZmFjZSBhbnNpLWNvbG9yLWJsdWUKKyAgJygodCA6Zm9yZWdy b3VuZCAiYmx1ZTIiIDpiYWNrZ3JvdW5kICJibHVlMiIpKQorICAiRmFjZSB1c2VkIHRvIHJl bmRlciBibHVlIGNvbG9yIGNvZGUuIgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJz aW9uICIyOC4xIikKKworKGRlZmZhY2UgYW5zaS1jb2xvci1tYWdlbnRhCisgICcoKHQgOmZv cmVncm91bmQgIm1hZ2VudGEzIiA6YmFja2dyb3VuZCAibWFnZW50YTMiKSkKKyAgIkZhY2Ug dXNlZCB0byByZW5kZXIgbWFnZW50YSBjb2xvciBjb2RlLiIKKyAgOmdyb3VwICdhbnNpLWNv bG9ycworICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIGFuc2ktY29sb3ItY3lhbgor ICAnKCh0IDpmb3JlZ3JvdW5kICJjeWFuMyIgOmJhY2tncm91bmQgImN5YW4zIikpCisgICJG YWNlIHVzZWQgdG8gcmVuZGVyIGN5YW4gY29sb3IgY29kZS4iCisgIDpncm91cCAnYW5zaS1j b2xvcnMKKyAgOnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSBhbnNpLWNvbG9yLXdoaXRl CisgICcoKHQgOmZvcmVncm91bmQgImdyZXk5MCIgOmJhY2tncm91bmQgImdyYXk5MCIpKQor ICAiRmFjZSB1c2VkIHRvIHJlbmRlciB3aGl0ZSBjb2xvciBjb2RlLiIKKyAgOmdyb3VwICdh bnNpLWNvbG9ycworICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIGFuc2ktY29sb3It YnJpZ2h0LWJsYWNrCisgICcoKHQgOmZvcmVncm91bmQgImdyYXkzMCIgOmJhY2tncm91bmQg ImdyYXkzMCIpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgYmxhY2sgY29sb3Ig Y29kZS4iCisgIDpncm91cCAnYW5zaS1jb2xvcnMKKyAgOnZlcnNpb24gIjI4LjEiKQorCiso ZGVmZmFjZSBhbnNpLWNvbG9yLWJyaWdodC1yZWQKKyAgJygodCA6Zm9yZWdyb3VuZCAicmVk MiIgOmJhY2tncm91bmQgInJlZDIiKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgYnJpZ2h0 IHJlZCBjb2xvciBjb2RlLiIKKyAgOmdyb3VwICdhbnNpLWNvbG9ycworICA6dmVyc2lvbiAi MjguMSIpCisKKyhkZWZmYWNlIGFuc2ktY29sb3ItYnJpZ2h0LWdyZWVuCisgICcoKHQgOmZv cmVncm91bmQgImdyZWVuMiIgOmJhY2tncm91bmQgImdyZWVuMiIpKQorICAiRmFjZSB1c2Vk IHRvIHJlbmRlciBicmlnaHQgZ3JlZW4gY29sb3IgY29kZS4iCisgIDpncm91cCAnYW5zaS1j b2xvcnMKKyAgOnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSBhbnNpLWNvbG9yLWJyaWdo dC15ZWxsb3cKKyAgJygodCA6Zm9yZWdyb3VuZCAieWVsbG93MiIgOmJhY2tncm91bmQgInll bGxvdzIiKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgYnJpZ2h0IHllbGxvdyBjb2xvciBj b2RlLiIKKyAgOmdyb3VwICdhbnNpLWNvbG9ycykKKworKGRlZmZhY2UgYW5zaS1jb2xvci1i cmlnaHQtYmx1ZQorICAnKCh0IDpmb3JlZ3JvdW5kICJibHVlMSIgOmJhY2tncm91bmQgImJs dWUxIikpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJyaWdodCBibHVlIGNvbG9yIGNvZGUu IgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJzaW9uICIyOC4xIikKKworKGRlZmZh Y2UgYW5zaS1jb2xvci1icmlnaHQtbWFnZW50YQorICAnKCh0IDpmb3JlZ3JvdW5kICJtYWdl bnRhMiIgOmJhY2tncm91bmQgIm1hZ2VudGEyIikpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVy IGJyaWdodCBtYWdlbnRhIGNvbG9yIGNvZGUuIgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisg IDp2ZXJzaW9uICIyOC4xIikKKworKGRlZmZhY2UgYW5zaS1jb2xvci1icmlnaHQtY3lhbgor ICAnKCh0IDpmb3JlZ3JvdW5kICJjeWFuMiIgOmJhY2tncm91bmQgImN5YW4yIikpCisgICJG YWNlIHVzZWQgdG8gcmVuZGVyIGJyaWdodCBjeWFuIGNvbG9yIGNvZGUuIgorICA6Z3JvdXAg J2Fuc2ktY29sb3JzCisgIDp2ZXJzaW9uICIyOC4xIikKKworKGRlZmZhY2UgYW5zaS1jb2xv ci1icmlnaHQtd2hpdGUKKyAgJygodCA6Zm9yZWdyb3VuZCAid2hpdGUiIDpiYWNrZ3JvdW5k ICJ3aGl0ZSIpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgd2hpdGUgY29sb3Ig Y29kZS4iCisgIDpncm91cCAnYW5zaS1jb2xvcnMKKyAgOnZlcnNpb24gIjI4LjEiKQorCiso ZGVmY29uc3QgYW5zaS1jb2xvci1iYXNpYy1mYWNlcy12ZWN0b3IKKyAgW25pbAorICAgYW5z aS1jb2xvci1ib2xkCisgICBhbnNpLWNvbG9yLWZhaW50CisgICBhbnNpLWNvbG9yLWl0YWxp YworICAgYW5zaS1jb2xvci11bmRlcmxpbmUKKyAgIGFuc2ktY29sb3Itc2xvdy1ibGluawor ICAgYW5zaS1jb2xvci1mYXN0LWJsaW5rCisgICBhbnNpLWNvbG9yLWludmVyc2VdCiAgICJG YWNlcyB1c2VkIGZvciBTR1IgY29udHJvbCBzZXF1ZW5jZXMgZGV0ZXJtaW5pbmcgYSBmYWNl LgogVGhpcyB2ZWN0b3IgaG9sZHMgdGhlIGZhY2VzIHVzZWQgZm9yIFNHUiBjb250cm9sIHNl cXVlbmNlIHBhcmFtZXRlcnMgMAogdG8gNy4KIAotUGFyYW1ldGVyICBEZXNjcmlwdGlvbiAg ICAgICAgRmFjZSB1c2VkIGJ5IGRlZmF1bHQKLSAgMCAgICAgICAgZGVmYXVsdCAgICAgICAg ICAgIGRlZmF1bHQKLSAgMSAgICAgICAgYm9sZCAgICAgICAgICAgICAgIGJvbGQKLSAgMiAg ICAgICAgZmFpbnQgICAgICAgICAgICAgIGRlZmF1bHQKLSAgMyAgICAgICAgaXRhbGljICAg ICAgICAgICAgIGl0YWxpYwotICA0ICAgICAgICB1bmRlcmxpbmVkICAgICAgICAgdW5kZXJs aW5lCi0gIDUgICAgICAgIHNsb3dseSBibGlua2luZyAgICBzdWNjZXNzCi0gIDYgICAgICAg IHJhcGlkbHkgYmxpbmtpbmcgICB3YXJuaW5nCi0gIDcgICAgICAgIG5lZ2F0aXZlIGltYWdl ICAgICBlcnJvcgotCi1Ob3RlIHRoYXQgdGhlIHN5bWJvbCBgZGVmYXVsdCcgaXMgc3BlY2lh bDogSXQgd2lsbCBub3QgYmUgY29tYmluZWQKLXdpdGggdGhlIGN1cnJlbnQgZmFjZS4KLQot VGhpcyB2ZWN0b3IgaXMgdXNlZCBieSBgYW5zaS1jb2xvci1tYWtlLWNvbG9yLW1hcCcgdG8g Y3JlYXRlIGEgY29sb3IKLW1hcC4gIFRoaXMgY29sb3IgbWFwIGlzIHN0b3JlZCBpbiB0aGUg dmFyaWFibGUgYGFuc2ktY29sb3ItbWFwJy4iCi0gIDp0eXBlICcodmVjdG9yIGZhY2UgZmFj ZSBmYWNlIGZhY2UgZmFjZSBmYWNlIGZhY2UgZmFjZSkKLSAgOnNldCAnYW5zaS1jb2xvci1t YXAtdXBkYXRlCi0gIDppbml0aWFsaXplICdjdXN0b20taW5pdGlhbGl6ZS1kZWZhdWx0Ci0g IDpncm91cCAnYW5zaS1jb2xvcnMpCi0KLShkZWZjdXN0b20gYW5zaS1jb2xvci1uYW1lcy12 ZWN0b3IKLSAgWyJibGFjayIgInJlZDMiICJncmVlbjMiICJ5ZWxsb3czIiAiYmx1ZTIiICJt YWdlbnRhMyIgImN5YW4zIiAiZ3JheTkwIl0KLSAgIkNvbG9ycyB1c2VkIGZvciBTR1IgY29u dHJvbCBzZXF1ZW5jZXMgZGV0ZXJtaW5pbmcgYSBjb2xvci4KLVRoaXMgdmVjdG9yIGhvbGRz IHRoZSBjb2xvcnMgdXNlZCBmb3IgU0dSIGNvbnRyb2wgc2VxdWVuY2VzIHBhcmFtZXRlcnMK K1BhcmFtZXRlciAgRGVzY3JpcHRpb24KKyAgMCAgICAgICAgZGVmYXVsdAorICAxICAgICAg ICBib2xkCisgIDIgICAgICAgIGZhaW50CisgIDMgICAgICAgIGl0YWxpYworICA0ICAgICAg ICB1bmRlcmxpbmVkCisgIDUgICAgICAgIHNsb3dseSBibGlua2luZworICA2ICAgICAgICBy YXBpZGx5IGJsaW5raW5nCisgIDcgICAgICAgIG5lZ2F0aXZlIGltYWdlIikKKworKGRlZmNv bnN0IGFuc2ktY29sb3Itbm9ybWFsLWNvbG9ycy12ZWN0b3IKKyAgW2Fuc2ktY29sb3ItYmxh Y2sKKyAgIGFuc2ktY29sb3ItcmVkCisgICBhbnNpLWNvbG9yLWdyZWVuCisgICBhbnNpLWNv bG9yLXllbGxvdworICAgYW5zaS1jb2xvci1ibHVlCisgICBhbnNpLWNvbG9yLW1hZ2VudGEK KyAgIGFuc2ktY29sb3ItY3lhbgorICAgYW5zaS1jb2xvci13aGl0ZV0KKyAgIkZhY2VzIHVz ZWQgZm9yIFNHUiBjb250cm9sIHNlcXVlbmNlcyBkZXRlcm1pbmluZyBhIGNvbG9yLgorVGhp cyB2ZWN0b3IgaG9sZHMgdGhlIGZhY2VzIHVzZWQgZm9yIFNHUiBjb250cm9sIHNlcXVlbmNl cyBwYXJhbWV0ZXJzCiAzMCB0byAzNyAoZm9yZWdyb3VuZCBjb2xvcnMpIGFuZCA0MCB0byA0 NyAoYmFja2dyb3VuZCBjb2xvcnMpLgogCiBQYXJhbWV0ZXIgIENvbG9yCkBAIC0xMzAsMjQg KzI3MSwzNyBAQCBhbnNpLWNvbG9yLW5hbWVzLXZlY3RvcgogICAzNCAgNDQgICBibHVlCiAg IDM1ICA0NSAgIG1hZ2VudGEKICAgMzYgIDQ2ICAgY3lhbgotICAzNyAgNDcgICB3aGl0ZQot Ci1UaGlzIHZlY3RvciBpcyB1c2VkIGJ5IGBhbnNpLWNvbG9yLW1ha2UtY29sb3ItbWFwJyB0 byBjcmVhdGUgYSBjb2xvcgotbWFwLiAgVGhpcyBjb2xvciBtYXAgaXMgc3RvcmVkIGluIHRo ZSB2YXJpYWJsZSBgYW5zaS1jb2xvci1tYXAnLgotCi1FYWNoIGVsZW1lbnQgbWF5IGFsc28g YmUgYSBjb25zIGNlbGwgd2hlcmUgdGhlIGNhciBhbmQgY2RyIHNwZWNpZnkgdGhlCi1mb3Jl Z3JvdW5kIGFuZCBiYWNrZ3JvdW5kIGNvbG9ycywgcmVzcGVjdGl2ZWx5LiIKLSAgOnR5cGUg Jyh2ZWN0b3IgKGNob2ljZSBjb2xvciAoY29ucyBjb2xvciBjb2xvcikpCi0gICAgICAgICAg ICAgICAgIChjaG9pY2UgY29sb3IgKGNvbnMgY29sb3IgY29sb3IpKQotICAgICAgICAgICAg ICAgICAoY2hvaWNlIGNvbG9yIChjb25zIGNvbG9yIGNvbG9yKSkKLSAgICAgICAgICAgICAg ICAgKGNob2ljZSBjb2xvciAoY29ucyBjb2xvciBjb2xvcikpCi0gICAgICAgICAgICAgICAg IChjaG9pY2UgY29sb3IgKGNvbnMgY29sb3IgY29sb3IpKQotICAgICAgICAgICAgICAgICAo Y2hvaWNlIGNvbG9yIChjb25zIGNvbG9yIGNvbG9yKSkKLSAgICAgICAgICAgICAgICAgKGNo b2ljZSBjb2xvciAoY29ucyBjb2xvciBjb2xvcikpCi0gICAgICAgICAgICAgICAgIChjaG9p Y2UgY29sb3IgKGNvbnMgY29sb3IgY29sb3IpKSkKLSAgOnNldCAnYW5zaS1jb2xvci1tYXAt dXBkYXRlCi0gIDppbml0aWFsaXplICdjdXN0b20taW5pdGlhbGl6ZS1kZWZhdWx0Ci0gIDp2 ZXJzaW9uICIyNC40IiA7IGRlZmF1bHQgY29sb3JzIGNvcGllZCBmcm9tIGB4dGVybS1zdGFu ZGFyZC1jb2xvcnMnCisgIDM3ICA0NyAgIHdoaXRlIikKKworKGRlZmNvbnN0IGFuc2ktY29s b3ItYnJpZ2h0LWNvbG9ycy12ZWN0b3IKKyAgW2Fuc2ktY29sb3ItYnJpZ2h0LWJsYWNrCisg ICBhbnNpLWNvbG9yLWJyaWdodC1yZWQKKyAgIGFuc2ktY29sb3ItYnJpZ2h0LWdyZWVuCisg ICBhbnNpLWNvbG9yLWJyaWdodC15ZWxsb3cKKyAgIGFuc2ktY29sb3ItYnJpZ2h0LWJsdWUK KyAgIGFuc2ktY29sb3ItYnJpZ2h0LW1hZ2VudGEKKyAgIGFuc2ktY29sb3ItYnJpZ2h0LWN5 YW4KKyAgIGFuc2ktY29sb3ItYnJpZ2h0LXdoaXRlXQorICAiRmFjZXMgdXNlZCBmb3IgU0dS IGNvbnRyb2wgc2VxdWVuY2VzIGRldGVybWluaW5nIGEgXCJicmlnaHRcIiBjb2xvci4KK1Ro aXMgdmVjdG9yIGhvbGRzIHRoZSBmYWNlcyB1c2VkIGZvciBTR1IgY29udHJvbCBzZXF1ZW5j ZXMgcGFyYW1ldGVycworOTAgdG8gOTcgKGJyaWdodCBmb3JlZ3JvdW5kIGNvbG9ycykgYW5k IDEwMCB0byAxMDcgKGJyaWdodCBiYWNrZ3JvdW5kCitjb2xvcnMpLgorCitQYXJhbWV0ZXIg ICBDb2xvcgorICA5MCAgMTAwICAgYnJpZ2h0IGJsYWNrCisgIDkxICAxMDEgICBicmlnaHQg cmVkCisgIDkyICAxMDIgICBicmlnaHQgZ3JlZW4KKyAgOTMgIDEwMyAgIGJyaWdodCB5ZWxs b3cKKyAgOTQgIDEwNCAgIGJyaWdodCBibHVlCisgIDk1ICAxMDUgICBicmlnaHQgbWFnZW50 YQorICA5NiAgMTA2ICAgYnJpZ2h0IGN5YW4KKyAgOTcgIDEwNyAgIGJyaWdodCB3aGl0ZSIp CisKKyhkZWZjdXN0b20gYW5zaS1jb2xvci1ib2xkLWlzLWJyaWdodCBuaWwKKyAgIklmIHNl dCB0byBub24tbmlsLCBjb21iaW5pbmcgQU5TSSBib2xkIGFuZCBhIGNvbG9yIHByb2R1Y2Vz IHRoZSBicmlnaHQKK3ZlcnNpb24gb2YgdGhhdCBjb2xvci4iCisgIDp0eXBlICdib29sZWFu CisgIDp2ZXJzaW9uICIyOC4xIgogICA6Z3JvdXAgJ2Fuc2ktY29sb3JzKQogCiAoZGVmY29u c3QgYW5zaS1jb2xvci1jb250cm9sLXNlcS1yZWdleHAKQEAgLTMwNCwxMyArNDU4LDE1IEBA IGFuc2ktY29sb3ItZmlsdGVyLWFwcGx5CiAKIChkZWZ1biBhbnNpLWNvbG9yLS1maW5kLWZh Y2UgKGNvZGVzKQogICAiUmV0dXJuIHRoZSBmYWNlIGNvcnJlc3BvbmRpbmcgdG8gQ09ERVMu IgotICAobGV0IChmYWNlcykKKyAgOzsgU29ydCB0aGUgY29kZXMgaW4gYXNjZW5kaW5nIG9y ZGVyIHRvIGd1YXJhbnRlZSB0aGF0ICJib2xkIiBjb21lcyBiZWZvcmUKKyAgOzsgYW55IG9m IHRoZSBjb2xvcnMuICBUaGlzIGVuc3VyZXMgdGhhdCBgYW5zaS1jb2xvci1ib2xkLWlzLWJy aWdodCcgaXMKKyAgOzsgYXBwbGllZCBjb3JyZWN0bHkuCisgIChsZXQgKGZhY2VzIGJyaWdo dCAoY29kZXMgKHNvcnQgKGNvcHktc2VxdWVuY2UgY29kZXMpICMnPCkpKQogICAgICh3aGls ZSBjb2RlcwotICAgICAgKGxldCAoKGZhY2UgKGFuc2ktY29sb3ItZ2V0LWZhY2UtMSAocG9w IGNvZGVzKSkpKQotCTs7IEluIHRoZSAoZGVmYXVsdCB1bmRlcmxpbmUpIGZhY2UsIHNheSwg dGhlIHZhbHVlIG9mIHRoZQotCTs7ICJ1bmRlcmxpbmUiIGF0dHJpYnV0ZSBvZiB0aGUgYGRl ZmF1bHQnIGZhY2Ugd2lucy4KLQkodW5sZXNzIChlcSBmYWNlICdkZWZhdWx0KQotCSAgKHB1 c2ggZmFjZSBmYWNlcykpKSkKKyAgICAgICh3aGVuLWxldCAoKGZhY2UgKGFuc2ktY29sb3It Z2V0LWZhY2UtMSAocG9wIGNvZGVzKSBicmlnaHQpKSkKKyAgICAgICAgKHdoZW4gKGFuZCBh bnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0IChlcSBmYWNlICdhbnNpLWNvbG9yLWJvbGQpKQor ICAgICAgICAgIChzZXRxIGJyaWdodCB0KSkKKyAgICAgICAgKHB1c2ggZmFjZSBmYWNlcykp KQogICAgIDs7IEF2b2lkIHNvbWUgbG9uZy1saXZlZCBjb25zZXMgaW4gdGhlIGNvbW1vbiBj YXNlLgogICAgIChpZiAoY2RyIGZhY2VzKQogCShucmV2ZXJzZSBmYWNlcykKQEAgLTMyMSw5 ICs0NzcsOCBAQCBhbnNpLWNvbG9yLWFwcGx5CiBEZWxldGUgYWxsIG90aGVyIGNvbnRyb2wg c2VxdWVuY2VzIHdpdGhvdXQgcHJvY2Vzc2luZyB0aGVtLgogCiBBcHBsaWVzIFNHUiBjb250 cm9sIHNlcXVlbmNlcyBzZXR0aW5nIGZvcmVncm91bmQgYW5kIGJhY2tncm91bmQgY29sb3Jz Ci10byBTVFJJTkcgdXNpbmcgdGV4dCBwcm9wZXJ0aWVzIGFuZCByZXR1cm5zIHRoZSByZXN1 bHQuICBUaGUgY29sb3JzIHVzZWQKLWFyZSBnaXZlbiBpbiBgYW5zaS1jb2xvci1mYWNlcy12 ZWN0b3InIGFuZCBgYW5zaS1jb2xvci1uYW1lcy12ZWN0b3InLgotU2VlIGZ1bmN0aW9uIGBh bnNpLWNvbG9yLWFwcGx5LXNlcXVlbmNlJyBmb3IgZGV0YWlscy4KK3RvIFNUUklORyB1c2lu ZyB0ZXh0IHByb3BlcnRpZXMgYW5kIHJldHVybnMgdGhlIHJlc3VsdC4gIFNlZSBmdW5jdGlv bgorYGFuc2ktY29sb3ItYXBwbHktc2VxdWVuY2UnIGZvciBkZXRhaWxzLgogCiBFdmVyeSBj YWxsIHRvIHRoaXMgZnVuY3Rpb24gd2lsbCBzZXQgYW5kIHVzZSB0aGUgYnVmZmVyLWxvY2Fs IHZhcmlhYmxlCiBgYW5zaS1jb2xvci1jb250ZXh0JyB0byBzYXZlIHBhcnRpYWwgZXNjYXBl IHNlcXVlbmNlcyBhbmQgY3VycmVudCBhbnNpIGNvZGVzLgpAQCAtNDAyLDggKzU1Nyw3IEBA IGFuc2ktY29sb3ItYXBwbHktb24tcmVnaW9uCiBTR1IgY29udHJvbCBzZXF1ZW5jZXMgYXJl IGFwcGxpZWQgYnkgY2FsbGluZyB0aGUgZnVuY3Rpb24KIHNwZWNpZmllZCBieSBgYW5zaS1j b2xvci1hcHBseS1mYWNlLWZ1bmN0aW9uJy4gIFRoZSBkZWZhdWx0CiBmdW5jdGlvbiBzZXRz IGZvcmVncm91bmQgYW5kIGJhY2tncm91bmQgY29sb3JzIHRvIHRoZSB0ZXh0Ci1iZXR3ZWVu IEJFR0lOIGFuZCBFTkQsIHVzaW5nIG92ZXJsYXlzLiAgVGhlIGNvbG9ycyB1c2VkIGFyZSBn aXZlbgotaW4gYGFuc2ktY29sb3ItZmFjZXMtdmVjdG9yJyBhbmQgYGFuc2ktY29sb3ItbmFt ZXMtdmVjdG9yJy4gIFNlZQorYmV0d2VlbiBCRUdJTiBhbmQgRU5ELCB1c2luZyBvdmVybGF5 cy4gIFNlZSBmdW5jdGlvbgogYGFuc2ktY29sb3ItYXBwbHktc2VxdWVuY2UnIGZvciBkZXRh aWxzLgogCiBFdmVyeSBjYWxsIHRvIHRoaXMgZnVuY3Rpb24gd2lsbCBzZXQgYW5kIHVzZSB0 aGUgYnVmZmVyLWxvY2FsCkBAIC01NzAsMTEgKzcyNCwxMSBAQCBhbnNpLWNvbG9yLWFwcGx5 LXNlcXVlbmNlCiAKIEZvciBlYWNoIG5ldyBjb2RlLCB0aGUgZm9sbG93aW5nIGhhcHBlbnM6 IGlmIGl0IGlzIDEtNywgYWRkIGl0IHRvCiB0aGUgbGlzdCBvZiBjb2RlczsgaWYgaXQgaXMg MjEtMjUgb3IgMjcsIGRlbGV0ZSBhcHByb3ByaWF0ZQotcGFyYW1ldGVycyBmcm9tIHRoZSBs aXN0IG9mIGNvZGVzOyBpZiBpdCBpcyAzMC0zNyByZXNwLiAzOSwgdGhlCi1mb3JlZ3JvdW5k IGNvbG9yIGNvZGUgaXMgcmVwbGFjZWQgb3IgYWRkZWQgcmVzcC4gZGVsZXRlZDsgaWYgaXQK LWlzIDQwLTQ3IHJlc3AuIDQ5LCB0aGUgYmFja2dyb3VuZCBjb2xvciBjb2RlIGlzIHJlcGxh Y2VkIG9yIGFkZGVkCi1yZXNwLiBkZWxldGVkOyBhbnkgb3RoZXIgY29kZSBpcyBkaXNjYXJk ZWQgdG9nZXRoZXIgd2l0aCB0aGUgb2xkCi1jb2Rlcy4JRmluYWxseSwgdGhlIHNvIGNoYW5n ZWQgbGlzdCBvZiBjb2RlcyBpcyByZXR1cm5lZC4iCitwYXJhbWV0ZXJzIGZyb20gdGhlIGxp c3Qgb2YgY29kZXM7IGlmIGl0IGlzIDMwLTM3IChvciA5MC05NykgcmVzcC4gMzksCit0aGUg Zm9yZWdyb3VuZCBjb2xvciBjb2RlIGlzIHJlcGxhY2VkIG9yIGFkZGVkIHJlc3AuIGRlbGV0 ZWQ7IGlmIGl0CitpcyA0MC00NyAob3IgMTAwLTEwNykgcmVzcC4gNDksIHRoZSBiYWNrZ3Jv dW5kIGNvbG9yIGNvZGUgaXMgcmVwbGFjZWQKK29yIGFkZGVkIHJlc3AuIGRlbGV0ZWQ7IGFu eSBvdGhlciBjb2RlIGlzIGRpc2NhcmRlZCB0b2dldGhlciB3aXRoIHRoZQorb2xkIGNvZGVz LiAgRmluYWxseSwgdGhlIHNvIGNoYW5nZWQgbGlzdCBvZiBjb2RlcyBpcyByZXR1cm5lZC4i CiAgIChsZXQgKChuZXctY29kZXMgKGFuc2ktY29sb3ItcGFyc2Utc2VxdWVuY2UgZXNjYXBl LXNlcXVlbmNlKSkpCiAgICAgKHdoaWxlIG5ldy1jb2RlcwogICAgICAgKGxldCogKChuZXcg KHBvcCBuZXctY29kZXMpKQpAQCAtNTkxLDcgKzc0NSw3IEBAIGFuc2ktY29sb3ItYXBwbHkt c2VxdWVuY2UKIAkJCQkJKDIyIChyZW1xIDEgY29kZXMpKQogCQkJCQkoMjUgKHJlbXEgNiBj b2RlcykpCiAJCQkJCShfIGNvZGVzKSkpKSkKLQkJKChvciAzIDQpIChsZXQgKChyIChtb2Qg bmV3IDEwKSkpCisJCSgob3IgMyA0IDkgMTApIChsZXQgKChyIChtb2QgbmV3IDEwKSkpCiAJ CQkgICAgKHVubGVzcyAoPSByIDgpCiAJCQkgICAgICAobGV0IChiZWcpCiAJCQkJKHdoaWxl IChhbmQgY29kZXMgKC89IHEgKC8gKGNhciBjb2RlcykgMTApKSkKQEAgLTYwMyw2OSArNzU3 LDM0IEBAIGFuc2ktY29sb3ItYXBwbHktc2VxdWVuY2UKIAkJKF8gbmlsKSkpKSkKICAgICBj b2RlcykpCiAKLShkZWZ1biBhbnNpLWNvbG9yLW1ha2UtY29sb3ItbWFwICgpCi0gICJDcmVh dGUgYSB2ZWN0b3Igb2YgZmFjZSBkZWZpbml0aW9ucyBhbmQgcmV0dXJuIGl0LgotCi1UaGUg aW5kZXggaW50byB0aGUgdmVjdG9yIGlzIGFuIEFOU0kgY29kZS4gIFNlZSB0aGUgZG9jdW1l bnRhdGlvbiBvZgotYGFuc2ktY29sb3ItbWFwJyBmb3IgYW4gZXhhbXBsZS4KLQotVGhlIGZh Y2UgZGVmaW5pdGlvbnMgYXJlIGJhc2VkIHVwb24gdGhlIHZhcmlhYmxlcwotYGFuc2ktY29s b3ItZmFjZXMtdmVjdG9yJyBhbmQgYGFuc2ktY29sb3ItbmFtZXMtdmVjdG9yJy4iCi0gIChs ZXQgKChtYXAgKG1ha2UtdmVjdG9yIDUwIG5pbCkpCi0gICAgICAgIChpbmRleCAwKSkKLSAg ICA7OyBtaXNjZWxsYW5lb3VzIGF0dHJpYnV0ZXMKLSAgICAobWFwYwotICAgICAobGFtYmRh IChlKQotICAgICAgIChhc2V0IG1hcCBpbmRleCBlKQotICAgICAgIChzZXRxIGluZGV4ICgx KyBpbmRleCkpICkKLSAgICAgYW5zaS1jb2xvci1mYWNlcy12ZWN0b3IpCi0gICAgOzsgZm9y ZWdyb3VuZCBhdHRyaWJ1dGVzCi0gICAgKHNldHEgaW5kZXggMzApCi0gICAgKG1hcGMKLSAg ICAgKGxhbWJkYSAoZSkKLSAgICAgICAoYXNldCBtYXAgaW5kZXgKLSAgICAgICAgICAgICAo YW5zaS1jb2xvci1tYWtlLWZhY2UgJ2ZvcmVncm91bmQKLSAgICAgICAgICAgICAgICAgICAg ICAgICAoaWYgKGNvbnNwIGUpIChjYXIgZSkgZSkpKQotICAgICAgIChzZXRxIGluZGV4ICgx KyBpbmRleCkpICkKLSAgICAgYW5zaS1jb2xvci1uYW1lcy12ZWN0b3IpCi0gICAgOzsgYmFj a2dyb3VuZCBhdHRyaWJ1dGVzCi0gICAgKHNldHEgaW5kZXggNDApCi0gICAgKG1hcGMKLSAg ICAgKGxhbWJkYSAoZSkKLSAgICAgICAoYXNldCBtYXAgaW5kZXgKLSAgICAgICAgICAgICAo YW5zaS1jb2xvci1tYWtlLWZhY2UgJ2JhY2tncm91bmQKLSAgICAgICAgICAgICAgICAgICAg ICAgICAoaWYgKGNvbnNwIGUpIChjZHIgZSkgZSkpKQotICAgICAgIChzZXRxIGluZGV4ICgx KyBpbmRleCkpICkKLSAgICAgYW5zaS1jb2xvci1uYW1lcy12ZWN0b3IpCi0gICAgbWFwKSkK LQotKGRlZnZhciBhbnNpLWNvbG9yLW1hcCAoYW5zaS1jb2xvci1tYWtlLWNvbG9yLW1hcCkK LSAgIkEgYnJhbmQgbmV3IGNvbG9yIG1hcCBzdWl0YWJsZSBmb3IgYGFuc2ktY29sb3ItZ2V0 LWZhY2UnLgotCi1UaGUgdmFsdWUgb2YgdGhpcyB2YXJpYWJsZSBpcyB1c3VhbGx5IGNvbnN0 cnVjdGVkIGJ5Ci1gYW5zaS1jb2xvci1tYWtlLWNvbG9yLW1hcCcuICBUaGUgdmFsdWVzIGlu IHRoZSBhcnJheSBhcmUgc3VjaCB0aGF0IHRoZQotbnVtYmVycyBpbmNsdWRlZCBpbiBhbiBT R1IgY29udHJvbCBzZXF1ZW5jZXMgcG9pbnQgdG8gdGhlIGNvcnJlY3QKLWZvcmVncm91bmQg b3IgYmFja2dyb3VuZCBjb2xvcnMuCi0KLUV4YW1wbGU6IFRoZSBzZXF1ZW5jZSBcXDAzM1sz NG0gc3BlY2lmaWVzIGEgYmx1ZSBmb3JlZ3JvdW5kLiAgVGhlcmVmb3JlOgotICAgICAoYXJl ZiBhbnNpLWNvbG9yLW1hcCAzNCkKLSAgICAgICAgICA9PiAoZm9yZWdyb3VuZC1jb2xvciAu IFwiYmx1ZVwiKSIpCi0KLShkZWZ1biBhbnNpLWNvbG9yLW1hcC11cGRhdGUgKHN5bWJvbCB2 YWx1ZSkKLSAgIlVwZGF0ZSBgYW5zaS1jb2xvci1tYXAnLgotCi1XaGVuZXZlciB0aGUgdmVj dG9ycyB1c2VkIHRvIGNvbnN0cnVjdCBgYW5zaS1jb2xvci1tYXAnIGFyZSBjaGFuZ2VkLAot dGhpcyBmdW5jdGlvbiBpcyBjYWxsZWQuICBUaGVyZWZvcmUgdGhpcyBmdW5jdGlvbiBpcyBs aXN0ZWQgYXMgdGhlIDpzZXQKLXByb3BlcnR5IG9mIGBhbnNpLWNvbG9yLWZhY2VzLXZlY3Rv cicgYW5kIGBhbnNpLWNvbG9yLW5hbWVzLXZlY3RvcicuIgotICAoc2V0LWRlZmF1bHQgc3lt Ym9sIHZhbHVlKQotICAoc2V0cSBhbnNpLWNvbG9yLW1hcCAoYW5zaS1jb2xvci1tYWtlLWNv bG9yLW1hcCkpKQotCi0oZGVmdW4gYW5zaS1jb2xvci1nZXQtZmFjZS0xIChhbnNpLWNvZGUp Ci0gICJHZXQgZmFjZSBkZWZpbml0aW9uIGZyb20gYGFuc2ktY29sb3ItbWFwJy4KLUFOU0kt Q09ERSBpcyB1c2VkIGFzIGFuIGluZGV4IGludG8gdGhlIHZlY3Rvci4iCi0gIChjb25kaXRp b24tY2FzZSBuaWwKLSAgICAgIChhcmVmIGFuc2ktY29sb3ItbWFwIGFuc2ktY29kZSkKLSAg ICAoYXJncy1vdXQtb2YtcmFuZ2UgbmlsKSkpCisoZGVmdW4gYW5zaS1jb2xvci1nZXQtZmFj ZS0xIChhbnNpLWNvZGUgJm9wdGlvbmFsIGJyaWdodCkKKyAgIkdldCBmYWNlIGRlZmluaXRp b24gZm9yIEFOU0ktQ09ERS4KK0JSSUdIVCwgaWYgbm9uLW5pbCwgcmVxdWVzdHMgXCJicmln aHRcIiBBTlNJIGNvbG9ycywgZXZlbiBpZiBBTlNJLUNPREUKK2lzIGEgbm9ybWFsLWludGVu c2l0eSBjb2xvci4iCisgICh3aGVuIChhbmQgYnJpZ2h0ICg8PSAzMCBhbnNpLWNvZGUgNDkp KQorICAgIChzZXRxIGFuc2ktY29kZSAoKyBhbnNpLWNvZGUgNjApKSkKKyAgKGNvbmQgKCg8 PSAwIGFuc2ktY29kZSA3KQorICAgICAgICAgKGFyZWYgYW5zaS1jb2xvci1iYXNpYy1mYWNl cy12ZWN0b3IgYW5zaS1jb2RlKSkKKyAgICAgICAgKCg8PSAzMCBhbnNpLWNvZGUgMzgpCisg ICAgICAgICAobGlzdCA6Zm9yZWdyb3VuZAorICAgICAgICAgICAgICAgKGZhY2UtZm9yZWdy b3VuZAorICAgICAgICAgICAgICAgIChhcmVmIGFuc2ktY29sb3Itbm9ybWFsLWNvbG9ycy12 ZWN0b3IgKC0gYW5zaS1jb2RlIDMwKSkKKyAgICAgICAgICAgICAgICBuaWwgJ2RlZmF1bHQp KSkKKyAgICAgICAgKCg8PSA0MCBhbnNpLWNvZGUgNDgpCisgICAgICAgICAobGlzdCA6YmFj a2dyb3VuZAorICAgICAgICAgICAgICAgKGZhY2UtYmFja2dyb3VuZAorICAgICAgICAgICAg ICAgIChhcmVmIGFuc2ktY29sb3Itbm9ybWFsLWNvbG9ycy12ZWN0b3IgKC0gYW5zaS1jb2Rl IDQwKSkKKyAgICAgICAgICAgICAgICBuaWwgJ2RlZmF1bHQpKSkKKyAgICAgICAgKCg8PSA5 MCBhbnNpLWNvZGUgOTgpCisgICAgICAgICAobGlzdCA6Zm9yZWdyb3VuZAorICAgICAgICAg ICAgICAgKGZhY2UtZm9yZWdyb3VuZAorICAgICAgICAgICAgICAgIChhcmVmIGFuc2ktY29s b3ItYnJpZ2h0LWNvbG9ycy12ZWN0b3IgKC0gYW5zaS1jb2RlIDkwKSkKKyAgICAgICAgICAg ICAgICBuaWwgJ2RlZmF1bHQpKSkKKyAgICAgICAgKCg8PSAxMDAgYW5zaS1jb2RlIDEwOCkK KyAgICAgICAgIChsaXN0IDpiYWNrZ3JvdW5kCisgICAgICAgICAgICAgICAoZmFjZS1iYWNr Z3JvdW5kCisgICAgICAgICAgICAgICAgKGFyZWYgYW5zaS1jb2xvci1icmlnaHQtY29sb3Jz LXZlY3RvciAoLSBhbnNpLWNvZGUgMTAwKSkKKyAgICAgICAgICAgICAgICBuaWwgJ2RlZmF1 bHQpKSkpKQogCiAocHJvdmlkZSAnYW5zaS1jb2xvcikKIApkaWZmIC0tZ2l0IGEvbGlzcC9t YW4uZWwgYi9saXNwL21hbi5lbAppbmRleCA2MDA5YTMxOTE5Li45YWEyN2MzZmQ2IDEwMDY0 NAotLS0gYS9saXNwL21hbi5lbAorKysgYi9saXNwL21hbi5lbApAQCAtMTQxLDEyICsxNDEs NiBAQCBNYW4tcmV2ZXJzZQogICA6Z3JvdXAgJ21hbgogICA6dmVyc2lvbiAiMjQuMyIpCiAK LShkZWZ2YXIgTWFuLWFuc2ktY29sb3ItbWFwIChsZXQgKChhbnNpLWNvbG9yLWZhY2VzLXZl Y3RvcgotCQkJCSAgWyBkZWZhdWx0IE1hbi1vdmVyc3RyaWtlIGRlZmF1bHQgTWFuLXVuZGVy bGluZQotCQkJCSAgICBNYW4tdW5kZXJsaW5lIGRlZmF1bHQgZGVmYXVsdCBNYW4tcmV2ZXJz ZSBdKSkKLQkJCSAgICAgKGFuc2ktY29sb3ItbWFrZS1jb2xvci1tYXApKQotICAiVGhlIHZh bHVlIHVzZWQgaGVyZSBmb3IgYGFuc2ktY29sb3ItbWFwJy4iKQotCiAoZGVmY3VzdG9tIE1h bi1ub3RpZnktbWV0aG9kICdmcmllbmRseQogICAiU2VsZWN0cyB0aGUgYmVoYXZpb3Igd2hl biBtYW5wYWdlIGlzIHJlYWR5LgogVGhpcyB2YXJpYWJsZSBtYXkgaGF2ZSBvbmUgb2YgdGhl IGZvbGxvd2luZyB2YWx1ZXMsIHdoZXJlIChzZikgbWVhbnMKQEAgLTEyNDIsOCArMTIzNiw3 IEBAIE1hbi1mb250aWZ5LW1hbnBhZ2UKICAgKGludGVyYWN0aXZlIG5pbCBtYW4tY29tbW9u KQogICAoZ290by1jaGFyIChwb2ludC1taW4pKQogICA7OyBGb250aWZ5IEFOU0kgZXNjYXBl cy4KLSAgKGxldCAoKGFuc2ktY29sb3ItYXBwbHktZmFjZS1mdW5jdGlvbiAjJ2Fuc2ktY29s b3ItYXBwbHktdGV4dC1wcm9wZXJ0eS1mYWNlKQotCShhbnNpLWNvbG9yLW1hcCBNYW4tYW5z aS1jb2xvci1tYXApKQorICAobGV0ICgoYW5zaS1jb2xvci1hcHBseS1mYWNlLWZ1bmN0aW9u ICMnYW5zaS1jb2xvci1hcHBseS10ZXh0LXByb3BlcnR5LWZhY2UpKQogICAgIChhbnNpLWNv bG9yLWFwcGx5LW9uLXJlZ2lvbiAocG9pbnQtbWluKSAocG9pbnQtbWF4KSkpCiAgIDs7IE90 aGVyIGhpZ2hsaWdodGluZy4KICAgKGxldCAoKGJ1ZmZlci11bmRvLWxpc3QgdCkpCmRpZmYg LS1naXQgYS90ZXN0L2xpc3AvYW5zaS1jb2xvci10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9hbnNp LWNvbG9yLXRlc3RzLmVsCmluZGV4IDEwN2RjOGU0MDAuLmRmNjc0ZGZjN2YgMTAwNjQ0Ci0t LSBhL3Rlc3QvbGlzcC9hbnNpLWNvbG9yLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9hbnNp LWNvbG9yLXRlc3RzLmVsCkBAIC0yNSwxNyArMjUsNTggQEAKIDs7OyBDb2RlOgogCiAocmVx dWlyZSAnYW5zaS1jb2xvcikKKyhldmFsLXdoZW4tY29tcGlsZSAocmVxdWlyZSAnY2wtbGli KSkKIAotKGRlZnZhciB0ZXN0LXN0cmluZ3MgJygoIlxlWzMzbUhlbGxvIFdvcmxkXGVbMG0i IC4gIkhlbGxvIFdvcmxkIikKLSAgICAgICAgICAgICAgICAgICAgICAgKCJcZVsxbVxlWzNt XGVbNW1ib2xkIGl0YWxpY3MgYmxpbmtcZVswbSIgLiAiYm9sZCBpdGFsaWNzIGJsaW5rIikp KQorKGRlZnZhciB5ZWxsb3cgKGZhY2UtZm9yZWdyb3VuZCAnYW5zaS1jb2xvci15ZWxsb3cg bmlsICdkZWZhdWx0KSkKKyhkZWZ2YXIgYnJpZ2h0LXllbGxvdyAoZmFjZS1mb3JlZ3JvdW5k ICdhbnNpLWNvbG9yLWJyaWdodC15ZWxsb3cgbmlsICdkZWZhdWx0KSkKKworKGRlZnZhciB0 ZXN0LXN0cmluZ3MKKyAgYCgoIkhlbGxvIFdvcmxkIiAiSGVsbG8gV29ybGQiKQorICAgICgi XGVbMzNtSGVsbG8gV29ybGRcZVswbSIgIkhlbGxvIFdvcmxkIgorICAgICAoOmZvcmVncm91 bmQgLHllbGxvdykpCisgICAgKCJcZVs0M21IZWxsbyBXb3JsZFxlWzBtIiAiSGVsbG8gV29y bGQiCisgICAgICg6YmFja2dyb3VuZCAseWVsbG93KSkKKyAgICAoIlxlWzkzbUhlbGxvIFdv cmxkXGVbMG0iICJIZWxsbyBXb3JsZCIKKyAgICAgKDpmb3JlZ3JvdW5kICxicmlnaHQteWVs bG93KSkKKyAgICAoIlxlWzEwM21IZWxsbyBXb3JsZFxlWzBtIiAiSGVsbG8gV29ybGQiCisg ICAgICg6YmFja2dyb3VuZCAsYnJpZ2h0LXllbGxvdykpCisgICAgKCJcZVsxOzMzbUhlbGxv IFdvcmxkXGVbMG0iICJIZWxsbyBXb3JsZCIKKyAgICAgKGFuc2ktY29sb3ItYm9sZCAoOmZv cmVncm91bmQgLHllbGxvdykpCisgICAgIChhbnNpLWNvbG9yLWJvbGQgKDpmb3JlZ3JvdW5k ICxicmlnaHQteWVsbG93KSkpCisgICAgKCJcZVszMzsxbUhlbGxvIFdvcmxkXGVbMG0iICJI ZWxsbyBXb3JsZCIKKyAgICAgKGFuc2ktY29sb3ItYm9sZCAoOmZvcmVncm91bmQgLHllbGxv dykpCisgICAgIChhbnNpLWNvbG9yLWJvbGQgKDpmb3JlZ3JvdW5kICxicmlnaHQteWVsbG93 KSkpCisgICAgKCJcZVsxbVxlWzMzbUhlbGxvIFdvcmxkXGVbMG0iICJIZWxsbyBXb3JsZCIK KyAgICAgKGFuc2ktY29sb3ItYm9sZCAoOmZvcmVncm91bmQgLHllbGxvdykpCisgICAgIChh bnNpLWNvbG9yLWJvbGQgKDpmb3JlZ3JvdW5kICxicmlnaHQteWVsbG93KSkpCisgICAgKCJc ZVszM21cZVsxbUhlbGxvIFdvcmxkXGVbMG0iICJIZWxsbyBXb3JsZCIKKyAgICAgKGFuc2kt Y29sb3ItYm9sZCAoOmZvcmVncm91bmQgLHllbGxvdykpCisgICAgIChhbnNpLWNvbG9yLWJv bGQgKDpmb3JlZ3JvdW5kICxicmlnaHQteWVsbG93KSkpCisgICAgKCJcZVsxbVxlWzNtXGVb NW1ib2xkIGl0YWxpY3MgYmxpbmtcZVswbSIgImJvbGQgaXRhbGljcyBibGluayIKKyAgICAg KGFuc2ktY29sb3ItYm9sZCBhbnNpLWNvbG9yLWl0YWxpYyBhbnNpLWNvbG9yLXNsb3ctYmxp bmspKQorICAgICgiXGVbMTBtdW5yZWNvZ25pemVkXGVbMG0iICJ1bnJlY29nbml6ZWQiKSkp CiAKIChlcnQtZGVmdGVzdCBhbnNpLWNvbG9yLWFwcGx5LW9uLXJlZ2lvbi10ZXN0ICgpCi0g ICAgKGRvbGlzdCAocGFpciB0ZXN0LXN0cmluZ3MpCi0gICAgICAod2l0aC10ZW1wLWJ1ZmZl cgotICAgICAgICAoaW5zZXJ0IChjYXIgcGFpcikpCisgIChwY2FzZS1kb2xpc3QgKGAoLGlu cHV0ICx0ZXh0ICxmYWNlKSB0ZXN0LXN0cmluZ3MpCisgICAgKHdpdGgtdGVtcC1idWZmZXIK KyAgICAgIChpbnNlcnQgaW5wdXQpCisgICAgICAoYW5zaS1jb2xvci1hcHBseS1vbi1yZWdp b24gKHBvaW50LW1pbikgKHBvaW50LW1heCkpCisgICAgICAoc2hvdWxkIChlcXVhbCAoYnVm ZmVyLXN0cmluZykgdGV4dCkpCisgICAgICAoc2hvdWxkIChlcXVhbCAoZ2V0LWNoYXItcHJv cGVydHkgKHBvaW50LW1pbikgJ2ZhY2UpIGZhY2UpKQorICAgICAgKHdoZW4gZmFjZQorICAg ICAgICAoc2hvdWxkIChub3QgKGVxdWFsIChvdmVybGF5cy1hdCAocG9pbnQtbWluKSkgbmls KSkpKSkpKQorCisoZXJ0LWRlZnRlc3QgYW5zaS1jb2xvci1hcHBseS1vbi1yZWdpb24tYm9s ZC1pcy1icmlnaHQtdGVzdCAoKQorICAocGNhc2UtZG9saXN0IChgKCxpbnB1dCAsdGV4dCAs bm9ybWFsLWZhY2UgLGJyaWdodC1mYWNlKSB0ZXN0LXN0cmluZ3MpCisgICAgKHdpdGgtdGVt cC1idWZmZXIKKyAgICAgIChsZXQgKChhbnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0IHQpCisg ICAgICAgICAgICAoZmFjZSAob3IgYnJpZ2h0LWZhY2Ugbm9ybWFsLWZhY2UpKSkKKyAgICAg ICAgKGluc2VydCBpbnB1dCkKICAgICAgICAgKGFuc2ktY29sb3ItYXBwbHktb24tcmVnaW9u IChwb2ludC1taW4pIChwb2ludC1tYXgpKQotICAgICAgICAoc2hvdWxkIChlcXVhbCAoYnVm ZmVyLXN0cmluZykgKGNkciBwYWlyKSkpCi0gICAgICAgIChzaG91bGQgKG5vdCAoZXF1YWwg KG92ZXJsYXlzLWF0IChwb2ludC1taW4pKSBuaWwpKSkpKSkKKyAgICAgICAgKHNob3VsZCAo ZXF1YWwgKGJ1ZmZlci1zdHJpbmcpIHRleHQpKQorICAgICAgICAoc2hvdWxkIChlcXVhbCAo Z2V0LWNoYXItcHJvcGVydHkgKHBvaW50LW1pbikgJ2ZhY2UpIGZhY2UpKQorICAgICAgICAo d2hlbiBmYWNlCisgICAgICAgICAgKHNob3VsZCAobm90IChlcXVhbCAob3ZlcmxheXMtYXQg KHBvaW50LW1pbikpIG5pbCkpKSkpKSkpCiAKIChlcnQtZGVmdGVzdCBhbnNpLWNvbG9yLWFw cGx5LW9uLXJlZ2lvbi1wcmVzZXJ2aW5nLXRlc3QgKCkKICAgICAoZG9saXN0IChwYWlyIHRl c3Qtc3RyaW5ncykKLS0gCjIuMjUuMQoK --------------B46408E9A6DA1B106410C7A4 Content-Type: text/plain; charset=UTF-8; name="0002-Add-support-for-bright-ANSI-colors-in-term-mode.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0002-Add-support-for-bright-ANSI-colors-in-term-mode.patch" RnJvbSAxMTNkOWY4ZDJkZjdiNTg2NTU4NTBjYTllMGEwNThhNTViZDM2NjE5IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFdlZCwgMjIgU2VwIDIwMjEgMTI6MDk6MDMgLTA3MDAKU3ViamVjdDogW1BB VENIIDIvMl0gQWRkIHN1cHBvcnQgZm9yICJicmlnaHQiIEFOU0kgY29sb3JzIGluIHRlcm0t bW9kZQoKKiBsaXN0L3Rlcm0uZWwgKGFuc2ktdGVybS1jb2xvci12ZWN0b3IpOiBBZGQgbmV3 IGZhY2VzLgoodGVybS1jb2xvci1ibGFjaywgdGVybS1jb2xvci1yZWQsIHRlcm0tY29sb3It Z3JlZW4sIHRlcm0tY29sb3IteWVsbG93KQoodGVybS1jb2xvci1ibHVlLCB0ZXJtLWNvbG9y LW1hZ2VudGEsIHRlcm0tY29sb3ItY3lhbiwgdGVybS1jb2xvci13aGl0ZSk6CkluaGVyaXQg ZnJvbSAnYW5zaS1jb2xvci1DT0xPUicuCih0ZXJtLWNvbG9yLWJyaWdodC1ibGFjaywgdGVy bS1jb2xvci1icmlnaHQtcmVkLCB0ZXJtLWNvbG9yLWJyaWdodC1ncmVlbikKKHRlcm0tY29s b3ItYnJpZ2h0LXllbGxvdywgdGVybS1jb2xvci1icmlnaHQtYmx1ZSkKKHRlcm0tY29sb3It YnJpZ2h0LW1hZ2VudGEsIHRlcm0tY29sb3ItYnJpZ2h0LWN5YW4pCih0ZXJtLWNvbG9yLWJy aWdodC13aGl0ZSk6IE5ldyBmYWNlcy4KKHRlcm0tLW1heWJlLWJyaWdodGVuLWNvbG9yKTog TmV3IGZ1bmN0aW9uLgoodGVybS1oYW5kbGUtY29sb3JzLWFycmF5KTogSGFuZGxlIGJyaWdo dCBjb2xvcnMuCiogdGVzdC9saXNwL3Rlcm0tdGVzdHMuZWwgKHRlcm0tY29sb3JzLCB0ZXJt LWNvbG9ycy1ib2xkLWlzLWJyaWdodCk6Ck5ldyBmdW5jdGlvbnMuCi0tLQogZXRjL05FV1Mg ICAgICAgICAgICAgICAgfCAgIDcgKysKIGxpc3AvdGVybS5lbCAgICAgICAgICAgIHwgMTg2 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIHRlc3QvbGlzcC90 ZXJtLXRlc3RzLmVsIHwgIDY1ICsrKysrKysrKysrKystCiAzIGZpbGVzIGNoYW5nZWQsIDIw OCBpbnNlcnRpb25zKCspLCA1MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ldGMvTkVX UyBiL2V0Yy9ORVdTCmluZGV4IGNmNjgyM2Y1MWIuLjI3YzY5OTZiYjMgMTAwNjQ0Ci0tLSBh L2V0Yy9ORVdTCisrKyBiL2V0Yy9ORVdTCkBAIC0xNTA4LDYgKzE1MDgsMTMgQEAgYmFzZWQg b24gdGhlIGN1cnJlbnQgd2luZG93IHNpemUuICBJbiBwcmV2aW91cyB2ZXJzaW9ucyBvZiBF bWFjcywgdGhpcwogd2FzIGFsd2F5cyBkb25lIChhbmQgdGhhdCBjb3VsZCBsZWFkIHRvIG9k ZCBkaXNwbGF5cyB3aGVuIHJlc2l6aW5nIHRoZQogd2luZG93IGFmdGVyIHN0YXJ0aW5nKS4g IFRoaXMgdmFyaWFibGUgZGVmYXVsdHMgdG8gbmlsLgogCistLS0KKyoqKiAndGVybS1tb2Rl JyBub3cgc3VwcG9ydHMgImJyaWdodCIgY29sb3IgY29kZXMuCisiQnJpZ2h0IiBBTlNJIGNv bG9yIGNvZGVzIGFyZSBub3cgZGlzcGxheWVkIHVzaW5nIHRoZSBjb2xvciB2YWx1ZXMKK2Rl ZmluZWQgaW4gJ3Rlcm0tY29sb3ItYnJpZ2h0LSonLiAgSW4gYWRkaXRpb24sIGJvbGQgdGV4 dCB3aXRoIHJlZ3VsYXIKK0FOU0kgY29sb3JzIGNhbiBiZSBkaXNwbGF5ZWQgYXMgImJyaWdo dCIgaWYgJ2Fuc2ktY29sb3ItYm9sZC1pcy1icmlnaHQnCitpcyBub24tbmlsLgorCiAqKiBF c2hlbGwKIAogLS0tCmRpZmYgLS1naXQgYS9saXNwL3Rlcm0uZWwgYi9saXNwL3Rlcm0uZWwK aW5kZXggYWY5MzA4OTEwNC4uZjU3ZmNjOGNkNSAxMDA2NDQKLS0tIGEvbGlzcC90ZXJtLmVs CisrKyBiL2xpc3AvdGVybS5lbApAQCAtNzI3LDcgKzcyNywxNSBAQCBhbnNpLXRlcm0tY29s b3ItdmVjdG9yCiAgICB0ZXJtLWNvbG9yLWJsdWUKICAgIHRlcm0tY29sb3ItbWFnZW50YQog ICAgdGVybS1jb2xvci1jeWFuCi0gICB0ZXJtLWNvbG9yLXdoaXRlXSkKKyAgIHRlcm0tY29s b3Itd2hpdGUKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LWJsYWNrCisgICB0ZXJtLWNvbG9yLWJy aWdodC1yZWQKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LWdyZWVuCisgICB0ZXJtLWNvbG9yLWJy aWdodC15ZWxsb3cKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LWJsdWUKKyAgIHRlcm0tY29sb3It YnJpZ2h0LW1hZ2VudGEKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LWN5YW4KKyAgIHRlcm0tY29s b3ItYnJpZ2h0LXdoaXRlXSkKIAogKGRlZmN1c3RvbSB0ZXJtLWRlZmF1bHQtZmctY29sb3Ig bmlsCiAgICJJZiBub24tbmlsLCBkZWZhdWx0IGNvbG9yIGZvciBmb3JlZ3JvdW5kIGluIFRl cm0gbW9kZS4iCkBAIC03NTIsNTUgKzc2MCwxMTIgQEAgdGVybQogICA6Z3JvdXAgJ3Rlcm0p CiAKIChkZWZmYWNlIHRlcm0tYm9sZAotICAnKCh0IDpib2xkIHQpKQorICAnKCh0IDppbmhl cml0IGFuc2ktY29sb3ItYm9sZCkpCiAgICJEZWZhdWx0IGZhY2UgdG8gdXNlIGZvciBib2xk IHRleHQuIgotICA6Z3JvdXAgJ3Rlcm0pCisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAi MjguMSIpCiAKIChkZWZmYWNlIHRlcm0tdW5kZXJsaW5lCi0gICcoKHQgOnVuZGVybGluZSB0 KSkKKyAgJygodCA6aW5oZXJpdCBhbnNpLWNvbG9yLXVuZGVybGluZSkpCiAgICJEZWZhdWx0 IGZhY2UgdG8gdXNlIGZvciB1bmRlcmxpbmVkIHRleHQuIgotICA6Z3JvdXAgJ3Rlcm0pCisg IDpncm91cCAndGVybQorICA6dmVyc2lvbiAiMjguMSIpCiAKIChkZWZmYWNlIHRlcm0tY29s b3ItYmxhY2sKLSAgJygodCA6Zm9yZWdyb3VuZCAiYmxhY2siIDpiYWNrZ3JvdW5kICJibGFj ayIpKQorICAnKCh0IDppbmhlcml0IGFuc2ktY29sb3ItYmxhY2spKQogICAiRmFjZSB1c2Vk IHRvIHJlbmRlciBibGFjayBjb2xvciBjb2RlLiIKLSAgOmdyb3VwICd0ZXJtKQorICA6Z3Jv dXAgJ3Rlcm0KKyAgOnZlcnNpb24gIjI4LjEiKQogCiAoZGVmZmFjZSB0ZXJtLWNvbG9yLXJl ZAotICAnKCh0IDpmb3JlZ3JvdW5kICJyZWQzIiA6YmFja2dyb3VuZCAicmVkMyIpKQorICAn KCh0IDppbmhlcml0IGFuc2ktY29sb3ItcmVkKSkKICAgIkZhY2UgdXNlZCB0byByZW5kZXIg cmVkIGNvbG9yIGNvZGUuIgotICA6Z3JvdXAgJ3Rlcm0pCisgIDpncm91cCAndGVybQorICA6 dmVyc2lvbiAiMjguMSIpCiAKIChkZWZmYWNlIHRlcm0tY29sb3ItZ3JlZW4KLSAgJygodCA6 Zm9yZWdyb3VuZCAiZ3JlZW4zIiA6YmFja2dyb3VuZCAiZ3JlZW4zIikpCisgICcoKHQgOmlu aGVyaXQgYW5zaS1jb2xvci1ncmVlbikpCiAgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGdyZWVu IGNvbG9yIGNvZGUuIgotICA6Z3JvdXAgJ3Rlcm0pCisgIDpncm91cCAndGVybQorICA6dmVy c2lvbiAiMjguMSIpCiAKIChkZWZmYWNlIHRlcm0tY29sb3IteWVsbG93Ci0gICcoKHQgOmZv cmVncm91bmQgInllbGxvdzMiIDpiYWNrZ3JvdW5kICJ5ZWxsb3czIikpCisgICcoKHQgOmlu aGVyaXQgYW5zaS1jb2xvci15ZWxsb3cpKQogICAiRmFjZSB1c2VkIHRvIHJlbmRlciB5ZWxs b3cgY29sb3IgY29kZS4iCi0gIDpncm91cCAndGVybSkKKyAgOmdyb3VwICd0ZXJtCisgIDp2 ZXJzaW9uICIyOC4xIikKIAogKGRlZmZhY2UgdGVybS1jb2xvci1ibHVlCi0gICcoKHQgOmZv cmVncm91bmQgImJsdWUyIiA6YmFja2dyb3VuZCAiYmx1ZTIiKSkKKyAgJygodCA6aW5oZXJp dCBhbnNpLWNvbG9yLWJsdWUpKQogICAiRmFjZSB1c2VkIHRvIHJlbmRlciBibHVlIGNvbG9y IGNvZGUuIgotICA6Z3JvdXAgJ3Rlcm0pCisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAi MjguMSIpCiAKIChkZWZmYWNlIHRlcm0tY29sb3ItbWFnZW50YQotICAnKCh0IDpmb3JlZ3Jv dW5kICJtYWdlbnRhMyIgOmJhY2tncm91bmQgIm1hZ2VudGEzIikpCisgICcoKHQgOmluaGVy aXQgYW5zaS1jb2xvci1tYWdlbnRhKSkKICAgIkZhY2UgdXNlZCB0byByZW5kZXIgbWFnZW50 YSBjb2xvciBjb2RlLiIKLSAgOmdyb3VwICd0ZXJtKQorICA6Z3JvdXAgJ3Rlcm0KKyAgOnZl cnNpb24gIjI4LjEiKQogCiAoZGVmZmFjZSB0ZXJtLWNvbG9yLWN5YW4KLSAgJygodCA6Zm9y ZWdyb3VuZCAiY3lhbjMiIDpiYWNrZ3JvdW5kICJjeWFuMyIpKQorICAnKCh0IDppbmhlcml0 IGFuc2ktY29sb3ItY3lhbikpCiAgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGN5YW4gY29sb3Ig Y29kZS4iCi0gIDpncm91cCAndGVybSkKKyAgOmdyb3VwICd0ZXJtCisgIDp2ZXJzaW9uICIy OC4xIikKIAogKGRlZmZhY2UgdGVybS1jb2xvci13aGl0ZQotICAnKCh0IDpmb3JlZ3JvdW5k ICJ3aGl0ZSIgOmJhY2tncm91bmQgIndoaXRlIikpCisgICcoKHQgOmluaGVyaXQgYW5zaS1j b2xvci13aGl0ZSkpCiAgICJGYWNlIHVzZWQgdG8gcmVuZGVyIHdoaXRlIGNvbG9yIGNvZGUu IgorICA6Z3JvdXAgJ3Rlcm0KKyAgOnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSB0ZXJt LWNvbG9yLWJyaWdodC1ibGFjaworICAnKCh0IDppbmhlcml0IGFuc2ktY29sb3ItYnJpZ2h0 LWJsYWNrKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgYnJpZ2h0IGJsYWNrIGNvbG9yIGNv ZGUuIgorICA6Z3JvdXAgJ3Rlcm0KKyAgOnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSB0 ZXJtLWNvbG9yLWJyaWdodC1yZWQKKyAgJygodCA6aW5oZXJpdCBhbnNpLWNvbG9yLWJyaWdo dC1yZWQpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgcmVkIGNvbG9yIGNvZGUu IgorICA6Z3JvdXAgJ3Rlcm0KKyAgOnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSB0ZXJt LWNvbG9yLWJyaWdodC1ncmVlbgorICAnKCh0IDppbmhlcml0IGFuc2ktY29sb3ItYnJpZ2h0 LWdyZWVuKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgYnJpZ2h0IGdyZWVuIGNvbG9yIGNv ZGUuIgorICA6Z3JvdXAgJ3Rlcm0KKyAgOnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSB0 ZXJtLWNvbG9yLWJyaWdodC15ZWxsb3cKKyAgJygodCA6aW5oZXJpdCBhbnNpLWNvbG9yLWJy aWdodC15ZWxsb3cpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgeWVsbG93IGNv bG9yIGNvZGUuIgogICA6Z3JvdXAgJ3Rlcm0pCiAKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJp Z2h0LWJsdWUKKyAgJygodCA6aW5oZXJpdCBhbnNpLWNvbG9yLWJyaWdodC1ibHVlKSkKKyAg IkZhY2UgdXNlZCB0byByZW5kZXIgYnJpZ2h0IGJsdWUgY29sb3IgY29kZS4iCisgIDpncm91 cCAndGVybQorICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJp Z2h0LW1hZ2VudGEKKyAgJygodCA6aW5oZXJpdCBhbnNpLWNvbG9yLWJyaWdodC1tYWdlbnRh KSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgYnJpZ2h0IG1hZ2VudGEgY29sb3IgY29kZS4i CisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIHRlcm0t Y29sb3ItYnJpZ2h0LWN5YW4KKyAgJygodCA6aW5oZXJpdCBhbnNpLWNvbG9yLWJyaWdodC1j eWFuKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgYnJpZ2h0IGN5YW4gY29sb3IgY29kZS4i CisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIHRlcm0t Y29sb3ItYnJpZ2h0LXdoaXRlCisgICcoKHQgOmluaGVyaXQgYW5zaS1jb2xvci1icmlnaHQt d2hpdGUpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgd2hpdGUgY29sb3IgY29k ZS4iCisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAiMjguMSIpCisKIChkZWZjdXN0b20g dGVybS1idWZmZXItbWF4aW11bS1zaXplIDgxOTIKICAgIlRoZSBtYXhpbXVtIHNpemUgaW4g bGluZXMgZm9yIHRlcm0gYnVmZmVycy4KIFRlcm0gYnVmZmVycyBhcmUgdHJ1bmNhdGVkIGZy b20gdGhlIHRvcCB0byBiZSBubyBncmVhdGVyIHRoYW4gdGhpcyBudW1iZXIuCkBAIC0zMjIz LDYgKzMyODgsMTUgQEAgdGVybS1yZXNldC10ZXJtaW5hbAogICA7OyBGSVhNRTogTm8gaWRl YSB3aHkgdGhpcyBpcyBoZXJlLCBpdCBsb29rcyB3cm9uZy4gIC0tU3RlZgogICAoc2V0cSB0 ZXJtLWFuc2ktZmFjZS1hbHJlYWR5LWRvbmUgbmlsKSkKIAorKGRlZnVuIHRlcm0tLW1heWJl LWJyaWdodGVuLWNvbG9yIChjb2xvciBib2xkKQorICAiUG9zc2libHkgY29udmVydCBDT0xP UiB0byBpdHMgYnJpZ2h0IHZhcmlhbnQuCitDT0xPUiBpcyBhbiBpbmRleCBpbnRvIGBhbnNp LXRlcm0tY29sb3ItdmVjdG9yJy4gIElmIEJPTEQgYW5kCitgYW5zaS1jb2xvci1ib2xkLWlz LWJyaWdodCcgYXJlIG5vbi1uaWwgYW5kIENPTE9SIGlzIGEgcmVndWxhciBjb2xvciwKK3Jl dHVybiB0aGUgYnJpZ2h0IHZlcnNpb24gb2YgQ09MT1I7IG90aGVyd2lzZSwgcmV0dXJuIENP TE9SLiIKKyAgKGlmIChhbmQgYW5zaS1jb2xvci1ib2xkLWlzLWJyaWdodCBib2xkICg8PSAx IGNvbG9yIDgpKQorICAgICAgKCsgY29sb3IgOCkKKyAgICBjb2xvcikpCisKIDs7IE5ldyBm dW5jdGlvbiB0byBkZWFsIHdpdGggYW5zaSBjb2xvcml6ZWQgb3V0cHV0LCBhcyB5b3UgY2Fu IHNlZSB5b3UgY2FuCiA7OyBoYXZlIGFueSBib2xkL3VuZGVybGluZS9mZy9iZy9yZXZlcnNl IGNvbWJpbmF0aW9uLiAtbW0KIApAQCAtMzI2Miw2ICszMzM2LDEwIEBAIHRlcm0taGFuZGxl LWNvbG9ycy1hcnJheQogICAgKChhbmQgKD49IHBhcmFtZXRlciAzMCkgKDw9IHBhcmFtZXRl ciAzNykpCiAgICAgKHNldHEgdGVybS1hbnNpLWN1cnJlbnQtY29sb3IgKC0gcGFyYW1ldGVy IDI5KSkpCiAKKyAgIDs7IEJyaWdodCBmb3JlZ3JvdW5kCisgICAoKGFuZCAoPj0gcGFyYW1l dGVyIDkwKSAoPD0gcGFyYW1ldGVyIDk3KSkKKyAgICAoc2V0cSB0ZXJtLWFuc2ktY3VycmVu dC1jb2xvciAoLSBwYXJhbWV0ZXIgODEpKSkKKwogICAgOzsgUmVzZXQgZm9yZWdyb3VuZAog ICAgKChlcSBwYXJhbWV0ZXIgMzkpCiAgICAgKHNldHEgdGVybS1hbnNpLWN1cnJlbnQtY29s b3IgMCkpCkBAIC0zMjcwLDYgKzMzNDgsMTAgQEAgdGVybS1oYW5kbGUtY29sb3JzLWFycmF5 CiAgICAoKGFuZCAoPj0gcGFyYW1ldGVyIDQwKSAoPD0gcGFyYW1ldGVyIDQ3KSkKICAgICAo c2V0cSB0ZXJtLWFuc2ktY3VycmVudC1iZy1jb2xvciAoLSBwYXJhbWV0ZXIgMzkpKSkKIAor ICAgOzsgQnJpZ2h0IGZvcmVncm91bmQKKyAgICgoYW5kICg+PSBwYXJhbWV0ZXIgMTAwKSAo PD0gcGFyYW1ldGVyIDEwNykpCisgICAgKHNldHEgdGVybS1hbnNpLWN1cnJlbnQtYmctY29s b3IgKC0gcGFyYW1ldGVyIDkxKSkpCisKICAgIDs7IFJlc2V0IGJhY2tncm91bmQKICAgICgo ZXEgcGFyYW1ldGVyIDQ5KQogICAgIChzZXRxIHRlcm0tYW5zaS1jdXJyZW50LWJnLWNvbG9y IDApKQpAQCAtMzI4OCwzNyArMzM3MCw0MyBAQCB0ZXJtLWhhbmRsZS1jb2xvcnMtYXJyYXkK ICAgOzsgICAgICAgICAgdGVybS1hbnNpLWN1cnJlbnQtYmctY29sb3IpCiAKICAgKHVubGVz cyB0ZXJtLWFuc2ktZmFjZS1hbHJlYWR5LWRvbmUKLSAgICAoaWYgdGVybS1hbnNpLWN1cnJl bnQtaW52aXNpYmxlCi0gICAgICAgIChsZXQgKChjb2xvcgotICAgICAgICAgICAgICAgKGlm IHRlcm0tYW5zaS1jdXJyZW50LXJldmVyc2UKLSAgICAgICAgICAgICAgICAgICAoZmFjZS1m b3JlZ3JvdW5kCi0gICAgICAgICAgICAgICAgICAgIChlbHQgYW5zaS10ZXJtLWNvbG9yLXZl Y3RvciB0ZXJtLWFuc2ktY3VycmVudC1jb2xvcikKLSAgICAgICAgICAgICAgICAgICAgbmls ICdkZWZhdWx0KQotICAgICAgICAgICAgICAgICAoZmFjZS1iYWNrZ3JvdW5kCi0gICAgICAg ICAgICAgICAgICAoZWx0IGFuc2ktdGVybS1jb2xvci12ZWN0b3IgdGVybS1hbnNpLWN1cnJl bnQtYmctY29sb3IpCi0gICAgICAgICAgICAgICAgICBuaWwgJ2RlZmF1bHQpKSkpCi0gICAg ICAgICAgKHNldHEgdGVybS1jdXJyZW50LWZhY2UKLSAgICAgICAgICAgICAgICAobGlzdCA6 YmFja2dyb3VuZCBjb2xvcgotICAgICAgICAgICAgICAgICAgICAgIDpmb3JlZ3JvdW5kIGNv bG9yKSkKLSAgICAgICAgICApIDs7IE5vIG5lZWQgdG8gYm90aGVyIHdpdGggYW55dGhpbmcg ZWxzZSBpZiBpdCdzIGludmlzaWJsZS4KLSAgICAgIChzZXRxIHRlcm0tY3VycmVudC1mYWNl Ci0gICAgICAgICAgICAobGlzdCA6Zm9yZWdyb3VuZAotICAgICAgICAgICAgICAgICAgKGZh Y2UtZm9yZWdyb3VuZAotICAgICAgICAgICAgICAgICAgIChlbHQgYW5zaS10ZXJtLWNvbG9y LXZlY3RvciB0ZXJtLWFuc2ktY3VycmVudC1jb2xvcikKLSAgICAgICAgICAgICAgICAgICBu aWwgJ2RlZmF1bHQpCi0gICAgICAgICAgICAgICAgICA6YmFja2dyb3VuZAotICAgICAgICAg ICAgICAgICAgKGZhY2UtYmFja2dyb3VuZAotICAgICAgICAgICAgICAgICAgIChlbHQgYW5z aS10ZXJtLWNvbG9yLXZlY3RvciB0ZXJtLWFuc2ktY3VycmVudC1iZy1jb2xvcikKLSAgICAg ICAgICAgICAgICAgICBuaWwgJ2RlZmF1bHQpCi0gICAgICAgICAgICAgICAgICA6aW52ZXJz ZS12aWRlbyB0ZXJtLWFuc2ktY3VycmVudC1yZXZlcnNlKSkKLQotICAgICAgKHdoZW4gdGVy bS1hbnNpLWN1cnJlbnQtYm9sZAorICAgIChsZXQgKChjdXJyZW50LWNvbG9yICh0ZXJtLS1t YXliZS1icmlnaHRlbi1jb2xvcgorICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXJtLWFu c2ktY3VycmVudC1jb2xvcgorICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXJtLWFuc2kt Y3VycmVudC1ib2xkKSkKKyAgICAgICAgICAoY3VycmVudC1iZy1jb2xvciAodGVybS0tbWF5 YmUtYnJpZ2h0ZW4tY29sb3IKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGVybS1h bnNpLWN1cnJlbnQtYmctY29sb3IKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGVy bS1hbnNpLWN1cnJlbnQtYm9sZCkpKQorICAgICAgKGlmIHRlcm0tYW5zaS1jdXJyZW50LWlu dmlzaWJsZQorICAgICAgICAgIChsZXQgKChjb2xvcgorICAgICAgICAgICAgICAgICAoaWYg dGVybS1hbnNpLWN1cnJlbnQtcmV2ZXJzZQorICAgICAgICAgICAgICAgICAgICAgKGZhY2Ut Zm9yZWdyb3VuZAorICAgICAgICAgICAgICAgICAgICAgIChlbHQgYW5zaS10ZXJtLWNvbG9y LXZlY3RvciBjdXJyZW50LWNvbG9yKQorICAgICAgICAgICAgICAgICAgICAgIG5pbCAnZGVm YXVsdCkKKyAgICAgICAgICAgICAgICAgICAoZmFjZS1iYWNrZ3JvdW5kCisgICAgICAgICAg ICAgICAgICAgIChlbHQgYW5zaS10ZXJtLWNvbG9yLXZlY3RvciBjdXJyZW50LWJnLWNvbG9y KQorICAgICAgICAgICAgICAgICAgICBuaWwgJ2RlZmF1bHQpKSkpCisgICAgICAgICAgICAo c2V0cSB0ZXJtLWN1cnJlbnQtZmFjZQorICAgICAgICAgICAgICAgICAgKGxpc3QgOmJhY2tn cm91bmQgY29sb3IKKyAgICAgICAgICAgICAgICAgICAgICAgIDpmb3JlZ3JvdW5kIGNvbG9y KSkKKyAgICAgICAgICAgICkgOzsgTm8gbmVlZCB0byBib3RoZXIgd2l0aCBhbnl0aGluZyBl bHNlIGlmIGl0J3MgaW52aXNpYmxlLgogICAgICAgICAoc2V0cSB0ZXJtLWN1cnJlbnQtZmFj ZQotICAgICAgICAgICAgICBgKCx0ZXJtLWN1cnJlbnQtZmFjZSA6aW5oZXJpdCB0ZXJtLWJv bGQpKSkKKyAgICAgICAgICAgICAgKGxpc3QgOmZvcmVncm91bmQKKyAgICAgICAgICAgICAg ICAgICAgKGZhY2UtZm9yZWdyb3VuZAorICAgICAgICAgICAgICAgICAgICAgKGVsdCBhbnNp LXRlcm0tY29sb3ItdmVjdG9yIGN1cnJlbnQtY29sb3IpCisgICAgICAgICAgICAgICAgICAg ICBuaWwgJ2RlZmF1bHQpCisgICAgICAgICAgICAgICAgICAgIDpiYWNrZ3JvdW5kCisgICAg ICAgICAgICAgICAgICAgIChmYWNlLWJhY2tncm91bmQKKyAgICAgICAgICAgICAgICAgICAg IChlbHQgYW5zaS10ZXJtLWNvbG9yLXZlY3RvciBjdXJyZW50LWJnLWNvbG9yKQorICAgICAg ICAgICAgICAgICAgICAgbmlsICdkZWZhdWx0KQorICAgICAgICAgICAgICAgICAgICA6aW52 ZXJzZS12aWRlbyB0ZXJtLWFuc2ktY3VycmVudC1yZXZlcnNlKSkKKworICAgICAgICAod2hl biB0ZXJtLWFuc2ktY3VycmVudC1ib2xkCisgICAgICAgICAgKHNldHEgdGVybS1jdXJyZW50 LWZhY2UKKyAgICAgICAgICAgICAgICBgKCx0ZXJtLWN1cnJlbnQtZmFjZSA6aW5oZXJpdCB0 ZXJtLWJvbGQpKSkKIAotICAgICAgKHdoZW4gdGVybS1hbnNpLWN1cnJlbnQtdW5kZXJsaW5l Ci0gICAgICAgIChzZXRxIHRlcm0tY3VycmVudC1mYWNlCi0gICAgICAgICAgICAgIGAoLHRl cm0tY3VycmVudC1mYWNlIDppbmhlcml0IHRlcm0tdW5kZXJsaW5lKSkpKSkKKyAgICAgICAg KHdoZW4gdGVybS1hbnNpLWN1cnJlbnQtdW5kZXJsaW5lCisgICAgICAgICAgKHNldHEgdGVy bS1jdXJyZW50LWZhY2UKKyAgICAgICAgICAgICAgICBgKCx0ZXJtLWN1cnJlbnQtZmFjZSA6 aW5oZXJpdCB0ZXJtLXVuZGVybGluZSkpKSkpKQogCiAgIDs7CShtZXNzYWdlICJEZWJ1ZyAl UyIgdGVybS1jdXJyZW50LWZhY2UpCiAgIDs7IEZJWE1FOiBzaG91bGRuJ3Qgd2Ugc2V0IHRl cm0tYW5zaS1mYWNlLWFscmVhZHktZG9uZSB0byB0IGhlcmU/ICAtLVN0ZWYKZGlmZiAtLWdp dCBhL3Rlc3QvbGlzcC90ZXJtLXRlc3RzLmVsIGIvdGVzdC9saXNwL3Rlcm0tdGVzdHMuZWwK aW5kZXggNTBhYzM3MGI1Yi4uOTZiNmQ3MzQ4OCAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL3Rl cm0tdGVzdHMuZWwKKysrIGIvdGVzdC9saXNwL3Rlcm0tdGVzdHMuZWwKQEAgLTI4LDYgKzI4 LDUxIEBACiAoZGVmdmFyIHRlcm0taGVpZ2h0KSAgICAgICAgICAgICAgICAgICAgOyBOdW1i ZXIgb2YgbGluZXMgaW4gd2luZG93LgogKGRlZnZhciB0ZXJtLXdpZHRoKSAgICAgICAgICAg ICAgICAgICAgIDsgTnVtYmVyIG9mIGNvbHVtbnMgaW4gd2luZG93LgogCisoZGVmdmFyIHll bGxvdy1mZy1wcm9wcworICBgKCA6Zm9yZWdyb3VuZCAsKGZhY2UtZm9yZWdyb3VuZCAndGVy bS1jb2xvci15ZWxsb3cgbmlsICdkZWZhdWx0KQorICAgICA6YmFja2dyb3VuZCAidW5zcGVj aWZpZWQtYmciIDppbnZlcnNlLXZpZGVvIG5pbCkpCisoZGVmdmFyIHllbGxvdy1iZy1wcm9w cworICBgKCA6Zm9yZWdyb3VuZCAidW5zcGVjaWZpZWQtZmciCisgICAgIDpiYWNrZ3JvdW5k ICwoZmFjZS1iYWNrZ3JvdW5kICd0ZXJtLWNvbG9yLXllbGxvdyBuaWwgJ2RlZmF1bHQpCisg ICAgIDppbnZlcnNlLXZpZGVvIG5pbCkpCisoZGVmdmFyIGJyaWdodC15ZWxsb3ctZmctcHJv cHMKKyAgYCggOmZvcmVncm91bmQgLChmYWNlLWZvcmVncm91bmQgJ3Rlcm0tY29sb3ItYnJp Z2h0LXllbGxvdyBuaWwgJ2RlZmF1bHQpCisgICAgIDpiYWNrZ3JvdW5kICJ1bnNwZWNpZmll ZC1iZyIgOmludmVyc2UtdmlkZW8gbmlsKSkKKyhkZWZ2YXIgYnJpZ2h0LXllbGxvdy1iZy1w cm9wcworICBgKCA6Zm9yZWdyb3VuZCAidW5zcGVjaWZpZWQtZmciCisgICAgIDpiYWNrZ3Jv dW5kICwoZmFjZS1iYWNrZ3JvdW5kICd0ZXJtLWNvbG9yLWJyaWdodC15ZWxsb3cgbmlsICdk ZWZhdWx0KQorICAgICA6aW52ZXJzZS12aWRlbyBuaWwpKQorCisoZGVmdmFyIGFuc2ktdGVz dC1zdHJpbmdzCisgIGAoKCJcZVszM21IZWxsbyBXb3JsZFxlWzBtIgorICAgICAsKHByb3Bl cnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UgeWVsbG93LWZnLXByb3BzKSkK KyAgICAoIlxlWzQzbUhlbGxvIFdvcmxkXGVbMG0iCisgICAgICwocHJvcGVydGl6ZSAiSGVs bG8gV29ybGQiICdmb250LWxvY2stZmFjZSB5ZWxsb3ctYmctcHJvcHMpKQorICAgICgiXGVb OTNtSGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIg J2ZvbnQtbG9jay1mYWNlIGJyaWdodC15ZWxsb3ctZmctcHJvcHMpKQorICAgICgiXGVbMTAz bUhlbGxvIFdvcmxkXGVbMG0iCisgICAgICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdm b250LWxvY2stZmFjZSBicmlnaHQteWVsbG93LWJnLXByb3BzKSkKKyAgICAoIlxlWzE7MzNt SGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2Zv bnQtbG9jay1mYWNlCisgICAgICAgICAgICAgICAgICBgKCx5ZWxsb3ctZmctcHJvcHMgOmlu aGVyaXQgdGVybS1ib2xkKSkKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2Zv bnQtbG9jay1mYWNlCisgICAgICAgICAgICAgICAgICBgKCxicmlnaHQteWVsbG93LWZnLXBy b3BzIDppbmhlcml0IHRlcm0tYm9sZCkpKQorICAgICgiXGVbMzM7MW1IZWxsbyBXb3JsZFxl WzBtIgorICAgICAsKHByb3BlcnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UK KyAgICAgICAgICAgICAgICAgIGAoLHllbGxvdy1mZy1wcm9wcyA6aW5oZXJpdCB0ZXJtLWJv bGQpKQorICAgICAsKHByb3BlcnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UK KyAgICAgICAgICAgICAgICAgIGAoLGJyaWdodC15ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQg dGVybS1ib2xkKSkpCisgICAgKCJcZVsxbVxlWzMzbUhlbGxvIFdvcmxkXGVbMG0iCisgICAg ICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdmb250LWxvY2stZmFjZQorICAgICAgICAg ICAgICAgICAgYCgseWVsbG93LWZnLXByb3BzIDppbmhlcml0IHRlcm0tYm9sZCkpCisgICAg ICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdmb250LWxvY2stZmFjZQorICAgICAgICAg ICAgICAgICAgYCgsYnJpZ2h0LXllbGxvdy1mZy1wcm9wcyA6aW5oZXJpdCB0ZXJtLWJvbGQp KSkKKyAgICAoIlxlWzMzbVxlWzFtSGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChwcm9wZXJ0 aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1mYWNlCisgICAgICAgICAgICAgICAgICBg KCx5ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQgdGVybS1ib2xkKSkKKyAgICAgLChwcm9wZXJ0 aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1mYWNlCisgICAgICAgICAgICAgICAgICBg KCxicmlnaHQteWVsbG93LWZnLXByb3BzIDppbmhlcml0IHRlcm0tYm9sZCkpKSkpCisKIChk ZWZ1biB0ZXJtLXRlc3Qtc2NyZWVuLWZyb20taW5wdXQgKHdpZHRoIGhlaWdodCBpbnB1dCAm b3B0aW9uYWwgcmV0dXJuLXZhcikKICAgKHdpdGgtdGVtcC1idWZmZXIKICAgICAodGVybS1t b2RlKQpAQCAtNDgsNyArOTMsNyBAQCB0ZXJtLXRlc3Qtc2NyZWVuLWZyb20taW5wdXQKICAg ICAgICAgICAgICAgICAobWFwYyAobGFtYmRhIChpbnB1dCkgKHRlcm0tZW11bGF0ZS10ZXJt aW5hbCBwcm9jIGlucHV0KSkgaW5wdXQpCiAgICAgICAgICAgICAgICh0ZXJtLWVtdWxhdGUt dGVybWluYWwgcHJvYyBpbnB1dCkpCiAgICAgICAoaWYgcmV0dXJuLXZhciAoYnVmZmVyLWxv Y2FsLXZhbHVlIHJldHVybi12YXIgKGN1cnJlbnQtYnVmZmVyKSkKLSAgICAgICAgKGJ1ZmZl ci1zdWJzdHJpbmctbm8tcHJvcGVydGllcyAocG9pbnQtbWluKSAocG9pbnQtbWF4KSkpKSkp CisgICAgICAgIChidWZmZXItc3Vic3RyaW5nIChwb2ludC1taW4pIChwb2ludC1tYXgpKSkp KSkKIAogKGVydC1kZWZ0ZXN0IHRlcm0tc2ltcGxlLWxpbmVzICgpCiAgIChza2lwLXVubGVz cyAobm90IChtZW1xIHN5c3RlbS10eXBlICcod2luZG93cy1udCBtcy1kb3MpKSkpCkBAIC03 Nyw2ICsxMjIsMjQgQEAgdGVybS1saW5lLXdyYXAKICAgICAgICAgICAgKHRlcm0tdGVzdC1z Y3JlZW4tZnJvbS1pbnB1dCA0MCAxMiAobGV0ICgoc3RyIChtYWtlLXN0cmluZyAzMCA/YSkp KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxp c3Qgc3RyIHN0cikpKSkpKQogCisoZXJ0LWRlZnRlc3QgdGVybS1jb2xvcnMgKCkKKyAgKHNr aXAtdW5sZXNzIChub3QgKG1lbXEgc3lzdGVtLXR5cGUgJyh3aW5kb3dzLW50IG1zLWRvcykp KSkKKyAgKHBjYXNlLWRvbGlzdCAoYCgsc3RyICxleHBlY3RlZCkgYW5zaS10ZXN0LXN0cmlu Z3MpCisgICAgKGxldCAoKHJlc3VsdCAodGVybS10ZXN0LXNjcmVlbi1mcm9tLWlucHV0IDQw IDEyIHN0cikpKQorICAgICAgKHNob3VsZCAoZXF1YWwgcmVzdWx0IGV4cGVjdGVkKSkKKyAg ICAgIChzaG91bGQgKGVxdWFsICh0ZXh0LXByb3BlcnRpZXMtYXQgMCByZXN1bHQpCisgICAg ICAgICAgICAgICAgICAgICAodGV4dC1wcm9wZXJ0aWVzLWF0IDAgZXhwZWN0ZWQpKSkpKSkK KworKGVydC1kZWZ0ZXN0IHRlcm0tY29sb3JzLWJvbGQtaXMtYnJpZ2h0ICgpCisgIChza2lw LXVubGVzcyAobm90IChtZW1xIHN5c3RlbS10eXBlICcod2luZG93cy1udCBtcy1kb3MpKSkp CisgIChsZXQgKChhbnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0IHQpKQorICAgIChwY2FzZS1k b2xpc3QgKGAoLHN0ciAsZXhwZWN0ZWQgLGJyaWdodC1leHBlY3RlZCkgYW5zaS10ZXN0LXN0 cmluZ3MpCisgICAgICAobGV0ICgoZXhwZWN0ZWQgKG9yIGJyaWdodC1leHBlY3RlZCBleHBl Y3RlZCkpCisgICAgICAgICAgICAocmVzdWx0ICh0ZXJtLXRlc3Qtc2NyZWVuLWZyb20taW5w dXQgNDAgMTIgc3RyKSkpCisgICAgICAgIChzaG91bGQgKGVxdWFsIHJlc3VsdCBleHBlY3Rl ZCkpCisgICAgICAgIChzaG91bGQgKGVxdWFsICh0ZXh0LXByb3BlcnRpZXMtYXQgMCByZXN1 bHQpCisgICAgICAgICAgICAgICAgICAgICAgICh0ZXh0LXByb3BlcnRpZXMtYXQgMCBleHBl Y3RlZCkpKSkpKSkKKwogKGVydC1kZWZ0ZXN0IHRlcm0tY3Vyc29yLW1vdmVtZW50ICgpCiAg IChza2lwLXVubGVzcyAobm90IChtZW1xIHN5c3RlbS10eXBlICcod2luZG93cy1udCBtcy1k b3MpKSkpCiAgIDs7IEFic29sdXRlIHBvc2l0aW9uaW5nLgotLSAKMi4yNS4xCgo= --------------B46408E9A6DA1B106410C7A4-- From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 22 15:49:39 2021 Received: (at 50179) by debbugs.gnu.org; 22 Sep 2021 19:49:39 +0000 Received: from localhost ([127.0.0.1]:51752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mT8FO-0005mz-UG for submit@debbugs.gnu.org; Wed, 22 Sep 2021 15:49:39 -0400 Received: from quimby.gnus.org ([95.216.78.240]:33340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mT8FM-0005mi-Ag for 50179@debbugs.gnu.org; Wed, 22 Sep 2021 15:49:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=+BlxIDeelZ9DcA/TTsVbfh1/overt+zvRivn7XTFyWE=; b=bQSpU4hCo7UFt5Oqy7FAeW+CXO bucxltcjiL6hWTW1iBk20yrPoNQw8skKcKERsJhi6dA/8+fHG7w7FzikpG96dPqNopEw3CAoYggGY 3ly8nVZydOnk83imgS06cCg7jT5S4hnQhRRkHSGotheMIbyl98rxNUUucZwkMVO71s38=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mT8FA-0006gR-Ja; Wed, 22 Sep 2021 21:49:28 +0200 From: Lars Ingebrigtsen To: Jim Porter Subject: Re: bug#50179: [WIP PATCH v3] Add support for "bright" ANSI colors to ansi-color and term-mode References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> <87a6l5k9xr.fsf@gnus.org> <87lf4p3210.fsf@gnus.org> <831r6hv51r.fsf@gnu.org> <87h7fc2vd4.fsf@gnus.org> <871r5kpqsj.fsf@gnus.org> <0e61dc90-c315-f3cd-df83-22b9ecb029c1@gmail.com> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAD1BMVEXYyLjFtaWTfm5W PzH////FdCktAAAAAWJLR0QEj2jZUQAAAAd0SU1FB+UJFhMoAl8MmAwAAAGtSURBVDjLZZPrlcQg CIXBbQBIAxEbmIH+e1tATdyzzh9PvuHyuAiAw/cxzjPMVBUQtb75WEB0aALAuIyRQBeIIwFIxCYw owQp1ANA0w3cgFnnKXCkJx4HUH8JvhF4Aj+kQMYBPgdomffRagdQH/+0CvgJ7hMsJUv+na0XsCzL RFmeJJwAo2/veeG/AIZGywVyxBBafYJrTAB8RUg0FqKwyrLSrFZzFjwjcIMaZ5dQmhEwCqBalaUv kLSixcDZ0fUA0cq4G8cGOHnXdHgB8U6IQmg9pPoDWlqHlQb/gExegLXN5Pz2UXce1wliJA4sd5o5 sqotdcUQiZCqiOsALf3hAChGbQGaI3HrBT4RXmTPKrxmitxQlh9VucfoQHpsjL8gXfBvtkfprr3l zrVF6YB9HBEFmFDjTYQlJgtUbgMVane8kHhIJ8idu7GMJ1kNtr229yz+8WODGZBLsqTSaNdMX3NI pyeoNiAeMyCtmLlwtbnsn9jE5fQ0pyXozQmZNqi/1BPsP4bMCE/IeptGI8EjBRg7oDGFL/mXY1Hw AGHM8M4BTq0AaUDmZsjfA34BSGFuZ4hpGIkAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjEtMDktMjJU MTk6NDA6MDIrMDA6MDCrt6N+AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIxLTA5LTIyVDE5OjQwOjAy KzAwOjAw2uobwgAAAABJRU5ErkJggg== X-Now-Playing: Davitt Sigerson's _Davitt Sigerson_: "I Never Fall In Love" Date: Wed, 22 Sep 2021 21:49:23 +0200 In-Reply-To: <0e61dc90-c315-f3cd-df83-22b9ecb029c1@gmail.com> (Jim Porter's message of "Wed, 22 Sep 2021 12:39:55 -0700") Message-ID: <87ilysv1a4.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jim Porter writes: > I don't quite know what to do about man.el though. It has overrides > for a few of the faces used by ansi-color. I could maintain that > behavior fairly easily, but maybe it makes sense to have it u [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50179 Cc: 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Jim Porter writes: > I don't quite know what to do about man.el though. It has overrides > for a few of the faces used by ansi-color. I could maintain that > behavior fairly easily, but maybe it makes sense to have it use the > defaults from ansi-color. Hm... I wonder why man.el is overriding the colours? Skimming the patch, it looks good to me, but some trivial comments: > -(defcustom ansi-color-faces-vector > - [default bold default italic underline success warning error] Instead of removing the variable, mark it as obsolete instead. (Users may have code that references it in their .emacs files, and that shouldn't bug out.) > +(defconst ansi-color-basic-faces-vector > + [nil [...] > - :type '(vector face face face face face face face face) > - :set 'ansi-color-map-update > - :initialize 'custom-initialize-default > - :group 'ansi-colors) Needs a :version. > -(defcustom ansi-color-names-vector > - ["black" "red3" "green3" "yellow3" "blue2" "magenta3" "cyan3" "gray90"] Same thing with obsoletion here. > -(defvar Man-ansi-color-map (let ((ansi-color-faces-vector > - [ default Man-overstrike default Man-underline > - Man-underline default default Man-reverse ])) > - (ansi-color-make-color-map)) > - "The value used here for `ansi-color-map'.") And same obsoletion thing here. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 22 21:47:39 2021 Received: (at 50179) by debbugs.gnu.org; 23 Sep 2021 01:47:39 +0000 Received: from localhost ([127.0.0.1]:52268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTDpp-0007yP-Ho for submit@debbugs.gnu.org; Wed, 22 Sep 2021 21:47:39 -0400 Received: from mail-pl1-f178.google.com ([209.85.214.178]:37833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTDpl-0007xR-Jm for 50179@debbugs.gnu.org; Wed, 22 Sep 2021 21:47:35 -0400 Received: by mail-pl1-f178.google.com with SMTP id j14so2995256plx.4 for <50179@debbugs.gnu.org>; Wed, 22 Sep 2021 18:47:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language; bh=D+jEyvLhflL9iYMxKlfPDvKw6kP3PwqWS02xhfDjtOo=; b=O28vVfBA5NAyhJ+Q08xtQ6nDzAhmCvCjk60fMjoK3Wmpcq/MhYA+czc8wAuW7isAJ8 e6Uqspuy5ulZcF53GyqXA0deCkjXbTNNhuomUuc+KrNE0mjtdOMKTqekjvftE4k78O4t f5GwrDe1EpVPVhOkcznkQfjLB4kmI6XfMlGTGCOpj1vMpRaYVe46aXUNV9azGWgA5uxc G40XLs3ylE2jmnbSb0Gk0jLPPXTn0PVNPRdj6EtmGYsyGctllxX8wBMojdC2JpQRqNJj 1+HCgDfZxgP7ZcmRGgKbBZHCCEDYLG0ktuK4PufzmfW6t9UtZX6woj8tuvV7ftyO48wa X0yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language; bh=D+jEyvLhflL9iYMxKlfPDvKw6kP3PwqWS02xhfDjtOo=; b=dSyeEC+Ibc4fNaVBwbJmw8VZ8pV+iwis0FCstRa85A5ngbsmgRKelvXGB9eJtWXYZm erOC8j3d2CpFrQZRWbHRb8Vg+zlKCYLffVNokmeGkX0tC67inmoKQwyIqFXEKFjqUM0e x+ns7hHvdusdi+MzfIZYp5l3PFhcM/QO+bks1ZLs+Fm3J3BDzWW7sFXTN43QI6JkkDd0 d6nmEAkfEdlo1PCKlqK/vmHou4Ow+95BqnYSyEUPvmkRUFGG2newMdwGVucb/NO+LZYm aH+HZ0sCdNweFkyXW2E8FPdoxtx36bnPSyEraaXGOLCOkUu2nEBbjeEnJl1nx77L+dHV DWmg== X-Gm-Message-State: AOAM533nr2gOSVNruv2dr/0/EBnbuYykBenwpLcaS6CHAO+KVEJwm/op nslWHdJT6f9EBy+x0DqDeW968+vpBBU= X-Google-Smtp-Source: ABdhPJxU3RgSVHDNfzmtjxz6+BS8nnUZHwbM5+fyqmEOnQfA8n2Xigxiv42H9DbtA0XfR3JtQIGpfg== X-Received: by 2002:a17:903:244e:b0:13c:802d:92c with SMTP id l14-20020a170903244e00b0013c802d092cmr1559347pls.78.1632361646702; Wed, 22 Sep 2021 18:47:26 -0700 (PDT) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id i15sm4123809pgo.4.2021.09.22.18.47.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Sep 2021 18:47:25 -0700 (PDT) Subject: Re: bug#50179: [PATCH v4] Add support for "bright" ANSI colors to ansi-color and term-mode To: Lars Ingebrigtsen References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> <87a6l5k9xr.fsf@gnus.org> <87lf4p3210.fsf@gnus.org> <831r6hv51r.fsf@gnu.org> <87h7fc2vd4.fsf@gnus.org> <871r5kpqsj.fsf@gnus.org> <0e61dc90-c315-f3cd-df83-22b9ecb029c1@gmail.com> <87ilysv1a4.fsf@gnus.org> From: Jim Porter Message-ID: <24dfacb5-067d-580d-2608-8198d9e4f1a3@gmail.com> Date: Wed, 22 Sep 2021 18:47:25 -0700 MIME-Version: 1.0 In-Reply-To: <87ilysv1a4.fsf@gnus.org> Content-Type: multipart/mixed; boundary="------------387B348318050924D49CCE37" Content-Language: en-US X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50179 Cc: 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------387B348318050924D49CCE37 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 9/22/2021 12:49 PM, Lars Ingebrigtsen wrote: > Jim Porter writes: > >> I don't quite know what to do about man.el though. It has overrides >> for a few of the faces used by ansi-color. I could maintain that >> behavior fairly easily, but maybe it makes sense to have it use the >> defaults from ansi-color. > > Hm... I wonder why man.el is overriding the colours? Since I'm not totally sure, I maintained that behavior. It's not really any extra effort, so someone can make that decision later. > Skimming the patch, it looks good to me, but some trivial comments: > >> -(defcustom ansi-color-faces-vector >> - [default bold default italic underline success warning error] > > Instead of removing the variable, mark it as obsolete instead. (Users > may have code that references it in their .emacs files, and that > shouldn't bug out.) Ok, I've done this here, and all the other places as well. I also obsoleted the old `ansi-color-map' and friends instead of deleting them for the same reason. Hopefully all that's right; I tried to make sure that they warn the user if they use them, but that warnings don't show up when building Emacs. --------------387B348318050924D49CCE37 Content-Type: text/plain; charset=UTF-8; name="0001-Add-support-for-bright-ANSI-colors-in-ansi-color.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Add-support-for-bright-ANSI-colors-in-ansi-color.patch" RnJvbSA3MDgzZjBiZTk1MWYzMTAwYzNhMzI0OTMxM2VkZTczOTFkZjA5MjgxIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFdlZCwgMjIgU2VwIDIwMjEgMTg6Mzc6NTIgLTA3MDAKU3ViamVjdDogW1BB VENIIDEvMl0gQWRkIHN1cHBvcnQgZm9yICJicmlnaHQiIEFOU0kgY29sb3JzIGluIGFuc2kt Y29sb3IKCiogbGlzcC9hbnNpLWNvbG9yLmVsIChhbnNpLWNvbG9yLWJvbGQsIGFuc2ktY29s b3ItZmFpbnQsIGFuc2ktY29sb3ItaXRhbGljKQooYW5zaS1jb2xvci11bmRlcmxpbmUsIGFu c2ktY29sb3Itc2xvdy1ibGluaywgYW5zaS1jb2xvci1mYXN0LWJsaW5rKQooYW5zaS1jb2xv ci1pbnZlcnNlLCBhbnNpLWNvbG9yLXJlZCwgYW5zaS1jb2xvci1ncmVlbiwgYW5zaS1jb2xv ci15ZWxsb3cpCihhbnNpLWNvbG9yLWJsdWUsIGFuc2ktY29sb3ItbWFnZW50YSwgYW5zaS1j b2xvci1jeWFuLCBhbnNpLWNvbG9yLXdoaXRlKQooYW5zaS1jb2xvci1icmlnaHQtcmVkLCBh bnNpLWNvbG9yLWJyaWdodC1ncmVlbiwgYW5zaS1jb2xvci1icmlnaHQteWVsbG93KQooYW5z aS1jb2xvci1icmlnaHQtYmx1ZSwgYW5zaS1jb2xvci1icmlnaHQtbWFnZW50YSwgYW5zaS1j b2xvci1icmlnaHQtY3lhbikKKGFuc2ktY29sb3ItYnJpZ2h0LXdoaXRlKTogTmV3IGZhY2Vz LgooYW5zaS1jb2xvci1iYXNpYy1mYWNlcy12ZWN0b3IsIGFuc2ktY29sb3Itbm9ybWFsLWNv bG9ycy12ZWN0b3IpCihhbnNpLWNvbG9yLWJyaWdodC1jb2xvcnMtdmVjdG9yKTogTmV3IGNv bnN0YW50cy4KKGFuc2ktY29sb3ItZmFjZXMtdmVjdG9yLCBhbnNpLWNvbG9yLW5hbWVzLXZl Y3Rvcik6IE1ha2Ugb2Jzb2xldGUuCihhbnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0KTogTmV3 IGRlZmN1c3RvbS4KKGFuc2ktY29sb3ItLWZpbmQtZmFjZSk6IFNvcnQgQU5TSSBjb2RlcyBh bmQgY2hlY2sKJ2Fuc2ktY29sb3ItYm9sZC1pcy1icmlnaHQnLgooYW5zaS1jb2xvci1hcHBs eS1zZXF1ZW5jZSk6IFN1cHBvcnQgYnJpZ2h0IEFOU0kgY29sb3JzLgooYW5zaS1jb2xvci1t YWtlLWNvbG9yLW1hcCwgYW5zaS1jb2xvci1tYXAsIGFuc2ktY29sb3ItbWFwLXVwZGF0ZSk6 Ck1ha2Ugb2Jzb2xldGUuCihhbnNpLWNvbG9yLWdldC1mYWNlLTEpOiBBZGQgQlJJR0hUIHBh cmFtZXRlci4KKiBsaXNwL21hbi5lbCAoTWFuLWFuc2ktY29sb3ItYmFzaWMtZmFjZXMtdmVj dG9yKTogTmV3IHZhcmlhYmxlLgooTWFuLWFuc2ktY29sb3ItbWFwKTogTWFrZSBvYnNvbGV0 ZS4KKE1hbi1mb250aWZ5LW1hbnBhZ2UpOiBVc2UgJ01hbi1hbnNpLWNvbG9yLWJhc2ljLWZh Y2VzLXZlY3RvcicgaGVyZS4KKiB0ZXN0L2xpc3AvYW5zaS1jb2xvci10ZXN0cy5lbAooYW5z aS1jb2xvci1hcHBseS1vbi1yZWdpb24tYm9sZC1pcy1icmlnaHQtdGVzdCk6IE5ldyBmdW5j dGlvbi4KLS0tCiBldGMvTkVXUyAgICAgICAgICAgICAgICAgICAgICB8ICAxNSArKwogbGlz cC9hbnNpLWNvbG9yLmVsICAgICAgICAgICAgfCAzNTUgKysrKysrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLQogbGlzcC9tYW4uZWwgICAgICAgICAgICAgICAgICAgfCAgMjIgKyst CiB0ZXN0L2xpc3AvYW5zaS1jb2xvci10ZXN0cy5lbCB8ICA1NSArKysrKy0KIDQgZmlsZXMg Y2hhbmdlZCwgMzY1IGluc2VydGlvbnMoKyksIDgyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2V0Yy9ORVdTIGIvZXRjL05FV1MKaW5kZXggZjI3M2I4ZTgyYS4uY2Y2ODIzZjUxYiAx MDA2NDQKLS0tIGEvZXRjL05FV1MKKysrIGIvZXRjL05FV1MKQEAgLTI3MDMsNiArMjcwMywy MSBAQCBzZXF1ZW5jZXMuCiAqKiogJ2NvbWludC1kZWxldGUtb3V0cHV0JyBjYW4gbm93IHNh dmUgZGVsZXRlZCB0ZXh0IGluIHRoZSBraWxsLXJpbmcuCiBJbnRlcmFjdGl2ZWx5LCAnQy11 IEMtYyBDLW8nIHRyaWdnZXJzIHRoaXMgbmV3IG9wdGlvbmFsIGJlaGF2aW9yLgogCisqKiBh bnNpLWNvbG9yLmVsCisKKy0tLQorKioqIENvbG9ycyBhcmUgbm93IGRlZmluZWQgYnkgZmFj ZXMuCitBTlNJIFNHUiBjb2RlcyBub3cgaGF2ZSBjb3JyZXNwb25kaW5nIGZhY2VzIHRvIGRl c2NyaWJlIHRoZWlyCithcHBlYXJhbmNlLCBlLmcuICdhbnNpLWNvbG9yLWJvbGQnLgorCist LS0KKyoqKiBTdXBwb3J0IGZvciAiYnJpZ2h0IiBjb2xvciBjb2Rlcy4KKyJCcmlnaHQiIEFO U0kgY29sb3IgY29kZXMgYXJlIG5vdyBkaXNwbGF5ZWQgd2hlbiBhcHBseWluZyBBTlNJIGNv bG9yCitmaWx0ZXJzIHVzaW5nIHRoZSBjb2xvciB2YWx1ZXMgZGVmaW5lZCBieSB0aGUgZmFj ZXMKKydhbnNpLWNvbG9yLWJyaWdodC1DT0xPUicuICBJbiBhZGRpdGlvbiwgYm9sZCB0ZXh0 IHdpdGggcmVndWxhciBBTlNJCitjb2xvcnMgY2FuIGJlIGRpc3BsYXllZCBhcyAiYnJpZ2h0 IiBpZiAnYW5zaS1jb2xvci1ib2xkLWlzLWJyaWdodCcgaXMKK25vbi1uaWwuCisKICoqIEVS QwogCiAtLS0KZGlmZiAtLWdpdCBhL2xpc3AvYW5zaS1jb2xvci5lbCBiL2xpc3AvYW5zaS1j b2xvci5lbAppbmRleCA0MzE1YTdmM2NlLi5iMWM5Y2RhZWNhIDEwMDY0NAotLS0gYS9saXNw L2Fuc2ktY29sb3IuZWwKKysrIGIvbGlzcC9hbnNpLWNvbG9yLmVsCkBAIC05MCw1MyArOTAs MTY4IEBAIGFuc2ktY29sb3JzCiAgIDp2ZXJzaW9uICIyMS4xIgogICA6Z3JvdXAgJ3Byb2Nl c3NlcykKIAorKGRlZmZhY2UgYW5zaS1jb2xvci1ib2xkCisgICcoKHQgOmluaGVyaXQgJ2Jv bGQpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBib2xkIHRleHQuIgorICA6Z3JvdXAgJ2Fu c2ktY29sb3JzCisgIDp2ZXJzaW9uICIyOC4xIikKKworKGRlZmZhY2UgYW5zaS1jb2xvci1m YWludAorICAnKCh0IDp3ZWlnaHQgbGlnaHQpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBm YWludCB0ZXh0LiIKKyAgOmdyb3VwICdhbnNpLWNvbG9ycworICA6dmVyc2lvbiAiMjguMSIp CisKKyhkZWZmYWNlIGFuc2ktY29sb3ItaXRhbGljCisgICcoKHQgOmluaGVyaXQgJ2l0YWxp YykpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGl0YWxpYyB0ZXh0LiIKKyAgOmdyb3VwICdh bnNpLWNvbG9ycworICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIGFuc2ktY29sb3It dW5kZXJsaW5lCisgICcoKHQgOmluaGVyaXQgJ3VuZGVybGluZSkpCisgICJGYWNlIHVzZWQg dG8gcmVuZGVyIHVuZGVybGluZWQgdGV4dC4iCisgIDpncm91cCAnYW5zaS1jb2xvcnMKKyAg OnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSBhbnNpLWNvbG9yLXNsb3ctYmxpbmsKKyAg JygodCA6Ym94ICg6bGluZS13aWR0aCAtMSkpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBz bG93bHkgYmxpbmtpbmcgdGV4dC4iCisgIDpncm91cCAnYW5zaS1jb2xvcnMKKyAgOnZlcnNp b24gIjI4LjEiKQorCisoZGVmZmFjZSBhbnNpLWNvbG9yLWZhc3QtYmxpbmsKKyAgJygodCA6 Ym94ICg6bGluZS13aWR0aCAtMSkpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciByYXBpZGx5 IGJsaW5raW5nIHRleHQuIgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJzaW9uICIy OC4xIikKKworKGRlZmZhY2UgYW5zaS1jb2xvci1pbnZlcnNlCisgICcoKHQgOmludmVyc2Ut dmlkZW8gdCkpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGludmVydGVkIHZpZGVvIHRleHQu IgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJzaW9uICIyOC4xIikKKworKGRlZmZh Y2UgYW5zaS1jb2xvci1ibGFjaworICAnKCh0IDpmb3JlZ3JvdW5kICJibGFjayIgOmJhY2tn cm91bmQgImJsYWNrIikpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJsYWNrIGNvbG9yIGNv ZGUuIgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJzaW9uICIyOC4xIikKKworKGRl ZmZhY2UgYW5zaS1jb2xvci1yZWQKKyAgJygodCA6Zm9yZWdyb3VuZCAicmVkMyIgOmJhY2tn cm91bmQgInJlZDMiKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgcmVkIGNvbG9yIGNvZGUu IgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJzaW9uICIyOC4xIikKKworKGRlZmZh Y2UgYW5zaS1jb2xvci1ncmVlbgorICAnKCh0IDpmb3JlZ3JvdW5kICJncmVlbjMiIDpiYWNr Z3JvdW5kICJncmVlbjMiKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgZ3JlZW4gY29sb3Ig Y29kZS4iCisgIDpncm91cCAnYW5zaS1jb2xvcnMKKyAgOnZlcnNpb24gIjI4LjEiKQorCiso ZGVmZmFjZSBhbnNpLWNvbG9yLXllbGxvdworICAnKCh0IDpmb3JlZ3JvdW5kICJ5ZWxsb3cz IiA6YmFja2dyb3VuZCAieWVsbG93MyIpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciB5ZWxs b3cgY29sb3IgY29kZS4iCisgIDpncm91cCAnYW5zaS1jb2xvcnMKKyAgOnZlcnNpb24gIjI4 LjEiKQorCisoZGVmZmFjZSBhbnNpLWNvbG9yLWJsdWUKKyAgJygodCA6Zm9yZWdyb3VuZCAi Ymx1ZTIiIDpiYWNrZ3JvdW5kICJibHVlMiIpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBi bHVlIGNvbG9yIGNvZGUuIgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJzaW9uICIy OC4xIikKKworKGRlZmZhY2UgYW5zaS1jb2xvci1tYWdlbnRhCisgICcoKHQgOmZvcmVncm91 bmQgIm1hZ2VudGEzIiA6YmFja2dyb3VuZCAibWFnZW50YTMiKSkKKyAgIkZhY2UgdXNlZCB0 byByZW5kZXIgbWFnZW50YSBjb2xvciBjb2RlLiIKKyAgOmdyb3VwICdhbnNpLWNvbG9ycwor ICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIGFuc2ktY29sb3ItY3lhbgorICAnKCh0 IDpmb3JlZ3JvdW5kICJjeWFuMyIgOmJhY2tncm91bmQgImN5YW4zIikpCisgICJGYWNlIHVz ZWQgdG8gcmVuZGVyIGN5YW4gY29sb3IgY29kZS4iCisgIDpncm91cCAnYW5zaS1jb2xvcnMK KyAgOnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSBhbnNpLWNvbG9yLXdoaXRlCisgICco KHQgOmZvcmVncm91bmQgImdyZXk5MCIgOmJhY2tncm91bmQgImdyYXk5MCIpKQorICAiRmFj ZSB1c2VkIHRvIHJlbmRlciB3aGl0ZSBjb2xvciBjb2RlLiIKKyAgOmdyb3VwICdhbnNpLWNv bG9ycworICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIGFuc2ktY29sb3ItYnJpZ2h0 LWJsYWNrCisgICcoKHQgOmZvcmVncm91bmQgImdyYXkzMCIgOmJhY2tncm91bmQgImdyYXkz MCIpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgYmxhY2sgY29sb3IgY29kZS4i CisgIDpncm91cCAnYW5zaS1jb2xvcnMKKyAgOnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFj ZSBhbnNpLWNvbG9yLWJyaWdodC1yZWQKKyAgJygodCA6Zm9yZWdyb3VuZCAicmVkMiIgOmJh Y2tncm91bmQgInJlZDIiKSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgYnJpZ2h0IHJlZCBj b2xvciBjb2RlLiIKKyAgOmdyb3VwICdhbnNpLWNvbG9ycworICA6dmVyc2lvbiAiMjguMSIp CisKKyhkZWZmYWNlIGFuc2ktY29sb3ItYnJpZ2h0LWdyZWVuCisgICcoKHQgOmZvcmVncm91 bmQgImdyZWVuMiIgOmJhY2tncm91bmQgImdyZWVuMiIpKQorICAiRmFjZSB1c2VkIHRvIHJl bmRlciBicmlnaHQgZ3JlZW4gY29sb3IgY29kZS4iCisgIDpncm91cCAnYW5zaS1jb2xvcnMK KyAgOnZlcnNpb24gIjI4LjEiKQorCisoZGVmZmFjZSBhbnNpLWNvbG9yLWJyaWdodC15ZWxs b3cKKyAgJygodCA6Zm9yZWdyb3VuZCAieWVsbG93MiIgOmJhY2tncm91bmQgInllbGxvdzIi KSkKKyAgIkZhY2UgdXNlZCB0byByZW5kZXIgYnJpZ2h0IHllbGxvdyBjb2xvciBjb2RlLiIK KyAgOmdyb3VwICdhbnNpLWNvbG9ycykKKworKGRlZmZhY2UgYW5zaS1jb2xvci1icmlnaHQt Ymx1ZQorICAnKCh0IDpmb3JlZ3JvdW5kICJibHVlMSIgOmJhY2tncm91bmQgImJsdWUxIikp CisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJyaWdodCBibHVlIGNvbG9yIGNvZGUuIgorICA6 Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJzaW9uICIyOC4xIikKKworKGRlZmZhY2UgYW5z aS1jb2xvci1icmlnaHQtbWFnZW50YQorICAnKCh0IDpmb3JlZ3JvdW5kICJtYWdlbnRhMiIg OmJhY2tncm91bmQgIm1hZ2VudGEyIikpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJyaWdo dCBtYWdlbnRhIGNvbG9yIGNvZGUuIgorICA6Z3JvdXAgJ2Fuc2ktY29sb3JzCisgIDp2ZXJz aW9uICIyOC4xIikKKworKGRlZmZhY2UgYW5zaS1jb2xvci1icmlnaHQtY3lhbgorICAnKCh0 IDpmb3JlZ3JvdW5kICJjeWFuMiIgOmJhY2tncm91bmQgImN5YW4yIikpCisgICJGYWNlIHVz ZWQgdG8gcmVuZGVyIGJyaWdodCBjeWFuIGNvbG9yIGNvZGUuIgorICA6Z3JvdXAgJ2Fuc2kt Y29sb3JzCisgIDp2ZXJzaW9uICIyOC4xIikKKworKGRlZmZhY2UgYW5zaS1jb2xvci1icmln aHQtd2hpdGUKKyAgJygodCA6Zm9yZWdyb3VuZCAid2hpdGUiIDpiYWNrZ3JvdW5kICJ3aGl0 ZSIpKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmlnaHQgd2hpdGUgY29sb3IgY29kZS4i CisgIDpncm91cCAnYW5zaS1jb2xvcnMKKyAgOnZlcnNpb24gIjI4LjEiKQorCiAoZGVmY3Vz dG9tIGFuc2ktY29sb3ItZmFjZXMtdmVjdG9yCiAgIFtkZWZhdWx0IGJvbGQgZGVmYXVsdCBp dGFsaWMgdW5kZXJsaW5lIHN1Y2Nlc3Mgd2FybmluZyBlcnJvcl0KICAgIkZhY2VzIHVzZWQg Zm9yIFNHUiBjb250cm9sIHNlcXVlbmNlcyBkZXRlcm1pbmluZyBhIGZhY2UuCiBUaGlzIHZl Y3RvciBob2xkcyB0aGUgZmFjZXMgdXNlZCBmb3IgU0dSIGNvbnRyb2wgc2VxdWVuY2UgcGFy YW1ldGVycyAwCiB0byA3LgogCi1QYXJhbWV0ZXIgIERlc2NyaXB0aW9uICAgICAgICBGYWNl IHVzZWQgYnkgZGVmYXVsdAotICAwICAgICAgICBkZWZhdWx0ICAgICAgICAgICAgZGVmYXVs dAotICAxICAgICAgICBib2xkICAgICAgICAgICAgICAgYm9sZAotICAyICAgICAgICBmYWlu dCAgICAgICAgICAgICAgZGVmYXVsdAotICAzICAgICAgICBpdGFsaWMgICAgICAgICAgICAg aXRhbGljCi0gIDQgICAgICAgIHVuZGVybGluZWQgICAgICAgICB1bmRlcmxpbmUKLSAgNSAg ICAgICAgc2xvd2x5IGJsaW5raW5nICAgIHN1Y2Nlc3MKLSAgNiAgICAgICAgcmFwaWRseSBi bGlua2luZyAgIHdhcm5pbmcKLSAgNyAgICAgICAgbmVnYXRpdmUgaW1hZ2UgICAgIGVycm9y Ci0KLU5vdGUgdGhhdCB0aGUgc3ltYm9sIGBkZWZhdWx0JyBpcyBzcGVjaWFsOiBJdCB3aWxs IG5vdCBiZSBjb21iaW5lZAotd2l0aCB0aGUgY3VycmVudCBmYWNlLgotCi1UaGlzIHZlY3Rv ciBpcyB1c2VkIGJ5IGBhbnNpLWNvbG9yLW1ha2UtY29sb3ItbWFwJyB0byBjcmVhdGUgYSBj b2xvcgotbWFwLiAgVGhpcyBjb2xvciBtYXAgaXMgc3RvcmVkIGluIHRoZSB2YXJpYWJsZSBg YW5zaS1jb2xvci1tYXAnLiIKK1RoaXMgdmFyaWFibGUgaXMgb2Jzb2xldGUuICBUbyBjdXN0 b21pemUgdGhlIGRpc3BsYXkgb2YgZmFjZXMgdXNlZCBieQorYW5zaS1jb2xvciwgY2hhbmdl ICdhbnNpLWNvbG9yLUZBQ0UnLCBlLmcuIGBhbnNpLWNvbG9yLWJvbGQnLiAgVG8KK2N1c3Rv bWl6ZSB0aGUgYWN0dWFsIGZhY2VzIHVzZWQgKGUuZy4gdG8gdGVtcG9yYXJpbHkgZGlzcGxh eSBTR1IKK2NvbnRyb2wgc2VxdWVuY2VzIGRpZmZlcmVudGx5KSwgdXNlIGBhbnNpLWNvbG9y LWJhc2ljLWZhY2VzLXZlY3RvcicuIgogICA6dHlwZSAnKHZlY3RvciBmYWNlIGZhY2UgZmFj ZSBmYWNlIGZhY2UgZmFjZSBmYWNlIGZhY2UpCi0gIDpzZXQgJ2Fuc2ktY29sb3ItbWFwLXVw ZGF0ZQotICA6aW5pdGlhbGl6ZSAnY3VzdG9tLWluaXRpYWxpemUtZGVmYXVsdAogICA6Z3Jv dXAgJ2Fuc2ktY29sb3JzKQorKG1ha2Utb2Jzb2xldGUtdmFyaWFibGUgJ2Fuc2ktY29sb3It ZmFjZXMtdmVjdG9yICdhbnNpLWNvbG9yLWJhc2ljLWZhY2VzLXZlY3RvcgorICAgICAgICAg ICAgICAgICAgICAgICAgIjI4LjEiKQogCiAoZGVmY3VzdG9tIGFuc2ktY29sb3ItbmFtZXMt dmVjdG9yCiAgIFsiYmxhY2siICJyZWQzIiAiZ3JlZW4zIiAieWVsbG93MyIgImJsdWUyIiAi bWFnZW50YTMiICJjeWFuMyIgImdyYXk5MCJdCiAgICJDb2xvcnMgdXNlZCBmb3IgU0dSIGNv bnRyb2wgc2VxdWVuY2VzIGRldGVybWluaW5nIGEgY29sb3IuCi1UaGlzIHZlY3RvciBob2xk cyB0aGUgY29sb3JzIHVzZWQgZm9yIFNHUiBjb250cm9sIHNlcXVlbmNlcyBwYXJhbWV0ZXJz CitUaGlzIHZlY3RvciBob2xkcyB0aGUgY29sb3JzIHVzZWQgZm9yIFNHUiBjb250cm9sIHNl cXVlbmNlIHBhcmFtZXRlcnMKIDMwIHRvIDM3IChmb3JlZ3JvdW5kIGNvbG9ycykgYW5kIDQw IHRvIDQ3IChiYWNrZ3JvdW5kIGNvbG9ycykuCiAKLVBhcmFtZXRlciAgQ29sb3IKLSAgMzAg IDQwICAgYmxhY2sKLSAgMzEgIDQxICAgcmVkCi0gIDMyICA0MiAgIGdyZWVuCi0gIDMzICA0 MyAgIHllbGxvdwotICAzNCAgNDQgICBibHVlCi0gIDM1ICA0NSAgIG1hZ2VudGEKLSAgMzYg IDQ2ICAgY3lhbgotICAzNyAgNDcgICB3aGl0ZQotCi1UaGlzIHZlY3RvciBpcyB1c2VkIGJ5 IGBhbnNpLWNvbG9yLW1ha2UtY29sb3ItbWFwJyB0byBjcmVhdGUgYSBjb2xvcgotbWFwLiAg VGhpcyBjb2xvciBtYXAgaXMgc3RvcmVkIGluIHRoZSB2YXJpYWJsZSBgYW5zaS1jb2xvci1t YXAnLgotCi1FYWNoIGVsZW1lbnQgbWF5IGFsc28gYmUgYSBjb25zIGNlbGwgd2hlcmUgdGhl IGNhciBhbmQgY2RyIHNwZWNpZnkgdGhlCi1mb3JlZ3JvdW5kIGFuZCBiYWNrZ3JvdW5kIGNv bG9ycywgcmVzcGVjdGl2ZWx5LiIKK1RoaXMgdmFyaWFibGUgaXMgb2Jzb2xldGUuICBUbyBj dXN0b21pemUgdGhlIGRpc3BsYXkgb2YgY29sb3JzIHVzZWQgYnkKK2Fuc2ktY29sb3IsIGNo YW5nZSAnYW5zaS1jb2xvci1DT0xPUicsIGUuZy4gYGFuc2ktY29sb3ItcmVkJy4gIFRvCitj dXN0b21pemUgdGhlIGFjdHVhbCBmYWNlcyB1c2VkIChlLmcuIHRvIHRlbXBvcmFyaWx5IGRp c3BsYXkgU0dSCitjb250cm9sIHNlcXVlbmNlcyBkaWZmZXJlbnRseSksIHVzZSBgYW5zaS1j b2xvci1ub3JtYWwtY29sb3JzLXZlY3RvcicuIgogICA6dHlwZSAnKHZlY3RvciAoY2hvaWNl IGNvbG9yIChjb25zIGNvbG9yIGNvbG9yKSkKICAgICAgICAgICAgICAgICAgKGNob2ljZSBj b2xvciAoY29ucyBjb2xvciBjb2xvcikpCiAgICAgICAgICAgICAgICAgIChjaG9pY2UgY29s b3IgKGNvbnMgY29sb3IgY29sb3IpKQpAQCAtMTQ1LDEwICsyNjAsODcgQEAgYW5zaS1jb2xv ci1uYW1lcy12ZWN0b3IKICAgICAgICAgICAgICAgICAgKGNob2ljZSBjb2xvciAoY29ucyBj b2xvciBjb2xvcikpCiAgICAgICAgICAgICAgICAgIChjaG9pY2UgY29sb3IgKGNvbnMgY29s b3IgY29sb3IpKQogICAgICAgICAgICAgICAgICAoY2hvaWNlIGNvbG9yIChjb25zIGNvbG9y IGNvbG9yKSkpCi0gIDpzZXQgJ2Fuc2ktY29sb3ItbWFwLXVwZGF0ZQotICA6aW5pdGlhbGl6 ZSAnY3VzdG9tLWluaXRpYWxpemUtZGVmYXVsdAogICA6dmVyc2lvbiAiMjQuNCIgOyBkZWZh dWx0IGNvbG9ycyBjb3BpZWQgZnJvbSBgeHRlcm0tc3RhbmRhcmQtY29sb3JzJwogICA6Z3Jv dXAgJ2Fuc2ktY29sb3JzKQorKG1ha2Utb2Jzb2xldGUtdmFyaWFibGUgJ2Fuc2ktY29sb3It ZmFjZXMtdmVjdG9yCisgICAgICAgICAgICAgICAgICAgICAgICAnYW5zaS1jb2xvci1ub3Jt YWwtY29sb3JzLXZlY3RvciAiMjguMSIpCisKKyhkZWZ2YXIgYW5zaS1jb2xvci1iYXNpYy1m YWNlcy12ZWN0b3IKKyAgW25pbAorICAgYW5zaS1jb2xvci1ib2xkCisgICBhbnNpLWNvbG9y LWZhaW50CisgICBhbnNpLWNvbG9yLWl0YWxpYworICAgYW5zaS1jb2xvci11bmRlcmxpbmUK KyAgIGFuc2ktY29sb3Itc2xvdy1ibGluaworICAgYW5zaS1jb2xvci1mYXN0LWJsaW5rCisg ICBhbnNpLWNvbG9yLWludmVyc2VdCisgICJGYWNlcyB1c2VkIGZvciBTR1IgY29udHJvbCBz ZXF1ZW5jZXMgZGV0ZXJtaW5pbmcgYSBmYWNlLgorVGhpcyB2ZWN0b3IgaG9sZHMgdGhlIGZh Y2VzIHVzZWQgZm9yIFNHUiBjb250cm9sIHNlcXVlbmNlIHBhcmFtZXRlcnMgMAordG8gNy4K KworUGFyYW1ldGVyICBEZXNjcmlwdGlvbgorICAwICAgICAgICBkZWZhdWx0CisgIDEgICAg ICAgIGJvbGQKKyAgMiAgICAgICAgZmFpbnQKKyAgMyAgICAgICAgaXRhbGljCisgIDQgICAg ICAgIHVuZGVybGluZWQKKyAgNSAgICAgICAgc2xvd2x5IGJsaW5raW5nCisgIDYgICAgICAg IHJhcGlkbHkgYmxpbmtpbmcKKyAgNyAgICAgICAgbmVnYXRpdmUgaW1hZ2UiKQorCisoZGVm dmFyIGFuc2ktY29sb3Itbm9ybWFsLWNvbG9ycy12ZWN0b3IKKyAgW2Fuc2ktY29sb3ItYmxh Y2sKKyAgIGFuc2ktY29sb3ItcmVkCisgICBhbnNpLWNvbG9yLWdyZWVuCisgICBhbnNpLWNv bG9yLXllbGxvdworICAgYW5zaS1jb2xvci1ibHVlCisgICBhbnNpLWNvbG9yLW1hZ2VudGEK KyAgIGFuc2ktY29sb3ItY3lhbgorICAgYW5zaS1jb2xvci13aGl0ZV0KKyAgIkZhY2VzIHVz ZWQgZm9yIFNHUiBjb250cm9sIHNlcXVlbmNlcyBkZXRlcm1pbmluZyBhIGNvbG9yLgorVGhp cyB2ZWN0b3IgaG9sZHMgdGhlIGZhY2VzIHVzZWQgZm9yIFNHUiBjb250cm9sIHNlcXVlbmNl IHBhcmFtZXRlcnMKKzMwIHRvIDM3IChmb3JlZ3JvdW5kIGNvbG9ycykgYW5kIDQwIHRvIDQ3 IChiYWNrZ3JvdW5kIGNvbG9ycykuCisKK1BhcmFtZXRlciAgQ29sb3IKKyAgMzAgIDQwICAg YmxhY2sKKyAgMzEgIDQxICAgcmVkCisgIDMyICA0MiAgIGdyZWVuCisgIDMzICA0MyAgIHll bGxvdworICAzNCAgNDQgICBibHVlCisgIDM1ICA0NSAgIG1hZ2VudGEKKyAgMzYgIDQ2ICAg Y3lhbgorICAzNyAgNDcgICB3aGl0ZSIpCisKKyhkZWZ2YXIgYW5zaS1jb2xvci1icmlnaHQt Y29sb3JzLXZlY3RvcgorICBbYW5zaS1jb2xvci1icmlnaHQtYmxhY2sKKyAgIGFuc2ktY29s b3ItYnJpZ2h0LXJlZAorICAgYW5zaS1jb2xvci1icmlnaHQtZ3JlZW4KKyAgIGFuc2ktY29s b3ItYnJpZ2h0LXllbGxvdworICAgYW5zaS1jb2xvci1icmlnaHQtYmx1ZQorICAgYW5zaS1j b2xvci1icmlnaHQtbWFnZW50YQorICAgYW5zaS1jb2xvci1icmlnaHQtY3lhbgorICAgYW5z aS1jb2xvci1icmlnaHQtd2hpdGVdCisgICJGYWNlcyB1c2VkIGZvciBTR1IgY29udHJvbCBz ZXF1ZW5jZXMgZGV0ZXJtaW5pbmcgYSBcImJyaWdodFwiIGNvbG9yLgorVGhpcyB2ZWN0b3Ig aG9sZHMgdGhlIGZhY2VzIHVzZWQgZm9yIFNHUiBjb250cm9sIHNlcXVlbmNlIHBhcmFtZXRl cnMKKzkwIHRvIDk3IChicmlnaHQgZm9yZWdyb3VuZCBjb2xvcnMpIGFuZCAxMDAgdG8gMTA3 IChicmlnaHQgYmFja2dyb3VuZAorY29sb3JzKS4KKworUGFyYW1ldGVyICAgQ29sb3IKKyAg OTAgIDEwMCAgIGJyaWdodCBibGFjaworICA5MSAgMTAxICAgYnJpZ2h0IHJlZAorICA5MiAg MTAyICAgYnJpZ2h0IGdyZWVuCisgIDkzICAxMDMgICBicmlnaHQgeWVsbG93CisgIDk0ICAx MDQgICBicmlnaHQgYmx1ZQorICA5NSAgMTA1ICAgYnJpZ2h0IG1hZ2VudGEKKyAgOTYgIDEw NiAgIGJyaWdodCBjeWFuCisgIDk3ICAxMDcgICBicmlnaHQgd2hpdGUiKQorCisoZGVmY3Vz dG9tIGFuc2ktY29sb3ItYm9sZC1pcy1icmlnaHQgbmlsCisgICJJZiBzZXQgdG8gbm9uLW5p bCwgY29tYmluaW5nIEFOU0kgYm9sZCBhbmQgYSBjb2xvciBwcm9kdWNlcyB0aGUgYnJpZ2h0 Cit2ZXJzaW9uIG9mIHRoYXQgY29sb3IuIgorICA6dHlwZSAnYm9vbGVhbgorICA6dmVyc2lv biAiMjguMSIKKyAgOmdyb3VwICdhbnNpLWNvbG9ycykKIAogKGRlZmNvbnN0IGFuc2ktY29s b3ItY29udHJvbC1zZXEtcmVnZXhwCiAgIDs7IFNlZSBFQ01BIDQ4LCBzZWN0aW9uIDUuNCAi Q29udHJvbCBTZXF1ZW5jZXMiLgpAQCAtMzA0LDEzICs0OTYsMTUgQEAgYW5zaS1jb2xvci1m aWx0ZXItYXBwbHkKIAogKGRlZnVuIGFuc2ktY29sb3ItLWZpbmQtZmFjZSAoY29kZXMpCiAg ICJSZXR1cm4gdGhlIGZhY2UgY29ycmVzcG9uZGluZyB0byBDT0RFUy4iCi0gIChsZXQgKGZh Y2VzKQorICA7OyBTb3J0IHRoZSBjb2RlcyBpbiBhc2NlbmRpbmcgb3JkZXIgdG8gZ3VhcmFu dGVlIHRoYXQgImJvbGQiIGNvbWVzIGJlZm9yZQorICA7OyBhbnkgb2YgdGhlIGNvbG9ycy4g IFRoaXMgZW5zdXJlcyB0aGF0IGBhbnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0JyBpcworICA7 OyBhcHBsaWVkIGNvcnJlY3RseS4KKyAgKGxldCAoZmFjZXMgYnJpZ2h0IChjb2RlcyAoc29y dCAoY29weS1zZXF1ZW5jZSBjb2RlcykgIyc8KSkpCiAgICAgKHdoaWxlIGNvZGVzCi0gICAg ICAobGV0ICgoZmFjZSAoYW5zaS1jb2xvci1nZXQtZmFjZS0xIChwb3AgY29kZXMpKSkpCi0J OzsgSW4gdGhlIChkZWZhdWx0IHVuZGVybGluZSkgZmFjZSwgc2F5LCB0aGUgdmFsdWUgb2Yg dGhlCi0JOzsgInVuZGVybGluZSIgYXR0cmlidXRlIG9mIHRoZSBgZGVmYXVsdCcgZmFjZSB3 aW5zLgotCSh1bmxlc3MgKGVxIGZhY2UgJ2RlZmF1bHQpCi0JICAocHVzaCBmYWNlIGZhY2Vz KSkpKQorICAgICAgKHdoZW4tbGV0ICgoZmFjZSAoYW5zaS1jb2xvci1nZXQtZmFjZS0xIChw b3AgY29kZXMpIGJyaWdodCkpKQorICAgICAgICAod2hlbiAoYW5kIGFuc2ktY29sb3ItYm9s ZC1pcy1icmlnaHQgKGVxIGZhY2UgJ2Fuc2ktY29sb3ItYm9sZCkpCisgICAgICAgICAgKHNl dHEgYnJpZ2h0IHQpKQorICAgICAgICAocHVzaCBmYWNlIGZhY2VzKSkpCiAgICAgOzsgQXZv aWQgc29tZSBsb25nLWxpdmVkIGNvbnNlcyBpbiB0aGUgY29tbW9uIGNhc2UuCiAgICAgKGlm IChjZHIgZmFjZXMpCiAJKG5yZXZlcnNlIGZhY2VzKQpAQCAtMzIxLDkgKzUxNSw4IEBAIGFu c2ktY29sb3ItYXBwbHkKIERlbGV0ZSBhbGwgb3RoZXIgY29udHJvbCBzZXF1ZW5jZXMgd2l0 aG91dCBwcm9jZXNzaW5nIHRoZW0uCiAKIEFwcGxpZXMgU0dSIGNvbnRyb2wgc2VxdWVuY2Vz IHNldHRpbmcgZm9yZWdyb3VuZCBhbmQgYmFja2dyb3VuZCBjb2xvcnMKLXRvIFNUUklORyB1 c2luZyB0ZXh0IHByb3BlcnRpZXMgYW5kIHJldHVybnMgdGhlIHJlc3VsdC4gIFRoZSBjb2xv cnMgdXNlZAotYXJlIGdpdmVuIGluIGBhbnNpLWNvbG9yLWZhY2VzLXZlY3RvcicgYW5kIGBh bnNpLWNvbG9yLW5hbWVzLXZlY3RvcicuCi1TZWUgZnVuY3Rpb24gYGFuc2ktY29sb3ItYXBw bHktc2VxdWVuY2UnIGZvciBkZXRhaWxzLgordG8gU1RSSU5HIHVzaW5nIHRleHQgcHJvcGVy dGllcyBhbmQgcmV0dXJucyB0aGUgcmVzdWx0LiAgU2VlIGZ1bmN0aW9uCitgYW5zaS1jb2xv ci1hcHBseS1zZXF1ZW5jZScgZm9yIGRldGFpbHMuCiAKIEV2ZXJ5IGNhbGwgdG8gdGhpcyBm dW5jdGlvbiB3aWxsIHNldCBhbmQgdXNlIHRoZSBidWZmZXItbG9jYWwgdmFyaWFibGUKIGBh bnNpLWNvbG9yLWNvbnRleHQnIHRvIHNhdmUgcGFydGlhbCBlc2NhcGUgc2VxdWVuY2VzIGFu ZCBjdXJyZW50IGFuc2kgY29kZXMuCkBAIC00MDIsOCArNTk1LDcgQEAgYW5zaS1jb2xvci1h cHBseS1vbi1yZWdpb24KIFNHUiBjb250cm9sIHNlcXVlbmNlcyBhcmUgYXBwbGllZCBieSBj YWxsaW5nIHRoZSBmdW5jdGlvbgogc3BlY2lmaWVkIGJ5IGBhbnNpLWNvbG9yLWFwcGx5LWZh Y2UtZnVuY3Rpb24nLiAgVGhlIGRlZmF1bHQKIGZ1bmN0aW9uIHNldHMgZm9yZWdyb3VuZCBh bmQgYmFja2dyb3VuZCBjb2xvcnMgdG8gdGhlIHRleHQKLWJldHdlZW4gQkVHSU4gYW5kIEVO RCwgdXNpbmcgb3ZlcmxheXMuICBUaGUgY29sb3JzIHVzZWQgYXJlIGdpdmVuCi1pbiBgYW5z aS1jb2xvci1mYWNlcy12ZWN0b3InIGFuZCBgYW5zaS1jb2xvci1uYW1lcy12ZWN0b3InLiAg U2VlCitiZXR3ZWVuIEJFR0lOIGFuZCBFTkQsIHVzaW5nIG92ZXJsYXlzLiAgU2VlIGZ1bmN0 aW9uCiBgYW5zaS1jb2xvci1hcHBseS1zZXF1ZW5jZScgZm9yIGRldGFpbHMuCiAKIEV2ZXJ5 IGNhbGwgdG8gdGhpcyBmdW5jdGlvbiB3aWxsIHNldCBhbmQgdXNlIHRoZSBidWZmZXItbG9j YWwKQEAgLTU3MCwxMSArNzYyLDExIEBAIGFuc2ktY29sb3ItYXBwbHktc2VxdWVuY2UKIAog Rm9yIGVhY2ggbmV3IGNvZGUsIHRoZSBmb2xsb3dpbmcgaGFwcGVuczogaWYgaXQgaXMgMS03 LCBhZGQgaXQgdG8KIHRoZSBsaXN0IG9mIGNvZGVzOyBpZiBpdCBpcyAyMS0yNSBvciAyNywg ZGVsZXRlIGFwcHJvcHJpYXRlCi1wYXJhbWV0ZXJzIGZyb20gdGhlIGxpc3Qgb2YgY29kZXM7 IGlmIGl0IGlzIDMwLTM3IHJlc3AuIDM5LCB0aGUKLWZvcmVncm91bmQgY29sb3IgY29kZSBp cyByZXBsYWNlZCBvciBhZGRlZCByZXNwLiBkZWxldGVkOyBpZiBpdAotaXMgNDAtNDcgcmVz cC4gNDksIHRoZSBiYWNrZ3JvdW5kIGNvbG9yIGNvZGUgaXMgcmVwbGFjZWQgb3IgYWRkZWQK LXJlc3AuIGRlbGV0ZWQ7IGFueSBvdGhlciBjb2RlIGlzIGRpc2NhcmRlZCB0b2dldGhlciB3 aXRoIHRoZSBvbGQKLWNvZGVzLglGaW5hbGx5LCB0aGUgc28gY2hhbmdlZCBsaXN0IG9mIGNv ZGVzIGlzIHJldHVybmVkLiIKK3BhcmFtZXRlcnMgZnJvbSB0aGUgbGlzdCBvZiBjb2Rlczsg aWYgaXQgaXMgMzAtMzcgKG9yIDkwLTk3KSByZXNwLiAzOSwKK3RoZSBmb3JlZ3JvdW5kIGNv bG9yIGNvZGUgaXMgcmVwbGFjZWQgb3IgYWRkZWQgcmVzcC4gZGVsZXRlZDsgaWYgaXQKK2lz IDQwLTQ3IChvciAxMDAtMTA3KSByZXNwLiA0OSwgdGhlIGJhY2tncm91bmQgY29sb3IgY29k ZSBpcyByZXBsYWNlZAorb3IgYWRkZWQgcmVzcC4gZGVsZXRlZDsgYW55IG90aGVyIGNvZGUg aXMgZGlzY2FyZGVkIHRvZ2V0aGVyIHdpdGggdGhlCitvbGQgY29kZXMuICBGaW5hbGx5LCB0 aGUgc28gY2hhbmdlZCBsaXN0IG9mIGNvZGVzIGlzIHJldHVybmVkLiIKICAgKGxldCAoKG5l dy1jb2RlcyAoYW5zaS1jb2xvci1wYXJzZS1zZXF1ZW5jZSBlc2NhcGUtc2VxdWVuY2UpKSkK ICAgICAod2hpbGUgbmV3LWNvZGVzCiAgICAgICAobGV0KiAoKG5ldyAocG9wIG5ldy1jb2Rl cykpCkBAIC01OTEsNyArNzgzLDcgQEAgYW5zaS1jb2xvci1hcHBseS1zZXF1ZW5jZQogCQkJ CQkoMjIgKHJlbXEgMSBjb2RlcykpCiAJCQkJCSgyNSAocmVtcSA2IGNvZGVzKSkKIAkJCQkJ KF8gY29kZXMpKSkpKQotCQkoKG9yIDMgNCkgKGxldCAoKHIgKG1vZCBuZXcgMTApKSkKKwkJ KChvciAzIDQgOSAxMCkgKGxldCAoKHIgKG1vZCBuZXcgMTApKSkKIAkJCSAgICAodW5sZXNz ICg9IHIgOCkKIAkJCSAgICAgIChsZXQgKGJlZykKIAkJCQkod2hpbGUgKGFuZCBjb2RlcyAo Lz0gcSAoLyAoY2FyIGNvZGVzKSAxMCkpKQpAQCAtNjEwLDcgKzgwMiw5IEBAIGFuc2ktY29s b3ItbWFrZS1jb2xvci1tYXAKIGBhbnNpLWNvbG9yLW1hcCcgZm9yIGFuIGV4YW1wbGUuCiAK IFRoZSBmYWNlIGRlZmluaXRpb25zIGFyZSBiYXNlZCB1cG9uIHRoZSB2YXJpYWJsZXMKLWBh bnNpLWNvbG9yLWZhY2VzLXZlY3RvcicgYW5kIGBhbnNpLWNvbG9yLW5hbWVzLXZlY3Rvcicu IgorYGFuc2ktY29sb3ItZmFjZXMtdmVjdG9yJyBhbmQgYGFuc2ktY29sb3ItbmFtZXMtdmVj dG9yJy4KKworVGhpcyBmdW5jdGlvbiBpcyBvYnNvbGV0ZSwgYW5kIG5vIGxvbmdlciBuZWVk ZWQgdG8gdXNlIGFuc2ktY29sb3IuIgogICAobGV0ICgobWFwIChtYWtlLXZlY3RvciA1MCBu aWwpKQogICAgICAgICAoaW5kZXggMCkpCiAgICAgOzsgbWlzY2VsbGFuZW91cyBhdHRyaWJ1 dGVzCkBAIC02MzgsMzQgKzgzMiw1NyBAQCBhbnNpLWNvbG9yLW1ha2UtY29sb3ItbWFwCiAg ICAgICAgKHNldHEgaW5kZXggKDErIGluZGV4KSkgKQogICAgICBhbnNpLWNvbG9yLW5hbWVz LXZlY3RvcikKICAgICBtYXApKQorKG1ha2Utb2Jzb2xldGUgJ2Fuc2ktY29sb3ItbWFrZS1j b2xvci1tYXAgInlvdSBjYW4gcmVtb3ZlIGl0LiIgIjI4LjEiKQogCi0oZGVmdmFyIGFuc2kt Y29sb3ItbWFwIChhbnNpLWNvbG9yLW1ha2UtY29sb3ItbWFwKQotICAiQSBicmFuZCBuZXcg Y29sb3IgbWFwIHN1aXRhYmxlIGZvciBgYW5zaS1jb2xvci1nZXQtZmFjZScuCisoZGVmdmFy IGFuc2ktY29sb3ItbWFwCisgICh3aXRoLW5vLXdhcm5pbmdzIChhbnNpLWNvbG9yLW1ha2Ut Y29sb3ItbWFwKSkKKyAgIkEgYnJhbmQgbmV3IGNvbG9yIG1hcCwgZm9ybWVybHkgc3VpdGFi bGUgZm9yIGBhbnNpLWNvbG9yLWdldC1mYWNlJy4KIAogVGhlIHZhbHVlIG9mIHRoaXMgdmFy aWFibGUgaXMgdXN1YWxseSBjb25zdHJ1Y3RlZCBieQogYGFuc2ktY29sb3ItbWFrZS1jb2xv ci1tYXAnLiAgVGhlIHZhbHVlcyBpbiB0aGUgYXJyYXkgYXJlIHN1Y2ggdGhhdCB0aGUKIG51 bWJlcnMgaW5jbHVkZWQgaW4gYW4gU0dSIGNvbnRyb2wgc2VxdWVuY2VzIHBvaW50IHRvIHRo ZSBjb3JyZWN0CiBmb3JlZ3JvdW5kIG9yIGJhY2tncm91bmQgY29sb3JzLgogCi1FeGFtcGxl OiBUaGUgc2VxdWVuY2UgXFwwMzNbMzRtIHNwZWNpZmllcyBhIGJsdWUgZm9yZWdyb3VuZC4g IFRoZXJlZm9yZToKLSAgICAgKGFyZWYgYW5zaS1jb2xvci1tYXAgMzQpCi0gICAgICAgICAg PT4gKGZvcmVncm91bmQtY29sb3IgLiBcImJsdWVcIikiKQorVGhpcyB2YXJpYWJsZSBpcyBv YnNvbGV0ZSwgYW5kIG5vIGxvbmdlciBuZWVkZWQgdG8gdXNlIGFuc2ktY29sb3IuIikKKyht YWtlLW9ic29sZXRlLXZhcmlhYmxlICdhbnNpLWNvbG9yLW1hcCAieW91IGNhbiByZW1vdmUg aXQuIiAiMjguMSIpCiAKIChkZWZ1biBhbnNpLWNvbG9yLW1hcC11cGRhdGUgKHN5bWJvbCB2 YWx1ZSkKICAgIlVwZGF0ZSBgYW5zaS1jb2xvci1tYXAnLgogCi1XaGVuZXZlciB0aGUgdmVj dG9ycyB1c2VkIHRvIGNvbnN0cnVjdCBgYW5zaS1jb2xvci1tYXAnIGFyZSBjaGFuZ2VkLAot dGhpcyBmdW5jdGlvbiBpcyBjYWxsZWQuICBUaGVyZWZvcmUgdGhpcyBmdW5jdGlvbiBpcyBs aXN0ZWQgYXMgdGhlIDpzZXQKLXByb3BlcnR5IG9mIGBhbnNpLWNvbG9yLWZhY2VzLXZlY3Rv cicgYW5kIGBhbnNpLWNvbG9yLW5hbWVzLXZlY3RvcicuIgorVGhpcyBmdW5jdGlvbiBpcyBv YnNvbGV0ZSwgYW5kIG5vIGxvbmdlciBuZWVkZWQgdG8gdXNlIGFuc2ktY29sb3IuIgogICAo c2V0LWRlZmF1bHQgc3ltYm9sIHZhbHVlKQotICAoc2V0cSBhbnNpLWNvbG9yLW1hcCAoYW5z aS1jb2xvci1tYWtlLWNvbG9yLW1hcCkpKQotCi0oZGVmdW4gYW5zaS1jb2xvci1nZXQtZmFj ZS0xIChhbnNpLWNvZGUpCi0gICJHZXQgZmFjZSBkZWZpbml0aW9uIGZyb20gYGFuc2ktY29s b3ItbWFwJy4KLUFOU0ktQ09ERSBpcyB1c2VkIGFzIGFuIGluZGV4IGludG8gdGhlIHZlY3Rv ci4iCi0gIChjb25kaXRpb24tY2FzZSBuaWwKLSAgICAgIChhcmVmIGFuc2ktY29sb3ItbWFw IGFuc2ktY29kZSkKLSAgICAoYXJncy1vdXQtb2YtcmFuZ2UgbmlsKSkpCisgICh3aXRoLW5v LXdhcm5pbmdzCisgICAgKHNldHEgYW5zaS1jb2xvci1tYXAgKGFuc2ktY29sb3ItbWFrZS1j b2xvci1tYXApKSkpCisobWFrZS1vYnNvbGV0ZSAnYW5zaS1jb2xvci1tYXAtdXBkYXRlICJ5 b3UgY2FuIHJlbW92ZSBpdC4iICIyOC4xIikKKworKGRlZnVuIGFuc2ktY29sb3ItZ2V0LWZh Y2UtMSAoYW5zaS1jb2RlICZvcHRpb25hbCBicmlnaHQpCisgICJHZXQgZmFjZSBkZWZpbml0 aW9uIGZvciBBTlNJLUNPREUuCitCUklHSFQsIGlmIG5vbi1uaWwsIHJlcXVlc3RzIFwiYnJp Z2h0XCIgQU5TSSBjb2xvcnMsIGV2ZW4gaWYgQU5TSS1DT0RFCitpcyBhIG5vcm1hbC1pbnRl bnNpdHkgY29sb3IuIgorICAod2hlbiAoYW5kIGJyaWdodCAoPD0gMzAgYW5zaS1jb2RlIDQ5 KSkKKyAgICAoc2V0cSBhbnNpLWNvZGUgKCsgYW5zaS1jb2RlIDYwKSkpCisgIChjb25kICgo PD0gMCBhbnNpLWNvZGUgNykKKyAgICAgICAgIChhcmVmIGFuc2ktY29sb3ItYmFzaWMtZmFj ZXMtdmVjdG9yIGFuc2ktY29kZSkpCisgICAgICAgICgoPD0gMzAgYW5zaS1jb2RlIDM4KQor ICAgICAgICAgKGxpc3QgOmZvcmVncm91bmQKKyAgICAgICAgICAgICAgIChmYWNlLWZvcmVn cm91bmQKKyAgICAgICAgICAgICAgICAoYXJlZiBhbnNpLWNvbG9yLW5vcm1hbC1jb2xvcnMt dmVjdG9yICgtIGFuc2ktY29kZSAzMCkpCisgICAgICAgICAgICAgICAgbmlsICdkZWZhdWx0 KSkpCisgICAgICAgICgoPD0gNDAgYW5zaS1jb2RlIDQ4KQorICAgICAgICAgKGxpc3QgOmJh Y2tncm91bmQKKyAgICAgICAgICAgICAgIChmYWNlLWJhY2tncm91bmQKKyAgICAgICAgICAg ICAgICAoYXJlZiBhbnNpLWNvbG9yLW5vcm1hbC1jb2xvcnMtdmVjdG9yICgtIGFuc2ktY29k ZSA0MCkpCisgICAgICAgICAgICAgICAgbmlsICdkZWZhdWx0KSkpCisgICAgICAgICgoPD0g OTAgYW5zaS1jb2RlIDk4KQorICAgICAgICAgKGxpc3QgOmZvcmVncm91bmQKKyAgICAgICAg ICAgICAgIChmYWNlLWZvcmVncm91bmQKKyAgICAgICAgICAgICAgICAoYXJlZiBhbnNpLWNv bG9yLWJyaWdodC1jb2xvcnMtdmVjdG9yICgtIGFuc2ktY29kZSA5MCkpCisgICAgICAgICAg ICAgICAgbmlsICdkZWZhdWx0KSkpCisgICAgICAgICgoPD0gMTAwIGFuc2ktY29kZSAxMDgp CisgICAgICAgICAobGlzdCA6YmFja2dyb3VuZAorICAgICAgICAgICAgICAgKGZhY2UtYmFj a2dyb3VuZAorICAgICAgICAgICAgICAgIChhcmVmIGFuc2ktY29sb3ItYnJpZ2h0LWNvbG9y cy12ZWN0b3IgKC0gYW5zaS1jb2RlIDEwMCkpCisgICAgICAgICAgICAgICAgbmlsICdkZWZh dWx0KSkpKSkKIAogKHByb3ZpZGUgJ2Fuc2ktY29sb3IpCiAKZGlmZiAtLWdpdCBhL2xpc3Av bWFuLmVsIGIvbGlzcC9tYW4uZWwKaW5kZXggNjAwOWEzMTkxOS4uODQyODdjOWY5ZCAxMDA2 NDQKLS0tIGEvbGlzcC9tYW4uZWwKKysrIGIvbGlzcC9tYW4uZWwKQEAgLTE0MSwxMSArMTQx LDIxIEBAIE1hbi1yZXZlcnNlCiAgIDpncm91cCAnbWFuCiAgIDp2ZXJzaW9uICIyNC4zIikK IAotKGRlZnZhciBNYW4tYW5zaS1jb2xvci1tYXAgKGxldCAoKGFuc2ktY29sb3ItZmFjZXMt dmVjdG9yCi0JCQkJICBbIGRlZmF1bHQgTWFuLW92ZXJzdHJpa2UgZGVmYXVsdCBNYW4tdW5k ZXJsaW5lCi0JCQkJICAgIE1hbi11bmRlcmxpbmUgZGVmYXVsdCBkZWZhdWx0IE1hbi1yZXZl cnNlIF0pKQotCQkJICAgICAoYW5zaS1jb2xvci1tYWtlLWNvbG9yLW1hcCkpCi0gICJUaGUg dmFsdWUgdXNlZCBoZXJlIGZvciBgYW5zaS1jb2xvci1tYXAnLiIpCisoZGVmdmFyIE1hbi1h bnNpLWNvbG9yLWJhc2ljLWZhY2VzLXZlY3RvcgorICBbbmlsIE1hbi1vdmVyc3RyaWtlIG5p bCBNYW4tdW5kZXJsaW5lIE1hbi11bmRlcmxpbmUgbmlsIG5pbCBNYW4tcmV2ZXJzZV0KKyAg IlRoZSB2YWx1ZSB1c2VkIGhlcmUgZm9yIGBhbnNpLWNvbG9yLWJhc2ljLWZhY2VzLXZlY3Rv cicuIikKKworKGRlZnZhciBNYW4tYW5zaS1jb2xvci1tYXAKKyAgKHdpdGgtbm8td2Fybmlu Z3MKKyAgICAobGV0ICgoYW5zaS1jb2xvci1mYWNlcy12ZWN0b3IgTWFuLWFuc2ktY29sb3It YmFzaWMtZmFjZXMtdmVjdG9yKSkKKyAgICAgICAgICAgWyBkZWZhdWx0IE1hbi1vdmVyc3Ry aWtlIGRlZmF1bHQgTWFuLXVuZGVybGluZQorICAgICAgICAgICAgIE1hbi11bmRlcmxpbmUg ZGVmYXVsdCBkZWZhdWx0IE1hbi1yZXZlcnNlIF0pKQorICAgICAgKGFuc2ktY29sb3ItbWFr ZS1jb2xvci1tYXApKSkKKyAgIlRoZSB2YWx1ZSBmb3JtZXJseSB1c2VkIGhlcmUgZm9yIGBh bnNpLWNvbG9yLW1hcCcuCitUaGlzIHZhcmlhYmxlIGlzIG9ic29sZXRlLiAgVG8gY3VzdG9t aXplIHRoZSBmYWNlcyB1c2VkIGJ5IGFuc2ktY29sb3IsCitzZXQgYE1hbi1hbnNpLWNvbG9y LWJhc2ljLWZhY2VzLXZlY3RvcicuIikKKyhtYWtlLW9ic29sZXRlLXZhcmlhYmxlICdNYW4t YW5zaS1jb2xvci1tYXAKKyAgICAgICAgICAgICAgICAgICAgICAgICdNYW4tYW5zaS1jb2xv ci1iYXNpYy1mYWNlcy12ZWN0b3IgIjI4LjEiKQogCiAoZGVmY3VzdG9tIE1hbi1ub3RpZnkt bWV0aG9kICdmcmllbmRseQogICAiU2VsZWN0cyB0aGUgYmVoYXZpb3Igd2hlbiBtYW5wYWdl IGlzIHJlYWR5LgpAQCAtMTI0Myw3ICsxMjUzLDcgQEAgTWFuLWZvbnRpZnktbWFucGFnZQog ICAoZ290by1jaGFyIChwb2ludC1taW4pKQogICA7OyBGb250aWZ5IEFOU0kgZXNjYXBlcy4K ICAgKGxldCAoKGFuc2ktY29sb3ItYXBwbHktZmFjZS1mdW5jdGlvbiAjJ2Fuc2ktY29sb3It YXBwbHktdGV4dC1wcm9wZXJ0eS1mYWNlKQotCShhbnNpLWNvbG9yLW1hcCBNYW4tYW5zaS1j b2xvci1tYXApKQorCShhbnNpLWNvbG9yLWJhc2ljLWZhY2VzLXZlY3RvciBNYW4tYW5zaS1j b2xvci1iYXNpYy1mYWNlcy12ZWN0b3IpKQogICAgIChhbnNpLWNvbG9yLWFwcGx5LW9uLXJl Z2lvbiAocG9pbnQtbWluKSAocG9pbnQtbWF4KSkpCiAgIDs7IE90aGVyIGhpZ2hsaWdodGlu Zy4KICAgKGxldCAoKGJ1ZmZlci11bmRvLWxpc3QgdCkpCmRpZmYgLS1naXQgYS90ZXN0L2xp c3AvYW5zaS1jb2xvci10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9hbnNpLWNvbG9yLXRlc3RzLmVs CmluZGV4IDEwN2RjOGU0MDAuLmRmNjc0ZGZjN2YgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9h bnNpLWNvbG9yLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9hbnNpLWNvbG9yLXRlc3RzLmVs CkBAIC0yNSwxNyArMjUsNTggQEAKIDs7OyBDb2RlOgogCiAocmVxdWlyZSAnYW5zaS1jb2xv cikKKyhldmFsLXdoZW4tY29tcGlsZSAocmVxdWlyZSAnY2wtbGliKSkKIAotKGRlZnZhciB0 ZXN0LXN0cmluZ3MgJygoIlxlWzMzbUhlbGxvIFdvcmxkXGVbMG0iIC4gIkhlbGxvIFdvcmxk IikKLSAgICAgICAgICAgICAgICAgICAgICAgKCJcZVsxbVxlWzNtXGVbNW1ib2xkIGl0YWxp Y3MgYmxpbmtcZVswbSIgLiAiYm9sZCBpdGFsaWNzIGJsaW5rIikpKQorKGRlZnZhciB5ZWxs b3cgKGZhY2UtZm9yZWdyb3VuZCAnYW5zaS1jb2xvci15ZWxsb3cgbmlsICdkZWZhdWx0KSkK KyhkZWZ2YXIgYnJpZ2h0LXllbGxvdyAoZmFjZS1mb3JlZ3JvdW5kICdhbnNpLWNvbG9yLWJy aWdodC15ZWxsb3cgbmlsICdkZWZhdWx0KSkKKworKGRlZnZhciB0ZXN0LXN0cmluZ3MKKyAg YCgoIkhlbGxvIFdvcmxkIiAiSGVsbG8gV29ybGQiKQorICAgICgiXGVbMzNtSGVsbG8gV29y bGRcZVswbSIgIkhlbGxvIFdvcmxkIgorICAgICAoOmZvcmVncm91bmQgLHllbGxvdykpCisg ICAgKCJcZVs0M21IZWxsbyBXb3JsZFxlWzBtIiAiSGVsbG8gV29ybGQiCisgICAgICg6YmFj a2dyb3VuZCAseWVsbG93KSkKKyAgICAoIlxlWzkzbUhlbGxvIFdvcmxkXGVbMG0iICJIZWxs byBXb3JsZCIKKyAgICAgKDpmb3JlZ3JvdW5kICxicmlnaHQteWVsbG93KSkKKyAgICAoIlxl WzEwM21IZWxsbyBXb3JsZFxlWzBtIiAiSGVsbG8gV29ybGQiCisgICAgICg6YmFja2dyb3Vu ZCAsYnJpZ2h0LXllbGxvdykpCisgICAgKCJcZVsxOzMzbUhlbGxvIFdvcmxkXGVbMG0iICJI ZWxsbyBXb3JsZCIKKyAgICAgKGFuc2ktY29sb3ItYm9sZCAoOmZvcmVncm91bmQgLHllbGxv dykpCisgICAgIChhbnNpLWNvbG9yLWJvbGQgKDpmb3JlZ3JvdW5kICxicmlnaHQteWVsbG93 KSkpCisgICAgKCJcZVszMzsxbUhlbGxvIFdvcmxkXGVbMG0iICJIZWxsbyBXb3JsZCIKKyAg ICAgKGFuc2ktY29sb3ItYm9sZCAoOmZvcmVncm91bmQgLHllbGxvdykpCisgICAgIChhbnNp LWNvbG9yLWJvbGQgKDpmb3JlZ3JvdW5kICxicmlnaHQteWVsbG93KSkpCisgICAgKCJcZVsx bVxlWzMzbUhlbGxvIFdvcmxkXGVbMG0iICJIZWxsbyBXb3JsZCIKKyAgICAgKGFuc2ktY29s b3ItYm9sZCAoOmZvcmVncm91bmQgLHllbGxvdykpCisgICAgIChhbnNpLWNvbG9yLWJvbGQg KDpmb3JlZ3JvdW5kICxicmlnaHQteWVsbG93KSkpCisgICAgKCJcZVszM21cZVsxbUhlbGxv IFdvcmxkXGVbMG0iICJIZWxsbyBXb3JsZCIKKyAgICAgKGFuc2ktY29sb3ItYm9sZCAoOmZv cmVncm91bmQgLHllbGxvdykpCisgICAgIChhbnNpLWNvbG9yLWJvbGQgKDpmb3JlZ3JvdW5k ICxicmlnaHQteWVsbG93KSkpCisgICAgKCJcZVsxbVxlWzNtXGVbNW1ib2xkIGl0YWxpY3Mg YmxpbmtcZVswbSIgImJvbGQgaXRhbGljcyBibGluayIKKyAgICAgKGFuc2ktY29sb3ItYm9s ZCBhbnNpLWNvbG9yLWl0YWxpYyBhbnNpLWNvbG9yLXNsb3ctYmxpbmspKQorICAgICgiXGVb MTBtdW5yZWNvZ25pemVkXGVbMG0iICJ1bnJlY29nbml6ZWQiKSkpCiAKIChlcnQtZGVmdGVz dCBhbnNpLWNvbG9yLWFwcGx5LW9uLXJlZ2lvbi10ZXN0ICgpCi0gICAgKGRvbGlzdCAocGFp ciB0ZXN0LXN0cmluZ3MpCi0gICAgICAod2l0aC10ZW1wLWJ1ZmZlcgotICAgICAgICAoaW5z ZXJ0IChjYXIgcGFpcikpCisgIChwY2FzZS1kb2xpc3QgKGAoLGlucHV0ICx0ZXh0ICxmYWNl KSB0ZXN0LXN0cmluZ3MpCisgICAgKHdpdGgtdGVtcC1idWZmZXIKKyAgICAgIChpbnNlcnQg aW5wdXQpCisgICAgICAoYW5zaS1jb2xvci1hcHBseS1vbi1yZWdpb24gKHBvaW50LW1pbikg KHBvaW50LW1heCkpCisgICAgICAoc2hvdWxkIChlcXVhbCAoYnVmZmVyLXN0cmluZykgdGV4 dCkpCisgICAgICAoc2hvdWxkIChlcXVhbCAoZ2V0LWNoYXItcHJvcGVydHkgKHBvaW50LW1p bikgJ2ZhY2UpIGZhY2UpKQorICAgICAgKHdoZW4gZmFjZQorICAgICAgICAoc2hvdWxkIChu b3QgKGVxdWFsIChvdmVybGF5cy1hdCAocG9pbnQtbWluKSkgbmlsKSkpKSkpKQorCisoZXJ0 LWRlZnRlc3QgYW5zaS1jb2xvci1hcHBseS1vbi1yZWdpb24tYm9sZC1pcy1icmlnaHQtdGVz dCAoKQorICAocGNhc2UtZG9saXN0IChgKCxpbnB1dCAsdGV4dCAsbm9ybWFsLWZhY2UgLGJy aWdodC1mYWNlKSB0ZXN0LXN0cmluZ3MpCisgICAgKHdpdGgtdGVtcC1idWZmZXIKKyAgICAg IChsZXQgKChhbnNpLWNvbG9yLWJvbGQtaXMtYnJpZ2h0IHQpCisgICAgICAgICAgICAoZmFj ZSAob3IgYnJpZ2h0LWZhY2Ugbm9ybWFsLWZhY2UpKSkKKyAgICAgICAgKGluc2VydCBpbnB1 dCkKICAgICAgICAgKGFuc2ktY29sb3ItYXBwbHktb24tcmVnaW9uIChwb2ludC1taW4pIChw b2ludC1tYXgpKQotICAgICAgICAoc2hvdWxkIChlcXVhbCAoYnVmZmVyLXN0cmluZykgKGNk ciBwYWlyKSkpCi0gICAgICAgIChzaG91bGQgKG5vdCAoZXF1YWwgKG92ZXJsYXlzLWF0IChw b2ludC1taW4pKSBuaWwpKSkpKSkKKyAgICAgICAgKHNob3VsZCAoZXF1YWwgKGJ1ZmZlci1z dHJpbmcpIHRleHQpKQorICAgICAgICAoc2hvdWxkIChlcXVhbCAoZ2V0LWNoYXItcHJvcGVy dHkgKHBvaW50LW1pbikgJ2ZhY2UpIGZhY2UpKQorICAgICAgICAod2hlbiBmYWNlCisgICAg ICAgICAgKHNob3VsZCAobm90IChlcXVhbCAob3ZlcmxheXMtYXQgKHBvaW50LW1pbikpIG5p bCkpKSkpKSkpCiAKIChlcnQtZGVmdGVzdCBhbnNpLWNvbG9yLWFwcGx5LW9uLXJlZ2lvbi1w cmVzZXJ2aW5nLXRlc3QgKCkKICAgICAoZG9saXN0IChwYWlyIHRlc3Qtc3RyaW5ncykKLS0g CjIuMjUuMQoK --------------387B348318050924D49CCE37 Content-Type: text/plain; charset=UTF-8; name="0002-Add-support-for-bright-ANSI-colors-in-term-mode.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0002-Add-support-for-bright-ANSI-colors-in-term-mode.patch" RnJvbSAxNjY5ODIyYWNhYTM2MjAxYTJiOGRkODFkOTNhM2M3MzdjOGM3MmQ5IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFdlZCwgMjIgU2VwIDIwMjEgMTg6Mzk6NTIgLTA3MDAKU3ViamVjdDogW1BB VENIIDIvMl0gQWRkIHN1cHBvcnQgZm9yICJicmlnaHQiIEFOU0kgY29sb3JzIGluIHRlcm0t bW9kZQoKKiBsaXN0L3Rlcm0uZWwgKGFuc2ktdGVybS1jb2xvci12ZWN0b3IpOiBBZGQgbmV3 IGZhY2VzLgoodGVybS1jb2xvci1ibGFjaywgdGVybS1jb2xvci1yZWQsIHRlcm0tY29sb3It Z3JlZW4sIHRlcm0tY29sb3IteWVsbG93KQoodGVybS1jb2xvci1ibHVlLCB0ZXJtLWNvbG9y LW1hZ2VudGEsIHRlcm0tY29sb3ItY3lhbiwgdGVybS1jb2xvci13aGl0ZSk6CkluaGVyaXQg ZnJvbSAnYW5zaS1jb2xvci1DT0xPUicuCih0ZXJtLWNvbG9yLWJyaWdodC1ibGFjaywgdGVy bS1jb2xvci1icmlnaHQtcmVkLCB0ZXJtLWNvbG9yLWJyaWdodC1ncmVlbikKKHRlcm0tY29s b3ItYnJpZ2h0LXllbGxvdywgdGVybS1jb2xvci1icmlnaHQtYmx1ZSkKKHRlcm0tY29sb3It YnJpZ2h0LW1hZ2VudGEsIHRlcm0tY29sb3ItYnJpZ2h0LWN5YW4pCih0ZXJtLWNvbG9yLWJy aWdodC13aGl0ZSk6IE5ldyBmYWNlcy4KKHRlcm0tLW1heWJlLWJyaWdodGVuLWNvbG9yKTog TmV3IGZ1bmN0aW9uLgoodGVybS1oYW5kbGUtY29sb3JzLWFycmF5KTogSGFuZGxlIGJyaWdo dCBjb2xvcnMuCiogdGVzdC9saXNwL3Rlcm0tdGVzdHMuZWwgKHRlcm0tY29sb3JzLCB0ZXJt LWNvbG9ycy1ib2xkLWlzLWJyaWdodCk6Ck5ldyBmdW5jdGlvbnMuCi0tLQogZXRjL05FV1Mg ICAgICAgICAgICAgICAgfCAgIDcgKysKIGxpc3AvdGVybS5lbCAgICAgICAgICAgIHwgMTg5 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIHRlc3QvbGlzcC90 ZXJtLXRlc3RzLmVsIHwgIDY1ICsrKysrKysrKysrKystCiAzIGZpbGVzIGNoYW5nZWQsIDIx MCBpbnNlcnRpb25zKCspLCA1MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ldGMvTkVX UyBiL2V0Yy9ORVdTCmluZGV4IGNmNjgyM2Y1MWIuLjI3YzY5OTZiYjMgMTAwNjQ0Ci0tLSBh L2V0Yy9ORVdTCisrKyBiL2V0Yy9ORVdTCkBAIC0xNTA4LDYgKzE1MDgsMTMgQEAgYmFzZWQg b24gdGhlIGN1cnJlbnQgd2luZG93IHNpemUuICBJbiBwcmV2aW91cyB2ZXJzaW9ucyBvZiBF bWFjcywgdGhpcwogd2FzIGFsd2F5cyBkb25lIChhbmQgdGhhdCBjb3VsZCBsZWFkIHRvIG9k ZCBkaXNwbGF5cyB3aGVuIHJlc2l6aW5nIHRoZQogd2luZG93IGFmdGVyIHN0YXJ0aW5nKS4g IFRoaXMgdmFyaWFibGUgZGVmYXVsdHMgdG8gbmlsLgogCistLS0KKyoqKiAndGVybS1tb2Rl JyBub3cgc3VwcG9ydHMgImJyaWdodCIgY29sb3IgY29kZXMuCisiQnJpZ2h0IiBBTlNJIGNv bG9yIGNvZGVzIGFyZSBub3cgZGlzcGxheWVkIHVzaW5nIHRoZSBjb2xvciB2YWx1ZXMKK2Rl ZmluZWQgaW4gJ3Rlcm0tY29sb3ItYnJpZ2h0LSonLiAgSW4gYWRkaXRpb24sIGJvbGQgdGV4 dCB3aXRoIHJlZ3VsYXIKK0FOU0kgY29sb3JzIGNhbiBiZSBkaXNwbGF5ZWQgYXMgImJyaWdo dCIgaWYgJ2Fuc2ktY29sb3ItYm9sZC1pcy1icmlnaHQnCitpcyBub24tbmlsLgorCiAqKiBF c2hlbGwKIAogLS0tCmRpZmYgLS1naXQgYS9saXNwL3Rlcm0uZWwgYi9saXNwL3Rlcm0uZWwK aW5kZXggYWY5MzA4OTEwNC4uZTc2ZWI3NzY0NyAxMDA2NDQKLS0tIGEvbGlzcC90ZXJtLmVs CisrKyBiL2xpc3AvdGVybS5lbApAQCAtNzI3LDcgKzcyNywxNSBAQCBhbnNpLXRlcm0tY29s b3ItdmVjdG9yCiAgICB0ZXJtLWNvbG9yLWJsdWUKICAgIHRlcm0tY29sb3ItbWFnZW50YQog ICAgdGVybS1jb2xvci1jeWFuCi0gICB0ZXJtLWNvbG9yLXdoaXRlXSkKKyAgIHRlcm0tY29s b3Itd2hpdGUKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LWJsYWNrCisgICB0ZXJtLWNvbG9yLWJy aWdodC1yZWQKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LWdyZWVuCisgICB0ZXJtLWNvbG9yLWJy aWdodC15ZWxsb3cKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LWJsdWUKKyAgIHRlcm0tY29sb3It YnJpZ2h0LW1hZ2VudGEKKyAgIHRlcm0tY29sb3ItYnJpZ2h0LWN5YW4KKyAgIHRlcm0tY29s b3ItYnJpZ2h0LXdoaXRlXSkKIAogKGRlZmN1c3RvbSB0ZXJtLWRlZmF1bHQtZmctY29sb3Ig bmlsCiAgICJJZiBub24tbmlsLCBkZWZhdWx0IGNvbG9yIGZvciBmb3JlZ3JvdW5kIGluIFRl cm0gbW9kZS4iCkBAIC03NTIsNTQgKzc2MCwxMTIgQEAgdGVybQogICA6Z3JvdXAgJ3Rlcm0p CiAKIChkZWZmYWNlIHRlcm0tYm9sZAotICAnKCh0IDpib2xkIHQpKQorICAnKCh0IDppbmhl cml0IGFuc2ktY29sb3ItYm9sZCkpCiAgICJEZWZhdWx0IGZhY2UgdG8gdXNlIGZvciBib2xk IHRleHQuIgotICA6Z3JvdXAgJ3Rlcm0pCisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAi MjguMSIpCiAKIChkZWZmYWNlIHRlcm0tdW5kZXJsaW5lCi0gICcoKHQgOnVuZGVybGluZSB0 KSkKKyAgJygodCA6aW5oZXJpdCBhbnNpLWNvbG9yLXVuZGVybGluZSkpCiAgICJEZWZhdWx0 IGZhY2UgdG8gdXNlIGZvciB1bmRlcmxpbmVkIHRleHQuIgotICA6Z3JvdXAgJ3Rlcm0pCisg IDpncm91cCAndGVybQorICA6dmVyc2lvbiAiMjguMSIpCiAKIChkZWZmYWNlIHRlcm0tY29s b3ItYmxhY2sKLSAgJygodCA6Zm9yZWdyb3VuZCAiYmxhY2siIDpiYWNrZ3JvdW5kICJibGFj ayIpKQorICAnKCh0IDppbmhlcml0IGFuc2ktY29sb3ItYmxhY2spKQogICAiRmFjZSB1c2Vk IHRvIHJlbmRlciBibGFjayBjb2xvciBjb2RlLiIKLSAgOmdyb3VwICd0ZXJtKQorICA6Z3Jv dXAgJ3Rlcm0KKyAgOnZlcnNpb24gIjI4LjEiKQogCiAoZGVmZmFjZSB0ZXJtLWNvbG9yLXJl ZAotICAnKCh0IDpmb3JlZ3JvdW5kICJyZWQzIiA6YmFja2dyb3VuZCAicmVkMyIpKQorICAn KCh0IDppbmhlcml0IGFuc2ktY29sb3ItcmVkKSkKICAgIkZhY2UgdXNlZCB0byByZW5kZXIg cmVkIGNvbG9yIGNvZGUuIgotICA6Z3JvdXAgJ3Rlcm0pCisgIDpncm91cCAndGVybQorICA6 dmVyc2lvbiAiMjguMSIpCiAKIChkZWZmYWNlIHRlcm0tY29sb3ItZ3JlZW4KLSAgJygodCA6 Zm9yZWdyb3VuZCAiZ3JlZW4zIiA6YmFja2dyb3VuZCAiZ3JlZW4zIikpCisgICcoKHQgOmlu aGVyaXQgYW5zaS1jb2xvci1ncmVlbikpCiAgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGdyZWVu IGNvbG9yIGNvZGUuIgotICA6Z3JvdXAgJ3Rlcm0pCisgIDpncm91cCAndGVybQorICA6dmVy c2lvbiAiMjguMSIpCiAKIChkZWZmYWNlIHRlcm0tY29sb3IteWVsbG93Ci0gICcoKHQgOmZv cmVncm91bmQgInllbGxvdzMiIDpiYWNrZ3JvdW5kICJ5ZWxsb3czIikpCisgICcoKHQgOmlu aGVyaXQgYW5zaS1jb2xvci15ZWxsb3cpKQogICAiRmFjZSB1c2VkIHRvIHJlbmRlciB5ZWxs b3cgY29sb3IgY29kZS4iCi0gIDpncm91cCAndGVybSkKKyAgOmdyb3VwICd0ZXJtCisgIDp2 ZXJzaW9uICIyOC4xIikKIAogKGRlZmZhY2UgdGVybS1jb2xvci1ibHVlCi0gICcoKHQgOmZv cmVncm91bmQgImJsdWUyIiA6YmFja2dyb3VuZCAiYmx1ZTIiKSkKKyAgJygodCA6aW5oZXJp dCBhbnNpLWNvbG9yLWJsdWUpKQogICAiRmFjZSB1c2VkIHRvIHJlbmRlciBibHVlIGNvbG9y IGNvZGUuIgotICA6Z3JvdXAgJ3Rlcm0pCisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAi MjguMSIpCiAKIChkZWZmYWNlIHRlcm0tY29sb3ItbWFnZW50YQotICAnKCh0IDpmb3JlZ3Jv dW5kICJtYWdlbnRhMyIgOmJhY2tncm91bmQgIm1hZ2VudGEzIikpCisgICcoKHQgOmluaGVy aXQgYW5zaS1jb2xvci1tYWdlbnRhKSkKICAgIkZhY2UgdXNlZCB0byByZW5kZXIgbWFnZW50 YSBjb2xvciBjb2RlLiIKLSAgOmdyb3VwICd0ZXJtKQorICA6Z3JvdXAgJ3Rlcm0KKyAgOnZl cnNpb24gIjI4LjEiKQogCiAoZGVmZmFjZSB0ZXJtLWNvbG9yLWN5YW4KLSAgJygodCA6Zm9y ZWdyb3VuZCAiY3lhbjMiIDpiYWNrZ3JvdW5kICJjeWFuMyIpKQorICAnKCh0IDppbmhlcml0 IGFuc2ktY29sb3ItY3lhbikpCiAgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGN5YW4gY29sb3Ig Y29kZS4iCi0gIDpncm91cCAndGVybSkKKyAgOmdyb3VwICd0ZXJtCisgIDp2ZXJzaW9uICIy OC4xIikKIAogKGRlZmZhY2UgdGVybS1jb2xvci13aGl0ZQotICAnKCh0IDpmb3JlZ3JvdW5k ICJ3aGl0ZSIgOmJhY2tncm91bmQgIndoaXRlIikpCisgICcoKHQgOmluaGVyaXQgYW5zaS1j b2xvci13aGl0ZSkpCiAgICJGYWNlIHVzZWQgdG8gcmVuZGVyIHdoaXRlIGNvbG9yIGNvZGUu IgotICA6Z3JvdXAgJ3Rlcm0pCisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAiMjguMSIp CisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0LWJsYWNrCisgICcoKHQgOmluaGVyaXQg YW5zaS1jb2xvci1icmlnaHQtYmxhY2spKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmln aHQgYmxhY2sgY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAiMjgu MSIpCisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0LXJlZAorICAnKCh0IDppbmhlcml0 IGFuc2ktY29sb3ItYnJpZ2h0LXJlZCkpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVyIGJyaWdo dCByZWQgY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAiMjguMSIp CisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0LWdyZWVuCisgICcoKHQgOmluaGVyaXQg YW5zaS1jb2xvci1icmlnaHQtZ3JlZW4pKQorICAiRmFjZSB1c2VkIHRvIHJlbmRlciBicmln aHQgZ3JlZW4gY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybQorICA6dmVyc2lvbiAiMjgu MSIpCisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0LXllbGxvdworICAnKCh0IDppbmhl cml0IGFuc2ktY29sb3ItYnJpZ2h0LXllbGxvdykpCisgICJGYWNlIHVzZWQgdG8gcmVuZGVy IGJyaWdodCB5ZWxsb3cgY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybQorICA6dmVyc2lv biAiMjguMSIpCisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0LWJsdWUKKyAgJygodCA6 aW5oZXJpdCBhbnNpLWNvbG9yLWJyaWdodC1ibHVlKSkKKyAgIkZhY2UgdXNlZCB0byByZW5k ZXIgYnJpZ2h0IGJsdWUgY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybQorICA6dmVyc2lv biAiMjguMSIpCisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0LW1hZ2VudGEKKyAgJygo dCA6aW5oZXJpdCBhbnNpLWNvbG9yLWJyaWdodC1tYWdlbnRhKSkKKyAgIkZhY2UgdXNlZCB0 byByZW5kZXIgYnJpZ2h0IG1hZ2VudGEgY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybQor ICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0LWN5YW4K KyAgJygodCA6aW5oZXJpdCBhbnNpLWNvbG9yLWJyaWdodC1jeWFuKSkKKyAgIkZhY2UgdXNl ZCB0byByZW5kZXIgYnJpZ2h0IGN5YW4gY29sb3IgY29kZS4iCisgIDpncm91cCAndGVybQor ICA6dmVyc2lvbiAiMjguMSIpCisKKyhkZWZmYWNlIHRlcm0tY29sb3ItYnJpZ2h0LXdoaXRl CisgICcoKHQgOmluaGVyaXQgYW5zaS1jb2xvci1icmlnaHQtd2hpdGUpKQorICAiRmFjZSB1 c2VkIHRvIHJlbmRlciBicmlnaHQgd2hpdGUgY29sb3IgY29kZS4iCisgIDpncm91cCAndGVy bQorICA6dmVyc2lvbiAiMjguMSIpCiAKIChkZWZjdXN0b20gdGVybS1idWZmZXItbWF4aW11 bS1zaXplIDgxOTIKICAgIlRoZSBtYXhpbXVtIHNpemUgaW4gbGluZXMgZm9yIHRlcm0gYnVm ZmVycy4KQEAgLTMyMjMsNiArMzI4OSwxNSBAQCB0ZXJtLXJlc2V0LXRlcm1pbmFsCiAgIDs7 IEZJWE1FOiBObyBpZGVhIHdoeSB0aGlzIGlzIGhlcmUsIGl0IGxvb2tzIHdyb25nLiAgLS1T dGVmCiAgIChzZXRxIHRlcm0tYW5zaS1mYWNlLWFscmVhZHktZG9uZSBuaWwpKQogCisoZGVm dW4gdGVybS0tbWF5YmUtYnJpZ2h0ZW4tY29sb3IgKGNvbG9yIGJvbGQpCisgICJQb3NzaWJs eSBjb252ZXJ0IENPTE9SIHRvIGl0cyBicmlnaHQgdmFyaWFudC4KK0NPTE9SIGlzIGFuIGlu ZGV4IGludG8gYGFuc2ktdGVybS1jb2xvci12ZWN0b3InLiAgSWYgQk9MRCBhbmQKK2BhbnNp LWNvbG9yLWJvbGQtaXMtYnJpZ2h0JyBhcmUgbm9uLW5pbCBhbmQgQ09MT1IgaXMgYSByZWd1 bGFyIGNvbG9yLAorcmV0dXJuIHRoZSBicmlnaHQgdmVyc2lvbiBvZiBDT0xPUjsgb3RoZXJ3 aXNlLCByZXR1cm4gQ09MT1IuIgorICAoaWYgKGFuZCBhbnNpLWNvbG9yLWJvbGQtaXMtYnJp Z2h0IGJvbGQgKDw9IDEgY29sb3IgOCkpCisgICAgICAoKyBjb2xvciA4KQorICAgIGNvbG9y KSkKKwogOzsgTmV3IGZ1bmN0aW9uIHRvIGRlYWwgd2l0aCBhbnNpIGNvbG9yaXplZCBvdXRw dXQsIGFzIHlvdSBjYW4gc2VlIHlvdSBjYW4KIDs7IGhhdmUgYW55IGJvbGQvdW5kZXJsaW5l L2ZnL2JnL3JldmVyc2UgY29tYmluYXRpb24uIC1tbQogCkBAIC0zMjYyLDYgKzMzMzcsMTAg QEAgdGVybS1oYW5kbGUtY29sb3JzLWFycmF5CiAgICAoKGFuZCAoPj0gcGFyYW1ldGVyIDMw KSAoPD0gcGFyYW1ldGVyIDM3KSkKICAgICAoc2V0cSB0ZXJtLWFuc2ktY3VycmVudC1jb2xv ciAoLSBwYXJhbWV0ZXIgMjkpKSkKIAorICAgOzsgQnJpZ2h0IGZvcmVncm91bmQKKyAgICgo YW5kICg+PSBwYXJhbWV0ZXIgOTApICg8PSBwYXJhbWV0ZXIgOTcpKQorICAgIChzZXRxIHRl cm0tYW5zaS1jdXJyZW50LWNvbG9yICgtIHBhcmFtZXRlciA4MSkpKQorCiAgICA7OyBSZXNl dCBmb3JlZ3JvdW5kCiAgICAoKGVxIHBhcmFtZXRlciAzOSkKICAgICAoc2V0cSB0ZXJtLWFu c2ktY3VycmVudC1jb2xvciAwKSkKQEAgLTMyNzAsNiArMzM0OSwxMCBAQCB0ZXJtLWhhbmRs ZS1jb2xvcnMtYXJyYXkKICAgICgoYW5kICg+PSBwYXJhbWV0ZXIgNDApICg8PSBwYXJhbWV0 ZXIgNDcpKQogICAgIChzZXRxIHRlcm0tYW5zaS1jdXJyZW50LWJnLWNvbG9yICgtIHBhcmFt ZXRlciAzOSkpKQogCisgICA7OyBCcmlnaHQgZm9yZWdyb3VuZAorICAgKChhbmQgKD49IHBh cmFtZXRlciAxMDApICg8PSBwYXJhbWV0ZXIgMTA3KSkKKyAgICAoc2V0cSB0ZXJtLWFuc2kt Y3VycmVudC1iZy1jb2xvciAoLSBwYXJhbWV0ZXIgOTEpKSkKKwogICAgOzsgUmVzZXQgYmFj a2dyb3VuZAogICAgKChlcSBwYXJhbWV0ZXIgNDkpCiAgICAgKHNldHEgdGVybS1hbnNpLWN1 cnJlbnQtYmctY29sb3IgMCkpCkBAIC0zMjg4LDM3ICszMzcxLDQzIEBAIHRlcm0taGFuZGxl LWNvbG9ycy1hcnJheQogICA7OyAgICAgICAgICB0ZXJtLWFuc2ktY3VycmVudC1iZy1jb2xv cikKIAogICAodW5sZXNzIHRlcm0tYW5zaS1mYWNlLWFscmVhZHktZG9uZQotICAgIChpZiB0 ZXJtLWFuc2ktY3VycmVudC1pbnZpc2libGUKLSAgICAgICAgKGxldCAoKGNvbG9yCi0gICAg ICAgICAgICAgICAoaWYgdGVybS1hbnNpLWN1cnJlbnQtcmV2ZXJzZQotICAgICAgICAgICAg ICAgICAgIChmYWNlLWZvcmVncm91bmQKLSAgICAgICAgICAgICAgICAgICAgKGVsdCBhbnNp LXRlcm0tY29sb3ItdmVjdG9yIHRlcm0tYW5zaS1jdXJyZW50LWNvbG9yKQotICAgICAgICAg ICAgICAgICAgICBuaWwgJ2RlZmF1bHQpCi0gICAgICAgICAgICAgICAgIChmYWNlLWJhY2tn cm91bmQKLSAgICAgICAgICAgICAgICAgIChlbHQgYW5zaS10ZXJtLWNvbG9yLXZlY3RvciB0 ZXJtLWFuc2ktY3VycmVudC1iZy1jb2xvcikKLSAgICAgICAgICAgICAgICAgIG5pbCAnZGVm YXVsdCkpKSkKLSAgICAgICAgICAoc2V0cSB0ZXJtLWN1cnJlbnQtZmFjZQotICAgICAgICAg ICAgICAgIChsaXN0IDpiYWNrZ3JvdW5kIGNvbG9yCi0gICAgICAgICAgICAgICAgICAgICAg OmZvcmVncm91bmQgY29sb3IpKQotICAgICAgICAgICkgOzsgTm8gbmVlZCB0byBib3RoZXIg d2l0aCBhbnl0aGluZyBlbHNlIGlmIGl0J3MgaW52aXNpYmxlLgotICAgICAgKHNldHEgdGVy bS1jdXJyZW50LWZhY2UKLSAgICAgICAgICAgIChsaXN0IDpmb3JlZ3JvdW5kCi0gICAgICAg ICAgICAgICAgICAoZmFjZS1mb3JlZ3JvdW5kCi0gICAgICAgICAgICAgICAgICAgKGVsdCBh bnNpLXRlcm0tY29sb3ItdmVjdG9yIHRlcm0tYW5zaS1jdXJyZW50LWNvbG9yKQotICAgICAg ICAgICAgICAgICAgIG5pbCAnZGVmYXVsdCkKLSAgICAgICAgICAgICAgICAgIDpiYWNrZ3Jv dW5kCi0gICAgICAgICAgICAgICAgICAoZmFjZS1iYWNrZ3JvdW5kCi0gICAgICAgICAgICAg ICAgICAgKGVsdCBhbnNpLXRlcm0tY29sb3ItdmVjdG9yIHRlcm0tYW5zaS1jdXJyZW50LWJn LWNvbG9yKQotICAgICAgICAgICAgICAgICAgIG5pbCAnZGVmYXVsdCkKLSAgICAgICAgICAg ICAgICAgIDppbnZlcnNlLXZpZGVvIHRlcm0tYW5zaS1jdXJyZW50LXJldmVyc2UpKQotCi0g ICAgICAod2hlbiB0ZXJtLWFuc2ktY3VycmVudC1ib2xkCisgICAgKGxldCAoKGN1cnJlbnQt Y29sb3IgKHRlcm0tLW1heWJlLWJyaWdodGVuLWNvbG9yCisgICAgICAgICAgICAgICAgICAg ICAgICAgIHRlcm0tYW5zaS1jdXJyZW50LWNvbG9yCisgICAgICAgICAgICAgICAgICAgICAg ICAgIHRlcm0tYW5zaS1jdXJyZW50LWJvbGQpKQorICAgICAgICAgIChjdXJyZW50LWJnLWNv bG9yICh0ZXJtLS1tYXliZS1icmlnaHRlbi1jb2xvcgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB0ZXJtLWFuc2ktY3VycmVudC1iZy1jb2xvcgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB0ZXJtLWFuc2ktY3VycmVudC1ib2xkKSkpCisgICAgICAoaWYgdGVybS1h bnNpLWN1cnJlbnQtaW52aXNpYmxlCisgICAgICAgICAgKGxldCAoKGNvbG9yCisgICAgICAg ICAgICAgICAgIChpZiB0ZXJtLWFuc2ktY3VycmVudC1yZXZlcnNlCisgICAgICAgICAgICAg ICAgICAgICAoZmFjZS1mb3JlZ3JvdW5kCisgICAgICAgICAgICAgICAgICAgICAgKGVsdCBh bnNpLXRlcm0tY29sb3ItdmVjdG9yIGN1cnJlbnQtY29sb3IpCisgICAgICAgICAgICAgICAg ICAgICAgbmlsICdkZWZhdWx0KQorICAgICAgICAgICAgICAgICAgIChmYWNlLWJhY2tncm91 bmQKKyAgICAgICAgICAgICAgICAgICAgKGVsdCBhbnNpLXRlcm0tY29sb3ItdmVjdG9yIGN1 cnJlbnQtYmctY29sb3IpCisgICAgICAgICAgICAgICAgICAgIG5pbCAnZGVmYXVsdCkpKSkK KyAgICAgICAgICAgIChzZXRxIHRlcm0tY3VycmVudC1mYWNlCisgICAgICAgICAgICAgICAg ICAobGlzdCA6YmFja2dyb3VuZCBjb2xvcgorICAgICAgICAgICAgICAgICAgICAgICAgOmZv cmVncm91bmQgY29sb3IpKQorICAgICAgICAgICAgKSA7OyBObyBuZWVkIHRvIGJvdGhlciB3 aXRoIGFueXRoaW5nIGVsc2UgaWYgaXQncyBpbnZpc2libGUuCiAgICAgICAgIChzZXRxIHRl cm0tY3VycmVudC1mYWNlCi0gICAgICAgICAgICAgIGAoLHRlcm0tY3VycmVudC1mYWNlIDpp bmhlcml0IHRlcm0tYm9sZCkpKQorICAgICAgICAgICAgICAobGlzdCA6Zm9yZWdyb3VuZAor ICAgICAgICAgICAgICAgICAgICAoZmFjZS1mb3JlZ3JvdW5kCisgICAgICAgICAgICAgICAg ICAgICAoZWx0IGFuc2ktdGVybS1jb2xvci12ZWN0b3IgY3VycmVudC1jb2xvcikKKyAgICAg ICAgICAgICAgICAgICAgIG5pbCAnZGVmYXVsdCkKKyAgICAgICAgICAgICAgICAgICAgOmJh Y2tncm91bmQKKyAgICAgICAgICAgICAgICAgICAgKGZhY2UtYmFja2dyb3VuZAorICAgICAg ICAgICAgICAgICAgICAgKGVsdCBhbnNpLXRlcm0tY29sb3ItdmVjdG9yIGN1cnJlbnQtYmct Y29sb3IpCisgICAgICAgICAgICAgICAgICAgICBuaWwgJ2RlZmF1bHQpCisgICAgICAgICAg ICAgICAgICAgIDppbnZlcnNlLXZpZGVvIHRlcm0tYW5zaS1jdXJyZW50LXJldmVyc2UpKQor CisgICAgICAgICh3aGVuIHRlcm0tYW5zaS1jdXJyZW50LWJvbGQKKyAgICAgICAgICAoc2V0 cSB0ZXJtLWN1cnJlbnQtZmFjZQorICAgICAgICAgICAgICAgIGAoLHRlcm0tY3VycmVudC1m YWNlIDppbmhlcml0IHRlcm0tYm9sZCkpKQogCi0gICAgICAod2hlbiB0ZXJtLWFuc2ktY3Vy cmVudC11bmRlcmxpbmUKLSAgICAgICAgKHNldHEgdGVybS1jdXJyZW50LWZhY2UKLSAgICAg ICAgICAgICAgYCgsdGVybS1jdXJyZW50LWZhY2UgOmluaGVyaXQgdGVybS11bmRlcmxpbmUp KSkpKQorICAgICAgICAod2hlbiB0ZXJtLWFuc2ktY3VycmVudC11bmRlcmxpbmUKKyAgICAg ICAgICAoc2V0cSB0ZXJtLWN1cnJlbnQtZmFjZQorICAgICAgICAgICAgICAgIGAoLHRlcm0t Y3VycmVudC1mYWNlIDppbmhlcml0IHRlcm0tdW5kZXJsaW5lKSkpKSkpCiAKICAgOzsJKG1l c3NhZ2UgIkRlYnVnICVTIiB0ZXJtLWN1cnJlbnQtZmFjZSkKICAgOzsgRklYTUU6IHNob3Vs ZG4ndCB3ZSBzZXQgdGVybS1hbnNpLWZhY2UtYWxyZWFkeS1kb25lIHRvIHQgaGVyZT8gIC0t U3RlZgpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL3Rlcm0tdGVzdHMuZWwgYi90ZXN0L2xpc3Av dGVybS10ZXN0cy5lbAppbmRleCA1MGFjMzcwYjViLi45NmI2ZDczNDg4IDEwMDY0NAotLS0g YS90ZXN0L2xpc3AvdGVybS10ZXN0cy5lbAorKysgYi90ZXN0L2xpc3AvdGVybS10ZXN0cy5l bApAQCAtMjgsNiArMjgsNTEgQEAKIChkZWZ2YXIgdGVybS1oZWlnaHQpICAgICAgICAgICAg ICAgICAgICA7IE51bWJlciBvZiBsaW5lcyBpbiB3aW5kb3cuCiAoZGVmdmFyIHRlcm0td2lk dGgpICAgICAgICAgICAgICAgICAgICAgOyBOdW1iZXIgb2YgY29sdW1ucyBpbiB3aW5kb3cu CiAKKyhkZWZ2YXIgeWVsbG93LWZnLXByb3BzCisgIGAoIDpmb3JlZ3JvdW5kICwoZmFjZS1m b3JlZ3JvdW5kICd0ZXJtLWNvbG9yLXllbGxvdyBuaWwgJ2RlZmF1bHQpCisgICAgIDpiYWNr Z3JvdW5kICJ1bnNwZWNpZmllZC1iZyIgOmludmVyc2UtdmlkZW8gbmlsKSkKKyhkZWZ2YXIg eWVsbG93LWJnLXByb3BzCisgIGAoIDpmb3JlZ3JvdW5kICJ1bnNwZWNpZmllZC1mZyIKKyAg ICAgOmJhY2tncm91bmQgLChmYWNlLWJhY2tncm91bmQgJ3Rlcm0tY29sb3IteWVsbG93IG5p bCAnZGVmYXVsdCkKKyAgICAgOmludmVyc2UtdmlkZW8gbmlsKSkKKyhkZWZ2YXIgYnJpZ2h0 LXllbGxvdy1mZy1wcm9wcworICBgKCA6Zm9yZWdyb3VuZCAsKGZhY2UtZm9yZWdyb3VuZCAn dGVybS1jb2xvci1icmlnaHQteWVsbG93IG5pbCAnZGVmYXVsdCkKKyAgICAgOmJhY2tncm91 bmQgInVuc3BlY2lmaWVkLWJnIiA6aW52ZXJzZS12aWRlbyBuaWwpKQorKGRlZnZhciBicmln aHQteWVsbG93LWJnLXByb3BzCisgIGAoIDpmb3JlZ3JvdW5kICJ1bnNwZWNpZmllZC1mZyIK KyAgICAgOmJhY2tncm91bmQgLChmYWNlLWJhY2tncm91bmQgJ3Rlcm0tY29sb3ItYnJpZ2h0 LXllbGxvdyBuaWwgJ2RlZmF1bHQpCisgICAgIDppbnZlcnNlLXZpZGVvIG5pbCkpCisKKyhk ZWZ2YXIgYW5zaS10ZXN0LXN0cmluZ3MKKyAgYCgoIlxlWzMzbUhlbGxvIFdvcmxkXGVbMG0i CisgICAgICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdmb250LWxvY2stZmFjZSB5ZWxs b3ctZmctcHJvcHMpKQorICAgICgiXGVbNDNtSGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChw cm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1mYWNlIHllbGxvdy1iZy1wcm9w cykpCisgICAgKCJcZVs5M21IZWxsbyBXb3JsZFxlWzBtIgorICAgICAsKHByb3BlcnRpemUg IkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UgYnJpZ2h0LXllbGxvdy1mZy1wcm9wcykp CisgICAgKCJcZVsxMDNtSGVsbG8gV29ybGRcZVswbSIKKyAgICAgLChwcm9wZXJ0aXplICJI ZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1mYWNlIGJyaWdodC15ZWxsb3ctYmctcHJvcHMpKQor ICAgICgiXGVbMTszM21IZWxsbyBXb3JsZFxlWzBtIgorICAgICAsKHByb3BlcnRpemUgIkhl bGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UKKyAgICAgICAgICAgICAgICAgIGAoLHllbGxv dy1mZy1wcm9wcyA6aW5oZXJpdCB0ZXJtLWJvbGQpKQorICAgICAsKHByb3BlcnRpemUgIkhl bGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UKKyAgICAgICAgICAgICAgICAgIGAoLGJyaWdo dC15ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQgdGVybS1ib2xkKSkpCisgICAgKCJcZVszMzsx bUhlbGxvIFdvcmxkXGVbMG0iCisgICAgICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdm b250LWxvY2stZmFjZQorICAgICAgICAgICAgICAgICAgYCgseWVsbG93LWZnLXByb3BzIDpp bmhlcml0IHRlcm0tYm9sZCkpCisgICAgICwocHJvcGVydGl6ZSAiSGVsbG8gV29ybGQiICdm b250LWxvY2stZmFjZQorICAgICAgICAgICAgICAgICAgYCgsYnJpZ2h0LXllbGxvdy1mZy1w cm9wcyA6aW5oZXJpdCB0ZXJtLWJvbGQpKSkKKyAgICAoIlxlWzFtXGVbMzNtSGVsbG8gV29y bGRcZVswbSIKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1m YWNlCisgICAgICAgICAgICAgICAgICBgKCx5ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQgdGVy bS1ib2xkKSkKKyAgICAgLChwcm9wZXJ0aXplICJIZWxsbyBXb3JsZCIgJ2ZvbnQtbG9jay1m YWNlCisgICAgICAgICAgICAgICAgICBgKCxicmlnaHQteWVsbG93LWZnLXByb3BzIDppbmhl cml0IHRlcm0tYm9sZCkpKQorICAgICgiXGVbMzNtXGVbMW1IZWxsbyBXb3JsZFxlWzBtIgor ICAgICAsKHByb3BlcnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UKKyAgICAg ICAgICAgICAgICAgIGAoLHllbGxvdy1mZy1wcm9wcyA6aW5oZXJpdCB0ZXJtLWJvbGQpKQor ICAgICAsKHByb3BlcnRpemUgIkhlbGxvIFdvcmxkIiAnZm9udC1sb2NrLWZhY2UKKyAgICAg ICAgICAgICAgICAgIGAoLGJyaWdodC15ZWxsb3ctZmctcHJvcHMgOmluaGVyaXQgdGVybS1i b2xkKSkpKSkKKwogKGRlZnVuIHRlcm0tdGVzdC1zY3JlZW4tZnJvbS1pbnB1dCAod2lkdGgg aGVpZ2h0IGlucHV0ICZvcHRpb25hbCByZXR1cm4tdmFyKQogICAod2l0aC10ZW1wLWJ1ZmZl cgogICAgICh0ZXJtLW1vZGUpCkBAIC00OCw3ICs5Myw3IEBAIHRlcm0tdGVzdC1zY3JlZW4t ZnJvbS1pbnB1dAogICAgICAgICAgICAgICAgIChtYXBjIChsYW1iZGEgKGlucHV0KSAodGVy bS1lbXVsYXRlLXRlcm1pbmFsIHByb2MgaW5wdXQpKSBpbnB1dCkKICAgICAgICAgICAgICAg KHRlcm0tZW11bGF0ZS10ZXJtaW5hbCBwcm9jIGlucHV0KSkKICAgICAgIChpZiByZXR1cm4t dmFyIChidWZmZXItbG9jYWwtdmFsdWUgcmV0dXJuLXZhciAoY3VycmVudC1idWZmZXIpKQot ICAgICAgICAoYnVmZmVyLXN1YnN0cmluZy1uby1wcm9wZXJ0aWVzIChwb2ludC1taW4pIChw b2ludC1tYXgpKSkpKSkKKyAgICAgICAgKGJ1ZmZlci1zdWJzdHJpbmcgKHBvaW50LW1pbikg KHBvaW50LW1heCkpKSkpKQogCiAoZXJ0LWRlZnRlc3QgdGVybS1zaW1wbGUtbGluZXMgKCkK ICAgKHNraXAtdW5sZXNzIChub3QgKG1lbXEgc3lzdGVtLXR5cGUgJyh3aW5kb3dzLW50IG1z LWRvcykpKSkKQEAgLTc3LDYgKzEyMiwyNCBAQCB0ZXJtLWxpbmUtd3JhcAogICAgICAgICAg ICAodGVybS10ZXN0LXNjcmVlbi1mcm9tLWlucHV0IDQwIDEyIChsZXQgKChzdHIgKG1ha2Ut c3RyaW5nIDMwID9hKSkpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAobGlzdCBzdHIgc3RyKSkpKSkpCiAKKyhlcnQtZGVmdGVzdCB0ZXJtLWNv bG9ycyAoKQorICAoc2tpcC11bmxlc3MgKG5vdCAobWVtcSBzeXN0ZW0tdHlwZSAnKHdpbmRv d3MtbnQgbXMtZG9zKSkpKQorICAocGNhc2UtZG9saXN0IChgKCxzdHIgLGV4cGVjdGVkKSBh bnNpLXRlc3Qtc3RyaW5ncykKKyAgICAobGV0ICgocmVzdWx0ICh0ZXJtLXRlc3Qtc2NyZWVu LWZyb20taW5wdXQgNDAgMTIgc3RyKSkpCisgICAgICAoc2hvdWxkIChlcXVhbCByZXN1bHQg ZXhwZWN0ZWQpKQorICAgICAgKHNob3VsZCAoZXF1YWwgKHRleHQtcHJvcGVydGllcy1hdCAw IHJlc3VsdCkKKyAgICAgICAgICAgICAgICAgICAgICh0ZXh0LXByb3BlcnRpZXMtYXQgMCBl eHBlY3RlZCkpKSkpKQorCisoZXJ0LWRlZnRlc3QgdGVybS1jb2xvcnMtYm9sZC1pcy1icmln aHQgKCkKKyAgKHNraXAtdW5sZXNzIChub3QgKG1lbXEgc3lzdGVtLXR5cGUgJyh3aW5kb3dz LW50IG1zLWRvcykpKSkKKyAgKGxldCAoKGFuc2ktY29sb3ItYm9sZC1pcy1icmlnaHQgdCkp CisgICAgKHBjYXNlLWRvbGlzdCAoYCgsc3RyICxleHBlY3RlZCAsYnJpZ2h0LWV4cGVjdGVk KSBhbnNpLXRlc3Qtc3RyaW5ncykKKyAgICAgIChsZXQgKChleHBlY3RlZCAob3IgYnJpZ2h0 LWV4cGVjdGVkIGV4cGVjdGVkKSkKKyAgICAgICAgICAgIChyZXN1bHQgKHRlcm0tdGVzdC1z Y3JlZW4tZnJvbS1pbnB1dCA0MCAxMiBzdHIpKSkKKyAgICAgICAgKHNob3VsZCAoZXF1YWwg cmVzdWx0IGV4cGVjdGVkKSkKKyAgICAgICAgKHNob3VsZCAoZXF1YWwgKHRleHQtcHJvcGVy dGllcy1hdCAwIHJlc3VsdCkKKyAgICAgICAgICAgICAgICAgICAgICAgKHRleHQtcHJvcGVy dGllcy1hdCAwIGV4cGVjdGVkKSkpKSkpKQorCiAoZXJ0LWRlZnRlc3QgdGVybS1jdXJzb3It bW92ZW1lbnQgKCkKICAgKHNraXAtdW5sZXNzIChub3QgKG1lbXEgc3lzdGVtLXR5cGUgJyh3 aW5kb3dzLW50IG1zLWRvcykpKSkKICAgOzsgQWJzb2x1dGUgcG9zaXRpb25pbmcuCi0tIAoy LjI1LjEKCg== --------------387B348318050924D49CCE37-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 23 16:58:47 2021 Received: (at 50179) by debbugs.gnu.org; 23 Sep 2021 20:58:47 +0000 Received: from localhost ([127.0.0.1]:55990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTVnq-0001gM-VJ for submit@debbugs.gnu.org; Thu, 23 Sep 2021 16:58:47 -0400 Received: from quimby.gnus.org ([95.216.78.240]:47702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTVnp-0001g5-Cl for 50179@debbugs.gnu.org; Thu, 23 Sep 2021 16:58:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=35V9LWhcWbTaj40p7v2JXpPshSzd+nqHgpkEY/2eW00=; b=bFqEmqHUK1fjGvxWwKP/2r9XqL xk0fwEbmnHnId/g7oKVCYnhwDU+ReABeCPDqSsK4UcmZ2V3eED/k529+9wdSKd3nZQQyoKQi8NaTk ETlTBYVWcx7fsL3p2hAvIYPuxww+bhD/bpqRBY5W/CkD4Ea3t4I0crUfqFFDH0CeKFkA=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mTVnf-0006le-GY; Thu, 23 Sep 2021 22:58:38 +0200 From: Lars Ingebrigtsen To: Jim Porter Subject: Re: bug#50179: [PATCH v4] Add support for "bright" ANSI colors to ansi-color and term-mode References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> <87a6l5k9xr.fsf@gnus.org> <87lf4p3210.fsf@gnus.org> <831r6hv51r.fsf@gnu.org> <87h7fc2vd4.fsf@gnus.org> <871r5kpqsj.fsf@gnus.org> <0e61dc90-c315-f3cd-df83-22b9ecb029c1@gmail.com> <87ilysv1a4.fsf@gnus.org> <24dfacb5-067d-580d-2608-8198d9e4f1a3@gmail.com> X-Now-Playing: Magnus Granberg & Skogen's _Let Pass My Weary Guiltless Ghost_: "Let Pass My Weary Guiltless Ghost" Date: Thu, 23 Sep 2021 22:58:34 +0200 In-Reply-To: <24dfacb5-067d-580d-2608-8198d9e4f1a3@gmail.com> (Jim Porter's message of "Wed, 22 Sep 2021 18:47:25 -0700") Message-ID: <87lf3nxb45.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jim Porter writes: > Ok, I've done this here, and all the other places as well. I also > obsoleted the old `ansi-color-map' and friends instead of deleting > them for the same reason. Hopefully all that's right; I tried [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50179 Cc: 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Jim Porter writes: > Ok, I've done this here, and all the other places as well. I also > obsoleted the old `ansi-color-map' and friends instead of deleting > them for the same reason. Hopefully all that's right; I tried to make > sure that they warn the user if they use them, but that warnings don't > show up when building Emacs. Thanks; looks good to me. There was a typo in the man.el part of the patch, but I think I fixed it -- can you have a look and see whether I did the correct thing? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 23 16:58:57 2021 Received: (at control) by debbugs.gnu.org; 23 Sep 2021 20:58:57 +0000 Received: from localhost ([127.0.0.1]:55993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTVo1-0001gl-6H for submit@debbugs.gnu.org; Thu, 23 Sep 2021 16:58:57 -0400 Received: from quimby.gnus.org ([95.216.78.240]:47716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTVnz-0001gX-BS for control@debbugs.gnu.org; Thu, 23 Sep 2021 16:58:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dgnGOfwmf56SOGx+kRXTHiitPjc4+f9WlNSBmtE3qj0=; b=J0jT2PYeOIvTBLiIZbId/m85Qo /J6k0trR5SO0EHAePfRLivvs00zONWW1LRkxFasHSrtr2WRrmejFycYeH8caBSlM2tNLStcEGYUjL 1Ba6Mhth2EwXXYoceH1YetaAbcTLKF1Qmk7HEqLBPxDY66QSkePnbf3NtlsJ6hP+JIGM=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mTVnr-0006lr-7r for control@debbugs.gnu.org; Thu, 23 Sep 2021 22:58:49 +0200 Date: Thu, 23 Sep 2021 22:58:46 +0200 Message-Id: <87k0j7xb3t.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #50179 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: close 50179 28.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) close 50179 28.1 quit From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 23 17:21:33 2021 Received: (at 50179) by debbugs.gnu.org; 23 Sep 2021 21:21:33 +0000 Received: from localhost ([127.0.0.1]:56054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTW9s-0004WM-Om for submit@debbugs.gnu.org; Thu, 23 Sep 2021 17:21:32 -0400 Received: from mail-pg1-f172.google.com ([209.85.215.172]:40580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTW9q-0004W6-Rg for 50179@debbugs.gnu.org; Thu, 23 Sep 2021 17:21:31 -0400 Received: by mail-pg1-f172.google.com with SMTP id h3so7639995pgb.7 for <50179@debbugs.gnu.org>; Thu, 23 Sep 2021 14:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=HAFpQOdKOy/9tI7BZl8BBWQFvbNN6nRIvdu4Vpi41GY=; b=dhwbnoWY2Mvsy0FYBiEPRY2kyPzHtXKI4HOPGp10ghxs3TqoS2Q+t/QoqTkWh7a4Tb xW8zBdSzaJKT3JhE9PJ3CG/p3FnpQDhG14LGi531V0stVM3EzkHeBOVSwjMAnnMf6tSg nuLw0CL0uvDQNCf6GbB+NWcqYcr/T7TagMoLZWNNRASiww5dB1DJL7L6mrDcXTxVQEly fUOxzpO49K0NA2gGZGM+1XgaPjGmsSFvHK951XUYD2avCkyDEXZyUsuFUIarB2JYMuQv dilIOEcKSW2Hdg20EjFRy0QD01NlRypRo7OZ+d9wuxFGLrDMIzWXt2Yh5decVy+8N/ck xEfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=HAFpQOdKOy/9tI7BZl8BBWQFvbNN6nRIvdu4Vpi41GY=; b=17Sm3x711RYDqrr6rug8UBV16GdrLAgRk1gKLMw6ZfERZac8ADBxCaopKmlBwjEZ7p Pqy/M8gq7lMAo0cVJtKRTAnyzWFmvgF6WCUG5LiwrLHkk+rg6P9TLXkEqKdESR28hLx7 7F6nP9qhhsTj9JuOBZ4gRhJw+iCgNs84QXSpzpY3DJbgmr17SeJ7uUgDa/5+oTG108YE 02SG5uLIP/3w5hWLlkYNET3H2vfApbD6ghAc3N9IJvV76T9imygiuW67CZaVg8PMNMox ycGlOYdUNfs8vqfNoT2j1g43x9v9KpH7yoSFfERhIYOJUAVuDKtgyK6kJT9WByrZuT/v NyWw== X-Gm-Message-State: AOAM53361iZqUpXvhyGQmRjHCjYacqxb/wCysBa5jkJY/vNQr7j/i3ij JSkfsexQyNYNgtvRnfporoqkGt/c6r8= X-Google-Smtp-Source: ABdhPJxVRVP8ondtVwwbeFcvrje0/7KLve2gQqGCtCuyAOwNYwtHyk4mexJwZUNjq3e+7myP1R5m+w== X-Received: by 2002:a63:f050:: with SMTP id s16mr727988pgj.258.1632432085003; Thu, 23 Sep 2021 14:21:25 -0700 (PDT) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id e7sm6627447pfc.114.2021.09.23.14.21.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Sep 2021 14:21:24 -0700 (PDT) Subject: Re: bug#50179: [PATCH v4] Add support for "bright" ANSI colors to ansi-color and term-mode To: Lars Ingebrigtsen References: <838s0rvyfu.fsf@gnu.org> <83zgt6vi43.fsf@gnu.org> <87a6l5k9xr.fsf@gnus.org> <87lf4p3210.fsf@gnus.org> <831r6hv51r.fsf@gnu.org> <87h7fc2vd4.fsf@gnus.org> <871r5kpqsj.fsf@gnus.org> <0e61dc90-c315-f3cd-df83-22b9ecb029c1@gmail.com> <87ilysv1a4.fsf@gnus.org> <24dfacb5-067d-580d-2608-8198d9e4f1a3@gmail.com> <87lf3nxb45.fsf@gnus.org> From: Jim Porter Message-ID: <96ed538e-84da-185c-31c3-2459b0f55168@gmail.com> Date: Thu, 23 Sep 2021 14:21:23 -0700 MIME-Version: 1.0 In-Reply-To: <87lf3nxb45.fsf@gnus.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50179 Cc: 50179@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 9/23/2021 1:58 PM, Lars Ingebrigtsen wrote: > Jim Porter writes: > >> Ok, I've done this here, and all the other places as well. I also >> obsoleted the old `ansi-color-map' and friends instead of deleting >> them for the same reason. Hopefully all that's right; I tried to make >> sure that they warn the user if they use them, but that warnings don't >> show up when building Emacs. > > Thanks; looks good to me. There was a typo in the man.el part of the > patch, but I think I fixed it -- can you have a look and see whether I > did the correct thing? That looks correct to me. Thanks for the fix! (I switched back and forth between implementations there a few times, and I guess when I made the patch I was midway between changing it back.) From unknown Sat Aug 16 15:55:25 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 22 Oct 2021 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator