218403 2020-10-30 13:31:45 -0700 [GTK][WPE] Cannot remove individual scripts/stylesheets using WebKitUserContentManager 2020-11-03 00:40:54 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aperez aperez berto bugs-noreply cgarcia ews-watchlist gustavo jan.brummer mcatanzaro oldest_to_newest 1703185 0 aperez 2020-10-30 13:31:45 -0700 Currently there are webkit_user_content_manager_remove_filter[_by_id] but no equivalent for scripts and stylesheets. There is no reason why webkit_user_content_manager_remove_{script,style_sheet} shouldn't be available >_< 1703196 1 412796 aperez 2020-10-30 13:57:52 -0700 Created attachment 412796 WIP Patch This should work, modulo missing test cases, which I will be adding if people agree we want to do these two additions to the public API ^_^ 1703197 2 ews-watchlist 2020-10-30 13:59:02 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1703231 3 mcatanzaro 2020-10-30 15:16:39 -0700 LGTM. I guess Ephy ought to use this when its user script/style preferences are disabled? 1703321 4 jan.brummer 2020-10-31 01:34:45 -0700 Yes, we need it there and also for my WebExtensions branch. 1703527 5 412919 aperez 2020-11-02 07:44:40 -0800 Created attachment 412919 Patch 1703839 6 ews-feeder 2020-11-03 00:40:52 -0800 Committed r269287: <https://trac.webkit.org/changeset/269287> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412919. 412796 2020-10-30 13:57:52 -0700 2020-11-02 07:44:35 -0800 WIP Patch bug-218403-20201030225750.patch text/plain 9833 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZmZDRjZTZlMzM5ZjhjZTRj Mjg5MGVjOTZjZWVhNGNiNzc4YjVhNzAuLmQxZjlkMDNiOGI2YjI2ZDliYTAxNDk5NjNjMTVkN2Jm NGZiYzNhM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMTAtMzAgIEFkcmlhbiBQ ZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtXUEVd IENhbm5vdCByZW1vdmUgaW5kaXZpZHVhbCBzY3JpcHRzL3N0eWxlc2hlZXRzIHVzaW5nIFdlYktp dFVzZXJDb250ZW50TWFuYWdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4NDAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIHRoZSBtaXNzaW5nIFdlYktpdFVzZXJDb250ZW50TWFuYWdlciBmdW5j dGlvbnMgd2hpY2ggYWxsb3cKKyAgICAgICAgcmVtb3ZpbmcgYSBzaW5nbGUgc2NyaXB0IGFuZCBz dHlsZSBzaGVldCBmcm9tIHRoZSBtYW5hZ2VyLiBHaXZlbgorICAgICAgICB0aGF0IGl0IGlzIHBv c3NpYmxlIHRvIHJlbW92ZSBhIHNpbmdsZSBjb250ZW50IGZpbHRlciBhbmQgbWVzc2FnZQorICAg ICAgICBoYW5kbGVycyBhbHJlYWR5LCB0aGlzIG1ha2UgdGhlIEFQSSBvcnRob2dvbmFsIGZvciBz Y3JpcHRzIGFuZCBzdHlsZQorICAgICAgICBzaGVldHMgYXMgd2VsbC4KKworICAgICAgICBObyBu ZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRV c2VyQ29udGVudE1hbmFnZXIuY3BwOgorICAgICAgICAod2Via2l0X3VzZXJfY29udGVudF9tYW5h Z2VyX3JlbW92ZV9zdHlsZV9zaGVldCk6IEFkZGVkLgorICAgICAgICAod2Via2l0X3VzZXJfY29u dGVudF9tYW5hZ2VyX3JlbW92ZV9zY3JpcHQpOiBBZGRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuaDogQWRkIGRlY2xhcmF0aW9ucyBmb3Ig dGhlIG5ldyBmdW5jdGlvbnMuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJr aXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQ6IERpdHRvLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv d3BlL1dlYktpdFVzZXJDb250ZW50TWFuYWdlci5oOiBEaXR0by4KKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL3dwZS9kb2NzL3dwZS0xLjAtc2VjdGlvbnMudHh0OiBEaXR0by4KKwogMjAyMC0xMC0z MCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBDb3JyZWN0 IHNhbmRib3ggdmlvbGF0aW9ucyBpbiBHUFUgUHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFVzZXJDb250ZW50TWFuYWdlci5j cHAKaW5kZXggNjI1OGNmMDFiMjQwYTVlN2Y0ZDY2ZjFiZTI3YTNkOWE2YTMxMjIzNy4uZDdmOTI3 ZDZmMWY0YWQzOTVlNDllYmQ5Y2RlNDFkZDcyOGJmNjVlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRVc2VyQ29udGVudE1hbmFn ZXIuY3BwCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNCBJZ2FsaWEg Uy5MLgorICogQ29weXJpZ2h0IChDKSAyMDE0LCAyMDIwIElnYWxpYSBTLkwuCiAgKgogICogVGhp cyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9v cgogICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJh bCBQdWJsaWMKQEAgLTEzOCw2ICsxMzgsMjQgQEAgdm9pZCB3ZWJraXRfdXNlcl9jb250ZW50X21h bmFnZXJfYWRkX3N0eWxlX3NoZWV0KFdlYktpdFVzZXJDb250ZW50TWFuYWdlciogbWFuYWcKICAg ICBtYW5hZ2VyLT5wcml2LT51c2VyQ29udGVudENvbnRyb2xsZXItPmFkZFVzZXJTdHlsZVNoZWV0 KHdlYmtpdFVzZXJTdHlsZVNoZWV0R2V0VXNlclN0eWxlU2hlZXQoc3R5bGVTaGVldCkpOwogfQog CisvKioKKyAqIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfc3R5bGVfc2hlZXQ6 CisgKiBAbWFuYWdlcjogQSAjV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyCisgKiBAc3R5bGVzaGVl dDogQSAjV2ViS2l0VXNlclN0eWxlU2hlZXQKKyAqCisgKiBSZW1vdmVzIGEgI1dlYktpdFVzZXJT dHlsZVNoZWV0IGZyb20gdGhlIGdpdmVuICNXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuCisgKgor ICogU2VlIGFsc28gd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9hbGxfc3R5bGVf c2hlZXRzKCkuCisgKgorICogU2luY2U6IDIuMzIKKyAqLwordm9pZCB3ZWJraXRfdXNlcl9jb250 ZW50X21hbmFnZXJfcmVtb3ZlX3N0eWxlX3NoZWV0KFdlYktpdFVzZXJDb250ZW50TWFuYWdlciog bWFuYWdlciwgV2ViS2l0VXNlclN0eWxlU2hlZXQqIHN0eWxlU2hlZXQpCit7CisgICAgZ19yZXR1 cm5faWZfZmFpbChXRUJLSVRfSVNfVVNFUl9DT05URU5UX01BTkFHRVIobWFuYWdlcikpOworICAg IGdfcmV0dXJuX2lmX2ZhaWwoc3R5bGVTaGVldCk7CisgICAgbWFuYWdlci0+cHJpdi0+dXNlckNv bnRlbnRDb250cm9sbGVyLT5yZW1vdmVVc2VyU3R5bGVTaGVldCh3ZWJraXRVc2VyU3R5bGVTaGVl dEdldFVzZXJTdHlsZVNoZWV0KHN0eWxlU2hlZXQpKTsKK30KKwogLyoqCiAgKiB3ZWJraXRfdXNl cl9jb250ZW50X21hbmFnZXJfcmVtb3ZlX2FsbF9zdHlsZV9zaGVldHM6CiAgKiBAbWFuYWdlcjog QSAjV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyCkBAIC0xNzAsMTIgKzE4OCwzMiBAQCB2b2lkIHdl YmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9hZGRfc2NyaXB0KFdlYktpdFVzZXJDb250ZW50TWFu YWdlciogbWFuYWdlciwgVwogICAgIG1hbmFnZXItPnByaXYtPnVzZXJDb250ZW50Q29udHJvbGxl ci0+YWRkVXNlclNjcmlwdCh3ZWJraXRVc2VyU2NyaXB0R2V0VXNlclNjcmlwdChzY3JpcHQpLCBJ bmplY3RVc2VyU2NyaXB0SW1tZWRpYXRlbHk6Ok5vKTsKIH0KIAorLyoqCisgKiB3ZWJraXRfdXNl cl9jb250ZW50X21hbmFnZXJfcmVtb3ZlX3NjcmlwdDoKKyAqIEBtYW5hZ2VyOiBBICNXZWJLaXRV c2VyQ29udGVudE1hbmFnZXIKKyAqIEBzY3JpcHQ6IEEgI1dlYktpdFVzZXJTY3JpcHQKKyAqCisg KiBSZW1vdmVzIGEgI1dlYktpdFVzZXJTY3JpcHQgZnJvbSB0aGUgZ2l2ZW4gI1dlYktpdFVzZXJD b250ZW50TWFuYWdlci4KKyAqCisgKiBTZWUgYWxzbyB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFn ZXJfcmVtb3ZlX2FsbF9zY3JpcHRzKCkuCisgKgorICogU2luY2U6IDIuMzIKKyAqLwordm9pZCB3 ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVtb3ZlX3NjcmlwdChXZWJLaXRVc2VyQ29udGVu dE1hbmFnZXIqIG1hbmFnZXIsIFdlYktpdFVzZXJTY3JpcHQqIHNjcmlwdCkKK3sKKyAgICBnX3Jl dHVybl9pZl9mYWlsKFdFQktJVF9JU19VU0VSX0NPTlRFTlRfTUFOQUdFUihtYW5hZ2VyKSk7Cisg ICAgZ19yZXR1cm5faWZfZmFpbChzY3JpcHQpOworICAgIG1hbmFnZXItPnByaXYtPnVzZXJDb250 ZW50Q29udHJvbGxlci0+cmVtb3ZlVXNlclNjcmlwdCh3ZWJraXRVc2VyU2NyaXB0R2V0VXNlclNj cmlwdChzY3JpcHQpKTsKK30KKwogLyoqCiAgKiB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJf cmVtb3ZlX2FsbF9zY3JpcHRzOgogICogQG1hbmFnZXI6IEEgI1dlYktpdFVzZXJDb250ZW50TWFu YWdlcgogICoKICAqIFJlbW92ZXMgYWxsIHVzZXIgc2NyaXB0cyBmcm9tIHRoZSBnaXZlbiAjV2Vi S2l0VXNlckNvbnRlbnRNYW5hZ2VyCiAgKgorICogU2VlIGFsc28gd2Via2l0X3VzZXJfY29udGVu dF9tYW5hZ2VyX3JlbW92ZV9zY3JpcHQoKS4KKyAqCiAgKiBTaW5jZTogMi42CiAgKi8KIHZvaWQg d2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9hbGxfc2NyaXB0cyhXZWJLaXRVc2Vy Q29udGVudE1hbmFnZXIqIG1hbmFnZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFVzZXJDb250ZW50TWFuYWdlci5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuaAppbmRleCAxMGQxOWQ3 ZjJjMTczYzEzN2YzNDFjYTBmMjE0MGVjN2JlMmRiOTlhLi5hZjgwZGJlMWI4MWNmY2ZhOTk3OTI3 NjdlYmFmODczZDEzYzk2YWU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFVzZXJDb250ZW50TWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmgKQEAgLTEsNSArMSw1IEBA CiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE0IElnYWxpYSBTLkwuCisgKiBDb3B5cmlnaHQgKEMp IDIwMTQsIDIwMjAgSWdhbGlhIFMuTC4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0 d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIg dGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtNjcsNiArNjcs MTEgQEAgd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX25ldyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAodm9pZCk7CiBXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF91c2Vy X2NvbnRlbnRfbWFuYWdlcl9hZGRfc3R5bGVfc2hlZXQgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKFdlYktpdFVzZXJDb250ZW50TWFuYWdlciAqbWFuYWdlciwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdl YktpdFVzZXJTdHlsZVNoZWV0ICAgICAqc3R5bGVzaGVldCk7CisKK1dFQktJVF9BUEkgdm9pZAor d2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9zdHlsZV9zaGVldCAgICAgICAgICAg ICAgICAgICAgICAgICAoV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyICptYW5hZ2VyLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgV2ViS2l0VXNlclN0eWxlU2hlZXQgICAgICpzdHlsZXNoZWV0KTsKKwogV0VCS0lU X0FQSSB2b2lkCiB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVtb3ZlX2FsbF9zdHlsZV9z aGVldHMgICAgICAgICAgICAgICAgICAgIChXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIgKm1hbmFn ZXIpOwogCkBAIC05MCw2ICs5NSwxMCBAQCBXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF91c2VyX2Nv bnRlbnRfbWFuYWdlcl9hZGRfc2NyaXB0ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KFdlYktpdFVzZXJDb250ZW50TWFuYWdlciAqbWFuYWdlciwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYktp dFVzZXJTY3JpcHQgICAgICAgICAqc2NyaXB0KTsKIAorV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRf dXNlcl9jb250ZW50X21hbmFnZXJfcmVtb3ZlX3NjcmlwdCAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIgKm1hbmFnZXIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBXZWJLaXRVc2VyU2NyaXB0ICAgICAgICAgKnNjcmlwdCk7CisKIFdFQktJVF9BUEkgdm9pZAog d2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9hbGxfc2NyaXB0cyAgICAgICAgICAg ICAgICAgICAgICAgICAoV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyICptYW5hZ2VyKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGst NC4wLXNlY3Rpb25zLnR4dCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93 ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQKaW5kZXggNjQwMzg0YzI4NTE3NjI2YjdiMjU1MWRk MTcxYThkOGM4MTcxMjMzMS4uZjZmNWI4YzUxZTZjOThiY2JiNmU1ODk0YTBiNjg3OGUyMWNjODc1 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtp dDJndGstNC4wLXNlY3Rpb25zLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Z3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAtc2VjdGlvbnMudHh0CkBAIC0xMjgsOCArMTI4LDEwIEBA IHdlYmtpdF91c2VyX2NvbnRlbnRfZmlsdGVyX2dldF90eXBlCiBXZWJLaXRVc2VyQ29udGVudE1h bmFnZXIKIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9uZXcKIHdlYmtpdF91c2VyX2NvbnRl bnRfbWFuYWdlcl9hZGRfc3R5bGVfc2hlZXQKK3dlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9y ZW1vdmVfc3R5bGVfc2hlZXQKIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfYWxs X3N0eWxlX3NoZWV0cwogd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX2FkZF9zY3JpcHQKK3dl YmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfc2NyaXB0CiB3ZWJraXRfdXNlcl9jb250 ZW50X21hbmFnZXJfcmVtb3ZlX2FsbF9zY3JpcHRzCiB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFn ZXJfcmVnaXN0ZXJfc2NyaXB0X21lc3NhZ2VfaGFuZGxlcgogd2Via2l0X3VzZXJfY29udGVudF9t YW5hZ2VyX3VucmVnaXN0ZXJfc2NyaXB0X21lc3NhZ2VfaGFuZGxlcgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuaCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2Vy LmgKaW5kZXggMDcwM2Q3OTdkOWE4M2ZmMmZkZTAzZDJiMDY0N2U5YzI0ZWVmZWZkMC4uYWIwOTkz NjBjZDRmMWZiN2FmOWE5ZmFkOTdhMTM5ZDYyMWFjYTEzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdFVzZXJDb250ZW50TWFuYWdlci5o CkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNCBJZ2FsaWEgUy5MLgor ICogQ29weXJpZ2h0IChDKSAyMDE0LCAyMDIwIElnYWxpYSBTLkwuCiAgKgogICogVGhpcyBsaWJy YXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICog bW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJs aWMKQEAgLTY3LDYgKzY3LDExIEBAIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9uZXcgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHZvaWQpOwogV0VCS0lUX0FQSSB2 b2lkCiB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfYWRkX3N0eWxlX3NoZWV0ICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIgKm1hbmFnZXIsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBXZWJLaXRVc2VyU3R5bGVTaGVldCAgICAgKnN0eWxlc2hlZXQpOworCitX RUJLSVRfQVBJIHZvaWQKK3dlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfc3R5bGVf c2hlZXQgICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFVzZXJDb250ZW50TWFuYWdlciAq bWFuYWdlciwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFdlYktpdFVzZXJTdHlsZVNoZWV0ICAgICAqc3R5bGVz aGVldCk7CisKIFdFQktJVF9BUEkgdm9pZAogd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3Jl bW92ZV9hbGxfc3R5bGVfc2hlZXRzICAgICAgICAgICAgICAgICAgICAoV2ViS2l0VXNlckNvbnRl bnRNYW5hZ2VyICptYW5hZ2VyKTsKIApAQCAtOTAsNiArOTUsMTAgQEAgV0VCS0lUX0FQSSB2b2lk CiB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfYWRkX3NjcmlwdCAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIgKm1hbmFnZXIsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBXZWJLaXRVc2VyU2NyaXB0ICAgICAgICAgKnNjcmlwdCk7CiAKK1dFQktJVF9B UEkgdm9pZAord2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9zY3JpcHQgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyICptYW5hZ2Vy LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgV2ViS2l0VXNlclNjcmlwdCAgICAgICAgICpzY3JpcHQpOworCiBX RUJLSVRfQVBJIHZvaWQKIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfYWxsX3Nj cmlwdHMgICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFVzZXJDb250ZW50TWFuYWdlciAq bWFuYWdlcik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUv ZG9jcy93cGUtMS4wLXNlY3Rpb25zLnR4dCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93 cGUvZG9jcy93cGUtMS4wLXNlY3Rpb25zLnR4dAppbmRleCBhNDM1OTUzMWY5OTIzNjIzZGVjODkx NjFmNzkxMWY3NTFiMTg1MDVjLi4wZWUyNTBlNTYzMzhjZGE3MzMyZDcwNTA4NTgyYTU5YTdhZDIx YzgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL2RvY3Mvd3Bl LTEuMC1zZWN0aW9ucy50eHQKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9k b2NzL3dwZS0xLjAtc2VjdGlvbnMudHh0CkBAIC0xMDMsOCArMTAzLDEwIEBAIHdlYmtpdF91c2Vy X2NvbnRlbnRfZmlsdGVyX2dldF90eXBlCiBXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIKIHdlYmtp dF91c2VyX2NvbnRlbnRfbWFuYWdlcl9uZXcKIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9h ZGRfc3R5bGVfc2hlZXQKK3dlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfc3R5bGVf c2hlZXQKIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfYWxsX3N0eWxlX3NoZWV0 cwogd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX2FkZF9zY3JpcHQKK3dlYmtpdF91c2VyX2Nv bnRlbnRfbWFuYWdlcl9yZW1vdmVfc2NyaXB0CiB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJf cmVtb3ZlX2FsbF9zY3JpcHRzCiB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVnaXN0ZXJf c2NyaXB0X21lc3NhZ2VfaGFuZGxlcgogd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3VucmVn aXN0ZXJfc2NyaXB0X21lc3NhZ2VfaGFuZGxlcgo= 412919 2020-11-02 07:44:40 -0800 2020-11-03 00:40:53 -0800 Patch bug-218403-20201102174438.patch text/plain 13748 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA3OTE3NWQ2MDVkZjY2ZDFj ZThlNGUxYTBmMjgzMTI5MWIwZjFjNzEuLjk5OWViZGRhN2UzYjdhMzRkZTgzMjBjMDllOTMwYTVh NTIzZWQzNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjAtMTEtMDIgIEFkcmlhbiBQ ZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtXUEVd IENhbm5vdCByZW1vdmUgaW5kaXZpZHVhbCBzY3JpcHRzL3N0eWxlc2hlZXRzIHVzaW5nIFdlYktp dFVzZXJDb250ZW50TWFuYWdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4NDAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIHRoZSBtaXNzaW5nIFdlYktpdFVzZXJDb250ZW50TWFuYWdlciBmdW5j dGlvbnMgd2hpY2ggYWxsb3cKKyAgICAgICAgcmVtb3ZpbmcgYSBzaW5nbGUgc2NyaXB0IGFuZCBz dHlsZSBzaGVldCBmcm9tIHRoZSBtYW5hZ2VyLiBHaXZlbgorICAgICAgICB0aGF0IGl0IGlzIHBv c3NpYmxlIHRvIHJlbW92ZSBhIHNpbmdsZSBjb250ZW50IGZpbHRlciBhbmQgbWVzc2FnZQorICAg ICAgICBoYW5kbGVycyBhbHJlYWR5LCB0aGlzIG1ha2UgdGhlIEFQSSBvcnRob2dvbmFsIGZvciBz Y3JpcHRzIGFuZCBzdHlsZQorICAgICAgICBzaGVldHMgYXMgd2VsbC4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuY3BwOgorICAgICAgICAo d2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9zdHlsZV9zaGVldCk6IEFkZGVkLgor ICAgICAgICAod2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9zY3JpcHQpOiBBZGRl ZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVc2VyQ29udGVudE1hbmFnZXIu aDogQWRkIGRlY2xhcmF0aW9ucyBmb3IgdGhlIG5ldyBmdW5jdGlvbnMuCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQ6IERpdHRvLgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdFVzZXJDb250ZW50TWFuYWdlci5oOiBE aXR0by4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3dwZS9kb2NzL3dwZS0xLjAtc2VjdGlvbnMu dHh0OiBEaXR0by4KKwogMjAyMC0xMS0wMiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5j b20+CiAKICAgICAgICAgU3RvcCBzZW5kaW5nIG9yaWdpbnMgZnJvbSBXZWJQcm9jZXNzIHRvIFVJ UHJvY2VzcyBmb3IgZ2V0VXNlck1lZGlhIHJlcXVlc3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmNw cAppbmRleCA2MjU4Y2YwMWIyNDBhNWU3ZjRkNjZmMWJlMjdhM2Q5YTZhMzEyMjM3Li5kN2Y5Mjdk NmYxZjRhZDM5NWU0OWViZDljZGU0MWRkNzI4YmY2NWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFVzZXJDb250ZW50TWFuYWdl ci5jcHAKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE0IElnYWxpYSBT LkwuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTQsIDIwMjAgSWdhbGlhIFMuTC4KICAqCiAgKiBUaGlz IGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y CiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFs IFB1YmxpYwpAQCAtMTM4LDYgKzEzOCwyNCBAQCB2b2lkIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFu YWdlcl9hZGRfc3R5bGVfc2hlZXQoV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyKiBtYW5hZwogICAg IG1hbmFnZXItPnByaXYtPnVzZXJDb250ZW50Q29udHJvbGxlci0+YWRkVXNlclN0eWxlU2hlZXQo d2Via2l0VXNlclN0eWxlU2hlZXRHZXRVc2VyU3R5bGVTaGVldChzdHlsZVNoZWV0KSk7CiB9CiAK Ky8qKgorICogd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9zdHlsZV9zaGVldDoK KyAqIEBtYW5hZ2VyOiBBICNXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIKKyAqIEBzdHlsZXNoZWV0 OiBBICNXZWJLaXRVc2VyU3R5bGVTaGVldAorICoKKyAqIFJlbW92ZXMgYSAjV2ViS2l0VXNlclN0 eWxlU2hlZXQgZnJvbSB0aGUgZ2l2ZW4gI1dlYktpdFVzZXJDb250ZW50TWFuYWdlci4KKyAqCisg KiBTZWUgYWxzbyB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVtb3ZlX2FsbF9zdHlsZV9z aGVldHMoKS4KKyAqCisgKiBTaW5jZTogMi4zMgorICovCit2b2lkIHdlYmtpdF91c2VyX2NvbnRl bnRfbWFuYWdlcl9yZW1vdmVfc3R5bGVfc2hlZXQoV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyKiBt YW5hZ2VyLCBXZWJLaXRVc2VyU3R5bGVTaGVldCogc3R5bGVTaGVldCkKK3sKKyAgICBnX3JldHVy bl9pZl9mYWlsKFdFQktJVF9JU19VU0VSX0NPTlRFTlRfTUFOQUdFUihtYW5hZ2VyKSk7CisgICAg Z19yZXR1cm5faWZfZmFpbChzdHlsZVNoZWV0KTsKKyAgICBtYW5hZ2VyLT5wcml2LT51c2VyQ29u dGVudENvbnRyb2xsZXItPnJlbW92ZVVzZXJTdHlsZVNoZWV0KHdlYmtpdFVzZXJTdHlsZVNoZWV0 R2V0VXNlclN0eWxlU2hlZXQoc3R5bGVTaGVldCkpOworfQorCiAvKioKICAqIHdlYmtpdF91c2Vy X2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfYWxsX3N0eWxlX3NoZWV0czoKICAqIEBtYW5hZ2VyOiBB ICNXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIKQEAgLTE3MCwxMiArMTg4LDMyIEBAIHZvaWQgd2Vi a2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX2FkZF9zY3JpcHQoV2ViS2l0VXNlckNvbnRlbnRNYW5h Z2VyKiBtYW5hZ2VyLCBXCiAgICAgbWFuYWdlci0+cHJpdi0+dXNlckNvbnRlbnRDb250cm9sbGVy LT5hZGRVc2VyU2NyaXB0KHdlYmtpdFVzZXJTY3JpcHRHZXRVc2VyU2NyaXB0KHNjcmlwdCksIElu amVjdFVzZXJTY3JpcHRJbW1lZGlhdGVseTo6Tm8pOwogfQogCisvKioKKyAqIHdlYmtpdF91c2Vy X2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfc2NyaXB0OgorICogQG1hbmFnZXI6IEEgI1dlYktpdFVz ZXJDb250ZW50TWFuYWdlcgorICogQHNjcmlwdDogQSAjV2ViS2l0VXNlclNjcmlwdAorICoKKyAq IFJlbW92ZXMgYSAjV2ViS2l0VXNlclNjcmlwdCBmcm9tIHRoZSBnaXZlbiAjV2ViS2l0VXNlckNv bnRlbnRNYW5hZ2VyLgorICoKKyAqIFNlZSBhbHNvIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdl cl9yZW1vdmVfYWxsX3NjcmlwdHMoKS4KKyAqCisgKiBTaW5jZTogMi4zMgorICovCit2b2lkIHdl YmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfc2NyaXB0KFdlYktpdFVzZXJDb250ZW50 TWFuYWdlciogbWFuYWdlciwgV2ViS2l0VXNlclNjcmlwdCogc2NyaXB0KQoreworICAgIGdfcmV0 dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1VTRVJfQ09OVEVOVF9NQU5BR0VSKG1hbmFnZXIpKTsKKyAg ICBnX3JldHVybl9pZl9mYWlsKHNjcmlwdCk7CisgICAgbWFuYWdlci0+cHJpdi0+dXNlckNvbnRl bnRDb250cm9sbGVyLT5yZW1vdmVVc2VyU2NyaXB0KHdlYmtpdFVzZXJTY3JpcHRHZXRVc2VyU2Ny aXB0KHNjcmlwdCkpOworfQorCiAvKioKICAqIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9y ZW1vdmVfYWxsX3NjcmlwdHM6CiAgKiBAbWFuYWdlcjogQSAjV2ViS2l0VXNlckNvbnRlbnRNYW5h Z2VyCiAgKgogICogUmVtb3ZlcyBhbGwgdXNlciBzY3JpcHRzIGZyb20gdGhlIGdpdmVuICNXZWJL aXRVc2VyQ29udGVudE1hbmFnZXIKICAqCisgKiBTZWUgYWxzbyB3ZWJraXRfdXNlcl9jb250ZW50 X21hbmFnZXJfcmVtb3ZlX3NjcmlwdCgpLgorICoKICAqIFNpbmNlOiAyLjYKICAqLwogdm9pZCB3 ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVtb3ZlX2FsbF9zY3JpcHRzKFdlYktpdFVzZXJD b250ZW50TWFuYWdlciogbWFuYWdlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVzZXJDb250ZW50TWFuYWdlci5oCmluZGV4IDEwZDE5ZDdm MmMxNzNjMTM3ZjM0MWNhMGYyMTQwZWM3YmUyZGI5OWEuLmFmODBkYmUxYjgxY2ZjZmE5OTc5Mjc2 N2ViYWY4NzNkMTNjOTZhZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuaApAQCAtMSw1ICsxLDUgQEAK IC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTQgSWdhbGlhIFMuTC4KKyAqIENvcHlyaWdodCAoQykg MjAxNCwgMjAyMCBJZ2FsaWEgUy5MLgogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3 YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAqIG1vZGlmeSBpdCB1bmRlciB0 aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCkBAIC02Nyw2ICs2Nywx MSBAQCB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfbmV3ICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICh2b2lkKTsKIFdFQktJVF9BUEkgdm9pZAogd2Via2l0X3VzZXJf Y29udGVudF9tYW5hZ2VyX2FkZF9zdHlsZV9zaGVldCAgICAgICAgICAgICAgICAgICAgICAgICAg ICAoV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyICptYW5hZ2VyLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV2Vi S2l0VXNlclN0eWxlU2hlZXQgICAgICpzdHlsZXNoZWV0KTsKKworV0VCS0lUX0FQSSB2b2lkCit3 ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVtb3ZlX3N0eWxlX3NoZWV0ICAgICAgICAgICAg ICAgICAgICAgICAgIChXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIgKm1hbmFnZXIsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBXZWJLaXRVc2VyU3R5bGVTaGVldCAgICAgKnN0eWxlc2hlZXQpOworCiBXRUJLSVRf QVBJIHZvaWQKIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfYWxsX3N0eWxlX3No ZWV0cyAgICAgICAgICAgICAgICAgICAgKFdlYktpdFVzZXJDb250ZW50TWFuYWdlciAqbWFuYWdl cik7CiAKQEAgLTkwLDYgKzk1LDEwIEBAIFdFQktJVF9BUEkgdm9pZAogd2Via2l0X3VzZXJfY29u dGVudF9tYW5hZ2VyX2FkZF9zY3JpcHQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAo V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyICptYW5hZ2VyLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV2ViS2l0 VXNlclNjcmlwdCAgICAgICAgICpzY3JpcHQpOwogCitXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF91 c2VyX2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfc2NyaXB0ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKFdlYktpdFVzZXJDb250ZW50TWFuYWdlciAqbWFuYWdlciwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFdlYktpdFVzZXJTY3JpcHQgICAgICAgICAqc2NyaXB0KTsKKwogV0VCS0lUX0FQSSB2b2lkCiB3 ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVtb3ZlX2FsbF9zY3JpcHRzICAgICAgICAgICAg ICAgICAgICAgICAgIChXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIgKm1hbmFnZXIpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00 LjAtc2VjdGlvbnMudHh0IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dl YmtpdDJndGstNC4wLXNlY3Rpb25zLnR4dAppbmRleCA2NDAzODRjMjg1MTc2MjZiN2IyNTUxZGQx NzFhOGQ4YzgxNzEyMzMxLi5mNmY1YjhjNTFlNmM5OGJjYmI2ZTU4OTRhMGI2ODc4ZTIxY2M4NzVi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0 Mmd0ay00LjAtc2VjdGlvbnMudHh0CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9n dGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQKQEAgLTEyOCw4ICsxMjgsMTAgQEAg d2Via2l0X3VzZXJfY29udGVudF9maWx0ZXJfZ2V0X3R5cGUKIFdlYktpdFVzZXJDb250ZW50TWFu YWdlcgogd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX25ldwogd2Via2l0X3VzZXJfY29udGVu dF9tYW5hZ2VyX2FkZF9zdHlsZV9zaGVldAord2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3Jl bW92ZV9zdHlsZV9zaGVldAogd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9hbGxf c3R5bGVfc2hlZXRzCiB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfYWRkX3NjcmlwdAord2Vi a2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9zY3JpcHQKIHdlYmtpdF91c2VyX2NvbnRl bnRfbWFuYWdlcl9yZW1vdmVfYWxsX3NjcmlwdHMKIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdl cl9yZWdpc3Rlcl9zY3JpcHRfbWVzc2FnZV9oYW5kbGVyCiB3ZWJraXRfdXNlcl9jb250ZW50X21h bmFnZXJfdW5yZWdpc3Rlcl9zY3JpcHRfbWVzc2FnZV9oYW5kbGVyCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdFVzZXJDb250ZW50TWFuYWdlci5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XZWJLaXRVc2VyQ29udGVudE1hbmFnZXIu aAppbmRleCAwNzAzZDc5N2Q5YTgzZmYyZmRlMDNkMmIwNjQ3ZTljMjRlZWZlZmQwLi5hYjA5OTM2 MGNkNGYxZmI3YWY5YTlmYWQ5N2ExMzlkNjIxYWNhMTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdFVzZXJDb250ZW50TWFuYWdlci5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmgK QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE0IElnYWxpYSBTLkwuCisg KiBDb3B5cmlnaHQgKEMpIDIwMTQsIDIwMjAgSWdhbGlhIFMuTC4KICAqCiAgKiBUaGlzIGxpYnJh cnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgKiBt b2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1Ymxp YwpAQCAtNjcsNiArNjcsMTEgQEAgd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX25ldyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAodm9pZCk7CiBXRUJLSVRfQVBJIHZv aWQKIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9hZGRfc3R5bGVfc2hlZXQgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKFdlYktpdFVzZXJDb250ZW50TWFuYWdlciAqbWFuYWdlciwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFdlYktpdFVzZXJTdHlsZVNoZWV0ICAgICAqc3R5bGVzaGVldCk7CisKK1dF QktJVF9BUEkgdm9pZAord2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9zdHlsZV9z aGVldCAgICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyICpt YW5hZ2VyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgV2ViS2l0VXNlclN0eWxlU2hlZXQgICAgICpzdHlsZXNo ZWV0KTsKKwogV0VCS0lUX0FQSSB2b2lkCiB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVt b3ZlX2FsbF9zdHlsZV9zaGVldHMgICAgICAgICAgICAgICAgICAgIChXZWJLaXRVc2VyQ29udGVu dE1hbmFnZXIgKm1hbmFnZXIpOwogCkBAIC05MCw2ICs5NSwxMCBAQCBXRUJLSVRfQVBJIHZvaWQK IHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9hZGRfc2NyaXB0ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKFdlYktpdFVzZXJDb250ZW50TWFuYWdlciAqbWFuYWdlciwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFdlYktpdFVzZXJTY3JpcHQgICAgICAgICAqc2NyaXB0KTsKIAorV0VCS0lUX0FQ SSB2b2lkCit3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVtb3ZlX3NjcmlwdCAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIgKm1hbmFnZXIs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBXZWJLaXRVc2VyU2NyaXB0ICAgICAgICAgKnNjcmlwdCk7CisKIFdF QktJVF9BUEkgdm9pZAogd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9hbGxfc2Ny aXB0cyAgICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyICpt YW5hZ2VyKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9k b2NzL3dwZS0xLjAtc2VjdGlvbnMudHh0IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dw ZS9kb2NzL3dwZS0xLjAtc2VjdGlvbnMudHh0CmluZGV4IGE0MzU5NTMxZjk5MjM2MjNkZWM4OTE2 MWY3OTExZjc1MWIxODUwNWMuLjBlZTI1MGU1NjMzOGNkYTczMzJkNzA1MDg1ODJhNTlhN2FkMjFj ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvZG9jcy93cGUt MS4wLXNlY3Rpb25zLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL2Rv Y3Mvd3BlLTEuMC1zZWN0aW9ucy50eHQKQEAgLTEwMyw4ICsxMDMsMTAgQEAgd2Via2l0X3VzZXJf Y29udGVudF9maWx0ZXJfZ2V0X3R5cGUKIFdlYktpdFVzZXJDb250ZW50TWFuYWdlcgogd2Via2l0 X3VzZXJfY29udGVudF9tYW5hZ2VyX25ldwogd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX2Fk ZF9zdHlsZV9zaGVldAord2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9zdHlsZV9z aGVldAogd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlbW92ZV9hbGxfc3R5bGVfc2hlZXRz CiB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfYWRkX3NjcmlwdAord2Via2l0X3VzZXJfY29u dGVudF9tYW5hZ2VyX3JlbW92ZV9zY3JpcHQKIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9y ZW1vdmVfYWxsX3NjcmlwdHMKIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZWdpc3Rlcl9z Y3JpcHRfbWVzc2FnZV9oYW5kbGVyCiB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfdW5yZWdp c3Rlcl9zY3JpcHRfbWVzc2FnZV9oYW5kbGVyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzZmYTk1YmQ0YTM0ZTAwNGU5YWY2OWI2OGNkODVlZWJm ZjQ1MWNmMS4uMjk2OTBjM2QzYWI1MjIxMDAzZTA0MDYwYTlkYWU4N2MzNzdhYjUxNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDIwLTExLTAyICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS11bV1BFXSBDYW5ub3QgcmVtb3ZlIGluZGl2aWR1YWwgc2NyaXB0 cy9zdHlsZXNoZWV0cyB1c2luZyBXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODQwMworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0aGUgbWlzc2luZyBXZWJL aXRVc2VyQ29udGVudE1hbmFnZXIgZnVuY3Rpb25zIHdoaWNoIGFsbG93CisgICAgICAgIHJlbW92 aW5nIGEgc2luZ2xlIHNjcmlwdCBhbmQgc3R5bGUgc2hlZXQgZnJvbSB0aGUgbWFuYWdlci4gR2l2 ZW4KKyAgICAgICAgdGhhdCBpdCBpcyBwb3NzaWJsZSB0byByZW1vdmUgYSBzaW5nbGUgY29udGVu dCBmaWx0ZXIgYW5kIG1lc3NhZ2UKKyAgICAgICAgaGFuZGxlcnMgYWxyZWFkeSwgdGhpcyBtYWtl IHRoZSBBUEkgb3J0aG9nb25hbCBmb3Igc2NyaXB0cyBhbmQgc3R5bGUKKyAgICAgICAgc2hlZXRz IGFzIHdlbGwuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVz dFdlYktpdFVzZXJDb250ZW50TWFuYWdlci5jcHA6CisgICAgICAgICh0ZXN0VXNlckNvbnRlbnRN YW5hZ2VySW5qZWN0ZWRTdHlsZVNoZWV0KTogQWRkIHRlc3QgZm9yCisgICAgICAgIHdlYmtpdF91 c2VyX2NvbnRlbnRfbWFuYWdlcl9yZW1vdmVfc3R5bGVfc2hlZXQoKS4KKyAgICAgICAgKHRlc3RV c2VyQ29udGVudE1hbmFnZXJJbmplY3RlZFNjcmlwdCk6IEFkZCB0ZXN0IGZvcgorICAgICAgICB3 ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVtb3ZlX3NjcmlwdCgpLgorCiAyMDIwLTExLTAx ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgcmVtYWlu aW5nIGFsdGVybmF0aXZlIHByZWZlcmVuY2Ugc2V0dGluZyBtZWNoYW5pc21zIGZyb20gTGF5b3V0 VGVzdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9U ZXN0V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmNwcAppbmRleCBlN2Yz YzViNzUwNTBlNWI1ZjliYTU4NjJjOTJjNjM4NTBlOTI3YzlkLi4zZGZkMzJiYjFmMTYyMmJiY2U1 YzY5ODM5YTY0NzU0MjcyM2UwZWQ3IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdEdMaWIvVGVzdFdlYktpdFVzZXJDb250ZW50TWFuYWdlci5jcHAKKysrIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRVc2VyQ29udGVudE1h bmFnZXIuY3BwCkBAIC0xODYsNiArMTg2LDE2IEBAIHN0YXRpYyB2b2lkIHRlc3RVc2VyQ29udGVu dE1hbmFnZXJJbmplY3RlZFN0eWxlU2hlZXQoV2ViVmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvCiAg ICAgZ19hc3NlcnRfZmFsc2UoaXNTdHlsZVNoZWV0SW5qZWN0ZWRGb3JVUkxBdFBhdGgodGVzdCwg aW5UaGVBbGxvd0xpc3RBbmRCbG9ja0xpc3QpKTsKICAgICBnX2Fzc2VydF9mYWxzZShpc1N0eWxl U2hlZXRJbmplY3RlZEZvclVSTEF0UGF0aCh0ZXN0LCBub3RJbkFsbG93TGlzdCkpOwogCisgICAg cmVtb3ZlT2xkSW5qZWN0ZWRDb250ZW50QW5kUmVzZXRMaXN0cyh0ZXN0LT5tX3VzZXJDb250ZW50 TWFuYWdlci5nZXQoKSwgYWxsb3dMaXN0LCBibG9ja0xpc3QpOworCisgICAgZ19hc3NlcnRfZmFs c2UoaXNTdHlsZVNoZWV0SW5qZWN0ZWRGb3JVUkxBdFBhdGgodGVzdCwgcmFuZG9tUGF0aCkpOwor ICAgIHN0eWxlU2hlZXQgPSB3ZWJraXRfdXNlcl9zdHlsZV9zaGVldF9uZXcoa0luamVjdGVkU3R5 bGVTaGVldCwgV0VCS0lUX1VTRVJfQ09OVEVOVF9JTkpFQ1RfQUxMX0ZSQU1FUywgV0VCS0lUX1VT RVJfU1RZTEVfTEVWRUxfVVNFUiwgbnVsbHB0ciwgbnVsbHB0cik7CisgICAgd2Via2l0X3VzZXJf Y29udGVudF9tYW5hZ2VyX2FkZF9zdHlsZV9zaGVldCh0ZXN0LT5tX3VzZXJDb250ZW50TWFuYWdl ci5nZXQoKSwgc3R5bGVTaGVldCk7CisgICAgZ19hc3NlcnRfdHJ1ZShpc1N0eWxlU2hlZXRJbmpl Y3RlZEZvclVSTEF0UGF0aCh0ZXN0LCByYW5kb21QYXRoKSk7CisgICAgd2Via2l0X3VzZXJfY29u dGVudF9tYW5hZ2VyX3JlbW92ZV9zdHlsZV9zaGVldCh0ZXN0LT5tX3VzZXJDb250ZW50TWFuYWdl ci5nZXQoKSwgc3R5bGVTaGVldCk7CisgICAgZ19hc3NlcnRfZmFsc2UoaXNTdHlsZVNoZWV0SW5q ZWN0ZWRGb3JVUkxBdFBhdGgodGVzdCwgcmFuZG9tUGF0aCkpOworICAgIHdlYmtpdF91c2VyX3N0 eWxlX3NoZWV0X3VucmVmKHN0eWxlU2hlZXQpOworCiAgICAgLy8gSXQncyBpbXBvcnRhbnQgdG8g Y2xlYW4gdXAgdGhlIGVudmlyb25tZW50IGJlZm9yZSBvdGhlciB0ZXN0cy4KICAgICByZW1vdmVP bGRJbmplY3RlZENvbnRlbnRBbmRSZXNldExpc3RzKHRlc3QtPm1fdXNlckNvbnRlbnRNYW5hZ2Vy LmdldCgpLCBhbGxvd0xpc3QsIGJsb2NrTGlzdCk7CiB9CkBAIC0yMzcsNiArMjQ3LDE2IEBAIHN0 YXRpYyB2b2lkIHRlc3RVc2VyQ29udGVudE1hbmFnZXJJbmplY3RlZFNjcmlwdChXZWJWaWV3VGVz dCogdGVzdCwgZ2NvbnN0cG9pbnRlCiAgICAgZ19hc3NlcnRfZmFsc2UoaXNTY3JpcHRJbmplY3Rl ZEZvclVSTEF0UGF0aCh0ZXN0LCBpblRoZUFsbG93TGlzdEFuZEJsb2NrTGlzdCkpOwogICAgIGdf YXNzZXJ0X2ZhbHNlKGlzU2NyaXB0SW5qZWN0ZWRGb3JVUkxBdFBhdGgodGVzdCwgbm90SW5BbGxv d0xpc3QpKTsKIAorICAgIHJlbW92ZU9sZEluamVjdGVkQ29udGVudEFuZFJlc2V0TGlzdHModGVz dC0+bV91c2VyQ29udGVudE1hbmFnZXIuZ2V0KCksIGFsbG93TGlzdCwgYmxvY2tMaXN0KTsKKwor ICAgIGdfYXNzZXJ0X2ZhbHNlKGlzU2NyaXB0SW5qZWN0ZWRGb3JVUkxBdFBhdGgodGVzdCwgcmFu ZG9tUGF0aCkpOworICAgIHNjcmlwdCA9IHdlYmtpdF91c2VyX3NjcmlwdF9uZXcoa0luamVjdGVk U2NyaXB0LCBXRUJLSVRfVVNFUl9DT05URU5UX0lOSkVDVF9BTExfRlJBTUVTLCBXRUJLSVRfVVNF Ul9TQ1JJUFRfSU5KRUNUX0FUX0RPQ1VNRU5UX0VORCwgbnVsbHB0ciwgbnVsbHB0cik7CisgICAg d2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX2FkZF9zY3JpcHQodGVzdC0+bV91c2VyQ29udGVu dE1hbmFnZXIuZ2V0KCksIHNjcmlwdCk7CisgICAgZ19hc3NlcnRfdHJ1ZShpc1NjcmlwdEluamVj dGVkRm9yVVJMQXRQYXRoKHRlc3QsIHJhbmRvbVBhdGgpKTsKKyAgICB3ZWJraXRfdXNlcl9jb250 ZW50X21hbmFnZXJfcmVtb3ZlX3NjcmlwdCh0ZXN0LT5tX3VzZXJDb250ZW50TWFuYWdlci5nZXQo KSwgc2NyaXB0KTsKKyAgICBnX2Fzc2VydF9mYWxzZShpc1NjcmlwdEluamVjdGVkRm9yVVJMQXRQ YXRoKHRlc3QsIHJhbmRvbVBhdGgpKTsKKyAgICB3ZWJraXRfdXNlcl9zY3JpcHRfdW5yZWYoc2Ny aXB0KTsKKwogICAgIC8vIEl0J3MgaW1wb3J0YW50IHRvIGNsZWFuIHVwIHRoZSBlbnZpcm9ubWVu dCBiZWZvcmUgb3RoZXIgdGVzdHMuCiAgICAgcmVtb3ZlT2xkSW5qZWN0ZWRDb250ZW50QW5kUmVz ZXRMaXN0cyh0ZXN0LT5tX3VzZXJDb250ZW50TWFuYWdlci5nZXQoKSwgYWxsb3dMaXN0LCBibG9j a0xpc3QpOwogfQo=