From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Rex Dieter To: git-commits@fedoraproject.org Subject: [rpms/amarok] epel10.2: - No Notification Area icon for non-KDE desktops (kde#232578,rh#603336) Date: Mon, 06 Jul 2026 18:31:11 GMT Message-ID: <178336267191.1.7150437244345666593.rpms-amarok-602b58867c62@fedoraproject.org> List-ID: X-Git-Repo: rpms/amarok X-Git-Branch: epel10.2 X-Git-Rev: 602b58867c624fa5d9f3a48fd7115dc0ad0a0479 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvYW1hcm9rCkJyYW5j aCA6IGVwZWwxMC4yCkNvbW1pdCA6IDYwMmI1ODg2N2M2MjRmYTVkOWYzYTQ4ZmQ3MTE1ZGMwYWQw YTA0NzkKQXV0aG9yIDogUmV4IERpZXRlciA8cmRpZXRlckBmZWRvcmFwcm9qZWN0Lm9yZz4KRGF0 ZSAgIDogMjAxMC0wNy0wOVQxOToyNjoxNSswMDowMApTdGF0cyAgOiArNjYyLy0yIGluIDUgZmls ZShzKQpVUkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2FtYXJvay9j LzYwMmI1ODg2N2M2MjRmYTVkOWYzYTQ4ZmQ3MTE1ZGMwYWQwYTA0Nzk/YnJhbmNoPWVwZWwxMC4y CgpMb2c6Ci0gTm8gTm90aWZpY2F0aW9uIEFyZWEgaWNvbiBmb3Igbm9uLUtERSBkZXNrdG9wcyAo a2RlIzIzMjU3OCxyaCM2MDMzMzYpCgotLS0KZGlmZiAtLWdpdCBhLzAwMDEtTW92ZS1zb21lLWNv ZGUtaW4tVHJheUljb24tY2xhc3MucGF0Y2ggYi8wMDAxLU1vdmUtc29tZS1jb2RlLWluLVRyYXlJ Y29uLWNsYXNzLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjMyOWZk YzcKLS0tIC9kZXYvbnVsbAorKysgYi8wMDAxLU1vdmUtc29tZS1jb2RlLWluLVRyYXlJY29uLWNs YXNzLnBhdGNoCkBAIC0wLDAgKzEsODUgQEAKK0Zyb20gMjdmNjA5MDc1ZGUwMmY3Njc2MTFkNDU1 YmEzZjllMjljMjk4NjAwMSBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IEtldmluIEZ1 bmsgPGtyZkBlbGVjdHJvc3Rvcm0ubmV0PgorRGF0ZTogRnJpLCAyOCBNYXkgMjAxMCAxMjozNjox OSArMDIwMAorU3ViamVjdDogW1BBVENIIDEvNF0gTW92ZSBzb21lIGNvZGUgaW4gVHJheUljb24g Y2xhc3MuCisKKy0tLQorIHNyYy9UcmF5SWNvbi5jcHAgfCAgIDI5ICsrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0tCisgc3JjL1RyYXlJY29uLmggICB8ICAgIDEgKworIDIgZmlsZXMgY2hhbmdl ZCwgMTEgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9zcmMv VHJheUljb24uY3BwIGIvc3JjL1RyYXlJY29uLmNwcAoraW5kZXggMDYxYmMwOC4uZmI5NzQ4MyAx MDA2NDQKKy0tLSBhL3NyYy9UcmF5SWNvbi5jcHAKKysrKyBiL3NyYy9UcmF5SWNvbi5jcHAKK0BA IC02NCwxMyArNjQsMTMgQEAgQW1hcm9rOjpUcmF5SWNvbjo6VHJheUljb24oIFFPYmplY3QgKnBh cmVudCApCisgCisgICAgIFBFUkZfTE9HKCAiQmVmb3JlIGFkZGluZyBhY3Rpb25zIiApOworIAor LSAgICAjaWZkZWYgUV9XU19NQUMKKysjaWZkZWYgUV9XU19NQUMKKyAgICAgLy8gQWRkIHRoZXNl IGZ1bmN0aW9ucyB0byB0aGUgZG9jayBpY29uIG1lbnUgaW4gT1MgWAorICAgICBleHRlcm4gdm9p ZCBxdF9tYWNfc2V0X2RvY2tfbWVudShRTWVudSAqKTsKKyAgICAgcXRfbWFjX3NldF9kb2NrX21l bnUoIGNvbnRleHRNZW51KCkgKTsKKyAgICAgY29udGV4dE1lbnUoKS0+YWRkQWN0aW9uKCBhYy0+ YWN0aW9uKCAicGxheWxpc3RfcGxheW1lZGlhIiApICk7CisgICAgIGNvbnRleHRNZW51KCktPmFk ZFNlcGFyYXRvcigpOworLSAgICAjZW5kaWYKKysjZW5kaWYKKyAKKyAgICAgY29udGV4dE1lbnUo KS0+YWRkQWN0aW9uKCBhYy0+YWN0aW9uKCAicHJldiIgICAgICAgKSApOworICAgICBjb250ZXh0 TWVudSgpLT5hZGRBY3Rpb24oIGFjLT5hY3Rpb24oICJwbGF5X3BhdXNlIiApICk7CitAQCAtNzks OCArNzksMTUgQEAgQW1hcm9rOjpUcmF5SWNvbjo6VHJheUljb24oIFFPYmplY3QgKnBhcmVudCAp CisgICAgIGNvbnRleHRNZW51KCktPnNldE9iamVjdE5hbWUoICJUcmF5SWNvbkNvbnRleHRNZW51 IiApOworIAorICAgICBQRVJGX0xPRyggIkFkZGluZyBzeXN0ZW0gdHJheSBpY29uIiApOworLSAg ICBwYWludEljb24oKTsKKyAKKysgICAgbV9iYXNlSWNvbiA9IEtJY29uTG9hZGVyOjpnbG9iYWwo KS0+bG9hZEljb24oICJhbWFyb2siLCBLSWNvbkxvYWRlcjo6UGFuZWwgKTsKKysgICAgc2V0SWNv bkJ5UGl4bWFwKCBtX2Jhc2VJY29uICk7IC8vIHNob3cgaWNvbgorKyAgICBzZXRPdmVybGF5SWNv bkJ5TmFtZSggUVN0cmluZygpICk7CisrCisrICAgIG1fZ3JheWVkSWNvbiA9IG1fYmFzZUljb247 IC8vIGNvcGllcyBvYmplY3QKKysgICAgS0ljb25FZmZlY3Q6OnNlbWlUcmFuc3BhcmVudCggbV9n cmF5ZWRJY29uICk7CisrCisrICAgIHBhaW50SWNvbigpOworICAgICBzZXR1cFRvb2xUaXAoKTsK KyAKKyAgICAgY29ubmVjdCggdGhpcywgU0lHTkFMKCBzY3JvbGxSZXF1ZXN0ZWQoIGludCwgUXQ6 Ok9yaWVudGF0aW9uICkgKSwgU0xPVCggc2xvdFNjcm9sbFJlcXVlc3RlZChpbnQsIFF0OjpPcmll bnRhdGlvbikgKSApOworQEAgLTI4OCwyMiArMjk1LDYgQEAgQW1hcm9rOjpUcmF5SWNvbjo6cGFp bnRJY29uKCBxaW50NjQgdHJhY2tQb3NpdGlvbiApCisgeworICAgICBzdGF0aWMgcWludDY0IG9s ZE1lcmdlUG9zID0gLTE7CisgCistICAgIC8vIHN0YXJ0IHVwCistICAgIC8vIFRPRE86IE1vdmUg dGhlc2UgdHdvIGJsb2NrcyB0byBjdG9yICh3YXJuaW5nOiBtaWdodCBnZXQgc29tZSByZWdyZXNz aW9ucykKKy0gICAgaWYoIG1fYmFzZUljb24uaXNOdWxsKCkgKQorLSAgICB7CistICAgICAgICBt X2Jhc2VJY29uID0gS0ljb25Mb2FkZXI6Omdsb2JhbCgpLT5sb2FkSWNvbiggImFtYXJvayIsIEtJ Y29uTG9hZGVyOjpQYW5lbCApOworLSAgICAgICAgc2V0SWNvbkJ5UGl4bWFwKCBtX2Jhc2VJY29u ICk7IC8vIHNob3cgaWNvbgorLSAgICAgICAgc2V0T3ZlcmxheUljb25CeU5hbWUoIFFTdHJpbmco KSApOworLSAgICAgICAgcmV0dXJuOyAvLyBIQUNLOiByZXR1cm4gYmVjYXVzZSBtX2Jhc2VJY29u IGlzIHN0aWxsIG51bGwgYWZ0ZXIgZmlyc3Qgc3RhcnR1cCAod2h5PykKKy0gICAgfQorLQorLSAg ICBpZiggbV9ncmF5ZWRJY29uLmlzTnVsbCgpICkKKy0gICAgeworLSAgICAgICAgbV9ncmF5ZWRJ Y29uID0gbV9iYXNlSWNvbjsgLy8gY29waWVzIG9iamVjdAorLSAgICAgICAgS0ljb25FZmZlY3Q6 OnNlbWlUcmFuc3BhcmVudCggbV9ncmF5ZWRJY29uICk7CistICAgIH0KKy0KKyAgICAgLy8gdHJh Y2tQb3NpdGlvbiA8IDAgbWVhbnMgcmVzZXQKKyAgICAgaWYoIHRyYWNrUG9zaXRpb24gPCAwICkK KyAgICAgeworZGlmZiAtLWdpdCBhL3NyYy9UcmF5SWNvbi5oIGIvc3JjL1RyYXlJY29uLmgKK2lu ZGV4IDQ2YTI2NWIuLmMyNjAyZGYgMTAwNjQ0CistLS0gYS9zcmMvVHJheUljb24uaAorKysrIGIv c3JjL1RyYXlJY29uLmgKK0BAIC00MCw2ICs0MCw3IEBAIGNsYXNzIFRyYXlJY29uIDogcHVibGlj IEtTdGF0dXNOb3RpZmllckl0ZW0sIHB1YmxpYyBFbmdpbmU6OkVuZ2luZU9ic2VydmVyLCBwdWJs CisgCisgcHVibGljOgorICAgICBUcmF5SWNvbiggUU9iamVjdCAqcGFyZW50ICk7CisrCisgICAg IGZyaWVuZCBjbGFzcyA6OkFwcDsKKyAgICAgCisgICAgIHZvaWQgc2V0VmlzaWJsZSggYm9vbCB2 aXNpYmxlICk7CistLSAKKzEuNy4wLjQKKwoKZGlmZiAtLWdpdCBhLzAwMDItU29tZS1UcmF5SWNv bi1jaGFuZ2VzLnBhdGNoIGIvMDAwMi1Tb21lLVRyYXlJY29uLWNoYW5nZXMucGF0Y2gKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjk0MTVmYwotLS0gL2Rldi9udWxsCisrKyBi LzAwMDItU29tZS1UcmF5SWNvbi1jaGFuZ2VzLnBhdGNoCkBAIC0wLDAgKzEsMjUxIEBACitGcm9t IGZlYzllOGY5NGViMzY2NWZjNzA1MWM0ZWFjMmY5NDM1NTA1ODg1MWQgTW9uIFNlcCAxNyAwMDow MDowMCAyMDAxCitGcm9tOiBLZXZpbiBGdW5rIDxrcmZAZWxlY3Ryb3N0b3JtLm5ldD4KK0RhdGU6 IFRodSwgOCBKdWwgMjAxMCAxMjoxMzowMCArMDIwMAorU3ViamVjdDogW1BBVENIIDIvNF0gU29t ZSBUcmF5SWNvbiBjaGFuZ2VzOgorICogUmVtb3ZlIHRyYWNrIHByb2dyZXNzIGVmZmVjdCAodGhp cyBpcyBiZWNhdXNlIEtTTkkgaGFzIHNvbWUgYm9ndXMKKyBpbXBsZW1lbnRhdGlvbiBvZiB0aGUg c2V0SWNvbkJ5UGl4bWFwKCkgZnVuY3Rpb24gY2F1c2luZyB0aGUgb3ZlcmxheQorIGljb24gYmVp bmcgd3Jvbmcgc2l6ZWQKKyAqIEZpeCBvdmVybGF5IGljb24gc2l6ZQorICogVG9vbHRpcCBhbGJ1 bSBjb3ZlciBpcyBub3cgdXBkYXRlZCBpZiBjaGFuZ2VkIGluIEFtYXJvaworICogQ2xlYW51cAor IENDQlVHOiAyMzE1MzkKKyBDQ0JVRzogMjMyNTc4CisgQ0NCVUc6IDIzMjMxMgorIEJVRzogMjMz NTA2CisgQlVHOiAyNDA0NjMKKworLS0tCisgc3JjL1RyYXlJY29uLmNwcCB8ICAxMDYgKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisgc3JjL1Ry YXlJY29uLmggICB8ICAgMTEgKy0tLS0tCisgMiBmaWxlcyBjaGFuZ2VkLCAyNSBpbnNlcnRpb25z KCspLCA5MiBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3NyYy9UcmF5SWNvbi5jcHAgYi9z cmMvVHJheUljb24uY3BwCitpbmRleCBmYjk3NDgzLi40YmQ0NmU0IDEwMDY0NAorLS0tIGEvc3Jj L1RyYXlJY29uLmNwcAorKysrIGIvc3JjL1RyYXlJY29uLmNwcAorQEAgLTUyLDcgKzUyLDYgQEAK KyBBbWFyb2s6OlRyYXlJY29uOjpUcmF5SWNvbiggUU9iamVjdCAqcGFyZW50ICkKKyAgICAgICAg IDogS1N0YXR1c05vdGlmaWVySXRlbSggcGFyZW50ICkKKyAgICAgICAgICwgRW5naW5lOjpFbmdp bmVPYnNlcnZlciggVGhlOjplbmdpbmVDb250cm9sbGVyKCkgKQorLSAgICAgICAgLCBtX3RyYWNr TGVuZ3RoKCAwICkKKyAgICAgICAgICwgbV9zZXBhcmF0b3IoIDAgKQorIHsKKyAgICAgREVCVUdf QkxPQ0sKK0BAIC04MCwxNCArNzksOCBAQCBBbWFyb2s6OlRyYXlJY29uOjpUcmF5SWNvbiggUU9i amVjdCAqcGFyZW50ICkKKyAKKyAgICAgUEVSRl9MT0coICJBZGRpbmcgc3lzdGVtIHRyYXkgaWNv biIgKTsKKyAKKy0gICAgbV9iYXNlSWNvbiA9IEtJY29uTG9hZGVyOjpnbG9iYWwoKS0+bG9hZElj b24oICJhbWFyb2siLCBLSWNvbkxvYWRlcjo6UGFuZWwgKTsKKy0gICAgc2V0SWNvbkJ5UGl4bWFw KCBtX2Jhc2VJY29uICk7IC8vIHNob3cgaWNvbgorLSAgICBzZXRPdmVybGF5SWNvbkJ5TmFtZSgg UVN0cmluZygpICk7CisrICAgIHNldEljb25CeU5hbWUoICJhbWFyb2siICk7CisgCistICAgIG1f Z3JheWVkSWNvbiA9IG1fYmFzZUljb247IC8vIGNvcGllcyBvYmplY3QKKy0gICAgS0ljb25FZmZl Y3Q6OnNlbWlUcmFuc3BhcmVudCggbV9ncmF5ZWRJY29uICk7CistCistICAgIHBhaW50SWNvbigp OworICAgICBzZXR1cFRvb2xUaXAoKTsKKyAKKyAgICAgY29ubmVjdCggdGhpcywgU0lHTkFMKCBz Y3JvbGxSZXF1ZXN0ZWQoIGludCwgUXQ6Ok9yaWVudGF0aW9uICkgKSwgU0xPVCggc2xvdFNjcm9s bFJlcXVlc3RlZChpbnQsIFF0OjpPcmllbnRhdGlvbikgKSApOworQEAgLTEwMiwyMiArOTUsMTMg QEAgQW1hcm9rOjpUcmF5SWNvbjo6c2V0dXBUb29sVGlwKCkKKyAgICAgICAgIHNldFRvb2xUaXBU aXRsZSggVGhlOjplbmdpbmVDb250cm9sbGVyKCktPnByZXR0eU5vd1BsYXlpbmcoKSApOworIAor ICAgICAgICAgUVN0cmluZ0xpc3QgdG9vbHRpcDsKKy0gICAgICAgIC8vIFRPRE86IFVzZSBPYnNl cnZlciB0byBnZXQgbm90aWZpZWQgYWJvdXQgY2hhbmdlZCBhbGJ1bSBhcnQKKy0gICAgICAgIGlm KCBtX3RyYWNrLT5hbGJ1bSgpICkKKysgICAgICAgIGlmKCBtX3RyYWNrLT5hbGJ1bSgpICYmIG1f dHJhY2stPmFsYnVtKCktPmhhc0ltYWdlKCkgKQorICAgICAgICAgeworICAgICAgICAgICAgIGNv bnN0IFFTdHJpbmcgdWlkID0gbV90cmFjay0+dWlkVXJsKCk7CisgICAgICAgICAgICAgaWYgKCB1 aWQgIT0gbV90b29sVGlwSWNvblVpZCApIHsKKyAgICAgICAgICAgICAgICAgY29uc3QgUVBpeG1h cCBpbWFnZSA9IFRoZTo6c3ZnSGFuZGxlcigpLT5pbWFnZVdpdGhCb3JkZXIoIG1fdHJhY2stPmFs YnVtKCksIEtJY29uTG9hZGVyOjpTaXplTGFyZ2UsIDUgKTsKKy0gICAgICAgICAgICAgICAgaWYg KCBpbWFnZS5pc051bGwoKSApCistICAgICAgICAgICAgICAgIHsKKy0gICAgICAgICAgICAgICAg ICAgIHNldFRvb2xUaXBJY29uQnlOYW1lKCAiYW1hcm9rIiApOworLSAgICAgICAgICAgICAgICAg ICAgbV90b29sVGlwSWNvblVpZC5jbGVhcigpOworLSAgICAgICAgICAgICAgICB9CistICAgICAg ICAgICAgICAgIGVsc2UKKy0gICAgICAgICAgICAgICAgeworLSAgICAgICAgICAgICAgICAgICAg c2V0VG9vbFRpcEljb25CeVBpeG1hcCggaW1hZ2UgKTsKKy0gICAgICAgICAgICAgICAgICAgIG1f dG9vbFRpcEljb25VaWQgPSB1aWQ7CistICAgICAgICAgICAgICAgIH0KKysgICAgICAgICAgICAg ICAgc2V0VG9vbFRpcEljb25CeVBpeG1hcCggaW1hZ2UgKTsKKysgICAgICAgICAgICAgICAgbV90 b29sVGlwSWNvblVpZCA9IHVpZDsKKyAgICAgICAgICAgICB9CisgICAgICAgICB9CisgICAgICAg ICBlbHNlCitAQCAtMTg0LDkgKzE2OCwxMCBAQCBBbWFyb2s6OlRyYXlJY29uOjpzZXR1cFRvb2xU aXAoKQorICAgICBlbHNlCisgICAgIHsKKyAgICAgICAgIHNldFRvb2xUaXBJY29uQnlOYW1lKCAi YW1hcm9rIiApOworLSAgICAgICAgbV90b29sVGlwSWNvblVpZC5jbGVhcigpOworICAgICAgICAg c2V0VG9vbFRpcFRpdGxlKCBLQ21kTGluZUFyZ3M6OmFib3V0RGF0YSgpLT5wcm9ncmFtTmFtZSgp ICk7CisgICAgICAgICBzZXRUb29sVGlwU3ViVGl0bGUoIFRoZTo6ZW5naW5lQ29udHJvbGxlcigp LT5wcmV0dHlOb3dQbGF5aW5nKCkgKTsKKysKKysgICAgICAgIG1fdG9vbFRpcEljb25VaWQuY2xl YXIoKTsKKyAgICAgfQorIH0KKyAKK0BAIC0yMDYsMjAgKzE5MSwyNiBAQCBBbWFyb2s6OlRyYXlJ Y29uOjplbmdpbmVTdGF0ZUNoYW5nZWQoIFBob25vbjo6U3RhdGUgc3RhdGUsIFBob25vbjo6U3Rh dGUgLypvbGRTdAorICAgICBzd2l0Y2goIHN0YXRlICkKKyAgICAgeworICAgICAgICAgY2FzZSBQ aG9ub246OlBsYXlpbmdTdGF0ZToKKy0gICAgICAgICAgICB1bnN1YnNjcmliZUZyb20oIG1fdHJh Y2sgKTsKKysgICAgICAgICAgICBpZiAoIG1fdHJhY2sgKQorKyAgICAgICAgICAgIHsKKysgICAg ICAgICAgICAgICAgdW5zdWJzY3JpYmVGcm9tKCBtX3RyYWNrICk7CisrICAgICAgICAgICAgICAg IHVuc3Vic2NyaWJlRnJvbSggbV90cmFjay0+YWxidW0oKSApOworKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICBtX3RyYWNrID0gdHJhY2s7CistICAgICAgICAgICAgbV90cmFja0xlbmd0aCA9 IG1fdHJhY2sgPyBtX3RyYWNrLT5sZW5ndGgoKSA6IDA7CistICAgICAgICAgICAgc3Vic2NyaWJl VG8oIHRyYWNrICk7CisrICAgICAgICAgICAgaWYgKCB0cmFjayApCisrICAgICAgICAgICAgewor KyAgICAgICAgICAgICAgICBzdWJzY3JpYmVUbyggdHJhY2sgKTsKKysgICAgICAgICAgICAgICAg c3Vic2NyaWJlVG8oIHRyYWNrLT5hbGJ1bSgpICk7CisrICAgICAgICAgICAgfQorIAorLSAgICAg ICAgICAgIHBhaW50SWNvbiggMCApOworKyAgICAgICAgICAgIHNldE92ZXJsYXlJY29uQnlOYW1l KCAibWVkaWEtcGxheWJhY2stc3RhcnQiICk7CisgICAgICAgICAgICAgc2V0dXBNZW51KCk7Cisg ICAgICAgICAgICAgYnJlYWs7CisgCisgICAgICAgICBjYXNlIFBob25vbjo6U3RvcHBlZFN0YXRl OgorICAgICAgICAgICAgIG1fdHJhY2sgPSAwOworLSAgICAgICAgICAgIG1fdHJhY2tMZW5ndGgg PSAwOworIAorLSAgICAgICAgICAgIHBhaW50SWNvbigpOworKyAgICAgICAgICAgIHNldE92ZXJs YXlJY29uQnlOYW1lKCBRU3RyaW5nKCkgKTsKKyAgICAgICAgICAgICBzZXR1cE1lbnUoKTsgLy8g cmVtb3ZlIGN1c3RvbSB0cmFjayBhY3Rpb25zIG9uIHN0b3AKKyAgICAgICAgICAgICBicmVhazsK KyAKK0BAIC0yMzAsNiArMjIxLDcgQEAgQW1hcm9rOjpUcmF5SWNvbjo6ZW5naW5lU3RhdGVDaGFu Z2VkKCBQaG9ub246OlN0YXRlIHN0YXRlLCBQaG9ub246OlN0YXRlIC8qb2xkU3QKKyAgICAgICAg IGNhc2UgUGhvbm9uOjpMb2FkaW5nU3RhdGU6CisgICAgICAgICBjYXNlIFBob25vbjo6RXJyb3JT dGF0ZToKKyAgICAgICAgIGNhc2UgUGhvbm9uOjpCdWZmZXJpbmdTdGF0ZToKKysgICAgICAgICAg ICBzZXRPdmVybGF5SWNvbkJ5TmFtZSggUVN0cmluZygpICk7CisgICAgICAgICAgICAgYnJlYWs7 CisgICAgIH0KKyAKK0BAIC0yNDAsOSArMjMyLDYgQEAgdm9pZAorIEFtYXJvazo6VHJheUljb246 OmVuZ2luZU5ld1RyYWNrUGxheWluZygpCisgeworICAgICBtX3RyYWNrID0gVGhlOjplbmdpbmVD b250cm9sbGVyKCktPmN1cnJlbnRUcmFjaygpOworLSAgICBtX3RyYWNrTGVuZ3RoID0gbV90cmFj ayA/IG1fdHJhY2stPmxlbmd0aCgpIDogMDsKKy0KKy0gICAgcGFpbnRJY29uKCAwICk7CisgCisg ICAgIHNldHVwVG9vbFRpcCgpOworICAgICBzZXR1cE1lbnUoKTsKK0BAIC0yNTgsMTIgKzI0Nywx MiBAQCBBbWFyb2s6OlRyYXlJY29uOjptZXRhZGF0YUNoYW5nZWQoIE1ldGE6OlRyYWNrUHRyIHRy YWNrICkKKyB9CisgCisgdm9pZAorLUFtYXJvazo6VHJheUljb246OmVuZ2luZVRyYWNrUG9zaXRp b25DaGFuZ2VkKCBxaW50NjQgcG9zaXRpb24sIGJvb2wgdXNlclNlZWsgKQorK0FtYXJvazo6VHJh eUljb246Om1ldGFkYXRhQ2hhbmdlZCggTWV0YTo6QWxidW1QdHIgYWxidW0gKQorIHsKKy0gICAg UV9VTlVTRUQoIHVzZXJTZWVrICk7CisrICAgIFFfVU5VU0VEKCBhbGJ1bSApCisgCistICAgIGlm KCBtX3RyYWNrTGVuZ3RoICkKKy0gICAgICAgIHBhaW50SWNvbiggcG9zaXRpb24gKTsKKysgICAg c2V0dXBUb29sVGlwKCk7CisrICAgIHNldHVwTWVudSgpOworIH0KKyAKKyB2b2lkCitAQCAtMjgz LDU1ICsyNzIsNiBAQCBBbWFyb2s6OlRyYXlJY29uOjplbmdpbmVNdXRlU3RhdGVDaGFuZ2VkKCBi b29sIG11dGUgKQorIH0KKyAKKyB2b2lkCistQW1hcm9rOjpUcmF5SWNvbjo6cGFsZXR0ZUNoYW5n ZSggY29uc3QgUVBhbGV0dGUgJiBvcCApCisteworLSAgICBRX1VOVVNFRCggb3AgKTsKKy0KKy0g ICAgcGFpbnRJY29uKCk7CistfQorLQorLXZvaWQKKy1BbWFyb2s6OlRyYXlJY29uOjpwYWludElj b24oIHFpbnQ2NCB0cmFja1Bvc2l0aW9uICkKKy17CistICAgIHN0YXRpYyBxaW50NjQgb2xkTWVy Z2VQb3MgPSAtMTsKKy0KKy0gICAgLy8gdHJhY2tQb3NpdGlvbiA8IDAgbWVhbnMgcmVzZXQKKy0g ICAgaWYoIHRyYWNrUG9zaXRpb24gPCAwICkKKy0gICAgeworLSAgICAgICAgb2xkTWVyZ2VQb3Mg PSAtMTsKKy0gICAgICAgIHNldEljb25CeVBpeG1hcCggbV9iYXNlSWNvbiApOworLSAgICAgICAg c2V0T3ZlcmxheUljb25CeU5hbWUoIFFTdHJpbmcoKSApOworLSAgICAgICAgcmV0dXJuOworLSAg ICB9CistCistICAgIC8vIGNoZWNrIGlmIHdlIGFyZSBwbGF5aW5nIGEgc3RyZWFtCistICAgIGlm KCAhbV90cmFja0xlbmd0aCApCistICAgIHsKKy0gICAgICAgIG1faWNvbiA9IG1fYmFzZUljb247 CistICAgICAgICBzZXRJY29uQnlQaXhtYXAoIG1faWNvbiApOworLSAgICAgICAgc2V0T3Zlcmxh eUljb25CeU5hbWUoICJtZWRpYS1wbGF5YmFjay1zdGFydCIgKTsKKy0gICAgICAgIHJldHVybjsK Ky0gICAgfQorLQorLSAgICBjb25zdCBxaW50NjQgbWVyZ2VQb3MgPSAoIGZsb2F0KCB0cmFja1Bv c2l0aW9uICkgLyBtX3RyYWNrTGVuZ3RoICkgKiBtX2ljb24uaGVpZ2h0KCk7CistCistICAgIC8v IHJldHVybiBpZiBwaXhtYXAgd291bGQgc3RheSB0aGUgc2FtZQorLSAgICBpZiggb2xkTWVyZ2VQ b3MgPT0gbWVyZ2VQb3MgKQorLSAgICAgICAgcmV0dXJuOworLQorLSAgICAvLyBkcmF3IG1fYmFz ZUljb24gb24gdG9wIG9mIHRoZSBncmF5IHZlcnNpb24KKy0gICAgbV9pY29uID0gbV9ncmF5ZWRJ Y29uOyAvLyBjb3BpZXMgb2JqZWN0CistICAgIFFQYWludGVyIHAoICZtX2ljb24gKTsKKy0gICAg cC5kcmF3UGl4bWFwKCAwLCAwLCBtX2Jhc2VJY29uLCAwLCAwLCAwLCBtX2ljb24uaGVpZ2h0KCkg LSBtZXJnZVBvcyApOworLSAgICBwLmVuZCgpOworLQorLSAgICBvbGRNZXJnZVBvcyA9IG1lcmdl UG9zOworLQorLSAgICBzZXRJY29uQnlQaXhtYXAoIG1faWNvbiApOworLSAgICBzZXRPdmVybGF5 SWNvbkJ5TmFtZSggIm1lZGlhLXBsYXliYWNrLXN0YXJ0IiApOworLX0KKy0KKy12b2lkCisgQW1h cm9rOjpUcmF5SWNvbjo6c2V0dXBNZW51KCkKKyB7CisgICAgIGZvcmVhY2goIFFBY3Rpb24qIGFj dGlvbiwgbV9leHRyYUFjdGlvbnMgKQorZGlmZiAtLWdpdCBhL3NyYy9UcmF5SWNvbi5oIGIvc3Jj L1RyYXlJY29uLmgKK2luZGV4IGMyNjAyZGYuLmQ1OTBiNWYgMTAwNjQ0CistLS0gYS9zcmMvVHJh eUljb24uaAorKysrIGIvc3JjL1RyYXlJY29uLmgKK0BAIC00OSwxNiArNDksMTMgQEAgcHJvdGVj dGVkOgorICAgICAvLyByZWltcGxlbWVudGVkIGZyb20gZW5naW5lb2JzZXJ2ZXIKKyAgICAgdmly dHVhbCB2b2lkIGVuZ2luZVN0YXRlQ2hhbmdlZCggUGhvbm9uOjpTdGF0ZSBzdGF0ZSwgUGhvbm9u OjpTdGF0ZSBvbGRTdGF0ZSA9IFBob25vbjo6U3RvcHBlZFN0YXRlICk7CisgICAgIHZpcnR1YWwg dm9pZCBlbmdpbmVOZXdUcmFja1BsYXlpbmcoKTsKKy0gICAgdmlydHVhbCB2b2lkIGVuZ2luZVRy YWNrUG9zaXRpb25DaGFuZ2VkKCBxaW50NjQgcG9zaXRpb24sIGJvb2wgLyp1c2VyU2VlayovICk7 CisgICAgIHZpcnR1YWwgdm9pZCBlbmdpbmVWb2x1bWVDaGFuZ2VkKCBpbnQgcGVyY2VudCApOwor ICAgICB2aXJ0dWFsIHZvaWQgZW5naW5lTXV0ZVN0YXRlQ2hhbmdlZCggYm9vbCBtdXRlICk7Cisg CistICAgIC8vUmVpbXBsZW1lbnRlZCBmcm9tIE1ldGE6Ok9ic2VydmVyCisrICAgIC8vIHJlaW1w bGVtZW50ZWQgZnJvbSBNZXRhOjpPYnNlcnZlcgorICAgICB1c2luZyBPYnNlcnZlcjo6bWV0YWRh dGFDaGFuZ2VkOworICAgICB2aXJ0dWFsIHZvaWQgbWV0YWRhdGFDaGFuZ2VkKCBNZXRhOjpUcmFj a1B0ciB0cmFjayApOworLQorLSAgICAvLyBnZXQgbm90aWZpZWQgb2YgJ2hpZ2hsaWdodCcgY29s b3IgY2hhbmdlCistICAgIHZpcnR1YWwgdm9pZCBwYWxldHRlQ2hhbmdlKCBjb25zdCBRUGFsZXR0 ZSAmIG9sZFBhbGV0dGUgKTsKKysgICAgdmlydHVhbCB2b2lkIG1ldGFkYXRhQ2hhbmdlZCggTWV0 YTo6QWxidW1QdHIgYWxidW0gKTsKKyAKKyBwcml2YXRlIHNsb3RzOgorICAgICB2b2lkIHNsb3RB Y3RpdmF0ZWQoKTsKK0BAIC02OCwxMyArNjUsOSBAQCBwcml2YXRlOgorICAgICB2b2lkIHNldHVw TWVudSgpOworICAgICB2b2lkIHNldHVwVG9vbFRpcCgpOworIAorLSAgICB2b2lkIHBhaW50SWNv biggcWludDY0IHRyYWNrUG9zaXRpb24gPSAtMSApOworLQorICAgICBNZXRhOjpUcmFja1B0ciBt X3RyYWNrOworLSAgICBxaW50NjQgbV90cmFja0xlbmd0aDsKKyAgICAgUVN0cmluZyBtX3Rvb2xU aXBJY29uVWlkOworIAorLSAgICBRUGl4bWFwIG1fYmFzZUljb24sIG1fZ3JheWVkSWNvbiwgbV9p Y29uOworICAgICBTbWFydFBvaW50ZXJMaXN0PFFBY3Rpb24+IG1fZXh0cmFBY3Rpb25zOworICAg ICBRUG9pbnRlcjxRQWN0aW9uPiBtX3NlcGFyYXRvcjsKKyB9OworLS0gCisxLjcuMC40CisKCmRp ZmYgLS1naXQgYS8wMDAzLVRyYXlJY29uLURvLW5vdC11cGRhdGUtY292ZXItZWFjaC10aW1lLXdl LXVwZGF0ZS10aGUucGF0Y2ggYi8wMDAzLVRyYXlJY29uLURvLW5vdC11cGRhdGUtY292ZXItZWFj aC10aW1lLXdlLXVwZGF0ZS10aGUucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uZDM5OWNhMgotLS0gL2Rldi9udWxsCisrKyBiLzAwMDMtVHJheUljb24tRG8tbm90LXVw ZGF0ZS1jb3Zlci1lYWNoLXRpbWUtd2UtdXBkYXRlLXRoZS5wYXRjaApAQCAtMCwwICsxLDI1OCBA QAorRnJvbSAzMDNmOWIyN2M0OWVmZTA1NDNiNDM4ODA3MzM3NDQwNjEwNWU5MTdkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQorRnJvbTogS2V2aW4gRnVuayA8a3JmQGVsZWN0cm9zdG9ybS5uZXQ+ CitEYXRlOiBUaHUsIDggSnVsIDIwMTAgMTI6NTg6MzcgKzAyMDAKK1N1YmplY3Q6IFtQQVRDSCAz LzRdIFRyYXlJY29uOiBEbyBub3QgdXBkYXRlIGNvdmVyIGVhY2ggdGltZSB3ZSB1cGRhdGUgdGhl IHRvb2x0aXAuIENsZWFudXAKKyBpbmNsdWRlcyBhc3dlbGwuCisKKy0tLQorIHNyYy9UcmF5SWNv bi5jcHAgfCAgIDgyICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQorIHNyYy9UcmF5SWNvbi5oICAgfCAgICA4ICstLS0tCisgMiBmaWxlcyBjaGFu Z2VkLCAzMyBpbnNlcnRpb25zKCspLCA1NyBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3Ny Yy9UcmF5SWNvbi5jcHAgYi9zcmMvVHJheUljb24uY3BwCitpbmRleCA0YmQ0NmU0Li43Mzk4ZTJh IDEwMDY0NAorLS0tIGEvc3JjL1RyYXlJY29uLmNwcAorKysrIGIvc3JjL1RyYXlJY29uLmNwcAor QEAgLTI2LDI3ICsyNiwxOSBAQAorICNpbmNsdWRlICJFbmdpbmVDb250cm9sbGVyLmgiCisgI2lu Y2x1ZGUgImFtYXJva2NvbmZpZy5oIgorICNpbmNsdWRlICJHbG9iYWxDdXJyZW50VHJhY2tBY3Rp b25zLmgiCistI2luY2x1ZGUgImNvcmUvbWV0YS9zdXBwb3J0L01ldGFDb25zdGFudHMuaCIKKyAj aW5jbHVkZSAiY29yZS9jYXBhYmlsaXRpZXMvQ3VycmVudFRyYWNrQWN0aW9uc0NhcGFiaWxpdHku aCIKKyAjaW5jbHVkZSAicGxheWxpc3QvUGxheWxpc3RBY3Rpb25zLmgiCistI2luY2x1ZGUgInBs YXlsaXN0L1BsYXlsaXN0TW9kZWxTdGFjay5oIgorICNpbmNsdWRlICJTdmdIYW5kbGVyLmgiCisg I2luY2x1ZGUgPEtBYm91dERhdGE+CisgI2luY2x1ZGUgPEtBY3Rpb24+CisgI2luY2x1ZGUgPEtD bWRMaW5lQXJncz4KKy0jaW5jbHVkZSA8S0ljb24+CistI2luY2x1ZGUgPEtJY29uRWZmZWN0Pgor ICNpbmNsdWRlIDxLTG9jYWxlPgorICNpbmNsdWRlIDxLTWVudT4KKyAjaW5jbHVkZSA8S1N0YW5k YXJkRGlycz4KKyAKKyAjaW5jbHVkZSA8UUFjdGlvbj4KKy0jaW5jbHVkZSA8UUV2ZW50PgorICNp bmNsdWRlIDxRRm9udE1ldHJpY3M+CistI2luY2x1ZGUgPFFNb3VzZUV2ZW50PgorLSNpbmNsdWRl IDxRUGFpbnRlcj4KKyAjaW5jbHVkZSA8UVBpeG1hcD4KKy0jaW5jbHVkZSA8UVRpbWU+CisgI2lu Y2x1ZGUgPFFUb29sVGlwPgorIAorIEFtYXJvazo6VHJheUljb246OlRyYXlJY29uKCBRT2JqZWN0 ICpwYXJlbnQgKQorQEAgLTgxLDg3ICs3Myw3OSBAQCBBbWFyb2s6OlRyYXlJY29uOjpUcmF5SWNv biggUU9iamVjdCAqcGFyZW50ICkKKyAKKyAgICAgc2V0SWNvbkJ5TmFtZSggImFtYXJvayIgKTsK KyAKKy0gICAgc2V0dXBUb29sVGlwKCk7CisrICAgIHNldHVwVG9vbFRpcCggdHJ1ZSApOworIAor ICAgICBjb25uZWN0KCB0aGlzLCBTSUdOQUwoIHNjcm9sbFJlcXVlc3RlZCggaW50LCBRdDo6T3Jp ZW50YXRpb24gKSApLCBTTE9UKCBzbG90U2Nyb2xsUmVxdWVzdGVkKGludCwgUXQ6Ok9yaWVudGF0 aW9uKSApICk7CisgICAgIGNvbm5lY3QoIHRoaXMsIFNJR05BTCggc2Vjb25kYXJ5QWN0aXZhdGVS ZXF1ZXN0ZWQoIGNvbnN0IFFQb2ludCAmICkgKSwgU0xPVCggc2xvdEFjdGl2YXRlZCgpICkgKTsK KyB9CisgCisgdm9pZAorLUFtYXJvazo6VHJheUljb246OnNldHVwVG9vbFRpcCgpCisrQW1hcm9r OjpUcmF5SWNvbjo6c2V0dXBUb29sVGlwKCBib29sIHVwZGF0ZUljb24gKQorIHsKKyAgICAgaWYo IG1fdHJhY2sgKQorICAgICB7CisgICAgICAgICBzZXRUb29sVGlwVGl0bGUoIFRoZTo6ZW5naW5l Q29udHJvbGxlcigpLT5wcmV0dHlOb3dQbGF5aW5nKCkgKTsKKyAKKy0gICAgICAgIFFTdHJpbmdM aXN0IHRvb2x0aXA7CistICAgICAgICBpZiggbV90cmFjay0+YWxidW0oKSAmJiBtX3RyYWNrLT5h bGJ1bSgpLT5oYXNJbWFnZSgpICkKKysgICAgICAgIC8vIGNoZWNrIGlmIHdlIHJlYWxseSBuZWVk IHRvIHVwZGF0ZSB0aGUgaWNvbiAocGVyZm9ybWFuY2UgdHdlYWspCisrICAgICAgICBpZiggdXBk YXRlSWNvbiApCisgICAgICAgICB7CistICAgICAgICAgICAgY29uc3QgUVN0cmluZyB1aWQgPSBt X3RyYWNrLT51aWRVcmwoKTsKKy0gICAgICAgICAgICBpZiAoIHVpZCAhPSBtX3Rvb2xUaXBJY29u VWlkICkgeworLSAgICAgICAgICAgICAgICBjb25zdCBRUGl4bWFwIGltYWdlID0gVGhlOjpzdmdI YW5kbGVyKCktPmltYWdlV2l0aEJvcmRlciggbV90cmFjay0+YWxidW0oKSwgS0ljb25Mb2FkZXI6 OlNpemVMYXJnZSwgNSApOworKyAgICAgICAgICAgIGlmKCBtX3RyYWNrLT5hbGJ1bSgpICYmIG1f dHJhY2stPmFsYnVtKCktPmhhc0ltYWdlKCkgKQorKyAgICAgICAgICAgIHsKKysgICAgICAgICAg ICAgICAgZGVidWcoKSA8PCAiSEVSRSI7CisrICAgICAgICAgICAgICAgIFFQaXhtYXAgaW1hZ2Ug PSBUaGU6OnN2Z0hhbmRsZXIoKS0+aW1hZ2VXaXRoQm9yZGVyKCBtX3RyYWNrLT5hbGJ1bSgpLCBL SWNvbkxvYWRlcjo6U2l6ZUxhcmdlLCA1ICk7CisgICAgICAgICAgICAgICAgIHNldFRvb2xUaXBJ Y29uQnlQaXhtYXAoIGltYWdlICk7CistICAgICAgICAgICAgICAgIG1fdG9vbFRpcEljb25VaWQg PSB1aWQ7CisgICAgICAgICAgICAgfQorLSAgICAgICAgfQorLSAgICAgICAgZWxzZQorLSAgICAg ICAgeworLSAgICAgICAgICAgIHNldFRvb2xUaXBJY29uQnlOYW1lKCAiYW1hcm9rIiApOworLSAg ICAgICAgICAgIG1fdG9vbFRpcEljb25VaWQuY2xlYXIoKTsKKysgICAgICAgICAgICBlbHNlCisr ICAgICAgICAgICAgeworKyAgICAgICAgICAgICAgICBzZXRUb29sVGlwSWNvbkJ5TmFtZSggImFt YXJvayIgKTsKKysgICAgICAgICAgICB9CisgICAgICAgICB9CisgCistICAgICAgICBRU3RyaW5n TGlzdCBsZWZ0LCByaWdodDsKKysgICAgICAgIFFTdHJpbmdMaXN0IHRvb2x0aXA7CisgCistICAg ICAgICAvLyBUT0RPOiBSZXBsYWNlIGJsb2NrIGJ5IHNvbWUgb3RoZXIgdXNlZnVsIGluZm9ybWF0 aW9uCisgICAgICAgICBRU3RyaW5nIHZvbHVtZTsKKyAgICAgICAgIGlmICggVGhlOjplbmdpbmVD b250cm9sbGVyKCktPmlzTXV0ZWQoKSApCisrICAgICAgICB7CisgICAgICAgICAgICAgdm9sdW1l ID0gaTE4biggIk11dGVkIiApOworKyAgICAgICAgfQorICAgICAgICAgZWxzZQorKyAgICAgICAg eworICAgICAgICAgICAgIHZvbHVtZSA9IFFTdHJpbmcoICIlMSUiICkuYXJnKCBUaGU6OmVuZ2lu ZUNvbnRyb2xsZXIoKS0+dm9sdW1lKCkgKTsKKy0gICAgICAgIHJpZ2h0IDw8IFFTdHJpbmcoIjxp PiUxPC9pPiIpLmFyZyggdm9sdW1lICk7CistICAgICAgICBsZWZ0IDw8IFFTdHJpbmcoICI8aT4l MTwvaT4iICkuYXJnKCBpMThuKCAiVm9sdW1lIiApICk7CisrICAgICAgICB9CisrICAgICAgICB0 b29sdGlwIDw8IFFTdHJpbmcoIjxpPiUxOiAlMjwvaT4iKS5hcmcoIGkxOG4oICJWb2x1bWUiICkg KS5hcmcoIHZvbHVtZSApOworIAorICAgICAgICAgY29uc3QgZmxvYXQgc2NvcmUgPSBtX3RyYWNr LT5zY29yZSgpOworICAgICAgICAgaWYoIHNjb3JlID4gMC5mICkKKyAgICAgICAgIHsKKy0gICAg ICAgICAgICByaWdodCA8PCBRU3RyaW5nOjpudW1iZXIoIHNjb3JlLCAnZicsIDIgKTsgIC8vIDIg ZGlnaXRzIGFmdGVyIGRlY2ltYWwgcG9pbnQKKy0gICAgICAgICAgICBsZWZ0IDw8IGkxOG4oICJT Y29yZSIgKTsKKysgICAgICAgICAgICB0b29sdGlwIDw8IFFTdHJpbmcoICIlMTogJTIiICkuYXJn KCBpMThuKCAiU2NvcmUiICkgKS5hcmcoIFFTdHJpbmc6Om51bWJlciggc2NvcmUsICdmJywgMiAp ICk7CisgICAgICAgICB9CisgCisgICAgICAgICBjb25zdCBpbnQgcmF0aW5nID0gbV90cmFjay0+ cmF0aW5nKCk7CisgICAgICAgICBpZiggcmF0aW5nID4gMCApCisgICAgICAgICB7CistICAgICAg ICAgICAgUVN0cmluZyBzOworKyAgICAgICAgICAgIFFTdHJpbmcgc3RhcnM7CisgICAgICAgICAg ICAgZm9yKCBpbnQgaSA9IDA7IGkgPCByYXRpbmcgLyAyOyArK2kgKQorLSAgICAgICAgICAgICAg ICBzICs9IFFTdHJpbmcoICI8aW1nIHNyYz1cIiUxXCIgaGVpZ2h0PVwiJTJcIiB3aWR0aD1cIiUz XCI+IiApCisrICAgICAgICAgICAgICAgIHN0YXJzICs9IFFTdHJpbmcoICI8aW1nIHNyYz1cIiUx XCIgaGVpZ2h0PVwiJTJcIiB3aWR0aD1cIiUzXCI+IiApCisgICAgICAgICAgICAgICAgICAgICAg ICAgLmFyZyggS1N0YW5kYXJkRGlyczo6bG9jYXRlKCAiZGF0YSIsICJhbWFyb2svaW1hZ2VzL3N0 YXIucG5nIiApICkKKyAgICAgICAgICAgICAgICAgICAgICAgICAuYXJnKCBRRm9udE1ldHJpY3Mo IFFUb29sVGlwOjpmb250KCkgKS5oZWlnaHQoKSApCisgICAgICAgICAgICAgICAgICAgICAgICAg LmFyZyggUUZvbnRNZXRyaWNzKCBRVG9vbFRpcDo6Zm9udCgpICkuaGVpZ2h0KCkgKTsKKyAgICAg ICAgICAgICBpZiggcmF0aW5nICUgMiApCistICAgICAgICAgICAgICAgIHMgKz0gUVN0cmluZygg IjxpbWcgc3JjPVwiJTFcIiBoZWlnaHQ9XCIlMlwiIHdpZHRoPVwiJTNcIj4iICkKKysgICAgICAg ICAgICAgICAgc3RhcnMgKz0gUVN0cmluZyggIjxpbWcgc3JjPVwiJTFcIiBoZWlnaHQ9XCIlMlwi IHdpZHRoPVwiJTNcIj4iICkKKyAgICAgICAgICAgICAgICAgICAgICAgICAuYXJnKCBLU3RhbmRh cmREaXJzOjpsb2NhdGUoICJkYXRhIiwgImFtYXJvay9pbWFnZXMvc21hbGxzdGFyLnBuZyIgKSAp CisgICAgICAgICAgICAgICAgICAgICAgICAgLmFyZyggUUZvbnRNZXRyaWNzKCBRVG9vbFRpcDo6 Zm9udCgpICkuaGVpZ2h0KCkgKQorICAgICAgICAgICAgICAgICAgICAgICAgIC5hcmcoIFFGb250 TWV0cmljcyggUVRvb2xUaXA6OmZvbnQoKSApLmhlaWdodCgpICk7CistICAgICAgICAgICAgcmln aHQgPDwgczsKKy0gICAgICAgICAgICBsZWZ0IDw8IGkxOG4oICJSYXRpbmciICk7CisrCisrICAg ICAgICAgICAgdG9vbHRpcCA8PCBRU3RyaW5nKCAiJTE6ICUyIiApLmFyZyggaTE4biggIlJhdGlu ZyIgKSApLmFyZyggc3RhcnMgKTsKKyAgICAgICAgIH0KKyAKKyAgICAgICAgIGNvbnN0IGludCBj b3VudCA9IG1fdHJhY2stPnBsYXlDb3VudCgpOworICAgICAgICAgaWYoIGNvdW50ID4gMCApCisg ICAgICAgICB7CistICAgICAgICAgICAgcmlnaHQgPDwgUVN0cmluZzo6bnVtYmVyKCBjb3VudCAp OworLSAgICAgICAgICAgIGxlZnQgPDwgaTE4biggIlBsYXkgQ291bnQiICk7CisrICAgICAgICAg ICAgdG9vbHRpcCA8PCBRU3RyaW5nKCAiJTE6ICUyIiApLmFyZyggaTE4biggIlBsYXkgQ291bnQi ICkgKS5hcmcoIFFTdHJpbmc6Om51bWJlciggY291bnQgKSApOworICAgICAgICAgfQorIAorICAg ICAgICAgY29uc3QgdWludCBsYXN0UGxheWVkID0gbV90cmFjay0+bGFzdFBsYXllZCgpOworLSAg ICAgICAgcmlnaHQgPDwgQW1hcm9rOjp2ZXJib3NlVGltZVNpbmNlKCBsYXN0UGxheWVkICk7Cist ICAgICAgICBsZWZ0IDw8IGkxOG4oICJMYXN0IFBsYXllZCIgKTsKKy0KKy0gICAgICAgIC8vIE5P VEU6IEl0IHNlZW1zIHRvIGJlIG5lY2Vzc2FyeSB0byA8Y2VudGVyPiBlYWNoIGVsZW1lbnQgaW5k aXZkdWFsbHkKKy0gICAgICAgIGNvbnN0IFFTdHJpbmcgcm93ID0gIi0gJTE6ICUyIjsKKy0gICAg ICAgIGZvciggaW50IHggPSAwOyB4IDwgbGVmdC5jb3VudCgpOyArK3ggKQorLSAgICAgICAgICAg IGlmICggIXJpZ2h0W3hdLmlzRW1wdHkoKSApCistICAgICAgICAgICAgICAgIHRvb2x0aXAgPDwg cm93LmFyZyggbGVmdFt4XSApLmFyZyggcmlnaHRbeF0gKTsKKysgICAgICAgIHRvb2x0aXAgPDwg UVN0cmluZyggIiUxOiAlMiIgKS5hcmcoIGkxOG4oICJMYXN0IHBsYXllZCIgKSApLmFyZyggQW1h cm9rOjp2ZXJib3NlVGltZVNpbmNlKCBsYXN0UGxheWVkICkgKTsKKyAKKyAgICAgICAgIHNldFRv b2xUaXBTdWJUaXRsZSggdG9vbHRpcC5qb2luKCI8YnI+IikgKTsKKyAgICAgfQorQEAgLTE3MCw4 ICsxNTQsNiBAQCBBbWFyb2s6OlRyYXlJY29uOjpzZXR1cFRvb2xUaXAoKQorICAgICAgICAgc2V0 VG9vbFRpcEljb25CeU5hbWUoICJhbWFyb2siICk7CisgICAgICAgICBzZXRUb29sVGlwVGl0bGUo IEtDbWRMaW5lQXJnczo6YWJvdXREYXRhKCktPnByb2dyYW1OYW1lKCkgKTsKKyAgICAgICAgIHNl dFRvb2xUaXBTdWJUaXRsZSggVGhlOjplbmdpbmVDb250cm9sbGVyKCktPnByZXR0eU5vd1BsYXlp bmcoKSApOworLQorLSAgICAgICAgbV90b29sVGlwSWNvblVpZC5jbGVhcigpOworICAgICB9Cisg fQorIAorQEAgLTIyNSw3ICsyMDcsNyBAQCBBbWFyb2s6OlRyYXlJY29uOjplbmdpbmVTdGF0ZUNo YW5nZWQoIFBob25vbjo6U3RhdGUgc3RhdGUsIFBob25vbjo6U3RhdGUgLypvbGRTdAorICAgICAg ICAgICAgIGJyZWFrOworICAgICB9CisgCistICAgIHNldHVwVG9vbFRpcCgpOworKyAgICBzZXR1 cFRvb2xUaXAoIHRydWUgKTsKKyB9CisgCisgdm9pZAorQEAgLTIzMyw3ICsyMTUsNyBAQCBBbWFy b2s6OlRyYXlJY29uOjplbmdpbmVOZXdUcmFja1BsYXlpbmcoKQorIHsKKyAgICAgbV90cmFjayA9 IFRoZTo6ZW5naW5lQ29udHJvbGxlcigpLT5jdXJyZW50VHJhY2soKTsKKyAKKy0gICAgc2V0dXBU b29sVGlwKCk7CisrICAgIHNldHVwVG9vbFRpcCggdHJ1ZSApOworICAgICBzZXR1cE1lbnUoKTsK KyB9CisgCitAQCAtMjQyLDcgKzIyNCw3IEBAIEFtYXJvazo6VHJheUljb246Om1ldGFkYXRhQ2hh bmdlZCggTWV0YTo6VHJhY2tQdHIgdHJhY2sgKQorIHsKKyAgICAgUV9VTlVTRUQoIHRyYWNrICkK KyAKKy0gICAgc2V0dXBUb29sVGlwKCk7CisrICAgIHNldHVwVG9vbFRpcCggZmFsc2UgKTsKKyAg ICAgc2V0dXBNZW51KCk7CisgfQorIAorQEAgLTI1MSw3ICsyMzMsNyBAQCBBbWFyb2s6OlRyYXlJ Y29uOjptZXRhZGF0YUNoYW5nZWQoIE1ldGE6OkFsYnVtUHRyIGFsYnVtICkKKyB7CisgICAgIFFf VU5VU0VEKCBhbGJ1bSApCisgCistICAgIHNldHVwVG9vbFRpcCgpOworKyAgICBzZXR1cFRvb2xU aXAoIHRydWUgKTsKKyAgICAgc2V0dXBNZW51KCk7CisgfQorIAorQEAgLTI2MCw3ICsyNDIsNyBA QCBBbWFyb2s6OlRyYXlJY29uOjplbmdpbmVWb2x1bWVDaGFuZ2VkKCBpbnQgcGVyY2VudCApCisg eworICAgICBRX1VOVVNFRCggcGVyY2VudCApOworIAorLSAgICBzZXR1cFRvb2xUaXAoKTsKKysg ICAgc2V0dXBUb29sVGlwKCBmYWxzZSApOworIH0KKyAKKyB2b2lkCitAQCAtMjY4LDcgKzI1MCw3 IEBAIEFtYXJvazo6VHJheUljb246OmVuZ2luZU11dGVTdGF0ZUNoYW5nZWQoIGJvb2wgbXV0ZSAp CisgeworICAgICBRX1VOVVNFRCggbXV0ZSApOworIAorLSAgICBzZXR1cFRvb2xUaXAoKTsKKysg ICAgc2V0dXBUb29sVGlwKCBmYWxzZSApOworIH0KKyAKKyB2b2lkCitkaWZmIC0tZ2l0IGEvc3Jj L1RyYXlJY29uLmggYi9zcmMvVHJheUljb24uaAoraW5kZXggZDU5MGI1Zi4uODY0MDA0OSAxMDA2 NDQKKy0tLSBhL3NyYy9UcmF5SWNvbi5oCisrKysgYi9zcmMvVHJheUljb24uaAorQEAgLTI4LDkg KzI4LDYgQEAKKyAjaW5jbHVkZSA8UUFjdGlvbj4KKyAjaW5jbHVkZSA8UVBvaW50ZXI+CisgCist Y2xhc3MgUUV2ZW50OworLWNsYXNzIEFwcDsKKy0KKyAKKyBuYW1lc3BhY2UgQW1hcm9rIHsKKyAK K0BAIC00MSw4ICszOCw2IEBAIGNsYXNzIFRyYXlJY29uIDogcHVibGljIEtTdGF0dXNOb3RpZmll ckl0ZW0sIHB1YmxpYyBFbmdpbmU6OkVuZ2luZU9ic2VydmVyLCBwdWJsCisgcHVibGljOgorICAg ICBUcmF5SWNvbiggUU9iamVjdCAqcGFyZW50ICk7CisgCistICAgIGZyaWVuZCBjbGFzcyA6OkFw cDsKKy0gICAgCisgICAgIHZvaWQgc2V0VmlzaWJsZSggYm9vbCB2aXNpYmxlICk7CisgCisgcHJv dGVjdGVkOgorQEAgLTYzLDEwICs1OCw5IEBAIHByaXZhdGUgc2xvdHM6CisgCisgcHJpdmF0ZToK KyAgICAgdm9pZCBzZXR1cE1lbnUoKTsKKy0gICAgdm9pZCBzZXR1cFRvb2xUaXAoKTsKKysgICAg dm9pZCBzZXR1cFRvb2xUaXAoIGJvb2wgdXBkYXRlSWNvbiApOworIAorICAgICBNZXRhOjpUcmFj a1B0ciBtX3RyYWNrOworLSAgICBRU3RyaW5nIG1fdG9vbFRpcEljb25VaWQ7CisgCisgICAgIFNt YXJ0UG9pbnRlckxpc3Q8UUFjdGlvbj4gbV9leHRyYUFjdGlvbnM7CisgICAgIFFQb2ludGVyPFFB Y3Rpb24+IG1fc2VwYXJhdG9yOworLS0gCisxLjcuMC40CisKCmRpZmYgLS1naXQgYS8wMDA0LU1p bm9yLVJlbW92ZS1yZWR1bmRhbnQtZGVidWctb3V0cHV0Li1VcGRhdGUtY29weXJpZ2gucGF0Y2gg Yi8wMDA0LU1pbm9yLVJlbW92ZS1yZWR1bmRhbnQtZGVidWctb3V0cHV0Li1VcGRhdGUtY29weXJp Z2gucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTQ3OGNkYgotLS0g L2Rldi9udWxsCisrKyBiLzAwMDQtTWlub3ItUmVtb3ZlLXJlZHVuZGFudC1kZWJ1Zy1vdXRwdXQu LVVwZGF0ZS1jb3B5cmlnaC5wYXRjaApAQCAtMCwwICsxLDUyIEBACitGcm9tIGY0YTg0YzY0YzNj MWU2MDJkZDk1OGU1NmI5MDExNGYzYzE3NjNmZTEgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitG cm9tOiBLZXZpbiBGdW5rIDxrcmZAZWxlY3Ryb3N0b3JtLm5ldD4KK0RhdGU6IFRodSwgOCBKdWwg MjAxMCAxODoyNjo1NSArMDIwMAorU3ViamVjdDogW1BBVENIIDQvNF0gTWlub3I6IFJlbW92ZSBy ZWR1bmRhbnQgZGVidWcgb3V0cHV0LiBVcGRhdGUgY29weXJpZ2h0IGluZm8KKworLS0tCisgc3Jj L1RyYXlJY29uLmNwcCB8ICAgIDEgLQorIHNyYy9UcmF5SWNvbi5oICAgfCAgICA2ICsrKy0tLQor IDIgZmlsZXMgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQorCitkaWZm IC0tZ2l0IGEvc3JjL1RyYXlJY29uLmNwcCBiL3NyYy9UcmF5SWNvbi5jcHAKK2luZGV4IDczOThl MmEuLjZiOTlkMzMgMTAwNjQ0CistLS0gYS9zcmMvVHJheUljb24uY3BwCisrKysgYi9zcmMvVHJh eUljb24uY3BwCitAQCAtOTEsNyArOTEsNiBAQCBBbWFyb2s6OlRyYXlJY29uOjpzZXR1cFRvb2xU aXAoIGJvb2wgdXBkYXRlSWNvbiApCisgICAgICAgICB7CisgICAgICAgICAgICAgaWYoIG1fdHJh Y2stPmFsYnVtKCkgJiYgbV90cmFjay0+YWxidW0oKS0+aGFzSW1hZ2UoKSApCisgICAgICAgICAg ICAgeworLSAgICAgICAgICAgICAgICBkZWJ1ZygpIDw8ICJIRVJFIjsKKyAgICAgICAgICAgICAg ICAgUVBpeG1hcCBpbWFnZSA9IFRoZTo6c3ZnSGFuZGxlcigpLT5pbWFnZVdpdGhCb3JkZXIoIG1f dHJhY2stPmFsYnVtKCksIEtJY29uTG9hZGVyOjpTaXplTGFyZ2UsIDUgKTsKKyAgICAgICAgICAg ICAgICAgc2V0VG9vbFRpcEljb25CeVBpeG1hcCggaW1hZ2UgKTsKKyAgICAgICAgICAgICB9Citk aWZmIC0tZ2l0IGEvc3JjL1RyYXlJY29uLmggYi9zcmMvVHJheUljb24uaAoraW5kZXggODY0MDA0 OS4uMmNiM2VjYSAxMDA2NDQKKy0tLSBhL3NyYy9UcmF5SWNvbi5oCisrKysgYi9zcmMvVHJheUlj b24uaAorQEAgLTEsNyArMSw3IEBACisgLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioK KyAgKiBDb3B5cmlnaHQgKGMpIDIwMDMgU3RhbmlzbGF2IEthcmNoZWJueSA8YmVya3VzQHVzZXJz LnNmLm5ldD4gICAgICAgICAgICAgICAgICAgICAgICAgKgorLSAqIENvcHlyaWdodCAoYykgMjAw OSBLZXZpbiBGdW5rIDxrcmZAZWxlY3Ryb3N0b3JtLm5ldD4gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAqCisgICogQ29weXJpZ2h0IChjKSAyMDA5IE1hcmsgS3JldHNjaG1hbm4gPGty ZXRzY2htYW5uQGtkZS5vcmc+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICoKKysgKiBDb3B5 cmlnaHQgKGMpIDIwMDksMjAxMCBLZXZpbiBGdW5rIDxrcmZAZWxlY3Ryb3N0b3JtLm5ldD4gICAg ICAgICAgICAgICAgICAgICAgICAgICAgKgorICAqICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAqCisgICogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmli dXRlIGl0IGFuZC9vciBtb2RpZnkgaXQgdW5kZXIgICAgICAgICoKKyAgKiB0aGUgdGVybXMgb2Yg dGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBT b2Z0d2FyZSAgICAgICAgKgorQEAgLTE5LDExICsxOSwxMSBAQAorICNpZm5kZWYgQU1BUk9LX1RS QVlJQ09OX0gKKyAjZGVmaW5lIEFNQVJPS19UUkFZSUNPTl9ICisgCistI2luY2x1ZGUgImNvcmUv ZW5naW5lL0VuZ2luZU9ic2VydmVyLmgiIC8vYmFzZWNsYXNzCisrI2luY2x1ZGUgImNvcmUvZW5n aW5lL0VuZ2luZU9ic2VydmVyLmgiIC8vIGJhc2VjbGFzcworICNpbmNsdWRlICJjb3JlL21ldGEv TWV0YS5oIgorICNpbmNsdWRlICJjb3JlL3N1cHBvcnQvU21hcnRQb2ludGVyTGlzdC5oIgorIAor LSNpbmNsdWRlIDxLU3RhdHVzTm90aWZpZXJJdGVtPiAvL2Jhc2VjbGFzcworKyNpbmNsdWRlIDxL U3RhdHVzTm90aWZpZXJJdGVtPiAvLyBiYXNlY2xhc3MKKyAKKyAjaW5jbHVkZSA8UUFjdGlvbj4K KyAjaW5jbHVkZSA8UVBvaW50ZXI+CistLSAKKzEuNy4wLjQKKwoKZGlmZiAtLWdpdCBhL2FtYXJv ay5zcGVjIGIvYW1hcm9rLnNwZWMKaW5kZXggMmQ5MWRlZS4uYzJhMTI4NiAxMDA2NDQKLS0tIGEv YW1hcm9rLnNwZWMKKysrIGIvYW1hcm9rLnNwZWMKQEAgLTIsNyArMiw3IEBACiBOYW1lOiAgICBh bWFyb2sKIFN1bW1hcnk6IE1lZGlhIHBsYXllcgogVmVyc2lvbjogMi4zLjEKLVJlbGVhc2U6IDEl ez9kaXN0fQorUmVsZWFzZTogMiV7P2Rpc3R9CiAKIEdyb3VwOiAJIEFwcGxpY2F0aW9ucy9NdWx0 aW1lZGlhCiBMaWNlbnNlOiBHUEx2MisKQEAgLTE0LDYgKzE0LDEwIEBAIFBhdGNoNTA6IGFtYXJv ay0yLjIuMS45MC1xdHNjcmlwdF9ub3RfcmVxdWlyZWQucGF0Y2gKIAogIyMgdXBzdHJlYW0gcGF0 Y2hlcwogUGF0Y2gxMDA6IGFtYXJvay0yLjMuMS1nbGliMjZfc2lnbmFsc19maXgucGF0Y2gKK1Bh dGNoMTAxOiAwMDAxLU1vdmUtc29tZS1jb2RlLWluLVRyYXlJY29uLWNsYXNzLnBhdGNoCitQYXRj aDEwMjogMDAwMi1Tb21lLVRyYXlJY29uLWNoYW5nZXMucGF0Y2gKK3BhdGNoMTAzOiAwMDAzLVRy YXlJY29uLURvLW5vdC11cGRhdGUtY292ZXItZWFjaC10aW1lLXdlLXVwZGF0ZS10aGUucGF0Y2gK K1BhdGNoMTA0OiAwMDA0LU1pbm9yLVJlbW92ZS1yZWR1bmRhbnQtZGVidWctb3V0cHV0Li1VcGRh dGUtY29weXJpZ2gucGF0Y2gKIAogQnVpbGRSZXF1aXJlczogY3VybC1kZXZlbAogQnVpbGRSZXF1 aXJlczogZGVza3RvcC1maWxlLXV0aWxzCkBAIC04Miw3ICs4NiwxNCBAQCBPYnNvbGV0ZXM6IGFt YXJvay11dGlsaXRpZXMgPCAyLjAuOTYKICVzZXR1cCAtcSAKIAogJXBhdGNoNTAgLXAxIC1iIC5x dHNjcmlwdF9ub3RfcmVxdWlyZWQKKyVpZiAwJXs/ZmVkb3JhfSA+IDEzCiAlcGF0Y2gxMDAgLXAx IC1iIC5nbGliMjZfc2lnbmFsc19maXgKKyVlbmRpZgorJXBhdGNoMTAxIC1wMSAtYiAuMDAwMQor JXBhdGNoMTAyIC1wMSAtYiAuMDAwMgorJXBhdGNoMTAzIC1wMSAtYiAuMDAwMworJXBhdGNoMTA0 IC1wMSAtYiAuMDAwNAorCiAKICVidWlsZAogbWtkaXIgLXAgJXtfdGFyZ2V0X3BsYXRmb3JtfQpA QCAtOTYsNyArMTA3LDcgQEAgbWFrZSAlez9fc21wX21mbGFnc30gLUMgJXtfdGFyZ2V0X3BsYXRm b3JtfQogJWluc3RhbGwKIHJtIC1yZiAle2J1aWxkcm9vdH0KIAotbWFrZSBpbnN0YWxsIERFU1RE SVI9JXtidWlsZHJvb3R9IC1DICV7X3RhcmdldF9wbGF0Zm9ybX0KK21ha2UgaW5zdGFsbC9mYXN0 IERFU1RESVI9JXtidWlsZHJvb3R9IC1DICV7X3RhcmdldF9wbGF0Zm9ybX0KIAogJWZpbmRfbGFu ZyBhbWFyb2sgCiAlZmluZF9sYW5nIGFtYXJva2NvbGxlY3Rpb25zY2FubmVyX3F0IApAQCAtMTc1 LDYgKzE4Niw5IEBAIGZpCiAKIAogJWNoYW5nZWxvZworKiBGcmkgSnVsIDA5IDIwMTAgUmV4IERp ZXRlciA8cmRpZXRlckBmZWRvcmFwcm9qZWN0Lm9yZz4gLSAyLjMuMS0yCistIE5vIE5vdGlmaWNh dGlvbiBBcmVhIGljb24gZm9yIG5vbi1LREUgZGVza3RvcHMgKGtkZSMyMzI1NzgscmgjNjAzMzM2 KQorCiAqIEZyaSBNYXkgMjggMjAxMCBSZXggRGlldGVyIDxyZGlldGVyQGZlZG9yYXByb2plY3Qu b3JnPiAtIDIuMy4xLTEKIC0gYW1hcm9rLTIuMy4xCiAK