From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=ham autolearn_force=no version=3.4.2 Received: from inbox.vuxu.org (localhost [IPv6:::1]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id e64dcc14 for ; Thu, 23 Jan 2020 23:03:14 +0000 (UTC) Content-Type: multipart/mixed; boundary="===============8997154475000581067==" MIME-Version: 1.0 Subject: Re: [PR PATCH] [Updated] python3-pyside2: extend Qt support to 5.12..5.14 To: ml@inbox.vuxu.org From: voidlinux-github@inbox.vuxu.org Reply-to: ml@inbox.vuxu.org In-Reply-To: References: Date: Fri, 24 Jan 2020 00:03:14 +0100 Message-ID: <20200123230314.TCKE2YUeuCCNKxsu0-3tAkrIbp5goj4sG5D1mJskO3s@z> GitHub notification mails are now in MIME to allow UTF8. --===============8997154475000581067== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 VGhlcmUgaXMgYW4gdXBkYXRlZCBwdWxsIHJlcXVlc3QgYnkgeW9waXRvIGFnYWluc3QgbWFzdGVy IG9uIHRoZSB2b2lkLXBhY2thZ2VzIHJlcG9zaXRvcnkKCmh0dHBzOi8vZ2l0aHViLmNvbS95b3Bp dG8vdm9pZC1wYWNrYWdlcyBweXNpZGUyLmV4dGVuZC5xdC5zdXBwb3J0Cmh0dHBzOi8vZ2l0aHVi LmNvbS92b2lkLWxpbnV4L3ZvaWQtcGFja2FnZXMvcHVsbC8xODUxOQoKcHl0aG9uMy1weXNpZGUy OiBleHRlbmQgUXQgc3VwcG9ydCB0byA1LjEyLi41LjE0CgoKQSBwYXRjaCBmaWxlIGZyb20gaHR0 cHM6Ly9naXRodWIuY29tL3ZvaWQtbGludXgvdm9pZC1wYWNrYWdlcy9wdWxsLzE4NTE5LnBhdGNo IGlzIGF0dGFjaGVk --===============8997154475000581067== Content-Type: text/x-diff MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="github-pr-pyside2.extend.qt.support-18519.patch" RnJvbSBlYTc3ZTJkMTZiNTIyOGJiZGQ1M2YwMjY1OGUxNmJkZWNiZjhlMDM1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiB5b3BpdG8gPHBpZXJyZS5ib3VyZ2luQGZyZWUuZnI+CkRhdGU6 IFdlZCwgMjIgSmFuIDIwMjAgMTk6MjQ6MjQgKzAxMDAKU3ViamVjdDogW1BBVENIXSBweXRob24z LXB5c2lkZTI6IGV4dGVuZCBRdCBzdXBwb3J0IHRvIDUuMTIuLjUuMTQKCltjaSBza2lwXQotLS0K IC4uLi9wYXRjaGVzL2FkZC1xdC01LjEyLTUuMTMtc3VwcG9ydC5wYXRjaCAgICB8IDI4OCArKysr KysrKysrKysrKysrKysKIC4uLjUuMTMtc3VwcG9ydC1jb3JlLXFtZXNzYWdlbG9nY29udGV4dC5w YXRjaCB8ICAxNiAtCiBzcmNwa2dzL3B5dGhvbjMtcHlzaWRlMi90ZW1wbGF0ZSAgICAgICAgICAg ICAgfCAgIDQgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMjg5IGluc2VydGlvbnMoKyksIDE5IGRlbGV0 aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IHNyY3BrZ3MvcHl0aG9uMy1weXNpZGUyL3BhdGNo ZXMvYWRkLXF0LTUuMTItNS4xMy1zdXBwb3J0LnBhdGNoCiBkZWxldGUgbW9kZSAxMDA2NDQgc3Jj cGtncy9weXRob24zLXB5c2lkZTIvcGF0Y2hlcy9xdC01LjEzLXN1cHBvcnQtY29yZS1xbWVzc2Fn ZWxvZ2NvbnRleHQucGF0Y2gKCmRpZmYgLS1naXQgYS9zcmNwa2dzL3B5dGhvbjMtcHlzaWRlMi9w YXRjaGVzL2FkZC1xdC01LjEyLTUuMTMtc3VwcG9ydC5wYXRjaCBiL3NyY3BrZ3MvcHl0aG9uMy1w eXNpZGUyL3BhdGNoZXMvYWRkLXF0LTUuMTItNS4xMy1zdXBwb3J0LnBhdGNoCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi41OGU2YTA5MWQ1ZgotLS0gL2Rldi9udWxsCisr KyBiL3NyY3BrZ3MvcHl0aG9uMy1weXNpZGUyL3BhdGNoZXMvYWRkLXF0LTUuMTItNS4xMy1zdXBw b3J0LnBhdGNoCkBAIC0wLDAgKzEsMjg4IEBACit1cHN0cmVhbSBzb3VyY2U6IGh0dHBzOi8vYnVn cmVwb3J0cy5xdC5pby9icm93c2UvUFlTSURFLTExOTEKKworRnJvbSBkZGNhZTM1Y2IzMmFmZjkw ZmNkODFjNDgwYWVkYzMwYTcwMDQwMWE2IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTog RnJpZWRlbWFubiBLbGVpbnQgPEZyaWVkZW1hbm4uS2xlaW50QHF0LmlvPgorRGF0ZTogTW9uLCAy MCBKYW4gMjAyMCAxNzozNjoyNyArMDEwMAorU3ViamVjdDogW1BBVENIXSBzaGlib2tlbjogSW50 cm9kdWNlICJ1bnRpbCIgdmVyc2lvbiBhdHRyaWJ1dGUgYXMgb3Bwb3NpdGUgb2YgInNpbmNlIgor CitQcm90b3R5cGljYWxseSB1c2UgaXQgZm9yIFFNZXNzYWdlTG9nQ29udGV4dCwgYWxsb3dpbmcg dG8gZWxlZ2FudGx5CitidWlsZCBmb3IgUXQgZnJvbSB2ZXJzaW9uIDUuMTIuLm5vdyB1c2luZyBh IHNpbmdsZSB0eXBlIHN5c3RlbSBmaWxlLgorCitGaXhlczogUFlTSURFLTExOTEKK0NoYW5nZS1J ZDogSWFhN2JkYzEwYzcxMjlkODRjNTRlODVhMDlhMWM4MDJhNDA5NzA4ZjkKKworLS0tIHNvdXJj ZXMvcHlzaWRlMi9QeVNpZGUyL1F0Q29yZS90eXBlc3lzdGVtX2NvcmVfY29tbW9uLnhtbAorKysr IHNvdXJjZXMvcHlzaWRlMi9QeVNpZGUyL1F0Q29yZS90eXBlc3lzdGVtX2NvcmVfY29tbW9uLnht bAorQEAgLTI4MzAsNyArMjgzMCwxMSBAQAorICAgICA8aW5jbHVkZSBmaWxlLW5hbWU9InFvYmpl Y3RkZWZzLmgiIGxvY2F0aW9uPSJnbG9iYWwiLz4KKyAgIDwvdmFsdWUtdHlwZT4KKyAKKy0gIDxv YmplY3QtdHlwZSBuYW1lPSJRTWVzc2FnZUxvZ0NvbnRleHQiLz4KKysgIDxvYmplY3QtdHlwZSBu YW1lPSJRTWVzc2FnZUxvZ0NvbnRleHQiIHNpbmNlPSI1LjE0Ii8+CisrCisrICA8b2JqZWN0LXR5 cGUgbmFtZT0iUU1lc3NhZ2VMb2dDb250ZXh0IiBzaW5jZT0iNS45IiB1bnRpbD0iNS4xMy4yIj4K KysgICAgPG1vZGlmeS1mdW5jdGlvbiBzaWduYXR1cmU9ImNvcHkoY29uc3QgUU1lc3NhZ2VMb2dD b250ZXh0ICZhbXA7KSIgcmVtb3ZlPSJhbGwiLz4KKysgIDwvb2JqZWN0LXR5cGU+CisgCisgICA8 dmFsdWUtdHlwZSBuYW1lPSJRTWV0YU1ldGhvZCI+CisgICAgIDxlbnVtLXR5cGUgbmFtZT0iQWNj ZXNzIi8+CistLS0gc291cmNlcy9zaGlib2tlbjIvQXBpRXh0cmFjdG9yL3Rlc3RzL3Rlc3R0eXBl cmV2aXNpb24uY3BwCisrKysgc291cmNlcy9zaGlib2tlbjIvQXBpRXh0cmFjdG9yL3Rlc3RzL3Rl c3R0eXBlcmV2aXNpb24uY3BwCitAQCAtNzcsNiArNzcsNyBAQAorICAgICBRVGVzdDo6bmV3Um93 KCJub25lIikgPDwgUVN0cmluZygpIDw8IDI7CisgICAgIFFUZXN0OjpuZXdSb3coIjEuMCIpIDw8 IFFTdHJpbmc6OmZyb21MYXRpbjEoIjEuMCIpIDw8IDE7ICAvLyBCYXIyMCBleGNsdWRlZAorICAg ICBRVGVzdDo6bmV3Um93KCIyLjAiKSA8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCIyLjAiKSA8PCAy OworKyAgICBRVGVzdDo6bmV3Um93KCIzLjAiKSA8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCIzLjAi KSA8PCAxOyAgLy8gQmFyIGV4Y2x1ZGVkIGJ5ICJ1bnRpbCIKKyB9CisgCisgdm9pZCBUZXN0VHlw ZVJldmlzaW9uOjp0ZXN0VmVyc2lvbigpCitAQCAtOTAsNyArOTEsNyBAQAorIClDUFAiOworICAg ICBjb25zdCBjaGFyIHhtbENvZGVbXSA9IFIiWE1MKAorIDx0eXBlc3lzdGVtIHBhY2thZ2U9IkZv byI+CistICAgIDx2YWx1ZS10eXBlIG5hbWU9IkJhciIvPgorKyAgICA8dmFsdWUtdHlwZSBuYW1l PSJCYXIiIHVudGlsPSIyLjAiLz4KKyAgICAgPHZhbHVlLXR5cGUgbmFtZT0iQmFyMjAiIHNpbmNl PSIyLjAiLz4KKyA8L3R5cGVzeXN0ZW0+CisgKVhNTCI7CistLS0gc291cmNlcy9zaGlib2tlbjIv QXBpRXh0cmFjdG9yL3R5cGVkYXRhYmFzZS5jcHAKKysrKyBzb3VyY2VzL3NoaWJva2VuMi9BcGlF eHRyYWN0b3IvdHlwZWRhdGFiYXNlLmNwcAorQEAgLTc0NiwxNCArNzQ2LDE1IEBACisgfQorIAor IGJvb2wgVHlwZURhdGFiYXNlOjpjaGVja0FwaVZlcnNpb24oY29uc3QgUVN0cmluZyAmcGFja2Fn ZSwKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFFWZXJzaW9uTnVt YmVyICZ2ZXJzaW9uTnVtYmVyKQorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgVmVyc2lvblJhbmdlICZ2cikKKyB7CisgICAgIGNvbnN0IEFwaVZlcnNpb25zICZ2ZXJz aW9ucyA9ICphcGlWZXJzaW9ucygpOworICAgICBpZiAodmVyc2lvbnMuaXNFbXB0eSgpKSAvLyBO b3RoaW5nIHNwZWNpZmllZDogdXNlIGxhdGVzdC4KKyAgICAgICAgIHJldHVybiB0cnVlOworICAg ICBmb3IgKGludCBpID0gMCwgc2l6ZSA9IHZlcnNpb25zLnNpemUoKTsgaSA8IHNpemU7ICsraSkg eworICAgICAgICAgaWYgKHZlcnNpb25zLmF0KGkpLmZpcnN0Lm1hdGNoKHBhY2thZ2UpLmhhc01h dGNoKCkpCistICAgICAgICAgICAgcmV0dXJuIHZlcnNpb25zLmF0KGkpLnNlY29uZCA+PSB2ZXJz aW9uTnVtYmVyOworKyAgICAgICAgICAgIHJldHVybiB2ZXJzaW9ucy5hdChpKS5zZWNvbmQgPj0g dnIuc2luY2UKKysgICAgICAgICAgICAgICAgJiYgdmVyc2lvbnMuYXQoaSkuc2Vjb25kIDw9IHZy LnVudGlsOworICAgICB9CisgICAgIHJldHVybiBmYWxzZTsKKyB9CistLS0gc291cmNlcy9zaGli b2tlbjIvQXBpRXh0cmFjdG9yL3R5cGVkYXRhYmFzZS5oCisrKysgc291cmNlcy9zaGlib2tlbjIv QXBpRXh0cmFjdG9yL3R5cGVkYXRhYmFzZS5oCitAQCAtMzcsOSArMzcsOSBAQAorIAorICNpbmNs dWRlIDxRdENvcmUvUVJlZ3VsYXJFeHByZXNzaW9uPgorICNpbmNsdWRlIDxRdENvcmUvUVN0cmlu Z0xpc3Q+CisrI2luY2x1ZGUgPFF0Q29yZS9RVmVyc2lvbk51bWJlcj4KKyAKKyBRVF9GT1JXQVJE X0RFQ0xBUkVfQ0xBU1MoUUlPRGV2aWNlKQorLVFUX0ZPUldBUkRfREVDTEFSRV9DTEFTUyhRVmVy c2lvbk51bWJlcikKKyAKKyBjbGFzcyBDb21wbGV4VHlwZUVudHJ5OworIGNsYXNzIENvbnRhaW5l clR5cGVFbnRyeTsKK0BAIC02MCw2ICs2MCwxOCBAQAorIGNsYXNzIFByaW1pdGl2ZVR5cGVFbnRy eTsKKyBjbGFzcyBUeXBlU3lzdGVtVHlwZUVudHJ5OworIAorK3N0cnVjdCBWZXJzaW9uUmFuZ2UK Kyt7CisrICAgIGJvb2wgaXNOdWxsKCkgY29uc3QKKysgICAgeworKyAgICAgICAgcmV0dXJuIHNp bmNlLm1ham9yVmVyc2lvbigpID09IDAgJiYgc2luY2UubWlub3JWZXJzaW9uKCkgPT0gMAorKyAg ICAgICAgICAgICYmIHVudGlsLm1ham9yVmVyc2lvbigpID09IDk5OTkgJiYgdW50aWwubWlub3JW ZXJzaW9uKCkgPT0gOTk5OTsKKysgICAgfQorKworKyAgICBRVmVyc2lvbk51bWJlciBzaW5jZXsw LCAwfTsKKysgICAgUVZlcnNpb25OdW1iZXIgdW50aWx7OTk5OSwgOTk5OX07CisrfTsKKysKKyBj bGFzcyBUeXBlRGF0YWJhc2UKKyB7CisgICAgIFR5cGVEYXRhYmFzZSgpOworQEAgLTE1Myw3ICsx NjUsNyBAQAorICAgICBzdGF0aWMgYm9vbCBzZXRBcGlWZXJzaW9uKGNvbnN0IFFTdHJpbmcgJnBh Y2thZ2UsIGNvbnN0IFFTdHJpbmcgJnZlcnNpb24pOworICAgICBzdGF0aWMgdm9pZCBjbGVhckFw aVZlcnNpb25zKCk7CisgCistICAgIHN0YXRpYyBib29sIGNoZWNrQXBpVmVyc2lvbihjb25zdCBR U3RyaW5nICZwYWNrYWdlLCBjb25zdCBRVmVyc2lvbk51bWJlciAmdmVyc2lvbik7CisrICAgIHN0 YXRpYyBib29sIGNoZWNrQXBpVmVyc2lvbihjb25zdCBRU3RyaW5nICZwYWNrYWdlLCBjb25zdCBW ZXJzaW9uUmFuZ2UgJnZyKTsKKyAKKyAgICAgYm9vbCBoYXNEcm9wcGVkVHlwZUVudHJpZXMoKSBj b25zdCB7IHJldHVybiAhbV9kcm9wVHlwZUVudHJpZXMuaXNFbXB0eSgpOyB9CisgCistLS0gc291 cmNlcy9zaGlib2tlbjIvQXBpRXh0cmFjdG9yL3R5cGVzeXN0ZW1wYXJzZXIuY3BwCisrKysgc291 cmNlcy9zaGlib2tlbjIvQXBpRXh0cmFjdG9yL3R5cGVzeXN0ZW1wYXJzZXIuY3BwCitAQCAtNTYs NiArNTYsNyBAQAorIHN0YXRpYyBpbmxpbmUgUVN0cmluZyB0ZXh0QXR0cmlidXRlKCkgeyByZXR1 cm4gUVN0cmluZ0xpdGVyYWwoInRleHQiKTsgfQorIHN0YXRpYyBpbmxpbmUgUVN0cmluZyBuYW1l QXR0cmlidXRlKCkgeyByZXR1cm4gUVN0cmluZ0xpdGVyYWwoIm5hbWUiKTsgfQorIHN0YXRpYyBp bmxpbmUgUVN0cmluZyBzaW5jZUF0dHJpYnV0ZSgpIHsgcmV0dXJuIFFTdHJpbmdMaXRlcmFsKCJz aW5jZSIpOyB9Cisrc3RhdGljIGlubGluZSBRU3RyaW5nIHVudGlsQXR0cmlidXRlKCkgeyByZXR1 cm4gUVN0cmluZ0xpdGVyYWwoInVudGlsIik7IH0KKyBzdGF0aWMgaW5saW5lIFFTdHJpbmcgZGVm YXVsdFN1cGVyY2xhc3NBdHRyaWJ1dGUoKSB7IHJldHVybiBRU3RyaW5nTGl0ZXJhbCgiZGVmYXVs dC1zdXBlcmNsYXNzIik7IH0KKyBzdGF0aWMgaW5saW5lIFFTdHJpbmcgZGVsZXRlSW5NYWluVGhy ZWFkQXR0cmlidXRlKCkgeyByZXR1cm4gUVN0cmluZ0xpdGVyYWwoImRlbGV0ZS1pbi1tYWluLXRo cmVhZCIpOyB9Cisgc3RhdGljIGlubGluZSBRU3RyaW5nIGRlcHJlY2F0ZWRBdHRyaWJ1dGUoKSB7 IHJldHVybiBRU3RyaW5nTGl0ZXJhbCgiZGVwcmVjYXRlZCIpOyB9CitAQCAtMjU4Miw2ICsyNTgz LDE3IEBACisgICAgIHJldHVybiB0cnVlOworIH0KKyAKKytzdGF0aWMgYm9vbCBwYXJzZVZlcnNp b24oY29uc3QgUVN0cmluZyAmdmVyc2lvblNwZWMsIGNvbnN0IFFTdHJpbmcgJnBhY2thZ2UsCisr ICAgICAgICAgICAgICAgICAgICAgICAgIFFWZXJzaW9uTnVtYmVyICpyZXN1bHQsIFFTdHJpbmcg KmVycm9yTWVzc2FnZSkKKyt7CisrICAgICpyZXN1bHQgPSBRVmVyc2lvbk51bWJlcjo6ZnJvbVN0 cmluZyh2ZXJzaW9uU3BlYyk7CisrICAgIGlmIChyZXN1bHQtPmlzTnVsbCgpKSB7CisrICAgICAg ICAqZXJyb3JNZXNzYWdlID0gbXNnSW52YWxpZFZlcnNpb24odmVyc2lvblNwZWMsIHBhY2thZ2Up OworKyAgICAgICAgcmV0dXJuIGZhbHNlOworKyAgICB9CisrICAgIHJldHVybiB0cnVlOworK30K KysKKyBib29sIFR5cGVTeXN0ZW1QYXJzZXI6OnN0YXJ0RWxlbWVudChjb25zdCBRWG1sU3RyZWFt UmVhZGVyICZyZWFkZXIpCisgeworICAgICBpZiAobV9pZ25vcmVEZXB0aCkgeworQEAgLTI1OTIs MjAgKzI2MDQsMjUgQEAKKyAgICAgY29uc3QgUVN0cmluZ1JlZiB0YWdOYW1lID0gcmVhZGVyLm5h bWUoKTsKKyAgICAgUVhtbFN0cmVhbUF0dHJpYnV0ZXMgYXR0cmlidXRlcyA9IHJlYWRlci5hdHRy aWJ1dGVzKCk7CisgCistICAgIFFWZXJzaW9uTnVtYmVyIHNpbmNlKDAsIDApOworLSAgICBpbnQg aW5kZXggPSBpbmRleE9mQXR0cmlidXRlKGF0dHJpYnV0ZXMsIHNpbmNlQXR0cmlidXRlKCkpOwor LSAgICBpZiAoaW5kZXggIT0gLTEpIHsKKy0gICAgICAgIGNvbnN0IFFTdHJpbmdSZWYgc2luY2VT cGVjID0gYXR0cmlidXRlcy50YWtlQXQoaW5kZXgpLnZhbHVlKCk7CistICAgICAgICBzaW5jZSA9 IFFWZXJzaW9uTnVtYmVyOjpmcm9tU3RyaW5nKHNpbmNlU3BlYy50b1N0cmluZygpKTsKKy0gICAg ICAgIGlmIChzaW5jZS5pc051bGwoKSkgeworLSAgICAgICAgICAgIG1fZXJyb3IgPSBtc2dJbnZh bGlkVmVyc2lvbihzaW5jZVNwZWMsIG1fZGVmYXVsdFBhY2thZ2UpOworLSAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKysgICAgVmVyc2lvblJhbmdlIHZlcnNpb25SYW5nZTsKKysgICAgZm9yIChp bnQgaSA9IGF0dHJpYnV0ZXMuc2l6ZSgpIC0gMTsgaSA+PSAwOyAtLWkpIHsKKysgICAgICAgIGNv bnN0IFFTdHJpbmdSZWYgbmFtZSA9IGF0dHJpYnV0ZXMuYXQoaSkucXVhbGlmaWVkTmFtZSgpOwor KyAgICAgICAgaWYgKG5hbWUgPT0gc2luY2VBdHRyaWJ1dGUoKSkgeworKyAgICAgICAgICAgIGlm ICghcGFyc2VWZXJzaW9uKGF0dHJpYnV0ZXMudGFrZUF0KGkpLnZhbHVlKCkudG9TdHJpbmcoKSwK KysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2RlZmF1bHRQYWNrYWdlLCAmdmVyc2lv blJhbmdlLnNpbmNlLCAmbV9lcnJvcikpIHsKKysgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworKyAgICAgICAgICAgIH0KKysgICAgICAgIH0gZWxzZSBpZiAobmFtZSA9PSB1bnRpbEF0dHJp YnV0ZSgpKSB7CisrICAgICAgICAgICAgaWYgKCFwYXJzZVZlcnNpb24oYXR0cmlidXRlcy50YWtl QXQoaSkudmFsdWUoKS50b1N0cmluZygpLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1fZGVmYXVsdFBhY2thZ2UsICZ2ZXJzaW9uUmFuZ2UudW50aWwsICZtX2Vycm9yKSkgeworKyAg ICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisrICAgICAgICAgICAgfQorICAgICAgICAgfQor ICAgICB9CisgCistICAgIGlmICghbV9kZWZhdWx0UGFja2FnZS5pc0VtcHR5KCkgJiYgc2luY2Ug PiBRVmVyc2lvbk51bWJlcigwLCAwKSkgeworKyAgICBpZiAoIW1fZGVmYXVsdFBhY2thZ2UuaXNF bXB0eSgpICYmICF2ZXJzaW9uUmFuZ2UuaXNOdWxsKCkpIHsKKyAgICAgICAgIFR5cGVEYXRhYmFz ZSogdGQgPSBUeXBlRGF0YWJhc2U6Omluc3RhbmNlKCk7CistICAgICAgICBpZiAoIXRkLT5jaGVj a0FwaVZlcnNpb24obV9kZWZhdWx0UGFja2FnZSwgc2luY2UpKSB7CisrICAgICAgICBpZiAoIXRk LT5jaGVja0FwaVZlcnNpb24obV9kZWZhdWx0UGFja2FnZSwgdmVyc2lvblJhbmdlKSkgeworICAg ICAgICAgICAgICsrbV9pZ25vcmVEZXB0aDsKKyAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICAgICAgIH0KK0BAIC0yNzI0LDE1ICsyNzQxLDE1IEBACisgICAgICAgICBjYXNlIFN0YWNrRWxl bWVudDo6Q3VzdG9tVHlwZUVudHJ5OgorICAgICAgICAgICAgIGlmICghY2hlY2tSb290RWxlbWVu dCgpKQorICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CistICAgICAgICAgICAgZWxlbWVu dC0+ZW50cnkgPSBuZXcgVHlwZUVudHJ5KG5hbWUsIFR5cGVFbnRyeTo6Q3VzdG9tVHlwZSwgc2lu Y2UsIG1fY3VycmVudC0+ZW50cnkpOworKyAgICAgICAgICAgIGVsZW1lbnQtPmVudHJ5ID0gbmV3 IFR5cGVFbnRyeShuYW1lLCBUeXBlRW50cnk6OkN1c3RvbVR5cGUsIHZlcnNpb25SYW5nZS5zaW5j ZSwgbV9jdXJyZW50LT5lbnRyeSk7CisgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICBjYXNl IFN0YWNrRWxlbWVudDo6UHJpbWl0aXZlVHlwZUVudHJ5OgorLSAgICAgICAgICAgIGVsZW1lbnQt PmVudHJ5ID0gcGFyc2VQcmltaXRpdmVUeXBlRW50cnkocmVhZGVyLCBuYW1lLCBzaW5jZSwgJmF0 dHJpYnV0ZXMpOworKyAgICAgICAgICAgIGVsZW1lbnQtPmVudHJ5ID0gcGFyc2VQcmltaXRpdmVU eXBlRW50cnkocmVhZGVyLCBuYW1lLCB2ZXJzaW9uUmFuZ2Uuc2luY2UsICZhdHRyaWJ1dGVzKTsK KyAgICAgICAgICAgICBpZiAoUV9VTkxJS0VMWSghZWxlbWVudC0+ZW50cnkpKQorICAgICAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICBjYXNl IFN0YWNrRWxlbWVudDo6Q29udGFpbmVyVHlwZUVudHJ5OgorLSAgICAgICAgICAgIGlmIChDb250 YWluZXJUeXBlRW50cnkgKmNlID0gcGFyc2VDb250YWluZXJUeXBlRW50cnkocmVhZGVyLCBuYW1l LCBzaW5jZSwgJmF0dHJpYnV0ZXMpKSB7CisrICAgICAgICAgICAgaWYgKENvbnRhaW5lclR5cGVF bnRyeSAqY2UgPSBwYXJzZUNvbnRhaW5lclR5cGVFbnRyeShyZWFkZXIsIG5hbWUsIHZlcnNpb25S YW5nZS5zaW5jZSwgJmF0dHJpYnV0ZXMpKSB7CisgICAgICAgICAgICAgICAgIGFwcGx5Q29tcGxl eFR5cGVBdHRyaWJ1dGVzKHJlYWRlciwgY2UsICZhdHRyaWJ1dGVzKTsKKyAgICAgICAgICAgICAg ICAgZWxlbWVudC0+ZW50cnkgPSBjZTsKKyAgICAgICAgICAgICB9IGVsc2UgeworQEAgLTI3NDEs NyArMjc1OCw3IEBACisgICAgICAgICAgICAgYnJlYWs7CisgCisgICAgICAgICBjYXNlIFN0YWNr RWxlbWVudDo6U21hcnRQb2ludGVyVHlwZUVudHJ5OgorLSAgICAgICAgICAgIGlmIChTbWFydFBv aW50ZXJUeXBlRW50cnkgKnNlID0gcGFyc2VTbWFydFBvaW50ZXJFbnRyeShyZWFkZXIsIG5hbWUs IHNpbmNlLCAmYXR0cmlidXRlcykpIHsKKysgICAgICAgICAgICBpZiAoU21hcnRQb2ludGVyVHlw ZUVudHJ5ICpzZSA9IHBhcnNlU21hcnRQb2ludGVyRW50cnkocmVhZGVyLCBuYW1lLCB2ZXJzaW9u UmFuZ2Uuc2luY2UsICZhdHRyaWJ1dGVzKSkgeworICAgICAgICAgICAgICAgICBhcHBseUNvbXBs ZXhUeXBlQXR0cmlidXRlcyhyZWFkZXIsIHNlLCAmYXR0cmlidXRlcyk7CisgICAgICAgICAgICAg ICAgIGVsZW1lbnQtPmVudHJ5ID0gc2U7CisgICAgICAgICAgICAgfSBlbHNlIHsKK0BAIC0yNzQ5 LDE0ICsyNzY2LDE0IEBACisgICAgICAgICAgICAgfQorICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICAgY2FzZSBTdGFja0VsZW1lbnQ6OkVudW1UeXBlRW50cnk6CistICAgICAgICAgICAgbV9j dXJyZW50RW51bSA9IHBhcnNlRW51bVR5cGVFbnRyeShyZWFkZXIsIG5hbWUsIHNpbmNlLCAmYXR0 cmlidXRlcyk7CisrICAgICAgICAgICAgbV9jdXJyZW50RW51bSA9IHBhcnNlRW51bVR5cGVFbnRy eShyZWFkZXIsIG5hbWUsIHZlcnNpb25SYW5nZS5zaW5jZSwgJmF0dHJpYnV0ZXMpOworICAgICAg ICAgICAgIGlmIChRX1VOTElLRUxZKCFtX2N1cnJlbnRFbnVtKSkKKyAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICAgICAgIGVsZW1lbnQtPmVudHJ5ID0gbV9jdXJyZW50RW51 bTsKKyAgICAgICAgICAgICBicmVhazsKKyAKKyAgICAgICAgIGNhc2UgU3RhY2tFbGVtZW50OjpJ bnRlcmZhY2VUeXBlRW50cnk6CistICAgICAgICAgICAgaWYgKE9iamVjdFR5cGVFbnRyeSAqb2Ug PSBwYXJzZUludGVyZmFjZVR5cGVFbnRyeShyZWFkZXIsIG5hbWUsIHNpbmNlLCAmYXR0cmlidXRl cykpIHsKKysgICAgICAgICAgICBpZiAoT2JqZWN0VHlwZUVudHJ5ICpvZSA9IHBhcnNlSW50ZXJm YWNlVHlwZUVudHJ5KHJlYWRlciwgbmFtZSwgdmVyc2lvblJhbmdlLnNpbmNlLCAmYXR0cmlidXRl cykpIHsKKyAgICAgICAgICAgICAgICAgYXBwbHlDb21wbGV4VHlwZUF0dHJpYnV0ZXMocmVhZGVy LCBvZSwgJmF0dHJpYnV0ZXMpOworICAgICAgICAgICAgICAgICBlbGVtZW50LT5lbnRyeSA9IG9l OworICAgICAgICAgICAgIH0gZWxzZSB7CitAQCAtMjc2NCw3ICsyNzgxLDcgQEAKKyAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICBjYXNlIFN0YWNrRWxlbWVudDo6 VmFsdWVUeXBlRW50cnk6CistICAgICAgICAgICBpZiAoVmFsdWVUeXBlRW50cnkgKnZlID0gcGFy c2VWYWx1ZVR5cGVFbnRyeShyZWFkZXIsIG5hbWUsIHNpbmNlLCAmYXR0cmlidXRlcykpIHsKKysg ICAgICAgICAgIGlmIChWYWx1ZVR5cGVFbnRyeSAqdmUgPSBwYXJzZVZhbHVlVHlwZUVudHJ5KHJl YWRlciwgbmFtZSwgdmVyc2lvblJhbmdlLnNpbmNlLCAmYXR0cmlidXRlcykpIHsKKyAgICAgICAg ICAgICAgICBhcHBseUNvbXBsZXhUeXBlQXR0cmlidXRlcyhyZWFkZXIsIHZlLCAmYXR0cmlidXRl cyk7CisgICAgICAgICAgICAgICAgZWxlbWVudC0+ZW50cnkgPSB2ZTsKKyAgICAgICAgICAgIH0g ZWxzZSB7CitAQCAtMjc3Miw3ICsyNzg5LDcgQEAKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg IGJyZWFrOworICAgICAgICAgY2FzZSBTdGFja0VsZW1lbnQ6Ok5hbWVzcGFjZVR5cGVFbnRyeToK Ky0gICAgICAgICAgICBpZiAoYXV0byBlbnRyeSA9IHBhcnNlTmFtZXNwYWNlVHlwZUVudHJ5KHJl YWRlciwgbmFtZSwgc2luY2UsICZhdHRyaWJ1dGVzKSkKKysgICAgICAgICAgICBpZiAoYXV0byBl bnRyeSA9IHBhcnNlTmFtZXNwYWNlVHlwZUVudHJ5KHJlYWRlciwgbmFtZSwgdmVyc2lvblJhbmdl LnNpbmNlLCAmYXR0cmlidXRlcykpCisgICAgICAgICAgICAgICAgIGVsZW1lbnQtPmVudHJ5ID0g ZW50cnk7CisgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CitAQCAtMjc4MCwxNyArMjc5NywxNyBAQAorICAgICAgICAgY2FzZSBTdGFja0VsZW1lbnQ6Ok9i amVjdFR5cGVFbnRyeToKKyAgICAgICAgICAgICBpZiAoIWNoZWNrUm9vdEVsZW1lbnQoKSkKKyAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworLSAgICAgICAgICAgIGVsZW1lbnQtPmVudHJ5 ID0gbmV3IE9iamVjdFR5cGVFbnRyeShuYW1lLCBzaW5jZSwgY3VycmVudFBhcmVudFR5cGVFbnRy eSgpKTsKKysgICAgICAgICAgICBlbGVtZW50LT5lbnRyeSA9IG5ldyBPYmplY3RUeXBlRW50cnko bmFtZSwgdmVyc2lvblJhbmdlLnNpbmNlLCBjdXJyZW50UGFyZW50VHlwZUVudHJ5KCkpOworICAg ICAgICAgICAgIGFwcGx5Q29tbW9uQXR0cmlidXRlcyhlbGVtZW50LT5lbnRyeSwgJmF0dHJpYnV0 ZXMpOworICAgICAgICAgICAgIGFwcGx5Q29tcGxleFR5cGVBdHRyaWJ1dGVzKHJlYWRlciwgc3Rh dGljX2Nhc3Q8Q29tcGxleFR5cGVFbnRyeSAqPihlbGVtZW50LT5lbnRyeSksICZhdHRyaWJ1dGVz KTsKKyAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgIGNhc2UgU3RhY2tFbGVtZW50OjpGdW5j dGlvblR5cGVFbnRyeToKKy0gICAgICAgICAgICBlbGVtZW50LT5lbnRyeSA9IHBhcnNlRnVuY3Rp b25UeXBlRW50cnkocmVhZGVyLCBuYW1lLCBzaW5jZSwgJmF0dHJpYnV0ZXMpOworKyAgICAgICAg ICAgIGVsZW1lbnQtPmVudHJ5ID0gcGFyc2VGdW5jdGlvblR5cGVFbnRyeShyZWFkZXIsIG5hbWUs IHZlcnNpb25SYW5nZS5zaW5jZSwgJmF0dHJpYnV0ZXMpOworICAgICAgICAgICAgIGlmIChRX1VO TElLRUxZKCFlbGVtZW50LT5lbnRyeSkpCisgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgIGNhc2UgU3RhY2tFbGVtZW50OjpUeXBlZGVm VHlwZUVudHJ5OgorLSAgICAgICAgICAgIGlmIChUeXBlZGVmRW50cnkgKnRlID0gcGFyc2VUeXBl ZGVmRW50cnkocmVhZGVyLCBuYW1lLCBzaW5jZSwgJmF0dHJpYnV0ZXMpKSB7CisrICAgICAgICAg ICAgaWYgKFR5cGVkZWZFbnRyeSAqdGUgPSBwYXJzZVR5cGVkZWZFbnRyeShyZWFkZXIsIG5hbWUs IHZlcnNpb25SYW5nZS5zaW5jZSwgJmF0dHJpYnV0ZXMpKSB7CisgICAgICAgICAgICAgICAgIGFw cGx5Q29tcGxleFR5cGVBdHRyaWJ1dGVzKHJlYWRlciwgdGUsICZhdHRyaWJ1dGVzKTsKKyAgICAg ICAgICAgICAgICAgZWxlbWVudC0+ZW50cnkgPSB0ZTsKKyAgICAgICAgICAgICB9IGVsc2Ugewor QEAgLTI4MzYsNyArMjg1Myw3IEBACisgCisgICAgICAgICBzd2l0Y2ggKGVsZW1lbnQtPnR5cGUp IHsKKyAgICAgICAgIGNhc2UgU3RhY2tFbGVtZW50OjpSb290OgorLSAgICAgICAgICAgIGVsZW1l bnQtPmVudHJ5ID0gcGFyc2VSb290RWxlbWVudChyZWFkZXIsIHNpbmNlLCAmYXR0cmlidXRlcyk7 CisrICAgICAgICAgICAgZWxlbWVudC0+ZW50cnkgPSBwYXJzZVJvb3RFbGVtZW50KHJlYWRlciwg dmVyc2lvblJhbmdlLnNpbmNlLCAmYXR0cmlidXRlcyk7CisgICAgICAgICAgICAgZWxlbWVudC0+ dHlwZSA9IFN0YWNrRWxlbWVudDo6Um9vdDsKKyAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg IGNhc2UgU3RhY2tFbGVtZW50OjpMb2FkVHlwZXN5c3RlbToKKy0tLSBzb3VyY2VzL3NoaWJva2Vu Mi9kb2MvdHlwZXN5c3RlbV9zcGVjaWZ5aW5nX3R5cGVzLnJzdAorKysrIHNvdXJjZXMvc2hpYm9r ZW4yL2RvYy90eXBlc3lzdGVtX3NwZWNpZnlpbmdfdHlwZXMucnN0CitAQCAtMTA0LDYgKzEwNCw3 IEBACisgICAgICAgICA8dHlwZXN5c3RlbT4KKyAgICAgICAgICAgICA8cHJpbWl0aXZlLXR5cGUg bmFtZT0iLi4uIgorICAgICAgICAgICAgICAgICBzaW5jZT0iLi4uIgorKyAgICAgICAgICAgICAg ICB1bnRpbD0iLi4uIgorICAgICAgICAgICAgICAgICB0YXJnZXQtbmFtZT0iLi4uIgorICAgICAg ICAgICAgICAgICBkZWZhdWx0LWNvbnN0cnVjdG9yPSIuLi4iCisgICAgICAgICAgICAgICAgIHBy ZWZlcnJlZC1jb252ZXJzaW9uPSJ5ZXMgfCBubyIgLz4KK0BAIC0xMTQsNyArMTE1LDExIEBACisg ICAgIGxhbmd1YWdlLiBJZiB0aGUgbGF0ZXIgdHdvIGF0dHJpYnV0ZXMgYXJlIG5vdCBzcGVjaWZp ZWQgdGhlaXIgZGVmYXVsdCB2YWx1ZQorICAgICB3aWxsIGJlIHRoZSBzYW1lIGFzIHRoZSAqKm5h bWUqKiBhdHRyaWJ1dGUuCisgCistICAgIFRoZSAqb3B0aW9uYWwqICAqKnNpbmNlKiogdmFsdWUg aXMgdXNlZCB0byBzcGVjaWZ5IHRoZSBBUEkgdmVyc2lvbiBvZiB0aGlzIHR5cGUuCisrICAgIFRo ZSAqb3B0aW9uYWwqICAqKnNpbmNlKiogdmFsdWUgaXMgdXNlZCB0byBzcGVjaWZ5IHRoZSBBUEkg dmVyc2lvbiBpbiB3aGljaAorKyAgICB0aGUgdHlwZSB3YXMgaW50cm9kdWNlZC4KKysKKysgICAg U2ltaWxhcmx5LCB0aGUgKm9wdGlvbmFsKiAgKip1bnRpbCoqIHZhbHVlIGNhbiBiZSB1c2VkIHRv IHNwZWNpZnkgdGhlIEFQSQorKyAgICB2ZXJzaW9uIGluIHdoaWNoIHRoZSB0eXBlIHdpbGwgYmUg b2Jzb2xldGVkLgorIAorICAgICBJZiB0aGUgKm9wdGlvbmFsKiAqKnByZWZlcnJlZC1jb252ZXJz aW9uKiogYXR0cmlidXRlIGlzIHNldCB0byAqbm8qLCBpdAorICAgICBpbmRpY2F0ZXMgdGhhdCB0 aGlzIHZlcnNpb24gb2YgdGhlIHByaW1pdGl2ZSB0eXBlIGlzIG5vdCB0aGUgcHJlZmVycmVkIEMr KwpkaWZmIC0tZ2l0IGEvc3JjcGtncy9weXRob24zLXB5c2lkZTIvcGF0Y2hlcy9xdC01LjEzLXN1 cHBvcnQtY29yZS1xbWVzc2FnZWxvZ2NvbnRleHQucGF0Y2ggYi9zcmNwa2dzL3B5dGhvbjMtcHlz aWRlMi9wYXRjaGVzL3F0LTUuMTMtc3VwcG9ydC1jb3JlLXFtZXNzYWdlbG9nY29udGV4dC5wYXRj aApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggOTY2NDRiNTk2YmYuLjAwMDAwMDAwMDAw Ci0tLSBhL3NyY3BrZ3MvcHl0aG9uMy1weXNpZGUyL3BhdGNoZXMvcXQtNS4xMy1zdXBwb3J0LWNv cmUtcW1lc3NhZ2Vsb2djb250ZXh0LnBhdGNoCisrKyAvZGV2L251bGwKQEAgLTEsMTYgKzAsMCBA QAotUmV2ZXJ0IHRvIFF0IDUuMTMgc3VwcG9ydAotc291cmNlOiBodHRwczovL2NvZGVyZXZpZXcu cXQtcHJvamVjdC5vcmcvYy9weXNpZGUvcHlzaWRlLXNldHVwLysvMjcyNTgxCi0KLS0tLSBzb3Vy Y2VzL3B5c2lkZTIvUHlTaWRlMi9RdENvcmUvdHlwZXN5c3RlbV9jb3JlX2NvbW1vbi54bWwuT1JJ RwotKysrIHNvdXJjZXMvcHlzaWRlMi9QeVNpZGUyL1F0Q29yZS90eXBlc3lzdGVtX2NvcmVfY29t bW9uLnhtbAotQEAgLTI4MzAsNyArMjgzMCw5IEBACi0gICAgIDxpbmNsdWRlIGZpbGUtbmFtZT0i cW9iamVjdGRlZnMuaCIgbG9jYXRpb249Imdsb2JhbCIvPgotICAgPC92YWx1ZS10eXBlPgotIAot LSAgPG9iamVjdC10eXBlIG5hbWU9IlFNZXNzYWdlTG9nQ29udGV4dCIvPgotKyAgPG9iamVjdC10 eXBlIG5hbWU9IlFNZXNzYWdlTG9nQ29udGV4dCI+Ci0rICAgIDxtb2RpZnktZnVuY3Rpb24gc2ln bmF0dXJlPSJjb3B5KGNvbnN0IFFNZXNzYWdlTG9nQ29udGV4dCAmYW1wOykiIHJlbW92ZT0iYWxs Ii8+Ci0rICA8L29iamVjdC10eXBlPgotIAotICAgPHZhbHVlLXR5cGUgbmFtZT0iUU1ldGFNZXRo b2QiPgotICAgICA8ZW51bS10eXBlIG5hbWU9IkFjY2VzcyIvPgpkaWZmIC0tZ2l0IGEvc3JjcGtn cy9weXRob24zLXB5c2lkZTIvdGVtcGxhdGUgYi9zcmNwa2dzL3B5dGhvbjMtcHlzaWRlMi90ZW1w bGF0ZQppbmRleCA4Y2ZlYjkzMWNiNy4uMjU2YWQ2YmE3NzIgMTAwNjQ0Ci0tLSBhL3NyY3BrZ3Mv cHl0aG9uMy1weXNpZGUyL3RlbXBsYXRlCisrKyBiL3NyY3BrZ3MvcHl0aG9uMy1weXNpZGUyL3Rl bXBsYXRlCkBAIC0xLDkgKzEsNyBAQAogIyBUZW1wbGF0ZSBmaWxlIGZvciAncHl0aG9uMy1weXNp ZGUyJwotIyBYWFggQ0FVVElPTiBwYXRjaGVkIHRvIHN1cHBvcnQgUXQgNS4xMy4yIGFuZCAqTk9U KiBRdCA1LjE0Ci0jIHdhcm5pbmc6IHB5dGhvbjMtcHlzaWRlMiBpcyBzdXBwb3NlZCB0byBiZSBh bGlnbmVkIHdpdGggUXQgdmVyc2lvbgogcGtnbmFtZT1weXRob24zLXB5c2lkZTIKIHZlcnNpb249 NS4xNC4wCi1yZXZpc2lvbj0yCityZXZpc2lvbj0zCiBfcGtnbmFtZT0icHlzaWRlLXNldHVwLW9w ZW5zb3VyY2Utc3JjLSR7dmVyc2lvbn0iCiB3cmtzcmM9IiRfcGtnbmFtZSIKIGNvbmZpZ3VyZV9h cmdzPSItRENNQUtFX0lOU1RBTExfUFJFRklYPS91c3IgLURDTUFLRV9CVUlMRF9UWVBFPVJlbGVh c2UK --===============8997154475000581067==--