From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#52293: 29.0.50; [PATCH v3] Prevent further cases of duplicated separators in context menus Date: Tue, 7 Dec 2021 20:37:28 -0800 Message-ID: <37047ada-fa33-88dd-5237-769611fec61b@gmail.com> References: <86tufn5jn9.fsf@mail.linkov.net> <86pmqa14fc.fsf@mail.linkov.net> <15eebcb1-b67a-8363-bc23-cf113913856f@gmail.com> <86h7bkhlo7.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2E6081CC01A1698AE7EF2A8D" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13322"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 52293@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Dec 08 05:38:13 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1muoib-0003HY-Kr for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 08 Dec 2021 05:38:13 +0100 Original-Received: from localhost ([::1]:42730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muoiZ-0006Qs-Nz for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 07 Dec 2021 23:38:11 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:39444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muoiR-0006Qj-1v for bug-gnu-emacs@gnu.org; Tue, 07 Dec 2021 23:38:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:56045) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muoiQ-0007fo-QZ for bug-gnu-emacs@gnu.org; Tue, 07 Dec 2021 23:38:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1muoiQ-0004cY-Mu for bug-gnu-emacs@gnu.org; Tue, 07 Dec 2021 23:38:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 08 Dec 2021 04:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52293 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 52293-submit@debbugs.gnu.org id=B52293.163893826017728 (code B ref 52293); Wed, 08 Dec 2021 04:38:02 +0000 Original-Received: (at 52293) by debbugs.gnu.org; 8 Dec 2021 04:37:40 +0000 Original-Received: from localhost ([127.0.0.1]:39357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1muoi2-0004br-Pn for submit@debbugs.gnu.org; Tue, 07 Dec 2021 23:37:39 -0500 Original-Received: from mail-pg1-f177.google.com ([209.85.215.177]:37483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1muohy-0004bZ-UR for 52293@debbugs.gnu.org; Tue, 07 Dec 2021 23:37:37 -0500 Original-Received: by mail-pg1-f177.google.com with SMTP id 71so1022847pgb.4 for <52293@debbugs.gnu.org>; Tue, 07 Dec 2021 20:37:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language; bh=7QPrtw6eItrlabwz0GVNkOq5w/CF25uKFRmdEsvXLc8=; b=ZFLQukqEsB1lgvRCCWgmpobGUAmi9O6TzdSZUKoEOHOQ+Mjshp8ZUwulCLrSr+T5ik 6fpsjyp4xyfqDs83Hs5ToZnE1iWFWExWu+TCL3CRzEIlC2fQTwP0vBtQrHn3Mbx1QAqN DTscnqUSAOqnKnfeNFfUyMYIsfjua61XyNstVqWA3ckEpr+tuf3nN0gF9iM9nS1e+s74 VG37s4IVX8E4/4yeA3b2EyJbGL2fFd9ZCr1p1TSwrSOaz6qNbGUqbdXCBFbj9zyoHYS4 p1WKT5ZWgi/KJlJj0LL9SBKh4geTXt8Yu0gCvjH3YNOOevJQVsdQRYNSJptq9UjFqXtq W0Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language; bh=7QPrtw6eItrlabwz0GVNkOq5w/CF25uKFRmdEsvXLc8=; b=GcM5N2Bm0/vTHLroPDCGIZaPHlfF5G1X6TpzlntcCRlr6EJ0HyNGEIVO6a5I3kbbTZ kBjlTWTSG4qtqunZxtt+rQ47NPFpIvPipVPzc5c95RUrY8hANjwE87HeuMxEiCrMHDON M5LHkjSbS91moUsPq+AuXWfceUOG1rN+2A30W8BT9Qt4Kb1pOEqSU5SJkLCbTIeIsHq2 aDmXNM1ZLfo/LgIVvcfMp7CaLVhlkUJdStFO8d9sEJ5VPQDe/KuJPU3nKQ570bXYxOo9 l52/VUt75/hIk5A4hsN5Qy2PVc8cWc5Q+hoaYdV0TxcAhw3lvqHPunhSsiqqsvN3sZqC 8HUw== X-Gm-Message-State: AOAM531QYHzldsTk2bkkmH+scIiHlqmjUksirgxF2Y/IK4J72V/0IvEE nlVbSACkiFE+jivOa9hzoTua6A9is5I= X-Google-Smtp-Source: ABdhPJx0eDugKY9Cn09QzzbIzvYuc1N4hcTs8h+m37SAW3C85q0jceLoeM0ZSPeW93ys/0VBEnhtxQ== X-Received: by 2002:a05:6a00:1145:b0:4a2:6a03:c592 with SMTP id b5-20020a056a00114500b004a26a03c592mr3301995pfm.65.1638938249034; Tue, 07 Dec 2021 20:37:29 -0800 (PST) Original-Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id b35sm953582pgb.83.2021.12.07.20.37.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Dec 2021 20:37:28 -0800 (PST) In-Reply-To: <86h7bkhlo7.fsf@mail.linkov.net> Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:221907 Archived-At: This is a multi-part message in MIME format. --------------2E6081CC01A1698AE7EF2A8D Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 12/7/2021 12:19 AM, Juri Linkov wrote: > Thanks, this makes perfect sense. I vote for pushing this to emacs-28, > so the authors of packages could rely on this scheme. Sounds good. Attached is an updated patch with an expanded docstring for `context-menu-functions' that mentions the existence of `top-separator' and `middle-separator' and how to use them. Everything else is the same as v2 though. --------------2E6081CC01A1698AE7EF2A8D Content-Type: text/plain; charset=UTF-8; name="0001-Add-a-top-separator-to-the-context-menu.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Add-a-top-separator-to-the-context-menu.patch" RnJvbSA4OWZlZjEyNDRlYmQ1NTA0MWViNDE1ZWY3YjlkNTllM2IxMDE0YWRjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFR1ZSwgNyBEZWMgMjAyMSAyMDozNDowOCAtMDgwMApTdWJqZWN0OiBbUEFU Q0hdIEFkZCBhICd0b3Atc2VwYXJhdG9yJyB0byB0aGUgY29udGV4dCBtZW51CgpUaGlzIHBy b3ZpZGVzIGFuIGFuY2hvciBmb3IgY29udGV4dCBtZW51IGZ1bmN0aW9ucyB0byB1c2UgdG8g aW5zZXJ0CnRoZWlyIG1lbnUgaXRlbXMgYWZ0ZXIgaXQuIFVzaW5nICdkZWZpbmUta2V5JyBk b2Vzbid0IHdvcmsgcHJvcGVybHkgaW4KdGhpcyBjYXNlLCBzaW5jZSBpdCBpbnNlcnRzIHRo ZSBpdGVtcyBiZWZvcmUgdGhlIG1lbnUgdGl0bGUsIGNvbmZ1c2luZwp0aGUgc2VwYXJhdG9y IGRlLWR1cGxpY2F0aW9uIGluICdjb250ZXh0LW1lbnUtbWFwJy4KCiogbGlzcC9tb3VzZS5l bCAoY29udGV4dC1tZW51LWZ1bmN0aW9ucyk6IE1lbnRpb24gJ3RvcC1zZXBhcmF0b3InLAon bWlkZGxlLXNlcGFyYXRvcicsIGFuZCBob3cgdG8gdXNlIHRoZW0uCihjb250ZXh0LW1lbnUt bWFwKTogQWRkICd0b3Atc2VwYXJhdG9yJyB0byB0aGUgbWVudS4KKiBsaXNwL2RpcmVkLmVs IChkaXJlZC1jb250ZXh0LW1lbnUpOgoqIGxpc3AvaGVscC1tb2RlLmVsIChoZWxwLW1vZGUt Y29udGV4dC1tZW51KToKKiBsaXNwL2luZm8uZWwgKEluZm8tY29udGV4dC1tZW51KToKKiBs aXNwL25ldC9ld3cuZWwgKGV3dy1jb250ZXh0LW1lbnUpOgoqIGxpc3AvbmV0L2dvdG8tYWRk ci5lbCAoZ290by1hZGRyZXNzLWNvbnRleHQtbWVudSk6ClVzZSAndG9wLXNlcGFyYXRvcicu Ci0tLQogbGlzcC9kaXJlZC5lbCAgICAgICAgIHwgIDUgKysrLS0KIGxpc3AvaGVscC1tb2Rl LmVsICAgICB8IDEwICsrKysrKy0tLS0KIGxpc3AvaW5mby5lbCAgICAgICAgICB8ICA5ICsr KysrLS0tLQogbGlzcC9tb3VzZS5lbCAgICAgICAgIHwgMTEgKysrKysrKysrKy0KIGxpc3Av bmV0L2V3dy5lbCAgICAgICB8IDE0ICsrKysrKysrLS0tLS0tCiBsaXNwL25ldC9nb3RvLWFk ZHIuZWwgfCAgOCArKysrKy0tLQogNiBmaWxlcyBjaGFuZ2VkLCAzNyBpbnNlcnRpb25zKCsp LCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL2RpcmVkLmVsIGIvbGlzcC9k aXJlZC5lbAppbmRleCBkMGU1NDdiYTBiLi5iMDA0ZDgxNDk1IDEwMDY0NAotLS0gYS9saXNw L2RpcmVkLmVsCisrKyBiL2xpc3AvZGlyZWQuZWwKQEAgLTIyODIsNyArMjI4Miw3IEBAIGRp cmVkLW1vZGUtb3BlcmF0ZS1tZW51CiAoZGVmdW4gZGlyZWQtY29udGV4dC1tZW51IChtZW51 IGNsaWNrKQogICAiUG9wdWxhdGUgTUVOVSB3aXRoIERpcmVkIG1vZGUgY29tbWFuZHMgYXQg Q0xJQ0suIgogICAod2hlbiAobW91c2UtcG9zbi1wcm9wZXJ0eSAoZXZlbnQtc3RhcnQgY2xp Y2spICdkaXJlZC1maWxlbmFtZSkKLSAgICAoZGVmaW5lLWtleSBtZW51IFtkaXJlZC1zZXBh cmF0b3JdIG1lbnUtYmFyLXNlcGFyYXRvcikKKyAgICAoZGVmaW5lLWtleS1hZnRlciBtZW51 IFtkaXJlZC1zZXBhcmF0b3JdIG1lbnUtYmFyLXNlcGFyYXRvciAndG9wLXNlcGFyYXRvcikK ICAgICAobGV0ICgoZWFzeS1tZW51IChtYWtlLXNwYXJzZS1rZXltYXAgIkltbWVkaWF0ZSIp KSkKICAgICAgIChlYXN5LW1lbnUtZGVmaW5lIG5pbCBlYXN5LW1lbnUgbmlsCiAgICAgICAg ICcoIkltbWVkaWF0ZSIKQEAgLTIyOTIsNyArMjI5Miw4IEBAIGRpcmVkLWNvbnRleHQtbWVu dQogICAgICAgICAgICA6aGVscCAiRWRpdCBmaWxlIGF0IG1vdXNlIGNsaWNrIGluIG90aGVy IHdpbmRvdyJdKSkKICAgICAgIChkb2xpc3QgKGl0ZW0gKHJldmVyc2UgKGxvb2t1cC1rZXkg ZWFzeS1tZW51IFttZW51LWJhciBpbW1lZGlhdGVdKSkpCiAgICAgICAgICh3aGVuIChjb25z cCBpdGVtKQotICAgICAgICAgIChkZWZpbmUta2V5IG1lbnUgKHZlY3RvciAoY2FyIGl0ZW0p KSAoY2RyIGl0ZW0pKSkpKSkKKyAgICAgICAgICAoZGVmaW5lLWtleS1hZnRlciBtZW51ICh2 ZWN0b3IgKGNhciBpdGVtKSkgKGNkciBpdGVtKQorICAgICAgICAgICAgJ3RvcC1zZXBhcmF0 b3IpKSkpKQogICBtZW51KQogCiAMCmRpZmYgLS1naXQgYS9saXNwL2hlbHAtbW9kZS5lbCBi L2xpc3AvaGVscC1tb2RlLmVsCmluZGV4IDc5MmYyZTVhZjMuLjJlZDIwNTc3ZjUgMTAwNjQ0 Ci0tLSBhL2xpc3AvaGVscC1tb2RlLmVsCisrKyBiL2xpc3AvaGVscC1tb2RlLmVsCkBAIC03 NCw3ICs3NCw4IEBAIGhlbHAtbW9kZS1tZW51CiAKIChkZWZ1biBoZWxwLW1vZGUtY29udGV4 dC1tZW51IChtZW51IGNsaWNrKQogICAiUG9wdWxhdGUgTUVOVSB3aXRoIEhlbHAgbW9kZSBj b21tYW5kcyBhdCBDTElDSy4iCi0gIChkZWZpbmUta2V5IG1lbnUgW2hlbHAtbW9kZS1zZXBh cmF0b3JdIG1lbnUtYmFyLXNlcGFyYXRvcikKKyAgKGRlZmluZS1rZXktYWZ0ZXIgbWVudSBb aGVscC1tb2RlLXNlcGFyYXRvcl0gbWVudS1iYXItc2VwYXJhdG9yCisgICAgJ3RvcC1zZXBh cmF0b3IpCiAgIChsZXQgKChlYXN5LW1lbnUgKG1ha2Utc3BhcnNlLWtleW1hcCAiSGVscC1N b2RlIikpKQogICAgIChlYXN5LW1lbnUtZGVmaW5lIG5pbCBlYXN5LW1lbnUgbmlsCiAgICAg ICAnKCJIZWxwLU1vZGUiCkBAIC04NiwxNCArODcsMTUgQEAgaGVscC1tb2RlLWNvbnRleHQt bWVudQogICAgICAgICAgOmFjdGl2ZSBoZWxwLXhyZWYtZm9yd2FyZC1zdGFja10pKQogICAg IChkb2xpc3QgKGl0ZW0gKHJldmVyc2UgKGxvb2t1cC1rZXkgZWFzeS1tZW51IFttZW51LWJh ciBoZWxwLW1vZGVdKSkpCiAgICAgICAod2hlbiAoY29uc3AgaXRlbSkKLSAgICAgICAgKGRl ZmluZS1rZXkgbWVudSAodmVjdG9yIChjYXIgaXRlbSkpIChjZHIgaXRlbSkpKSkpCisgICAg ICAgIChkZWZpbmUta2V5LWFmdGVyIG1lbnUgKHZlY3RvciAoY2FyIGl0ZW0pKSAoY2RyIGl0 ZW0pICd0b3Atc2VwYXJhdG9yKSkpKQogCiAgICh3aGVuIChtb3VzZS1wb3NuLXByb3BlcnR5 IChldmVudC1zdGFydCBjbGljaykgJ21vdXNlLWZhY2UpCi0gICAgKGRlZmluZS1rZXkgbWVu dSBbaGVscC1tb2RlLXB1c2gtYnV0dG9uXQorICAgIChkZWZpbmUta2V5LWFmdGVyIG1lbnUg W2hlbHAtbW9kZS1wdXNoLWJ1dHRvbl0KICAgICAgICcobWVudS1pdGVtICJGb2xsb3cgTGlu ayIgKGxhbWJkYSAoZXZlbnQpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGludGVyYWN0aXZlICJlIikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAo cHVzaC1idXR0b24gZXZlbnQpKQotICAgICAgICAgICAgICAgICAgOmhlbHAgIkZvbGxvdyB0 aGUgbGluayBhdCBjbGljayIpKSkKKyAgICAgICAgICAgICAgICAgIDpoZWxwICJGb2xsb3cg dGhlIGxpbmsgYXQgY2xpY2siKQorICAgICAgJ3RvcC1zZXBhcmF0b3IpKQogCiAgIG1lbnUp CiAKZGlmZiAtLWdpdCBhL2xpc3AvaW5mby5lbCBiL2xpc3AvaW5mby5lbAppbmRleCA1NTk0 NjBlOGQyLi4wNWU5Mjc3Njk4IDEwMDY0NAotLS0gYS9saXNwL2luZm8uZWwKKysrIGIvbGlz cC9pbmZvLmVsCkBAIC00MTkzLDcgKzQxOTMsNyBAQCBJbmZvLWNoZWNrLXBvaW50ZXIKIAog KGRlZnVuIEluZm8tY29udGV4dC1tZW51IChtZW51IGNsaWNrKQogICAiUG9wdWxhdGUgTUVO VSB3aXRoIEluZm8gY29tbWFuZHMgYXQgQ0xJQ0suIgotICAoZGVmaW5lLWtleSBtZW51IFtJ bmZvLXNlcGFyYXRvcl0gbWVudS1iYXItc2VwYXJhdG9yKQorICAoZGVmaW5lLWtleS1hZnRl ciBtZW51IFtJbmZvLXNlcGFyYXRvcl0gbWVudS1iYXItc2VwYXJhdG9yICd0b3Atc2VwYXJh dG9yKQogICAobGV0ICgoZWFzeS1tZW51IChtYWtlLXNwYXJzZS1rZXltYXAgIkluZm8iKSkp CiAgICAgKGVhc3ktbWVudS1kZWZpbmUgbmlsIGVhc3ktbWVudSBuaWwKICAgICAgICcoIklu Zm8iCkBAIC00MjAzLDEyICs0MjAzLDEzIEBAIEluZm8tY29udGV4dC1tZW51CiAgICAgICAg ICA6aGVscCAiR28gZm9yd2FyZCBpbiBoaXN0b3J5Il0pKQogICAgIChkb2xpc3QgKGl0ZW0g KHJldmVyc2UgKGxvb2t1cC1rZXkgZWFzeS1tZW51IFttZW51LWJhciBpbmZvXSkpKQogICAg ICAgKHdoZW4gKGNvbnNwIGl0ZW0pCi0gICAgICAgIChkZWZpbmUta2V5IG1lbnUgKHZlY3Rv ciAoY2FyIGl0ZW0pKSAoY2RyIGl0ZW0pKSkpKQorICAgICAgICAoZGVmaW5lLWtleS1hZnRl ciBtZW51ICh2ZWN0b3IgKGNhciBpdGVtKSkgKGNkciBpdGVtKSAndG9wLXNlcGFyYXRvcikp KSkKIAogICAod2hlbiAobW91c2UtcG9zbi1wcm9wZXJ0eSAoZXZlbnQtc3RhcnQgY2xpY2sp ICdtb3VzZS1mYWNlKQotICAgIChkZWZpbmUta2V5IG1lbnUgW0luZm8tbW91c2UtZm9sbG93 LW5lYXJlc3Qtbm9kZV0KKyAgICAoZGVmaW5lLWtleS1hZnRlciBtZW51IFtJbmZvLW1vdXNl LWZvbGxvdy1uZWFyZXN0LW5vZGVdCiAgICAgICAnKG1lbnUtaXRlbSAiRm9sbG93IExpbmsi IEluZm8tbW91c2UtZm9sbG93LW5lYXJlc3Qtbm9kZQotICAgICAgICAgICAgICAgICAgOmhl bHAgIkZvbGxvdyBhIGxpbmsgd2hlcmUgeW91IGNsaWNrIikpKQorICAgICAgICAgICAgICAg ICAgOmhlbHAgIkZvbGxvdyBhIGxpbmsgd2hlcmUgeW91IGNsaWNrIikKKyAgICAgICd0b3At c2VwYXJhdG9yKSkKIAogICBtZW51KQogCmRpZmYgLS1naXQgYS9saXNwL21vdXNlLmVsIGIv bGlzcC9tb3VzZS5lbAppbmRleCBhZjFlY2ExMmY0Li43NDRkZjVmOTE4IDEwMDY0NAotLS0g YS9saXNwL21vdXNlLmVsCisrKyBiL2xpc3AvbW91c2UuZWwKQEAgLTI4Niw3ICsyODYsMTMg QEAgY29udGV4dC1tZW51LWZ1bmN0aW9ucwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29udGV4dC1tZW51LW1pbm9yKQogICAiTGlzdCBvZiBmdW5jdGlvbnMgdGhh dCBwcm9kdWNlIHRoZSBjb250ZW50cyBvZiB0aGUgY29udGV4dCBtZW51LgogRWFjaCBmdW5j dGlvbiByZWNlaXZlcyB0aGUgbWVudSBhbmQgdGhlIG1vdXNlIGNsaWNrIGV2ZW50IGFzIGl0 cyBhcmd1bWVudHMKLWFuZCBzaG91bGQgcmV0dXJuIHRoZSBzYW1lIG1lbnUgd2l0aCBjaGFu Z2VzIHN1Y2ggYXMgYWRkZWQgbmV3IG1lbnUgaXRlbXMuIgorYW5kIHNob3VsZCByZXR1cm4g dGhlIHNhbWUgbWVudSB3aXRoIGNoYW5nZXMgc3VjaCBhcyBhZGRlZCBuZXcgbWVudSBpdGVt cy4KKworRnVuY3Rpb25zIGNhbiBpbnNlcnQgbmV3IG1lbnUgaXRlbXMgaW4gd2hhdGV2ZXIg b3JkZXIgbWFrZXMgc2Vuc2UgdG8gdGhlbS4KK1RvIGhlbHAgc2ltcGxpZnkgdGhlIHBsYWNl bWVudCBvZiBuZXcgaXRlbXMsIHRoZSBtZW51IHByb3ZpZGVzIHRoZQorc2VwYXJhdG9ycyBg dG9wLXNlcGFyYXRvcicgYW5kIGBtaWRkbGUtc2VwYXJhdG9yJywgd2hpY2ggY2FuIGJlIHBh c3NlZCBhcwordGhlIGxhc3QgYXJndW1lbnQgdG8gYGRlZmluZS1rZXktYWZ0ZXInIGluIG9y ZGVyIHRvIHBvc2l0aW9uIHRoZSBuZXcgaXRlbQorYWNjb3JkaW5nbHkuIgogICA6dHlwZSAn KHJlcGVhdAogICAgICAgICAgIChjaG9pY2UgKGZ1bmN0aW9uLWl0ZW0gY29udGV4dC1tZW51 LXVuZG8pCiAgICAgICAgICAgICAgICAgICAoZnVuY3Rpb24taXRlbSBjb250ZXh0LW1lbnUt cmVnaW9uKQpAQCAtMzE5LDYgKzMyNSw5IEBAIGNvbnRleHQtbWVudS1tYXAKICAgICAgICAg IChjbGljayAob3IgY2xpY2sgbGFzdC1pbnB1dC1ldmVudCkpCiAgICAgICAgICAoZnVuICht b3VzZS1wb3NuLXByb3BlcnR5IChldmVudC1zdGFydCBjbGljaykKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJ2NvbnRleHQtbWVudS1mdW5jdGlvbikpKQorICAgIDs7 IEFkZCBhIHNlcGFyYXRvciB0byB0aGUgdG9wIG9mIHRoZSBtZW51IHRvIHByb3ZpZGUgYW4g YW5jaG9yIGZvcgorICAgIDs7IGNvbnRleHQgbWVudSBmdW5jdGlvbnMgdG8gdXNlLgorICAg IChkZWZpbmUta2V5LWFmdGVyIG1lbnUgW3RvcC1zZXBhcmF0b3JdIG1lbnUtYmFyLXNlcGFy YXRvcikKIAogICAgIChpZiAoZnVuY3Rpb25wIGZ1bikKICAgICAgICAgKHNldHEgbWVudSAo ZnVuY2FsbCBmdW4gbWVudSBjbGljaykpCmRpZmYgLS1naXQgYS9saXNwL25ldC9ld3cuZWwg Yi9saXNwL25ldC9ld3cuZWwKaW5kZXggZTg2ZDIxZjg4OS4uNzMwM2UwMWEzNyAxMDA2NDQK LS0tIGEvbGlzcC9uZXQvZXd3LmVsCisrKyBiL2xpc3AvbmV0L2V3dy5lbApAQCAtMTEwNiw3 ICsxMTA2LDcgQEAgZXd3LW1vZGUtbWFwCiAKIChkZWZ1biBld3ctY29udGV4dC1tZW51ICht ZW51IGNsaWNrKQogICAiUG9wdWxhdGUgTUVOVSB3aXRoIGV3dyBjb21tYW5kcyBhdCBDTElD Sy4iCi0gIChkZWZpbmUta2V5IG1lbnUgW2V3dy1zZXBhcmF0b3JdIG1lbnUtYmFyLXNlcGFy YXRvcikKKyAgKGRlZmluZS1rZXktYWZ0ZXIgbWVudSBbZXd3LXNlcGFyYXRvcl0gbWVudS1i YXItc2VwYXJhdG9yICd0b3Atc2VwYXJhdG9yKQogICAobGV0ICgoZWFzeS1tZW51IChtYWtl LXNwYXJzZS1rZXltYXAgIkV3dyIpKSkKICAgICAoZWFzeS1tZW51LWRlZmluZSBuaWwgZWFz eS1tZW51IG5pbAogICAgICAgJygiRXd3IgpAQCAtMTExNywyMCArMTExNywyMiBAQCBld3ct Y29udGV4dC1tZW51CiAJWyJSZWxvYWQiIGV3dy1yZWxvYWQgdF0pKQogICAgIChkb2xpc3Qg KGl0ZW0gKHJldmVyc2UgKGxvb2t1cC1rZXkgZWFzeS1tZW51IFttZW51LWJhciBld3ddKSkp CiAgICAgICAod2hlbiAoY29uc3AgaXRlbSkKLSAgICAgICAgKGRlZmluZS1rZXkgbWVudSAo dmVjdG9yIChjYXIgaXRlbSkpIChjZHIgaXRlbSkpKSkpCisgICAgICAgIChkZWZpbmUta2V5 LWFmdGVyIG1lbnUgKHZlY3RvciAoY2FyIGl0ZW0pKSAoY2RyIGl0ZW0pICd0b3Atc2VwYXJh dG9yKSkpKQogCiAgICh3aGVuIChvciAobW91c2UtcG9zbi1wcm9wZXJ0eSAoZXZlbnQtc3Rh cnQgY2xpY2spICdzaHItdXJsKQogICAgICAgICAgICAgKG1vdXNlLXBvc24tcHJvcGVydHkg KGV2ZW50LXN0YXJ0IGNsaWNrKSAnaW1hZ2UtdXJsKSkKLSAgICAoZGVmaW5lLWtleSBtZW51 IFtzaHItbW91c2UtYnJvd3NlLXVybC1uZXctd2luZG93XQorICAgIChkZWZpbmUta2V5LWFm dGVyIG1lbnUgW3Noci1tb3VzZS1icm93c2UtdXJsLW5ldy13aW5kb3ddCiAgICAgICBgKG1l bnUtaXRlbSAiRm9sbG93IFVSTCBpbiBuZXcgd2luZG93IiAsKGlmIGJyb3dzZS11cmwtbmV3 LXdpbmRvdy1mbGFnCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICdzaHItbW91c2UtYnJvd3NlLXVybAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3Noci1tb3VzZS1icm93c2UtdXJsLW5ldy13 aW5kb3cpCi0gICAgICAgICAgICAgICAgICA6aGVscCAiQnJvd3NlIHRoZSBVUkwgdW5kZXIg dGhlIG1vdXNlIGN1cnNvciBpbiBhIG5ldyB3aW5kb3ciKSkKLSAgICAoZGVmaW5lLWtleSBt ZW51IFtzaHItbW91c2UtYnJvd3NlLXVybF0KKyAgICAgICAgICAgICAgICAgIDpoZWxwICJC cm93c2UgdGhlIFVSTCB1bmRlciB0aGUgbW91c2UgY3Vyc29yIGluIGEgbmV3IHdpbmRvdyIp CisgICAgICAndG9wLXNlcGFyYXRvcikKKyAgICAoZGVmaW5lLWtleS1hZnRlciBtZW51IFtz aHItbW91c2UtYnJvd3NlLXVybF0KICAgICAgIGAobWVudS1pdGVtICJGb2xsb3cgVVJMIiAs KGlmIGJyb3dzZS11cmwtbmV3LXdpbmRvdy1mbGFnCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnc2hyLW1vdXNlLWJyb3dzZS11cmwtbmV3LXdpbmRvdwogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICdzaHItbW91c2UtYnJvd3NlLXVybCkKLSAg ICAgICAgICAgICAgICAgIDpoZWxwICJCcm93c2UgdGhlIFVSTCB1bmRlciB0aGUgbW91c2Ug Y3Vyc29yIikpKQorICAgICAgICAgICAgICAgICAgOmhlbHAgIkJyb3dzZSB0aGUgVVJMIHVu ZGVyIHRoZSBtb3VzZSBjdXJzb3IiKQorICAgICAgJ3RvcC1zZXBhcmF0b3IpKQogCiAgIG1l bnUpCiAKZGlmZiAtLWdpdCBhL2xpc3AvbmV0L2dvdG8tYWRkci5lbCBiL2xpc3AvbmV0L2dv dG8tYWRkci5lbAppbmRleCA4NDhiYWQzYjBkLi5iYjBmMGIwMGVlIDEwMDY0NAotLS0gYS9s aXNwL25ldC9nb3RvLWFkZHIuZWwKKysrIGIvbGlzcC9uZXQvZ290by1hZGRyLmVsCkBAIC0x MjcsMTAgKzEyNywxMiBAQCBnb3RvLWFkZHJlc3MtaGlnaGxpZ2h0LWtleW1hcAogKGRlZnVu IGdvdG8tYWRkcmVzcy1jb250ZXh0LW1lbnUgKG1lbnUgY2xpY2spCiAgICJQb3B1bGF0ZSBN RU5VIHdpdGggYGdvdG8tYWRkcmVzcycgY29tbWFuZHMgYXQgQ0xJQ0suIgogICAod2hlbiAo bW91c2UtcG9zbi1wcm9wZXJ0eSAoZXZlbnQtc3RhcnQgY2xpY2spICdnb3RvLWFkZHJlc3Mp Ci0gICAgKGRlZmluZS1rZXkgbWVudSBbZ290by1hZGRyZXNzLXNlcGFyYXRvcl0gbWVudS1i YXItc2VwYXJhdG9yKQotICAgIChkZWZpbmUta2V5IG1lbnUgW2dvdG8tYWRkcmVzcy1hdC1t b3VzZV0KKyAgICAoZGVmaW5lLWtleS1hZnRlciBtZW51IFtnb3RvLWFkZHJlc3Mtc2VwYXJh dG9yXSBtZW51LWJhci1zZXBhcmF0b3IKKyAgICAgICd0b3Atc2VwYXJhdG9yKQorICAgIChk ZWZpbmUta2V5LWFmdGVyIG1lbnUgW2dvdG8tYWRkcmVzcy1hdC1tb3VzZV0KICAgICAgICco bWVudS1pdGVtICJGb2xsb3cgTGluayIgZ290by1hZGRyZXNzLWF0LW1vdXNlCi0gICAgICAg ICAgICAgICAgICA6aGVscCAiRm9sbG93IGEgbGluayB3aGVyZSB5b3UgY2xpY2siKSkpCisg ICAgICAgICAgICAgICAgICA6aGVscCAiRm9sbG93IGEgbGluayB3aGVyZSB5b3UgY2xpY2si KQorICAgICAgJ3RvcC1zZXBhcmF0b3IpKQogICBtZW51KQogCiAoZGVmY3VzdG9tIGdvdG8t YWRkcmVzcy11cmwtZmFjZSAnbGluawotLSAKMi4yNS4xCgo= --------------2E6081CC01A1698AE7EF2A8D--