From unknown Sun Jun 22 01:01:32 2025 X-Loop: help-debbugs@gnu.org Subject: bug#37621: [PATCH] Remove XEmacs compat code from edt.el Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 04 Oct 2019 14:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37621 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 37621@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157019813919997 (code B ref -1); Fri, 04 Oct 2019 14:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Oct 2019 14:08:59 +0000 Received: from localhost ([127.0.0.1]:43295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGOGQ-0005CS-JY for submit@debbugs.gnu.org; Fri, 04 Oct 2019 10:08:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:36044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGOGO-0005CK-PP for submit@debbugs.gnu.org; Fri, 04 Oct 2019 10:08:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53081) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGOGL-0001ny-PG for bug-gnu-emacs@gnu.org; Fri, 04 Oct 2019 10:08:56 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGOGI-0007yf-UQ for bug-gnu-emacs@gnu.org; Fri, 04 Oct 2019 10:08:53 -0400 Received: from mail-pf1-f176.google.com ([209.85.210.176]:40174) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iGOGI-0007yU-J4 for bug-gnu-emacs@gnu.org; Fri, 04 Oct 2019 10:08:50 -0400 Received: by mail-pf1-f176.google.com with SMTP id x127so3972445pfb.7 for ; Fri, 04 Oct 2019 07:08:50 -0700 (PDT) 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=HP+JkLzoCM6MkUJkzISYDUjz5NOWr33ZnKKiPAyzvh4=; b=DQnnieiH+mZvYa5iBpnIGxAUbRtu9zkcnplyPs5ZZDYjcv7kaZJDRA9+h0GglAWsqf 2ulwEPpcIYQ7dbvLunBPwxSmC2w6QFka2XSlG+gaAQCs+aCdfHMUlmmshWEUsmyJjz1U O19x9DzKd4OTdyxPYRgRT09XzfdsPxsz/d7EzcpDJmgaoy7M6PjDVdhyy3wKfdK3rI9Q UrgTh+QAlhU2bjPbfoc8iBLLt60m9iCHd48gpg0DAZ9zjrpWqUwVzz/6jCbTEjz0LQ+/ vnRfFbT2ov6MD5rwoEPbRjsrjpeC25E3QZzt5ZQPVFMnJoniGChvNkSdcTavKszwa1L5 Ajeg== X-Gm-Message-State: APjAAAXFDs1uDKuDos682MsFzSLQ3QJOdRoAxg5T/ux12jyF4Ml2JbZU Fwvlw2Kc/Sr+QQv44QyCV7eJx/8RZ8Ic+c0KOESvHQ== X-Google-Smtp-Source: APXvYqwLX34VHQWfYqfPFTwpsQD3Q4j/yELXaD2cSCtVimYZrpQmD/8WJ3wq/eSgfilfrOv1MEC9zG+Zh0Qdt/rqyZk= X-Received: by 2002:a17:90a:cc08:: with SMTP id b8mr17122326pju.119.1570198128834; Fri, 04 Oct 2019 07:08:48 -0700 (PDT) MIME-Version: 1.0 From: Stefan Kangas Date: Fri, 4 Oct 2019 16:08:36 +0200 Message-ID: Content-Type: multipart/mixed; boundary="000000000000b25ba50594163df4" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.210.176 X-Spam-Score: 0.9 (/) 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.1 (--) --000000000000b25ba50594163df4 Content-Type: text/plain; charset="UTF-8" Is this okay to commit? Best regards, Stefan Kangas --000000000000b25ba50594163df4 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Remove-XEmacs-compat-code-from-edt.el.patch" Content-Disposition: attachment; filename="0001-Remove-XEmacs-compat-code-from-edt.el.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k1c7eo4v0 RnJvbSA3NmVmYzMxOGY3NTI5ZWNhZTkzOWE3NjQyMjNjNjM5ODNlYWMwYmM2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5rYW5nYXNAZ21haWwuY29t PgpEYXRlOiBGcmksIDQgT2N0IDIwMTkgMTY6MDY6MzIgKzAyMDAKU3ViamVjdDogW1BBVENIXSBS ZW1vdmUgWEVtYWNzIGNvbXBhdCBjb2RlIGZyb20gZWR0LmVsCgoqIGxpc3AvZW11bGF0aW9uL2Vk dC5lbCAodG9wLWxldmVsLCBlZHQtZW1hY3MtdmFyaWFudCkKKGVkdC13aW5kb3ctc3lzdGVtLCBl ZHQteHNlcnZlciwgZWR0LXBhZ2UtYmFja3dhcmQpCihlZHQtYmVnaW5uaW5nLW9mLWxpbmUsIGVk dC1lbmQtb2YtbGluZS1mb3J3YXJkKQooZWR0LWVuZC1vZi1saW5lLWJhY2t3YXJkLCBlZHQtb25l LXdvcmQtZm9yd2FyZCkKKGVkdC1vbmUtd29yZC1iYWNrd2FyZCwgZWR0LWNoYXJhY3RlciwgZWR0 LWxpbmUtZm9yd2FyZCkKKGVkdC1uZXh0LWxpbmUsIGVkdC1wcmV2aW91cy1saW5lLCBlZHQtdG9w LCBlZHQtZmluZC1mb3J3YXJkKQooZWR0LWZpbmQtYmFja3dhcmQsIGVkdC1maW5kLW5leHQtZm9y d2FyZCkKKGVkdC1maW5kLW5leHQtYmFja3dhcmQsIGVkdC1yZXNldCwgZWR0LWFkdmFuY2UsIGVk dC1iYWNrdXApCihlZHQtZGVmaW5lLWtleSwgZWR0LWJvdHRvbS1jaGVjaywgZWR0LXNlbnRlbmNl LWZvcndhcmQpCihlZHQtc2VudGVuY2UtYmFja3dhcmQsIGVkdC1wYXJhZ3JhcGgtZm9yd2FyZCkK KGVkdC1wYXJhZ3JhcGgtYmFja3dhcmQsIGVkdC1yZXN0b3JlLWtleSwgZWR0LXdpbmRvdy10b3Ap CihlZHQtd2luZG93LWJvdHRvbSwgZWR0LXNjcm9sbC13aW5kb3ctYmFja3dhcmQtbGluZSkKKGVk dC1saW5lLXRvLWJvdHRvbS1vZi13aW5kb3csIGVkdC1saW5lLXRvLW1pZGRsZS1vZi13aW5kb3cp CihlZHQtZ290by1wZXJjZW50YWdlLCBlZHQtZGlzcGxheS10aGUtdGltZSwgZWR0LXJlbWVtYmVy KQooZWR0LXNwbGl0LXdpbmRvdywgZWR0LWxvYWQta2V5cywgZWR0LWVtdWxhdGlvbi1vbikKKGVk dC1lbXVsYXRpb24tb2ZmLCBlZHQtZGVmYXVsdC1lbXVsYXRpb24tc2V0dXApCihlZHQtdXNlci1l bXVsYXRpb24tc2V0dXAsIGVkdC1zZWxlY3QtZGVmYXVsdC1nbG9iYWwtbWFwKQooZWR0LXNlbGVj dC11c2VyLWdsb2JhbC1tYXApOiBSZW1vdmUgWEVtYWNzIGNvbXBhdCBjb2RlLgotLS0KIGxpc3Av ZW11bGF0aW9uL2VkdC5lbCB8IDIxMyArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2NiBpbnNlcnRpb25zKCspLCAxNDcgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9lbXVsYXRpb24vZWR0LmVsIGIvbGlzcC9lbXVsYXRpb24v ZWR0LmVsCmluZGV4IGRjYzMyN2RiZDQuLjBmZGZkNzVhMjYgMTAwNjQ0Ci0tLSBhL2xpc3AvZW11 bGF0aW9uL2VkdC5lbAorKysgYi9saXNwL2VtdWxhdGlvbi9lZHQuZWwKQEAgLTEwNiwxMCArMTA2 LDcgQEAKIDs7ICAgICAgY3VzdG9taXphdGlvbiBmaWxlLCBlZHQtdXNlci5lbCwgdG8gZG8gdGhp cy4KIDs7ICAgICAgU2VlIEluZm8gbm9kZSBgZWR0JyBmb3IgbW9yZSBkZXRhaWxzLgogCi07OyAg My4gIEVEVCBFbXVsYXRpb24gbm93IGFsc28gd29ya3MgaW4gWEVtYWNzLCBpbmNsdWRpbmcgdGhl Ci07OyAgICAgIGhpZ2hsaWdodGluZyBvZiBzZWxlY3RlZCB0ZXh0LgotCi07OyAgNC4gIElmIHlv dSBhY2Nlc3MgYSB3b3Jrc3RhdGlvbiB1c2luZyBhbiBYIFNlcnZlciwgb2JzZXJ2ZSB0aGF0Cis7 OyAgMy4gIElmIHlvdSBhY2Nlc3MgYSB3b3Jrc3RhdGlvbiB1c2luZyBhbiBYIFNlcnZlciwgb2Jz ZXJ2ZSB0aGF0CiA7OyAgICAgIHRoZSBpbml0aWFsaXphdGlvbiBmaWxlIGdlbmVyYXRlZCBieSBl ZHQtbWFwcGVyLmVsIHdpbGwgbm93CiA7OyAgICAgIGNvbnRhaW4gdGhlIG5hbWUgb2YgdGhlIFgg U2VydmVyIHZlbmRvci4gIFRoaXMgaXMgYQogOzsgICAgICBjb252ZW5pZW5jZSBmb3IgdGhvc2Ug d2hvIGhhdmUgYWNjZXNzIHRvIHRoZWlyIFVuaXggYWNjb3VudApAQCAtMTIwLDcgKzExNyw3IEBA CiA7OyAgICAgIG5hbWVzLiAgVGhlbiwgdGhlIGNvcnJlY3QgaW5pdGlhbGl6YXRpb24gZmlsZSBm b3IgdGhlCiA7OyAgICAgIHBhcnRpY3VsYXIgWCBzZXJ2ZXIgaW4gdXNlIGlzIGxvYWRlZCBjb3Jy ZWN0bHkgYXV0b21hdGljYWxseS4KIAotOzsgIDUuICBBbHNvLCBlZHQtbWFwcGVyLmVsIGlzIG5v dyBjYXBhYmxlIG9mIGJpbmRpbmcgYW4gQVNDSUkga2V5Cis7OyAgNC4gIEFsc28sIGVkdC1tYXBw ZXIuZWwgaXMgbm93IGNhcGFibGUgb2YgYmluZGluZyBhbiBBU0NJSSBrZXkKIDs7ICAgICAgc2Vx dWVuY2UsIHByb3ZpZGluZyB0aGUgQVNDSUkga2V5IHNlcXVlbmNlIHByZWZpeCBpcyBhbHJlYWR5 CiA7OyAgICAgIGtub3duIGJ5IEVtYWNzIHRvIGJlIGEgcHJlZml4LiAgQXMgYSByZXN1bHQgb2Yg cHJvdmlkaW5nIHRoaXMKIDs7ICAgICAgc3VwcG9ydCwgc29tZSB0ZXJtaW5hbC9rZXlib2FyZC93 aW5kb3cgc3lzdGVtIGNvbmZpZ3VyYXRpb25zLApAQCAtMTQwLDcgKzEzNyw3IEBACiA7OyAgICAg IHlvdXIgdGVybWluYWwgT1IgYSBidWcgaW4gdGhlIHRlcm1pbmFsIGVtdWxhdGlvbiBzb2Z0d2Fy ZSB5b3UKIDs7ICAgICAgYXJlIHVzaW5nLikKIAotOzsgIDYuICBUaGUgZWR0LXF1aXQgZnVuY3Rp b24gKGJvdW5kIHRvIEdPTEQtcSBieSBkZWZhdWx0KSBoYXMgYmVlbgorOzsgIDUuICBUaGUgZWR0 LXF1aXQgZnVuY3Rpb24gKGJvdW5kIHRvIEdPTEQtcSBieSBkZWZhdWx0KSBoYXMgYmVlbgogOzsg ICAgICBtb2RpZmllZCB0byB3YXJuIHRoZSB1c2VyIHdoZW4gZmlsZS1yZWxhdGVkIGJ1ZmZlcgog OzsgICAgICBtb2RpZmljYXRpb25zIGV4aXN0LiAgSXQgbm93IGNhdXRpb25zIHRoZSB1c2VyIHRo YXQgdGhvc2UKIDs7ICAgICAgbW9kaWZpY2F0aW9ucyB3aWxsIGJlIGxvc3QgaWYgdGhlIHVzZXIg cXVpdHMgd2l0aG91dCBzYXZpbmcKQEAgLTE4MCw4ICsxNzcsNiBAQCBlZHQtb3JpZy10cmFuc2ll bnQtbWFyay1tb2RlCiAoZGVmdmFyIGVkdC1yZWN0LXN0YXJ0LXBvaW50KQogKGRlZnZhciBlZHQt dXNlci1nbG9iYWwtbWFwKQogKGRlZnZhciByZWN0LXN0YXJ0LXBvaW50KQotKGRlZnZhciB0aW1l LXN0cmluZykKLShkZWZ2YXIgem1hY3MtcmVnaW9uLXN0YXlzKQogCiA7OzsKIDs7OyAgVmVyc2lv biBJbmZvcm1hdGlvbgpAQCAtMzEwLDIzICszMDUsMTMgQEAgZWR0LXRlcm0KIDs7OwogOzs7ICAg ICBvIGVkdC1lbXVsYXRpb24tb24gICAgICBvIGVkdC1sb2FkLWtleXMKIDs7OwotKGRlZmNvbnN0 IGVkdC1lbWFjcy12YXJpYW50IChpZiAoZmVhdHVyZXAgJ2VtYWNzKSAiZ251IiAieGVtYWNzIikK LSAgIkluZGljYXRlcyBFbWFjcyB2YXJpYW50OiAgR05VIEVtYWNzIG9yIFhFbWFjcyAoYWthIEx1 Y2lkIEVtYWNzKS4iKQotCi0oZGVmY29uc3QgZWR0LXdpbmRvdy1zeXN0ZW0gKGlmIChmZWF0dXJl cCAnZW1hY3MpIHdpbmRvdy1zeXN0ZW0gKGNvbnNvbGUtdHlwZSkpCi0gICJJbmRpY2F0ZXMgd2lu ZG93IHN5c3RlbSAoaW4gR05VIEVtYWNzKSBvciBjb25zb2xlIHR5cGUgKGluIFhFbWFjcykuIikK LQotKGRlY2xhcmUtZnVuY3Rpb24geC1zZXJ2ZXItdmVuZG9yICJ4Zm5zLmMiICgmb3B0aW9uYWwg dGVybWluYWwpKQotCi0oZGVmY29uc3QgZWR0LXhzZXJ2ZXIgKHdoZW4gKGVxIGVkdC13aW5kb3ct c3lzdGVtICd4KQorKGRlZmNvbnN0IGVkdC14c2VydmVyICh3aGVuIChlcSB3aW5kb3ctc3lzdGVt ICd4KQogCQkJOzsgVGhlIEN5Z3dpbiB3aW5kb3cgbWFuYWdlciBoYXMgYSBgLycgaW4gaXRzCiAJ CQk7OyBuYW1lLCB3aGljaCBicmVha3MgdGhlIGdlbmVyYXRlZCBmaWxlIG5hbWUgb2YKIAkJCTs7 IHRoZSBjdXN0b20ga2V5IG1hcCBmaWxlLiAgUmVwbGFjZSBgLycgd2l0aCBhCiAJCQk7OyBgLScg dG8gd29yayBhcm91bmQgdGhhdC4KLQkJCShpZiAoZmVhdHVyZXAgJ3hlbWFjcykKLQkJCSAgICAo cmVwbGFjZS1pbi1zdHJpbmcgKHgtc2VydmVyLXZlbmRvcikgIlsgL10iICItIikKLQkJCSAgKHJl cGxhY2UtcmVnZXhwLWluLXN0cmluZyAiWyAvXSIgIi0iCi0JCQkJCQkgICAgKHgtc2VydmVyLXZl bmRvcikpKSkKKwkJCShyZXBsYWNlLXJlZ2V4cC1pbi1zdHJpbmcgIlsgL10iICItIgorCQkJCQkJ ICAoeC1zZXJ2ZXItdmVuZG9yKSkpCiAgICJJbmRpY2F0ZXMgWCBzZXJ2ZXIgdmVuZG9yIG5hbWUs IGlmIGFwcGxpY2FibGUuIikKIAogKGRlZnZhciBlZHQta2V5cy1maWxlIG5pbApAQCAtMzg4LDgg KzM3Myw3IEBAIGVkdC1wYWdlLWJhY2t3YXJkCiAgICAgICAoZXJyb3IgIkJlZ2lubmluZyBvZiBi dWZmZXIiKQogCShwcm9nbgogCSAgKGJhY2t3YXJkLXBhZ2UgbnVtKQotICAgICAgKGVkdC1saW5l LXRvLXRvcC1vZi13aW5kb3cpCi0JICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNz LXJlZ2lvbi1zdGF5cyB0KSkpKSkKKyAgICAgIChlZHQtbGluZS10by10b3Atb2Ytd2luZG93KSkp KQogCiAoZGVmdW4gZWR0LXBhZ2UgKG51bSkKICAgIk1vdmUgaW4gY3VycmVudCBkaXJlY3Rpb24g dG8gbmV4dCBwYWdlIGRlbGltaXRlci4KQEAgLTQ0OSw4ICs0MzMsNyBAQCBlZHQtYmVnaW5uaW5n LW9mLWxpbmUKICAgICAgIChwcm9nbgogCShzZXRxIG51bSAoMS0gbnVtKSkKIAkoZm9yd2FyZC1s aW5lICgqIC0xIG51bSkpKSkKLSAgICAoZWR0LXRvcC1jaGVjayBiZWcgbnVtKSkKLSAgKGlmIChm ZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQorICAgIChlZHQt dG9wLWNoZWNrIGJlZyBudW0pKSkKIAogCiA7OzsKQEAgLTQ2NSw4ICs0NDgsNyBAQCBlZHQtZW5k LW9mLWxpbmUtZm9yd2FyZAogICAobGV0ICgoYmVnIChlZHQtY3VycmVudC1saW5lKSkpCiAgICAg KGZvcndhcmQtY2hhcikKICAgICAoZW5kLW9mLWxpbmUgbnVtKQotICAgIChlZHQtYm90dG9tLWNo ZWNrIGJlZyBudW0pKQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNzLXJlZ2lv bi1zdGF5cyB0KSkpCisgICAgKGVkdC1ib3R0b20tY2hlY2sgYmVnIG51bSkpKQogCiAKIChkZWZ1 biBlZHQtZW5kLW9mLWxpbmUtYmFja3dhcmQgKG51bSkKQEAgLTQ3Niw4ICs0NTgsNyBAQCBlZHQt ZW5kLW9mLWxpbmUtYmFja3dhcmQKICAgKGVkdC1jaGVjay1wcmVmaXggbnVtKQogICAobGV0ICgo YmVnIChlZHQtY3VycmVudC1saW5lKSkpCiAgICAgKGVuZC1vZi1saW5lICgxLSBudW0pKQotICAg IChlZHQtdG9wLWNoZWNrIGJlZyBudW0pKQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRx IHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisgICAgKGVkdC10b3AtY2hlY2sgYmVnIG51bSkpKQog CiAKIChkZWZ1biBlZHQtZW5kLW9mLWxpbmUgKG51bSkKQEAgLTUyMSw4ICs1MDIsNyBAQCBlZHQt b25lLXdvcmQtZm9yd2FyZAogCSAgICAgIChub3QgKGVvYnApKQogCSAgICAgIChlcSA/XCAgKGNo YXItc3ludGF4IChmb2xsb3dpbmctY2hhcikpKQogCSAgICAgIChub3QgKG1lbXEgKGZvbGxvd2lu Zy1jaGFyKSBlZHQtd29yZC1lbnRpdGllcykpKQotCShmb3J3YXJkLWNoYXIpKSkpCi0gIChpZiAo ZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlzIHQpKSkKKwkoZm9yd2Fy ZC1jaGFyKSkpKSkKIAogKGRlZnVuIGVkdC1vbmUtd29yZC1iYWNrd2FyZCAoKQogICAiTW92ZSBi YWNrd2FyZCB0byBmaXJzdCBjaGFyYWN0ZXIgb2YgcHJldmlvdXMgd29yZC4iCkBAIC01NDUsOCAr NTI1LDcgQEAgZWR0LW9uZS13b3JkLWJhY2t3YXJkCiAJCSAgKG5vdCAoYm9icCkpCiAJCSAgKG5v dCAoZXEgP1wgIChjaGFyLXN5bnRheCAocHJlY2VkaW5nLWNoYXIpKSkpCiAJCSAgKG5vdCAobWVt cSAocHJlY2VkaW5nLWNoYXIpIGVkdC13b3JkLWVudGl0aWVzKSkpCi0JICAgIChiYWNrd2FyZC1j aGFyKSkpKSkKLSAgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3Rh eXMgdCkpKQorCSAgICAoYmFja3dhcmQtY2hhcikpKSkpKQogCiAoZGVmdW4gZWR0LXdvcmQtZm9y d2FyZCAobnVtKQogICAiTW92ZSBmb3J3YXJkIHRvIGZpcnN0IGNoYXJhY3RlciBvZiBuZXh0IHdv cmQuCkBAIC01ODUsOCArNTY0LDcgQEAgZWR0LWNoYXJhY3RlcgogICAoZWR0LWNoZWNrLXByZWZp eCBudW0pCiAgIChpZiAoZXF1YWwgZWR0LWRpcmVjdGlvbi1zdHJpbmcgZWR0LWZvcndhcmQtc3Ry aW5nKQogICAgICAgKGZvcndhcmQtY2hhciBudW0pCi0gICAgKGJhY2t3YXJkLWNoYXIgbnVtKSkK LSAgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQor ICAgIChiYWNrd2FyZC1jaGFyIG51bSkpKQogCiA7OzsKIDs7OyBMSU5FCkBAIC02MDgsOCArNTg2 LDcgQEAgZWR0LWxpbmUtZm9yd2FyZAogICAoZWR0LWNoZWNrLXByZWZpeCBudW0pCiAgIChsZXQg KChiZWcgKGVkdC1jdXJyZW50LWxpbmUpKSkKICAgICAoZm9yd2FyZC1saW5lIG51bSkKLSAgICAo ZWR0LWJvdHRvbS1jaGVjayBiZWcgbnVtKSkKLSAgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0 cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQorICAgIChlZHQtYm90dG9tLWNoZWNrIGJlZyBudW0p KSkKIAogKGRlZnVuIGVkdC1saW5lIChudW0pCiAgICJNb3ZlIGluIGN1cnJlbnQgZGlyZWN0aW9u IHRvIG5leHQgYmVnaW5uaW5nIG9mIGxpbmUgbWFyay4KQEAgLTYzMSw4ICs2MDgsNyBAQCBlZHQt bmV4dC1saW5lCiAgIChsZXQgKChiZWcgKGVkdC1jdXJyZW50LWxpbmUpKSkKICAgICA7OyBXZSdy ZSBkZWxpYmVyYXRlbHkgdXNpbmcgbmV4dC1saW5lIGluc3RlYWQgb2YgZm9yd2FyZC1saW5lLgog ICAgICh3aXRoLW5vLXdhcm5pbmdzIChuZXh0LWxpbmUgbnVtKSkKLSAgICAoZWR0LWJvdHRvbS1j aGVjayBiZWcgbnVtKSkKLSAgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdp b24tc3RheXMgdCkpKQorICAgIChlZHQtYm90dG9tLWNoZWNrIGJlZyBudW0pKSkKIAogKGRlZnVu IGVkdC1wcmV2aW91cy1saW5lIChudW0pCiAgICJNb3ZlIGN1cnNvciB1cCBvbmUgbGluZS4KQEAg LTY0Miw4ICs2MTgsNyBAQCBlZHQtcHJldmlvdXMtbGluZQogICAobGV0ICgoYmVnIChlZHQtY3Vy cmVudC1saW5lKSkpCiAgICAgOzsgV2UncmUgZGVsaWJlcmF0ZWx5IHVzaW5nIHByZXZpb3VzLWxp bmUgaW5zdGVhZCBvZiBmb3J3YXJkLWxpbmUuCiAgICAgKHdpdGgtbm8td2FybmluZ3MgKHByZXZp b3VzLWxpbmUgbnVtKSkKLSAgICAoZWR0LXRvcC1jaGVjayBiZWcgbnVtKSkKLSAgKGlmIChmZWF0 dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQorICAgIChlZHQtdG9w LWNoZWNrIGJlZyBudW0pKSkKIAogCiA7OzsKQEAgLTY1Myw4ICs2MjgsNyBAQCBlZHQtcHJldmlv dXMtbGluZQogKGRlZnVuIGVkdC10b3AgKCkKICAgIk1vdmUgY3Vyc29yIHRvIHRoZSBiZWdpbm5p bmcgb2YgYnVmZmVyLiIKICAgKGludGVyYWN0aXZlKQotICAoZ290by1jaGFyIChwb2ludC1taW4p KQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkp CisgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpKQogCiA7OzsKIDs7OyBCT1RUT00KQEAgLTcwMyw4 ICs2NzcsNyBAQCBlZHQtZmluZC1mb3J3YXJkCiAgICAgICAgICAoaWYgKHplcm9wIChzZXRxIGxl ZnQgKHNhdmUtZXhjdXJzaW9uIChmb3J3YXJkLWxpbmUgaGVpZ2h0KSkpKQogICAgICAgICAgICAg IChyZWNlbnRlciB0b3AtbWFyZ2luKQogICAgICAgICAgICAocmVjZW50ZXIgKC0gbGVmdCBib3R0 b20tdXAtbWFyZ2luKSkpCi0gICAgICAgKGFuZCAoPiAocG9pbnQpIGJvdHRvbSkgKHJlY2VudGVy IGJvdHRvbS1tYXJnaW4pKSkpKQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNz LXJlZ2lvbi1zdGF5cyB0KSkpCisgICAgICAgKGFuZCAoPiAocG9pbnQpIGJvdHRvbSkgKHJlY2Vu dGVyIGJvdHRvbS1tYXJnaW4pKSkpKSkKIAogKGRlZnVuIGVkdC1maW5kLWJhY2t3YXJkICgmb3B0 aW9uYWwgZmluZCkKICAgIkZpbmQgZmlyc3Qgb2NjdXJyZW5jZSBvZiBhIHN0cmluZyBpbiB0aGUg YmFja3dhcmQgZGlyZWN0aW9uIGFuZCBzYXZlIGl0LgpAQCAtNzE1LDggKzY4OCw3IEBAIGVkdC1m aW5kLWJhY2t3YXJkCiAgIChlZHQtd2l0aC1wb3NpdGlvbgogICAgKGlmIChzZWFyY2gtYmFja3dh cmQgZWR0LWZpbmQtbGFzdC10ZXh0KQogICAgICAgIChlZHQtc2V0LW1hdGNoKSkKLSAgIChhbmQg KDwgKHBvaW50KSB0b3ApIChyZWNlbnRlciAobWluIGJlZyB0b3AtbWFyZ2luKSkpKQotICAoaWYg KGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisgICAoYW5k ICg8IChwb2ludCkgdG9wKSAocmVjZW50ZXIgKG1pbiBiZWcgdG9wLW1hcmdpbikpKSkpCiAKIChk ZWZ1biBlZHQtZmluZCAoKQogICAiRmluZCBmaXJzdCBvY2N1cnJlbmNlIG9mIHN0cmluZyBpbiBj dXJyZW50IGRpcmVjdGlvbiBhbmQgc2F2ZSBpdC4iCkBAIC03NDYsOCArNzE4LDcgQEAgZWR0LWZp bmQtbmV4dC1mb3J3YXJkCiAgICAgICAgICAgICAgICAocmVjZW50ZXIgKC0gbGVmdCBib3R0b20t dXAtbWFyZ2luKSkpCiAgICAgICAgICAgIChhbmQgKD4gKHBvaW50KSBib3R0b20pIChyZWNlbnRl ciBib3R0b20tbWFyZ2luKSkpKQogICAgICAoYmFja3dhcmQtY2hhciAxKQotICAgICAoZXJyb3Ig IlNlYXJjaCBmYWlsZWQ6IFwiJXNcIiIgZWR0LWZpbmQtbGFzdC10ZXh0KSkpCi0gIChpZiAoZmVh dHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlzIHQpKSkKKyAgICAgKGVycm9y ICJTZWFyY2ggZmFpbGVkOiBcIiVzXCIiIGVkdC1maW5kLWxhc3QtdGV4dCkpKSkKIAogKGRlZnVu IGVkdC1maW5kLW5leHQtYmFja3dhcmQgKCkKICAgIkZpbmQgbmV4dCBvY2N1cnJlbmNlIG9mIGEg c3RyaW5nIGluIGJhY2t3YXJkIGRpcmVjdGlvbi4iCkBAIC03NTYsOCArNzI3LDcgQEAgZWR0LWZp bmQtbmV4dC1iYWNrd2FyZAogICAgKGlmIChub3QgKHNlYXJjaC1iYWNrd2FyZCBlZHQtZmluZC1s YXN0LXRleHQgbmlsIHQpKQogICAgICAgIChlcnJvciAiU2VhcmNoIGZhaWxlZDogXCIlc1wiIiBl ZHQtZmluZC1sYXN0LXRleHQpCiAgICAgIChlZHQtc2V0LW1hdGNoKQotICAgICAoYW5kICg8IChw b2ludCkgdG9wKSAocmVjZW50ZXIgKG1pbiBiZWcgdG9wLW1hcmdpbikpKSkpCi0gIChpZiAoZmVh dHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlzIHQpKSkKKyAgICAgKGFuZCAo PCAocG9pbnQpIHRvcCkgKHJlY2VudGVyIChtaW4gYmVnIHRvcC1tYXJnaW4pKSkpKSkKIAogKGRl ZnVuIGVkdC1maW5kLW5leHQgKCkKICAgIkZpbmQgbmV4dCBvY2N1cnJlbmNlIG9mIGEgc3RyaW5n IGluIGN1cnJlbnQgZGlyZWN0aW9uLiIKQEAgLTgzNCw5ICs4MDQsNyBAQCBlZHQtc2VsZWN0CiAo ZGVmdW4gZWR0LXJlc2V0ICgpCiAgICJDYW5jZWwgdGV4dCBzZWxlY3Rpb24uIgogICAoaW50ZXJh Y3RpdmUpCi0gIChpZiAoZmVhdHVyZXAgJ2VtYWNzKQotICAgICAgKGRlYWN0aXZhdGUtbWFyaykK LSAgICAoem1hY3MtZGVhY3RpdmF0ZS1yZWdpb24pKSkKKyAgKGRlYWN0aXZhdGUtbWFyaykpCiAK IDs7OwogOzs7IENVVApAQCAtMTA1MCw4ICsxMDE4LDcgQEAgZWR0LWFkdmFuY2UKICAgKGZvcmNl LW1vZGUtbGluZS11cGRhdGUpCiAgIChpZiAoc3RyaW5nLWVxdWFsICIgKk1pbmlidWYiCiAgICAg ICAgICAgICAgICAgICAgIChzdWJzdHJpbmcgKGJ1ZmZlci1uYW1lKSAwIChtaW4gKGxlbmd0aCAo YnVmZmVyLW5hbWUpKSA5KSkpCi0gICAgICAoZXhpdC1taW5pYnVmZmVyKSkKLSAgKGlmIChmZWF0 dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQorICAgICAgKGV4aXQt bWluaWJ1ZmZlcikpKQogCiAKIDs7OwpAQCAtMTA2Niw4ICsxMDMzLDcgQEAgZWR0LWJhY2t1cAog ICAoZm9yY2UtbW9kZS1saW5lLXVwZGF0ZSkKICAgKGlmIChzdHJpbmctZXF1YWwgIiAqTWluaWJ1 ZiIKICAgICAgICAgICAgICAgICAgICAgKHN1YnN0cmluZyAoYnVmZmVyLW5hbWUpIDAgKG1pbiAo bGVuZ3RoIChidWZmZXItbmFtZSkpIDkpKSkKLSAgICAgIChleGl0LW1pbmlidWZmZXIpKQotICAo aWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisgICAg ICAoZXhpdC1taW5pYnVmZmVyKSkpCiAKIAogOzs7CkBAIC0xMTE3LDE0ICsxMDgzLDExIEBAIGVk dC1kZWZpbmUta2V5CiBUaGUgY3VycmVudCBrZXkgZGVmaW5pdGlvbiBpcyBzYXZlZCBpbiBgZWR0 LWxhc3QtcmVwbGFjZWQta2V5LWRlZmluaXRpb24nLgogVXNlIGBlZHQtcmVzdG9yZS1rZXknIHRv IHJlc3RvcmUgbGFzdCByZXBsYWNlZCBrZXkgZGVmaW5pdGlvbi4iCiAgIChpbnRlcmFjdGl2ZSkK LSAgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpCiAg IChsZXQgKGVkdC1mdW5jdGlvbgogCWVkdC1rZXktZGVmaW5pdGlvbikKICAgICAoc2V0cSBlZHQt a2V5LWRlZmluaXRpb24KIAkgIChyZWFkLWtleS1zZXF1ZW5jZSAiUHJlc3MgdGhlIGtleSB0byBi ZSBkZWZpbmVkOiAiKSkKLSAgICAoaWYgKGlmIChmZWF0dXJlcCAnZW1hY3MpCi0JICAgIChzdHJp bmctZXF1YWwgIlxDLW0iIGVkdC1rZXktZGVmaW5pdGlvbikKLQkgIChzdHJpbmctZXF1YWwgIlxD LW0iIChldmVudHMtdG8ta2V5cyBlZHQta2V5LWRlZmluaXRpb24pKSkKKyAgICAoaWYgKHN0cmlu Zy1lcXVhbCAiXEMtbSIgZWR0LWtleS1kZWZpbml0aW9uKQogICAgICAgICAobWVzc2FnZSAiS2V5 IG5vdCBkZWZpbmVkIikKICAgICAgIChwcm9nbgogCShzZXRxIGVkdC1mdW5jdGlvbiAocmVhZC1j b21tYW5kICJFbnRlciBjb21tYW5kIG5hbWU6ICIpKQpAQCAtMTIwMiw4ICsxMTY1LDYgQEAgZWR0 LWJvdHRvbS1jaGVjawogCQkgOzsgc3VidHJhY3QgMSBmcm9tIGhlaWdodCBiZWNhdXNlIGl0IGlu Y2x1ZGVzIG1vZGUgbGluZQogCQkgKGRpZmZlcmVuY2UgKC0gaGVpZ2h0IG1hcmdpbiAxKSkpCiAg ICAgKGNvbmQgKCg+IGJlZyBkaWZmZXJlbmNlKSAocmVjZW50ZXIgYmVnKSkKLQkJICAoKGFuZCAo ZmVhdHVyZXAgJ3hlbWFjcykgKD4gKCsgYmVnIGxpbmVzIDEpIGRpZmZlcmVuY2UpKQotCQkgICAo cmVjZW50ZXIgKC0gbWFyZ2luKSkpCiAJCSAgKCg+ICgrIGJlZyBsaW5lcykgZGlmZmVyZW5jZSkg KHJlY2VudGVyICgtIG1hcmdpbikpKSkpKQogCiAoZGVmdW4gZWR0LWN1cnJlbnQtbGluZSBuaWwK QEAgLTEyODksOCArMTI1MCw3IEBAIGVkdC1zZW50ZW5jZS1mb3J3YXJkCiAgICAgICAgKGlmICh6 ZXJvcCAoc2V0cSBsZWZ0IChzYXZlLWV4Y3Vyc2lvbiAoZm9yd2FyZC1saW5lIGhlaWdodCkpKSkK ICAgICAgICAgICAgKHJlY2VudGVyIHRvcC1tYXJnaW4pCiAgICAgICAgICAocmVjZW50ZXIgKC0g bGVmdCBib3R0b20tdXAtbWFyZ2luKSkpCi0gICAgIChhbmQgKD4gKHBvaW50KSBib3R0b20pIChy ZWNlbnRlciBib3R0b20tbWFyZ2luKSkpKQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRx IHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisgICAgIChhbmQgKD4gKHBvaW50KSBib3R0b20pIChy ZWNlbnRlciBib3R0b20tbWFyZ2luKSkpKSkKIAogKGRlZnVuIGVkdC1zZW50ZW5jZS1iYWNrd2Fy ZCAobnVtKQogICAiTW92ZSBiYWNrd2FyZCB0byBuZXh0IHNlbnRlbmNlIGJlZ2lubmluZy4KQEAg LTEzMDEsOCArMTI2MSw3IEBAIGVkdC1zZW50ZW5jZS1iYWNrd2FyZAogICAgKGlmIChlb2JwKQog ICAgICAgIChlcnJvciAiRW5kIG9mIGJ1ZmZlciIpCiAgICAgIChiYWNrd2FyZC1zZW50ZW5jZSBu dW0pKQotICAgKGFuZCAoPCAocG9pbnQpIHRvcCkgKHJlY2VudGVyIChtaW4gYmVnIHRvcC1tYXJn aW4pKSkpCi0gIChpZiAoZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlz IHQpKSkKKyAgIChhbmQgKDwgKHBvaW50KSB0b3ApIChyZWNlbnRlciAobWluIGJlZyB0b3AtbWFy Z2luKSkpKSkKIAogKGRlZnVuIGVkdC1zZW50ZW5jZSAobnVtKQogICAiTW92ZSBpbiBjdXJyZW50 IGRpcmVjdGlvbiB0byBuZXh0IHNlbnRlbmNlLgpAQCAtMTMzMiw4ICsxMjkxLDcgQEAgZWR0LXBh cmFncmFwaC1mb3J3YXJkCiAgICAgICAgKGlmICh6ZXJvcCAoc2V0cSBsZWZ0IChzYXZlLWV4Y3Vy c2lvbiAoZm9yd2FyZC1saW5lIGhlaWdodCkpKSkKICAgICAgICAgICAgKHJlY2VudGVyIHRvcC1t YXJnaW4pCiAgICAgICAgICAocmVjZW50ZXIgKC0gbGVmdCBib3R0b20tdXAtbWFyZ2luKSkpCi0g ICAgIChhbmQgKD4gKHBvaW50KSBib3R0b20pIChyZWNlbnRlciBib3R0b20tbWFyZ2luKSkpKQot ICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisg ICAgIChhbmQgKD4gKHBvaW50KSBib3R0b20pIChyZWNlbnRlciBib3R0b20tbWFyZ2luKSkpKSkK IAogKGRlZnVuIGVkdC1wYXJhZ3JhcGgtYmFja3dhcmQgKG51bSkKICAgIk1vdmUgYmFja3dhcmQg dG8gYmVnaW5uaW5nIG9mIHBhcmFncmFwaC4KQEAgLTEzNDQsOCArMTMwMiw3IEBAIGVkdC1wYXJh Z3JhcGgtYmFja3dhcmQKICAgICh3aGlsZSAoPiBudW0gMCkKICAgICAgKHN0YXJ0LW9mLXBhcmFn cmFwaC10ZXh0KQogICAgICAoc2V0cSBudW0gKDEtIG51bSkpKQotICAgKGFuZCAoPCAocG9pbnQp IHRvcCkgKHJlY2VudGVyIChtaW4gYmVnIHRvcC1tYXJnaW4pKSkpCi0gIChpZiAoZmVhdHVyZXAg J3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlzIHQpKSkKKyAgIChhbmQgKDwgKHBvaW50 KSB0b3ApIChyZWNlbnRlciAobWluIGJlZyB0b3AtbWFyZ2luKSkpKSkKIAogKGRlZnVuIGVkdC1w YXJhZ3JhcGggKG51bSkKICAgIk1vdmUgaW4gY3VycmVudCBkaXJlY3Rpb24gdG8gbmV4dCBwYXJh Z3JhcGguCkBAIC0xMzYzLDI0ICsxMzIwLDE4IEBAIGVkdC1yZXN0b3JlLWtleQogICAiUmVzdG9y ZSBsYXN0IHJlcGxhY2VkIGtleSBkZWZpbml0aW9uLgogRGVmaW5pdGlvbiBpcyBzdG9yZWQgaW4g YGVkdC1sYXN0LXJlcGxhY2VkLWtleS1kZWZpbml0aW9uJy4iCiAgIChpbnRlcmFjdGl2ZSkKLSAg KGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpCiAgIChp ZiBlZHQtbGFzdC1yZXBsYWNlZC1rZXktZGVmaW5pdGlvbgogICAgICAgKHByb2duCiAgICAgICAg IChsZXQgKGVkdC1rZXktZGVmaW5pdGlvbikKICAgICAgICAgICAoc2V0ICdlZHQta2V5LWRlZmlu aXRpb24KICAgICAgICAgICAgICAgIChyZWFkLWtleS1zZXF1ZW5jZSAiUHJlc3MgdGhlIGtleSB0 byBiZSByZXN0b3JlZDogIikpCi0JICAoaWYgKGlmIChmZWF0dXJlcCAnZW1hY3MpCi0JCSAgKHN0 cmluZy1lcXVhbCAiXEMtbSIgZWR0LWtleS1kZWZpbml0aW9uKQotCQkoc3RyaW5nLWVxdWFsICJc Qy1tIiAoZXZlbnRzLXRvLWtleXMgZWR0LWtleS1kZWZpbml0aW9uKSkpCisJICAoaWYgKHN0cmlu Zy1lcXVhbCAiXEMtbSIgZWR0LWtleS1kZWZpbml0aW9uKQogICAgICAgICAgICAgICAobWVzc2Fn ZSAiS2V5IG5vdCByZXN0b3JlZCIpCiAJICAgIChwcm9nbgogCSAgICAgIChkZWZpbmUta2V5IChj dXJyZW50LWdsb2JhbC1tYXApCiAJCWVkdC1rZXktZGVmaW5pdGlvbiBlZHQtbGFzdC1yZXBsYWNl ZC1rZXktZGVmaW5pdGlvbikKLQkgICAgICAoaWYgKGZlYXR1cmVwICdlbWFjcykKLQkJICAobWVz c2FnZSAiS2V5IGRlZmluaXRpb24gZm9yICVzIGhhcyBiZWVuIHJlc3RvcmVkLiIKLQkJCSAgIGVk dC1rZXktZGVmaW5pdGlvbikKLQkJKG1lc3NhZ2UgIktleSBkZWZpbml0aW9uIGZvciAlcyBoYXMg YmVlbiByZXN0b3JlZC4iCi0JCQkgKGV2ZW50cy10by1rZXlzIGVkdC1rZXktZGVmaW5pdGlvbikp KSkpKSkKKwkgICAgICAobWVzc2FnZSAiS2V5IGRlZmluaXRpb24gZm9yICVzIGhhcyBiZWVuIHJl c3RvcmVkLiIKKwkJICAgICAgIGVkdC1rZXktZGVmaW5pdGlvbikpKSkpCiAgICAgKGVycm9yICJO byByZXBsYWNlZCBrZXkgZGVmaW5pdGlvbiB0byByZXN0b3JlISIpKSkKIAogOzs7CkBAIC0xMzky LDggKzEzNDMsNyBAQCBlZHQtd2luZG93LXRvcAogICAoaW50ZXJhY3RpdmUpCiAgIChsZXQgKChz dGFydC1jb2x1bW4gKGN1cnJlbnQtY29sdW1uKSkpCiAgICAgKG1vdmUtdG8td2luZG93LWxpbmUg MCkKLSAgICAobW92ZS10by1jb2x1bW4gc3RhcnQtY29sdW1uKSkKLSAgKGlmIChmZWF0dXJlcCAn eGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQorICAgIChtb3ZlLXRvLWNvbHVt biBzdGFydC1jb2x1bW4pKSkKIAogOzs7CiA7OzsgV0lORE9XIEJPVFRPTQpAQCAtMTQwNCw4ICsx MzU0LDcgQEAgZWR0LXdpbmRvdy1ib3R0b20KICAgKGludGVyYWN0aXZlKQogICAobGV0ICgoc3Rh cnQtY29sdW1uIChjdXJyZW50LWNvbHVtbikpKQogICAgIChtb3ZlLXRvLXdpbmRvdy1saW5lICgt ICh3aW5kb3ctaGVpZ2h0KSAyKSkKLSAgICAobW92ZS10by1jb2x1bW4gc3RhcnQtY29sdW1uKSkK LSAgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQor ICAgIChtb3ZlLXRvLWNvbHVtbiBzdGFydC1jb2x1bW4pKSkKIAogOzs7CiA7OzsgU0NST0xMIFdJ TkRPVyBMSU5FCkBAIC0xNDE0LDE0ICsxMzYzLDEyIEBAIGVkdC13aW5kb3ctYm90dG9tCiAoZGVm dW4gZWR0LXNjcm9sbC13aW5kb3ctZm9yd2FyZC1saW5lICgpCiAgICJNb3ZlIHdpbmRvdyBmb3J3 YXJkIG9uZSBsaW5lIGxlYXZpbmcgY3Vyc29yIGF0IHBvc2l0aW9uIGluIHdpbmRvdy4iCiAgIChp bnRlcmFjdGl2ZSkKLSAgKHNjcm9sbC11cCAxKQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChz ZXRxIHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisgIChzY3JvbGwtdXAgMSkpCiAKIChkZWZ1biBl ZHQtc2Nyb2xsLXdpbmRvdy1iYWNrd2FyZC1saW5lICgpCiAgICJNb3ZlIHdpbmRvdyBiYWNrd2Fy ZCBvbmUgbGluZSBsZWF2aW5nIGN1cnNvciBhdCBwb3NpdGlvbiBpbiB3aW5kb3cuIgogICAoaW50 ZXJhY3RpdmUpCi0gIChzY3JvbGwtZG93biAxKQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChz ZXRxIHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisgIChzY3JvbGwtZG93biAxKSkKIAogKGRlZnVu IGVkdC1zY3JvbGwtbGluZSAoKQogICAiTW92ZSB3aW5kb3cgb25lIGxpbmUgaW4gY3VycmVudCBk aXJlY3Rpb24uIgpAQCAtMTQ2Nyw4ICsxNDE0LDcgQEAgZWR0LXNjcm9sbC13aW5kb3cKIChkZWZ1 biBlZHQtbGluZS10by1ib3R0b20tb2Ytd2luZG93ICgpCiAgICJNb3ZlIHRoZSBjdXJyZW50IGxp bmUgdG8gdGhlIGJvdHRvbSBvZiB0aGUgd2luZG93LiIKICAgKGludGVyYWN0aXZlKQotICAocmVj ZW50ZXIgLTEpCi0gIChpZiAoZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0 YXlzIHQpKSkKKyAgKHJlY2VudGVyIC0xKSkKIAogOzs7CiA7OzsgTElORSBUTyBUT1AgT0YgV0lO RE9XCkBAIC0xNDc3LDggKzE0MjMsNyBAQCBlZHQtbGluZS10by1ib3R0b20tb2Ytd2luZG93CiAo ZGVmdW4gZWR0LWxpbmUtdG8tdG9wLW9mLXdpbmRvdyAoKQogICAiTW92ZSB0aGUgY3VycmVudCBs aW5lIHRvIHRoZSB0b3Agb2YgdGhlIHdpbmRvdy4iCiAgIChpbnRlcmFjdGl2ZSkKLSAgKHJlY2Vu dGVyIDApCi0gIChpZiAoZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlz IHQpKSkKKyAgKHJlY2VudGVyIDApKQogCiA7OzsKIDs7OyBMSU5FIFRPIE1JRERMRSBPRiBXSU5E T1cKQEAgLTE0ODcsOCArMTQzMiw3IEBAIGVkdC1saW5lLXRvLXRvcC1vZi13aW5kb3cKIChkZWZ1 biBlZHQtbGluZS10by1taWRkbGUtb2Ytd2luZG93ICgpCiAgICJNb3ZlIHdpbmRvdyBzbyBsaW5l IHdpdGggY3Vyc29yIGlzIGluIHRoZSBtaWRkbGUgb2YgdGhlIHdpbmRvdy4iCiAgIChpbnRlcmFj dGl2ZSkKLSAgKHJlY2VudGVyICcoNCkpCi0gIChpZiAoZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEg em1hY3MtcmVnaW9uLXN0YXlzIHQpKSkKKyAgKHJlY2VudGVyICcoNCkpKQogCiA7OzsKIDs7OyBH T1RPIFBFUkNFTlRBR0UKQEAgLTE1MDAsOCArMTQ0NCw3IEBAIGVkdC1nb3RvLXBlcmNlbnRhZ2UK ICAgKGludGVyYWN0aXZlICJOR290by1wZXJjZW50YWdlOiAiKQogICAoaWYgKG9yICg+IG51bSAx MDApICg8IG51bSAwKSkKICAgICAgIChlcnJvciAiUGVyY2VudGFnZSAlZCBvdXQgb2YgcmFuZ2Ug MCA8IHBlcmNlbnQgPCAxMDAiIG51bSkKLSAgICAoZ290by1jaGFyICgvICgqIChwb2ludC1tYXgp IG51bSkgMTAwKSkpCi0gIChpZiAoZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9u LXN0YXlzIHQpKSkKKyAgICAoZ290by1jaGFyICgvICgqIChwb2ludC1tYXgpIG51bSkgMTAwKSkp KQogCiA7OzsKIDs7OyBGSUxMIFJFR0lPTgpAQCAtMTY3Myw3ICsxNjE2LDYgQEAgZWR0LWVsaW1p bmF0ZS1hbGwtdGFicwogKGRlZnVuIGVkdC1kaXNwbGF5LXRoZS10aW1lICgpCiAgICJEaXNwbGF5 IHRoZSBjdXJyZW50IHRpbWUuIgogICAoaW50ZXJhY3RpdmUpCi0gIChpZiAoZmVhdHVyZXAgJ3hl bWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlzIHQpKQogICAobWVzc2FnZSAiJXMiIChjdXJy ZW50LXRpbWUtc3RyaW5nKSkpCiAKIDs7OwpAQCAtMTcwMSw5ICsxNjQzLDcgQEAgZWR0LXJlbWVt YmVyCiAgICAgICAobGV0IChlZHQta2V5LWRlZmluaXRpb24pCiAJKHNldCAnZWR0LWtleS1kZWZp bml0aW9uCiAJICAgICAocmVhZC1rZXktc2VxdWVuY2UgIkVudGVyIGtleSBmb3IgYmluZGluZzog IikpCi0JKGlmIChpZiAoZmVhdHVyZXAgJ2VtYWNzKQotCQkoc3RyaW5nLWVxdWFsICJcQy1tIiBl ZHQta2V5LWRlZmluaXRpb24pCi0JICAgICAgKHN0cmluZy1lcXVhbCAiXEMtbSIgKGV2ZW50cy10 by1rZXlzIGVkdC1rZXktZGVmaW5pdGlvbikpKQorCShpZiAoc3RyaW5nLWVxdWFsICJcQy1tIiBl ZHQta2V5LWRlZmluaXRpb24pCiAJICAgIChtZXNzYWdlICJLZXkgc2VxdWVuY2Ugbm90IHJlbWVt YmVyZWQiKQogCSAgKHByb2duCiAJICAgIChzZXQgJ2VkdC1sZWFybi1tYWNyby1jb3VudCAoKyBl ZHQtbGVhcm4tbWFjcm8tY291bnQgMSkpCkBAIC0xNzUzLDggKzE2OTMsNyBAQCBlZHQtc3BsaXQt d2luZG93CiAgICJTcGxpdCBjdXJyZW50IHdpbmRvdyBhbmQgcGxhY2UgY3Vyc29yIGluIHRoZSBu ZXcgd2luZG93LiIKICAgKGludGVyYWN0aXZlKQogICAoc3BsaXQtd2luZG93KQotICAob3RoZXIt d2luZG93IDEpCi0gIChpZiAoZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0 YXlzIHQpKSkKKyAgKG90aGVyLXdpbmRvdyAxKSkKIAogOzs7CiA7OzsgQ09QWSBSRUNUQU5HTEUK QEAgLTE5MzUsOSArMTg3NCw4IEBAIGVkdC15LW9yLW4tcAogKGRlZnVuIGVkdC1sb2FkLWtleXMg KGZpbGUpCiAgICJMb2FkIHRoZSBMSy0yMDEga2V5IG1hcHBpbmcgRklMRSBnZW5lcmF0ZWQgYnkg ZWR0LW1hcHBlci5lbC4KIElmIEZJTEUgaXMgbmlsLCB3aGljaCBpcyB0aGUgbm9ybWFsIGNhc2Us IHRyeSB0byBsb2FkIGEgZGVmYXVsdCBmaWxlLgotVGhlIGRlZmF1bHQgZmlsZSBuYW1lcyBhcmUg YmFzZWQgdXBvbiB0aGUgd2luZG93IHN5c3RlbSwgdGVybWluYWwKLXR5cGUsIGFuZCB2ZXJzaW9u IG9mIEVtYWNzIGluIHVzZTogR05VIEVtYWNzIG9yIFhFbWFjcyAoYWthIEx1Y2lkCi1FbWFjcyku ICBJZiBhIGRlZmF1bHQgZmlsZSBkb2VzIG5vdCBleGlzdCwgYXNrIHVzZXIgaWYgb25lIHNob3Vs ZCBiZQorVGhlIGRlZmF1bHQgZmlsZSBuYW1lcyBhcmUgYmFzZWQgdXBvbiB0aGUgd2luZG93IHN5 c3RlbSBhbmQgdGVybWluYWwKK3R5cGUuICBJZiBhIGRlZmF1bHQgZmlsZSBkb2VzIG5vdCBleGlz dCwgYXNrIHVzZXIgaWYgb25lIHNob3VsZCBiZQogY3JlYXRlZC4iCiAgIChpbnRlcmFjdGl2ZSAi ZktleSBkZWZpbml0aW9uIGZpbGU6ICIpCiAgIChjb25kIChmaWxlCkBAIC0xOTQ4LDExICsxODg2 LDExIEBAIGVkdC1sb2FkLWtleXMKIAkgKHNldHEgZmlsZQogCSAgICAgICAoZXhwYW5kLWZpbGUt bmFtZQogCQkoY29uY2F0Ci0JCSAifi8uZWR0LSIgZWR0LWVtYWNzLXZhcmlhbnQKKwkJICJ+Ly5l ZHQtZ251IgogCQkgKGlmIGVkdC10ZXJtIChjb25jYXQgIi0iIGVkdC10ZXJtKSkKIAkJIChpZiBl ZHQteHNlcnZlciAoY29uY2F0ICItIiBlZHQteHNlcnZlcikpCi0JCSAoaWYgZWR0LXdpbmRvdy1z eXN0ZW0KLQkJICAgICAoY29uY2F0ICItIiAodXBjYXNlIChzeW1ib2wtbmFtZSBlZHQtd2luZG93 LXN5c3RlbSkpKSkKKwkJIChpZiB3aW5kb3ctc3lzdGVtCisJCSAgICAgKGNvbmNhdCAiLSIgKHVw Y2FzZSAoc3ltYm9sLW5hbWUgd2luZG93LXN5c3RlbSkpKSkKIAkJICIta2V5cyIpKSkpKQogICAo Y29uZCAoKGZpbGUtcmVhZGFibGUtcCBmaWxlKQogCSAobG9hZC1maWxlIGZpbGUpKQpAQCAtMjAw MiwxNSArMTk0MCwxNCBAQCBlZHQtZW11bGF0aW9uLW9uCiAgICJUdXJuIG9uIEVEVCBFbXVsYXRp b24uIgogICAoaW50ZXJhY3RpdmUpCiAgIDs7IElmIHVzaW5nIHBjIHdpbmRvdyBzeXN0ZW0gKE1T LURPUyksIHNldCB0ZXJtaW5hbCB0eXBlIHRvIHBjLgotICA7OyBJZiBub3QgYSB3aW5kb3cgc3lz dGVtIChHTlUpIG9yIGEgdHR5IHdpbmRvdyBzeXN0ZW0gKFhFbWFjcyksCi0gIDs7IGdldCB0ZXJt aW5hbCB0eXBlLgotICAoaWYgKGVxIGVkdC13aW5kb3ctc3lzdGVtICdwYykKKyAgOzsgSWYgbm90 IGEgd2luZG93IHN5c3RlbSwgZ2V0IHRlcm1pbmFsIHR5cGUuCisgIChpZiAoZXEgd2luZG93LXN5 c3RlbSAncGMpCiAgICAgICAoc2V0cSBlZHQtdGVybSAicGMiKQotICAgIChpZiAob3IgKG5vdCBl ZHQtd2luZG93LXN5c3RlbSkgKGVxIGVkdC13aW5kb3ctc3lzdGVtICd0dHkpKQorICAgIChpZiAo bm90IHdpbmRvdy1zeXN0ZW0pCiAJKHNldHEgZWR0LXRlcm0gKGdldGVudiAiVEVSTSIpKSkpCiAg IDs7IExvb2sgZm9yIGEgdGVybWluYWwgY29uZmlndXJhdGlvbiBmaWxlIGZvciB0aGlzIHRlcm1p bmFsIHR5cGUuCiAgIDs7IE90aGVyd2lzZSwgbG9hZCB0aGUgdXNlcidzIGN1c3RvbSBjb25maWd1 cmF0aW9uIGZpbGUuCi0gIChpZiAob3IgKG5vdCBlZHQtd2luZG93LXN5c3RlbSkgKG1lbXEgZWR0 LXdpbmRvdy1zeXN0ZW0gJyhwYyB0dHkpKSkKKyAgKGlmIChvciAobm90IHdpbmRvdy1zeXN0ZW0p IChtZW1xIHdpbmRvdy1zeXN0ZW0gJyhwYyB0dHkpKSkKICAgICAgIChwcm9nbgogCTs7IExvYWQg dGVybWluYWwtc3BlY2lmaWMgY29uZmlndXJhdGlvbiBmaWxlLCBpZiBpdCBleGlzdHMgZm9yIHRo aXMKIAk7OyB0ZXJtaW5hbCB0eXBlLiAgTm90ZTogQWxsIERFQyBWVCBzZXJpZXMgdGVybWluYWxz IGFyZSBzdXBwb3J0ZWQKQEAgLTIwMzcsMjcgKzE5NzQsMTYgQEAgZWR0LWVtdWxhdGlvbi1vbgog CSAgICAoc2V0cSBlZHQtdGVybSB0ZXJtKSkpKQogICAgIChlZHQtbG9hZC1rZXlzIG5pbCkpCiAg IDs7IE1ha2UgaGlnaGxpZ2h0aW5nIG9mIHNlbGVjdGVkIHRleHQgd29yayBwcm9wZXJseSBmb3Ig RURUIGNvbW1hbmRzLgotICAoaWYgKGZlYXR1cmVwICdlbWFjcykKLSAgICAgIChwcm9nbgotCShz ZXRxIGVkdC1vcmlnLXRyYW5zaWVudC1tYXJrLW1vZGUKLSAgICAgICAgICAgICAgKGRlZmF1bHQt dmFsdWUgJ3RyYW5zaWVudC1tYXJrLW1vZGUpKQotCShhZGQtaG9vayAnYWN0aXZhdGUtbWFyay1o b29rCi0JCSAgKGZ1bmN0aW9uCi0JCSAgIChsYW1iZGEgKCkKLQkJICAgICAoZWR0LXNlbGVjdC1t b2RlIHQpKSkpCi0JKGFkZC1ob29rICdkZWFjdGl2YXRlLW1hcmstaG9vawotCQkgIChmdW5jdGlv bgotCQkgICAobGFtYmRhICgpCi0JCSAgICAgKGVkdC1zZWxlY3QtbW9kZSBuaWwpKSkpKQotICAg IChwcm9nbgotICAgICAgKGFkZC1ob29rICd6bWFjcy1hY3RpdmF0ZS1yZWdpb24taG9vawotCQko ZnVuY3Rpb24KLQkJIChsYW1iZGEgKCkKLQkJICAgKGVkdC1zZWxlY3QtbW9kZSB0KSkpKQotICAg ICAgKGFkZC1ob29rICd6bWFjcy1kZWFjdGl2YXRlLXJlZ2lvbi1ob29rCi0JCShmdW5jdGlvbgot CQkgKGxhbWJkYSAoKQotCQkgICAoZWR0LXNlbGVjdC1tb2RlIG5pbCkpKSkpKQorICAoc2V0cSBl ZHQtb3JpZy10cmFuc2llbnQtbWFyay1tb2RlCisgICAgICAgIChkZWZhdWx0LXZhbHVlICd0cmFu c2llbnQtbWFyay1tb2RlKSkKKyAgKGFkZC1ob29rICdhY3RpdmF0ZS1tYXJrLWhvb2sKKwkgICAg KGZ1bmN0aW9uCisJICAgICAobGFtYmRhICgpCisJICAgICAgIChlZHQtc2VsZWN0LW1vZGUgdCkp KSkKKyAgKGFkZC1ob29rICdkZWFjdGl2YXRlLW1hcmstaG9vaworCSAgICAoZnVuY3Rpb24KKwkg ICAgIChsYW1iZGEgKCkKKwkgICAgICAgKGVkdC1zZWxlY3QtbW9kZSBuaWwpKSkpCiAgIDs7ICBM b2FkIHVzZXIncyBFRFQgY3VzdG9tIGtleSBiaW5kaW5ncyBmaWxlLCBpZiBpdCBleGlzdHMuCiAg IDs7ICBPdGhlcndpc2UsIHVzZSB0aGUgZGVmYXVsdCBiaW5kaW5ncy4KICAgKGlmIChsb2FkICJl ZHQtdXNlciIgdCB0KQpAQCAtMjA3NCw4ICsyMDAwLDcgQEAgZWR0LWVtdWxhdGlvbi1vZmYKICAg KHNldHEgZWR0LXNlbGVjdC1tb2RlLWN1cnJlbnQgbmlsKQogICAoZWR0LXJlc2V0KQogICAoZm9y Y2UtbW9kZS1saW5lLXVwZGF0ZSB0KQotICAoaWYgKGZlYXR1cmVwICdlbWFjcykKLSAgICAgIChz ZXRxLWRlZmF1bHQgdHJhbnNpZW50LW1hcmstbW9kZSBlZHQtb3JpZy10cmFuc2llbnQtbWFyay1t b2RlKSkKKyAgKHNldHEtZGVmYXVsdCB0cmFuc2llbnQtbWFyay1tb2RlIGVkdC1vcmlnLXRyYW5z aWVudC1tYXJrLW1vZGUpCiAgIChtZXNzYWdlICJPcmlnaW5hbCBrZXkgYmluZGluZ3MgcmVzdG9y ZWQ7IEVEVCBFbXVsYXRpb24gZGlzYWJsZWQiKSkKIAogKGRlZnVuIGVkdC1kZWZhdWx0LW1lbnUt YmFyLXVwZGF0ZS1idWZmZXJzICgpCkBAIC0yMTAzLDkgKzIwMjgsNyBAQCBlZHQtZGVmYXVsdC1l bXVsYXRpb24tc2V0dXAKICAgOzsgZGlzdHVyYmluZyB0aGUgb3JpZ2luYWwgYmluZGluZ3MgaW4g Z2xvYmFsLW1hcC4KICAgKGZzZXQgJ2VkdC1kZWZhdWx0LUVTQy1wcmVmaXggKGNvcHkta2V5bWFw ICdFU0MtcHJlZml4KSkKICAgKHNldHEgZWR0LWRlZmF1bHQtZ2xvYmFsLW1hcCAoY29weS1rZXlt YXAgKGN1cnJlbnQtZ2xvYmFsLW1hcCkpKQotICAoaWYgKGZlYXR1cmVwICdlbWFjcykKLSAgICAg IChkZWZpbmUta2V5IGVkdC1kZWZhdWx0LWdsb2JhbC1tYXAgIlxlIiAnZWR0LWRlZmF1bHQtRVND LXByZWZpeCkKLSAgICAoZGVmaW5lLWtleSBlZHQtZGVmYXVsdC1nbG9iYWwtbWFwIFtlc2NhcGVd ICdlZHQtZGVmYXVsdC1FU0MtcHJlZml4KSkKKyAgKGRlZmluZS1rZXkgZWR0LWRlZmF1bHQtZ2xv YmFsLW1hcCAiXGUiICdlZHQtZGVmYXVsdC1FU0MtcHJlZml4KQogICAoZGVmaW5lLXByZWZpeC1j b21tYW5kICdlZHQtZGVmYXVsdC1nb2xkLW1hcCkKICAgKGVkdC1zZXR1cC1kZWZhdWx0LWJpbmRp bmdzKQogICA7OyBJZiB0ZXJtaW5hbCBoYXMgYWRkaXRpb25hbCBmdW5jdGlvbiBrZXlzLCB0aGUg dGVybWluYWwtc3BlY2lmaWMKQEAgLTIxNDEsOSArMjA2NCw3IEBAIGVkdC11c2VyLWVtdWxhdGlv bi1zZXR1cAogICA7OyBTZXR1cCB1c2VyIEVEVCBnbG9iYWwgbWFwIGJ5IGNvcHlpbmcgZGVmYXVs dCBFRFQgZ2xvYmFsIG1hcCBiaW5kaW5ncy4KICAgKGZzZXQgJ2VkdC11c2VyLUVTQy1wcmVmaXgg KGNvcHkta2V5bWFwICdlZHQtZGVmYXVsdC1FU0MtcHJlZml4KSkKICAgKHNldHEgZWR0LXVzZXIt Z2xvYmFsLW1hcCAoY29weS1rZXltYXAgZWR0LWRlZmF1bHQtZ2xvYmFsLW1hcCkpCi0gIChpZiAo ZmVhdHVyZXAgJ2VtYWNzKQotICAgICAgKGRlZmluZS1rZXkgZWR0LXVzZXItZ2xvYmFsLW1hcCAi XGUiICdlZHQtdXNlci1FU0MtcHJlZml4KQotICAgIChkZWZpbmUta2V5IGVkdC11c2VyLWdsb2Jh bC1tYXAgW2VzY2FwZV0gJ2VkdC11c2VyLUVTQy1wcmVmaXgpKQorICAoZGVmaW5lLWtleSBlZHQt dXNlci1nbG9iYWwtbWFwICJcZSIgJ2VkdC11c2VyLUVTQy1wcmVmaXgpCiAgIDs7IElmIHRlcm1p bmFsIGhhcyBhZGRpdGlvbmFsIGZ1bmN0aW9uIGtleXMsIHRoZSB1c2VyJ3MgaW5pdGlhbGl6YXRp b24KICAgOzsgZmlsZSBjYW4gYXNzaWduIGJpbmRpbmdzIHRvIHRoZW0gdmlhIHRoZSBvcHRpb25h bAogICA7OyBmdW5jdGlvbiBlZHQtc2V0dXAtZXh0cmEtZGVmYXVsdC1iaW5kaW5ncy4KQEAgLTIx NjAsOCArMjA4MSw3IEBAIGVkdC11c2VyLWVtdWxhdGlvbi1zZXR1cAogKGRlZnVuIGVkdC1zZWxl Y3QtZGVmYXVsdC1nbG9iYWwtbWFwKCkKICAgIlNlbGVjdCBkZWZhdWx0IEVEVCBlbXVsYXRpb24g a2V5IGJpbmRpbmdzLiIKICAgKGludGVyYWN0aXZlKQotICAoaWYgKGZlYXR1cmVwICdlbWFjcykK LSAgICAodHJhbnNpZW50LW1hcmstbW9kZSAxKSkKKyAgKHRyYW5zaWVudC1tYXJrLW1vZGUgMSkK ICAgKHVzZS1nbG9iYWwtbWFwIGVkdC1kZWZhdWx0LWdsb2JhbC1tYXApCiAgIChpZiAobm90IGVk dC1rZWVwLWN1cnJlbnQtcGFnZS1kZWxpbWl0ZXIpCiAgICAgICAocHJvZ24KQEAgLTIxNzgsOCAr MjA5OCw3IEBAIGVkdC1zZWxlY3QtdXNlci1nbG9iYWwtbWFwCiAgIChpbnRlcmFjdGl2ZSkKICAg KGlmIGVkdC11c2VyLW1hcC1jb25maWd1cmVkCiAgICAgICAocHJvZ24KLQkoaWYgKGZlYXR1cmVw ICdlbWFjcykKLQkgICAgKHRyYW5zaWVudC1tYXJrLW1vZGUgMSkpCisJKHRyYW5zaWVudC1tYXJr LW1vZGUgMSkKICAgICAgICAgKHVzZS1nbG9iYWwtbWFwIGVkdC11c2VyLWdsb2JhbC1tYXApCiAg ICAgICAgIChpZiAobm90IGVkdC1rZWVwLWN1cnJlbnQtcGFnZS1kZWxpbWl0ZXIpCiAgICAgICAg ICAgICAocHJvZ24KLS0gCjIuMjAuMQoK --000000000000b25ba50594163df4-- From unknown Sun Jun 22 01:01:32 2025 X-Loop: help-debbugs@gnu.org Subject: bug#37621: [PATCH] Remove XEmacs compat code from edt.el Resent-From: "Basil L. Contovounesios" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 05 Oct 2019 21:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37621 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Stefan Kangas Cc: 37621@debbugs.gnu.org Received: via spool by 37621-submit@debbugs.gnu.org id=B37621.15703099863168 (code B ref 37621); Sat, 05 Oct 2019 21:14:02 +0000 Received: (at 37621) by debbugs.gnu.org; 5 Oct 2019 21:13:06 +0000 Received: from localhost ([127.0.0.1]:45310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGrMQ-0000p2-3S for submit@debbugs.gnu.org; Sat, 05 Oct 2019 17:13:06 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:37976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGrMN-0000oV-B3 for 37621@debbugs.gnu.org; Sat, 05 Oct 2019 17:13:04 -0400 Received: by mail-wm1-f43.google.com with SMTP id 3so8879136wmi.3 for <37621@debbugs.gnu.org>; Sat, 05 Oct 2019 14:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=O3IHHqaJj6A2triVWPeKl8PgMgLN6vy5+yomR63A/v0=; b=iq8iMlgbeRO/DoXIBzZU6QMGpRa/F2O332vl8uBq9QnNkhgxuQTVs8iTuKWDMAPMhB 1V9fiI8Kbfo30LTm711lxAZQnp1RmupBnVMtv0QVmS0jRs8/QtCApS38Pt1Us8LStu1b FrxsWg7xoarsYr3dWqYGZmSBbtdQf6IR6sidFKhf8aQNlSY8DHb7Ovnh2ZpUaN9ZIEbs FpwCNGQTyW6oKU+7yluVgtPl6E4RTFiFyH/TwluoilkJPOzg9BpcwZUk7zk9/Z9KPlf8 pZD6P9JFTq7CtCXp91wQGPT00+z3CO8dJ11OD/ZzfGHjc5oy2b1CPQrk08ncmZexl/2s HViQ== 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=O3IHHqaJj6A2triVWPeKl8PgMgLN6vy5+yomR63A/v0=; b=fZTK2Ack6SIvpBog60xcKePg93TFNcqwujuaue//f6Qf/VBntTNthqr3IxdR1J86vA EzlUnpiWIg3Z4Vv3dSy/uDFSB8Pa3Po0V2B+D19B8BzrLjmVC7F+/tsOEFYTRuK7UpK0 ib7K+lmmNfH7hDsmtjQBMrtyv3C0Q0taAnf23bEasFNgu9uIbarfAzZS1avaApjeDFWE AdEy1jFM+BUdmZgERIDFwhPZ+Ap7SmPH3OV7JwL0mPgCdwZyb3Y7H6IrQawx6I+tYOU5 gPhWntA1frAadToVvb8Wp/It/rmbhWwAAxo+a9JzNynNYzc+XaQvp9RAqvcncAqpOiuJ kSYg== X-Gm-Message-State: APjAAAWEzjBsSv32eDa1LSpM33YcnoizOiDq8OZnZ6lTqeIAhmHvx6jW 0Zeb8FPAv76sBmclLy2/aIqx6Jz28O0= X-Google-Smtp-Source: APXvYqwhi8MtIqaSLsoU2e6Jym9YDdQBoRaZUCyPDrH4VqBodPaB55LAt0ogJ9DTPJ1fhrBTp2KBTw== X-Received: by 2002:a1c:545d:: with SMTP id p29mr6150746wmi.9.1570309977363; Sat, 05 Oct 2019 14:12:57 -0700 (PDT) Received: from localhost ([2a02:8084:20e2:c380:92bd:1bfd:38fc:fae2]) by smtp.gmail.com with ESMTPSA id y5sm12270743wma.14.2019.10.05.14.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 14:12:56 -0700 (PDT) From: "Basil L. Contovounesios" References: Date: Sat, 05 Oct 2019 22:12:55 +0100 In-Reply-To: (Stefan Kangas's message of "Fri, 4 Oct 2019 16:08:36 +0200") Message-ID: <87a7aeq4ko.fsf@tcd.ie> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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 (-) Stefan Kangas writes: > @@ -310,23 +305,13 @@ edt-term > ;;; > ;;; o edt-emulation-on o edt-load-keys > ;;; > -(defconst edt-emacs-variant (if (featurep 'emacs) "gnu" "xemacs") > - "Indicates Emacs variant: GNU Emacs or XEmacs (aka Lucid Emacs).") > - > -(defconst edt-window-system (if (featurep 'emacs) window-system (console-type)) > - "Indicates window system (in GNU Emacs) or console type (in XEmacs).") Hopefully no-one will complain about these constants disappearing without first being made obsolete (I won't). ;) > @@ -2037,27 +1974,16 @@ edt-emulation-on > (setq edt-term term)))) > (edt-load-keys nil)) > ;; Make highlighting of selected text work properly for EDT commands. > - (if (featurep 'emacs) > - (progn > - (setq edt-orig-transient-mark-mode > - (default-value 'transient-mark-mode)) > - (add-hook 'activate-mark-hook > - (function > - (lambda () > - (edt-select-mode t)))) > - (add-hook 'deactivate-mark-hook > - (function > - (lambda () > - (edt-select-mode nil))))) > - (progn > - (add-hook 'zmacs-activate-region-hook > - (function > - (lambda () > - (edt-select-mode t)))) > - (add-hook 'zmacs-deactivate-region-hook > - (function > - (lambda () > - (edt-select-mode nil)))))) > + (setq edt-orig-transient-mark-mode > + (default-value 'transient-mark-mode)) > + (add-hook 'activate-mark-hook > + (function > + (lambda () > + (edt-select-mode t)))) > + (add-hook 'deactivate-mark-hook > + (function > + (lambda () > + (edt-select-mode nil)))) The calls to (function ...) can be removed, as they are redundant around evaluated lambdas. Otherwise looks fine to me, FWIW. Thanks, -- Basil From unknown Sun Jun 22 01:01:32 2025 X-Loop: help-debbugs@gnu.org Subject: bug#37621: [PATCH] Remove XEmacs compat code from edt.el Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 07 Oct 2019 12:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37621 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: "Basil L. Contovounesios" Cc: 37621@debbugs.gnu.org Received: via spool by 37621-submit@debbugs.gnu.org id=B37621.157045313831343 (code B ref 37621); Mon, 07 Oct 2019 12:59:02 +0000 Received: (at 37621) by debbugs.gnu.org; 7 Oct 2019 12:58:58 +0000 Received: from localhost ([127.0.0.1]:47459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iHSbK-00089S-Ap for submit@debbugs.gnu.org; Mon, 07 Oct 2019 08:58:58 -0400 Received: from mail-pl1-f173.google.com ([209.85.214.173]:34977) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iHSbI-00089D-Nu for 37621@debbugs.gnu.org; Mon, 07 Oct 2019 08:58:57 -0400 Received: by mail-pl1-f173.google.com with SMTP id c3so5369936plo.2 for <37621@debbugs.gnu.org>; Mon, 07 Oct 2019 05:58:56 -0700 (PDT) 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=bVzevNhPbjrPeSt583iTYiQgYhN6VsrctWIdGESVRDA=; b=BJ0M57YHjFwwB7VxoU5QYlMTs2dhfQOLJVcbmay1+jH/pRSSLuikLaw3jtV3PF46mC QfZ08bqV7Vi2xPRBHBDhx21MpqpJy4alZNGWVMVd3cAk7jphXju6jYHGjYlSznH3FFY4 M2HOKwIOXWuBRhlmOt4EtZYB5Mc11zCgC/MoWJf0pbCzR/4fTsS2saspXLIC8t1pgxZs WFR6Tia1aitykjvTo/aEXl2dH00vlvOPP3Whg3dSAZYUW4uLIilzqK5h3Pw05Itp7cYD yMCEcXjPcSyJfpg7JfYl1I+2qKWgXcJfr/vGhJqAtaaweZg6KDRUyGIYzYFybX2A+KR6 nsvg== X-Gm-Message-State: APjAAAUO1WgAY1khuPfkeXsP4H8Iejac4RYmNG/auN+O0K5/cyyoUc+y zuwRtnVds7U2QYkGB9a1DbhXqMw7aw1gGx3FJZI= X-Google-Smtp-Source: APXvYqwdh+7V0x4rPasaf9LKKtVzZt9c53AVl5GIVtLdpWBDCqX4XvDkhC+i0KGhwXsHUPQ/YxsAJBDWA4WJuBTTRIs= X-Received: by 2002:a17:902:6b88:: with SMTP id p8mr24114807plk.251.1570453130684; Mon, 07 Oct 2019 05:58:50 -0700 (PDT) MIME-Version: 1.0 References: <87a7aeq4ko.fsf@tcd.ie> In-Reply-To: <87a7aeq4ko.fsf@tcd.ie> From: Stefan Kangas Date: Mon, 7 Oct 2019 14:58:39 +0200 Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.3 (/) 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.7 (/) Basil L. Contovounesios writes: > Hopefully no-one will complain about these constants disappearing > without first being made obsolete (I won't). ;) I thought that it was fine to just remove them when they are only relevant for XEmacs or backwards compatibility? I could of course declare them obsolete instead if that's preferable. > The calls to (function ...) can be removed, as they are redundant around > evaluated lambdas. Indeed, I had missed that. > Otherwise looks fine to me, FWIW. Thanks for reviewing. I intend to push this in a couple of days if no one raises any objections. Best regards, Stefan Kangas From unknown Sun Jun 22 01:01:32 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Stefan Kangas Subject: bug#37621: closed (Re: bug#37621: [PATCH] Remove XEmacs compat code from edt.el) Message-ID: References: X-Gnu-PR-Message: they-closed 37621 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 37621@debbugs.gnu.org Date: Wed, 09 Oct 2019 18:14:04 +0000 Content-Type: multipart/mixed; boundary="----------=_1570644844-16476-1" This is a multi-part message in MIME format... ------------=_1570644844-16476-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #37621: [PATCH] Remove XEmacs compat code from edt.el which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 37621@debbugs.gnu.org. --=20 37621: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D37621 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1570644844-16476-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 37621-close) by debbugs.gnu.org; 9 Oct 2019 18:13:08 +0000 Received: from localhost ([127.0.0.1]:54087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iIGSR-0004GJ-MX for submit@debbugs.gnu.org; Wed, 09 Oct 2019 14:13:07 -0400 Received: from mail-pg1-f175.google.com ([209.85.215.175]:36687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iIGSP-0004Fj-SJ for 37621-close@debbugs.gnu.org; Wed, 09 Oct 2019 14:13:06 -0400 Received: by mail-pg1-f175.google.com with SMTP id 23so1930788pgk.3 for <37621-close@debbugs.gnu.org>; Wed, 09 Oct 2019 11:13:05 -0700 (PDT) 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=MskBlcllHQ65UBYU7rFZrpD+fkF8W7QHPX+RpyGj+sc=; b=Z4ZgYV7Fv5vIERWdXMzhjsGGm0ndcrV2pbzpZkZrTrD7ePf0ncO4le7vmsLOa1KMje h+JLfJ2pdJc4q1h1d2F1NcEnjw1UtULWhNeExkBZla2LUD7cYgMAQ1HgkenWwOzZzQ9y YjMd5X1FmCD9h+PQzydebLmhmhYTtoNM+9GYZYaLq4m5LiuxsZAl8dP5eUK5FPFDznrb oNAOJ7RgYDFYx0jX0OiFDQCG4bD9vIcC2LrTuHghhX0woDkecFWdm0IEQjr0Jvy0CWmq JCFhtN9VNVuXxAf+tt95OqCIVelwGZYIcSD4Z+mMw4Y+XIwajW+SqA9vtWFS1oS2eHh0 gXQg== X-Gm-Message-State: APjAAAUS0JQzMiQsoVg/624FsocZOBW/VLQ9qoRtGippLNl2kZAYRpso Je8ERr1beZr7iml49UpiqSXTxLdb8SxkG08sgQMo0cJm X-Google-Smtp-Source: APXvYqxQWdW6qhl7usw3q6hquGMmRJc+vVAi+vmksCKCozDBbQXJDxcGEvBuNxptz+Hfr5Oo7ZZh0q8CFNojUU8b8oU= X-Received: by 2002:a17:90a:1b2a:: with SMTP id q39mr5718230pjq.119.1570644779750; Wed, 09 Oct 2019 11:12:59 -0700 (PDT) MIME-Version: 1.0 References: <87a7aeq4ko.fsf@tcd.ie> In-Reply-To: From: Stefan Kangas Date: Wed, 9 Oct 2019 20:12:48 +0200 Message-ID: Subject: Re: bug#37621: [PATCH] Remove XEmacs compat code from edt.el To: "Basil L. Contovounesios" Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 37621-close Cc: 37621-close@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: -0.7 (/) Stefan Kangas writes: > Thanks for reviewing. I intend to push this in a couple of days if no > one raises any objections. Now pushed as commit c548a2af9b. Best regards, Stefan Kangas ------------=_1570644844-16476-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Oct 2019 14:08:59 +0000 Received: from localhost ([127.0.0.1]:43295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGOGQ-0005CS-JY for submit@debbugs.gnu.org; Fri, 04 Oct 2019 10:08:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:36044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGOGO-0005CK-PP for submit@debbugs.gnu.org; Fri, 04 Oct 2019 10:08:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53081) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGOGL-0001ny-PG for bug-gnu-emacs@gnu.org; Fri, 04 Oct 2019 10:08:56 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGOGI-0007yf-UQ for bug-gnu-emacs@gnu.org; Fri, 04 Oct 2019 10:08:53 -0400 Received: from mail-pf1-f176.google.com ([209.85.210.176]:40174) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iGOGI-0007yU-J4 for bug-gnu-emacs@gnu.org; Fri, 04 Oct 2019 10:08:50 -0400 Received: by mail-pf1-f176.google.com with SMTP id x127so3972445pfb.7 for ; Fri, 04 Oct 2019 07:08:50 -0700 (PDT) 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=HP+JkLzoCM6MkUJkzISYDUjz5NOWr33ZnKKiPAyzvh4=; b=DQnnieiH+mZvYa5iBpnIGxAUbRtu9zkcnplyPs5ZZDYjcv7kaZJDRA9+h0GglAWsqf 2ulwEPpcIYQ7dbvLunBPwxSmC2w6QFka2XSlG+gaAQCs+aCdfHMUlmmshWEUsmyJjz1U O19x9DzKd4OTdyxPYRgRT09XzfdsPxsz/d7EzcpDJmgaoy7M6PjDVdhyy3wKfdK3rI9Q UrgTh+QAlhU2bjPbfoc8iBLLt60m9iCHd48gpg0DAZ9zjrpWqUwVzz/6jCbTEjz0LQ+/ vnRfFbT2ov6MD5rwoEPbRjsrjpeC25E3QZzt5ZQPVFMnJoniGChvNkSdcTavKszwa1L5 Ajeg== X-Gm-Message-State: APjAAAXFDs1uDKuDos682MsFzSLQ3QJOdRoAxg5T/ux12jyF4Ml2JbZU Fwvlw2Kc/Sr+QQv44QyCV7eJx/8RZ8Ic+c0KOESvHQ== X-Google-Smtp-Source: APXvYqwLX34VHQWfYqfPFTwpsQD3Q4j/yELXaD2cSCtVimYZrpQmD/8WJ3wq/eSgfilfrOv1MEC9zG+Zh0Qdt/rqyZk= X-Received: by 2002:a17:90a:cc08:: with SMTP id b8mr17122326pju.119.1570198128834; Fri, 04 Oct 2019 07:08:48 -0700 (PDT) MIME-Version: 1.0 From: Stefan Kangas Date: Fri, 4 Oct 2019 16:08:36 +0200 Message-ID: Subject: [PATCH] Remove XEmacs compat code from edt.el To: bug-gnu-emacs@gnu.org Content-Type: multipart/mixed; boundary="000000000000b25ba50594163df4" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.210.176 X-Spam-Score: 0.9 (/) 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.1 (--) --000000000000b25ba50594163df4 Content-Type: text/plain; charset="UTF-8" Is this okay to commit? Best regards, Stefan Kangas --000000000000b25ba50594163df4 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Remove-XEmacs-compat-code-from-edt.el.patch" Content-Disposition: attachment; filename="0001-Remove-XEmacs-compat-code-from-edt.el.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k1c7eo4v0 RnJvbSA3NmVmYzMxOGY3NTI5ZWNhZTkzOWE3NjQyMjNjNjM5ODNlYWMwYmM2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5rYW5nYXNAZ21haWwuY29t PgpEYXRlOiBGcmksIDQgT2N0IDIwMTkgMTY6MDY6MzIgKzAyMDAKU3ViamVjdDogW1BBVENIXSBS ZW1vdmUgWEVtYWNzIGNvbXBhdCBjb2RlIGZyb20gZWR0LmVsCgoqIGxpc3AvZW11bGF0aW9uL2Vk dC5lbCAodG9wLWxldmVsLCBlZHQtZW1hY3MtdmFyaWFudCkKKGVkdC13aW5kb3ctc3lzdGVtLCBl ZHQteHNlcnZlciwgZWR0LXBhZ2UtYmFja3dhcmQpCihlZHQtYmVnaW5uaW5nLW9mLWxpbmUsIGVk dC1lbmQtb2YtbGluZS1mb3J3YXJkKQooZWR0LWVuZC1vZi1saW5lLWJhY2t3YXJkLCBlZHQtb25l LXdvcmQtZm9yd2FyZCkKKGVkdC1vbmUtd29yZC1iYWNrd2FyZCwgZWR0LWNoYXJhY3RlciwgZWR0 LWxpbmUtZm9yd2FyZCkKKGVkdC1uZXh0LWxpbmUsIGVkdC1wcmV2aW91cy1saW5lLCBlZHQtdG9w LCBlZHQtZmluZC1mb3J3YXJkKQooZWR0LWZpbmQtYmFja3dhcmQsIGVkdC1maW5kLW5leHQtZm9y d2FyZCkKKGVkdC1maW5kLW5leHQtYmFja3dhcmQsIGVkdC1yZXNldCwgZWR0LWFkdmFuY2UsIGVk dC1iYWNrdXApCihlZHQtZGVmaW5lLWtleSwgZWR0LWJvdHRvbS1jaGVjaywgZWR0LXNlbnRlbmNl LWZvcndhcmQpCihlZHQtc2VudGVuY2UtYmFja3dhcmQsIGVkdC1wYXJhZ3JhcGgtZm9yd2FyZCkK KGVkdC1wYXJhZ3JhcGgtYmFja3dhcmQsIGVkdC1yZXN0b3JlLWtleSwgZWR0LXdpbmRvdy10b3Ap CihlZHQtd2luZG93LWJvdHRvbSwgZWR0LXNjcm9sbC13aW5kb3ctYmFja3dhcmQtbGluZSkKKGVk dC1saW5lLXRvLWJvdHRvbS1vZi13aW5kb3csIGVkdC1saW5lLXRvLW1pZGRsZS1vZi13aW5kb3cp CihlZHQtZ290by1wZXJjZW50YWdlLCBlZHQtZGlzcGxheS10aGUtdGltZSwgZWR0LXJlbWVtYmVy KQooZWR0LXNwbGl0LXdpbmRvdywgZWR0LWxvYWQta2V5cywgZWR0LWVtdWxhdGlvbi1vbikKKGVk dC1lbXVsYXRpb24tb2ZmLCBlZHQtZGVmYXVsdC1lbXVsYXRpb24tc2V0dXApCihlZHQtdXNlci1l bXVsYXRpb24tc2V0dXAsIGVkdC1zZWxlY3QtZGVmYXVsdC1nbG9iYWwtbWFwKQooZWR0LXNlbGVj dC11c2VyLWdsb2JhbC1tYXApOiBSZW1vdmUgWEVtYWNzIGNvbXBhdCBjb2RlLgotLS0KIGxpc3Av ZW11bGF0aW9uL2VkdC5lbCB8IDIxMyArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2NiBpbnNlcnRpb25zKCspLCAxNDcgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9lbXVsYXRpb24vZWR0LmVsIGIvbGlzcC9lbXVsYXRpb24v ZWR0LmVsCmluZGV4IGRjYzMyN2RiZDQuLjBmZGZkNzVhMjYgMTAwNjQ0Ci0tLSBhL2xpc3AvZW11 bGF0aW9uL2VkdC5lbAorKysgYi9saXNwL2VtdWxhdGlvbi9lZHQuZWwKQEAgLTEwNiwxMCArMTA2 LDcgQEAKIDs7ICAgICAgY3VzdG9taXphdGlvbiBmaWxlLCBlZHQtdXNlci5lbCwgdG8gZG8gdGhp cy4KIDs7ICAgICAgU2VlIEluZm8gbm9kZSBgZWR0JyBmb3IgbW9yZSBkZXRhaWxzLgogCi07OyAg My4gIEVEVCBFbXVsYXRpb24gbm93IGFsc28gd29ya3MgaW4gWEVtYWNzLCBpbmNsdWRpbmcgdGhl Ci07OyAgICAgIGhpZ2hsaWdodGluZyBvZiBzZWxlY3RlZCB0ZXh0LgotCi07OyAgNC4gIElmIHlv dSBhY2Nlc3MgYSB3b3Jrc3RhdGlvbiB1c2luZyBhbiBYIFNlcnZlciwgb2JzZXJ2ZSB0aGF0Cis7 OyAgMy4gIElmIHlvdSBhY2Nlc3MgYSB3b3Jrc3RhdGlvbiB1c2luZyBhbiBYIFNlcnZlciwgb2Jz ZXJ2ZSB0aGF0CiA7OyAgICAgIHRoZSBpbml0aWFsaXphdGlvbiBmaWxlIGdlbmVyYXRlZCBieSBl ZHQtbWFwcGVyLmVsIHdpbGwgbm93CiA7OyAgICAgIGNvbnRhaW4gdGhlIG5hbWUgb2YgdGhlIFgg U2VydmVyIHZlbmRvci4gIFRoaXMgaXMgYQogOzsgICAgICBjb252ZW5pZW5jZSBmb3IgdGhvc2Ug d2hvIGhhdmUgYWNjZXNzIHRvIHRoZWlyIFVuaXggYWNjb3VudApAQCAtMTIwLDcgKzExNyw3IEBA CiA7OyAgICAgIG5hbWVzLiAgVGhlbiwgdGhlIGNvcnJlY3QgaW5pdGlhbGl6YXRpb24gZmlsZSBm b3IgdGhlCiA7OyAgICAgIHBhcnRpY3VsYXIgWCBzZXJ2ZXIgaW4gdXNlIGlzIGxvYWRlZCBjb3Jy ZWN0bHkgYXV0b21hdGljYWxseS4KIAotOzsgIDUuICBBbHNvLCBlZHQtbWFwcGVyLmVsIGlzIG5v dyBjYXBhYmxlIG9mIGJpbmRpbmcgYW4gQVNDSUkga2V5Cis7OyAgNC4gIEFsc28sIGVkdC1tYXBw ZXIuZWwgaXMgbm93IGNhcGFibGUgb2YgYmluZGluZyBhbiBBU0NJSSBrZXkKIDs7ICAgICAgc2Vx dWVuY2UsIHByb3ZpZGluZyB0aGUgQVNDSUkga2V5IHNlcXVlbmNlIHByZWZpeCBpcyBhbHJlYWR5 CiA7OyAgICAgIGtub3duIGJ5IEVtYWNzIHRvIGJlIGEgcHJlZml4LiAgQXMgYSByZXN1bHQgb2Yg cHJvdmlkaW5nIHRoaXMKIDs7ICAgICAgc3VwcG9ydCwgc29tZSB0ZXJtaW5hbC9rZXlib2FyZC93 aW5kb3cgc3lzdGVtIGNvbmZpZ3VyYXRpb25zLApAQCAtMTQwLDcgKzEzNyw3IEBACiA7OyAgICAg IHlvdXIgdGVybWluYWwgT1IgYSBidWcgaW4gdGhlIHRlcm1pbmFsIGVtdWxhdGlvbiBzb2Z0d2Fy ZSB5b3UKIDs7ICAgICAgYXJlIHVzaW5nLikKIAotOzsgIDYuICBUaGUgZWR0LXF1aXQgZnVuY3Rp b24gKGJvdW5kIHRvIEdPTEQtcSBieSBkZWZhdWx0KSBoYXMgYmVlbgorOzsgIDUuICBUaGUgZWR0 LXF1aXQgZnVuY3Rpb24gKGJvdW5kIHRvIEdPTEQtcSBieSBkZWZhdWx0KSBoYXMgYmVlbgogOzsg ICAgICBtb2RpZmllZCB0byB3YXJuIHRoZSB1c2VyIHdoZW4gZmlsZS1yZWxhdGVkIGJ1ZmZlcgog OzsgICAgICBtb2RpZmljYXRpb25zIGV4aXN0LiAgSXQgbm93IGNhdXRpb25zIHRoZSB1c2VyIHRo YXQgdGhvc2UKIDs7ICAgICAgbW9kaWZpY2F0aW9ucyB3aWxsIGJlIGxvc3QgaWYgdGhlIHVzZXIg cXVpdHMgd2l0aG91dCBzYXZpbmcKQEAgLTE4MCw4ICsxNzcsNiBAQCBlZHQtb3JpZy10cmFuc2ll bnQtbWFyay1tb2RlCiAoZGVmdmFyIGVkdC1yZWN0LXN0YXJ0LXBvaW50KQogKGRlZnZhciBlZHQt dXNlci1nbG9iYWwtbWFwKQogKGRlZnZhciByZWN0LXN0YXJ0LXBvaW50KQotKGRlZnZhciB0aW1l LXN0cmluZykKLShkZWZ2YXIgem1hY3MtcmVnaW9uLXN0YXlzKQogCiA7OzsKIDs7OyAgVmVyc2lv biBJbmZvcm1hdGlvbgpAQCAtMzEwLDIzICszMDUsMTMgQEAgZWR0LXRlcm0KIDs7OwogOzs7ICAg ICBvIGVkdC1lbXVsYXRpb24tb24gICAgICBvIGVkdC1sb2FkLWtleXMKIDs7OwotKGRlZmNvbnN0 IGVkdC1lbWFjcy12YXJpYW50IChpZiAoZmVhdHVyZXAgJ2VtYWNzKSAiZ251IiAieGVtYWNzIikK LSAgIkluZGljYXRlcyBFbWFjcyB2YXJpYW50OiAgR05VIEVtYWNzIG9yIFhFbWFjcyAoYWthIEx1 Y2lkIEVtYWNzKS4iKQotCi0oZGVmY29uc3QgZWR0LXdpbmRvdy1zeXN0ZW0gKGlmIChmZWF0dXJl cCAnZW1hY3MpIHdpbmRvdy1zeXN0ZW0gKGNvbnNvbGUtdHlwZSkpCi0gICJJbmRpY2F0ZXMgd2lu ZG93IHN5c3RlbSAoaW4gR05VIEVtYWNzKSBvciBjb25zb2xlIHR5cGUgKGluIFhFbWFjcykuIikK LQotKGRlY2xhcmUtZnVuY3Rpb24geC1zZXJ2ZXItdmVuZG9yICJ4Zm5zLmMiICgmb3B0aW9uYWwg dGVybWluYWwpKQotCi0oZGVmY29uc3QgZWR0LXhzZXJ2ZXIgKHdoZW4gKGVxIGVkdC13aW5kb3ct c3lzdGVtICd4KQorKGRlZmNvbnN0IGVkdC14c2VydmVyICh3aGVuIChlcSB3aW5kb3ctc3lzdGVt ICd4KQogCQkJOzsgVGhlIEN5Z3dpbiB3aW5kb3cgbWFuYWdlciBoYXMgYSBgLycgaW4gaXRzCiAJ CQk7OyBuYW1lLCB3aGljaCBicmVha3MgdGhlIGdlbmVyYXRlZCBmaWxlIG5hbWUgb2YKIAkJCTs7 IHRoZSBjdXN0b20ga2V5IG1hcCBmaWxlLiAgUmVwbGFjZSBgLycgd2l0aCBhCiAJCQk7OyBgLScg dG8gd29yayBhcm91bmQgdGhhdC4KLQkJCShpZiAoZmVhdHVyZXAgJ3hlbWFjcykKLQkJCSAgICAo cmVwbGFjZS1pbi1zdHJpbmcgKHgtc2VydmVyLXZlbmRvcikgIlsgL10iICItIikKLQkJCSAgKHJl cGxhY2UtcmVnZXhwLWluLXN0cmluZyAiWyAvXSIgIi0iCi0JCQkJCQkgICAgKHgtc2VydmVyLXZl bmRvcikpKSkKKwkJCShyZXBsYWNlLXJlZ2V4cC1pbi1zdHJpbmcgIlsgL10iICItIgorCQkJCQkJ ICAoeC1zZXJ2ZXItdmVuZG9yKSkpCiAgICJJbmRpY2F0ZXMgWCBzZXJ2ZXIgdmVuZG9yIG5hbWUs IGlmIGFwcGxpY2FibGUuIikKIAogKGRlZnZhciBlZHQta2V5cy1maWxlIG5pbApAQCAtMzg4LDgg KzM3Myw3IEBAIGVkdC1wYWdlLWJhY2t3YXJkCiAgICAgICAoZXJyb3IgIkJlZ2lubmluZyBvZiBi dWZmZXIiKQogCShwcm9nbgogCSAgKGJhY2t3YXJkLXBhZ2UgbnVtKQotICAgICAgKGVkdC1saW5l LXRvLXRvcC1vZi13aW5kb3cpCi0JICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNz LXJlZ2lvbi1zdGF5cyB0KSkpKSkKKyAgICAgIChlZHQtbGluZS10by10b3Atb2Ytd2luZG93KSkp KQogCiAoZGVmdW4gZWR0LXBhZ2UgKG51bSkKICAgIk1vdmUgaW4gY3VycmVudCBkaXJlY3Rpb24g dG8gbmV4dCBwYWdlIGRlbGltaXRlci4KQEAgLTQ0OSw4ICs0MzMsNyBAQCBlZHQtYmVnaW5uaW5n LW9mLWxpbmUKICAgICAgIChwcm9nbgogCShzZXRxIG51bSAoMS0gbnVtKSkKIAkoZm9yd2FyZC1s aW5lICgqIC0xIG51bSkpKSkKLSAgICAoZWR0LXRvcC1jaGVjayBiZWcgbnVtKSkKLSAgKGlmIChm ZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQorICAgIChlZHQt dG9wLWNoZWNrIGJlZyBudW0pKSkKIAogCiA7OzsKQEAgLTQ2NSw4ICs0NDgsNyBAQCBlZHQtZW5k LW9mLWxpbmUtZm9yd2FyZAogICAobGV0ICgoYmVnIChlZHQtY3VycmVudC1saW5lKSkpCiAgICAg KGZvcndhcmQtY2hhcikKICAgICAoZW5kLW9mLWxpbmUgbnVtKQotICAgIChlZHQtYm90dG9tLWNo ZWNrIGJlZyBudW0pKQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNzLXJlZ2lv bi1zdGF5cyB0KSkpCisgICAgKGVkdC1ib3R0b20tY2hlY2sgYmVnIG51bSkpKQogCiAKIChkZWZ1 biBlZHQtZW5kLW9mLWxpbmUtYmFja3dhcmQgKG51bSkKQEAgLTQ3Niw4ICs0NTgsNyBAQCBlZHQt ZW5kLW9mLWxpbmUtYmFja3dhcmQKICAgKGVkdC1jaGVjay1wcmVmaXggbnVtKQogICAobGV0ICgo YmVnIChlZHQtY3VycmVudC1saW5lKSkpCiAgICAgKGVuZC1vZi1saW5lICgxLSBudW0pKQotICAg IChlZHQtdG9wLWNoZWNrIGJlZyBudW0pKQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRx IHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisgICAgKGVkdC10b3AtY2hlY2sgYmVnIG51bSkpKQog CiAKIChkZWZ1biBlZHQtZW5kLW9mLWxpbmUgKG51bSkKQEAgLTUyMSw4ICs1MDIsNyBAQCBlZHQt b25lLXdvcmQtZm9yd2FyZAogCSAgICAgIChub3QgKGVvYnApKQogCSAgICAgIChlcSA/XCAgKGNo YXItc3ludGF4IChmb2xsb3dpbmctY2hhcikpKQogCSAgICAgIChub3QgKG1lbXEgKGZvbGxvd2lu Zy1jaGFyKSBlZHQtd29yZC1lbnRpdGllcykpKQotCShmb3J3YXJkLWNoYXIpKSkpCi0gIChpZiAo ZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlzIHQpKSkKKwkoZm9yd2Fy ZC1jaGFyKSkpKSkKIAogKGRlZnVuIGVkdC1vbmUtd29yZC1iYWNrd2FyZCAoKQogICAiTW92ZSBi YWNrd2FyZCB0byBmaXJzdCBjaGFyYWN0ZXIgb2YgcHJldmlvdXMgd29yZC4iCkBAIC01NDUsOCAr NTI1LDcgQEAgZWR0LW9uZS13b3JkLWJhY2t3YXJkCiAJCSAgKG5vdCAoYm9icCkpCiAJCSAgKG5v dCAoZXEgP1wgIChjaGFyLXN5bnRheCAocHJlY2VkaW5nLWNoYXIpKSkpCiAJCSAgKG5vdCAobWVt cSAocHJlY2VkaW5nLWNoYXIpIGVkdC13b3JkLWVudGl0aWVzKSkpCi0JICAgIChiYWNrd2FyZC1j aGFyKSkpKSkKLSAgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3Rh eXMgdCkpKQorCSAgICAoYmFja3dhcmQtY2hhcikpKSkpKQogCiAoZGVmdW4gZWR0LXdvcmQtZm9y d2FyZCAobnVtKQogICAiTW92ZSBmb3J3YXJkIHRvIGZpcnN0IGNoYXJhY3RlciBvZiBuZXh0IHdv cmQuCkBAIC01ODUsOCArNTY0LDcgQEAgZWR0LWNoYXJhY3RlcgogICAoZWR0LWNoZWNrLXByZWZp eCBudW0pCiAgIChpZiAoZXF1YWwgZWR0LWRpcmVjdGlvbi1zdHJpbmcgZWR0LWZvcndhcmQtc3Ry aW5nKQogICAgICAgKGZvcndhcmQtY2hhciBudW0pCi0gICAgKGJhY2t3YXJkLWNoYXIgbnVtKSkK LSAgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQor ICAgIChiYWNrd2FyZC1jaGFyIG51bSkpKQogCiA7OzsKIDs7OyBMSU5FCkBAIC02MDgsOCArNTg2 LDcgQEAgZWR0LWxpbmUtZm9yd2FyZAogICAoZWR0LWNoZWNrLXByZWZpeCBudW0pCiAgIChsZXQg KChiZWcgKGVkdC1jdXJyZW50LWxpbmUpKSkKICAgICAoZm9yd2FyZC1saW5lIG51bSkKLSAgICAo ZWR0LWJvdHRvbS1jaGVjayBiZWcgbnVtKSkKLSAgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0 cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQorICAgIChlZHQtYm90dG9tLWNoZWNrIGJlZyBudW0p KSkKIAogKGRlZnVuIGVkdC1saW5lIChudW0pCiAgICJNb3ZlIGluIGN1cnJlbnQgZGlyZWN0aW9u IHRvIG5leHQgYmVnaW5uaW5nIG9mIGxpbmUgbWFyay4KQEAgLTYzMSw4ICs2MDgsNyBAQCBlZHQt bmV4dC1saW5lCiAgIChsZXQgKChiZWcgKGVkdC1jdXJyZW50LWxpbmUpKSkKICAgICA7OyBXZSdy ZSBkZWxpYmVyYXRlbHkgdXNpbmcgbmV4dC1saW5lIGluc3RlYWQgb2YgZm9yd2FyZC1saW5lLgog ICAgICh3aXRoLW5vLXdhcm5pbmdzIChuZXh0LWxpbmUgbnVtKSkKLSAgICAoZWR0LWJvdHRvbS1j aGVjayBiZWcgbnVtKSkKLSAgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdp b24tc3RheXMgdCkpKQorICAgIChlZHQtYm90dG9tLWNoZWNrIGJlZyBudW0pKSkKIAogKGRlZnVu IGVkdC1wcmV2aW91cy1saW5lIChudW0pCiAgICJNb3ZlIGN1cnNvciB1cCBvbmUgbGluZS4KQEAg LTY0Miw4ICs2MTgsNyBAQCBlZHQtcHJldmlvdXMtbGluZQogICAobGV0ICgoYmVnIChlZHQtY3Vy cmVudC1saW5lKSkpCiAgICAgOzsgV2UncmUgZGVsaWJlcmF0ZWx5IHVzaW5nIHByZXZpb3VzLWxp bmUgaW5zdGVhZCBvZiBmb3J3YXJkLWxpbmUuCiAgICAgKHdpdGgtbm8td2FybmluZ3MgKHByZXZp b3VzLWxpbmUgbnVtKSkKLSAgICAoZWR0LXRvcC1jaGVjayBiZWcgbnVtKSkKLSAgKGlmIChmZWF0 dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQorICAgIChlZHQtdG9w LWNoZWNrIGJlZyBudW0pKSkKIAogCiA7OzsKQEAgLTY1Myw4ICs2MjgsNyBAQCBlZHQtcHJldmlv dXMtbGluZQogKGRlZnVuIGVkdC10b3AgKCkKICAgIk1vdmUgY3Vyc29yIHRvIHRoZSBiZWdpbm5p bmcgb2YgYnVmZmVyLiIKICAgKGludGVyYWN0aXZlKQotICAoZ290by1jaGFyIChwb2ludC1taW4p KQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkp CisgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpKQogCiA7OzsKIDs7OyBCT1RUT00KQEAgLTcwMyw4 ICs2NzcsNyBAQCBlZHQtZmluZC1mb3J3YXJkCiAgICAgICAgICAoaWYgKHplcm9wIChzZXRxIGxl ZnQgKHNhdmUtZXhjdXJzaW9uIChmb3J3YXJkLWxpbmUgaGVpZ2h0KSkpKQogICAgICAgICAgICAg IChyZWNlbnRlciB0b3AtbWFyZ2luKQogICAgICAgICAgICAocmVjZW50ZXIgKC0gbGVmdCBib3R0 b20tdXAtbWFyZ2luKSkpCi0gICAgICAgKGFuZCAoPiAocG9pbnQpIGJvdHRvbSkgKHJlY2VudGVy IGJvdHRvbS1tYXJnaW4pKSkpKQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNz LXJlZ2lvbi1zdGF5cyB0KSkpCisgICAgICAgKGFuZCAoPiAocG9pbnQpIGJvdHRvbSkgKHJlY2Vu dGVyIGJvdHRvbS1tYXJnaW4pKSkpKSkKIAogKGRlZnVuIGVkdC1maW5kLWJhY2t3YXJkICgmb3B0 aW9uYWwgZmluZCkKICAgIkZpbmQgZmlyc3Qgb2NjdXJyZW5jZSBvZiBhIHN0cmluZyBpbiB0aGUg YmFja3dhcmQgZGlyZWN0aW9uIGFuZCBzYXZlIGl0LgpAQCAtNzE1LDggKzY4OCw3IEBAIGVkdC1m aW5kLWJhY2t3YXJkCiAgIChlZHQtd2l0aC1wb3NpdGlvbgogICAgKGlmIChzZWFyY2gtYmFja3dh cmQgZWR0LWZpbmQtbGFzdC10ZXh0KQogICAgICAgIChlZHQtc2V0LW1hdGNoKSkKLSAgIChhbmQg KDwgKHBvaW50KSB0b3ApIChyZWNlbnRlciAobWluIGJlZyB0b3AtbWFyZ2luKSkpKQotICAoaWYg KGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisgICAoYW5k ICg8IChwb2ludCkgdG9wKSAocmVjZW50ZXIgKG1pbiBiZWcgdG9wLW1hcmdpbikpKSkpCiAKIChk ZWZ1biBlZHQtZmluZCAoKQogICAiRmluZCBmaXJzdCBvY2N1cnJlbmNlIG9mIHN0cmluZyBpbiBj dXJyZW50IGRpcmVjdGlvbiBhbmQgc2F2ZSBpdC4iCkBAIC03NDYsOCArNzE4LDcgQEAgZWR0LWZp bmQtbmV4dC1mb3J3YXJkCiAgICAgICAgICAgICAgICAocmVjZW50ZXIgKC0gbGVmdCBib3R0b20t dXAtbWFyZ2luKSkpCiAgICAgICAgICAgIChhbmQgKD4gKHBvaW50KSBib3R0b20pIChyZWNlbnRl ciBib3R0b20tbWFyZ2luKSkpKQogICAgICAoYmFja3dhcmQtY2hhciAxKQotICAgICAoZXJyb3Ig IlNlYXJjaCBmYWlsZWQ6IFwiJXNcIiIgZWR0LWZpbmQtbGFzdC10ZXh0KSkpCi0gIChpZiAoZmVh dHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlzIHQpKSkKKyAgICAgKGVycm9y ICJTZWFyY2ggZmFpbGVkOiBcIiVzXCIiIGVkdC1maW5kLWxhc3QtdGV4dCkpKSkKIAogKGRlZnVu IGVkdC1maW5kLW5leHQtYmFja3dhcmQgKCkKICAgIkZpbmQgbmV4dCBvY2N1cnJlbmNlIG9mIGEg c3RyaW5nIGluIGJhY2t3YXJkIGRpcmVjdGlvbi4iCkBAIC03NTYsOCArNzI3LDcgQEAgZWR0LWZp bmQtbmV4dC1iYWNrd2FyZAogICAgKGlmIChub3QgKHNlYXJjaC1iYWNrd2FyZCBlZHQtZmluZC1s YXN0LXRleHQgbmlsIHQpKQogICAgICAgIChlcnJvciAiU2VhcmNoIGZhaWxlZDogXCIlc1wiIiBl ZHQtZmluZC1sYXN0LXRleHQpCiAgICAgIChlZHQtc2V0LW1hdGNoKQotICAgICAoYW5kICg8IChw b2ludCkgdG9wKSAocmVjZW50ZXIgKG1pbiBiZWcgdG9wLW1hcmdpbikpKSkpCi0gIChpZiAoZmVh dHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlzIHQpKSkKKyAgICAgKGFuZCAo PCAocG9pbnQpIHRvcCkgKHJlY2VudGVyIChtaW4gYmVnIHRvcC1tYXJnaW4pKSkpKSkKIAogKGRl ZnVuIGVkdC1maW5kLW5leHQgKCkKICAgIkZpbmQgbmV4dCBvY2N1cnJlbmNlIG9mIGEgc3RyaW5n IGluIGN1cnJlbnQgZGlyZWN0aW9uLiIKQEAgLTgzNCw5ICs4MDQsNyBAQCBlZHQtc2VsZWN0CiAo ZGVmdW4gZWR0LXJlc2V0ICgpCiAgICJDYW5jZWwgdGV4dCBzZWxlY3Rpb24uIgogICAoaW50ZXJh Y3RpdmUpCi0gIChpZiAoZmVhdHVyZXAgJ2VtYWNzKQotICAgICAgKGRlYWN0aXZhdGUtbWFyaykK LSAgICAoem1hY3MtZGVhY3RpdmF0ZS1yZWdpb24pKSkKKyAgKGRlYWN0aXZhdGUtbWFyaykpCiAK IDs7OwogOzs7IENVVApAQCAtMTA1MCw4ICsxMDE4LDcgQEAgZWR0LWFkdmFuY2UKICAgKGZvcmNl LW1vZGUtbGluZS11cGRhdGUpCiAgIChpZiAoc3RyaW5nLWVxdWFsICIgKk1pbmlidWYiCiAgICAg ICAgICAgICAgICAgICAgIChzdWJzdHJpbmcgKGJ1ZmZlci1uYW1lKSAwIChtaW4gKGxlbmd0aCAo YnVmZmVyLW5hbWUpKSA5KSkpCi0gICAgICAoZXhpdC1taW5pYnVmZmVyKSkKLSAgKGlmIChmZWF0 dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQorICAgICAgKGV4aXQt bWluaWJ1ZmZlcikpKQogCiAKIDs7OwpAQCAtMTA2Niw4ICsxMDMzLDcgQEAgZWR0LWJhY2t1cAog ICAoZm9yY2UtbW9kZS1saW5lLXVwZGF0ZSkKICAgKGlmIChzdHJpbmctZXF1YWwgIiAqTWluaWJ1 ZiIKICAgICAgICAgICAgICAgICAgICAgKHN1YnN0cmluZyAoYnVmZmVyLW5hbWUpIDAgKG1pbiAo bGVuZ3RoIChidWZmZXItbmFtZSkpIDkpKSkKLSAgICAgIChleGl0LW1pbmlidWZmZXIpKQotICAo aWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisgICAg ICAoZXhpdC1taW5pYnVmZmVyKSkpCiAKIAogOzs7CkBAIC0xMTE3LDE0ICsxMDgzLDExIEBAIGVk dC1kZWZpbmUta2V5CiBUaGUgY3VycmVudCBrZXkgZGVmaW5pdGlvbiBpcyBzYXZlZCBpbiBgZWR0 LWxhc3QtcmVwbGFjZWQta2V5LWRlZmluaXRpb24nLgogVXNlIGBlZHQtcmVzdG9yZS1rZXknIHRv IHJlc3RvcmUgbGFzdCByZXBsYWNlZCBrZXkgZGVmaW5pdGlvbi4iCiAgIChpbnRlcmFjdGl2ZSkK LSAgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpCiAg IChsZXQgKGVkdC1mdW5jdGlvbgogCWVkdC1rZXktZGVmaW5pdGlvbikKICAgICAoc2V0cSBlZHQt a2V5LWRlZmluaXRpb24KIAkgIChyZWFkLWtleS1zZXF1ZW5jZSAiUHJlc3MgdGhlIGtleSB0byBi ZSBkZWZpbmVkOiAiKSkKLSAgICAoaWYgKGlmIChmZWF0dXJlcCAnZW1hY3MpCi0JICAgIChzdHJp bmctZXF1YWwgIlxDLW0iIGVkdC1rZXktZGVmaW5pdGlvbikKLQkgIChzdHJpbmctZXF1YWwgIlxD LW0iIChldmVudHMtdG8ta2V5cyBlZHQta2V5LWRlZmluaXRpb24pKSkKKyAgICAoaWYgKHN0cmlu Zy1lcXVhbCAiXEMtbSIgZWR0LWtleS1kZWZpbml0aW9uKQogICAgICAgICAobWVzc2FnZSAiS2V5 IG5vdCBkZWZpbmVkIikKICAgICAgIChwcm9nbgogCShzZXRxIGVkdC1mdW5jdGlvbiAocmVhZC1j b21tYW5kICJFbnRlciBjb21tYW5kIG5hbWU6ICIpKQpAQCAtMTIwMiw4ICsxMTY1LDYgQEAgZWR0 LWJvdHRvbS1jaGVjawogCQkgOzsgc3VidHJhY3QgMSBmcm9tIGhlaWdodCBiZWNhdXNlIGl0IGlu Y2x1ZGVzIG1vZGUgbGluZQogCQkgKGRpZmZlcmVuY2UgKC0gaGVpZ2h0IG1hcmdpbiAxKSkpCiAg ICAgKGNvbmQgKCg+IGJlZyBkaWZmZXJlbmNlKSAocmVjZW50ZXIgYmVnKSkKLQkJICAoKGFuZCAo ZmVhdHVyZXAgJ3hlbWFjcykgKD4gKCsgYmVnIGxpbmVzIDEpIGRpZmZlcmVuY2UpKQotCQkgICAo cmVjZW50ZXIgKC0gbWFyZ2luKSkpCiAJCSAgKCg+ICgrIGJlZyBsaW5lcykgZGlmZmVyZW5jZSkg KHJlY2VudGVyICgtIG1hcmdpbikpKSkpKQogCiAoZGVmdW4gZWR0LWN1cnJlbnQtbGluZSBuaWwK QEAgLTEyODksOCArMTI1MCw3IEBAIGVkdC1zZW50ZW5jZS1mb3J3YXJkCiAgICAgICAgKGlmICh6 ZXJvcCAoc2V0cSBsZWZ0IChzYXZlLWV4Y3Vyc2lvbiAoZm9yd2FyZC1saW5lIGhlaWdodCkpKSkK ICAgICAgICAgICAgKHJlY2VudGVyIHRvcC1tYXJnaW4pCiAgICAgICAgICAocmVjZW50ZXIgKC0g bGVmdCBib3R0b20tdXAtbWFyZ2luKSkpCi0gICAgIChhbmQgKD4gKHBvaW50KSBib3R0b20pIChy ZWNlbnRlciBib3R0b20tbWFyZ2luKSkpKQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRx IHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisgICAgIChhbmQgKD4gKHBvaW50KSBib3R0b20pIChy ZWNlbnRlciBib3R0b20tbWFyZ2luKSkpKSkKIAogKGRlZnVuIGVkdC1zZW50ZW5jZS1iYWNrd2Fy ZCAobnVtKQogICAiTW92ZSBiYWNrd2FyZCB0byBuZXh0IHNlbnRlbmNlIGJlZ2lubmluZy4KQEAg LTEzMDEsOCArMTI2MSw3IEBAIGVkdC1zZW50ZW5jZS1iYWNrd2FyZAogICAgKGlmIChlb2JwKQog ICAgICAgIChlcnJvciAiRW5kIG9mIGJ1ZmZlciIpCiAgICAgIChiYWNrd2FyZC1zZW50ZW5jZSBu dW0pKQotICAgKGFuZCAoPCAocG9pbnQpIHRvcCkgKHJlY2VudGVyIChtaW4gYmVnIHRvcC1tYXJn aW4pKSkpCi0gIChpZiAoZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlz IHQpKSkKKyAgIChhbmQgKDwgKHBvaW50KSB0b3ApIChyZWNlbnRlciAobWluIGJlZyB0b3AtbWFy Z2luKSkpKSkKIAogKGRlZnVuIGVkdC1zZW50ZW5jZSAobnVtKQogICAiTW92ZSBpbiBjdXJyZW50 IGRpcmVjdGlvbiB0byBuZXh0IHNlbnRlbmNlLgpAQCAtMTMzMiw4ICsxMjkxLDcgQEAgZWR0LXBh cmFncmFwaC1mb3J3YXJkCiAgICAgICAgKGlmICh6ZXJvcCAoc2V0cSBsZWZ0IChzYXZlLWV4Y3Vy c2lvbiAoZm9yd2FyZC1saW5lIGhlaWdodCkpKSkKICAgICAgICAgICAgKHJlY2VudGVyIHRvcC1t YXJnaW4pCiAgICAgICAgICAocmVjZW50ZXIgKC0gbGVmdCBib3R0b20tdXAtbWFyZ2luKSkpCi0g ICAgIChhbmQgKD4gKHBvaW50KSBib3R0b20pIChyZWNlbnRlciBib3R0b20tbWFyZ2luKSkpKQot ICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChzZXRxIHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisg ICAgIChhbmQgKD4gKHBvaW50KSBib3R0b20pIChyZWNlbnRlciBib3R0b20tbWFyZ2luKSkpKSkK IAogKGRlZnVuIGVkdC1wYXJhZ3JhcGgtYmFja3dhcmQgKG51bSkKICAgIk1vdmUgYmFja3dhcmQg dG8gYmVnaW5uaW5nIG9mIHBhcmFncmFwaC4KQEAgLTEzNDQsOCArMTMwMiw3IEBAIGVkdC1wYXJh Z3JhcGgtYmFja3dhcmQKICAgICh3aGlsZSAoPiBudW0gMCkKICAgICAgKHN0YXJ0LW9mLXBhcmFn cmFwaC10ZXh0KQogICAgICAoc2V0cSBudW0gKDEtIG51bSkpKQotICAgKGFuZCAoPCAocG9pbnQp IHRvcCkgKHJlY2VudGVyIChtaW4gYmVnIHRvcC1tYXJnaW4pKSkpCi0gIChpZiAoZmVhdHVyZXAg J3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlzIHQpKSkKKyAgIChhbmQgKDwgKHBvaW50 KSB0b3ApIChyZWNlbnRlciAobWluIGJlZyB0b3AtbWFyZ2luKSkpKSkKIAogKGRlZnVuIGVkdC1w YXJhZ3JhcGggKG51bSkKICAgIk1vdmUgaW4gY3VycmVudCBkaXJlY3Rpb24gdG8gbmV4dCBwYXJh Z3JhcGguCkBAIC0xMzYzLDI0ICsxMzIwLDE4IEBAIGVkdC1yZXN0b3JlLWtleQogICAiUmVzdG9y ZSBsYXN0IHJlcGxhY2VkIGtleSBkZWZpbml0aW9uLgogRGVmaW5pdGlvbiBpcyBzdG9yZWQgaW4g YGVkdC1sYXN0LXJlcGxhY2VkLWtleS1kZWZpbml0aW9uJy4iCiAgIChpbnRlcmFjdGl2ZSkKLSAg KGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpCiAgIChp ZiBlZHQtbGFzdC1yZXBsYWNlZC1rZXktZGVmaW5pdGlvbgogICAgICAgKHByb2duCiAgICAgICAg IChsZXQgKGVkdC1rZXktZGVmaW5pdGlvbikKICAgICAgICAgICAoc2V0ICdlZHQta2V5LWRlZmlu aXRpb24KICAgICAgICAgICAgICAgIChyZWFkLWtleS1zZXF1ZW5jZSAiUHJlc3MgdGhlIGtleSB0 byBiZSByZXN0b3JlZDogIikpCi0JICAoaWYgKGlmIChmZWF0dXJlcCAnZW1hY3MpCi0JCSAgKHN0 cmluZy1lcXVhbCAiXEMtbSIgZWR0LWtleS1kZWZpbml0aW9uKQotCQkoc3RyaW5nLWVxdWFsICJc Qy1tIiAoZXZlbnRzLXRvLWtleXMgZWR0LWtleS1kZWZpbml0aW9uKSkpCisJICAoaWYgKHN0cmlu Zy1lcXVhbCAiXEMtbSIgZWR0LWtleS1kZWZpbml0aW9uKQogICAgICAgICAgICAgICAobWVzc2Fn ZSAiS2V5IG5vdCByZXN0b3JlZCIpCiAJICAgIChwcm9nbgogCSAgICAgIChkZWZpbmUta2V5IChj dXJyZW50LWdsb2JhbC1tYXApCiAJCWVkdC1rZXktZGVmaW5pdGlvbiBlZHQtbGFzdC1yZXBsYWNl ZC1rZXktZGVmaW5pdGlvbikKLQkgICAgICAoaWYgKGZlYXR1cmVwICdlbWFjcykKLQkJICAobWVz c2FnZSAiS2V5IGRlZmluaXRpb24gZm9yICVzIGhhcyBiZWVuIHJlc3RvcmVkLiIKLQkJCSAgIGVk dC1rZXktZGVmaW5pdGlvbikKLQkJKG1lc3NhZ2UgIktleSBkZWZpbml0aW9uIGZvciAlcyBoYXMg YmVlbiByZXN0b3JlZC4iCi0JCQkgKGV2ZW50cy10by1rZXlzIGVkdC1rZXktZGVmaW5pdGlvbikp KSkpKSkKKwkgICAgICAobWVzc2FnZSAiS2V5IGRlZmluaXRpb24gZm9yICVzIGhhcyBiZWVuIHJl c3RvcmVkLiIKKwkJICAgICAgIGVkdC1rZXktZGVmaW5pdGlvbikpKSkpCiAgICAgKGVycm9yICJO byByZXBsYWNlZCBrZXkgZGVmaW5pdGlvbiB0byByZXN0b3JlISIpKSkKIAogOzs7CkBAIC0xMzky LDggKzEzNDMsNyBAQCBlZHQtd2luZG93LXRvcAogICAoaW50ZXJhY3RpdmUpCiAgIChsZXQgKChz dGFydC1jb2x1bW4gKGN1cnJlbnQtY29sdW1uKSkpCiAgICAgKG1vdmUtdG8td2luZG93LWxpbmUg MCkKLSAgICAobW92ZS10by1jb2x1bW4gc3RhcnQtY29sdW1uKSkKLSAgKGlmIChmZWF0dXJlcCAn eGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQorICAgIChtb3ZlLXRvLWNvbHVt biBzdGFydC1jb2x1bW4pKSkKIAogOzs7CiA7OzsgV0lORE9XIEJPVFRPTQpAQCAtMTQwNCw4ICsx MzU0LDcgQEAgZWR0LXdpbmRvdy1ib3R0b20KICAgKGludGVyYWN0aXZlKQogICAobGV0ICgoc3Rh cnQtY29sdW1uIChjdXJyZW50LWNvbHVtbikpKQogICAgIChtb3ZlLXRvLXdpbmRvdy1saW5lICgt ICh3aW5kb3ctaGVpZ2h0KSAyKSkKLSAgICAobW92ZS10by1jb2x1bW4gc3RhcnQtY29sdW1uKSkK LSAgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAoc2V0cSB6bWFjcy1yZWdpb24tc3RheXMgdCkpKQor ICAgIChtb3ZlLXRvLWNvbHVtbiBzdGFydC1jb2x1bW4pKSkKIAogOzs7CiA7OzsgU0NST0xMIFdJ TkRPVyBMSU5FCkBAIC0xNDE0LDE0ICsxMzYzLDEyIEBAIGVkdC13aW5kb3ctYm90dG9tCiAoZGVm dW4gZWR0LXNjcm9sbC13aW5kb3ctZm9yd2FyZC1saW5lICgpCiAgICJNb3ZlIHdpbmRvdyBmb3J3 YXJkIG9uZSBsaW5lIGxlYXZpbmcgY3Vyc29yIGF0IHBvc2l0aW9uIGluIHdpbmRvdy4iCiAgIChp bnRlcmFjdGl2ZSkKLSAgKHNjcm9sbC11cCAxKQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChz ZXRxIHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisgIChzY3JvbGwtdXAgMSkpCiAKIChkZWZ1biBl ZHQtc2Nyb2xsLXdpbmRvdy1iYWNrd2FyZC1saW5lICgpCiAgICJNb3ZlIHdpbmRvdyBiYWNrd2Fy ZCBvbmUgbGluZSBsZWF2aW5nIGN1cnNvciBhdCBwb3NpdGlvbiBpbiB3aW5kb3cuIgogICAoaW50 ZXJhY3RpdmUpCi0gIChzY3JvbGwtZG93biAxKQotICAoaWYgKGZlYXR1cmVwICd4ZW1hY3MpIChz ZXRxIHptYWNzLXJlZ2lvbi1zdGF5cyB0KSkpCisgIChzY3JvbGwtZG93biAxKSkKIAogKGRlZnVu IGVkdC1zY3JvbGwtbGluZSAoKQogICAiTW92ZSB3aW5kb3cgb25lIGxpbmUgaW4gY3VycmVudCBk aXJlY3Rpb24uIgpAQCAtMTQ2Nyw4ICsxNDE0LDcgQEAgZWR0LXNjcm9sbC13aW5kb3cKIChkZWZ1 biBlZHQtbGluZS10by1ib3R0b20tb2Ytd2luZG93ICgpCiAgICJNb3ZlIHRoZSBjdXJyZW50IGxp bmUgdG8gdGhlIGJvdHRvbSBvZiB0aGUgd2luZG93LiIKICAgKGludGVyYWN0aXZlKQotICAocmVj ZW50ZXIgLTEpCi0gIChpZiAoZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0 YXlzIHQpKSkKKyAgKHJlY2VudGVyIC0xKSkKIAogOzs7CiA7OzsgTElORSBUTyBUT1AgT0YgV0lO RE9XCkBAIC0xNDc3LDggKzE0MjMsNyBAQCBlZHQtbGluZS10by1ib3R0b20tb2Ytd2luZG93CiAo ZGVmdW4gZWR0LWxpbmUtdG8tdG9wLW9mLXdpbmRvdyAoKQogICAiTW92ZSB0aGUgY3VycmVudCBs aW5lIHRvIHRoZSB0b3Agb2YgdGhlIHdpbmRvdy4iCiAgIChpbnRlcmFjdGl2ZSkKLSAgKHJlY2Vu dGVyIDApCi0gIChpZiAoZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlz IHQpKSkKKyAgKHJlY2VudGVyIDApKQogCiA7OzsKIDs7OyBMSU5FIFRPIE1JRERMRSBPRiBXSU5E T1cKQEAgLTE0ODcsOCArMTQzMiw3IEBAIGVkdC1saW5lLXRvLXRvcC1vZi13aW5kb3cKIChkZWZ1 biBlZHQtbGluZS10by1taWRkbGUtb2Ytd2luZG93ICgpCiAgICJNb3ZlIHdpbmRvdyBzbyBsaW5l IHdpdGggY3Vyc29yIGlzIGluIHRoZSBtaWRkbGUgb2YgdGhlIHdpbmRvdy4iCiAgIChpbnRlcmFj dGl2ZSkKLSAgKHJlY2VudGVyICcoNCkpCi0gIChpZiAoZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEg em1hY3MtcmVnaW9uLXN0YXlzIHQpKSkKKyAgKHJlY2VudGVyICcoNCkpKQogCiA7OzsKIDs7OyBH T1RPIFBFUkNFTlRBR0UKQEAgLTE1MDAsOCArMTQ0NCw3IEBAIGVkdC1nb3RvLXBlcmNlbnRhZ2UK ICAgKGludGVyYWN0aXZlICJOR290by1wZXJjZW50YWdlOiAiKQogICAoaWYgKG9yICg+IG51bSAx MDApICg8IG51bSAwKSkKICAgICAgIChlcnJvciAiUGVyY2VudGFnZSAlZCBvdXQgb2YgcmFuZ2Ug MCA8IHBlcmNlbnQgPCAxMDAiIG51bSkKLSAgICAoZ290by1jaGFyICgvICgqIChwb2ludC1tYXgp IG51bSkgMTAwKSkpCi0gIChpZiAoZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9u LXN0YXlzIHQpKSkKKyAgICAoZ290by1jaGFyICgvICgqIChwb2ludC1tYXgpIG51bSkgMTAwKSkp KQogCiA7OzsKIDs7OyBGSUxMIFJFR0lPTgpAQCAtMTY3Myw3ICsxNjE2LDYgQEAgZWR0LWVsaW1p bmF0ZS1hbGwtdGFicwogKGRlZnVuIGVkdC1kaXNwbGF5LXRoZS10aW1lICgpCiAgICJEaXNwbGF5 IHRoZSBjdXJyZW50IHRpbWUuIgogICAoaW50ZXJhY3RpdmUpCi0gIChpZiAoZmVhdHVyZXAgJ3hl bWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0YXlzIHQpKQogICAobWVzc2FnZSAiJXMiIChjdXJy ZW50LXRpbWUtc3RyaW5nKSkpCiAKIDs7OwpAQCAtMTcwMSw5ICsxNjQzLDcgQEAgZWR0LXJlbWVt YmVyCiAgICAgICAobGV0IChlZHQta2V5LWRlZmluaXRpb24pCiAJKHNldCAnZWR0LWtleS1kZWZp bml0aW9uCiAJICAgICAocmVhZC1rZXktc2VxdWVuY2UgIkVudGVyIGtleSBmb3IgYmluZGluZzog IikpCi0JKGlmIChpZiAoZmVhdHVyZXAgJ2VtYWNzKQotCQkoc3RyaW5nLWVxdWFsICJcQy1tIiBl ZHQta2V5LWRlZmluaXRpb24pCi0JICAgICAgKHN0cmluZy1lcXVhbCAiXEMtbSIgKGV2ZW50cy10 by1rZXlzIGVkdC1rZXktZGVmaW5pdGlvbikpKQorCShpZiAoc3RyaW5nLWVxdWFsICJcQy1tIiBl ZHQta2V5LWRlZmluaXRpb24pCiAJICAgIChtZXNzYWdlICJLZXkgc2VxdWVuY2Ugbm90IHJlbWVt YmVyZWQiKQogCSAgKHByb2duCiAJICAgIChzZXQgJ2VkdC1sZWFybi1tYWNyby1jb3VudCAoKyBl ZHQtbGVhcm4tbWFjcm8tY291bnQgMSkpCkBAIC0xNzUzLDggKzE2OTMsNyBAQCBlZHQtc3BsaXQt d2luZG93CiAgICJTcGxpdCBjdXJyZW50IHdpbmRvdyBhbmQgcGxhY2UgY3Vyc29yIGluIHRoZSBu ZXcgd2luZG93LiIKICAgKGludGVyYWN0aXZlKQogICAoc3BsaXQtd2luZG93KQotICAob3RoZXIt d2luZG93IDEpCi0gIChpZiAoZmVhdHVyZXAgJ3hlbWFjcykgKHNldHEgem1hY3MtcmVnaW9uLXN0 YXlzIHQpKSkKKyAgKG90aGVyLXdpbmRvdyAxKSkKIAogOzs7CiA7OzsgQ09QWSBSRUNUQU5HTEUK QEAgLTE5MzUsOSArMTg3NCw4IEBAIGVkdC15LW9yLW4tcAogKGRlZnVuIGVkdC1sb2FkLWtleXMg KGZpbGUpCiAgICJMb2FkIHRoZSBMSy0yMDEga2V5IG1hcHBpbmcgRklMRSBnZW5lcmF0ZWQgYnkg ZWR0LW1hcHBlci5lbC4KIElmIEZJTEUgaXMgbmlsLCB3aGljaCBpcyB0aGUgbm9ybWFsIGNhc2Us IHRyeSB0byBsb2FkIGEgZGVmYXVsdCBmaWxlLgotVGhlIGRlZmF1bHQgZmlsZSBuYW1lcyBhcmUg YmFzZWQgdXBvbiB0aGUgd2luZG93IHN5c3RlbSwgdGVybWluYWwKLXR5cGUsIGFuZCB2ZXJzaW9u IG9mIEVtYWNzIGluIHVzZTogR05VIEVtYWNzIG9yIFhFbWFjcyAoYWthIEx1Y2lkCi1FbWFjcyku ICBJZiBhIGRlZmF1bHQgZmlsZSBkb2VzIG5vdCBleGlzdCwgYXNrIHVzZXIgaWYgb25lIHNob3Vs ZCBiZQorVGhlIGRlZmF1bHQgZmlsZSBuYW1lcyBhcmUgYmFzZWQgdXBvbiB0aGUgd2luZG93IHN5 c3RlbSBhbmQgdGVybWluYWwKK3R5cGUuICBJZiBhIGRlZmF1bHQgZmlsZSBkb2VzIG5vdCBleGlz dCwgYXNrIHVzZXIgaWYgb25lIHNob3VsZCBiZQogY3JlYXRlZC4iCiAgIChpbnRlcmFjdGl2ZSAi ZktleSBkZWZpbml0aW9uIGZpbGU6ICIpCiAgIChjb25kIChmaWxlCkBAIC0xOTQ4LDExICsxODg2 LDExIEBAIGVkdC1sb2FkLWtleXMKIAkgKHNldHEgZmlsZQogCSAgICAgICAoZXhwYW5kLWZpbGUt bmFtZQogCQkoY29uY2F0Ci0JCSAifi8uZWR0LSIgZWR0LWVtYWNzLXZhcmlhbnQKKwkJICJ+Ly5l ZHQtZ251IgogCQkgKGlmIGVkdC10ZXJtIChjb25jYXQgIi0iIGVkdC10ZXJtKSkKIAkJIChpZiBl ZHQteHNlcnZlciAoY29uY2F0ICItIiBlZHQteHNlcnZlcikpCi0JCSAoaWYgZWR0LXdpbmRvdy1z eXN0ZW0KLQkJICAgICAoY29uY2F0ICItIiAodXBjYXNlIChzeW1ib2wtbmFtZSBlZHQtd2luZG93 LXN5c3RlbSkpKSkKKwkJIChpZiB3aW5kb3ctc3lzdGVtCisJCSAgICAgKGNvbmNhdCAiLSIgKHVw Y2FzZSAoc3ltYm9sLW5hbWUgd2luZG93LXN5c3RlbSkpKSkKIAkJICIta2V5cyIpKSkpKQogICAo Y29uZCAoKGZpbGUtcmVhZGFibGUtcCBmaWxlKQogCSAobG9hZC1maWxlIGZpbGUpKQpAQCAtMjAw MiwxNSArMTk0MCwxNCBAQCBlZHQtZW11bGF0aW9uLW9uCiAgICJUdXJuIG9uIEVEVCBFbXVsYXRp b24uIgogICAoaW50ZXJhY3RpdmUpCiAgIDs7IElmIHVzaW5nIHBjIHdpbmRvdyBzeXN0ZW0gKE1T LURPUyksIHNldCB0ZXJtaW5hbCB0eXBlIHRvIHBjLgotICA7OyBJZiBub3QgYSB3aW5kb3cgc3lz dGVtIChHTlUpIG9yIGEgdHR5IHdpbmRvdyBzeXN0ZW0gKFhFbWFjcyksCi0gIDs7IGdldCB0ZXJt aW5hbCB0eXBlLgotICAoaWYgKGVxIGVkdC13aW5kb3ctc3lzdGVtICdwYykKKyAgOzsgSWYgbm90 IGEgd2luZG93IHN5c3RlbSwgZ2V0IHRlcm1pbmFsIHR5cGUuCisgIChpZiAoZXEgd2luZG93LXN5 c3RlbSAncGMpCiAgICAgICAoc2V0cSBlZHQtdGVybSAicGMiKQotICAgIChpZiAob3IgKG5vdCBl ZHQtd2luZG93LXN5c3RlbSkgKGVxIGVkdC13aW5kb3ctc3lzdGVtICd0dHkpKQorICAgIChpZiAo bm90IHdpbmRvdy1zeXN0ZW0pCiAJKHNldHEgZWR0LXRlcm0gKGdldGVudiAiVEVSTSIpKSkpCiAg IDs7IExvb2sgZm9yIGEgdGVybWluYWwgY29uZmlndXJhdGlvbiBmaWxlIGZvciB0aGlzIHRlcm1p bmFsIHR5cGUuCiAgIDs7IE90aGVyd2lzZSwgbG9hZCB0aGUgdXNlcidzIGN1c3RvbSBjb25maWd1 cmF0aW9uIGZpbGUuCi0gIChpZiAob3IgKG5vdCBlZHQtd2luZG93LXN5c3RlbSkgKG1lbXEgZWR0 LXdpbmRvdy1zeXN0ZW0gJyhwYyB0dHkpKSkKKyAgKGlmIChvciAobm90IHdpbmRvdy1zeXN0ZW0p IChtZW1xIHdpbmRvdy1zeXN0ZW0gJyhwYyB0dHkpKSkKICAgICAgIChwcm9nbgogCTs7IExvYWQg dGVybWluYWwtc3BlY2lmaWMgY29uZmlndXJhdGlvbiBmaWxlLCBpZiBpdCBleGlzdHMgZm9yIHRo aXMKIAk7OyB0ZXJtaW5hbCB0eXBlLiAgTm90ZTogQWxsIERFQyBWVCBzZXJpZXMgdGVybWluYWxz IGFyZSBzdXBwb3J0ZWQKQEAgLTIwMzcsMjcgKzE5NzQsMTYgQEAgZWR0LWVtdWxhdGlvbi1vbgog CSAgICAoc2V0cSBlZHQtdGVybSB0ZXJtKSkpKQogICAgIChlZHQtbG9hZC1rZXlzIG5pbCkpCiAg IDs7IE1ha2UgaGlnaGxpZ2h0aW5nIG9mIHNlbGVjdGVkIHRleHQgd29yayBwcm9wZXJseSBmb3Ig RURUIGNvbW1hbmRzLgotICAoaWYgKGZlYXR1cmVwICdlbWFjcykKLSAgICAgIChwcm9nbgotCShz ZXRxIGVkdC1vcmlnLXRyYW5zaWVudC1tYXJrLW1vZGUKLSAgICAgICAgICAgICAgKGRlZmF1bHQt dmFsdWUgJ3RyYW5zaWVudC1tYXJrLW1vZGUpKQotCShhZGQtaG9vayAnYWN0aXZhdGUtbWFyay1o b29rCi0JCSAgKGZ1bmN0aW9uCi0JCSAgIChsYW1iZGEgKCkKLQkJICAgICAoZWR0LXNlbGVjdC1t b2RlIHQpKSkpCi0JKGFkZC1ob29rICdkZWFjdGl2YXRlLW1hcmstaG9vawotCQkgIChmdW5jdGlv bgotCQkgICAobGFtYmRhICgpCi0JCSAgICAgKGVkdC1zZWxlY3QtbW9kZSBuaWwpKSkpKQotICAg IChwcm9nbgotICAgICAgKGFkZC1ob29rICd6bWFjcy1hY3RpdmF0ZS1yZWdpb24taG9vawotCQko ZnVuY3Rpb24KLQkJIChsYW1iZGEgKCkKLQkJICAgKGVkdC1zZWxlY3QtbW9kZSB0KSkpKQotICAg ICAgKGFkZC1ob29rICd6bWFjcy1kZWFjdGl2YXRlLXJlZ2lvbi1ob29rCi0JCShmdW5jdGlvbgot CQkgKGxhbWJkYSAoKQotCQkgICAoZWR0LXNlbGVjdC1tb2RlIG5pbCkpKSkpKQorICAoc2V0cSBl ZHQtb3JpZy10cmFuc2llbnQtbWFyay1tb2RlCisgICAgICAgIChkZWZhdWx0LXZhbHVlICd0cmFu c2llbnQtbWFyay1tb2RlKSkKKyAgKGFkZC1ob29rICdhY3RpdmF0ZS1tYXJrLWhvb2sKKwkgICAg KGZ1bmN0aW9uCisJICAgICAobGFtYmRhICgpCisJICAgICAgIChlZHQtc2VsZWN0LW1vZGUgdCkp KSkKKyAgKGFkZC1ob29rICdkZWFjdGl2YXRlLW1hcmstaG9vaworCSAgICAoZnVuY3Rpb24KKwkg ICAgIChsYW1iZGEgKCkKKwkgICAgICAgKGVkdC1zZWxlY3QtbW9kZSBuaWwpKSkpCiAgIDs7ICBM b2FkIHVzZXIncyBFRFQgY3VzdG9tIGtleSBiaW5kaW5ncyBmaWxlLCBpZiBpdCBleGlzdHMuCiAg IDs7ICBPdGhlcndpc2UsIHVzZSB0aGUgZGVmYXVsdCBiaW5kaW5ncy4KICAgKGlmIChsb2FkICJl ZHQtdXNlciIgdCB0KQpAQCAtMjA3NCw4ICsyMDAwLDcgQEAgZWR0LWVtdWxhdGlvbi1vZmYKICAg KHNldHEgZWR0LXNlbGVjdC1tb2RlLWN1cnJlbnQgbmlsKQogICAoZWR0LXJlc2V0KQogICAoZm9y Y2UtbW9kZS1saW5lLXVwZGF0ZSB0KQotICAoaWYgKGZlYXR1cmVwICdlbWFjcykKLSAgICAgIChz ZXRxLWRlZmF1bHQgdHJhbnNpZW50LW1hcmstbW9kZSBlZHQtb3JpZy10cmFuc2llbnQtbWFyay1t b2RlKSkKKyAgKHNldHEtZGVmYXVsdCB0cmFuc2llbnQtbWFyay1tb2RlIGVkdC1vcmlnLXRyYW5z aWVudC1tYXJrLW1vZGUpCiAgIChtZXNzYWdlICJPcmlnaW5hbCBrZXkgYmluZGluZ3MgcmVzdG9y ZWQ7IEVEVCBFbXVsYXRpb24gZGlzYWJsZWQiKSkKIAogKGRlZnVuIGVkdC1kZWZhdWx0LW1lbnUt YmFyLXVwZGF0ZS1idWZmZXJzICgpCkBAIC0yMTAzLDkgKzIwMjgsNyBAQCBlZHQtZGVmYXVsdC1l bXVsYXRpb24tc2V0dXAKICAgOzsgZGlzdHVyYmluZyB0aGUgb3JpZ2luYWwgYmluZGluZ3MgaW4g Z2xvYmFsLW1hcC4KICAgKGZzZXQgJ2VkdC1kZWZhdWx0LUVTQy1wcmVmaXggKGNvcHkta2V5bWFw ICdFU0MtcHJlZml4KSkKICAgKHNldHEgZWR0LWRlZmF1bHQtZ2xvYmFsLW1hcCAoY29weS1rZXlt YXAgKGN1cnJlbnQtZ2xvYmFsLW1hcCkpKQotICAoaWYgKGZlYXR1cmVwICdlbWFjcykKLSAgICAg IChkZWZpbmUta2V5IGVkdC1kZWZhdWx0LWdsb2JhbC1tYXAgIlxlIiAnZWR0LWRlZmF1bHQtRVND LXByZWZpeCkKLSAgICAoZGVmaW5lLWtleSBlZHQtZGVmYXVsdC1nbG9iYWwtbWFwIFtlc2NhcGVd ICdlZHQtZGVmYXVsdC1FU0MtcHJlZml4KSkKKyAgKGRlZmluZS1rZXkgZWR0LWRlZmF1bHQtZ2xv YmFsLW1hcCAiXGUiICdlZHQtZGVmYXVsdC1FU0MtcHJlZml4KQogICAoZGVmaW5lLXByZWZpeC1j b21tYW5kICdlZHQtZGVmYXVsdC1nb2xkLW1hcCkKICAgKGVkdC1zZXR1cC1kZWZhdWx0LWJpbmRp bmdzKQogICA7OyBJZiB0ZXJtaW5hbCBoYXMgYWRkaXRpb25hbCBmdW5jdGlvbiBrZXlzLCB0aGUg dGVybWluYWwtc3BlY2lmaWMKQEAgLTIxNDEsOSArMjA2NCw3IEBAIGVkdC11c2VyLWVtdWxhdGlv bi1zZXR1cAogICA7OyBTZXR1cCB1c2VyIEVEVCBnbG9iYWwgbWFwIGJ5IGNvcHlpbmcgZGVmYXVs dCBFRFQgZ2xvYmFsIG1hcCBiaW5kaW5ncy4KICAgKGZzZXQgJ2VkdC11c2VyLUVTQy1wcmVmaXgg KGNvcHkta2V5bWFwICdlZHQtZGVmYXVsdC1FU0MtcHJlZml4KSkKICAgKHNldHEgZWR0LXVzZXIt Z2xvYmFsLW1hcCAoY29weS1rZXltYXAgZWR0LWRlZmF1bHQtZ2xvYmFsLW1hcCkpCi0gIChpZiAo ZmVhdHVyZXAgJ2VtYWNzKQotICAgICAgKGRlZmluZS1rZXkgZWR0LXVzZXItZ2xvYmFsLW1hcCAi XGUiICdlZHQtdXNlci1FU0MtcHJlZml4KQotICAgIChkZWZpbmUta2V5IGVkdC11c2VyLWdsb2Jh bC1tYXAgW2VzY2FwZV0gJ2VkdC11c2VyLUVTQy1wcmVmaXgpKQorICAoZGVmaW5lLWtleSBlZHQt dXNlci1nbG9iYWwtbWFwICJcZSIgJ2VkdC11c2VyLUVTQy1wcmVmaXgpCiAgIDs7IElmIHRlcm1p bmFsIGhhcyBhZGRpdGlvbmFsIGZ1bmN0aW9uIGtleXMsIHRoZSB1c2VyJ3MgaW5pdGlhbGl6YXRp b24KICAgOzsgZmlsZSBjYW4gYXNzaWduIGJpbmRpbmdzIHRvIHRoZW0gdmlhIHRoZSBvcHRpb25h bAogICA7OyBmdW5jdGlvbiBlZHQtc2V0dXAtZXh0cmEtZGVmYXVsdC1iaW5kaW5ncy4KQEAgLTIx NjAsOCArMjA4MSw3IEBAIGVkdC11c2VyLWVtdWxhdGlvbi1zZXR1cAogKGRlZnVuIGVkdC1zZWxl Y3QtZGVmYXVsdC1nbG9iYWwtbWFwKCkKICAgIlNlbGVjdCBkZWZhdWx0IEVEVCBlbXVsYXRpb24g a2V5IGJpbmRpbmdzLiIKICAgKGludGVyYWN0aXZlKQotICAoaWYgKGZlYXR1cmVwICdlbWFjcykK LSAgICAodHJhbnNpZW50LW1hcmstbW9kZSAxKSkKKyAgKHRyYW5zaWVudC1tYXJrLW1vZGUgMSkK ICAgKHVzZS1nbG9iYWwtbWFwIGVkdC1kZWZhdWx0LWdsb2JhbC1tYXApCiAgIChpZiAobm90IGVk dC1rZWVwLWN1cnJlbnQtcGFnZS1kZWxpbWl0ZXIpCiAgICAgICAocHJvZ24KQEAgLTIxNzgsOCAr MjA5OCw3IEBAIGVkdC1zZWxlY3QtdXNlci1nbG9iYWwtbWFwCiAgIChpbnRlcmFjdGl2ZSkKICAg KGlmIGVkdC11c2VyLW1hcC1jb25maWd1cmVkCiAgICAgICAocHJvZ24KLQkoaWYgKGZlYXR1cmVw ICdlbWFjcykKLQkgICAgKHRyYW5zaWVudC1tYXJrLW1vZGUgMSkpCisJKHRyYW5zaWVudC1tYXJr LW1vZGUgMSkKICAgICAgICAgKHVzZS1nbG9iYWwtbWFwIGVkdC11c2VyLWdsb2JhbC1tYXApCiAg ICAgICAgIChpZiAobm90IGVkdC1rZWVwLWN1cnJlbnQtcGFnZS1kZWxpbWl0ZXIpCiAgICAgICAg ICAgICAocHJvZ24KLS0gCjIuMjAuMQoK --000000000000b25ba50594163df4-- ------------=_1570644844-16476-1--