147519 2015-07-31 18:17:42 -0700 Get ready to build DumpRenderTree with CMake 2015-08-05 16:03:23 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen gyuyoung.kim mrobinson oldest_to_newest 1113946 0 achristensen 2015-07-31 18:17:42 -0700 There's still one symbol the linker can't find, but this is ready to upstream. 1113949 1 257987 achristensen 2015-07-31 18:27:31 -0700 Created attachment 257987 Patch 1113960 2 257987 mrobinson 2015-07-31 19:31:07 -0700 Comment on attachment 257987 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257987&action=review Looks pretty good, but I have a few suggestions... > Source/WebKit/CMakeLists.txt:22 > + PRIVATE JavaScriptCore > + PRIVATE WTF > + PRIVATE WebCore Small indentation issue here. > Tools/DumpRenderTree/CMakeLists.txt:85 > +if (WIN32) > + add_library(DumpRenderTreeLib SHARED ${DumpRenderTree_SOURCES}) > + set_target_properties(DumpRenderTreeLib PROPERTIES FOLDER "Tools") > + set_target_properties(DumpRenderTreeLib PROPERTIES OUTPUT_NAME "DumpRenderTree") > + target_link_libraries(DumpRenderTreeLib ${DumpRenderTree_LIBRARIES}) > + > + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup") > + add_executable(DumpRenderTree ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp) > + target_link_libraries(DumpRenderTree shlwapi) I wonder if you could move this to the Windows specific CMake file by using the DumpRenderTree_SOURCES variable to add the DumpRenderTreeLib library and then resetting it to only contain ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp. I think that would allow you to remove the Windows-specific code form this file. 1115138 3 258308 achristensen 2015-08-05 15:34:12 -0700 Created attachment 258308 Patch 1115150 4 258308 bfulgham 2015-08-05 15:54:42 -0700 Comment on attachment 258308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258308&action=review LGTM! r=me. > Source/WebCore/CMakeLists.txt:-3297 > - WebCore Is this true for other platforms (EFL/GTK?) 1115154 5 achristensen 2015-08-05 15:58:23 -0700 (In reply to comment #4) > Comment on attachment 258308 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=258308&action=review > > LGTM! r=me. > > > Source/WebCore/CMakeLists.txt:-3297 > > - WebCore > > Is this true for other platforms (EFL/GTK?) Yes, WebCoreTestSupport is a static library on all platforms currently, and their EWS bots are ok with this change. If someone wants to make it a static library in the future for some reason, then they can, provided they don't break anything. 1115158 6 achristensen 2015-08-05 16:03:23 -0700 Moved include from WebView.h to WebView.cpp Committed to http://trac.webkit.org/changeset/187997 257987 2015-07-31 18:27:31 -0700 2015-08-05 15:34:10 -0700 Patch bug-147519-20150731182728.patch text/plain 10118 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NzY5OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA3LTMxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgR2V0IHJlYWR5 IHRvIGJ1aWxkIER1bXBSZW5kZXJUcmVlIHdpdGggQ01ha2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzUxOQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAgICAgIFdl YkNvcmVUZXN0U3VwcG9ydCBpcyBhIHN0YXRpYyBsaWJyYXJ5LCBhbmQgaXQgZG9lcyBub3QgbmVl ZCB0byBsaW5rIHdpdGggV2ViQ29yZS4KKyAgICAgICAgTGlua2luZyB3aXRoIFdlYkNvcmUgbWFr ZXMgQ01ha2UgbWFrZSBldmVyeXRoaW5nIHRoYXQgbGlua3Mgd2l0aCBXZWJDb3JlVGVzdFN1cHBv cnQgYWxzbyBsaW5rIHdpdGggV2ViQ29yZSwgd2hpY2ggd2UgZG8gbm90IHdhbnQuCisKIDIwMTUt MDctMzEgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAg W2lPU10gdXNlIGEgbWVkaWEtc3BlY2lmaWMgdXNlciBnZXN0dXJlIGNoZWNrCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9D TWFrZUxpc3RzLnR4dAkocmV2aXNpb24gMTg3Njk4KQorKysgU291cmNlL1dlYkNvcmUvQ01ha2VM aXN0cy50eHQJKHdvcmtpbmcgY29weSkKQEAgLTMyNTYsNyArMzI1Niw2IEBAIHNldChXZWJDb3Jl VGVzdFN1cHBvcnRfU09VUkNFUwogc2V0KFdlYkNvcmVUZXN0U3VwcG9ydF9MSUJSQVJJRVMKICAg ICBKYXZhU2NyaXB0Q29yZQogICAgIFdURgotICAgIFdlYkNvcmUKICkKIAogIyBNb2R1bGVzIHRo YXQgdGhlIGJpbmRpbmdzIGdlbmVyYXRvciBzY3JpcHRzIG1heSB1c2UKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShy ZXZpc2lvbiAxODc2OTgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA3LTMxICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgR2V0IHJlYWR5IHRvIGJ1aWxkIER1bXBSZW5k ZXJUcmVlIHdpdGggQ01ha2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NzUxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAgICAgICogUGxhdGZvcm1NYWMuY21ha2U6 CisgICAgICAgICogUGxhdGZvcm1XaW4uY21ha2U6CisgICAgICAgIE1ha2UgdGhlIGxpYnJhcmll cyBXZWJLaXQgbGlua3Mgd2l0aCBwcml2YXRlLCB3aGljaCBtZWFucyB0aGF0IENNYWtlIHdpbGwg bm90IG1ha2UgZXZlcnl0aGluZworICAgICAgICB0aGF0IGxpbmtzIHdpdGggV2ViS2l0IGxpbmsg d2l0aCBldmVyeXRoaW5nIFdlYktpdCBsaW5rcyB3aXRoLgorCiAyMDE1LTA3LTMwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVpbGQgQXBw bGVXaW4gcG9ydCB3aXRoIENNYWtlCkluZGV4OiBTb3VyY2UvV2ViS2l0L0NNYWtlTGlzdHMudHh0 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ01ha2VMaXN0cy50eHQJKHJldmlzaW9uIDE4 NzY5OCkKKysrIFNvdXJjZS9XZWJLaXQvQ01ha2VMaXN0cy50eHQJKHdvcmtpbmcgY29weSkKQEAg LTE3LDkgKzE3LDkgQEAgc2V0KFdlYktpdF9JTkNMVURFX0RJUkVDVE9SSUVTCiBzZXQoV2ViS2l0 X1NZU1RFTV9JTkNMVURFX0RJUkVDVE9SSUVTICIiKQogCiBzZXQoV2ViS2l0X0xJQlJBUklFUwot ICAgIEphdmFTY3JpcHRDb3JlCi0gICAgV1RGCi0gICAgV2ViQ29yZQorICAgIFBSSVZBVEUgSmF2 YVNjcmlwdENvcmUKKyAgICBQUklWQVRFIFdURgorICAgIFBSSVZBVEUgV2ViQ29yZQogKQogCiBX RUJLSVRfSU5DTFVERV9DT05GSUdfRklMRVNfSUZfRVhJU1RTKCkKSW5kZXg6IFNvdXJjZS9XZWJL aXQvUGxhdGZvcm1NYWMuY21ha2UKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9QbGF0Zm9y bU1hYy5jbWFrZQkocmV2aXNpb24gMTg3Njk4KQorKysgU291cmNlL1dlYktpdC9QbGF0Zm9ybU1h Yy5jbWFrZQkod29ya2luZyBjb3B5KQpAQCAtMjgsMjQgKzI4LDI0IEBAIGVuZGlmICgpCiBsaW5r X2RpcmVjdG9yaWVzKC4uLy4uL1dlYktpdExpYnJhcmllcykKIAogbGlzdChBUFBFTkQgV2ViS2l0 X0xJQlJBUklFUwotICAgICR7QUNDRUxFUkFURV9MSUJSQVJZfQotICAgICR7QVVESU9UT09MQk9Y X0xJQlJBUll9Ci0gICAgJHtBVURJT1VOSVRfTElCUkFSWX0KLSAgICAke0NBUkJPTl9MSUJSQVJZ fQotICAgICR7Q09DT0FfTElCUkFSWX0KLSAgICAke0NPUkVBVURJT19MSUJSQVJZfQotICAgICR7 RElTS0FSQklUUkFUSU9OX0xJQlJBUll9Ci0gICAgJHtJT0tJVF9MSUJSQVJZfQotICAgICR7SU9T VVJGQUNFX0xJQlJBUll9Ci0gICAgJHtPUEVOR0xfTElCUkFSWX0KLSAgICAke1BERktJVF9GUkFN RVdPUkt9L1BERktpdAotICAgICR7UVVBUlRaX0xJQlJBUll9Ci0gICAgJHtRVUFSVFpDT1JFX0xJ QlJBUll9Ci0gICAgJHtTRUNVUklUWV9MSUJSQVJZfQotICAgICR7U1FMSVRFM19MSUJSQVJZfQot ICAgICR7V0VCS0lUU1lTVEVNSU5URVJGQUNFX0xJQlJBUll9Ci0gICAgJHtYTUwyX0xJQlJBUll9 Ci0gICAgJHtaTElCX0xJQlJBUklFU30KKyAgICBQUklWQVRFICR7QUNDRUxFUkFURV9MSUJSQVJZ fQorICAgIFBSSVZBVEUgJHtBVURJT1RPT0xCT1hfTElCUkFSWX0KKyAgICBQUklWQVRFICR7QVVE SU9VTklUX0xJQlJBUll9CisgICAgUFJJVkFURSAke0NBUkJPTl9MSUJSQVJZfQorICAgIFBSSVZB VEUgJHtDT0NPQV9MSUJSQVJZfQorICAgIFBSSVZBVEUgJHtDT1JFQVVESU9fTElCUkFSWX0KKyAg ICBQUklWQVRFICR7RElTS0FSQklUUkFUSU9OX0xJQlJBUll9CisgICAgUFJJVkFURSAke0lPS0lU X0xJQlJBUll9CisgICAgUFJJVkFURSAke0lPU1VSRkFDRV9MSUJSQVJZfQorICAgIFBSSVZBVEUg JHtPUEVOR0xfTElCUkFSWX0KKyAgICBQUklWQVRFICR7UERGS0lUX0ZSQU1FV09SS30vUERGS2l0 CisgICAgUFJJVkFURSAke1FVQVJUWl9MSUJSQVJZfQorICAgIFBSSVZBVEUgJHtRVUFSVFpDT1JF X0xJQlJBUll9CisgICAgUFJJVkFURSAke1NFQ1VSSVRZX0xJQlJBUll9CisgICAgUFJJVkFURSAk e1NRTElURTNfTElCUkFSWX0KKyAgICBQUklWQVRFICR7V0VCS0lUU1lTVEVNSU5URVJGQUNFX0xJ QlJBUll9CisgICAgUFJJVkFURSAke1hNTDJfTElCUkFSWX0KKyAgICBQUklWQVRFICR7WkxJQl9M SUJSQVJJRVN9CiApCiAKIGxpc3QoQVBQRU5EIFdlYktpdF9JTkNMVURFX0RJUkVDVE9SSUVTCklu ZGV4OiBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtV2luLmNtYWtlCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvUGxhdGZvcm1XaW4uY21ha2UJKHJldmlzaW9uIDE4NzY5OCkKKysrIFNvdXJjZS9X ZWJLaXQvUGxhdGZvcm1XaW4uY21ha2UJKHdvcmtpbmcgY29weSkKQEAgLTExLDggKzExLDggQEAg aWYgKCR7V1RGX1BMQVRGT1JNX1dJTl9DQUlST30pCiAgICAgICAgIHdpbi9XZWJVUkxBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZVNlbmRlckNVUkwuY3BwCiAgICAgKQogICAgIGxpc3QoQVBQRU5EIFdl YktpdF9MSUJSQVJJRVMKLSAgICAgICAgbGliZWF5MzIubGliCi0gICAgICAgIHNzbGVheTMyLmxp YgorICAgICAgICBQUklWQVRFIGxpYmVheTMyLmxpYgorICAgICAgICBQUklWQVRFIHNzbGVheTMy LmxpYgogICAgICkKIGVsc2UgKCkKICAgICBsaXN0KEFQUEVORCBXZWJLaXRfU09VUkNFU19DbGFz c2VzCkBAIC0yMCw3ICsyMCw3IEBAIGVsc2UgKCkKICAgICAgICAgd2luL1dlYlVSTEF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlU2VuZGVyQ0ZOZXQuY3BwCiAgICAgKQogICAgIGxpc3QoQVBQRU5EIFdl YktpdF9MSUJSQVJJRVMKLSAgICAgICAgV2ViS2l0U3lzdGVtSW50ZXJmYWNlCisgICAgICAgIFBS SVZBVEUgV2ViS2l0U3lzdGVtSW50ZXJmYWNlCiAgICAgKQogZW5kaWYgKCkKIApAQCAtNDA0LDE1 ICs0MDQsMTUgQEAgYWRkX2xpYnJhcnkoV2ViS2l0R1VJRCBTVEFUSUMKIHNldF90YXJnZXRfcHJv cGVydGllcyhXZWJLaXRHVUlEIFBST1BFUlRJRVMgRk9MREVSICJXZWJLaXQiKQogCiBsaXN0KEFQ UEVORCBXZWJLaXRfTElCUkFSSUVTCi0gICAgQ29tY3RsMzIKLSAgICBDb21zdXBwCi0gICAgQ3J5 cHQzMgotICAgIElwaGxwYXBpCi0gICAgUnBjcnQ0Ci0gICAgU2hsd2FwaQotICAgIFVzcDEwCi0g ICAgVmVyc2lvbgotICAgIFdlYktpdEdVSUQKKyAgICBQUklWQVRFIENvbWN0bDMyCisgICAgUFJJ VkFURSBDb21zdXBwCisgICAgUFJJVkFURSBDcnlwdDMyCisgICAgUFJJVkFURSBJcGhscGFwaQor ICAgIFBSSVZBVEUgUnBjcnQ0CisgICAgUFJJVkFURSBTaGx3YXBpCisgICAgUFJJVkFURSBVc3Ax MAorICAgIFBSSVZBVEUgVmVyc2lvbgorICAgIFBSSVZBVEUgV2ViS2l0R1VJRAogKQogCiAjIFdl IG5lZWQgdGhlIHdlYmtpdCBsaWJyYXJpZXMgdG8gY29tZSBiZWZvcmUgdGhlIHN5c3RlbSBkZWZh dWx0IGxpYnJhcmllcyB0byBwcmV2ZW50IHN5bWJvbCBjb25mbGljdHMgd2l0aCB1dWlkLmxpYi4K SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NzY5OCkKKysrIFNvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA3LTMx ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAg R2V0IHJlYWR5IHRvIGJ1aWxkIER1bXBSZW5kZXJUcmVlIHdpdGggQ01ha2UKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzUxOQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0RExMLmNwcDoKKyAg ICAgICAgKHNodXREb3duV2ViS2l0KToKKyAgICAgICAgKGxvYWRSZXNvdXJjZUludG9CdWZmZXIp OiBOZWVkcyB0byBiZSBleHBvcnRlZCBmcm9tIFdlYktpdC5kbGwgZm9yIHRlc3RpbmcuCisKIDIw MTUtMDctMjcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBVc2UgTmluamEgb24gV2luZG93cy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL1dl YktpdERMTC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93aW4vV2ViS2l0RExMLmNw cAkocmV2aXNpb24gMTg3Njk4KQorKysgU291cmNlL1dlYktpdC93aW4vV2ViS2l0RExMLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTU3LDcgKzE1Nyw3IEBAIHZvaWQgc2h1dERvd25XZWJLaXQoKQog fQogCiAvL0ZJWE1FOiBXZSBzaG91bGQgY29uc2lkZXIgbW92aW5nIHRoaXMgdG8gYSBuZXcgZmls ZSBmb3IgY3Jvc3MtcHJvamVjdCBmdW5jdGlvbmFsaXR5Ci1QYXNzUmVmUHRyPFdlYkNvcmU6OlNo YXJlZEJ1ZmZlcj4gbG9hZFJlc291cmNlSW50b0J1ZmZlcihjb25zdCBjaGFyKiBuYW1lKQorV0VC S0lUX0FQSSBQYXNzUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4gbG9hZFJlc291cmNlSW50 b0J1ZmZlcihjb25zdCBjaGFyKiBuYW1lKQogewogICAgIGludCBpZHI7CiAgICAgLy8gdGVtcG9y YXJ5IGhhY2sgdG8gZ2V0IHJlc291cmNlIGlkCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxODc2OTgpCisrKyBUb29scy9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxNS0wNy0zMSAgQWxleCBD aHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIEdldCByZWFk eSB0byBidWlsZCBEdW1wUmVuZGVyVHJlZSB3aXRoIENNYWtlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc1MTkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0NNYWtlTGlzdHMu dHh0OgorICAgICAgICBPbiBXaW5kb3dzLCBEdW1wUmVuZGVyVHJlZSBpcyBhbiBleGVjdXRhYmxl IHRoYXQgbGlua3Mgd2l0aCBhIERMTCBvZiB0aGUgc2FtZSBuYW1lLgorICAgICAgICAqIER1bXBS ZW5kZXJUcmVlL1BsYXRmb3JtV2luLmNtYWtlOgorICAgICAgICBBZGRlZCBtaXNzaW5nIHNvdXJj ZSBmaWxlcyBhbmQgbGlicmFyaWVzLgorCiAyMDE1LTA3LTMxICBDc2FiYSBPc3p0cm9nb27DoWMg IDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0VGTF0gRml4IHBpeG1hbiBidWlsZCBvbiBB Uk0gd2l0aCBHQ0MgNC45LjMKSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL0NNYWtlTGlzdHMu dHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL0NNYWtlTGlzdHMudHh0CShy ZXZpc2lvbiAxODc2OTgpCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS9DTWFrZUxpc3RzLnR4dAko d29ya2luZyBjb3B5KQpAQCAtNSw2ICs1LDcgQEAgc2V0KER1bXBSZW5kZXJUcmVlX1NPVVJDRVMK ICAgICBDeWNsaWNSZWR1bmRhbmN5Q2hlY2suY3BwCiAgICAgRHVtcFJlbmRlclRyZWVDb21tb24u Y3BwCiAgICAgR0NDb250cm9sbGVyLmNwcAorICAgIEphdmFTY3JpcHRUaHJlYWRpbmcuY3BwCiAg ICAgUGl4ZWxEdW1wU3VwcG9ydC5jcHAKICAgICBUZXN0UnVubmVyLmNwcAogICAgIFdvcmtRdWV1 ZS5jcHAKQEAgLTEzLDcgKzE0LDYgQEAgc2V0KER1bXBSZW5kZXJUcmVlX1NPVVJDRVMKIHNldChE dW1wUmVuZGVyVHJlZV9MSUJSQVJJRVMKICAgICBKYXZhU2NyaXB0Q29yZQogICAgIFdURgotICAg IFdlYkNvcmUKICAgICBXZWJDb3JlVGVzdFN1cHBvcnQKICAgICBXZWJLaXQKICkKQEAgLTc0LDYg Kzc0LDE3IEBAIFdFQktJVF9JTkNMVURFX0NPTkZJR19GSUxFU19JRl9FWElTVFMoKQogCiBpbmNs dWRlX2RpcmVjdG9yaWVzKCR7RHVtcFJlbmRlclRyZWVfSU5DTFVERV9ESVJFQ1RPUklFU30pCiAK LWFkZF9leGVjdXRhYmxlKER1bXBSZW5kZXJUcmVlICR7RHVtcFJlbmRlclRyZWVfU09VUkNFU30p Ci10YXJnZXRfbGlua19saWJyYXJpZXMoRHVtcFJlbmRlclRyZWUgJHtEdW1wUmVuZGVyVHJlZV9M SUJSQVJJRVN9KQoraWYgKFdJTjMyKQorICAgIGFkZF9saWJyYXJ5KER1bXBSZW5kZXJUcmVlTGli IFNIQVJFRCAke0R1bXBSZW5kZXJUcmVlX1NPVVJDRVN9KQorICAgIHNldF90YXJnZXRfcHJvcGVy dGllcyhEdW1wUmVuZGVyVHJlZUxpYiBQUk9QRVJUSUVTIEZPTERFUiAiVG9vbHMiKQorICAgIHNl dF90YXJnZXRfcHJvcGVydGllcyhEdW1wUmVuZGVyVHJlZUxpYiBQUk9QRVJUSUVTIE9VVFBVVF9O QU1FICJEdW1wUmVuZGVyVHJlZSIpCisgICAgdGFyZ2V0X2xpbmtfbGlicmFyaWVzKER1bXBSZW5k ZXJUcmVlTGliICR7RHVtcFJlbmRlclRyZWVfTElCUkFSSUVTfSkKKworICAgIHNldChDTUFLRV9F WEVfTElOS0VSX0ZMQUdTICIke0NNQUtFX0VYRV9MSU5LRVJfRkxBR1N9IC9FTlRSWTp3V2luTWFp bkNSVFN0YXJ0dXAiKQorICAgIGFkZF9leGVjdXRhYmxlKER1bXBSZW5kZXJUcmVlICR7VE9PTFNf RElSfS93aW4vRExMTGF1bmNoZXIvRExMTGF1bmNoZXJNYWluLmNwcCkKKyAgICB0YXJnZXRfbGlu a19saWJyYXJpZXMoRHVtcFJlbmRlclRyZWUgc2hsd2FwaSkKK2Vsc2UgKCkKKyAgICBhZGRfZXhl Y3V0YWJsZShEdW1wUmVuZGVyVHJlZSAke0R1bXBSZW5kZXJUcmVlX1NPVVJDRVN9KQorICAgIHRh cmdldF9saW5rX2xpYnJhcmllcyhEdW1wUmVuZGVyVHJlZSAke0R1bXBSZW5kZXJUcmVlX0xJQlJB UklFU30pCitlbmRpZiAoKQogc2V0X3RhcmdldF9wcm9wZXJ0aWVzKER1bXBSZW5kZXJUcmVlIFBS T1BFUlRJRVMgRk9MREVSICJUb29scyIpCkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS9QbGF0 Zm9ybVdpbi5jbWFrZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS9QbGF0Zm9y bVdpbi5jbWFrZQkocmV2aXNpb24gMTg3Njk4KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvUGxh dGZvcm1XaW4uY21ha2UJKHdvcmtpbmcgY29weSkKQEAgLTUsMTIgKzUsMzQgQEAgbGlzdChBUFBF TkQgRHVtcFJlbmRlclRyZWVfSU5DTFVERV9ESVJFQwogbGlzdChBUFBFTkQgRHVtcFJlbmRlclRy ZWVfU09VUkNFUwogICAgIHdpbi9BY2Nlc3NpYmlsaXR5Q29udHJvbGxlcldpbi5jcHAKICAgICB3 aW4vQWNjZXNzaWJpbGl0eVVJRWxlbWVudFdpbi5jcHAKKyAgICB3aW4vRFJURGF0YU9iamVjdC5j cHAKKyAgICB3aW4vRFJURGVza3RvcE5vdGlmaWNhdGlvblByZXNlbnRlci5jcHAKKyAgICB3aW4v RFJURHJvcFNvdXJjZS5jcHAKKyAgICB3aW4vRHVtcFJlbmRlclRyZWUuY3BwCisgICAgd2luL0Vk aXRpbmdEZWxlZ2F0ZS5jcHAKKyAgICB3aW4vRXZlbnRTZW5kZXIuY3BwCisgICAgd2luL0ZyYW1l TG9hZERlbGVnYXRlLmNwcAogICAgIHdpbi9HQ0NvbnRyb2xsZXJXaW4uY3BwCisgICAgd2luL0hp c3RvcnlEZWxlZ2F0ZS5jcHAKKyAgICB3aW4vTUQ1LmNwcAogICAgIHdpbi9QaXhlbER1bXBTdXBw b3J0V2luLmNwcAorICAgIHdpbi9Qb2xpY3lEZWxlZ2F0ZS5jcHAKKyAgICB3aW4vUmVzb3VyY2VM b2FkRGVsZWdhdGUuY3BwCiAgICAgd2luL1Rlc3RSdW5uZXJXaW4uY3BwCisgICAgd2luL1RleHRJ bnB1dENvbnRyb2xsZXIuY3BwCisgICAgd2luL1RleHRJbnB1dENvbnRyb2xsZXJXaW4uY3BwCisg ICAgd2luL1VJRGVsZWdhdGUuY3BwCiAgICAgd2luL1dvcmtRdWV1ZUl0ZW1XaW4uY3BwCiApCiAK K2xpc3QoQVBQRU5EIER1bXBSZW5kZXJUcmVlX0xJQlJBUklFUworICAgIENvbXN1cHB3CisgICAg T2xlYWNjCisgICAgV2ViS2l0R1VJRAorKQorCithZGRfZGVmaW5pdGlvbnMoLURfVU5JQ09ERSkK KwogaWYgKCR7V1RGX1BMQVRGT1JNX1dJTl9DQUlST30pCiAgICAgbGlzdChBUFBFTkQgRHVtcFJl bmRlclRyZWVfSU5DTFVERV9ESVJFQ1RPUklFUwogICAgICAgICBjYWlybwpAQCAtMjAsMyArNDIs NSBAQCBpZiAoJHtXVEZfUExBVEZPUk1fV0lOX0NBSVJPfSkKICAgICAgICAgY2Fpcm8vUGl4ZWxE dW1wU3VwcG9ydENhaXJvLmNwcAogICAgICkKIGVuZGlmICgpCisKK0FERF9QUkVDT01QSUxFRF9I RUFERVIoIkR1bXBSZW5kZXJUcmVlUHJlZml4LmgiICJ3aW4vRHVtcFJlbmRlclRyZWVQcmVmaXgu Y3BwIiBEdW1wUmVuZGVyVHJlZV9TT1VSQ0VTKQo= 258308 2015-08-05 15:34:12 -0700 2015-08-05 15:54:42 -0700 Patch bug-147519-20150805153403.patch text/plain 10584 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4Nzk5MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE1LTA4LTA1ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQnVpbGQgRHVt cFJlbmRlclRyZWUgd2l0aCBDTWFrZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NzUxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAgICAgIFdlYkNvcmVUZXN0U3Vw cG9ydCBpcyBhIHN0YXRpYyBsaWJyYXJ5IGFuZCBzaG91bGQgbm90IGJlIGxpbmtlZCB3aXRoIFdl YkNvcmUuCisKIDIwMTUtMDgtMDUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBGaXggYnVpbGQuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3Rz LnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dAkocmV2aXNp b24gMTg3OTkxKQorKysgU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQJKHdvcmtpbmcgY29w eSkKQEAgLTMyOTQsNyArMzI5NCw2IEBAIHNldChXZWJDb3JlVGVzdFN1cHBvcnRfU09VUkNFUwog c2V0KFdlYkNvcmVUZXN0U3VwcG9ydF9MSUJSQVJJRVMKICAgICBKYXZhU2NyaXB0Q29yZQogICAg IFdURgotICAgIFdlYkNvcmUKICkKIAogIyBNb2R1bGVzIHRoYXQgdGhlIGJpbmRpbmdzIGdlbmVy YXRvciBzY3JpcHRzIG1heSB1c2UKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxODc5OTIpCisrKyBT b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisy MDE1LTA4LTA1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisK KyAgICAgICAgQnVpbGQgRHVtcFJlbmRlclRyZWUgd2l0aCBDTWFrZS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzUxOQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAg ICAgICogUGxhdGZvcm1NYWMuY21ha2U6CisgICAgICAgICogUGxhdGZvcm1XaW4uY21ha2U6Cisg ICAgICAgIE1ha2UgdGhlIGxpYnJhcmllcyBXZWJLaXQgbGlua3Mgd2l0aCBwcml2YXRlLCB3aGlj aCBtZWFucyB0aGF0IENNYWtlIHdpbGwgbm90IG1ha2UgZXZlcnl0aGluZworICAgICAgICB0aGF0 IGxpbmtzIHdpdGggV2ViS2l0IGxpbmsgd2l0aCBldmVyeXRoaW5nIFdlYktpdCBsaW5rcyB3aXRo LgorCiAyMDE1LTA4LTA0ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAg ICAgUmVuYW1lIE11dGV4IHRvIERlcHJlY2F0ZWRNdXRleApJbmRleDogU291cmNlL1dlYktpdC9D TWFrZUxpc3RzLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NNYWtlTGlzdHMudHh0 CShyZXZpc2lvbiAxODc5OTEpCisrKyBTb3VyY2UvV2ViS2l0L0NNYWtlTGlzdHMudHh0CSh3b3Jr aW5nIGNvcHkpCkBAIC0xNyw5ICsxNyw5IEBAIHNldChXZWJLaXRfSU5DTFVERV9ESVJFQ1RPUklF Uwogc2V0KFdlYktpdF9TWVNURU1fSU5DTFVERV9ESVJFQ1RPUklFUyAiIikKIAogc2V0KFdlYktp dF9MSUJSQVJJRVMKLSAgICBKYXZhU2NyaXB0Q29yZQotICAgIFdURgotICAgIFdlYkNvcmUKKyAg ICBQUklWQVRFIEphdmFTY3JpcHRDb3JlCisgICAgUFJJVkFURSBXVEYKKyAgICBQUklWQVRFIFdl YkNvcmUKICkKIAogV0VCS0lUX0lOQ0xVREVfQ09ORklHX0ZJTEVTX0lGX0VYSVNUUygpCkluZGV4 OiBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtTWFjLmNtYWtlCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvUGxhdGZvcm1NYWMuY21ha2UJKHJldmlzaW9uIDE4Nzk5MSkKKysrIFNvdXJjZS9XZWJL aXQvUGxhdGZvcm1NYWMuY21ha2UJKHdvcmtpbmcgY29weSkKQEAgLTI4LDI0ICsyOCwyNCBAQCBl bmRpZiAoKQogbGlua19kaXJlY3RvcmllcyguLi8uLi9XZWJLaXRMaWJyYXJpZXMpCiAKIGxpc3Qo QVBQRU5EIFdlYktpdF9MSUJSQVJJRVMKLSAgICAke0FDQ0VMRVJBVEVfTElCUkFSWX0KLSAgICAk e0FVRElPVE9PTEJPWF9MSUJSQVJZfQotICAgICR7QVVESU9VTklUX0xJQlJBUll9Ci0gICAgJHtD QVJCT05fTElCUkFSWX0KLSAgICAke0NPQ09BX0xJQlJBUll9Ci0gICAgJHtDT1JFQVVESU9fTElC UkFSWX0KLSAgICAke0RJU0tBUkJJVFJBVElPTl9MSUJSQVJZfQotICAgICR7SU9LSVRfTElCUkFS WX0KLSAgICAke0lPU1VSRkFDRV9MSUJSQVJZfQotICAgICR7T1BFTkdMX0xJQlJBUll9Ci0gICAg JHtQREZLSVRfRlJBTUVXT1JLfS9QREZLaXQKLSAgICAke1FVQVJUWl9MSUJSQVJZfQotICAgICR7 UVVBUlRaQ09SRV9MSUJSQVJZfQotICAgICR7U0VDVVJJVFlfTElCUkFSWX0KLSAgICAke1NRTElU RTNfTElCUkFSWX0KLSAgICAke1dFQktJVFNZU1RFTUlOVEVSRkFDRV9MSUJSQVJZfQotICAgICR7 WE1MMl9MSUJSQVJZfQotICAgICR7WkxJQl9MSUJSQVJJRVN9CisgICAgUFJJVkFURSAke0FDQ0VM RVJBVEVfTElCUkFSWX0KKyAgICBQUklWQVRFICR7QVVESU9UT09MQk9YX0xJQlJBUll9CisgICAg UFJJVkFURSAke0FVRElPVU5JVF9MSUJSQVJZfQorICAgIFBSSVZBVEUgJHtDQVJCT05fTElCUkFS WX0KKyAgICBQUklWQVRFICR7Q09DT0FfTElCUkFSWX0KKyAgICBQUklWQVRFICR7Q09SRUFVRElP X0xJQlJBUll9CisgICAgUFJJVkFURSAke0RJU0tBUkJJVFJBVElPTl9MSUJSQVJZfQorICAgIFBS SVZBVEUgJHtJT0tJVF9MSUJSQVJZfQorICAgIFBSSVZBVEUgJHtJT1NVUkZBQ0VfTElCUkFSWX0K KyAgICBQUklWQVRFICR7T1BFTkdMX0xJQlJBUll9CisgICAgUFJJVkFURSAke1BERktJVF9GUkFN RVdPUkt9L1BERktpdAorICAgIFBSSVZBVEUgJHtRVUFSVFpfTElCUkFSWX0KKyAgICBQUklWQVRF ICR7UVVBUlRaQ09SRV9MSUJSQVJZfQorICAgIFBSSVZBVEUgJHtTRUNVUklUWV9MSUJSQVJZfQor ICAgIFBSSVZBVEUgJHtTUUxJVEUzX0xJQlJBUll9CisgICAgUFJJVkFURSAke1dFQktJVFNZU1RF TUlOVEVSRkFDRV9MSUJSQVJZfQorICAgIFBSSVZBVEUgJHtYTUwyX0xJQlJBUll9CisgICAgUFJJ VkFURSAke1pMSUJfTElCUkFSSUVTfQogKQogCiBsaXN0KEFQUEVORCBXZWJLaXRfSU5DTFVERV9E SVJFQ1RPUklFUwpJbmRleDogU291cmNlL1dlYktpdC9QbGF0Zm9ybVdpbi5jbWFrZQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtV2luLmNtYWtlCShyZXZpc2lvbiAxODc5OTEp CisrKyBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtV2luLmNtYWtlCSh3b3JraW5nIGNvcHkpCkBAIC0x MSw4ICsxMSw4IEBAIGlmICgke1dURl9QTEFURk9STV9XSU5fQ0FJUk99KQogICAgICAgICB3aW4v V2ViVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2VTZW5kZXJDVVJMLmNwcAogICAgICkKICAgICBs aXN0KEFQUEVORCBXZWJLaXRfTElCUkFSSUVTCi0gICAgICAgIGxpYmVheTMyLmxpYgotICAgICAg ICBzc2xlYXkzMi5saWIKKyAgICAgICAgUFJJVkFURSBsaWJlYXkzMi5saWIKKyAgICAgICAgUFJJ VkFURSBzc2xlYXkzMi5saWIKICAgICApCiBlbHNlICgpCiAgICAgbGlzdChBUFBFTkQgV2ViS2l0 X1NPVVJDRVNfQ2xhc3NlcwpAQCAtMjAsNyArMjAsNyBAQCBlbHNlICgpCiAgICAgICAgIHdpbi9X ZWJVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZVNlbmRlckNGTmV0LmNwcAogICAgICkKICAgICBs aXN0KEFQUEVORCBXZWJLaXRfTElCUkFSSUVTCi0gICAgICAgIFdlYktpdFN5c3RlbUludGVyZmFj ZQorICAgICAgICBQUklWQVRFIFdlYktpdFN5c3RlbUludGVyZmFjZQogICAgICkKIGVuZGlmICgp CiAKQEAgLTQxNywxNSArNDE3LDE1IEBAIGFkZF9saWJyYXJ5KFdlYktpdEdVSUQgU1RBVElDCiBz ZXRfdGFyZ2V0X3Byb3BlcnRpZXMoV2ViS2l0R1VJRCBQUk9QRVJUSUVTIEZPTERFUiAiV2ViS2l0 IikKIAogbGlzdChBUFBFTkQgV2ViS2l0X0xJQlJBUklFUwotICAgIENvbWN0bDMyCi0gICAgQ29t c3VwcAotICAgIENyeXB0MzIKLSAgICBJcGhscGFwaQotICAgIFJwY3J0NAotICAgIFNobHdhcGkK LSAgICBVc3AxMAotICAgIFZlcnNpb24KLSAgICBXZWJLaXRHVUlECisgICAgUFJJVkFURSBDb21j dGwzMgorICAgIFBSSVZBVEUgQ29tc3VwcAorICAgIFBSSVZBVEUgQ3J5cHQzMgorICAgIFBSSVZB VEUgSXBobHBhcGkKKyAgICBQUklWQVRFIFJwY3J0NAorICAgIFBSSVZBVEUgU2hsd2FwaQorICAg IFBSSVZBVEUgVXNwMTAKKyAgICBQUklWQVRFIFZlcnNpb24KKyAgICBQUklWQVRFIFdlYktpdEdV SUQKICkKIAogaWYgKEVOQUJMRV9HUkFQSElDU19DT05URVhUXzNEKQpJbmRleDogU291cmNlL1dl YktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL0NoYW5n ZUxvZwkocmV2aXNpb24gMTg3OTkyKQorKysgU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTUtMDgtMDUgIEFsZXggQ2hyaXN0ZW5z ZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBCdWlsZCBEdW1wUmVuZGVy VHJlZSB3aXRoIENNYWtlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQ3NTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgSW5jbHVkZSBKU1NjcmlwdFByb2ZpbGUu aCB0byBleHBvcnQgdG9KUyhFeGVjU3RhdGUqLCBKU0RvbUdsb2JhbE9iamVjdCosIEpTQzo6UHJv ZmlsZSopIGZyb20gV2ViS2l0LmRsbC4KKwogMjAxNS0wOC0wNSAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggV2luZG93cyBidWlsZC4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L3dpbi9XZWJWaWV3LmgJKHJldmlzaW9uIDE4Nzk5MSkKKysrIFNvdXJjZS9XZWJLaXQvd2luL1dl YlZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtMzYsNiArMzYsNyBAQAogI2luY2x1ZGUgPFdlYkNv cmUvR3JhcGhpY3NMYXllci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NMYXllckNsaWVu dC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSW50UmVjdC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvSlNT Y3JpcHRQcm9maWxlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TaGFyZWRHRElPYmplY3QuaD4KICNp bmNsdWRlIDxXZWJDb3JlL1N1c3BlbmRhYmxlVGltZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1dp bmRvd01lc3NhZ2VMaXN0ZW5lci5oPgpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTg3OTkyKQorKysgVG9vbHMvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTUtMDgtMDUgIEFsZXggQ2hyaXN0 ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBCdWlsZCBEdW1wUmVu ZGVyVHJlZSB3aXRoIENNYWtlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTQ3NTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBDTWFrZUxpc3RzLnR4dDoKKyAgICAgICAgQnVpbGQgdGhlIER1bXBSZW5k ZXJUcmVlIGRpcmVjdG9yeSBub3cgdGhhdCBpdCBidWlsZHMgc3VjY2Vzc2Z1bGx5LgorICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL0NNYWtlTGlzdHMudHh0OgorICAgICAgICBBZGRlZCBtaXNzaW5n IHNvdXJjZSBmaWxlIGFuZCBkb24ndCBsaW5rIHdpdGggV2ViQ29yZS5saWIuCisgICAgICAgICog RHVtcFJlbmRlclRyZWUvUGxhdGZvcm1XaW4uY21ha2U6CisgICAgICAgIEFkZGVkIHNvdXJjZXMg dG8gRHVtcFJlbmRlclRyZWVMaWIgYW5kIG1hZGUgRHVtcFJlbmRlclRyZWUgb25seSBidWlsZCBE TExMYXVuY2hlck1haW4uY3BwLiAKKyAgICAgICAgKiBXaW5MYXVuY2hlci9DTWFrZUxpc3RzLnR4 dDoKKyAgICAgICAgV2UgbmVlZCBsaWJjbXQgbm93IHRoYXQgd2UgYXJlIG5vdCBsaW5raW5nIHdp dGggV2ViQ29yZS5saWIuCisKIDIwMTUtMDgtMDUgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBh cHBsZS5jb20+CiAKICAgICAgICAgQXBwU2NhbGU6IFVzZSBodHRwcyBVUkxzIGZvciBzdWJyZXNv dXJjZXMgYW5kIGxpbmtzCkluZGV4OiBUb29scy9DTWFrZUxpc3RzLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9DTWFrZUxpc3RzLnR4dAkocmV2aXNpb24gMTg3OTkxKQorKysgVG9vbHMvQ01ha2VM aXN0cy50eHQJKHdvcmtpbmcgY29weSkKQEAgLTI4LDcgKzI4LDcgQEAgZWxzZWlmICgiJHtQT1JU fSIgU1RSRVFVQUwgIkdUSyIpCiBlbmRpZiAoKQogCiBpZiAoV0lOMzIpCi0gICAgIyBGSVhNRTog R2V0IER1bXBSZW5kZXJUcmVlIHdvcmtpbmcgd2l0aCBDTWFrZS4KKyAgICBhZGRfc3ViZGlyZWN0 b3J5KER1bXBSZW5kZXJUcmVlKQogICAgIGFkZF9zdWJkaXJlY3RvcnkoV2luTGF1bmNoZXIpCiBl bmRpZiAoKQogCkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS9DTWFrZUxpc3RzLnR4dAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS9DTWFrZUxpc3RzLnR4dAkocmV2aXNpb24g MTg3OTkxKQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvQ01ha2VMaXN0cy50eHQJKHdvcmtpbmcg Y29weSkKQEAgLTUsNiArNSw3IEBAIHNldChEdW1wUmVuZGVyVHJlZV9TT1VSQ0VTCiAgICAgQ3lj bGljUmVkdW5kYW5jeUNoZWNrLmNwcAogICAgIER1bXBSZW5kZXJUcmVlQ29tbW9uLmNwcAogICAg IEdDQ29udHJvbGxlci5jcHAKKyAgICBKYXZhU2NyaXB0VGhyZWFkaW5nLmNwcAogICAgIFBpeGVs RHVtcFN1cHBvcnQuY3BwCiAgICAgVGVzdFJ1bm5lci5jcHAKICAgICBXb3JrUXVldWUuY3BwCkBA IC0xMyw3ICsxNCw2IEBAIHNldChEdW1wUmVuZGVyVHJlZV9TT1VSQ0VTCiBzZXQoRHVtcFJlbmRl clRyZWVfTElCUkFSSUVTCiAgICAgSmF2YVNjcmlwdENvcmUKICAgICBXVEYKLSAgICBXZWJDb3Jl CiAgICAgV2ViQ29yZVRlc3RTdXBwb3J0CiAgICAgV2ViS2l0CiApCkluZGV4OiBUb29scy9EdW1w UmVuZGVyVHJlZS9QbGF0Zm9ybVdpbi5jbWFrZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVu ZGVyVHJlZS9QbGF0Zm9ybVdpbi5jbWFrZQkocmV2aXNpb24gMTg3OTkxKQorKysgVG9vbHMvRHVt cFJlbmRlclRyZWUvUGxhdGZvcm1XaW4uY21ha2UJKHdvcmtpbmcgY29weSkKQEAgLTEsMjIgKzEs NjQgQEAKLWxpc3QoQVBQRU5EIER1bXBSZW5kZXJUcmVlX0lOQ0xVREVfRElSRUNUT1JJRVMKLSAg ICB3aW4KLSkKLQotbGlzdChBUFBFTkQgRHVtcFJlbmRlclRyZWVfU09VUkNFUworc2V0KER1bXBS ZW5kZXJUcmVlTGliX1NPVVJDRVMKKyAgICAke0R1bXBSZW5kZXJUcmVlX1NPVVJDRVN9CiAgICAg d2luL0FjY2Vzc2liaWxpdHlDb250cm9sbGVyV2luLmNwcAogICAgIHdpbi9BY2Nlc3NpYmlsaXR5 VUlFbGVtZW50V2luLmNwcAorICAgIHdpbi9EUlREYXRhT2JqZWN0LmNwcAorICAgIHdpbi9EUlRE ZXNrdG9wTm90aWZpY2F0aW9uUHJlc2VudGVyLmNwcAorICAgIHdpbi9EUlREcm9wU291cmNlLmNw cAorICAgIHdpbi9EdW1wUmVuZGVyVHJlZS5jcHAKKyAgICB3aW4vRWRpdGluZ0RlbGVnYXRlLmNw cAorICAgIHdpbi9FdmVudFNlbmRlci5jcHAKKyAgICB3aW4vRnJhbWVMb2FkRGVsZWdhdGUuY3Bw CiAgICAgd2luL0dDQ29udHJvbGxlcldpbi5jcHAKKyAgICB3aW4vSGlzdG9yeURlbGVnYXRlLmNw cAorICAgIHdpbi9NRDUuY3BwCiAgICAgd2luL1BpeGVsRHVtcFN1cHBvcnRXaW4uY3BwCisgICAg d2luL1BvbGljeURlbGVnYXRlLmNwcAorICAgIHdpbi9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5jcHAK ICAgICB3aW4vVGVzdFJ1bm5lcldpbi5jcHAKKyAgICB3aW4vVGV4dElucHV0Q29udHJvbGxlci5j cHAKKyAgICB3aW4vVGV4dElucHV0Q29udHJvbGxlcldpbi5jcHAKKyAgICB3aW4vVUlEZWxlZ2F0 ZS5jcHAKICAgICB3aW4vV29ya1F1ZXVlSXRlbVdpbi5jcHAKICkKIAorc2V0KER1bXBSZW5kZXJU cmVlX1NPVVJDRVMKKyAgICAke1RPT0xTX0RJUn0vd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVy TWFpbi5jcHAKKykKKworbGlzdChBUFBFTkQgRHVtcFJlbmRlclRyZWVfSU5DTFVERV9ESVJFQ1RP UklFUworICAgIHdpbgorKQorCitsaXN0KEFQUEVORCBEdW1wUmVuZGVyVHJlZV9MSUJSQVJJRVMK KyAgICBzaGx3YXBpCispCisKK3NldChEdW1wUmVuZGVyVHJlZUxpYl9MSUJSQVJJRVMKKyAgICAk e0R1bXBSZW5kZXJUcmVlX0xJQlJBUklFU30KKyAgICBDb21zdXBwdworICAgIE9sZWFjYworICAg IFdlYktpdEdVSUQKKykKKwogaWYgKCR7V1RGX1BMQVRGT1JNX1dJTl9DQUlST30pCiAgICAgbGlz dChBUFBFTkQgRHVtcFJlbmRlclRyZWVfSU5DTFVERV9ESVJFQ1RPUklFUwogICAgICAgICBjYWly bwogICAgICAgICAiJEVOVntXRUJLSVRfTElCUkFSSUVTfS9pbmNsdWRlL2NhaXJvIgogICAgICkK LSAgICBsaXN0KEFQUEVORCBEdW1wUmVuZGVyVHJlZV9TT1VSQ0VTCisgICAgbGlzdChBUFBFTkQg RHVtcFJlbmRlclRyZWVMaWJfU09VUkNFUwogICAgICAgICBjYWlyby9QaXhlbER1bXBTdXBwb3J0 Q2Fpcm8uY3BwCiAgICAgKQogZW5kaWYgKCkKKworQUREX1BSRUNPTVBJTEVEX0hFQURFUigiRHVt cFJlbmRlclRyZWVQcmVmaXguaCIgIndpbi9EdW1wUmVuZGVyVHJlZVByZWZpeC5jcHAiIER1bXBS ZW5kZXJUcmVlTGliX1NPVVJDRVMpCisKK2FkZF9saWJyYXJ5KER1bXBSZW5kZXJUcmVlTGliIFNI QVJFRCAke0R1bXBSZW5kZXJUcmVlTGliX1NPVVJDRVN9KQorc2V0X3RhcmdldF9wcm9wZXJ0aWVz KER1bXBSZW5kZXJUcmVlTGliIFBST1BFUlRJRVMgRk9MREVSICJUb29scyIpCitzZXRfdGFyZ2V0 X3Byb3BlcnRpZXMoRHVtcFJlbmRlclRyZWVMaWIgUFJPUEVSVElFUyBPVVRQVVRfTkFNRSAiRHVt cFJlbmRlclRyZWUiKQordGFyZ2V0X2xpbmtfbGlicmFyaWVzKER1bXBSZW5kZXJUcmVlTGliICR7 RHVtcFJlbmRlclRyZWVMaWJfTElCUkFSSUVTfSkKKworc2V0KENNQUtFX0VYRV9MSU5LRVJfRkxB R1MgIiR7Q01BS0VfRVhFX0xJTktFUl9GTEFHU30gL0VOVFJZOndXaW5NYWluQ1JUU3RhcnR1cCIp CisKK2FkZF9kZWZpbml0aW9ucygtRF9VTklDT0RFKQorCkluZGV4OiBUb29scy9XaW5MYXVuY2hl ci9DTWFrZUxpc3RzLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XaW5MYXVuY2hlci9DTWFrZUxp c3RzLnR4dAkocmV2aXNpb24gMTg3OTkxKQorKysgVG9vbHMvV2luTGF1bmNoZXIvQ01ha2VMaXN0 cy50eHQJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDcgKzQ1LDYgQEAgZWxzZSAoKQogICAgICkKIGVu ZGlmICgpCiAKLXNldChDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTICIke0NNQUtFX1NIQVJFRF9M SU5LRVJfRkxBR1N9IC9OT0RFRkFVTFRMSUI6TElCQ01UIikKIHNldChDTUFLRV9FWEVfTElOS0VS X0ZMQUdTICIke0NNQUtFX0VYRV9MSU5LRVJfRkxBR1N9IC9FTlRSWTp3V2luTWFpbkNSVFN0YXJ0 dXAiKQogCiBpZiAoJHtXVEZfUExBVEZPUk1fV0lOX0NBSVJPfSkK