198984 2019-06-18 17:02:46 -0700 Relocate some test tools in non-mac builds 2019-06-19 17:14:22 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin aestes ap commit-queue mitz thorton webkit-bug-importer oldest_to_newest 1545895 0 krollin 2019-06-18 17:02:46 -0700 The tools DumpRenderTree, WebKitTestRunner, LayoutTestHelper, and TestNetscapePlugin get created in WebKit.framework/Versions/A/Resources on non-mac builds. This is incorrect, as those bundles are shallow bundles that don't use the Versions hierarchy. Instead, store these files directly in WebKit.framework. (Note that getting rid of just the "Versions/A" path components and putting the files in WebKit.framework/Resources doesn't work as `codesign` treats this as an invalid layout.) 1545896 1 webkit-bug-importer 2019-06-18 17:03:01 -0700 <rdar://problem/51873261> 1545900 2 372408 krollin 2019-06-18 17:07:32 -0700 Created attachment 372408 Patch 1545908 3 372408 aestes 2019-06-18 17:30:36 -0700 Comment on attachment 372408 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372408&action=review > Tools/DumpRenderTree/mac/Configurations/Base.xcconfig:116 > +WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework; > +WEBKIT_FRAMEWORK_RESOURCES_PATH[sdk=macosx*] = WebKit.framework/Versions/A/Resources; I see some other places in WebKit that use the value of $(SHALLOW_BUNDLE) rather than checking for specific SDKs. Can we do that here too? 1545911 4 krollin 2019-06-18 17:37:05 -0700 Not really. I tried that. The value of $(SHALLOW_BUNDLE) bundle that we'd want would be that used by the WebKit.framework build. That's not available when building WebKitTestRunner, et al. And, it turns out $(SHALLOW_BUNDLE) can be set to NO for some of these projects, which are strict executables and not bundles themselves. 1545915 5 372408 aestes 2019-06-18 17:57:19 -0700 Comment on attachment 372408 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372408&action=review > Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:-1389 > - WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework/Versions/A/Resources; It'd be nice to also move INSTALL_PATH from the pbxproj to an .xcconfig file. WEBKIT_FRAMEWORK_RESOURCES_PATH's effect is a little mysterious otherwise (at least it was to me while reviewing). 1545999 6 ap 2019-06-19 00:59:39 -0700 IIRC the location was chosen for Mac as one that didn't make code signing get unhappy about unexpected or missing binaries. Not sure if this is still relevant as we tend to re-sign a lot more eagerly, but anyway - how did you test this? 1546163 7 krollin 2019-06-19 11:57:49 -0700 > how did you test this? I ran it through spade to create a temporary-install. I modified spade to allow me to specify local roots. See Safari pull request 7255. This is how I found out about codesign complaining about my trying to use a Resources directory. 1546253 8 372495 krollin 2019-06-19 15:16:16 -0700 Created attachment 372495 Patch 1546304 9 372495 commit-queue 2019-06-19 17:14:20 -0700 Comment on attachment 372495 Patch Clearing flags on attachment: 372495 Committed r246617: <https://trac.webkit.org/changeset/246617> 1546305 10 commit-queue 2019-06-19 17:14:22 -0700 All reviewed patches have been landed. Closing bug. 372408 2019-06-18 17:07:32 -0700 2019-06-19 15:16:15 -0700 Patch bug-198984-20190618170731.patch text/plain 3562 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZThjYTc5ZjdjMzc5OTExYTFkYjQ4OTZiNjdiNzgxM2I4 YTM2ODIyMi4uODUzNzE2YWExY2U2OGI4ODk3NmI4YjEzZDNmM2UyZDZhYjEwZTlhMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDE5LTA2LTE4ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAg ICAgICBSZWxvY2F0ZSBzb21lIHRlc3QgdG9vbHMgaW4gbm9uLW1hYyBidWlsZHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODk4NAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNTE4NzMyNjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhlIHRvb2xzIER1bXBSZW5kZXJUcmVlLCBXZWJLaXRUZXN0UnVu bmVyLCBMYXlvdXRUZXN0SGVscGVyLCBhbmQKKyAgICAgICAgVGVzdE5ldHNjYXBlUGx1Z2luIGdl dCBjcmVhdGVkIGluCisgICAgICAgIFdlYktpdC5mcmFtZXdvcmsvVmVyc2lvbnMvQS9SZXNvdXJj ZXMgb24gbm9uLW1hYyBidWlsZHMuIFRoaXMgaXMKKyAgICAgICAgaW5jb3JyZWN0LCBhcyB0aG9z ZSBidW5kbGVzIGFyZSBzaGFsbG93IGJ1bmRsZXMgdGhhdCBkb24ndCB1c2UgdGhlCisgICAgICAg IFZlcnNpb25zIGhpZXJhcmNoeS4gSW5zdGVhZCwgc3RvcmUgdGhlc2UgZmlsZXMgZGlyZWN0bHkg aW4KKyAgICAgICAgV2ViS2l0LmZyYW1ld29yay4KKworICAgICAgICBOb3RlIHRoYXQgZ2V0dGlu ZyByaWQgb2YganVzdCB0aGUgIlZlcnNpb25zL0EiIHBhdGggY29tcG9uZW50cyBhbmQKKyAgICAg ICAgcHV0dGluZyB0aGUgZmlsZXMgaW4gV2ViS2l0LmZyYW1ld29yay9SZXNvdXJjZXMgZG9lc24n dCB3b3JrIGFzCisgICAgICAgIGBjb2Rlc2lnbmAgdHJlYXRzIHRoaXMgYXMgYW4gaW52YWxpZCBs YXlvdXQuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9Db25maWd1 cmF0aW9ucy9CYXNlLnhjY29uZmlnOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvQ29uZmln dXJhdGlvbnMvQmFzZVRhcmdldC54Y2NvbmZpZzoKKwogMjAxOS0wNi0xNyAgQWRyaWFuIFBlcmV6 IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtGbGF0cGFrXVtKSEJ1 aWxkXSBVcGRhdGUgYnVpbGQgZW52aXJvbm1lbnRzIHRvIHVzZSBXUEVCYWNrZW5kLWZkbyAxLjMu MQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvaiBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggNDYzYjYwOTkxYmFkYTMzNzU2OWQ4Mjk4 MGIzY2ZkZjQ1Mjg3OTJkMy4uYjljYzRjZjcxZDgwODk1MjNiMTMwNmVhMWI5NzJlYWJhNGEzMGU0 MyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVy VHJlZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0xMzg2LDcgKzEzODYsNiBAQAogCQkJ aXNhID0gWENCdWlsZENvbmZpZ3VyYXRpb247CiAJCQliYXNlQ29uZmlndXJhdGlvblJlZmVyZW5j ZSA9IEJDQjI4MUVFMENGQTcxM0QwMDdFNTMzRSAvKiBCYXNlLnhjY29uZmlnICovOwogCQkJYnVp bGRTZXR0aW5ncyA9IHsKLQkJCQlXRUJLSVRfRlJBTUVXT1JLX1JFU09VUkNFU19QQVRIID0gV2Vi S2l0LmZyYW1ld29yay9WZXJzaW9ucy9BL1Jlc291cmNlczsKIAkJCX07CiAJCQluYW1lID0gUHJv ZHVjdGlvbjsKIAkJfTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9Db25m aWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0NvbmZp Z3VyYXRpb25zL0Jhc2UueGNjb25maWcKaW5kZXggMGViZjFiMDYzYzgxOTg4Zjg0ZjVmYmRhN2E0 NmZiMDNiYmJiMDRlYy4uZjIyYTExZmI4NDExNzljZDRmOTQ1Njc4ZGNjMDJkMThmYmNlNzExMiAx MDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0NvbmZpZ3VyYXRpb25zL0Jhc2Uu eGNjb25maWcKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0NvbmZpZ3VyYXRpb25zL0Jh c2UueGNjb25maWcKQEAgLTExMSwzICsxMTEsNiBAQCBTVVBQT1JURURfUExBVEZPUk1TID0gaXBo b25lb3MgaXBob25lc2ltdWxhdG9yIG1hY29zeCB0dm9zIHR2c2ltdWxhdG9yIHdhdGNob3Mgdwog T1RIRVJfQ0ZMQUdTID0gJChBU0FOX09USEVSX0NGTEFHUyk7CiBPVEhFUl9DUExVU1BMVVNGTEFH UyA9ICQoQVNBTl9PVEhFUl9DUExVU1BMVVNGTEFHUyk7CiBPVEhFUl9MREZMQUdTID0gJChBU0FO X09USEVSX0xERkxBR1MpOworCitXRUJLSVRfRlJBTUVXT1JLX1JFU09VUkNFU19QQVRIID0gV2Vi S2l0LmZyYW1ld29yazsKK1dFQktJVF9GUkFNRVdPUktfUkVTT1VSQ0VTX1BBVEhbc2RrPW1hY29z eCpdID0gV2ViS2l0LmZyYW1ld29yay9WZXJzaW9ucy9BL1Jlc291cmNlczsKZGlmZiAtLWdpdCBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvQ29uZmlndXJhdGlvbnMvQmFzZVRhcmdldC54Y2NvbmZp ZyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvQ29uZmlndXJhdGlvbnMvQmFzZVRhcmdldC54Y2Nv bmZpZwppbmRleCAzYjU4NTM5NzU2MWU0ZmQ5NTJhNWU4M2UwMWM4Yzk3YTUyMGM0YWI2Li44NWU2 MGFlYjVkMTE5YzBjZDkzZTc4NjM2MTFiYzMwZmVlNmFkNDdmIDEwMDY0NAotLS0gYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL0NvbmZpZ3VyYXRpb25zL0Jhc2VUYXJnZXQueGNjb25maWcKKysrIGIv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Db25maWd1cmF0aW9ucy9CYXNlVGFyZ2V0LnhjY29uZmln CkBAIC0yMSw0ICsyMSw3IEBACiAvLyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNF KSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKIC8vIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAogCi1J TlNUQUxMX1BBVEggPSAkKFNZU1RFTV9MSUJSQVJZX0RJUikvRnJhbWV3b3Jrcy9XZWJLaXQuZnJh bWV3b3JrL1ZlcnNpb25zL0EvUmVzb3VyY2VzOworV0VCS0lUX0ZSQU1FV09SS19SRVNPVVJDRVNf UEFUSCA9IFdlYktpdC5mcmFtZXdvcms7CitXRUJLSVRfRlJBTUVXT1JLX1JFU09VUkNFU19QQVRI W3Nkaz1tYWNvc3gqXSA9IFdlYktpdC5mcmFtZXdvcmsvVmVyc2lvbnMvQS9SZXNvdXJjZXM7CisK K0lOU1RBTExfUEFUSCA9ICQoU1lTVEVNX0xJQlJBUllfRElSKS9GcmFtZXdvcmtzLyQoV0VCS0lU X0ZSQU1FV09SS19SRVNPVVJDRVNfUEFUSCk7Cg== 372495 2019-06-19 15:16:16 -0700 2019-06-19 17:14:20 -0700 Patch bug-198984-20190619151616.patch text/plain 8279 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZThjYTc5ZjdjMzc5OTExYTFkYjQ4OTZiNjdiNzgxM2I4 YTM2ODIyMi4uNmM5MDllYTdmNDY3ZDEyYmYyNzNmOWVlNDg3NWNiZGY2NjBkMmUzYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4 IEBACisyMDE5LTA2LTE5ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAg ICAgICBSZWxvY2F0ZSBzb21lIHRlc3QgdG9vbHMgaW4gbm9uLW1hYyBidWlsZHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODk4NAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNTE4NzMyNjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW5keSBFc3Rl cy4KKworICAgICAgICBUaGUgdG9vbHMgRHVtcFJlbmRlclRyZWUsIFdlYktpdFRlc3RSdW5uZXIs IExheW91dFRlc3RIZWxwZXIsIGFuZAorICAgICAgICBUZXN0TmV0c2NhcGVQbHVnaW4gZ2V0IGNy ZWF0ZWQgaW4KKyAgICAgICAgV2ViS2l0LmZyYW1ld29yay9WZXJzaW9ucy9BL1Jlc291cmNlcyBv biBub24tbWFjIGJ1aWxkcy4gVGhpcyBpcworICAgICAgICBpbmNvcnJlY3QsIGFzIHRob3NlIGJ1 bmRsZXMgYXJlIHNoYWxsb3cgYnVuZGxlcyB0aGF0IGRvbid0IHVzZSB0aGUKKyAgICAgICAgVmVy c2lvbnMgaGllcmFyY2h5LiBJbnN0ZWFkLCBzdG9yZSB0aGVzZSBmaWxlcyBkaXJlY3RseSBpbgor ICAgICAgICBXZWJLaXQuZnJhbWV3b3JrLgorCisgICAgICAgIE5vdGUgdGhhdCBnZXR0aW5nIHJp ZCBvZiBqdXN0IHRoZSAiVmVyc2lvbnMvQSIgcGF0aCBjb21wb25lbnRzIGFuZAorICAgICAgICBw dXR0aW5nIHRoZSBmaWxlcyBpbiBXZWJLaXQuZnJhbWV3b3JrL1Jlc291cmNlcyBkb2Vzbid0IHdv cmsgYXMKKyAgICAgICAgYGNvZGVzaWduYCB0cmVhdHMgdGhlIHJlc3VsdCBhcyBhbiBpbnZhbGlk IGxheW91dC4KKworICAgICAgICBUaGUgd29yayBpbiB0aGlzIHBhdGNoIGludm9sdmVzIGNoYW5n aW5nIHRoZSBkZWZpbml0aW9uIG9mIHRoZSBjdXN0b20KKyAgICAgICAgYnVpbGQgdmFyaWFibGUg V0VCS0lUX0ZSQU1FV09SS19SRVNPVVJDRVNfUEFUSC4gVGhlIHN0YW5kYXJkIGJ1aWxkCisgICAg ICAgIHZhcmlhYmxlIElOU1RBTExfUEFUSCBpcyBkZWZpbmVkIGluIHRlcm1zIG9mIHRoaXMgdmFy aWFibGUuIEluIG9yZGVyCisgICAgICAgIHRvIGluY3JlYXNlIHZpc2libGl0eSBpbnRvIHRoaXMg cmVsYXRpb25zaGlwLCBtb3ZlIGJvdGggb2YgdGhlc2UKKyAgICAgICAgdmFyaWFibGVzIGludG8g LnhjY29uZmlnIGZpbGVzIGlmIHRoZXkgd2VyZW4ndCBhbHJlYWR5LiBUaGlzCisgICAgICAgIHJl ZmFjdG9yaW5nIHdhcyBkb25lIGluIGEgd2F5IHRvIGJlIHRoZSBsZWFzdCBkaXNydXB0aXZlIGFu ZCBtb3N0CisgICAgICAgIGNvbXBhdGlibGUgd2l0aCB0aGUgcHJldmlvdXMgZGVmaW5pdGlvbnMs IGV2ZW4gYXQgdGhlIGNvc3Qgb2YgYmVpbmcKKyAgICAgICAgcmVwZXRpdGl2ZS4KKworICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2o6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNj b25maWc6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0NvbmZpZ3VyYXRpb25zL0R1bXBS ZW5kZXJUcmVlLnhjY29uZmlnOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9Db25maWd1 cmF0aW9ucy9MYXlvdXRUZXN0SGVscGVyLnhjY29uZmlnOgorICAgICAgICAqIER1bXBSZW5kZXJU cmVlL21hYy9Db25maWd1cmF0aW9ucy9UZXN0TmV0c2NhcGVQbHVnSW4ueGNjb25maWc6CisgICAg ICAgICogV2ViS2l0VGVzdFJ1bm5lci9Db25maWd1cmF0aW9ucy9CYXNlVGFyZ2V0LnhjY29uZmln OgorCiAyMDE5LTA2LTE3ICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CiAKICAgICAgICAgW0ZsYXRwYWtdW0pIQnVpbGRdIFVwZGF0ZSBidWlsZCBlbnZpcm9ubWVu dHMgdG8gdXNlIFdQRUJhY2tlbmQtZmRvIDEuMy4xCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVu ZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvVG9vbHMv RHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpp bmRleCA0NjNiNjA5OTFiYWRhMzM3NTY5ZDgyOTgwYjNjZmRmNDUyODc5MmQzLi5kMTQwYzM4MmI3 NzYzZWU3YzJiNDQ2YTBjMjIxMzg1YWZjZWI2MDkwIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVu ZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKQEAgLTEzNDksNyArMTM0OSw2IEBACiAJCQlpc2EgPSBYQ0J1aWxkQ29uZmlndXJhdGlvbjsK IAkJCWJhc2VDb25maWd1cmF0aW9uUmVmZXJlbmNlID0gQTExMDNCNUIxODkyNDk4RjAwNzM4Qzg3 IC8qIExheW91dFRlc3RIZWxwZXIueGNjb25maWcgKi87CiAJCQlidWlsZFNldHRpbmdzID0gewot CQkJCUlOU1RBTExfUEFUSCA9ICIkKFNZU1RFTV9MSUJSQVJZX0RJUikvRnJhbWV3b3Jrcy8kKFdF QktJVF9GUkFNRVdPUktfUkVTT1VSQ0VTX1BBVEgpIjsKIAkJCQlQUk9EVUNUX05BTUUgPSBMYXlv dXRUZXN0SGVscGVyOwogCQkJCVNLSVBfSU5TVEFMTCA9IE5POwogCQkJfTsKQEAgLTEzODYsMTQg KzEzODUsMTIgQEAKIAkJCWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9uOwogCQkJYmFzZUNvbmZp Z3VyYXRpb25SZWZlcmVuY2UgPSBCQ0IyODFFRTBDRkE3MTNEMDA3RTUzM0UgLyogQmFzZS54Y2Nv bmZpZyAqLzsKIAkJCWJ1aWxkU2V0dGluZ3MgPSB7Ci0JCQkJV0VCS0lUX0ZSQU1FV09SS19SRVNP VVJDRVNfUEFUSCA9IFdlYktpdC5mcmFtZXdvcmsvVmVyc2lvbnMvQS9SZXNvdXJjZXM7CiAJCQl9 OwogCQkJbmFtZSA9IFByb2R1Y3Rpb247CiAJCX07CiAJCTkwQ0JDMzUxMEY3NDhCMTMwMEE3MTJC NyAvKiBQcm9kdWN0aW9uICovID0gewogCQkJaXNhID0gWENCdWlsZENvbmZpZ3VyYXRpb247CiAJ CQlidWlsZFNldHRpbmdzID0gewotCQkJCUlOU1RBTExfUEFUSCA9ICIkKFNZU1RFTV9MSUJSQVJZ X0RJUikvRnJhbWV3b3Jrcy8kKFdFQktJVF9GUkFNRVdPUktfUkVTT1VSQ0VTX1BBVEgpIjsKIAkJ CQlQUk9EVUNUX05BTUUgPSBBbGw7CiAJCQkJVVNFX0VYUE9SVF9NQUNST1MgPSAwOwogCQkJfTsK QEAgLTE0MDMsNyArMTQwMCw2IEBACiAJCQlpc2EgPSBYQ0J1aWxkQ29uZmlndXJhdGlvbjsKIAkJ CWJhc2VDb25maWd1cmF0aW9uUmVmZXJlbmNlID0gQkNCMjgxRjAwQ0ZBNzEzRDAwN0U1MzNFIC8q IER1bXBSZW5kZXJUcmVlLnhjY29uZmlnICovOwogCQkJYnVpbGRTZXR0aW5ncyA9IHsKLQkJCQlJ TlNUQUxMX1BBVEggPSAiJChTWVNURU1fTElCUkFSWV9ESVIpL0ZyYW1ld29ya3MvJChXRUJLSVRf RlJBTUVXT1JLX1JFU09VUkNFU19QQVRIKSI7CiAJCQl9OwogCQkJbmFtZSA9IFByb2R1Y3Rpb247 CiAJCX07CkBAIC0xNDEyLDcgKzE0MDgsNiBAQAogCQkJYmFzZUNvbmZpZ3VyYXRpb25SZWZlcmVu Y2UgPSBCQ0IyODNERTBDRkE3QzIwMDA3RTUzM0UgLyogVGVzdE5ldHNjYXBlUGx1Z0luLnhjY29u ZmlnICovOwogCQkJYnVpbGRTZXR0aW5ncyA9IHsKIAkJCQlJTkZPUExJU1RfRklMRSA9IFRlc3RO ZXRzY2FwZVBsdWdJbi9tYWMvSW5mby5wbGlzdDsKLQkJCQlJTlNUQUxMX1BBVEggPSAiJChTWVNU RU1fTElCUkFSWV9ESVIpL0ZyYW1ld29ya3MvJChXRUJLSVRfRlJBTUVXT1JLX1JFU09VUkNFU19Q QVRIKSI7CiAJCQkJU0tJUF9JTlNUQUxMID0gTk87CiAJCQl9OwogCQkJbmFtZSA9IFByb2R1Y3Rp b247CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMv QmFzZS54Y2NvbmZpZyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9Db25maWd1cmF0aW9ucy9C YXNlLnhjY29uZmlnCmluZGV4IDBlYmYxYjA2M2M4MTk4OGY4NGY1ZmJkYTdhNDZmYjAzYmJiYjA0 ZWMuLmYyMmExMWZiODQxMTc5Y2Q0Zjk0NTY3OGRjYzAyZDE4ZmJjZTcxMTIgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCisr KyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmln CkBAIC0xMTEsMyArMTExLDYgQEAgU1VQUE9SVEVEX1BMQVRGT1JNUyA9IGlwaG9uZW9zIGlwaG9u ZXNpbXVsYXRvciBtYWNvc3ggdHZvcyB0dnNpbXVsYXRvciB3YXRjaG9zIHcKIE9USEVSX0NGTEFH UyA9ICQoQVNBTl9PVEhFUl9DRkxBR1MpOwogT1RIRVJfQ1BMVVNQTFVTRkxBR1MgPSAkKEFTQU5f T1RIRVJfQ1BMVVNQTFVTRkxBR1MpOwogT1RIRVJfTERGTEFHUyA9ICQoQVNBTl9PVEhFUl9MREZM QUdTKTsKKworV0VCS0lUX0ZSQU1FV09SS19SRVNPVVJDRVNfUEFUSCA9IFdlYktpdC5mcmFtZXdv cms7CitXRUJLSVRfRlJBTUVXT1JLX1JFU09VUkNFU19QQVRIW3Nkaz1tYWNvc3gqXSA9IFdlYktp dC5mcmFtZXdvcmsvVmVyc2lvbnMvQS9SZXNvdXJjZXM7CmRpZmYgLS1naXQgYS9Ub29scy9EdW1w UmVuZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMvRHVtcFJlbmRlclRyZWUueGNjb25maWcgYi9U b29scy9EdW1wUmVuZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMvRHVtcFJlbmRlclRyZWUueGNj b25maWcKaW5kZXggNzExZjc3YzExMGNkMThkNDFhMGFhNTIyZmFhZGM4Yjc0YzFlY2Y0NC4uMjNk MzQzOGZlYWRiNDU0YWM4MjVmNGI1NDQ5OGE1M2UyOGM0ZDcyNCAxMDA2NDQKLS0tIGEvVG9vbHMv RHVtcFJlbmRlclRyZWUvbWFjL0NvbmZpZ3VyYXRpb25zL0R1bXBSZW5kZXJUcmVlLnhjY29uZmln CisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9Db25maWd1cmF0aW9ucy9EdW1wUmVuZGVy VHJlZS54Y2NvbmZpZwpAQCAtMzIsMyArMzIsOSBAQCBQUk9EVUNUX05BTUUgPSBEdW1wUmVuZGVy VHJlZTsKIFNLSVBfSU5TVEFMTFtzZGs9bWFjb3N4Kl0gPSBOTzsKIFNLSVBfSU5TVEFMTFtzZGs9 aXBob25lKl0gPSBZRVM7CiBFWENMVURFRF9TT1VSQ0VfRklMRV9OQU1FU1tzZGs9aXBob25lKl0g PSAqLnR0ZiAqLlRURiAqLm90ZjsKKworSU5TVEFMTF9QQVRIID0gJChJTlNUQUxMX1BBVEhfJChD T05GSUdVUkFUSU9OKSkKK0lOU1RBTExfUEFUSF9SZWxlYXNlID0gJChJTlNUQUxMX1BBVEgpOwor SU5TVEFMTF9QQVRIX0RlYnVnID0gJChJTlNUQUxMX1BBVEgpOworSU5TVEFMTF9QQVRIX1Byb2R1 Y3Rpb24gPSAkKFNZU1RFTV9MSUJSQVJZX0RJUikvRnJhbWV3b3Jrcy8kKFdFQktJVF9GUkFNRVdP UktfUkVTT1VSQ0VTX1BBVEgpOworSU5TVEFMTF9QQVRIX2VuZ2luZWVyaW5nID0gJChJTlNUQUxM X1BBVEgpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0NvbmZpZ3VyYXRp b25zL0xheW91dFRlc3RIZWxwZXIueGNjb25maWcgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMv Q29uZmlndXJhdGlvbnMvTGF5b3V0VGVzdEhlbHBlci54Y2NvbmZpZwppbmRleCBkZTY0NGNjNWNk MTdjMTNhMWU1OTQwM2ZkZmE0YzkzNjljYTc5ZWM2Li42M2M0OTEwMzA0MDI3MjNiMDk3ZDI4MzRh MDYxNjcxODY2ZDVhZGM2IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvQ29u ZmlndXJhdGlvbnMvTGF5b3V0VGVzdEhlbHBlci54Y2NvbmZpZworKysgYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMvTGF5b3V0VGVzdEhlbHBlci54Y2NvbmZpZwpAQCAt MjcsMyArMjcsOSBAQAogCiBPVEhFUl9MREZMQUdTW3Nkaz1tYWNvc3gqXSA9ICQoaW5oZXJpdGVk KSAtZnJhbWV3b3JrIENhcmJvbiAtZnJhbWV3b3JrIENvY29hIC1mcmFtZXdvcmsgT3BlbkdMIC1m cmFtZXdvcmsgSU9LaXQ7CiBTVFJJUF9TVFlMRSA9IGRlYnVnZ2luZzsKKworSU5TVEFMTF9QQVRI ID0gJChJTlNUQUxMX1BBVEhfJChDT05GSUdVUkFUSU9OKSkKK0lOU1RBTExfUEFUSF9SZWxlYXNl ID0gJChJTlNUQUxMX1BBVEgpOworSU5TVEFMTF9QQVRIX0RlYnVnID0gJChJTlNUQUxMX1BBVEgp OworSU5TVEFMTF9QQVRIX1Byb2R1Y3Rpb24gPSAkKFNZU1RFTV9MSUJSQVJZX0RJUikvRnJhbWV3 b3Jrcy8kKFdFQktJVF9GUkFNRVdPUktfUkVTT1VSQ0VTX1BBVEgpOworSU5TVEFMTF9QQVRIX2Vu Z2luZWVyaW5nID0gJChJTlNUQUxMX1BBVEgpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRl clRyZWUvbWFjL0NvbmZpZ3VyYXRpb25zL1Rlc3ROZXRzY2FwZVBsdWdJbi54Y2NvbmZpZyBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL21hYy9Db25maWd1cmF0aW9ucy9UZXN0TmV0c2NhcGVQbHVnSW4u eGNjb25maWcKaW5kZXggODRhODM2NGE2NmYyNDZkZDliOTk4NDkzZTk0NTJjNDE3NDg3MDBiNC4u NjRhYTUzYTk4ODQ1N2UxZmQ3ZjNlYmQ3YTE4ZThkZjJjYWM3NzZkZCAxMDA2NDQKLS0tIGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvbWFjL0NvbmZpZ3VyYXRpb25zL1Rlc3ROZXRzY2FwZVBsdWdJbi54 Y2NvbmZpZworKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMvVGVz dE5ldHNjYXBlUGx1Z0luLnhjY29uZmlnCkBAIC0yNyw3ICsyNywxMiBAQCBQUk9EVUNUX05BTUUg PSBUZXN0TmV0c2NhcGVQbHVnSW4KIFBST0RVQ1RfQlVORExFX0lERU5USUZJRVIgPSBjb20uYXBw bGUudGVzdG5ldHNjYXBlcGx1Z2luCiBXUkFQUEVSX0VYVEVOU0lPTiA9IHBsdWdpbgogSU5GT1BM SVNUX0ZJTEUgPSBUZXN0TmV0c2NhcGVQbHVnSW4uc3VicHJvai9JbmZvLnBsaXN0Ci1JTlNUQUxM X1BBVEggPSAiJChVU0VSX0xJQlJBUllfRElSKS9QbHVnaW5zIgogV0FSTklOR19DRkxBR1MgPSAt V21vc3QgLVduby1mb3VyLWNoYXItY29uc3RhbnRzIC1Xbm8tdW5rbm93bi1wcmFnbWFzCiBMSUJS QVJZX1NUWUxFID0gQlVORExFCiBFWENMVURFRF9TT1VSQ0VfRklMRV9OQU1FU1tzZGs9aXBob25l Kl0gPSAqOworCitJTlNUQUxMX1BBVEggPSAkKElOU1RBTExfUEFUSF8kKENPTkZJR1VSQVRJT04p KQorSU5TVEFMTF9QQVRIX1JlbGVhc2UgPSAkKFVTRVJfTElCUkFSWV9ESVIpL1BsdWdpbnM7CitJ TlNUQUxMX1BBVEhfRGVidWcgPSAkKFVTRVJfTElCUkFSWV9ESVIpL1BsdWdpbnM7CitJTlNUQUxM X1BBVEhfUHJvZHVjdGlvbiA9ICQoU1lTVEVNX0xJQlJBUllfRElSKS9GcmFtZXdvcmtzLyQoV0VC S0lUX0ZSQU1FV09SS19SRVNPVVJDRVNfUEFUSCk7CitJTlNUQUxMX1BBVEhfZW5naW5lZXJpbmcg PSAkKFVTRVJfTElCUkFSWV9ESVIpL1BsdWdpbnM7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL0NvbmZpZ3VyYXRpb25zL0Jhc2VUYXJnZXQueGNjb25maWcgYi9Ub29scy9XZWJL aXRUZXN0UnVubmVyL0NvbmZpZ3VyYXRpb25zL0Jhc2VUYXJnZXQueGNjb25maWcKaW5kZXggM2I1 ODUzOTc1NjFlNGZkOTUyYTVlODNlMDFjOGM5N2E1MjBjNGFiNi4uODVlNjBhZWI1ZDExOWMwY2Q5 M2U3ODYzNjExYmMzMGZlZTZhZDQ3ZiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9Db25maWd1cmF0aW9ucy9CYXNlVGFyZ2V0LnhjY29uZmlnCisrKyBiL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvQ29uZmlndXJhdGlvbnMvQmFzZVRhcmdldC54Y2NvbmZpZwpAQCAtMjEsNCArMjEs NyBAQAogLy8gKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBB TlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAvLyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKIAotSU5TVEFMTF9QQVRIID0g JChTWVNURU1fTElCUkFSWV9ESVIpL0ZyYW1ld29ya3MvV2ViS2l0LmZyYW1ld29yay9WZXJzaW9u cy9BL1Jlc291cmNlczsKK1dFQktJVF9GUkFNRVdPUktfUkVTT1VSQ0VTX1BBVEggPSBXZWJLaXQu ZnJhbWV3b3JrOworV0VCS0lUX0ZSQU1FV09SS19SRVNPVVJDRVNfUEFUSFtzZGs9bWFjb3N4Kl0g PSBXZWJLaXQuZnJhbWV3b3JrL1ZlcnNpb25zL0EvUmVzb3VyY2VzOworCitJTlNUQUxMX1BBVEgg PSAkKFNZU1RFTV9MSUJSQVJZX0RJUikvRnJhbWV3b3Jrcy8kKFdFQktJVF9GUkFNRVdPUktfUkVT T1VSQ0VTX1BBVEgpOwo=