11260 2006-10-11 16:26:41 -0700 Linux\Gdk build fixes 2006-10-12 02:42:25 -0700 1 1 1 Unclassified WebKit New Bugs 420+ PC Linux RESOLVED FIXED P2 Normal --- 1 kkowalczyk webkit-unassigned oldest_to_newest 53396 0 kkowalczyk 2006-10-11 16:26:41 -0700 Attached patch has linux\gdk fixes for recent changes. 53397 1 11041 kkowalczyk 2006-10-11 16:28:09 -0700 Created attachment 11041 linux\gdk build fixes This patch has: * linux\gdk build fixes, modelled after Qt code * regenerate-makefiles also regenerates GtkLauncher makefile, since it's easy to forget 53399 2 kkowalczyk 2006-10-11 16:34:05 -0700 BTW: slightly unrelated, but it would also be good if a kind soul killed JavaScriptsCore\Makefile.vc and JavaScriptCore\README-Win32.txt. I wrote those very long time ago and they're no longer applicable, hence probably confusing. 53408 3 11041 mjs 2006-10-12 02:34:37 -0700 Comment on attachment 11041 linux\gdk build fixes r=me 53410 4 mrowe 2006-10-12 02:42:25 -0700 Landed in r17003. 11041 2006-10-11 16:28:09 -0700 2006-10-12 02:34:37 -0700 linux\gdk build fixes patch.txt text/plain 10979 kkowalczyk SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ2RrL1RlbXBvcmFyeUxpbmtTdHVicy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9nZGsvVGVtcG9yYXJ5TGlua1N0dWJzLmNwcAkocmV2 aXNpb24gMTY5OTYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dkay9UZW1wb3JhcnlMaW5rU3R1YnMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw3ICs0Nyw2IEBACiAjaW5jbHVkZSAiS1VSTC5oIgog I2luY2x1ZGUgIlBsYXRmb3JtU2Nyb2xsQmFyLmgiCiAjaW5jbHVkZSAiU2Nyb2xsQmFyLmgiCi0j aW5jbHVkZSAiSmF2YUFwcGxldFdpZGdldC5oIgogI2luY2x1ZGUgIlBhdGguaCIKICNpbmNsdWRl ICJQbGF0Zm9ybU1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJDb29raWVKYXIuaCIKQEAgLTg4LDgg Kzg3LDYgQEAKIHZvaWQgV2lkZ2V0Ojp1bmxvY2tEcmF3aW5nRm9jdXMoR3JhcGhpY3NDb250ZXh0 KikgeyBub3RJbXBsZW1lbnRlZCgpOyB9CiB2b2lkIFdpZGdldDo6cmVtb3ZlRnJvbVBhcmVudCgp IHsgfQogCi1KYXZhQXBwbGV0V2lkZ2V0OjpKYXZhQXBwbGV0V2lkZ2V0KEludFNpemUgY29uc3Qm LCBFbGVtZW50KiwgV1RGOjpIYXNoTWFwPFN0cmluZywgU3RyaW5nPiBjb25zdCYpIHsgbm90SW1w bGVtZW50ZWQoKTsgfQotCiB2b2lkIFRleHRGaWVsZDo6c2VsZWN0QWxsKCkgeyBub3RJbXBsZW1l bnRlZCgpOyB9CiB2b2lkIFRleHRGaWVsZDo6YWRkU2VhcmNoUmVzdWx0KCkgeyBub3RJbXBsZW1l bnRlZCgpOyB9CiBpbnQgVGV4dEZpZWxkOjpzZWxlY3Rpb25TdGFydCgpIGNvbnN0IHsgbm90SW1w bGVtZW50ZWQoKTsgcmV0dXJuIDA7IH0KQEAgLTE0Niw2ICsxNDMsNyBAQAogS0pTOjpCaW5kaW5n czo6SW5zdGFuY2UqIEZyYW1lR2RrOjpnZXRPYmplY3RJbnN0YW5jZUZvcldpZGdldChXaWRnZXQg KikgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4gMDsgfQogS0pTOjpCaW5kaW5nczo6SW5zdGFu Y2UqIEZyYW1lR2RrOjpnZXRFbWJlZEluc3RhbmNlRm9yV2lkZ2V0KFdpZGdldCAqKSB7IG5vdElt cGxlbWVudGVkKCk7IHJldHVybiAwOyB9CiBLSlM6OkJpbmRpbmdzOjpSb290T2JqZWN0KiBGcmFt ZUdkazo6YmluZGluZ1Jvb3RPYmplY3QoKSB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiAwOyB9 CitXaWRnZXQqIEZyYW1lR2RrOjpjcmVhdGVKYXZhQXBwbGV0V2lkZ2V0KGNvbnN0IEludFNpemUm LCBFbGVtZW50KiwgY29uc3QgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4mKSB7IG5vdEltcGxlbWVu dGVkKCk7IHJldHVybiAwOyB9CiBib29sIEZyYW1lR2RrOjpjYW5SZWRvKCkgY29uc3QgeyBub3RJ bXBsZW1lbnRlZCgpOyByZXR1cm4gMDsgfQogYm9vbCBGcmFtZUdkazo6Y2FuVW5kbygpIGNvbnN0 IHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIDA7IH0KIHZvaWQgRnJhbWVHZGs6OnJlZ2lzdGVy Q29tbWFuZEZvclJlZG8oUGFzc1JlZlB0cjxXZWJDb3JlOjpFZGl0Q29tbWFuZD4pIHsgbm90SW1w bGVtZW50ZWQoKTsgfQpAQCAtMzQxLDYgKzMzOSw3IEBACiAKIEZpbGVDaG9vc2VyOjpGaWxlQ2hv b3NlcihEb2N1bWVudCosIFJlbmRlckZpbGVVcGxvYWRDb250cm9sKikgeyBub3RJbXBsZW1lbnRl ZCgpOyB9CiBGaWxlQ2hvb3Nlcjo6fkZpbGVDaG9vc2VyKCkgeyBub3RJbXBsZW1lbnRlZCgpOyB9 CitQYXNzUmVmUHRyPEZpbGVDaG9vc2VyPiBGaWxlQ2hvb3Nlcjo6Y3JlYXRlKERvY3VtZW50Kiwg UmVuZGVyRmlsZVVwbG9hZENvbnRyb2wqKSB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiAwOyB9 CiB2b2lkIEZpbGVDaG9vc2VyOjpvcGVuRmlsZUNob29zZXIoKSB7IG5vdEltcGxlbWVudGVkKCk7 IH0KIFN0cmluZyBGaWxlQ2hvb3Nlcjo6YmFzZW5hbWVGb3JXaWR0aChpbnQgd2lkdGgpIGNvbnN0 IHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIFN0cmluZygpOyB9CiB2b2lkIEZpbGVDaG9vc2Vy Ojp1cGxvYWRDb250cm9sRGV0YWNoaW5nKCkgeyBub3RJbXBsZW1lbnRlZCgpOyB9CkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL2dkay9GcmFtZUdkay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vZ2RrL0ZyYW1lR2RrLmgJKHJldmlzaW9uIDE2OTk2KQorKysgV2ViQ29yZS9wbGF0Zm9y bS9nZGsvRnJhbWVHZGsuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsMTQgKzM1LDQ0IEBACiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEVsZW1lbnQ7CitjbGFzcyBGcmFtZUdkazsKIAogY2xh c3MgRnJhbWVHZGtDbGllbnQgewogcHVibGljOgotICAgIHZpcnR1YWwgdm9pZCBvcGVuVVJMKGNv bnN0IERlcHJlY2F0ZWRTdHJpbmcmKSA9IDA7CisgICAgdmlydHVhbCB+RnJhbWVHZGtDbGllbnQo KSA9IDA7CisKKyAgICB2aXJ0dWFsIHZvaWQgc2V0RnJhbWUoY29uc3QgRnJhbWVHZGsqKSA9IDA7 CisKKyAgICB2aXJ0dWFsIHZvaWQgb3BlblVSTChjb25zdCBLVVJMJikgPSAwOworICAgIHZpcnR1 YWwgdm9pZCBzdWJtaXRGb3JtKGNvbnN0IFN0cmluZyYgbWV0aG9kLCBjb25zdCBLVVJMJiwgY29u c3QgRm9ybURhdGEqKSA9IDA7CiB9OwogCi1jbGFzcyBGcmFtZUdkayA6IHB1YmxpYyBGcmFtZSwg UmVzb3VyY2VMb2FkZXJDbGllbnQgeworY2xhc3MgRnJhbWVHZGtDbGllbnREZWZhdWx0IDogcHVi bGljIEZyYW1lR2RrQ2xpZW50LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVibGlj ICBSZXNvdXJjZUxvYWRlckNsaWVudCAKK3sKIHB1YmxpYzoKKworICAgIEZyYW1lR2RrQ2xpZW50 RGVmYXVsdCgpOworICAgIHZpcnR1YWwgfkZyYW1lR2RrQ2xpZW50RGVmYXVsdCgpOworCisgICAg Ly8gRnJhbWVHZGtDbGllbnQKKyAgICB2aXJ0dWFsIHZvaWQgc2V0RnJhbWUoY29uc3QgRnJhbWVH ZGsqKTsKKyAgICB2aXJ0dWFsIHZvaWQgb3BlblVSTChjb25zdCBLVVJMJik7CisgICAgdmlydHVh bCB2b2lkIHN1Ym1pdEZvcm0oY29uc3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IEtVUkwmLCBjb25z dCBGb3JtRGF0YSopOworCisgICAgLy8gUmVzb3VyY2VMb2FkZXJDbGllbnQKKyAgICB2aXJ0dWFs IHZvaWQgcmVjZWl2ZWRSZXNwb25zZShSZXNvdXJjZUxvYWRlciosIFBsYXRmb3JtUmVzcG9uc2Up OworICAgIHZpcnR1YWwgdm9pZCByZWNlaXZlZERhdGEoUmVzb3VyY2VMb2FkZXIqLCBjb25zdCBj aGFyKiwgaW50KTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVjZWl2ZWRBbGxEYXRhKFJlc291cmNlTG9h ZGVyKiwgUGxhdGZvcm1EYXRhKTsKKworcHJpdmF0ZToKKyAgICBGcmFtZUdkayogbV9mcmFtZTsK KyAgICBib29sIG1fYmVnaW5DYWxsZWQgOiAxOworCit9OworCitjbGFzcyBGcmFtZUdkayA6IHB1 YmxpYyBGcmFtZSB7CitwdWJsaWM6CiAgICAgRnJhbWVHZGsoUGFnZSosIEVsZW1lbnQqKTsKICAg ICBGcmFtZUdkayhHZGtEcmF3YWJsZSopOwogICAgIHZpcnR1YWwgfkZyYW1lR2RrKCk7CkBAIC0x MjksMTIgKzE1OSwxMCBAQAogICAgIGJvb2wga2V5UHJlc3MoY29uc3QgUGxhdGZvcm1LZXlib2Fy ZEV2ZW50Jik7CiAgICAgdmlydHVhbCBLVVJMIG9yaWdpbmFsUmVxdWVzdFVSTCgpIGNvbnN0Owog Ci0gICAgdmlydHVhbCB2b2lkIHJlY2VpdmVkRGF0YShSZXNvdXJjZUxvYWRlciosIGNvbnN0IGNo YXIqLCBpbnQpOwotICAgIHZpcnR1YWwgdm9pZCByZWNlaXZlZEFsbERhdGEoUmVzb3VyY2VMb2Fk ZXIqLFBsYXRmb3JtRGF0YSk7Ci0KICAgICBJbnRSZWN0IGZyYW1lR2VvbWV0cnkoKSBjb25zdDsK ICAgICB2b2lkIHNldEZyYW1lR2VvbWV0cnkoY29uc3QgSW50UmVjdCYpOwogICAgIHZpcnR1YWwg RnJhbWUqIGNyZWF0ZUZyYW1lKGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmIG5hbWUsIEVsZW1l bnQqIG93bmVyRWxlbWVudCwgY29uc3QgU3RyaW5nJiByZWZlcnJlcik7CisgICAgV2lkZ2V0KiBj cmVhdGVKYXZhQXBwbGV0V2lkZ2V0KGNvbnN0IEludFNpemUmLCBFbGVtZW50KiwgY29uc3QgSGFz aE1hcDxTdHJpbmcsIFN0cmluZz4mKTsKIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgaXNM b2FkVHlwZVJlbG9hZCgpOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRnJhbWVHZGsuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZyYW1lR2RrLmNwcAkocmV2aXNp b24gMTY5OTYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dkay9GcmFtZUdkay5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQzLDYgKzQzLDcgQEAKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNp bmNsdWRlICJIVE1MRG9jdW1lbnQuaCIKICNpbmNsdWRlICJSZXNvdXJjZUxvYWRlci5oIgorI2lu Y2x1ZGUgIlJlc291cmNlTG9hZGVySW50ZXJuYWwuaCIKICNpbmNsdWRlICJQbGF0Zm9ybU1vdXNl RXZlbnQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUtleWJvYXJkRXZlbnQuaCIKICNpbmNsdWRlICJQ bGF0Zm9ybVdoZWVsRXZlbnQuaCIKQEAgLTY5LDYgKzcwLDcwIEBACiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAorRnJhbWVHZGtDbGllbnREZWZhdWx0OjpGcmFtZUdka0NsaWVudERlZmF1bHQoKQor ICAgIDogUmVzb3VyY2VMb2FkZXJDbGllbnQoKQorICAgICwgbV9mcmFtZSgwKQorICAgICwgbV9i ZWdpbkNhbGxlZChmYWxzZSkKK3sKK30KKworRnJhbWVHZGtDbGllbnREZWZhdWx0Ojp+RnJhbWVH ZGtDbGllbnREZWZhdWx0KCkKK3sKK30KKwordm9pZCBGcmFtZUdka0NsaWVudERlZmF1bHQ6OnNl dEZyYW1lKGNvbnN0IEZyYW1lR2RrKiBmcmFtZSkKK3sKKyAgICBtX2ZyYW1lID0gY29uc3RfY2Fz dDxGcmFtZUdkayo+KGZyYW1lKTsKK30KKwordm9pZCBGcmFtZUdka0NsaWVudERlZmF1bHQ6Om9w ZW5VUkwoY29uc3QgS1VSTCYgdXJsKQoreworICAgIG1fZnJhbWUtPmRpZE9wZW5VUkwodXJsKTsK KyAgICBtX2JlZ2luQ2FsbGVkID0gZmFsc2U7CisKKyAgICBSZWZQdHI8UmVzb3VyY2VMb2FkZXI+ IGxvYWRlciA9IFJlc291cmNlTG9hZGVyOjpjcmVhdGUodGhpcywgIkdFVCIsIHVybCk7CisgICAg bG9hZGVyLT5zdGFydCgwKTsKK30KKwordm9pZCBGcmFtZUdka0NsaWVudERlZmF1bHQ6OnN1Ym1p dEZvcm0oY29uc3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IEtVUkwmIHVybCwgY29uc3QgRm9ybURh dGEqIHBvc3REYXRhKQoreworICAgIG1fYmVnaW5DYWxsZWQgPSBmYWxzZTsKKworICAgIFJlZlB0 cjxSZXNvdXJjZUxvYWRlcj4gbG9hZGVyID0gUmVzb3VyY2VMb2FkZXI6OmNyZWF0ZSh0aGlzLCBt ZXRob2QsIHVybCwgKnBvc3REYXRhKTsKKyAgICBsb2FkZXItPnN0YXJ0KDApOworfQorCit2b2lk IEZyYW1lR2RrQ2xpZW50RGVmYXVsdDo6cmVjZWl2ZWRSZXNwb25zZShSZXNvdXJjZUxvYWRlcios IFBsYXRmb3JtUmVzcG9uc2UpCit7CisgICAgLy8gbm8tb3AKK30KKwordm9pZCBGcmFtZUdka0Ns aWVudERlZmF1bHQ6OnJlY2VpdmVkRGF0YShSZXNvdXJjZUxvYWRlciogam9iLCBjb25zdCBjaGFy KiBkYXRhLCBpbnQgbGVuZ3RoKQoreworICAgIGlmICghbV9iZWdpbkNhbGxlZCkgeworICAgICAg ICBtX2JlZ2luQ2FsbGVkID0gdHJ1ZTsKKworI2lmIDAgIC8vIEZJWE1FOiBUaGlzIGlzIGZyb20g UXQgdmVyc2lvbiwgbmVlZCB0byBiZSByZW1vdmVkIG9yIEdkayBlcXVpdmFsZW50IHdyaXR0ZW4K KyAgICAgICAgLy8gQXNzaWduIGNvcnJlY3QgbWltZXR5cGUgX2JlZm9yZV8gY2FsbGluZyBiZWdp bigpIQorICAgICAgICBSZXNvdXJjZUxvYWRlckludGVybmFsKiBkID0gam9iLT5nZXRJbnRlcm5h bCgpOworICAgICAgICBpZiAoZCkgeworICAgICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVl c3QobV9mcmFtZS0+cmVzb3VyY2VSZXF1ZXN0KCkpOworICAgICAgICAgICAgcmVxdWVzdC5tX3Jl c3BvbnNlTUlNRVR5cGUgPSBkLT5tX21pbWV0eXBlOworICAgICAgICAgICAgbV9mcmFtZS0+c2V0 UmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpOworICAgICAgICB9CisjZW5kaWYKKyAgICAgICAgbV9m cmFtZS0+YmVnaW4oam9iLT51cmwoKSk7CisgICAgfQorCisgICAgbV9mcmFtZS0+d3JpdGUoZGF0 YSwgbGVuZ3RoKTsKK30KKwordm9pZCBGcmFtZUdka0NsaWVudERlZmF1bHQ6OnJlY2VpdmVkQWxs RGF0YShSZXNvdXJjZUxvYWRlciogam9iLCBQbGF0Zm9ybURhdGEgZGF0YSkKK3sKKyAgICBtX2Zy YW1lLT5lbmQoKTsKKyAgICBtX2JlZ2luQ2FsbGVkID0gZmFsc2U7Cit9CisKIHN0YXRpYyB2b2lk IGRvU2Nyb2xsKGNvbnN0IFJlbmRlck9iamVjdCogciwgZmxvYXQgZGVsdGFYLCBmbG9hdCBkZWx0 YVkpCiB7CiAgICAgLy8gRklYTUU6IFRoZSBzY3JvbGxpbmcgZG9uZSBoZXJlIHNob3VsZCBiZSBk b25lIGluIHRoZSBkZWZhdWx0IGhhbmRsZXJzCkBAIC0xMTAsNiArMTc1LDkgQEAKICAgICBJbnRS ZWN0IGdlb20gPSBmcmFtZUdlb21ldHJ5KCk7CiAgICAgdmlldy0+cmVzaXplKGdlb20ud2lkdGgo KSwgZ2VvbS5oZWlnaHQoKSk7CiAgICAgdmlldy0+U2Nyb2xsVmlldzo6c2V0RHJhd2FibGUoZ2Rr ZHJhd2FibGUpOworCisgICAgbV9jbGllbnQgPSBuZXcgRnJhbWVHZGtDbGllbnREZWZhdWx0KCk7 CisgICAgbV9jbGllbnQtPnNldEZyYW1lKHRoaXMpOwogfQogCiBGcmFtZUdkazo6RnJhbWVHZGso UGFnZSogcGFnZSwgRWxlbWVudCogZWxlbWVudCkKQEAgLTExOSw2ICsxODcsOCBAQAogICAgIFNl dHRpbmdzKiBzZXR0aW5ncyA9IG5ldyBTZXR0aW5nczsKICAgICBzZXR0aW5ncy0+c2V0QXV0b0xv YWRJbWFnZXModHJ1ZSk7CiAgICAgc2V0U2V0dGluZ3Moc2V0dGluZ3MpOworICAgIG1fY2xpZW50 ID0gbmV3IEZyYW1lR2RrQ2xpZW50RGVmYXVsdCgpOworICAgIG1fY2xpZW50LT5zZXRGcmFtZSh0 aGlzKTsKIH0KIAogRnJhbWVHZGs6On5GcmFtZUdkaygpCkBAIC0xMjgsMjYgKzE5OCwzMiBAQAog CiBib29sIEZyYW1lR2RrOjpvcGVuVVJMKGNvbnN0IEtVUkwmIHVybCkKIHsKLSAgICBkaWRPcGVu VVJMKHVybCk7Ci0gICAgYmVnaW4odXJsKTsKLSAgICBSZWZQdHI8UmVzb3VyY2VMb2FkZXI+IGxv YWRlciA9IFJlc291cmNlTG9hZGVyOjpjcmVhdGUodGhpcywgIkdFVCIsIHVybCk7Ci0gICAgbG9h ZGVyLT5zdGFydChkb2N1bWVudCgpLT5kb2NMb2FkZXIoKSk7CisgICAgaWYgKCFtX2NsaWVudCkK KyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgbV9jbGllbnQtPm9wZW5VUkwodXJsKTsKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBGcmFtZUdkazo6c3VibWl0Rm9ybShjb25zdCBSZXNv dXJjZVJlcXVlc3QmKQordm9pZCBGcmFtZUdkazo6c3VibWl0Rm9ybShjb25zdCBSZXNvdXJjZVJl cXVlc3QmIHJlcXVlc3QpCiB7CisgICAgLy8gRklYTUU6IHRoaXMgaXMgYSBoYWNrIGluaGVyaXRl ZCBmcm9tIEZyYW1lTWFjLCBhbmQgc2hvdWxkIGJlIHB1c2hlZCBpbnRvIEZyYW1lCisgICAgaWYg KGQtPm1fc3VibWl0dGVkRm9ybVVSTCA9PSByZXF1ZXN0LnVybCgpKQorICAgICAgICByZXR1cm47 CisKKyAgICBkLT5tX3N1Ym1pdHRlZEZvcm1VUkwgPSByZXF1ZXN0LnVybCgpOworCisgICAgaWYg KG1fY2xpZW50KQorICAgICAgICBtX2NsaWVudC0+c3VibWl0Rm9ybShyZXF1ZXN0LmRvUG9zdCgp ID8gIlBPU1QiIDogIkdFVCIsIHJlcXVlc3QudXJsKCksICZyZXF1ZXN0LnBvc3REYXRhKTsKKyAg ICBjbGVhclJlY29yZGVkRm9ybVZhbHVlcygpOwogfQogCiB2b2lkIEZyYW1lR2RrOjp1cmxTZWxl Y3RlZChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7Ci0gICAgLy9uZWVkIHRvIHBv dGVudGlhbGx5IHVwZGF0ZUxvY2F0aW9uQmFyKHN0ci5hc2NpaSgpKTsgb3Igbm90aWZ5IHN5cyBv ZiBuZXcgdXJsIG15YmUgZXZlbnQgb3IgY2FsbGJhY2sKLSAgICBjb25zdCBLVVJMIHVybCA9IHJl cXVlc3QudXJsKCk7Ci0gICAgcHJpbnRmKCItLS0tLS0tLS0tLS0tLS0tLS0+IExPQURJTkcgTkVX IFVSTCAlcyBcbiIsIHVybC51cmwoKS5hc2NpaSgpKTsKLSAgICBkaWRPcGVuVVJMKHVybCk7Ci0g ICAgYmVnaW4odXJsKTsKLSAgICBSZWZQdHI8UmVzb3VyY2VMb2FkZXI+IGxvYWRlciA9IFJlc291 cmNlTG9hZGVyOjpjcmVhdGUodGhpcywgIkdFVCIsIHVybCk7Ci0gICAgbG9hZGVyLT5zdGFydChk b2N1bWVudCgpLT5kb2NMb2FkZXIoKSk7CisgICAgaWYgKCFtX2NsaWVudCkKKyAgICAgICAgcmV0 dXJuOworCisgICAgbV9jbGllbnQtPm9wZW5VUkwocmVxdWVzdC51cmwoKSk7CiB9CiAKIFN0cmlu ZyBGcmFtZUdkazo6dXNlckFnZW50KCkgY29uc3QKQEAgLTI5OCwxNiArMzc0LDYgQEAKICAgICB9 CiB9CiAKLXZvaWQgRnJhbWVHZGs6OnJlY2VpdmVkRGF0YShSZXNvdXJjZUxvYWRlciogam9iLCBj b25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuZ3RoKQotewotICAgIHdyaXRlKGRhdGEsIGxlbmd0aCk7 Ci19Ci0KLXZvaWQgRnJhbWVHZGs6OnJlY2VpdmVkQWxsRGF0YShSZXNvdXJjZUxvYWRlciogam9i LCBQbGF0Zm9ybURhdGEgZGF0YSkKLXsKLSAgICBlbmQoKTsKLX0KLQogdm9pZCBGcmFtZUdkazo6 c2V0RnJhbWVHZW9tZXRyeShjb25zdCBJbnRSZWN0ICZyKQogewogICAgIGlmICghbV9kcmF3YWJs ZSB8fCAhR0RLX0lTX1dJTkRPVyhtX2RyYXdhYmxlKSkKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjk5OCkKKysrIFdl YkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMDYtMTAt MTEgIEtyenlzenRvZiBLb3dhbGN6eWsgIDxra293YWxjenlrQGdtYWlsLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXQVJOSU5HOiBOTyBURVNU IENBU0VTIEFEREVEIE9SIENIQU5HRUQKKworICAgICAgICBVcGRhdGUgR2RrXExpbnV4IGJ1aWxk IGZvciByZWNlbnQgY2hhbmdlcywgYmFzZWQgb24gUXQgY29kZQorCisgICAgICAgICogcGxhdGZv cm0vZ2RrL0ZyYW1lR2RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lR2RrQ2xpZW50RGVm YXVsdDo6RnJhbWVHZGtDbGllbnREZWZhdWx0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lR2Rr Q2xpZW50RGVmYXVsdDo6fkZyYW1lR2RrQ2xpZW50RGVmYXVsdCk6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUdka0NsaWVudERlZmF1bHQ6OnNldEZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lR2RrQ2xpZW50RGVmYXVsdDo6b3BlblVSTCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUdk a0NsaWVudERlZmF1bHQ6OnN1Ym1pdEZvcm0pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVHZGtD bGllbnREZWZhdWx0OjpyZWNlaXZlZFJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l R2RrQ2xpZW50RGVmYXVsdDo6cmVjZWl2ZWREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l R2RrQ2xpZW50RGVmYXVsdDo6cmVjZWl2ZWRBbGxEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lR2RrOjpGcmFtZUdkayk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUdkazo6b3BlblVSTCk6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUdkazo6c3VibWl0Rm9ybSk6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZUdkazo6dXJsU2VsZWN0ZWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dkay9GcmFt ZUdkay5oOgorICAgICAgICAqIHBsYXRmb3JtL2dkay9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwOgor ICAgICAgICAoRnJhbWVHZGs6OmNyZWF0ZUphdmFBcHBsZXRXaWRnZXQpOgorICAgICAgICAoRmls ZUNob29zZXI6OmNyZWF0ZSk6CisKIDIwMDYtMTAtMTEgIEpvaG4gU3VsbGl2YW4gIDxzdWxsaXZh bkBhcHBsZS5jb20+CiAgICAgICAgIAogICAgICAgICBEYXJpbiB3cm90ZSB0aGlzIGNvZGU7IHdl IHRlc3RlZCBpdDsgSSBnaXZlIGl0IHRoZSB0aHVtYnMgdXAuCkluZGV4OiBXZWJLaXRUb29scy9T Y3JpcHRzL3JlZ2VuZXJhdGUtbWFrZWZpbGVzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1Nj cmlwdHMvcmVnZW5lcmF0ZS1tYWtlZmlsZXMJKHJldmlzaW9uIDE2OTk2KQorKysgV2ViS2l0VG9v bHMvU2NyaXB0cy9yZWdlbmVyYXRlLW1ha2VmaWxlcwkod29ya2luZyBjb3B5KQpAQCAtNjksMyAr NjksNSBAQAogCiBjZCAuLi8uLi9CYWtlZmlsZXMKIGJha2VmaWxlX2dlbgorY2QgLi4vV2ViS2l0 VG9vbHMvR2RrTGF1bmNoZXIKK2Jha2VmaWxlX2dlbgpJbmRleDogV2ViS2l0VG9vbHMvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTY5OTgp CisrKyBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBA QAorMjAwNi0xMC0xMSAgS3J6eXN6dG9mIEtvd2FsY3p5ayAgPGtrb3dhbGN6eWtAZ21haWwuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsc28g cmVnZW5lcmF0ZSBHZGtMYXVuY2hlciBtYWtlZmlsZXMsIHNpbmNlIG5vdCBkb2luZyB0aGF0IG1p Z2h0CisgICAgICAgIGxlYWQgdG8gbWlzbWF0Y2ggYmV0d2VlbiBXZWJDb3JlIGFuZCBHZGtMYXVu Y2hlciBjb21waWxlciBzZXR0aW5ncy4KKworICAgICAgICAqIFNjcmlwdHMvcmVnZW5lcmF0ZS1t YWtlZmlsZXM6CisKIDIwMDYtMTAtMTAgIERhdmlkIFNtaXRoICA8Y2F0ZmlzaC5tYW5AZ21haWwu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRpbSBILgo=