From unknown Sat Sep 20 03:42:54 2025 X-Loop: help-debbugs@gnu.org Subject: bug#44731: [PATCH] Make XEmacs compat aliases easy-menu-{add,remove} obsolete Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 19 Nov 2020 00:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44731 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 44731@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160574643917229 (code B ref -1); Thu, 19 Nov 2020 00:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2020 00:40:39 +0000 Received: from localhost ([127.0.0.1]:37201 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfY05-0004To-M5 for submit@debbugs.gnu.org; Wed, 18 Nov 2020 19:40:38 -0500 Received: from lists.gnu.org ([209.51.188.17]:39616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfY02-0004Te-6B for submit@debbugs.gnu.org; Wed, 18 Nov 2020 19:40:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfY01-00081j-M0 for bug-gnu-emacs@gnu.org; Wed, 18 Nov 2020 19:40:33 -0500 Received: from mail-ed1-f48.google.com ([209.85.208.48]:37204) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kfXzy-0002oD-69 for bug-gnu-emacs@gnu.org; Wed, 18 Nov 2020 19:40:33 -0500 Received: by mail-ed1-f48.google.com with SMTP id cq7so4000628edb.4 for ; Wed, 18 Nov 2020 16:40:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:mime-version:date:message-id:subject:to; bh=47mKWJpQFCXKlTDI5y5L6FnF7lc7ZjIlfhqeBnZ/Low=; b=uQLsdtUembhfpX4kXHJQdUnV3e0HWHO+WilBOVVUNOqEiX0uG29jKNqp+ImHuyoq1g 8DWGt0J9RHZUy7nkjqHsRKQnXC36LlsxZe/C3IG6CfRHJj/IgqwfRSeY/2FPwAfVhmpV iUAGcIGUJXEbxUThAnkix9l4okduZW6FuVHImWVCgngL6AUJW81+dh4qyR8OyTQzFE/6 YvZiSD8IWxCRPVQAiwEXRrbhs14e6bDe4srWzNo0/DPcN84mubD6NAaIGvYt9d9UH/AL F2vi/CDR6DFkuo3w5Q6U5LPTHOaWU8rda2DcF/3GQA+Q+GsW2Px0LZgXCNHGhZyRSqv3 ox+g== X-Gm-Message-State: AOAM532F0Q2Kkuflm/4bhEM0NfTpOM1/SSzrAV1bQe2/4OO4U3D9NsKz Sge2be3VXdlNZVba6opMyGKerPGxgUeBw3C6HV/EfdMq X-Google-Smtp-Source: ABdhPJxpR6bSW/AspsMu7aRG6Q69o3aQuWIzX5jx+Ts7drsa7DLqx+mSGmk9g61koDl8XiMc+Xd3f6+9offtuUmIcvc= X-Received: by 2002:aa7:d888:: with SMTP id u8mr29102886edq.210.1605746428395; Wed, 18 Nov 2020 16:40:28 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Wed, 18 Nov 2020 16:40:27 -0800 From: Stefan Kangas MIME-Version: 1.0 Date: Wed, 18 Nov 2020 16:40:27 -0800 Message-ID: Content-Type: multipart/mixed; boundary="00000000000077c14305b46af97e" Received-SPF: pass client-ip=209.85.208.48; envelope-from=stefankangas@gmail.com; helo=mail-ed1-f48.google.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 19:40:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.7 (/) 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.8 (-) --00000000000077c14305b46af97e Content-Type: text/plain; charset="UTF-8" Severity: wishlist The `easy-menu-remove' and `easy-menu-add' are XEmacs compatibility aliases. I think they do not make sense these days, and it is better for code that wants to use them to wrap the call in something like `(when (featurep 'xemacs) ...)'. The attached patch makes them obsolete and fixes all callers. It takes care to not remove XEmacs compatibility from any modules where it was not already removed, so I hope this will be uncontroversial. --00000000000077c14305b46af97e Content-Type: text/x-diff; charset="US-ASCII"; name="0001-Make-XEmacs-compat-aliases-easy-menu-add-remove-obso.patch" Content-Disposition: attachment; filename="0001-Make-XEmacs-compat-aliases-easy-menu-add-remove-obso.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: 39f2ec49aeb538b2_0.1 RnJvbSBhNzllYmQ1YzBhYTg2YjljOGFkYzAxMTMxMGI3ZWI2NjZlMTllNzAwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5AbWFyeGlzdC5zZT4KRGF0 ZTogV2VkLCAxOCBOb3YgMjAyMCAyMzoxNToyMSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIE1ha2Ug WEVtYWNzIGNvbXBhdCBhbGlhc2VzIGVhc3ktbWVudS17YWRkLHJlbW92ZX0gb2Jzb2xldGUKCiog bGlzcC9lbWFjcy1saXNwL2Vhc3ltZW51LmVsIChlYXN5LW1lbnUtcmVtb3ZlLCBlYXN5LW1lbnUt YWRkKToKTWFrZSBYRW1hY3MgY29tcGF0IGFsaWFzZXMgb2Jzb2xldGUuCiogbGlzcC9hbGxvdXQu ZWwgKGFsbG91dC1zZXR1cC1tZW51YmFyKToKKiBsaXNwL2N1cy1lZGl0LmVsIChDdXN0b20tbW9k ZSk6CiogbGlzcC9nbnVzL2dudXMtYXJ0LmVsIChnbnVzLWFydGljbGUtZWRpdC1tb2RlKToKKiBs aXNwL2dudXMvbWVzc2FnZS5lbCAobWVzc2FnZS1tb2RlKToKKiBsaXNwL25ldC9zaWV2ZS5lbCAo c2lldmUtbWFuYWdlLW1vZGUpOgoqIGxpc3Avb3JnL29yZy1hZ2VuZGEuZWwgKG9yZy1hZ2VuZGEt bW9kZSk6CiogbGlzcC9vcmcvb3JnLXRhYmxlLmVsIChvcmctdGFibGUtZWRpdC1mb3JtdWxhcywg b3JndGJsLW1vZGUpOgoqIGxpc3Avb3JnL29yZy5lbDoKKiBsaXNwL3Byb2dtb2Rlcy9jcGVybC1t b2RlLmVsIChjcGVybC1tb2RlKToKKiBsaXNwL3Byb2dtb2Rlcy9oaWRlc2hvdy5lbCAoaHMtbWlu b3ItbW9kZSk6CiogbGlzcC9wcm9nbW9kZXMvaWRsdy1oZWxwLmVsIChpZGx3YXZlLWhlbHAtbW9k ZSk6CiogbGlzcC9wcm9nbW9kZXMvaWRsdy1zaGVsbC5lbCAoaWRsd2F2ZS1zaGVsbC1tb2RlKToK KiBsaXNwL3Byb2dtb2Rlcy9pZGx3YXZlLmVsIChpZGx3YXZlLW1vZGUpOgoqIGxpc3AvcHJvZ21v ZGVzL21ldGEtbW9kZS5lbCAobWV0YS1jb21tb24tbW9kZSk6CiogbGlzcC9wcm9nbW9kZXMvb2N0 YXZlLmVsIChvY3RhdmUtbW9kZSk6CiogbGlzcC9wcm9nbW9kZXMvcHJvbG9nLmVsIChwcm9sb2ct bWVudSk6CiogbGlzcC9wcm9nbW9kZXMvdGNsLmVsICh0Y2wtbW9kZSk6CiogbGlzcC9zcGVlZGJh ci5lbCAoc3BlZWRiYXItcmVjb25maWd1cmUta2V5bWFwcyk6CiogbGlzcC90ZXJtLmVsICh0ZXJt LW1vZGUsIHRlcm0tY2hhci1tb2RlLCB0ZXJtLXByb2Nlc3MtcGFnZXIpOgoqIGxpc3AvdGV4dG1v ZGVzL2Rucy1tb2RlLmVsIChkbnMtbW9kZSk6CiogbGlzcC93aWQtYnJvd3NlLmVsICh3aWRnZXQt YnJvd3NlLW1vZGUpOiBEb24ndCBjYWxsIGFib3ZlCm9ic29sZXRlIGFsaWFzZXMuCiogbGlzcC9j ZWRldC9zZW1hbnRpYy9ncmFtbWFyLmVsIChzZW1hbnRpYy1ncmFtbWFyLXNldHVwLW1lbnUteGVt YWNzKToKKiBsaXNwL21oLWUvbWgtZm9sZGVyLmVsIChtaC1mb2xkZXItbW9kZSk6CiogbGlzcC9t aC1lL21oLWlkZW50aXR5LmVsIChtaC1pZGVudGl0eS1hZGQtbWVudSk6CiogbGlzcC9taC1lL21o LWxldHRlci5lbCAobWgtbGV0dGVyLW1vZGUpOgoqIGxpc3AvbWgtZS9taC1zZWFyY2guZWwgKG1o LXNlYXJjaC1tb2RlKToKKiBsaXNwL21oLWUvbWgtc2hvdy5lbCAobWgtc2hvdy1tb2RlKToKKiBs aXNwL29ic29sZXRlL290b2RvLW1vZGUuZWwgKHRvZG8tbW9kZSk6CiogbGlzcC9wcm9nbW9kZXMv YW50bHItbW9kZS5lbCAoYW50bHItbW9kZSk6CiogbGlzcC9wcm9nbW9kZXMvY2MtbW9kZS5lbCAo Yy1tb2RlLCBjKystbW9kZSwgb2JqYy1tb2RlKQooamF2YS1tb2RlLCBpZGwtbW9kZSwgcGlrZS1t b2RlKToKKiBsaXNwL3Byb2dtb2Rlcy9zcWwuZWwgKHNxbC1tb2RlLCBzcWwtaW50ZXJhY3RpdmUt bW9kZSk6CiogbGlzcC9wcm9nbW9kZXMvdmhkbC1tb2RlLmVsICh2aGRsLXVwZGF0ZS1tb2RlLW1l bnUpCih2aGRsLWFkZC1zb3VyY2UtZmlsZXMtbWVudSwgdmhkbC1tb2RlKToKKiBsaXNwL3RleHRt b2Rlcy9yZWZ0ZXgtaW5kZXguZWwgKHJlZnRleC1pbmRleC1tb2RlKQoocmVmdGV4LWluZGV4LXBo cmFzZXMtbW9kZSk6CiogbGlzcC90ZXh0bW9kZXMvcmVmdGV4LXRvYy5lbCAocmVmdGV4LXRvYy1t b2RlKToKKiBsaXNwL3RleHRtb2Rlcy9yZWZ0ZXguZWwgKHJlZnRleC1tb2RlKTogT25seSBjYWxs IGFib3ZlIG9ic29sZXRlCmFsaWFzZXMgaW4gWEVtYWNzLgoKKiBsaXNwL3Byb2dtb2Rlcy9wcm9s b2cuZWwgKHByb2xvZy1pbmZlcmlvci1tZW51KToKKiBsaXNwL2VyYy9lcmMtbWVudS5lbCAoZXJj LW1lbnUtYWRkLCBlcmMtbWVudS1yZW1vdmUpOiBEb24ndCBjYWxsCmFib3ZlIG9ic29sZXRlIGFs aWFzZXMuICBNYWtlIG9ic29sZXRlLgoqIGxpc3AvZXJjL2VyYy1tZW51LmVsIChtZW51LCBlcmMt bWVudS1hZGQsIGVyYy1tZW51LXJlbW92ZSk6CiogbGlzcC9wcm9nbW9kZXMvcHJvbG9nLmVsIChw cm9sb2ctaW5mZXJpb3ItbW9kZSk6IEFkanVzdCBjYWxsZXJzLgoqIGxpc3Avc3BlZWRiYXIuZWwg KHNwZWVkYmFyLXByZXZpb3VzLW1lbnUpOiBNYWtlIG9ic29sZXRlLgotLS0KIGxpc3AvYWxsb3V0 LmVsICAgICAgICAgICAgICAgICB8ICAzICstLQogbGlzcC9jZWRldC9zZW1hbnRpYy9ncmFtbWFy LmVsIHwgIDMgKystCiBsaXNwL2N1cy1lZGl0LmVsICAgICAgICAgICAgICAgfCAgMSAtCiBsaXNw L2VtYWNzLWxpc3AvZWFzeW1lbnUuZWwgICAgfCAgNyArKy0tLS0tCiBsaXNwL2VyYy9lcmMtbWVu dS5lbCAgICAgICAgICAgfCAxNSArKysrKystLS0tLS0tLS0KIGxpc3AvZ251cy9nbnVzLWFydC5l bCAgICAgICAgICB8ICAxIC0KIGxpc3AvZ251cy9tZXNzYWdlLmVsICAgICAgICAgICB8ICAyIC0t CiBsaXNwL21oLWUvbWgtZm9sZGVyLmVsICAgICAgICAgfCAgNyArKysrLS0tCiBsaXNwL21oLWUv bWgtaWRlbnRpdHkuZWwgICAgICAgfCAgMiArLQogbGlzcC9taC1lL21oLWxldHRlci5lbCAgICAg ICAgIHwgIDIgKy0KIGxpc3AvbWgtZS9taC1zZWFyY2guZWwgICAgICAgICB8ICAyICstCiBsaXNw L21oLWUvbWgtc2hvdy5lbCAgICAgICAgICAgfCAgNyArKysrLS0tCiBsaXNwL25ldC9zaWV2ZS5l bCAgICAgICAgICAgICAgfCAgMyArLS0KIGxpc3Avb2Jzb2xldGUvb3RvZG8tbW9kZS5lbCAgICB8 ICAzICsrLQogbGlzcC9vcmcvb3JnLWFnZW5kYS5lbCAgICAgICAgIHwgIDEgLQogbGlzcC9vcmcv b3JnLXRhYmxlLmVsICAgICAgICAgIHwgIDUgKy0tLS0KIGxpc3Avb3JnL29yZy5lbCAgICAgICAg ICAgICAgICB8ICAxIC0KIGxpc3AvcHJvZ21vZGVzL2FudGxyLW1vZGUuZWwgICB8ICAzICsrLQog bGlzcC9wcm9nbW9kZXMvY2MtbW9kZS5lbCAgICAgIHwgMTggKysrKysrKysrKysrLS0tLS0tCiBs aXNwL3Byb2dtb2Rlcy9jcGVybC1tb2RlLmVsICAgfCAgMiAtLQogbGlzcC9wcm9nbW9kZXMvaGlk ZXNob3cuZWwgICAgIHwgIDEgLQogbGlzcC9wcm9nbW9kZXMvaWRsdy1oZWxwLmVsICAgIHwgIDEg LQogbGlzcC9wcm9nbW9kZXMvaWRsdy1zaGVsbC5lbCAgIHwgIDcgKy0tLS0tLQogbGlzcC9wcm9n bW9kZXMvaWRsd2F2ZS5lbCAgICAgIHwgIDQgLS0tLQogbGlzcC9wcm9nbW9kZXMvbWV0YS1tb2Rl LmVsICAgIHwgIDUgKy0tLS0KIGxpc3AvcHJvZ21vZGVzL29jdGF2ZS5lbCAgICAgICB8ICA0ICst LS0KIGxpc3AvcHJvZ21vZGVzL3Byb2xvZy5lbCAgICAgICB8IDE0ICsrKystLS0tLS0tLS0tCiBs aXNwL3Byb2dtb2Rlcy9zcWwuZWwgICAgICAgICAgfCAxMCArKysrKystLS0tCiBsaXNwL3Byb2dt b2Rlcy90Y2wuZWwgICAgICAgICAgfCAgNCArLS0tCiBsaXNwL3Byb2dtb2Rlcy92aGRsLW1vZGUu ZWwgICAgfCAxMiArKysrKysrKy0tLS0KIGxpc3Avc3BlZWRiYXIuZWwgICAgICAgICAgICAgICB8 ICA2ICsrLS0tLQogbGlzcC90ZXJtLmVsICAgICAgICAgICAgICAgICAgIHwgIDcgLS0tLS0tLQog bGlzcC90ZXh0bW9kZXMvZG5zLW1vZGUuZWwgICAgIHwgIDMgKy0tCiBsaXNwL3RleHRtb2Rlcy9y ZWZ0ZXgtaW5kZXguZWwgfCAgNiArKysrLS0KIGxpc3AvdGV4dG1vZGVzL3JlZnRleC10b2MuZWwg ICB8ICAzICsrLQogbGlzcC90ZXh0bW9kZXMvcmVmdGV4LmVsICAgICAgIHwgIDYgKysrKy0tCiBs aXNwL3dpZC1icm93c2UuZWwgICAgICAgICAgICAgfCAgMiAtLQogMzcgZmlsZXMgY2hhbmdlZCwg NzUgaW5zZXJ0aW9ucygrKSwgMTA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvYWxs b3V0LmVsIGIvbGlzcC9hbGxvdXQuZWwKaW5kZXggYTQ4MDJhMWMyYS4uODgwMDk4YzUxNSAxMDA2 NDQKLS0tIGEvbGlzcC9hbGxvdXQuZWwKKysrIGIvbGlzcC9hbGxvdXQuZWwKQEAgLTE2MjEsOCAr MTYyMSw3IEBAIGFsbG91dC1zZXR1cC1tZW51YmFyCiAJY3VyKQogICAgICh3aGlsZSBtZW51cwog ICAgICAgKHNldHEgY3VyIChjYXIgbWVudXMpCi0JICAgIG1lbnVzIChjZHIgbWVudXMpKQotICAg ICAgKGVhc3ktbWVudS1hZGQgY3VyKSkpKQorICAgICAgICAgICAgbWVudXMgKGNkciBtZW51cykp KSkpCiA7OztfICA+IGFsbG91dC1vdmVybGF5LXByZXBhcmF0aW9ucwogKGRlZnVuIGFsbG91dC1v dmVybGF5LXByZXBhcmF0aW9ucyAoKQogICAiU2V0IHRoZSBwcm9wZXJ0aWVzIG9mIHRoZSBhbGxv dXQgaW52aXNpYmxlLXRleHQgb3ZlcmxheSBhbmQgb3RoZXJzLiIKZGlmZiAtLWdpdCBhL2xpc3Av Y2VkZXQvc2VtYW50aWMvZ3JhbW1hci5lbCBiL2xpc3AvY2VkZXQvc2VtYW50aWMvZ3JhbW1hci5l bAppbmRleCBmNzFhYzZjNDEzLi5iNzY3MGVmNDRiIDEwMDY0NAotLS0gYS9saXNwL2NlZGV0L3Nl bWFudGljL2dyYW1tYXIuZWwKKysrIGIvbGlzcC9jZWRldC9zZW1hbnRpYy9ncmFtbWFyLmVsCkBA IC0xMjU4LDcgKzEyNTgsOCBAQCBzZW1hbnRpYy1ncmFtbWFyLXNldHVwLW1lbnUteGVtYWNzCiAg ICAgICAgKHVubGVzcyAoYm91bmRwICcsc3ltYm9sKQogICAgICAgICAgKGVhc3ktbWVudS1kZWZp bmUgLHN5bWJvbCBuaWwKICAgICAgICAgICAgIkdyYW1tYXIgTWVudSIgKGNvcHktc2VxdWVuY2Ug c2VtYW50aWMtZ3JhbW1hci1tZW51KSkpCi0gICAgICAgKGVhc3ktbWVudS1hZGQgLHN5bWJvbCkK KyAgICAgICAod2hlbiAoZmVhdHVyZXAgJ3hlbWFjcykKKyAgICAgICAgIChlYXN5LW1lbnUtYWRk ICxzeW1ib2wpKQogICAgICAgIChsZXQgKCgsaXRlbXMgKGNkciAsbW9kZS1tZW51KSkKICAgICAg ICAgICAgICAoLHBhdGggKGxpc3QgKGNhciAsc3ltYm9sKSkpKQogICAgICAgICAgKHdoZW4gLGl0 ZW1zCmRpZmYgLS1naXQgYS9saXNwL2N1cy1lZGl0LmVsIGIvbGlzcC9jdXMtZWRpdC5lbAppbmRl eCBkMTA3N2QzNjdkLi41OTNmZjNmN2JiIDEwMDY0NAotLS0gYS9saXNwL2N1cy1lZGl0LmVsCisr KyBiL2xpc3AvY3VzLWVkaXQuZWwKQEAgLTUxMTYsNyArNTExNiw2IEBAIEN1c3RvbS1tb2RlCiBF bnRyeSB0byB0aGlzIG1vZGUgY2FsbHMgdGhlIHZhbHVlIG9mIGBDdXN0b20tbW9kZS1ob29rJwog aWYgdGhhdCB2YWx1ZSBpcyBub24tbmlsLiIKICAgKHVzZS1sb2NhbC1tYXAgY3VzdG9tLW1vZGUt bWFwKQotICAoZWFzeS1tZW51LWFkZCBDdXN0b20tbW9kZS1tZW51KQogICAoc2V0cS1sb2NhbCB0 b29sLWJhci1tYXAKIAkgICAgICAob3IgY3VzdG9tLXRvb2wtYmFyLW1hcAogCQkgIDs7IFNldCB1 cCBgY3VzdG9tLXRvb2wtYmFyLW1hcCcuCmRpZmYgLS1naXQgYS9saXNwL2VtYWNzLWxpc3AvZWFz eW1lbnUuZWwgYi9saXNwL2VtYWNzLWxpc3AvZWFzeW1lbnUuZWwKaW5kZXggNzNkYWJlZjNmYS4u NzA2ODk4MDkxOSAxMDA2NDQKLS0tIGEvbGlzcC9lbWFjcy1saXNwL2Vhc3ltZW51LmVsCisrKyBi L2xpc3AvZW1hY3MtbGlzcC9lYXN5bWVudS5lbApAQCAtNDg4LDE3ICs0ODgsMTQgQEAgZWFzeS1t ZW51LWNoYW5nZQogYG1lbnUtYmFyLXVwZGF0ZS1ob29rJyBvciB1c2UgYSBtZW51IGZpbHRlci4i CiAgIChlYXN5LW1lbnUtYWRkLWl0ZW0gbWFwIHBhdGggKGVhc3ktbWVudS1jcmVhdGUtbWVudSBu YW1lIGl0ZW1zKSBiZWZvcmUpKQogCi07OyBYRW1hY3MgbmVlZHMgdGhlIGZvbGxvd2luZyB0d28g ZnVuY3Rpb25zIHRvIGFkZCBhbmQgcmVtb3ZlIG1lbnVzLgotOzsgSW4gRW1hY3MgdGhpcyBpcyBk b25lIGF1dG9tYXRpY2FsbHkgd2hlbiBzd2l0Y2hpbmcga2V5bWFwcywgc28KLTs7IGhlcmUgZWFz eS1tZW51LXJlbW92ZSBhbmQgZWFzeS1tZW51LWFkZCBhcmUgYSBub29wcy4KLShkZWZhbGlhcyAn ZWFzeS1tZW51LXJlbW92ZSAnaWdub3JlCisoZGVmaW5lLW9ic29sZXRlLWZ1bmN0aW9uLWFsaWFz ICdlYXN5LW1lbnUtcmVtb3ZlICMnaWdub3JlICIyOC4xIgogICAiUmVtb3ZlIE1FTlUgZnJvbSB0 aGUgY3VycmVudCBtZW51IGJhci4KIENvbnRyYXJ5IHRvIFhFbWFjcywgdGhpcyBpcyBhIG5vcCBv biBFbWFjcyBzaW5jZSBtZW51cyBhcmUgYXV0b21hdGljYWxseQogXChkZSlhY3RpdmF0ZWQgd2hl biB0aGUgY29ycmVzcG9uZGluZyBrZXltYXAgaXMgKGRlKWFjdGl2YXRlZC4KIAogXChmbiBNRU5V KSIpCiAKLShkZWZhbGlhcyAnZWFzeS1tZW51LWFkZCAjJ2lnbm9yZQorKGRlZmluZS1vYnNvbGV0 ZS1mdW5jdGlvbi1hbGlhcyAnZWFzeS1tZW51LWFkZCAjJ2lnbm9yZSAiMjguMSIKICAgIkFkZCB0 aGUgbWVudSB0byB0aGUgbWVudWJhci4KIE9uIEVtYWNzIHRoaXMgaXMgYSBub3AsIGJlY2F1c2Ug bWVudXMgYXJlIGFscmVhZHkgYXV0b21hdGljYWxseQogYWN0aXZhdGVkIHdoZW4gdGhlIGNvcnJl c3BvbmRpbmcga2V5bWFwIGlzIGFjdGl2YXRlZC4gIE9uIFhFbWFjcwpkaWZmIC0tZ2l0IGEvbGlz cC9lcmMvZXJjLW1lbnUuZWwgYi9saXNwL2VyYy9lcmMtbWVudS5lbAppbmRleCA5YzAyODk5MDU3 Li5iMzZhMWNiOGZhIDEwMDY0NAotLS0gYS9saXNwL2VyYy9lcmMtbWVudS5lbAorKysgYi9saXNw L2VyYy9lcmMtbWVudS5lbApAQCAtMTE0LDIyICsxMTQsMTkgQEAgbWVudQogICAgICA7OyBtYWtl IHN1cmUgdGhlIG1lbnUgb25seSBnZXRzIGRlZmluZWQgb25jZSwgc2luY2UgRW1hY3MgMjIKICAg ICAgOzsgYWN0aXZhdGVzIGl0IGltbWVkaWF0ZWx5CiAgICAgIChlYXN5LW1lbnUtZGVmaW5lIGVy Yy1tZW51IGVyYy1tb2RlLW1hcCAiRVJDIG1lbnUiIGVyYy1tZW51LWRlZmluaXRpb24pCi0gICAg IChzZXRxIGVyYy1tZW51LWRlZmluZWQgdCkpCi0gICAoZXJjLW1lbnUtYWRkKSkKLSAgKChlcmMt bWVudS1yZW1vdmUpCi0gICA7OyBgZWFzeS1tZW51LXJlbW92ZScgaXMgYSBuby1vcCBpbiBFbWFj cyAyMgorICAgICAoc2V0cSBlcmMtbWVudS1kZWZpbmVkIHQpKSkKKyAgKDs7IGBlYXN5LW1lbnUt cmVtb3ZlJyBpcyBhIG5vLW9wIGluIEVtYWNzIDIyCiAgICAobWVzc2FnZSAiWW91IG1pZ2h0IGhh dmUgdG8gcmVzdGFydCBFbWFjcyB0byByZW1vdmUgdGhlIEVSQyBtZW51IikpKQogCi07OyBzaWxl bmNlIGJ5dGUtY29tcGlsZXIgd2FybmluZwotKGRlZnZhciBlcmMtbWVudSkKLQogKGRlZnVuIGVy Yy1tZW51LWFkZCAoKQogICAiQWRkIHRoZSBFUkMgbWVudSB0byB0aGUgY3VycmVudCBidWZmZXIu IgotICAoZWFzeS1tZW51LWFkZCBlcmMtbWVudSBlcmMtbW9kZS1tYXApKQorICAoZGVjbGFyZSAo b2Jzb2xldGUgbmlsICIyOC4xIikpCisgIG5pbCkKIAogKGRlZnVuIGVyYy1tZW51LXJlbW92ZSAo KQogICAiUmVtb3ZlIHRoZSBFUkMgbWVudSBmcm9tIHRoZSBjdXJyZW50IGJ1ZmZlci4iCi0gIChl YXN5LW1lbnUtcmVtb3ZlIGVyYy1tZW51KSkKKyAgKGRlY2xhcmUgKG9ic29sZXRlIG5pbCAiMjgu MSIpKQorICBuaWwpCiAKIChwcm92aWRlICdlcmMtbWVudSkKIApkaWZmIC0tZ2l0IGEvbGlzcC9n bnVzL2dudXMtYXJ0LmVsIGIvbGlzcC9nbnVzL2dudXMtYXJ0LmVsCmluZGV4IDhmNGNhN2ViM2Iu LjdmNTk0YzljMzYgMTAwNjQ0Ci0tLSBhL2xpc3AvZ251cy9nbnVzLWFydC5lbAorKysgYi9saXNw L2dudXMvZ251cy1hcnQuZWwKQEAgLTcyNTEsNyArNzI1MSw2IEBAIGdudXMtYXJ0aWNsZS1lZGl0 LW1vZGUKICAgICAgICAnKG1lc3NhZ2UtZm9udC1sb2NrLWtleXdvcmRzIHQpKQogICAoc2V0ICht YWtlLWxvY2FsLXZhcmlhYmxlICdtYWlsLWhlYWRlci1zZXBhcmF0b3IpICIiKQogICAoc2V0ICht YWtlLWxvY2FsLXZhcmlhYmxlICdnbnVzLWFydGljbGUtZWRpdC1tb2RlKSB0KQotICAoZWFzeS1t ZW51LWFkZCBtZXNzYWdlLW1vZGUtZmllbGQtbWVudSBtZXNzYWdlLW1vZGUtbWFwKQogICAobW1s LW1vZGUpCiAgIChzZXRxIGJ1ZmZlci1yZWFkLW9ubHkgbmlsKQogICAoYnVmZmVyLWVuYWJsZS11 bmRvKQpkaWZmIC0tZ2l0IGEvbGlzcC9nbnVzL21lc3NhZ2UuZWwgYi9saXNwL2dudXMvbWVzc2Fn ZS5lbAppbmRleCAwNzgyNzc4ZmQ0Li5mOTgxMWJhYTY5IDEwMDY0NAotLS0gYS9saXNwL2dudXMv bWVzc2FnZS5lbAorKysgYi9saXNwL2dudXMvbWVzc2FnZS5lbApAQCAtMzEwOSw4ICszMTA5LDYg QEAgbWVzc2FnZS1tb2RlCiAgICAgICAgJyhtZXNzYWdlLWZvbnQtbG9jay1rZXl3b3JkcyB0KSkK ICAgKGlmIChib3VuZHAgJ3Rvb2wtYmFyLW1hcCkKICAgICAgIChzZXQgKG1ha2UtbG9jYWwtdmFy aWFibGUgJ3Rvb2wtYmFyLW1hcCkgKG1lc3NhZ2UtbWFrZS10b29sLWJhcikpKQotICAoZWFzeS1t ZW51LWFkZCBtZXNzYWdlLW1vZGUtbWVudSBtZXNzYWdlLW1vZGUtbWFwKQotICAoZWFzeS1tZW51 LWFkZCBtZXNzYWdlLW1vZGUtZmllbGQtbWVudSBtZXNzYWdlLW1vZGUtbWFwKQogICA7OyBNbW1t Li4uIEZvcmJpZGRlbiBwcm9wZXJ0aWVzLi4uCiAgIChhZGQtaG9vayAnYWZ0ZXItY2hhbmdlLWZ1 bmN0aW9ucyAjJ21lc3NhZ2Utc3RyaXAtZm9yYmlkZGVuLXByb3BlcnRpZXMKIAkgICAgbmlsICds b2NhbCkKZGlmZiAtLWdpdCBhL2xpc3AvbWgtZS9taC1mb2xkZXIuZWwgYi9saXNwL21oLWUvbWgt Zm9sZGVyLmVsCmluZGV4IDBhNzNmZjQ1YzIuLjBmYjVlYmYxZjcgMTAwNjQ0Ci0tLSBhL2xpc3Av bWgtZS9taC1mb2xkZXIuZWwKKysrIGIvbGlzcC9taC1lL21oLWZvbGRlci5lbApAQCAtNjU2LDkg KzY1NiwxMCBAQCBtaC1mb2xkZXItbW9kZQogICAobWgtZnVuY2FsbC1pZi1leGlzdHMgaGwtbGlu ZS1tb2RlIDEpCiAgIChzZXRxIHJldmVydC1idWZmZXItZnVuY3Rpb24gJ21oLXVuZG8tZm9sZGVy KQogICAoYWRkLXRvLWxpc3QgJ21pbm9yLW1vZGUtYWxpc3QgJyhtaC1zaG93aW5nLW1vZGUgIiBT aG93IikpCi0gIChlYXN5LW1lbnUtYWRkIG1oLWZvbGRlci1zZXF1ZW5jZS1tZW51KQotICAoZWFz eS1tZW51LWFkZCBtaC1mb2xkZXItbWVzc2FnZS1tZW51KQotICAoZWFzeS1tZW51LWFkZCBtaC1m b2xkZXItZm9sZGVyLW1lbnUpCisgIChtaC1kby1pbi14ZW1hY3MKKyAgICAoZWFzeS1tZW51LWFk ZCBtaC1mb2xkZXItc2VxdWVuY2UtbWVudSkKKyAgICAoZWFzeS1tZW51LWFkZCBtaC1mb2xkZXIt bWVzc2FnZS1tZW51KQorICAgIChlYXN5LW1lbnUtYWRkIG1oLWZvbGRlci1mb2xkZXItbWVudSkp CiAgIChtaC1pbmMtc3Bvb2wtbWFrZSkKICAgKG1oLXNldC1oZWxwIG1oLWZvbGRlci1tb2RlLWhl bHAtbWVzc2FnZXMpCiAgIChpZiAoYW5kIChmZWF0dXJlcCAneGVtYWNzKQpkaWZmIC0tZ2l0IGEv bGlzcC9taC1lL21oLWlkZW50aXR5LmVsIGIvbGlzcC9taC1lL21oLWlkZW50aXR5LmVsCmluZGV4 IGVkMjM5OTYzMzkuLjIzZmE4N2RlODIgMTAwNjQ0Ci0tLSBhL2xpc3AvbWgtZS9taC1pZGVudGl0 eS5lbAorKysgYi9saXNwL21oLWUvbWgtaWRlbnRpdHkuZWwKQEAgLTkxLDcgKzkxLDcgQEAgbWgt aWRlbnRpdHktYWRkLW1lbnUKICAgIkFkZCB0aGUgY3VycmVudCBJZGVudGl0eSBtZW51LgogU2Vl IGBtaC1pZGVudGl0eS1tYWtlLW1lbnUnLiIKICAgKGlmIG1oLWlkZW50aXR5LW1lbnUKLSAgICAg IChlYXN5LW1lbnUtYWRkIG1oLWlkZW50aXR5LW1lbnUpKSkKKyAgICAgIChtaC1kby1pbi14ZW1h Y3MgKGVhc3ktbWVudS1hZGQgbWgtaWRlbnRpdHktbWVudSkpKSkKIAogKGRlZnZhciBtaC1pZGVu dGl0eS1sb2NhbCBuaWwKICAgIkJ1ZmZlci1sb2NhbCB2YXJpYWJsZSB0aGF0IGhvbGRzIHRoZSBp ZGVudGl0eSBjdXJyZW50bHkgaW4gdXNlLiIpCmRpZmYgLS1naXQgYS9saXNwL21oLWUvbWgtbGV0 dGVyLmVsIGIvbGlzcC9taC1lL21oLWxldHRlci5lbAppbmRleCA1ZTFjZTQwMzE4Li5iOGFjYTc3 ZGRjIDEwMDY0NAotLS0gYS9saXNwL21oLWUvbWgtbGV0dGVyLmVsCisrKyBiL2xpc3AvbWgtZS9t aC1sZXR0ZXIuZWwKQEAgLTMzMCw3ICszMzAsNyBAQCBtaC1sZXR0ZXItbW9kZQogICAgKHQKICAg ICA7OyAuLi5vciB0aGUgaGVhZGVyIG9ubHkKICAgICAoc2V0cSBmb250LWxvY2stZGVmYXVsdHMg JygobWgtc2hvdy1mb250LWxvY2sta2V5d29yZHMpIHQpKSkpCi0gIChlYXN5LW1lbnUtYWRkIG1o LWxldHRlci1tZW51KQorICAobWgtZG8taW4teGVtYWNzIChlYXN5LW1lbnUtYWRkIG1oLWxldHRl ci1tZW51KSkKICAgOzsgTWF5YmUgd2Ugd2FudCB0byB1c2UgdGhlIGV4aXN0aW5nIE1haWwgbWVu dSBmcm9tIG1haWwtbW9kZSBpbgogICA7OyA5LjA7IGluIHRoZSBtZWFuIHRpbWUsIGxldCdzIHJl bW92ZSBpdCBzaW5jZSB0aGUgcmVkdW5kYW5jeSB3aWxsCiAgIDs7IG9ubHkgcHJvZHVjZSBjb25m dXNpb24uCmRpZmYgLS1naXQgYS9saXNwL21oLWUvbWgtc2VhcmNoLmVsIGIvbGlzcC9taC1lL21o LXNlYXJjaC5lbAppbmRleCA2ZmI3NmJlZmYyLi41Y2ZlNjc4NjVlIDEwMDY0NAotLS0gYS9saXNw L21oLWUvbWgtc2VhcmNoLmVsCisrKyBiL2xpc3AvbWgtZS9taC1zZWFyY2guZWwKQEAgLTYxOCw3 ICs2MTgsNyBAQCBtaC1zZWFyY2gtbW9kZQogCiBcXHttaC1zZWFyY2gtbW9kZS1tYXB9IgogCi0g IChlYXN5LW1lbnUtYWRkIG1oLXBpY2stbWVudSkKKyAgKG1oLWRvLWluLXhlbWFjcyAoZWFzeS1t ZW51LWFkZCBtaC1waWNrLW1lbnUpKQogICAobWgtc2V0LWhlbHAgbWgtc2VhcmNoLW1vZGUtaGVs cC1tZXNzYWdlcykpCiAKIAwKZGlmZiAtLWdpdCBhL2xpc3AvbWgtZS9taC1zaG93LmVsIGIvbGlz cC9taC1lL21oLXNob3cuZWwKaW5kZXggNzUzNmY5NDllNy4uNDhmZjc0MTMxZCAxMDA2NDQKLS0t IGEvbGlzcC9taC1lL21oLXNob3cuZWwKKysrIGIvbGlzcC9taC1lL21oLXNob3cuZWwKQEAgLTg2 Myw5ICs4NjMsMTAgQEAgbWgtc2hvdy1tb2RlCiAgICh3aGVuIG1oLWRlY29kZS1taW1lLWZsYWcK ICAgICAobWgtbWFrZS1sb2NhbC1ob29rICdraWxsLWJ1ZmZlci1ob29rKQogICAgIChhZGQtaG9v ayAna2lsbC1idWZmZXItaG9vayAnbWgtbWltZS1jbGVhbnVwIG5pbCB0KSkKLSAgKGVhc3ktbWVu dS1hZGQgbWgtc2hvdy1zZXF1ZW5jZS1tZW51KQotICAoZWFzeS1tZW51LWFkZCBtaC1zaG93LW1l c3NhZ2UtbWVudSkKLSAgKGVhc3ktbWVudS1hZGQgbWgtc2hvdy1mb2xkZXItbWVudSkKKyAgKG1o LWRvLWluLXhlbWFjcworICAgIChlYXN5LW1lbnUtYWRkIG1oLXNob3ctc2VxdWVuY2UtbWVudSkK KyAgICAoZWFzeS1tZW51LWFkZCBtaC1zaG93LW1lc3NhZ2UtbWVudSkKKyAgICAoZWFzeS1tZW51 LWFkZCBtaC1zaG93LWZvbGRlci1tZW51KSkKICAgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ21oLXNo b3ctZm9sZGVyLWJ1ZmZlcikKICAgKGJ1ZmZlci1kaXNhYmxlLXVuZG8pCiAgICh1c2UtbG9jYWwt bWFwIG1oLXNob3ctbW9kZS1tYXApKQpkaWZmIC0tZ2l0IGEvbGlzcC9uZXQvc2lldmUuZWwgYi9s aXNwL25ldC9zaWV2ZS5lbAppbmRleCAwODM2N2M2OThmLi43NWJiNGUyNDJlIDEwMDY0NAotLS0g YS9saXNwL25ldC9zaWV2ZS5lbAorKysgYi9saXNwL25ldC9zaWV2ZS5lbApAQCAtMTQzLDggKzE0 Myw3IEBAIHNpZXZlLW1hbmFnZS1tb2RlLW1lbnUKIChkZWZpbmUtZGVyaXZlZC1tb2RlIHNpZXZl LW1hbmFnZS1tb2RlIHNwZWNpYWwtbW9kZSAiU2lldmUtbWFuYWdlIgogICAiTW9kZSB1c2VkIGZv ciBzaWV2ZSBzY3JpcHQgbWFuYWdlbWVudC4iCiAgIChidWZmZXItZGlzYWJsZS11bmRvIChjdXJy ZW50LWJ1ZmZlcikpCi0gIChzZXRxIHRydW5jYXRlLWxpbmVzIHQpCi0gIChlYXN5LW1lbnUtYWRk IHNpZXZlLW1hbmFnZS1tb2RlLW1lbnUgc2lldmUtbWFuYWdlLW1vZGUtbWFwKSkKKyAgKHNldHEg dHJ1bmNhdGUtbGluZXMgdCkpCiAKIDs7IENvbW1hbmRzIHVzZWQgaW4gc2lldmUtbWFuYWdlIG1v ZGU6CiAKZGlmZiAtLWdpdCBhL2xpc3Avb2Jzb2xldGUvb3RvZG8tbW9kZS5lbCBiL2xpc3Avb2Jz b2xldGUvb3RvZG8tbW9kZS5lbAppbmRleCAyYTRhZjI5MGI2Li42YWFkYTA3NTVlIDEwMDY0NAot LS0gYS9saXNwL29ic29sZXRlL290b2RvLW1vZGUuZWwKKysrIGIvbGlzcC9vYnNvbGV0ZS9vdG9k by1tb2RlLmVsCkBAIC05MjMsNyArOTIzLDggQEAgdG9kby1tZW51CiA7OzsjIyNhdXRvbG9hZAog KGRlZmluZS1kZXJpdmVkLW1vZGUgdG9kby1tb2RlIG5pbCAiVE9ETyIKICAgIk1ham9yIG1vZGUg Zm9yIGVkaXRpbmcgVE9ETyBsaXN0cy4iCi0gIChlYXN5LW1lbnUtYWRkIHRvZG8tbWVudSkpCisg ICh3aGVuIChmZWF0dXJlcCAneGVtYWNzKQorICAgIChlYXN5LW1lbnUtYWRkIHRvZG8tbWVudSkp KQogCiAod2l0aC1zdXBwcmVzc2VkLXdhcm5pbmdzICgobGV4aWNhbCBkYXRlIGVudHJ5KSkKICAg KGRlZnZhciBkYXRlKQpkaWZmIC0tZ2l0IGEvbGlzcC9vcmcvb3JnLWFnZW5kYS5lbCBiL2xpc3Av b3JnL29yZy1hZ2VuZGEuZWwKaW5kZXggNjg5ZDEzNDYyNy4uODJiZjFiMjNmOSAxMDA2NDQKLS0t IGEvbGlzcC9vcmcvb3JnLWFnZW5kYS5lbAorKysgYi9saXNwL29yZy9vcmctYWdlbmRhLmVsCkBA IC0yMjM2LDcgKzIyMzYsNiBAQCBvcmctYWdlbmRhLW1vZGUKICAgKHNldHEgbW9kZS1uYW1lICJP cmctQWdlbmRhIikKICAgKHNldHEgaW5kZW50LXRhYnMtbW9kZSBuaWwpCiAgICh1c2UtbG9jYWwt bWFwIG9yZy1hZ2VuZGEtbW9kZS1tYXApCi0gIChlYXN5LW1lbnUtYWRkIG9yZy1hZ2VuZGEtbWVu dSkKICAgKHdoZW4gb3JnLXN0YXJ0dXAtdHJ1bmNhdGVkIChzZXRxIHRydW5jYXRlLWxpbmVzIHQp KQogICAoc2V0cS1sb2NhbCBsaW5lLW1vdmUtdmlzdWFsIG5pbCkKICAgKGFkZC1ob29rICdwb3N0 LWNvbW1hbmQtaG9vayAnb3JnLWFnZW5kYS11cGRhdGUtYWdlbmRhLXR5cGUgbmlsICdsb2NhbCkK ZGlmZiAtLWdpdCBhL2xpc3Avb3JnL29yZy10YWJsZS5lbCBiL2xpc3Avb3JnL29yZy10YWJsZS5l bAppbmRleCA1YzM3Y2IxYWY1Li40NjM2YmFhZTczIDEwMDY0NAotLS0gYS9saXNwL29yZy9vcmct dGFibGUuZWwKKysrIGIvbGlzcC9vcmcvb3JnLXRhYmxlLmVsCkBAIC0zMjg3LDcgKzMyODcsNiBA QCBvcmctdGFibGUtZWRpdC1mb3JtdWxhcwogICAgICAgKHNldHEtbG9jYWwgb3JnLXNlbGVjdGVk LXdpbmRvdyBzZWwtd2luKQogICAgICAgKHVzZS1sb2NhbC1tYXAgb3JnLXRhYmxlLWZlZGl0LW1h cCkKICAgICAgIChhZGQtaG9vayAncG9zdC1jb21tYW5kLWhvb2sgIydvcmctdGFibGUtZmVkaXQt cG9zdC1jb21tYW5kIHQgdCkKLSAgICAgIChlYXN5LW1lbnUtYWRkIG9yZy10YWJsZS1mZWRpdC1t ZW51KQogICAgICAgKHNldHEgc3RhcnRsaW5lIChvcmctY3VycmVudC1saW5lKSkKICAgICAgIChk b2xpc3QgKGVudHJ5IGVxbCkKIAkobGV0KiAoKHR5cGUgKGNvbmQKQEAgLTUxMjksMTUgKzUxMjgs MTMgQEAgb3JndGJsLW1vZGUKIAkJICBvcmd0YmwtbGluZS1zdGFydC1yZWdleHApKQogICAgICh3 aGVuIChmYm91bmRwICdmb250LWxvY2stYWRkLWtleXdvcmRzKQogICAgICAgKGZvbnQtbG9jay1h ZGQta2V5d29yZHMgbmlsIG9yZ3RibC1leHRyYS1mb250LWxvY2sta2V5d29yZHMpCi0gICAgICAo b3JnLXJlc3RhcnQtZm9udC1sb2NrKSkKLSAgICAoZWFzeS1tZW51LWFkZCBvcmd0YmwtbW9kZS1t ZW51KSkKKyAgICAgIChvcmctcmVzdGFydC1mb250LWxvY2spKSkKICAgICh0CiAgICAgKHNldHEg YXV0by1maWxsLWluaGliaXQtcmVnZXhwIG9yZy1vbGQtYXV0by1maWxsLWluaGliaXQtcmVnZXhw KQogICAgIChyZW1vdmUtaG9vayAnYmVmb3JlLWNoYW5nZS1mdW5jdGlvbnMgJ29yZy1iZWZvcmUt Y2hhbmdlLWZ1bmN0aW9uIHQpCiAgICAgKHdoZW4gKGZib3VuZHAgJ2ZvbnQtbG9jay1yZW1vdmUt a2V5d29yZHMpCiAgICAgICAoZm9udC1sb2NrLXJlbW92ZS1rZXl3b3JkcyBuaWwgb3JndGJsLWV4 dHJhLWZvbnQtbG9jay1rZXl3b3JkcykKICAgICAgIChvcmctcmVzdGFydC1mb250LWxvY2spKQot ICAgIChlYXN5LW1lbnUtcmVtb3ZlIG9yZ3RibC1tb2RlLW1lbnUpCiAgICAgKGZvcmNlLW1vZGUt bGluZS11cGRhdGUgJ2FsbCkpKSkKIAogKGRlZnVuIG9yZ3RibC1tYWtlLWJpbmRpbmcgKGZ1biBu ICZyZXN0IGtleXMpCmRpZmYgLS1naXQgYS9saXNwL29yZy9vcmcuZWwgYi9saXNwL29yZy9vcmcu ZWwKaW5kZXggMWFiOGFiNjg4OC4uOWE3MmI3NGQyMyAxMDA2NDQKLS0tIGEvbGlzcC9vcmcvb3Jn LmVsCisrKyBiL2xpc3Avb3JnL29yZy5lbApAQCAtNDc5MSw3ICs0NzkxLDYgQEAgYnVmZmVyLWZh Y2UtbW9kZS1mYWNlCiAocmVxdWlyZSAndGltZS1kYXRlKQogKHVubGVzcyAoZmJvdW5kcCAndGlt ZS1zdWJ0cmFjdCkgKGRlZmFsaWFzICd0aW1lLXN1YnRyYWN0ICdzdWJ0cmFjdC10aW1lKSkKIChy ZXF1aXJlICdlYXN5bWVudSkKLShhdXRvbG9hZCAnZWFzeS1tZW51LWFkZCAiZWFzeW1lbnUiKQog KHJlcXVpcmUgJ292ZXJsYXkpCiAKIDs7IChyZXF1aXJlICdvcmctbWFjcykgbW92ZWQgaGlnaGVy IHVwIGluIHRoZSBmaWxlIGJlZm9yZSBpdCBpcyBmaXJzdCB1c2VkCmRpZmYgLS1naXQgYS9saXNw L3Byb2dtb2Rlcy9hbnRsci1tb2RlLmVsIGIvbGlzcC9wcm9nbW9kZXMvYW50bHItbW9kZS5lbApp bmRleCA5ZGFjZDU4NTZjLi5kYzcyN2FhMzc1IDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9h bnRsci1tb2RlLmVsCisrKyBiL2xpc3AvcHJvZ21vZGVzL2FudGxyLW1vZGUuZWwKQEAgLTI1OTIs NyArMjU5Miw4IEBAIGFudGxyLW1vZGUKIAljb21tZW50LXN0YXJ0LXNraXAgIi9cXCorICpcXHwv LyAqIikKICAgOzsgdmFyaW91cyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAoc2V0IChtYWtlLWxvY2FsLXZhcmlhYmxl ICdmb250LWxvY2stZGVmYXVsdHMpIGFudGxyLWZvbnQtbG9jay1kZWZhdWx0cykKLSAgKGVhc3kt bWVudS1hZGQgYW50bHItbW9kZS1tZW51KQorICAod2hlbiAoZmVhdHVyZXAgJ3hlbWFjcykKKyAg ICAoZWFzeS1tZW51LWFkZCBhbnRsci1tb2RlLW1lbnUpKQogICAoc2V0IChtYWtlLWxvY2FsLXZh cmlhYmxlICdpbWVudS1jcmVhdGUtaW5kZXgtZnVuY3Rpb24pCiAgICAgICAgJ2FudGxyLWltZW51 LWNyZWF0ZS1pbmRleC1mdW5jdGlvbikKICAgKHNldCAobWFrZS1sb2NhbC12YXJpYWJsZSAnaW1l bnUtZ2VuZXJpYy1leHByZXNzaW9uKSB0KSA7IGZvb2wgc3R1cGlkIHRlc3QKZGlmZiAtLWdpdCBh L2xpc3AvcHJvZ21vZGVzL2NjLW1vZGUuZWwgYi9saXNwL3Byb2dtb2Rlcy9jYy1tb2RlLmVsCmlu ZGV4IGM1MjAxZDFhZjUuLjVlOGNmNjE2MWUgMTAwNjQ0Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL2Nj LW1vZGUuZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvY2MtbW9kZS5lbApAQCAtMjU5Nyw3ICsyNTk3 LDggQEAgYy1tb2RlCiAgIChzZXRxIGFiYnJldi1tb2RlIHQpCiAgIChjLWluaXQtbGFuZ3VhZ2Ut dmFycy1mb3IgJ2MtbW9kZSkKICAgKGMtY29tbW9uLWluaXQgJ2MtbW9kZSkKLSAgKGVhc3ktbWVu dS1hZGQgYy1jLW1lbnUpCisgICh3aGVuIChmZWF0dXJlcCAneGVtYWNzKQorICAgIChlYXN5LW1l bnUtYWRkIGMtYy1tZW51KSkKICAgKGNjLWltZW51LWluaXQgY2MtaW1lbnUtYy1nZW5lcmljLWV4 cHJlc3Npb24pCiAgIChhZGQtaG9vayAnZmx5bWFrZS1kaWFnbm9zdGljLWZ1bmN0aW9ucyAnZmx5 bWFrZS1jYyBuaWwgdCkKICAgKGMtcnVuLW1vZGUtaG9va3MgJ2MtbW9kZS1jb21tb24taG9vaykp CkBAIC0yNjg4LDcgKzI2ODksOCBAQCBjKystbW9kZQogICAoc2V0cSBhYmJyZXYtbW9kZSB0KQog ICAoYy1pbml0LWxhbmd1YWdlLXZhcnMtZm9yICdjKystbW9kZSkKICAgKGMtY29tbW9uLWluaXQg J2MrKy1tb2RlKQotICAoZWFzeS1tZW51LWFkZCBjLWMrKy1tZW51KQorICAod2hlbiAoZmVhdHVy ZXAgJ3hlbWFjcykKKyAgICAoZWFzeS1tZW51LWFkZCBjLWMrKy1tZW51KSkKICAgKGNjLWltZW51 LWluaXQgY2MtaW1lbnUtYysrLWdlbmVyaWMtZXhwcmVzc2lvbikKICAgKGFkZC1ob29rICdmbHlt YWtlLWRpYWdub3N0aWMtZnVuY3Rpb25zICdmbHltYWtlLWNjIG5pbCB0KQogICAoYy1ydW4tbW9k ZS1ob29rcyAnYy1tb2RlLWNvbW1vbi1ob29rKSkKQEAgLTI3MzUsNyArMjczNyw4IEBAIG9iamMt bW9kZQogICAoc2V0cSBhYmJyZXYtbW9kZSB0KQogICAoYy1pbml0LWxhbmd1YWdlLXZhcnMtZm9y ICdvYmpjLW1vZGUpCiAgIChjLWNvbW1vbi1pbml0ICdvYmpjLW1vZGUpCi0gIChlYXN5LW1lbnUt YWRkIGMtb2JqYy1tZW51KQorICAod2hlbiAoZmVhdHVyZXAgJ3hlbWFjcykKKyAgICAoZWFzeS1t ZW51LWFkZCBjLW9iamMtbWVudSkpCiAgIChjYy1pbWVudS1pbml0IG5pbCAnY2MtaW1lbnUtb2Jq Yy1mdW5jdGlvbikKICAgKGMtcnVuLW1vZGUtaG9va3MgJ2MtbW9kZS1jb21tb24taG9vaykpCiAK QEAgLTI3ODUsNyArMjc4OCw4IEBAIGphdmEtbW9kZQogICAoc2V0cSBhYmJyZXYtbW9kZSB0KQog ICAoYy1pbml0LWxhbmd1YWdlLXZhcnMtZm9yICdqYXZhLW1vZGUpCiAgIChjLWNvbW1vbi1pbml0 ICdqYXZhLW1vZGUpCi0gIChlYXN5LW1lbnUtYWRkIGMtamF2YS1tZW51KQorICAod2hlbiAoZmVh dHVyZXAgJ3hlbWFjcykKKyAgICAoZWFzeS1tZW51LWFkZCBjLWphdmEtbWVudSkpCiAgIChjYy1p bWVudS1pbml0IGNjLWltZW51LWphdmEtZ2VuZXJpYy1leHByZXNzaW9uKQogICAoYy1ydW4tbW9k ZS1ob29rcyAnYy1tb2RlLWNvbW1vbi1ob29rKSkKIApAQCAtMjgyNyw3ICsyODMxLDggQEAgaWRs LW1vZGUKICAgKGMtaW5pdGlhbGl6ZS1jYy1tb2RlIHQpCiAgIChjLWluaXQtbGFuZ3VhZ2UtdmFy cy1mb3IgJ2lkbC1tb2RlKQogICAoYy1jb21tb24taW5pdCAnaWRsLW1vZGUpCi0gIChlYXN5LW1l bnUtYWRkIGMtaWRsLW1lbnUpCisgICh3aGVuIChmZWF0dXJlcCAneGVtYWNzKQorICAgIChlYXN5 LW1lbnUtYWRkIGMtaWRsLW1lbnUpKQogICA7OyhjYy1pbWVudS1pbml0IGNjLWltZW51LWlkbC1n ZW5lcmljLWV4cHJlc3Npb24pIDtUT0RPCiAgIChjLXJ1bi1tb2RlLWhvb2tzICdjLW1vZGUtY29t bW9uLWhvb2spKQogCkBAIC0yODcyLDcgKzI4NzcsOCBAQCBwaWtlLW1vZGUKICAgKHNldHEJYWJi cmV2LW1vZGUgdCkKICAgKGMtaW5pdC1sYW5ndWFnZS12YXJzLWZvciAncGlrZS1tb2RlKQogICAo Yy1jb21tb24taW5pdCAncGlrZS1tb2RlKQotICAoZWFzeS1tZW51LWFkZCBjLXBpa2UtbWVudSkK KyAgKHdoZW4gKGZlYXR1cmVwICd4ZW1hY3MpCisgICAgKGVhc3ktbWVudS1hZGQgYy1waWtlLW1l bnUpKQogICA7OyhjYy1pbWVudS1pbml0IGNjLWltZW51LXBpa2UtZ2VuZXJpYy1leHByZXNzaW9u KSA7VE9ETwogICAoYy1ydW4tbW9kZS1ob29rcyAnYy1tb2RlLWNvbW1vbi1ob29rKSkKIApkaWZm IC0tZ2l0IGEvbGlzcC9wcm9nbW9kZXMvY3BlcmwtbW9kZS5lbCBiL2xpc3AvcHJvZ21vZGVzL2Nw ZXJsLW1vZGUuZWwKaW5kZXggMzYwNmY5YTM5NS4uNjU5YmM5M2M4ZSAxMDA2NDQKLS0tIGEvbGlz cC9wcm9nbW9kZXMvY3BlcmwtbW9kZS5lbAorKysgYi9saXNwL3Byb2dtb2Rlcy9jcGVybC1tb2Rl LmVsCkBAIC0xNzIwLDggKzE3MjAsNiBAQCBjcGVybC1tb2RlCiAgIChhbmQgKGJvdW5kcCAnbXNi LW1lbnUtY29uZCkKICAgICAgICAobm90IGNwZXJsLW1zYi1maXhlZCkKICAgICAgICAoY3Blcmwt bXNiLWZpeCkpCi0gIChpZiAoZmJvdW5kcCAnZWFzeS1tZW51LWFkZCkKLSAgICAgIChlYXN5LW1l bnUtYWRkIGNwZXJsLW1lbnUpKQk7IEEgTk9QIGluIEVtYWNzLgogICAoaWYgY3BlcmwtaG9vay1h ZnRlci1jaGFuZ2UKICAgICAgIChhZGQtaG9vayAnYWZ0ZXItY2hhbmdlLWZ1bmN0aW9ucyAjJ2Nw ZXJsLWFmdGVyLWNoYW5nZS1mdW5jdGlvbiBuaWwgdCkpCiAgIDs7IEFmdGVyIGhvb2tzIHNpbmNl IGZvbnRpZmljYXRpb24gd2lsbCBicmVhayB0aGlzCmRpZmYgLS1naXQgYS9saXNwL3Byb2dtb2Rl cy9oaWRlc2hvdy5lbCBiL2xpc3AvcHJvZ21vZGVzL2hpZGVzaG93LmVsCmluZGV4IDJhZDY2Y2Nj NWUuLjRkZWU3MmM3MzcgMTAwNjQ0Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL2hpZGVzaG93LmVsCisr KyBiL2xpc3AvcHJvZ21vZGVzL2hpZGVzaG93LmVsCkBAIC05NDgsNyArOTQ4LDYgQEAgaHMtbWlu b3ItbW9kZQogICAgICAgICAoYWRkLWhvb2sgJ2NoYW5nZS1tYWpvci1tb2RlLWhvb2sKICAgICAg ICAgICAgICAgICAgICMndHVybi1vZmYtaGlkZXNob3cKICAgICAgICAgICAgICAgICAgIG5pbCB0 KQotICAgICAgICAoZWFzeS1tZW51LWFkZCBocy1taW5vci1tb2RlLW1lbnUpCiAgICAgICAgIChz ZXQgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ2xpbmUtbW92ZS1pZ25vcmUtaW52aXNpYmxlKSB0KQog ICAgICAgICAoYWRkLXRvLWludmlzaWJpbGl0eS1zcGVjICcoaHMgLiB0KSkpCiAgICAgKHJlbW92 ZS1mcm9tLWludmlzaWJpbGl0eS1zcGVjICcoaHMgLiB0KSkKZGlmZiAtLWdpdCBhL2xpc3AvcHJv Z21vZGVzL2lkbHctaGVscC5lbCBiL2xpc3AvcHJvZ21vZGVzL2lkbHctaGVscC5lbAppbmRleCAy ZDRlYTQ2NWM0Li41MmM1MGM1MzE3IDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9pZGx3LWhl bHAuZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvaWRsdy1oZWxwLmVsCkBAIC0zMDYsNyArMzA2LDYg QEAgaWRsd2F2ZS1oZWxwLW1vZGUKIEhlcmUgYXJlIGFsbCBrZXliaW5kaW5ncy4KIFxce2lkbHdh dmUtaGVscC1tb2RlLW1hcH0iCiAgIChidWZmZXItZGlzYWJsZS11bmRvKQotICAoZWFzeS1tZW51 LWFkZCBpZGx3YXZlLWhlbHAtbWVudSBpZGx3YXZlLWhlbHAtbW9kZS1tYXApCiAgIChzZXRxIHRy dW5jYXRlLWxpbmVzIHQpCiAgIChzZXRxIGNhc2UtZm9sZC1zZWFyY2ggdCkKICAgKHNldHEgbW9k ZS1saW5lLWZvcm1hdApkaWZmIC0tZ2l0IGEvbGlzcC9wcm9nbW9kZXMvaWRsdy1zaGVsbC5lbCBi L2xpc3AvcHJvZ21vZGVzL2lkbHctc2hlbGwuZWwKaW5kZXggMzgxMjdmY2NiYy4uNmY3MTQ4MmE5 ZSAxMDA2NDQKLS0tIGEvbGlzcC9wcm9nbW9kZXMvaWRsdy1zaGVsbC5lbAorKysgYi9saXNwL3By b2dtb2Rlcy9pZGx3LXNoZWxsLmVsCkBAIC05NzMsNyArOTczLDYgQEAgaWRsd2F2ZS1zaGVsbC1t b2RlCiAJICAgIG5pbCAnbG9jYWwpCiAgIChhZGQtaG9vayAna2lsbC1idWZmZXItaG9vayAnaWRs d2F2ZS1zaGVsbC1kZWxldGUtdGVtcC1maWxlcyBuaWwgJ2xvY2FsKQogICAoYWRkLWhvb2sgJ2tp bGwtZW1hY3MtaG9vayAnaWRsd2F2ZS1zaGVsbC1kZWxldGUtdGVtcC1maWxlcykKLSAgKGVhc3kt bWVudS1hZGQgaWRsd2F2ZS1zaGVsbC1tb2RlLW1lbnUgaWRsd2F2ZS1zaGVsbC1tb2RlLW1hcCkK IAogICA7OyBTZXQgdGhlIG9wdGlvbmFsIGNvbWludCB2YXJpYWJsZXMKICAgKHdoZW4gaWRsd2F2 ZS1zaGVsbC1jb21pbnQtc2V0dGluZ3MKQEAgLTQzNjIsMTEgKzQzNjEsNyBAQCBpZGx3YXZlLXNo ZWxsLW1lbnUtZGVmCiAgICAgICAgaWRsd2F2ZS1zaGVsbC1tZW51LWRlZikKICAgICAgIChzYXZl LWN1cnJlbnQtYnVmZmVyCiAJKGRvbGlzdCAoYnVmIChidWZmZXItbGlzdCkpCi0gICAgICAgICAg KHNldC1idWZmZXIgYnVmKQotICAgICAgICAgIChpZiAoZGVyaXZlZC1tb2RlLXAgJ2lkbHdhdmUt bW9kZSkKLSAgICAgICAgICAgICAgKHByb2duCi0gICAgICAgICAgICAgICAgKGVhc3ktbWVudS1y ZW1vdmUgaWRsd2F2ZS1tb2RlLWRlYnVnLW1lbnUpCi0gICAgICAgICAgICAgICAgKGVhc3ktbWVu dS1hZGQgaWRsd2F2ZS1tb2RlLWRlYnVnLW1lbnUpKSkpKSkpCisgICAgICAgICAgKHNldC1idWZm ZXIgYnVmKSkpKSkKIAogOzsgVGhlIEJyZWFrcG9pbnQgR2x5cGggLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCmRpZmYgLS1naXQgYS9saXNw L3Byb2dtb2Rlcy9pZGx3YXZlLmVsIGIvbGlzcC9wcm9nbW9kZXMvaWRsd2F2ZS5lbAppbmRleCA4 NmY5ZjMzNjcyLi44YjczYmM1YjUzIDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9pZGx3YXZl LmVsCisrKyBiL2xpc3AvcHJvZ21vZGVzL2lkbHdhdmUuZWwKQEAgLTE4NzMsMTAgKzE4NzMsNiBA QCBpZGx3YXZlLW1vZGUKICAgKHNldCAobWFrZS1sb2NhbC12YXJpYWJsZSAnaW5kZW50LXRhYnMt bW9kZSkgbmlsKQogICAoc2V0IChtYWtlLWxvY2FsLXZhcmlhYmxlICdjb21wbGV0aW9uLWlnbm9y ZS1jYXNlKSB0KQogCi0gICh3aGVuIChmZWF0dXJlcCAnZWFzeW1lbnUpCi0gICAgKGVhc3ktbWVu dS1hZGQgaWRsd2F2ZS1tb2RlLW1lbnUgaWRsd2F2ZS1tb2RlLW1hcCkKLSAgICAoZWFzeS1tZW51 LWFkZCBpZGx3YXZlLW1vZGUtZGVidWctbWVudSBpZGx3YXZlLW1vZGUtbWFwKSkKLQogICAoc2V0 cSBhYmJyZXYtbW9kZSB0KQogCiAgIChzZXQgKG1ha2UtbG9jYWwtdmFyaWFibGUgaWRsd2F2ZS1m aWxsLWZ1bmN0aW9uKSAnaWRsd2F2ZS1hdXRvLWZpbGwpCmRpZmYgLS1naXQgYS9saXNwL3Byb2dt b2Rlcy9tZXRhLW1vZGUuZWwgYi9saXNwL3Byb2dtb2Rlcy9tZXRhLW1vZGUuZWwKaW5kZXggNGE1 ZDg3MmI3OS4uODdjMjBhMmVlMCAxMDA2NDQKLS0tIGEvbGlzcC9wcm9nbW9kZXMvbWV0YS1tb2Rl LmVsCisrKyBiL2xpc3AvcHJvZ21vZGVzL21ldGEtbW9kZS5lbApAQCAtOTQ2LDEwICs5NDYsNyBA QCBtZXRhLWNvbW1vbi1tb2RlCiAgIChzZXQgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ2ZvbnQtbG9j ay1kZWZhdWx0cykKICAgICAgICAnKG1ldGEtZm9udC1sb2NrLWtleXdvcmRzCiAgICAgICAgICBu aWwgbmlsICgoP18gLiAidyIpKSBuaWwKLSAgICAgICAgIChmb250LWxvY2stY29tbWVudC1zdGFy dC1yZWdleHAgLiAiJSIpKSkKLQotICA7OyBBY3RpdmF0ZSBzeW50YXggdGFibGUsIGtleW1hcCBh bmQgbWVudS4KLSAgKGVhc3ktbWVudS1hZGQgbWV0YS1tb2RlLW1lbnUpKQorICAgICAgICAgKGZv bnQtbG9jay1jb21tZW50LXN0YXJ0LXJlZ2V4cCAuICIlIikpKSkKIAogCiA7OzsjIyNhdXRvbG9h ZApkaWZmIC0tZ2l0IGEvbGlzcC9wcm9nbW9kZXMvb2N0YXZlLmVsIGIvbGlzcC9wcm9nbW9kZXMv b2N0YXZlLmVsCmluZGV4IDU1YTc4YzZjYzguLmMzMTNhZDExNzkgMTAwNjQ0Ci0tLSBhL2xpc3Av cHJvZ21vZGVzL29jdGF2ZS5lbAorKysgYi9saXNwL3Byb2dtb2Rlcy9vY3RhdmUuZWwKQEAgLTYx OSw5ICs2MTksNyBAQCBvY3RhdmUtbW9kZQogICAoYWRkLWhvb2sgJ2JlZm9yZS1zYXZlLWhvb2sg J29jdGF2ZS1zeW5jLWZ1bmN0aW9uLWZpbGUtbmFtZXMgbmlsIHQpCiAgIChzZXRxLWxvY2FsIGJl Z2lubmluZy1vZi1kZWZ1bi1mdW5jdGlvbiAnb2N0YXZlLWJlZ2lubmluZy1vZi1kZWZ1bikKICAg KGFuZCBvY3RhdmUtZm9udC1sb2NrLXRleGluZm8tY29tbWVudCAob2N0YXZlLWZvbnQtbG9jay10 ZXhpbmZvLWNvbW1lbnQpKQotICAoYWRkLWhvb2sgJ2VsZG9jLWRvY3VtZW50YXRpb24tZnVuY3Rp b25zICdvY3RhdmUtZWxkb2MtZnVuY3Rpb24gbmlsIHQpCi0KLSAgKGVhc3ktbWVudS1hZGQgb2N0 YXZlLW1vZGUtbWVudSkpCisgIChhZGQtaG9vayAnZWxkb2MtZG9jdW1lbnRhdGlvbi1mdW5jdGlv bnMgJ29jdGF2ZS1lbGRvYy1mdW5jdGlvbiBuaWwgdCkpCiAKIAwKIChkZWZjdXN0b20gaW5mZXJp b3Itb2N0YXZlLXByb2dyYW0gIm9jdGF2ZSIKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3By b2xvZy5lbCBiL2xpc3AvcHJvZ21vZGVzL3Byb2xvZy5lbAppbmRleCAxMjRmNjUyZWQ2Li4xODEy ZmUwN2ZkIDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9wcm9sb2cuZWwKKysrIGIvbGlzcC9w cm9nbW9kZXMvcHJvbG9nLmVsCkBAIC0xMjkzLDggKzEyOTMsNyBAQCBwcm9sb2ctaW5mZXJpb3It bW9kZQogICAoc2V0cS1sb2NhbCBzaGVsbC1kaXJzdGFjay1xdWVyeSAicHdkLiIpCiAgIChzZXRx LWxvY2FsIGNvbXBpbGF0aW9uLWVycm9yLXJlZ2V4cC1hbGlzdAogICAgICAgICAgICAgICBwcm9s b2ctaW5mZXJpb3ItZXJyb3ItcmVnZXhwLWFsaXN0KQotICAoY29tcGlsYXRpb24tc2hlbGwtbWlu b3ItbW9kZSkKLSAgKHByb2xvZy1pbmZlcmlvci1tZW51KSkKKyAgKGNvbXBpbGF0aW9uLXNoZWxs LW1pbm9yLW1vZGUpKQogCiAoZGVmdW4gcHJvbG9nLWlucHV0LWZpbHRlciAoc3RyKQogICAoY29u ZCAoKHN0cmluZy1tYXRjaCAiXFxgXFxzICpcXCciIHN0cikgbmlsKSA7d2hpdGVzcGFjZQpAQCAt MzM4MSw5ICszMzgwLDYgQEAgcHJvbG9nLXZhcmlhYmxlcy10by1hbm9ueW1vdXMKIChkZWZ1biBw cm9sb2ctbWVudSAoKQogICAiQWRkIHRoZSBtZW51cyBmb3IgdGhlIFByb2xvZyBlZGl0aW5nIGJ1 ZmZlcnMuIgogCi0gIChlYXN5LW1lbnUtYWRkIHByb2xvZy1lZGl0LW1lbnUtaW5zZXJ0LW1vdmUp Ci0gIChlYXN5LW1lbnUtYWRkIHByb2xvZy1lZGl0LW1lbnUtcnVudGltZSkKLQogICA7OyBBZGQg cHJlZGljYXRlIGluZGV4IG1lbnUKICAgKHNldHEtbG9jYWwgaW1lbnUtY3JlYXRlLWluZGV4LWZ1 bmN0aW9uCiAgICAgICAgICAgICAgICdpbWVudS1kZWZhdWx0LWNyZWF0ZS1pbmRleC1mdW5jdGlv bikKQEAgLTMzOTQsOSArMzM5MCw3IEBAIHByb2xvZy1tZW51CiAKICAgKGlmIChhbmQgcHJvbG9n LWltZW51LWZsYWcKICAgICAgICAgICAgKDwgKGNvdW50LWxpbmVzIChwb2ludC1taW4pIChwb2lu dC1tYXgpKSBwcm9sb2ctaW1lbnUtbWF4LWxpbmVzKSkKLSAgICAgIChpbWVudS1hZGQtdG8tbWVu dWJhciAiUHJlZGljYXRlcyIpKQotCi0gIChlYXN5LW1lbnUtYWRkIHByb2xvZy1tZW51LWhlbHAp KQorICAgICAgKGltZW51LWFkZC10by1tZW51YmFyICJQcmVkaWNhdGVzIikpKQogCiAoZWFzeS1t ZW51LWRlZmluZQogICBwcm9sb2ctaW5mZXJpb3ItbWVudS1hbGwgcHJvbG9nLWluZmVyaW9yLW1v ZGUtbWFwCkBAIC0zNDM5LDggKzM0MzMsOCBAQCBwcm9sb2ctaW5mZXJpb3ItbWVudQogICAiQ3Jl YXRlIHRoZSBtZW51cyBmb3IgdGhlIFByb2xvZyBpbmZlcmlvciBidWZmZXIuCiBUaGlzIG1lbnUg aXMgZHluYW1pY2FsbHkgY3JlYXRlZCBiZWNhdXNlIG9uZSBtYXkgY2hhbmdlIHN5c3RlbXMgZHVy aW5nCiB0aGUgbGlmZSBvZiBhbiBFbWFjcyBzZXNzaW9uLiIKLSAgKGVhc3ktbWVudS1hZGQgcHJv bG9nLWluZmVyaW9yLW1lbnUtYWxsKQotICAoZWFzeS1tZW51LWFkZCBwcm9sb2ctbWVudS1oZWxw KSkKKyAgKGRlY2xhcmUgKG9ic29sZXRlIG5pbCAiMjguMSIpKQorICBuaWwpCiAKIChkZWZ1biBw cm9sb2ctbW9kZS12ZXJzaW9uICgpCiAgICJFY2hvIHRoZSBjdXJyZW50IHZlcnNpb24gb2YgUHJv bG9nIG1vZGUgaW4gdGhlIG1pbmlidWZmZXIuIgpkaWZmIC0tZ2l0IGEvbGlzcC9wcm9nbW9kZXMv c3FsLmVsIGIvbGlzcC9wcm9nbW9kZXMvc3FsLmVsCmluZGV4IDZiMGRmMmQ3MDAuLjIyMDk5Mzk0 ZmYgMTAwNjQ0Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL3NxbC5lbAorKysgYi9saXNwL3Byb2dtb2Rl cy9zcWwuZWwKQEAgLTQxODYsOCArNDE4Niw5IEBAIHNxbC1tb2RlCiAJICAgIChtb2RpZnktc3lu dGF4LWVudHJ5ID9cXFxcIFwiXFxcXFwiIHNxbC1tb2RlLXN5bnRheC10YWJsZSkpKSIKICAgOmFi YnJldi10YWJsZSBzcWwtbW9kZS1hYmJyZXYtdGFibGUKIAotICAoaWYgc3FsLW1vZGUtbWVudQot ICAgICAgKGVhc3ktbWVudS1hZGQgc3FsLW1vZGUtbWVudSkpOyBYRW1hY3MKKyAgKHdoZW4gKGFu ZCAoZmVhdHVyZXAgJ3hlbWFjcykKKyAgICAgICAgICAgICBzcWwtbW9kZS1tZW51KQorICAgICAg KGVhc3ktbWVudS1hZGQgc3FsLW1vZGUtbWVudSkpCiAKICAgOzsgKHNtaWUtc2V0dXAgc3FsLXNt aWUtZ3JhbW1hciAjJ3NxbC1zbWllLXJ1bGVzKQogICAoc2V0IChtYWtlLWxvY2FsLXZhcmlhYmxl ICdjb21tZW50LXN0YXJ0KSAiLS0iKQpAQCAtNDMxMiw4ICs0MzEzLDkgQEAgc3FsLWludGVyYWN0 aXZlLW1vZGUKICAgKHNldHEgbW9kZS1uYW1lCiAgICAgICAgIChjb25jYXQgIlNRTGlbIiAob3Ig KHNxbC1nZXQtcHJvZHVjdC1mZWF0dXJlIHNxbC1wcm9kdWN0IDpuYW1lKQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChzeW1ib2wtbmFtZSBzcWwtcHJvZHVjdCkpICJdIikpCi0gIChpZiBz cWwtaW50ZXJhY3RpdmUtbW9kZS1tZW51Ci0gICAgICAoZWFzeS1tZW51LWFkZCBzcWwtaW50ZXJh Y3RpdmUtbW9kZS1tZW51KSkgOyBYRW1hY3MKKyAgKHdoZW4gKGFuZCAoZmVhdHVyZXAgJ3hlbWFj cykKKyAgICAgICAgICAgICBzcWwtaW50ZXJhY3RpdmUtbW9kZS1tZW51KQorICAgIChlYXN5LW1l bnUtYWRkIHNxbC1pbnRlcmFjdGl2ZS1tb2RlLW1lbnUpKQogCiAgIDs7IE5vdGUgdGhhdCBtYWtp bmcgS0VZV09SRFMtT05MWSBuaWwgd2lsbCBjYXVzZSBoYXZvYyBpZiB5b3UgdHJ5CiAgIDs7IFNF TEVDVCAneCcgRlJPTSBEVUFMIHdpdGggU1FMKlBsdXMsIGJlY2F1c2UgdGhlIHRpdGxlIG9mIHRo ZSBjb2x1bW4KZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3RjbC5lbCBiL2xpc3AvcHJvZ21v ZGVzL3RjbC5lbAppbmRleCBmMGRkOWFmYTRjLi5mZjNmYjk2NTdkIDEwMDY0NAotLS0gYS9saXNw L3Byb2dtb2Rlcy90Y2wuZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvdGNsLmVsCkBAIC02NTQsOSAr NjU0LDcgQEAgdGNsLW1vZGUKICAgICAgICAjJ3RjbC1hZGQtbG9nLWRlZnVuKQogCiAgIChzZXRx LWxvY2FsIGJlZ2lubmluZy1vZi1kZWZ1bi1mdW5jdGlvbiAjJ3RjbC1iZWdpbm5pbmctb2YtZGVm dW4tZnVuY3Rpb24pCi0gIChzZXRxLWxvY2FsIGVuZC1vZi1kZWZ1bi1mdW5jdGlvbiAjJ3RjbC1l bmQtb2YtZGVmdW4tZnVuY3Rpb24pCi0KLSAgKGVhc3ktbWVudS1hZGQgdGNsLW1vZGUtbWVudSkp CisgIChzZXRxLWxvY2FsIGVuZC1vZi1kZWZ1bi1mdW5jdGlvbiAjJ3RjbC1lbmQtb2YtZGVmdW4t ZnVuY3Rpb24pKQogCiAMCiAKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3ZoZGwtbW9kZS5l bCBiL2xpc3AvcHJvZ21vZGVzL3ZoZGwtbW9kZS5lbAppbmRleCBmMjg4ZmFjYmE1Li40ODkwOTJm NThlIDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy92aGRsLW1vZGUuZWwKKysrIGIvbGlzcC9w cm9nbW9kZXMvdmhkbC1tb2RlLmVsCkBAIC00MjA1LDkgKzQyMDUsMTEgQEAgdmhkbC1tb2RlLW1l bnUtbGlzdAogKGRlZnVuIHZoZGwtdXBkYXRlLW1vZGUtbWVudSAoKQogICAiVXBkYXRlIFZIREwg TW9kZSBtZW51LiIKICAgKGludGVyYWN0aXZlKQotICAoZWFzeS1tZW51LXJlbW92ZSB2aGRsLW1v ZGUtbWVudS1saXN0KSA7IGZvciBYRW1hY3MKKyAgKHdoZW4gKGZlYXR1cmVwICd4ZW1hY3MpCisg ICAgKGVhc3ktbWVudS1yZW1vdmUgdmhkbC1tb2RlLW1lbnUtbGlzdCkpCiAgIChzZXRxIHZoZGwt bW9kZS1tZW51LWxpc3QgKHZoZGwtY3JlYXRlLW1vZGUtbWVudSkpCi0gIChlYXN5LW1lbnUtYWRk IHZoZGwtbW9kZS1tZW51LWxpc3QpCTsgZm9yIFhFbWFjcworICAod2hlbiAoZmVhdHVyZXAgJ3hl bWFjcykKKyAgICAoZWFzeS1tZW51LWFkZCB2aGRsLW1vZGUtbWVudS1saXN0KSkKICAgKGVhc3kt bWVudS1kZWZpbmUgdmhkbC1tb2RlLW1lbnUgdmhkbC1tb2RlLW1hcAogCQkgICAgIk1lbnUga2V5 bWFwIGZvciBWSERMIE1vZGUuIiB2aGRsLW1vZGUtbWVudS1saXN0KSkKIApAQCAtNDMxMyw3ICs0 MzE1LDggQEAgdmhkbC1hZGQtc291cmNlLWZpbGVzLW1lbnUKICAgICAocHVzaCBbIipSZXNjYW4q IiB2aGRsLWFkZC1zb3VyY2UtZmlsZXMtbWVudSB0XSBtZW51LWxpc3QpCiAgICAgKHB1c2ggIlNv dXJjZXMiIG1lbnUtbGlzdCkKICAgICA7OyBDcmVhdGUgbWVudQotICAgIChlYXN5LW1lbnUtYWRk IG1lbnUtbGlzdCkKKyAgICAod2hlbiAoZmVhdHVyZXAgJ3hlbWFjcykKKyAgICAgIChlYXN5LW1l bnUtYWRkIG1lbnUtbGlzdCkpCiAgICAgKGVhc3ktbWVudS1kZWZpbmUgdmhkbC1zb3VyY2VzLW1l bnUgbmV3bWFwCiAJCSAgICAgICJWSERMIHNvdXJjZSBmaWxlcyBtZW51IiBtZW51LWxpc3QpKQog ICAobWVzc2FnZSAiIikpCkBAIC00OTI2LDcgKzQ5MjksOCBAQCB2aGRsLW1vZGUKICAgOzsgYWRk IHNvdXJjZSBmaWxlIG1lbnUKICAgKGlmIHZoZGwtc291cmNlLWZpbGUtbWVudSAodmhkbC1hZGQt c291cmNlLWZpbGVzLW1lbnUpKQogICA7OyBhZGQgVkhETCBtZW51Ci0gIChlYXN5LW1lbnUtYWRk IHZoZGwtbW9kZS1tZW51LWxpc3QpCTsgZm9yIFhFbWFjcworICAod2hlbiAoZmVhdHVyZXAgJ3hl bWFjcykKKyAgICAoZWFzeS1tZW51LWFkZCB2aGRsLW1vZGUtbWVudS1saXN0KSkKICAgKGVhc3kt bWVudS1kZWZpbmUgdmhkbC1tb2RlLW1lbnUgdmhkbC1tb2RlLW1hcAogCQkgICAgIk1lbnUga2V5 bWFwIGZvciBWSERMIE1vZGUuIiB2aGRsLW1vZGUtbWVudS1saXN0KQogICA7OyBpbml0aWFsaXpl IGhpZGVzaG93IGFuZCBhZGQgbWVudQpkaWZmIC0tZ2l0IGEvbGlzcC9zcGVlZGJhci5lbCBiL2xp c3Avc3BlZWRiYXIuZWwKaW5kZXggMzYxOWIyM2Q5ZS4uMzQ2ODc4MDViNSAxMDA2NDQKLS0tIGEv bGlzcC9zcGVlZGJhci5lbAorKysgYi9saXNwL3NwZWVkYmFyLmVsCkBAIC0xMTQ0LDYgKzExNDQs NyBAQCBzcGVlZGJhci1zZXQtbW9kZS1saW5lLWZvcm1hdAogCiAoZGVmdmFyIHNwZWVkYmFyLXBy ZXZpb3VzLW1lbnUgbmlsCiAgICJUaGUgbWVudSBiZWZvcmUgdGhlIGxhc3QgYHNwZWVkYmFyLXJl Y29uZmlndXJlLWtleW1hcHMnIHdhcyBjYWxsZWQuIikKKyhtYWtlLW9ic29sZXRlLXZhcmlhYmxl ICdzcGVlZGJhci1wcmV2aW91cy1tZW51ICJubyBsb25nZXIgdXNlZC4iICIyOC4xIikKIAogKGRl ZnVuIHNwZWVkYmFyLXJlY29uZmlndXJlLWtleW1hcHMgKCkKICAgIlJlY29uZmlndXJlIHRoZSBt ZW51LWJhciBpbiBhIHNwZWVkYmFyIGZyYW1lLgpAQCAtMTE5NSwxMCArMTE5Niw3IEBAIHNwZWVk YmFyLXJlY29uZmlndXJlLWtleW1hcHMKIAkJCSAoc3BlZWRiYXItaW5pdGlhbC1rZXltYXApCiAJ CQkgOzsgVGhpcyBjcmVhdGVzIGEgc21hbGwga2V5bWFwIHdlIGNhbiBnbG9tIHRoZQogCQkJIDs7 IG1lbnUgYWRqdXN0bWVudHMgaW50by4KLQkJCSAoc3BlZWRiYXItbWFrZS1zcGVjaWFsaXplZC1r ZXltYXApKSkKLSAgICAgIDs7IERlbGV0ZSB0aGUgb2xkIG1lbnUgaWYgYXBwbGljYWJsZS4KLSAg ICAgIChpZiBzcGVlZGJhci1wcmV2aW91cy1tZW51IChlYXN5LW1lbnUtcmVtb3ZlIHNwZWVkYmFy LXByZXZpb3VzLW1lbnUpKQotICAgICAgKHNldHEgc3BlZWRiYXItcHJldmlvdXMtbWVudSBtZCkK KyAgICAgICAgICAgICAgICAgICAgICAgICAoc3BlZWRiYXItbWFrZS1zcGVjaWFsaXplZC1rZXlt YXApKSkKICAgICAgIDs7IE5vdyBhZGQgdGhlIG5ldyBtZW51CiAgICAgICAoZWFzeS1tZW51LWRl ZmluZSBzcGVlZGJhci1tZW51LW1hcCAoY3VycmVudC1sb2NhbC1tYXApCiAgICAgICAgICJTcGVl ZGJhciBtZW51IiBtZCkpCmRpZmYgLS1naXQgYS9saXNwL3Rlcm0uZWwgYi9saXNwL3Rlcm0uZWwK aW5kZXggNTg1MjMyYmU2Yy4uY2E2NGQyOGQ5YiAxMDA2NDQKLS0tIGEvbGlzcC90ZXJtLmVsCisr KyBiL2xpc3AvdGVybS5lbApAQCAtMTEwNyw4ICsxMTA3LDYgQEAgdGVybS1tb2RlCiAKICAgKHRl cm0tLXJlc2V0LXNjcm9sbC1yZWdpb24pCiAKLSAgKGVhc3ktbWVudS1hZGQgdGVybS10ZXJtaW5h bC1tZW51KQotICAoZWFzeS1tZW51LWFkZCB0ZXJtLXNpZ25hbHMtbWVudSkKICAgKG9yIHRlcm0t aW5wdXQtcmluZwogICAgICAgKHNldHEgdGVybS1pbnB1dC1yaW5nIChtYWtlLXJpbmcgdGVybS1p bnB1dC1yaW5nLXNpemUpKSkKICAgKHRlcm0tdXBkYXRlLW1vZGUtbGluZSkpCkBAIC0xMjkzLDgg KzEyOTEsNiBAQCB0ZXJtLWNoYXItbW9kZQogICAod2hlbiAodGVybS1pbi1saW5lLW1vZGUpCiAg ICAgKHNldHEgdGVybS1vbGQtbW9kZS1tYXAgKGN1cnJlbnQtbG9jYWwtbWFwKSkKICAgICAodXNl LWxvY2FsLW1hcCB0ZXJtLXJhdy1tYXApCi0gICAgKGVhc3ktbWVudS1hZGQgdGVybS10ZXJtaW5h bC1tZW51KQotICAgIChlYXN5LW1lbnUtYWRkIHRlcm0tc2lnbmFscy1tZW51KQogCiAgICAgOzsg RG9uJ3QgYWxsb3cgY2hhbmdlcyB0byB0aGUgYnVmZmVyIG9yIHRvIHBvaW50IHdoaWNoIGFyZSBu b3QKICAgICA7OyBjYXVzZWQgYnkgdGhlIHByb2Nlc3MgZmlsdGVyLgpAQCAtMzU1MCw5ICszNTQ2 LDYgQEAgdGVybS1wcm9jZXNzLXBhZ2VyCiAgIDs7ICAgKHN0b3AtcHJvY2VzcyBwcm9jZXNzKSkK ICAgKHNldHEgdGVybS1wYWdlci1vbGQtbG9jYWwtbWFwIChjdXJyZW50LWxvY2FsLW1hcCkpCiAg ICh1c2UtbG9jYWwtbWFwIHRlcm0tcGFnZXItYnJlYWstbWFwKQotICAoZWFzeS1tZW51LWFkZCB0 ZXJtLXRlcm1pbmFsLW1lbnUpCi0gIChlYXN5LW1lbnUtYWRkIHRlcm0tc2lnbmFscy1tZW51KQot ICAoZWFzeS1tZW51LWFkZCB0ZXJtLXBhZ2VyLW1lbnUpCiAgIChtYWtlLWxvY2FsLXZhcmlhYmxl ICd0ZXJtLW9sZC1tb2RlLWxpbmUtZm9ybWF0KQogICAoc2V0cSB0ZXJtLW9sZC1tb2RlLWxpbmUt Zm9ybWF0IG1vZGUtbGluZS1mb3JtYXQpCiAgIChzZXRxIG1vZGUtbGluZS1mb3JtYXQKZGlmZiAt LWdpdCBhL2xpc3AvdGV4dG1vZGVzL2Rucy1tb2RlLmVsIGIvbGlzcC90ZXh0bW9kZXMvZG5zLW1v ZGUuZWwKaW5kZXggNmRmZWE4ZjE4OC4uNzEyOTU1ZTg0ZCAxMDA2NDQKLS0tIGEvbGlzcC90ZXh0 bW9kZXMvZG5zLW1vZGUuZWwKKysrIGIvbGlzcC90ZXh0bW9kZXMvZG5zLW1vZGUuZWwKQEAgLTE4 NCw4ICsxODQsNyBAQCBkbnMtbW9kZQogICAoc2V0IChtYWtlLWxvY2FsLXZhcmlhYmxlICdmb250 LWxvY2stZGVmYXVsdHMpCiAgICAgICAgJyhkbnMtbW9kZS1mb250LWxvY2sta2V5d29yZHMgbmls IG5pbCAoKD9fIC4gInciKSkpKQogICAoYWRkLWhvb2sgJ2JlZm9yZS1zYXZlLWhvb2sgJ2Rucy1t b2RlLXNvYS1tYXliZS1pbmNyZW1lbnQtc2VyaWFsCi0JICAgIG5pbCB0KQotICAoZWFzeS1tZW51 LWFkZCBkbnMtbW9kZS1tZW51IGRucy1tb2RlLW1hcCkpCisgICAgICAgICAgICBuaWwgdCkpCiAK IDs7OyMjI2F1dG9sb2FkIChkZWZhbGlhcyAnem9uZS1tb2RlICdkbnMtbW9kZSkKIApkaWZmIC0t Z2l0IGEvbGlzcC90ZXh0bW9kZXMvcmVmdGV4LWluZGV4LmVsIGIvbGlzcC90ZXh0bW9kZXMvcmVm dGV4LWluZGV4LmVsCmluZGV4IGExZTMwMjY5ZDIuLmJlYmRhNDgzNjcgMTAwNjQ0Ci0tLSBhL2xp c3AvdGV4dG1vZGVzL3JlZnRleC1pbmRleC5lbAorKysgYi9saXNwL3RleHRtb2Rlcy9yZWZ0ZXgt aW5kZXguZWwKQEAgLTQwOCw3ICs0MDgsOCBAQCByZWZ0ZXgtaW5kZXgtbW9kZQogICAgIChtYWtl LWxvY2FsLWhvb2sgJ3Bvc3QtY29tbWFuZC1ob29rKQogICAgIChtYWtlLWxvY2FsLWhvb2sgJ3By ZS1jb21tYW5kLWhvb2spKQogICAobWFrZS1sb2NhbC12YXJpYWJsZSAncmVmdGV4LWxhc3QtZm9s bG93LXBvaW50KQotICAoZWFzeS1tZW51LWFkZCByZWZ0ZXgtaW5kZXgtbWVudSByZWZ0ZXgtaW5k ZXgtbW9kZS1tYXApCisgICh3aGVuIChmZWF0dXJlcCAneGVtYWNzKQorICAgIChlYXN5LW1lbnUt YWRkIHJlZnRleC1pbmRleC1tZW51IHJlZnRleC1pbmRleC1tb2RlLW1hcCkpCiAgIChhZGQtaG9v ayAncG9zdC1jb21tYW5kLWhvb2sgJ3JlZnRleC1pbmRleC1wb3N0LWNvbW1hbmQtaG9vayBuaWwg dCkKICAgKGFkZC1ob29rICdwcmUtY29tbWFuZC1ob29rICAncmVmdGV4LWluZGV4LXByZS1jb21t YW5kLWhvb2sgbmlsIHQpKQogCkBAIC0xMzg2LDcgKzEzODcsOCBAQCByZWZ0ZXgtaW5kZXgtcGhy YXNlcy1tb2RlCiAgIDpzeW50YXgtdGFibGUgcmVmdGV4LWluZGV4LXBocmFzZXMtc3ludGF4LXRh YmxlCiAgIChzZXQgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ2ZvbnQtbG9jay1kZWZhdWx0cykKICAg ICAgICByZWZ0ZXgtaW5kZXgtcGhyYXNlcy1mb250LWxvY2stZGVmYXVsdHMpCi0gIChlYXN5LW1l bnUtYWRkIHJlZnRleC1pbmRleC1waHJhc2VzLW1lbnUgcmVmdGV4LWluZGV4LXBocmFzZXMtbW9k ZS1tYXApCisgICh3aGVuIChmZWF0dXJlcCAneGVtYWNzKQorICAgIChlYXN5LW1lbnUtYWRkIHJl ZnRleC1pbmRleC1waHJhc2VzLW1lbnUgcmVmdGV4LWluZGV4LXBocmFzZXMtbW9kZS1tYXApKQog ICAoc2V0IChtYWtlLWxvY2FsLXZhcmlhYmxlICdyZWZ0ZXgtaW5kZXgtcGhyYXNlcy1tYXJrZXIp IChtYWtlLW1hcmtlcikpKQogOzsgKGFkZC1ob29rICdyZWZ0ZXgtaW5kZXgtcGhyYXNlcy1tb2Rl LWhvb2sgJ3R1cm4tb24tZm9udC1sb2NrKQogCmRpZmYgLS1naXQgYS9saXNwL3RleHRtb2Rlcy9y ZWZ0ZXgtdG9jLmVsIGIvbGlzcC90ZXh0bW9kZXMvcmVmdGV4LXRvYy5lbAppbmRleCAwMmU3ZTNh OGYxLi5lYjZlZDJmZjQ0IDEwMDY0NAotLS0gYS9saXNwL3RleHRtb2Rlcy9yZWZ0ZXgtdG9jLmVs CisrKyBiL2xpc3AvdGV4dG1vZGVzL3JlZnRleC10b2MuZWwKQEAgLTE1Myw3ICsxNTMsOCBAQCBy ZWZ0ZXgtdG9jLW1vZGUKICAgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ3JlZnRleC1sYXN0LWZvbGxv dy1wb2ludCkKICAgKGFkZC1ob29rICdwb3N0LWNvbW1hbmQtaG9vayAncmVmdGV4LXRvYy1wb3N0 LWNvbW1hbmQtaG9vayBuaWwgdCkKICAgKGFkZC1ob29rICdwcmUtY29tbWFuZC1ob29rICAncmVm dGV4LXRvYy1wcmUtY29tbWFuZC1ob29rIG5pbCB0KQotICAoZWFzeS1tZW51LWFkZCByZWZ0ZXgt dG9jLW1lbnUgcmVmdGV4LXRvYy1tb2RlLW1hcCkpCisgICh3aGVuIChmZWF0dXJlcCAneGVtYWNz KQorICAgIChlYXN5LW1lbnUtYWRkIHJlZnRleC10b2MtbWVudSByZWZ0ZXgtdG9jLW1vZGUtbWFw KSkpCiAKIChkZWZ2YXIgcmVmdGV4LWxhc3QtdG9jLWZpbGUgbmlsCiAgICJTdG9yZXMgdGhlIGZp bGUgbmFtZSBmcm9tIHdoaWNoIGByZWZ0ZXgtdG9jJyB3YXMgY2FsbGVkLiAgRm9yIHJlZG8gY29t bWFuZC4iKQpkaWZmIC0tZ2l0IGEvbGlzcC90ZXh0bW9kZXMvcmVmdGV4LmVsIGIvbGlzcC90ZXh0 bW9kZXMvcmVmdGV4LmVsCmluZGV4IDQwNzFjMGRkMDcuLjI5ZWJhYjVmOWIgMTAwNjQ0Ci0tLSBh L2xpc3AvdGV4dG1vZGVzL3JlZnRleC5lbAorKysgYi9saXNwL3RleHRtb2Rlcy9yZWZ0ZXguZWwK QEAgLTIwNyw3ICsyMDcsOCBAQCByZWZ0ZXgtbW9kZQogICAoaWYgcmVmdGV4LW1vZGUKICAgICAg IChwcm9nbgogICAgICAgICA7OyBNb2RlIHdhcyB0dXJuZWQgb24KLSAgICAgICAgKGVhc3ktbWVu dS1hZGQgcmVmdGV4LW1vZGUtbWVudSkKKyAgICAgICAgKHdoZW4gKGZlYXR1cmVwICd4ZW1hY3Mp CisgICAgICAgICAgKGVhc3ktbWVudS1hZGQgcmVmdGV4LW1vZGUtbWVudSkpCiAgICAgICAgIChh bmQgcmVmdGV4LXBsdWctaW50by1BVUNUZVgKICAgICAgICAgICAgICAocmVmdGV4LXBsdWctaW50 by1BVUNUZVgpKQogICAgICAgICAodW5sZXNzIChnZXQgJ3JlZnRleC1hdXRvLXZpZXctY3Jvc3Ny ZWYgJ2luaXRpYWxpemVkKQpAQCAtMjI0LDcgKzIyNSw4IEBAIHJlZnRleC1tb2RlCiAKICAgICAg ICAgKHJ1bi1ob29rcyAncmVmdGV4LW1vZGUtaG9vaykpCiAgICAgOzsgTW9kZSB3YXMgdHVybmVk IG9mZgotICAgIChlYXN5LW1lbnUtcmVtb3ZlIHJlZnRleC1tb2RlLW1lbnUpKSkKKyAgICAod2hl biAoZmVhdHVyZXAgJ3hlbWFjcykKKyAgICAgIChlYXN5LW1lbnUtcmVtb3ZlIHJlZnRleC1tb2Rl LW1lbnUpKSkpCiAKIChkZWZ2YXIgcmVmdGV4LWRvY3N0cnVjdC1zeW1ib2wpCiAoZGVmdW4gcmVm dGV4LWtpbGwtYnVmZmVyLWhvb2sgKCkKZGlmZiAtLWdpdCBhL2xpc3Avd2lkLWJyb3dzZS5lbCBi L2xpc3Avd2lkLWJyb3dzZS5lbAppbmRleCA1M2Y5MThjZmY5Li5mNWMzZDQ4NmY0IDEwMDY0NAot LS0gYS9saXNwL3dpZC1icm93c2UuZWwKKysrIGIvbGlzcC93aWQtYnJvd3NlLmVsCkBAIC03Nyw4 ICs3Nyw2IEBAIHdpZGdldC1icm93c2UtbW9kZQogICAoc2V0cSBtYWpvci1tb2RlICd3aWRnZXQt YnJvd3NlLW1vZGUKIAltb2RlLW5hbWUgIldpZGdldCIpCiAgICh1c2UtbG9jYWwtbWFwIHdpZGdl dC1icm93c2UtbW9kZS1tYXApCi0gIChlYXN5LW1lbnUtYWRkIHdpZGdldC1icm93c2UtbW9kZS1j dXN0b21pemUtbWVudSkKLSAgKGVhc3ktbWVudS1hZGQgd2lkZ2V0LWJyb3dzZS1tb2RlLW1lbnUp CiAgIChydW4tbW9kZS1ob29rcyAnd2lkZ2V0LWJyb3dzZS1tb2RlLWhvb2spKQogCiAocHV0ICd3 aWRnZXQtYnJvd3NlLW1vZGUgJ21vZGUtY2xhc3MgJ3NwZWNpYWwpCi0tIAoyLjI5LjIKCg== --00000000000077c14305b46af97e-- From unknown Sat Sep 20 03:42:54 2025 X-Loop: help-debbugs@gnu.org Subject: bug#44731: [PATCH] Make XEmacs compat aliases easy-menu-{add,remove} obsolete Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 24 Nov 2020 08:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44731 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Stefan Kangas Cc: 44731@debbugs.gnu.org Received: via spool by 44731-submit@debbugs.gnu.org id=B44731.160620487626042 (code B ref 44731); Tue, 24 Nov 2020 08:02:02 +0000 Received: (at 44731) by debbugs.gnu.org; 24 Nov 2020 08:01:16 +0000 Received: from localhost ([127.0.0.1]:57315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1khTGF-0006la-Ob for submit@debbugs.gnu.org; Tue, 24 Nov 2020 03:01:16 -0500 Received: from quimby.gnus.org ([95.216.78.240]:50508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1khTGD-0006eA-Na for 44731@debbugs.gnu.org; Tue, 24 Nov 2020 03:01:14 -0500 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=r0bgwysZOeHNBNtQno2bCYVOtAdcPTe2dA2j54gd//4=; b=tLAMUqHzdzUddBLnsW4yNtV9pt kS/SxZDdeyMP1ht1BRarrQpN/wNG5PH99sM/smHin7QHbc50ZchflL6vQkNieim5pVhLuw02zsnxc 4Z81SfIOy8z1R6vepiQlk2rDRTPazF5Tvt016a6iucUSeJcUbrl0yjZ+PA7BDVve9eoY=; Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1khTG0-00012v-2M; Tue, 24 Nov 2020 09:01:06 +0100 From: Lars Ingebrigtsen References: X-Now-Playing: Fad Gadget's _Fireside Favourites_: "Fireside Favourite" Date: Tue, 24 Nov 2020 09:00:58 +0100 In-Reply-To: (Stefan Kangas's message of "Wed, 18 Nov 2020 16:40:27 -0800") Message-ID: <874klf89qd.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: Stefan Kangas writes: > The `easy-menu-remove' and `easy-menu-add' are XEmacs compatibility > aliases. I think they do not make sense these days, and it is better > for code that wants to use them to wrap the call in somet [...] 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: 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: > The `easy-menu-remove' and `easy-menu-add' are XEmacs compatibility > aliases. I think they do not make sense these days, and it is better > for code that wants to use them to wrap the call in something like > `(when (featurep 'xemacs) ...)'. > > The attached patch makes them obsolete and fixes all callers. It takes > care to not remove XEmacs compatibility from any modules where it was > not already removed, so I hope this will be uncontroversial. Makes sense to me. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From unknown Sat Sep 20 03:42:54 2025 X-Loop: help-debbugs@gnu.org Subject: bug#44731: [PATCH] Make XEmacs compat aliases easy-menu-{add, remove} obsolete Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 24 Nov 2020 17:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44731 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Lars Ingebrigtsen Cc: 44731@debbugs.gnu.org Received: via spool by 44731-submit@debbugs.gnu.org id=B44731.16062380875893 (code B ref 44731); Tue, 24 Nov 2020 17:15:02 +0000 Received: (at 44731) by debbugs.gnu.org; 24 Nov 2020 17:14:47 +0000 Received: from localhost ([127.0.0.1]:32880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1khbtv-0001Wu-45 for submit@debbugs.gnu.org; Tue, 24 Nov 2020 12:14:47 -0500 Received: from mail-ed1-f43.google.com ([209.85.208.43]:45283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1khbtt-0001WZ-Cb for 44731@debbugs.gnu.org; Tue, 24 Nov 2020 12:14:46 -0500 Received: by mail-ed1-f43.google.com with SMTP id q3so21648980edr.12 for <44731@debbugs.gnu.org>; Tue, 24 Nov 2020 09:14:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:in-reply-to:references:mime-version:date :message-id:subject:to:cc; bh=squrMS3+Z92v6ANQmbPacGUdq1v4WKjJGSBy9vdJYTI=; b=YoWydzKBTKpT0iN5FcXg4k8j0N0wkNOx5CAe+FUE19Xqrw0rM0cCyntjumcmtieWuW sEZ8MwQs3BdoasUmuSCCVZwhyx9nmFy6XGMza0FIzybo5CdNUD+AP8WbwQlw6/6K/7W3 n+Xf53+oYIxo5R/pKNcUKCDFgUIRMkghf/r/oO53AKXhX9D4SgvBwopuExlsLAtSEcRN lGB1lVGo1YA8pP/ufAv9RTMEA4Y/2pvyUlGVHusMwVJekFK0J0loZ/iw/2hl62CHkV56 jQ5YrSZsPEEfUlmkeNPOTqxqtVp2XgegaVIW1oIFcgLO53v+BMUvgqltfFKxAYGZ2+/g unSg== X-Gm-Message-State: AOAM531sFz9ixvzsHJh2y+xf5wF9n6KIuIhxGzkS3c0k8IK7mm/m20hv 0HOa2my4Ae/7ereV6rm621Y7bHufHkIuwiLDbQI= X-Google-Smtp-Source: ABdhPJzVTdxxewiC6umIC3EFooHWmVjUhyYKJXEBm2Pkd0LKBr99UuLiyMK8etRywEDkMNOiro1n0qSfb+0pnbAZy2w= X-Received: by 2002:a50:9f61:: with SMTP id b88mr5085632edf.282.1606238079737; Tue, 24 Nov 2020 09:14:39 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 24 Nov 2020 09:14:38 -0800 From: Stefan Kangas In-Reply-To: <874klf89qd.fsf@gnus.org> References: <874klf89qd.fsf@gnus.org> MIME-Version: 1.0 Date: Tue, 24 Nov 2020 09:14:38 -0800 Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.5 (/) 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 (/) tags 44731 fixed close 44731 28.1 thanks Lars Ingebrigtsen writes: > Stefan Kangas writes: > >> The `easy-menu-remove' and `easy-menu-add' are XEmacs compatibility >> aliases. I think they do not make sense these days, and it is better >> for code that wants to use them to wrap the call in something like >> `(when (featurep 'xemacs) ...)'. >> >> The attached patch makes them obsolete and fixes all callers. It takes >> care to not remove XEmacs compatibility from any modules where it was >> not already removed, so I hope this will be uncontroversial. > > Makes sense to me. Thanks. No further comments within a week, so I pushed this to master as commit affe9b225d.