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 806f8b7e for ; Thu, 23 Jan 2020 21:42:44 +0000 (UTC) Content-Type: multipart/mixed; boundary="===============7764129171135952768==" MIME-Version: 1.0 Subject: [PR PATCH] 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 Message-ID: Date: Thu, 23 Jan 2020 22:42:43 +0100 GitHub notification mails are now in MIME to allow UTF8. --===============7764129171135952768== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 VGhlcmUgaXMgYSBuZXcgcHVsbCByZXF1ZXN0IGJ5IHlvcGl0byBhZ2FpbnN0IG1hc3RlciBvbiB0 aGUgdm9pZC1wYWNrYWdlcyByZXBvc2l0b3J5CgpodHRwczovL2dpdGh1Yi5jb20veW9waXRvL3Zv aWQtcGFja2FnZXMgcHlzaWRlMi5leHRlbmQucXQuc3VwcG9ydApodHRwczovL2dpdGh1Yi5jb20v dm9pZC1saW51eC92b2lkLXBhY2thZ2VzL3B1bGwvMTg1MTkKCnB5dGhvbjMtcHlzaWRlMjogZXh0 ZW5kIFF0IHN1cHBvcnQgdG8gNS4xMi4uNS4xNAoKCkEgcGF0Y2ggZmlsZSBmcm9tIGh0dHBzOi8v Z2l0aHViLmNvbS92b2lkLWxpbnV4L3ZvaWQtcGFja2FnZXMvcHVsbC8xODUxOS5wYXRjaCBpcyBh dHRhY2hlZA== --===============7764129171135952768== 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" RnJvbSA1M2NhZjI0NGUzODlmZTBlYjRmZjMzYmE4ZTk4ZDViOTkxY2IzZjdhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiB5b3BpdG8gPHBpZXJyZS5ib3VyZ2luQGZyZWUuZnI+CkRhdGU6 IFdlZCwgMjIgSmFuIDIwMjAgMTk6MjQ6MjQgKzAxMDAKU3ViamVjdDogW1BBVENIXSBweXRob24z LXB5c2lkZTI6IGV4dGVuZCBRdCBzdXBwb3J0IHRvIDUuMTIuLjUuMTQKCi0tLQogLi4uL3BhdGNo ZXMvYWRkLXF0LTUuMTItNS4xMy1zdXBwb3J0LnBhdGNoICAgIHwgMjg4ICsrKysrKysrKysrKysr KysrKwogLi4uNS4xMy1zdXBwb3J0LWNvcmUtcW1lc3NhZ2Vsb2djb250ZXh0LnBhdGNoIHwgIDE2 IC0KIHNyY3BrZ3MvcHl0aG9uMy1weXNpZGUyL3RlbXBsYXRlICAgICAgICAgICAgICB8ICAgNCAr LQogMyBmaWxlcyBjaGFuZ2VkLCAyODkgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCiBj cmVhdGUgbW9kZSAxMDA2NDQgc3JjcGtncy9weXRob24zLXB5c2lkZTIvcGF0Y2hlcy9hZGQtcXQt NS4xMi01LjEzLXN1cHBvcnQucGF0Y2gKIGRlbGV0ZSBtb2RlIDEwMDY0NCBzcmNwa2dzL3B5dGhv bjMtcHlzaWRlMi9wYXRjaGVzL3F0LTUuMTMtc3VwcG9ydC1jb3JlLXFtZXNzYWdlbG9nY29udGV4 dC5wYXRjaAoKZGlmZiAtLWdpdCBhL3NyY3BrZ3MvcHl0aG9uMy1weXNpZGUyL3BhdGNoZXMvYWRk LXF0LTUuMTItNS4xMy1zdXBwb3J0LnBhdGNoIGIvc3JjcGtncy9weXRob24zLXB5c2lkZTIvcGF0 Y2hlcy9hZGQtcXQtNS4xMi01LjEzLXN1cHBvcnQucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAuLjU4ZTZhMDkxZDVmCi0tLSAvZGV2L251bGwKKysrIGIvc3JjcGtn cy9weXRob24zLXB5c2lkZTIvcGF0Y2hlcy9hZGQtcXQtNS4xMi01LjEzLXN1cHBvcnQucGF0Y2gK QEAgLTAsMCArMSwyODggQEAKK3Vwc3RyZWFtIHNvdXJjZTogaHR0cHM6Ly9idWdyZXBvcnRzLnF0 LmlvL2Jyb3dzZS9QWVNJREUtMTE5MQorCitGcm9tIGRkY2FlMzVjYjMyYWZmOTBmY2Q4MWM0ODBh ZWRjMzBhNzAwNDAxYTYgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBGcmllZGVtYW5u IEtsZWludCA8RnJpZWRlbWFubi5LbGVpbnRAcXQuaW8+CitEYXRlOiBNb24sIDIwIEphbiAyMDIw IDE3OjM2OjI3ICswMTAwCitTdWJqZWN0OiBbUEFUQ0hdIHNoaWJva2VuOiBJbnRyb2R1Y2UgInVu dGlsIiB2ZXJzaW9uIGF0dHJpYnV0ZSBhcyBvcHBvc2l0ZSBvZiAic2luY2UiCisKK1Byb3RvdHlw aWNhbGx5IHVzZSBpdCBmb3IgUU1lc3NhZ2VMb2dDb250ZXh0LCBhbGxvd2luZyB0byBlbGVnYW50 bHkKK2J1aWxkIGZvciBRdCBmcm9tIHZlcnNpb24gNS4xMi4ubm93IHVzaW5nIGEgc2luZ2xlIHR5 cGUgc3lzdGVtIGZpbGUuCisKK0ZpeGVzOiBQWVNJREUtMTE5MQorQ2hhbmdlLUlkOiBJYWE3YmRj MTBjNzEyOWQ4NGM1NGU4NWEwOWExYzgwMmE0MDk3MDhmOQorCistLS0gc291cmNlcy9weXNpZGUy L1B5U2lkZTIvUXRDb3JlL3R5cGVzeXN0ZW1fY29yZV9jb21tb24ueG1sCisrKysgc291cmNlcy9w eXNpZGUyL1B5U2lkZTIvUXRDb3JlL3R5cGVzeXN0ZW1fY29yZV9jb21tb24ueG1sCitAQCAtMjgz MCw3ICsyODMwLDExIEBACisgICAgIDxpbmNsdWRlIGZpbGUtbmFtZT0icW9iamVjdGRlZnMuaCIg bG9jYXRpb249Imdsb2JhbCIvPgorICAgPC92YWx1ZS10eXBlPgorIAorLSAgPG9iamVjdC10eXBl IG5hbWU9IlFNZXNzYWdlTG9nQ29udGV4dCIvPgorKyAgPG9iamVjdC10eXBlIG5hbWU9IlFNZXNz YWdlTG9nQ29udGV4dCIgc2luY2U9IjUuMTQiLz4KKysKKysgIDxvYmplY3QtdHlwZSBuYW1lPSJR TWVzc2FnZUxvZ0NvbnRleHQiIHNpbmNlPSI1LjkiIHVudGlsPSI1LjEzLjIiPgorKyAgICA8bW9k aWZ5LWZ1bmN0aW9uIHNpZ25hdHVyZT0iY29weShjb25zdCBRTWVzc2FnZUxvZ0NvbnRleHQgJmFt cDspIiByZW1vdmU9ImFsbCIvPgorKyAgPC9vYmplY3QtdHlwZT4KKyAKKyAgIDx2YWx1ZS10eXBl IG5hbWU9IlFNZXRhTWV0aG9kIj4KKyAgICAgPGVudW0tdHlwZSBuYW1lPSJBY2Nlc3MiLz4KKy0t LSBzb3VyY2VzL3NoaWJva2VuMi9BcGlFeHRyYWN0b3IvdGVzdHMvdGVzdHR5cGVyZXZpc2lvbi5j cHAKKysrKyBzb3VyY2VzL3NoaWJva2VuMi9BcGlFeHRyYWN0b3IvdGVzdHMvdGVzdHR5cGVyZXZp c2lvbi5jcHAKK0BAIC03Nyw2ICs3Nyw3IEBACisgICAgIFFUZXN0OjpuZXdSb3coIm5vbmUiKSA8 PCBRU3RyaW5nKCkgPDwgMjsKKyAgICAgUVRlc3Q6Om5ld1JvdygiMS4wIikgPDwgUVN0cmluZzo6 ZnJvbUxhdGluMSgiMS4wIikgPDwgMTsgIC8vIEJhcjIwIGV4Y2x1ZGVkCisgICAgIFFUZXN0Ojpu ZXdSb3coIjIuMCIpIDw8IFFTdHJpbmc6OmZyb21MYXRpbjEoIjIuMCIpIDw8IDI7CisrICAgIFFU ZXN0OjpuZXdSb3coIjMuMCIpIDw8IFFTdHJpbmc6OmZyb21MYXRpbjEoIjMuMCIpIDw8IDE7ICAv LyBCYXIgZXhjbHVkZWQgYnkgInVudGlsIgorIH0KKyAKKyB2b2lkIFRlc3RUeXBlUmV2aXNpb246 OnRlc3RWZXJzaW9uKCkKK0BAIC05MCw3ICs5MSw3IEBACisgKUNQUCI7CisgICAgIGNvbnN0IGNo YXIgeG1sQ29kZVtdID0gUiJYTUwoCisgPHR5cGVzeXN0ZW0gcGFja2FnZT0iRm9vIj4KKy0gICAg PHZhbHVlLXR5cGUgbmFtZT0iQmFyIi8+CisrICAgIDx2YWx1ZS10eXBlIG5hbWU9IkJhciIgdW50 aWw9IjIuMCIvPgorICAgICA8dmFsdWUtdHlwZSBuYW1lPSJCYXIyMCIgc2luY2U9IjIuMCIvPgor IDwvdHlwZXN5c3RlbT4KKyApWE1MIjsKKy0tLSBzb3VyY2VzL3NoaWJva2VuMi9BcGlFeHRyYWN0 b3IvdHlwZWRhdGFiYXNlLmNwcAorKysrIHNvdXJjZXMvc2hpYm9rZW4yL0FwaUV4dHJhY3Rvci90 eXBlZGF0YWJhc2UuY3BwCitAQCAtNzQ2LDE0ICs3NDYsMTUgQEAKKyB9CisgCisgYm9vbCBUeXBl RGF0YWJhc2U6OmNoZWNrQXBpVmVyc2lvbihjb25zdCBRU3RyaW5nICZwYWNrYWdlLAorLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUVZlcnNpb25OdW1iZXIgJnZlcnNp b25OdW1iZXIpCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBWZXJz aW9uUmFuZ2UgJnZyKQorIHsKKyAgICAgY29uc3QgQXBpVmVyc2lvbnMgJnZlcnNpb25zID0gKmFw aVZlcnNpb25zKCk7CisgICAgIGlmICh2ZXJzaW9ucy5pc0VtcHR5KCkpIC8vIE5vdGhpbmcgc3Bl Y2lmaWVkOiB1c2UgbGF0ZXN0LgorICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgIGZvciAoaW50 IGkgPSAwLCBzaXplID0gdmVyc2lvbnMuc2l6ZSgpOyBpIDwgc2l6ZTsgKytpKSB7CisgICAgICAg ICBpZiAodmVyc2lvbnMuYXQoaSkuZmlyc3QubWF0Y2gocGFja2FnZSkuaGFzTWF0Y2goKSkKKy0g ICAgICAgICAgICByZXR1cm4gdmVyc2lvbnMuYXQoaSkuc2Vjb25kID49IHZlcnNpb25OdW1iZXI7 CisrICAgICAgICAgICAgcmV0dXJuIHZlcnNpb25zLmF0KGkpLnNlY29uZCA+PSB2ci5zaW5jZQor KyAgICAgICAgICAgICAgICAmJiB2ZXJzaW9ucy5hdChpKS5zZWNvbmQgPD0gdnIudW50aWw7Cisg ICAgIH0KKyAgICAgcmV0dXJuIGZhbHNlOworIH0KKy0tLSBzb3VyY2VzL3NoaWJva2VuMi9BcGlF eHRyYWN0b3IvdHlwZWRhdGFiYXNlLmgKKysrKyBzb3VyY2VzL3NoaWJva2VuMi9BcGlFeHRyYWN0 b3IvdHlwZWRhdGFiYXNlLmgKK0BAIC0zNyw5ICszNyw5IEBACisgCisgI2luY2x1ZGUgPFF0Q29y ZS9RUmVndWxhckV4cHJlc3Npb24+CisgI2luY2x1ZGUgPFF0Q29yZS9RU3RyaW5nTGlzdD4KKysj aW5jbHVkZSA8UXRDb3JlL1FWZXJzaW9uTnVtYmVyPgorIAorIFFUX0ZPUldBUkRfREVDTEFSRV9D TEFTUyhRSU9EZXZpY2UpCistUVRfRk9SV0FSRF9ERUNMQVJFX0NMQVNTKFFWZXJzaW9uTnVtYmVy KQorIAorIGNsYXNzIENvbXBsZXhUeXBlRW50cnk7CisgY2xhc3MgQ29udGFpbmVyVHlwZUVudHJ5 OworQEAgLTYwLDYgKzYwLDE4IEBACisgY2xhc3MgUHJpbWl0aXZlVHlwZUVudHJ5OworIGNsYXNz IFR5cGVTeXN0ZW1UeXBlRW50cnk7CisgCisrc3RydWN0IFZlcnNpb25SYW5nZQorK3sKKysgICAg Ym9vbCBpc051bGwoKSBjb25zdAorKyAgICB7CisrICAgICAgICByZXR1cm4gc2luY2UubWFqb3JW ZXJzaW9uKCkgPT0gMCAmJiBzaW5jZS5taW5vclZlcnNpb24oKSA9PSAwCisrICAgICAgICAgICAg JiYgdW50aWwubWFqb3JWZXJzaW9uKCkgPT0gOTk5OSAmJiB1bnRpbC5taW5vclZlcnNpb24oKSA9 PSA5OTk5OworKyAgICB9CisrCisrICAgIFFWZXJzaW9uTnVtYmVyIHNpbmNlezAsIDB9OworKyAg ICBRVmVyc2lvbk51bWJlciB1bnRpbHs5OTk5LCA5OTk5fTsKKyt9OworKworIGNsYXNzIFR5cGVE YXRhYmFzZQorIHsKKyAgICAgVHlwZURhdGFiYXNlKCk7CitAQCAtMTUzLDcgKzE2NSw3IEBACisg ICAgIHN0YXRpYyBib29sIHNldEFwaVZlcnNpb24oY29uc3QgUVN0cmluZyAmcGFja2FnZSwgY29u c3QgUVN0cmluZyAmdmVyc2lvbik7CisgICAgIHN0YXRpYyB2b2lkIGNsZWFyQXBpVmVyc2lvbnMo KTsKKyAKKy0gICAgc3RhdGljIGJvb2wgY2hlY2tBcGlWZXJzaW9uKGNvbnN0IFFTdHJpbmcgJnBh Y2thZ2UsIGNvbnN0IFFWZXJzaW9uTnVtYmVyICZ2ZXJzaW9uKTsKKysgICAgc3RhdGljIGJvb2wg Y2hlY2tBcGlWZXJzaW9uKGNvbnN0IFFTdHJpbmcgJnBhY2thZ2UsIGNvbnN0IFZlcnNpb25SYW5n ZSAmdnIpOworIAorICAgICBib29sIGhhc0Ryb3BwZWRUeXBlRW50cmllcygpIGNvbnN0IHsgcmV0 dXJuICFtX2Ryb3BUeXBlRW50cmllcy5pc0VtcHR5KCk7IH0KKyAKKy0tLSBzb3VyY2VzL3NoaWJv a2VuMi9BcGlFeHRyYWN0b3IvdHlwZXN5c3RlbXBhcnNlci5jcHAKKysrKyBzb3VyY2VzL3NoaWJv a2VuMi9BcGlFeHRyYWN0b3IvdHlwZXN5c3RlbXBhcnNlci5jcHAKK0BAIC01Niw2ICs1Niw3IEBA Cisgc3RhdGljIGlubGluZSBRU3RyaW5nIHRleHRBdHRyaWJ1dGUoKSB7IHJldHVybiBRU3RyaW5n TGl0ZXJhbCgidGV4dCIpOyB9Cisgc3RhdGljIGlubGluZSBRU3RyaW5nIG5hbWVBdHRyaWJ1dGUo KSB7IHJldHVybiBRU3RyaW5nTGl0ZXJhbCgibmFtZSIpOyB9Cisgc3RhdGljIGlubGluZSBRU3Ry aW5nIHNpbmNlQXR0cmlidXRlKCkgeyByZXR1cm4gUVN0cmluZ0xpdGVyYWwoInNpbmNlIik7IH0K KytzdGF0aWMgaW5saW5lIFFTdHJpbmcgdW50aWxBdHRyaWJ1dGUoKSB7IHJldHVybiBRU3RyaW5n TGl0ZXJhbCgidW50aWwiKTsgfQorIHN0YXRpYyBpbmxpbmUgUVN0cmluZyBkZWZhdWx0U3VwZXJj bGFzc0F0dHJpYnV0ZSgpIHsgcmV0dXJuIFFTdHJpbmdMaXRlcmFsKCJkZWZhdWx0LXN1cGVyY2xh c3MiKTsgfQorIHN0YXRpYyBpbmxpbmUgUVN0cmluZyBkZWxldGVJbk1haW5UaHJlYWRBdHRyaWJ1 dGUoKSB7IHJldHVybiBRU3RyaW5nTGl0ZXJhbCgiZGVsZXRlLWluLW1haW4tdGhyZWFkIik7IH0K KyBzdGF0aWMgaW5saW5lIFFTdHJpbmcgZGVwcmVjYXRlZEF0dHJpYnV0ZSgpIHsgcmV0dXJuIFFT dHJpbmdMaXRlcmFsKCJkZXByZWNhdGVkIik7IH0KK0BAIC0yNTgyLDYgKzI1ODMsMTcgQEAKKyAg ICAgcmV0dXJuIHRydWU7CisgfQorIAorK3N0YXRpYyBib29sIHBhcnNlVmVyc2lvbihjb25zdCBR U3RyaW5nICZ2ZXJzaW9uU3BlYywgY29uc3QgUVN0cmluZyAmcGFja2FnZSwKKysgICAgICAgICAg ICAgICAgICAgICAgICAgUVZlcnNpb25OdW1iZXIgKnJlc3VsdCwgUVN0cmluZyAqZXJyb3JNZXNz YWdlKQorK3sKKysgICAgKnJlc3VsdCA9IFFWZXJzaW9uTnVtYmVyOjpmcm9tU3RyaW5nKHZlcnNp b25TcGVjKTsKKysgICAgaWYgKHJlc3VsdC0+aXNOdWxsKCkpIHsKKysgICAgICAgICplcnJvck1l c3NhZ2UgPSBtc2dJbnZhbGlkVmVyc2lvbih2ZXJzaW9uU3BlYywgcGFja2FnZSk7CisrICAgICAg ICByZXR1cm4gZmFsc2U7CisrICAgIH0KKysgICAgcmV0dXJuIHRydWU7CisrfQorKworIGJvb2wg VHlwZVN5c3RlbVBhcnNlcjo6c3RhcnRFbGVtZW50KGNvbnN0IFFYbWxTdHJlYW1SZWFkZXIgJnJl YWRlcikKKyB7CisgICAgIGlmIChtX2lnbm9yZURlcHRoKSB7CitAQCAtMjU5MiwyMCArMjYwNCwy NSBAQAorICAgICBjb25zdCBRU3RyaW5nUmVmIHRhZ05hbWUgPSByZWFkZXIubmFtZSgpOworICAg ICBRWG1sU3RyZWFtQXR0cmlidXRlcyBhdHRyaWJ1dGVzID0gcmVhZGVyLmF0dHJpYnV0ZXMoKTsK KyAKKy0gICAgUVZlcnNpb25OdW1iZXIgc2luY2UoMCwgMCk7CistICAgIGludCBpbmRleCA9IGlu ZGV4T2ZBdHRyaWJ1dGUoYXR0cmlidXRlcywgc2luY2VBdHRyaWJ1dGUoKSk7CistICAgIGlmIChp bmRleCAhPSAtMSkgeworLSAgICAgICAgY29uc3QgUVN0cmluZ1JlZiBzaW5jZVNwZWMgPSBhdHRy aWJ1dGVzLnRha2VBdChpbmRleCkudmFsdWUoKTsKKy0gICAgICAgIHNpbmNlID0gUVZlcnNpb25O dW1iZXI6OmZyb21TdHJpbmcoc2luY2VTcGVjLnRvU3RyaW5nKCkpOworLSAgICAgICAgaWYgKHNp bmNlLmlzTnVsbCgpKSB7CistICAgICAgICAgICAgbV9lcnJvciA9IG1zZ0ludmFsaWRWZXJzaW9u KHNpbmNlU3BlYywgbV9kZWZhdWx0UGFja2FnZSk7CistICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworKyAgICBWZXJzaW9uUmFuZ2UgdmVyc2lvblJhbmdlOworKyAgICBmb3IgKGludCBpID0gYXR0 cmlidXRlcy5zaXplKCkgLSAxOyBpID49IDA7IC0taSkgeworKyAgICAgICAgY29uc3QgUVN0cmlu Z1JlZiBuYW1lID0gYXR0cmlidXRlcy5hdChpKS5xdWFsaWZpZWROYW1lKCk7CisrICAgICAgICBp ZiAobmFtZSA9PSBzaW5jZUF0dHJpYnV0ZSgpKSB7CisrICAgICAgICAgICAgaWYgKCFwYXJzZVZl cnNpb24oYXR0cmlidXRlcy50YWtlQXQoaSkudmFsdWUoKS50b1N0cmluZygpLAorKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG1fZGVmYXVsdFBhY2thZ2UsICZ2ZXJzaW9uUmFuZ2Uuc2lu Y2UsICZtX2Vycm9yKSkgeworKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisrICAgICAg ICAgICAgfQorKyAgICAgICAgfSBlbHNlIGlmIChuYW1lID09IHVudGlsQXR0cmlidXRlKCkpIHsK KysgICAgICAgICAgICBpZiAoIXBhcnNlVmVyc2lvbihhdHRyaWJ1dGVzLnRha2VBdChpKS52YWx1 ZSgpLnRvU3RyaW5nKCksCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9kZWZhdWx0 UGFja2FnZSwgJnZlcnNpb25SYW5nZS51bnRpbCwgJm1fZXJyb3IpKSB7CisrICAgICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKysgICAgICAgICAgICB9CisgICAgICAgICB9CisgICAgIH0KKyAK Ky0gICAgaWYgKCFtX2RlZmF1bHRQYWNrYWdlLmlzRW1wdHkoKSAmJiBzaW5jZSA+IFFWZXJzaW9u TnVtYmVyKDAsIDApKSB7CisrICAgIGlmICghbV9kZWZhdWx0UGFja2FnZS5pc0VtcHR5KCkgJiYg IXZlcnNpb25SYW5nZS5pc051bGwoKSkgeworICAgICAgICAgVHlwZURhdGFiYXNlKiB0ZCA9IFR5 cGVEYXRhYmFzZTo6aW5zdGFuY2UoKTsKKy0gICAgICAgIGlmICghdGQtPmNoZWNrQXBpVmVyc2lv bihtX2RlZmF1bHRQYWNrYWdlLCBzaW5jZSkpIHsKKysgICAgICAgIGlmICghdGQtPmNoZWNrQXBp VmVyc2lvbihtX2RlZmF1bHRQYWNrYWdlLCB2ZXJzaW9uUmFuZ2UpKSB7CisgICAgICAgICAgICAg KyttX2lnbm9yZURlcHRoOworICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgfQor QEAgLTI3MjQsMTUgKzI3NDEsMTUgQEAKKyAgICAgICAgIGNhc2UgU3RhY2tFbGVtZW50OjpDdXN0 b21UeXBlRW50cnk6CisgICAgICAgICAgICAgaWYgKCFjaGVja1Jvb3RFbGVtZW50KCkpCisgICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKy0gICAgICAgICAgICBlbGVtZW50LT5lbnRyeSA9 IG5ldyBUeXBlRW50cnkobmFtZSwgVHlwZUVudHJ5OjpDdXN0b21UeXBlLCBzaW5jZSwgbV9jdXJy ZW50LT5lbnRyeSk7CisrICAgICAgICAgICAgZWxlbWVudC0+ZW50cnkgPSBuZXcgVHlwZUVudHJ5 KG5hbWUsIFR5cGVFbnRyeTo6Q3VzdG9tVHlwZSwgdmVyc2lvblJhbmdlLnNpbmNlLCBtX2N1cnJl bnQtPmVudHJ5KTsKKyAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgIGNhc2UgU3RhY2tFbGVt ZW50OjpQcmltaXRpdmVUeXBlRW50cnk6CistICAgICAgICAgICAgZWxlbWVudC0+ZW50cnkgPSBw YXJzZVByaW1pdGl2ZVR5cGVFbnRyeShyZWFkZXIsIG5hbWUsIHNpbmNlLCAmYXR0cmlidXRlcyk7 CisrICAgICAgICAgICAgZWxlbWVudC0+ZW50cnkgPSBwYXJzZVByaW1pdGl2ZVR5cGVFbnRyeShy ZWFkZXIsIG5hbWUsIHZlcnNpb25SYW5nZS5zaW5jZSwgJmF0dHJpYnV0ZXMpOworICAgICAgICAg ICAgIGlmIChRX1VOTElLRUxZKCFlbGVtZW50LT5lbnRyeSkpCisgICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgIGNhc2UgU3RhY2tFbGVt ZW50OjpDb250YWluZXJUeXBlRW50cnk6CistICAgICAgICAgICAgaWYgKENvbnRhaW5lclR5cGVF bnRyeSAqY2UgPSBwYXJzZUNvbnRhaW5lclR5cGVFbnRyeShyZWFkZXIsIG5hbWUsIHNpbmNlLCAm YXR0cmlidXRlcykpIHsKKysgICAgICAgICAgICBpZiAoQ29udGFpbmVyVHlwZUVudHJ5ICpjZSA9 IHBhcnNlQ29udGFpbmVyVHlwZUVudHJ5KHJlYWRlciwgbmFtZSwgdmVyc2lvblJhbmdlLnNpbmNl LCAmYXR0cmlidXRlcykpIHsKKyAgICAgICAgICAgICAgICAgYXBwbHlDb21wbGV4VHlwZUF0dHJp YnV0ZXMocmVhZGVyLCBjZSwgJmF0dHJpYnV0ZXMpOworICAgICAgICAgICAgICAgICBlbGVtZW50 LT5lbnRyeSA9IGNlOworICAgICAgICAgICAgIH0gZWxzZSB7CitAQCAtMjc0MSw3ICsyNzU4LDcg QEAKKyAgICAgICAgICAgICBicmVhazsKKyAKKyAgICAgICAgIGNhc2UgU3RhY2tFbGVtZW50OjpT bWFydFBvaW50ZXJUeXBlRW50cnk6CistICAgICAgICAgICAgaWYgKFNtYXJ0UG9pbnRlclR5cGVF bnRyeSAqc2UgPSBwYXJzZVNtYXJ0UG9pbnRlckVudHJ5KHJlYWRlciwgbmFtZSwgc2luY2UsICZh dHRyaWJ1dGVzKSkgeworKyAgICAgICAgICAgIGlmIChTbWFydFBvaW50ZXJUeXBlRW50cnkgKnNl ID0gcGFyc2VTbWFydFBvaW50ZXJFbnRyeShyZWFkZXIsIG5hbWUsIHZlcnNpb25SYW5nZS5zaW5j ZSwgJmF0dHJpYnV0ZXMpKSB7CisgICAgICAgICAgICAgICAgIGFwcGx5Q29tcGxleFR5cGVBdHRy aWJ1dGVzKHJlYWRlciwgc2UsICZhdHRyaWJ1dGVzKTsKKyAgICAgICAgICAgICAgICAgZWxlbWVu dC0+ZW50cnkgPSBzZTsKKyAgICAgICAgICAgICB9IGVsc2UgeworQEAgLTI3NDksMTQgKzI3NjYs MTQgQEAKKyAgICAgICAgICAgICB9CisgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICBjYXNl IFN0YWNrRWxlbWVudDo6RW51bVR5cGVFbnRyeToKKy0gICAgICAgICAgICBtX2N1cnJlbnRFbnVt ID0gcGFyc2VFbnVtVHlwZUVudHJ5KHJlYWRlciwgbmFtZSwgc2luY2UsICZhdHRyaWJ1dGVzKTsK KysgICAgICAgICAgICBtX2N1cnJlbnRFbnVtID0gcGFyc2VFbnVtVHlwZUVudHJ5KHJlYWRlciwg bmFtZSwgdmVyc2lvblJhbmdlLnNpbmNlLCAmYXR0cmlidXRlcyk7CisgICAgICAgICAgICAgaWYg KFFfVU5MSUtFTFkoIW1fY3VycmVudEVudW0pKQorICAgICAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgICAgICAgICAgZWxlbWVudC0+ZW50cnkgPSBtX2N1cnJlbnRFbnVtOworICAgICAg ICAgICAgIGJyZWFrOworIAorICAgICAgICAgY2FzZSBTdGFja0VsZW1lbnQ6OkludGVyZmFjZVR5 cGVFbnRyeToKKy0gICAgICAgICAgICBpZiAoT2JqZWN0VHlwZUVudHJ5ICpvZSA9IHBhcnNlSW50 ZXJmYWNlVHlwZUVudHJ5KHJlYWRlciwgbmFtZSwgc2luY2UsICZhdHRyaWJ1dGVzKSkgeworKyAg ICAgICAgICAgIGlmIChPYmplY3RUeXBlRW50cnkgKm9lID0gcGFyc2VJbnRlcmZhY2VUeXBlRW50 cnkocmVhZGVyLCBuYW1lLCB2ZXJzaW9uUmFuZ2Uuc2luY2UsICZhdHRyaWJ1dGVzKSkgeworICAg ICAgICAgICAgICAgICBhcHBseUNvbXBsZXhUeXBlQXR0cmlidXRlcyhyZWFkZXIsIG9lLCAmYXR0 cmlidXRlcyk7CisgICAgICAgICAgICAgICAgIGVsZW1lbnQtPmVudHJ5ID0gb2U7CisgICAgICAg ICAgICAgfSBlbHNlIHsKK0BAIC0yNzY0LDcgKzI3ODEsNyBAQAorICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgIGNhc2UgU3RhY2tFbGVtZW50OjpWYWx1ZVR5cGVF bnRyeToKKy0gICAgICAgICAgIGlmIChWYWx1ZVR5cGVFbnRyeSAqdmUgPSBwYXJzZVZhbHVlVHlw ZUVudHJ5KHJlYWRlciwgbmFtZSwgc2luY2UsICZhdHRyaWJ1dGVzKSkgeworKyAgICAgICAgICAg aWYgKFZhbHVlVHlwZUVudHJ5ICp2ZSA9IHBhcnNlVmFsdWVUeXBlRW50cnkocmVhZGVyLCBuYW1l LCB2ZXJzaW9uUmFuZ2Uuc2luY2UsICZhdHRyaWJ1dGVzKSkgeworICAgICAgICAgICAgICAgIGFw cGx5Q29tcGxleFR5cGVBdHRyaWJ1dGVzKHJlYWRlciwgdmUsICZhdHRyaWJ1dGVzKTsKKyAgICAg ICAgICAgICAgICBlbGVtZW50LT5lbnRyeSA9IHZlOworICAgICAgICAgICAgfSBlbHNlIHsKK0BA IC0yNzcyLDcgKzI3ODksNyBAQAorICAgICAgICAgICAgfQorICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICBjYXNlIFN0YWNrRWxlbWVudDo6TmFtZXNwYWNlVHlwZUVudHJ5OgorLSAgICAgICAg ICAgIGlmIChhdXRvIGVudHJ5ID0gcGFyc2VOYW1lc3BhY2VUeXBlRW50cnkocmVhZGVyLCBuYW1l LCBzaW5jZSwgJmF0dHJpYnV0ZXMpKQorKyAgICAgICAgICAgIGlmIChhdXRvIGVudHJ5ID0gcGFy c2VOYW1lc3BhY2VUeXBlRW50cnkocmVhZGVyLCBuYW1lLCB2ZXJzaW9uUmFuZ2Uuc2luY2UsICZh dHRyaWJ1dGVzKSkKKyAgICAgICAgICAgICAgICAgZWxlbWVudC0+ZW50cnkgPSBlbnRyeTsKKyAg ICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKK0BAIC0yNzgw LDE3ICsyNzk3LDE3IEBACisgICAgICAgICBjYXNlIFN0YWNrRWxlbWVudDo6T2JqZWN0VHlwZUVu dHJ5OgorICAgICAgICAgICAgIGlmICghY2hlY2tSb290RWxlbWVudCgpKQorICAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CistICAgICAgICAgICAgZWxlbWVudC0+ZW50cnkgPSBuZXcgT2Jq ZWN0VHlwZUVudHJ5KG5hbWUsIHNpbmNlLCBjdXJyZW50UGFyZW50VHlwZUVudHJ5KCkpOworKyAg ICAgICAgICAgIGVsZW1lbnQtPmVudHJ5ID0gbmV3IE9iamVjdFR5cGVFbnRyeShuYW1lLCB2ZXJz aW9uUmFuZ2Uuc2luY2UsIGN1cnJlbnRQYXJlbnRUeXBlRW50cnkoKSk7CisgICAgICAgICAgICAg YXBwbHlDb21tb25BdHRyaWJ1dGVzKGVsZW1lbnQtPmVudHJ5LCAmYXR0cmlidXRlcyk7CisgICAg ICAgICAgICAgYXBwbHlDb21wbGV4VHlwZUF0dHJpYnV0ZXMocmVhZGVyLCBzdGF0aWNfY2FzdDxD b21wbGV4VHlwZUVudHJ5ICo+KGVsZW1lbnQtPmVudHJ5KSwgJmF0dHJpYnV0ZXMpOworICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICAgY2FzZSBTdGFja0VsZW1lbnQ6OkZ1bmN0aW9uVHlwZUVu dHJ5OgorLSAgICAgICAgICAgIGVsZW1lbnQtPmVudHJ5ID0gcGFyc2VGdW5jdGlvblR5cGVFbnRy eShyZWFkZXIsIG5hbWUsIHNpbmNlLCAmYXR0cmlidXRlcyk7CisrICAgICAgICAgICAgZWxlbWVu dC0+ZW50cnkgPSBwYXJzZUZ1bmN0aW9uVHlwZUVudHJ5KHJlYWRlciwgbmFtZSwgdmVyc2lvblJh bmdlLnNpbmNlLCAmYXR0cmlidXRlcyk7CisgICAgICAgICAgICAgaWYgKFFfVU5MSUtFTFkoIWVs ZW1lbnQtPmVudHJ5KSkKKyAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgY2FzZSBTdGFja0VsZW1lbnQ6OlR5cGVkZWZUeXBlRW50cnk6 CistICAgICAgICAgICAgaWYgKFR5cGVkZWZFbnRyeSAqdGUgPSBwYXJzZVR5cGVkZWZFbnRyeShy ZWFkZXIsIG5hbWUsIHNpbmNlLCAmYXR0cmlidXRlcykpIHsKKysgICAgICAgICAgICBpZiAoVHlw ZWRlZkVudHJ5ICp0ZSA9IHBhcnNlVHlwZWRlZkVudHJ5KHJlYWRlciwgbmFtZSwgdmVyc2lvblJh bmdlLnNpbmNlLCAmYXR0cmlidXRlcykpIHsKKyAgICAgICAgICAgICAgICAgYXBwbHlDb21wbGV4 VHlwZUF0dHJpYnV0ZXMocmVhZGVyLCB0ZSwgJmF0dHJpYnV0ZXMpOworICAgICAgICAgICAgICAg ICBlbGVtZW50LT5lbnRyeSA9IHRlOworICAgICAgICAgICAgIH0gZWxzZSB7CitAQCAtMjgzNiw3 ICsyODUzLDcgQEAKKyAKKyAgICAgICAgIHN3aXRjaCAoZWxlbWVudC0+dHlwZSkgeworICAgICAg ICAgY2FzZSBTdGFja0VsZW1lbnQ6OlJvb3Q6CistICAgICAgICAgICAgZWxlbWVudC0+ZW50cnkg PSBwYXJzZVJvb3RFbGVtZW50KHJlYWRlciwgc2luY2UsICZhdHRyaWJ1dGVzKTsKKysgICAgICAg ICAgICBlbGVtZW50LT5lbnRyeSA9IHBhcnNlUm9vdEVsZW1lbnQocmVhZGVyLCB2ZXJzaW9uUmFu Z2Uuc2luY2UsICZhdHRyaWJ1dGVzKTsKKyAgICAgICAgICAgICBlbGVtZW50LT50eXBlID0gU3Rh Y2tFbGVtZW50OjpSb290OworICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgY2FzZSBTdGFj a0VsZW1lbnQ6OkxvYWRUeXBlc3lzdGVtOgorLS0tIHNvdXJjZXMvc2hpYm9rZW4yL2RvYy90eXBl c3lzdGVtX3NwZWNpZnlpbmdfdHlwZXMucnN0CisrKysgc291cmNlcy9zaGlib2tlbjIvZG9jL3R5 cGVzeXN0ZW1fc3BlY2lmeWluZ190eXBlcy5yc3QKK0BAIC0xMDQsNiArMTA0LDcgQEAKKyAgICAg ICAgIDx0eXBlc3lzdGVtPgorICAgICAgICAgICAgIDxwcmltaXRpdmUtdHlwZSBuYW1lPSIuLi4i CisgICAgICAgICAgICAgICAgIHNpbmNlPSIuLi4iCisrICAgICAgICAgICAgICAgIHVudGlsPSIu Li4iCisgICAgICAgICAgICAgICAgIHRhcmdldC1uYW1lPSIuLi4iCisgICAgICAgICAgICAgICAg IGRlZmF1bHQtY29uc3RydWN0b3I9Ii4uLiIKKyAgICAgICAgICAgICAgICAgcHJlZmVycmVkLWNv bnZlcnNpb249InllcyB8IG5vIiAvPgorQEAgLTExNCw3ICsxMTUsMTEgQEAKKyAgICAgbGFuZ3Vh Z2UuIElmIHRoZSBsYXRlciB0d28gYXR0cmlidXRlcyBhcmUgbm90IHNwZWNpZmllZCB0aGVpciBk ZWZhdWx0IHZhbHVlCisgICAgIHdpbGwgYmUgdGhlIHNhbWUgYXMgdGhlICoqbmFtZSoqIGF0dHJp YnV0ZS4KKyAKKy0gICAgVGhlICpvcHRpb25hbCogICoqc2luY2UqKiB2YWx1ZSBpcyB1c2VkIHRv IHNwZWNpZnkgdGhlIEFQSSB2ZXJzaW9uIG9mIHRoaXMgdHlwZS4KKysgICAgVGhlICpvcHRpb25h bCogICoqc2luY2UqKiB2YWx1ZSBpcyB1c2VkIHRvIHNwZWNpZnkgdGhlIEFQSSB2ZXJzaW9uIGlu IHdoaWNoCisrICAgIHRoZSB0eXBlIHdhcyBpbnRyb2R1Y2VkLgorKworKyAgICBTaW1pbGFybHks IHRoZSAqb3B0aW9uYWwqICAqKnVudGlsKiogdmFsdWUgY2FuIGJlIHVzZWQgdG8gc3BlY2lmeSB0 aGUgQVBJCisrICAgIHZlcnNpb24gaW4gd2hpY2ggdGhlIHR5cGUgd2lsbCBiZSBvYnNvbGV0ZWQu CisgCisgICAgIElmIHRoZSAqb3B0aW9uYWwqICoqcHJlZmVycmVkLWNvbnZlcnNpb24qKiBhdHRy aWJ1dGUgaXMgc2V0IHRvICpubyosIGl0CisgICAgIGluZGljYXRlcyB0aGF0IHRoaXMgdmVyc2lv biBvZiB0aGUgcHJpbWl0aXZlIHR5cGUgaXMgbm90IHRoZSBwcmVmZXJyZWQgQysrCmRpZmYgLS1n aXQgYS9zcmNwa2dzL3B5dGhvbjMtcHlzaWRlMi9wYXRjaGVzL3F0LTUuMTMtc3VwcG9ydC1jb3Jl LXFtZXNzYWdlbG9nY29udGV4dC5wYXRjaCBiL3NyY3BrZ3MvcHl0aG9uMy1weXNpZGUyL3BhdGNo ZXMvcXQtNS4xMy1zdXBwb3J0LWNvcmUtcW1lc3NhZ2Vsb2djb250ZXh0LnBhdGNoCmRlbGV0ZWQg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCA5NjY0NGI1OTZiZi4uMDAwMDAwMDAwMDAKLS0tIGEvc3Jj cGtncy9weXRob24zLXB5c2lkZTIvcGF0Y2hlcy9xdC01LjEzLXN1cHBvcnQtY29yZS1xbWVzc2Fn ZWxvZ2NvbnRleHQucGF0Y2gKKysrIC9kZXYvbnVsbApAQCAtMSwxNiArMCwwIEBACi1SZXZlcnQg dG8gUXQgNS4xMyBzdXBwb3J0Ci1zb3VyY2U6IGh0dHBzOi8vY29kZXJldmlldy5xdC1wcm9qZWN0 Lm9yZy9jL3B5c2lkZS9weXNpZGUtc2V0dXAvKy8yNzI1ODEKLQotLS0tIHNvdXJjZXMvcHlzaWRl Mi9QeVNpZGUyL1F0Q29yZS90eXBlc3lzdGVtX2NvcmVfY29tbW9uLnhtbC5PUklHCi0rKysgc291 cmNlcy9weXNpZGUyL1B5U2lkZTIvUXRDb3JlL3R5cGVzeXN0ZW1fY29yZV9jb21tb24ueG1sCi1A QCAtMjgzMCw3ICsyODMwLDkgQEAKLSAgICAgPGluY2x1ZGUgZmlsZS1uYW1lPSJxb2JqZWN0ZGVm cy5oIiBsb2NhdGlvbj0iZ2xvYmFsIi8+Ci0gICA8L3ZhbHVlLXR5cGU+Ci0gCi0tICA8b2JqZWN0 LXR5cGUgbmFtZT0iUU1lc3NhZ2VMb2dDb250ZXh0Ii8+Ci0rICA8b2JqZWN0LXR5cGUgbmFtZT0i UU1lc3NhZ2VMb2dDb250ZXh0Ij4KLSsgICAgPG1vZGlmeS1mdW5jdGlvbiBzaWduYXR1cmU9ImNv cHkoY29uc3QgUU1lc3NhZ2VMb2dDb250ZXh0ICZhbXA7KSIgcmVtb3ZlPSJhbGwiLz4KLSsgIDwv b2JqZWN0LXR5cGU+Ci0gCi0gICA8dmFsdWUtdHlwZSBuYW1lPSJRTWV0YU1ldGhvZCI+Ci0gICAg IDxlbnVtLXR5cGUgbmFtZT0iQWNjZXNzIi8+CmRpZmYgLS1naXQgYS9zcmNwa2dzL3B5dGhvbjMt cHlzaWRlMi90ZW1wbGF0ZSBiL3NyY3BrZ3MvcHl0aG9uMy1weXNpZGUyL3RlbXBsYXRlCmluZGV4 IDhjZmViOTMxY2I3Li4yNTZhZDZiYTc3MiAxMDA2NDQKLS0tIGEvc3JjcGtncy9weXRob24zLXB5 c2lkZTIvdGVtcGxhdGUKKysrIGIvc3JjcGtncy9weXRob24zLXB5c2lkZTIvdGVtcGxhdGUKQEAg LTEsOSArMSw3IEBACiAjIFRlbXBsYXRlIGZpbGUgZm9yICdweXRob24zLXB5c2lkZTInCi0jIFhY WCBDQVVUSU9OIHBhdGNoZWQgdG8gc3VwcG9ydCBRdCA1LjEzLjIgYW5kICpOT1QqIFF0IDUuMTQK LSMgd2FybmluZzogcHl0aG9uMy1weXNpZGUyIGlzIHN1cHBvc2VkIHRvIGJlIGFsaWduZWQgd2l0 aCBRdCB2ZXJzaW9uCiBwa2duYW1lPXB5dGhvbjMtcHlzaWRlMgogdmVyc2lvbj01LjE0LjAKLXJl dmlzaW9uPTIKK3JldmlzaW9uPTMKIF9wa2duYW1lPSJweXNpZGUtc2V0dXAtb3BlbnNvdXJjZS1z cmMtJHt2ZXJzaW9ufSIKIHdya3NyYz0iJF9wa2duYW1lIgogY29uZmlndXJlX2FyZ3M9Ii1EQ01B S0VfSU5TVEFMTF9QUkVGSVg9L3VzciAtRENNQUtFX0JVSUxEX1RZUEU9UmVsZWFzZQo= --===============7764129171135952768==--