135752 2014-08-08 01:10:05 -0700 [GTK] Do not look for child processes in the UI process binary path 2015-03-11 10:48:15 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 126688 1 cgarcia webkit-unassigned berto commit-queue glenn gustavo svillar oldest_to_newest 1027819 0 cgarcia 2014-08-08 01:10:05 -0700 I think this is only useful for internal tools and tests, but never when installed, since we don't install the processes in the bin dir but in the libexec dir. We already have an env var to cover the cases of the internal tools and tests, so I think it would be better to use that variable only. 1027820 1 236271 cgarcia 2014-08-08 01:13:13 -0700 Created attachment 236271 Patch 1031965 2 gustavo 2014-08-28 05:26:56 -0700 This will mean we need to set WEBKIT_EXEC_PATH for running MiniBrowser directly, right? 1031967 3 cgarcia 2014-08-28 05:41:12 -0700 (In reply to comment #2) > This will mean we need to set WEBKIT_EXEC_PATH for running MiniBrowser directly, right? Yes, that's what the patch does. And I don't like it, because downstream need to patch it to remove that. I think we could pass DEVELOPER_MODE to the compiler and only set the envs for developer builds #ifdef DEVELOPER_MODE g_setenv("WEBKIT_EXEC_PATH", WEBKIT_EXEC_PATH, FALSE); g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE); #endif Or only pass WEBKIT_EXEC_PATH and WEBKIT_INJECTED_BUNDLE_PATH for developer builds and check those directly. 1031968 4 cgarcia 2014-08-28 05:42:20 -0700 (In reply to comment #3) > (In reply to comment #2) > > This will mean we need to set WEBKIT_EXEC_PATH for running MiniBrowser directly, right? > > Yes, that's what the patch does. And I don't like it, because downstream need to patch it to remove that. I think we could pass DEVELOPER_MODE to the compiler and only set the envs for developer builds > > #ifdef DEVELOPER_MODE > g_setenv("WEBKIT_EXEC_PATH", WEBKIT_EXEC_PATH, FALSE); > g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE); > #endif > > Or only pass WEBKIT_EXEC_PATH and WEBKIT_INJECTED_BUNDLE_PATH for developer builds and check those directly. hmm, wait, but Tools (including MB) are not build on non developer builds, or does debian also patch that? Berto? 1031969 5 berto 2014-08-28 05:57:58 -0700 (In reply to comment #4) > hmm, wait, but Tools (including MB) are not build on non developer > builds, or does debian also patch that? Berto? In Debian I'm patching CMakeLists.txt to build the MiniBrowser, the rest of the tools we don't need. I also remove the g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", ...) call from main.c. 1031971 6 cgarcia 2014-08-28 06:13:32 -0700 (In reply to comment #5) > (In reply to comment #4) > > hmm, wait, but Tools (including MB) are not build on non developer > > builds, or does debian also patch that? Berto? > > In Debian I'm patching CMakeLists.txt to build the MiniBrowser, the > rest of the tools we don't need. > > I also remove the g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", ...) call > from main.c. Ok, so you will have to keep patching it anyway, so we either leave it as it is, or build MB unconditionally. MB doesn't use any internal symbol, so it shouldn't be a problem. 1031977 7 berto 2014-08-28 06:44:37 -0700 (In reply to comment #6) > Ok, so you will have to keep patching it anyway Yeah, that's not a problem, it's a trivial patch anyway. The only alternative would be that we want to install MiniBrowser by default upstream, which I don't think it's the case? 1031979 8 cgarcia 2014-08-28 06:50:29 -0700 (In reply to comment #7) > (In reply to comment #6) > > Ok, so you will have to keep patching it anyway > > Yeah, that's not a problem, it's a trivial patch anyway. > > The only alternative would be that we want to install MiniBrowser by > default upstream, which I don't think it's the case? I don't see why not. It's like gtk3-demo, for example, or poppler-glib-demo. We can add a specific compile option to disable it (not the installation, but the whole MB), and enable it always for developer builds, since it's required/expected by the layout tests. 1032128 9 berto 2014-08-29 01:00:29 -0700 (In reply to comment #8) > > The only alternative would be that we want to install MiniBrowser > > by default upstream, which I don't think it's the case? > I don't see why not. It's like gtk3-demo, for example, or > poppler-glib-demo. Ok, why are not we installing it then? Anyway, if we add an option to install it I think we should disable the hardcoded WEBKIT_INJECTED_BUNDLE_PATH somehow. 1075945 10 248327 cgarcia 2015-03-10 04:51:57 -0700 Created attachment 248327 New patch This patch introduces DEVELOPMENT_BUILD, and only when defined we look for child processes in UI process bin dir, or even in WEBKIT_EXEC_PATH. And the same for the WEBKIT_INJECTED_BUNDLE_PATH env var. 1076366 11 cgarcia 2015-03-11 10:48:15 -0700 Committed r181392: <http://trac.webkit.org/changeset/181392> 236271 2014-08-08 01:13:13 -0700 2015-03-10 04:51:57 -0700 Patch wk2-exec-path.diff text/plain 4183 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1NDhiM2QwLi41MjMyNjM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTQtMDgtMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvIG5vdCBsb29rIGZvciBjaGlsZCBwcm9jZXNzZXMgaW4gdGhl IFVJIHByb2Nlc3MgYmluYXJ5IHBhdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNTc1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgaXMgb25seSB1c2VmdWwgZm9yIGludGVybmFsIHRvb2xzIGFu ZCB0ZXN0cywgYnV0IG5ldmVyIHdoZW4KKyAgICAgICAgaW5zdGFsbGVkLCBzaW5jZSB3ZSBkb24n dCBpbnN0YWxsIHRoZSBwcm9jZXNzZXMgaW4gdGhlIGJpbiBkaXIgYnV0CisgICAgICAgIGluIHRo ZSBsaWJleGVjIGRpci4gV2UgYWxyZWFkeSBoYXZlIGFuIGVudiB2YXIgdG8gY292ZXIgdGhlIGNh c2VzCisgICAgICAgIG9mIHRoZSBpbnRlcm5hbCB0b29scyBhbmQgdGVzdHMuCisKKyAgICAgICAg KiBTaGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5jcHA6CisgICAgICAgIChXZWJL aXQ6OmZpbmRXZWJLaXRQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6Z2V0RXhlY3V0YWJsZVBh dGgpOiBEZWxldGVkLgorCiAyMDE0LTA4LTA3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25A YXBwbGUuY29tPgogCiAgICAgICAgIFtTZXJ2aWNlcyB3aXRoIFVJXSBBY3Rpb24gbWVudSBkb2Vz IG5vdCBhcHBlYXIgaWYgc2VsZWN0aW9uIGluY2x1ZGVzIGJvdGggdGV4dCBhbmQgYW4gaW1hZ2UK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQ YXRoR3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQ YXRoR3RrLmNwcAppbmRleCBlNzU3Y2MyLi5kMzNhYjYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvU2hhcmVkL2d0ay9Qcm9jZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwCkBAIC0yOSwy MCArMjksMTEgQEAKIAogI2luY2x1ZGUgPFdlYkNvcmUvRmlsZVN5c3RlbS5oPgogI2luY2x1ZGUg PGdsaWIuaD4KLSNpbmNsdWRlIDx3dGYvZ29iamVjdC9HbGliVXRpbGl0aWVzLmg+CiAKIHVzaW5n IG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotc3RhdGljIFN0cmlu ZyBnZXRFeGVjdXRhYmxlUGF0aCgpCi17Ci0gICAgQ1N0cmluZyBleGVjdXRhYmxlUGF0aCA9IGdl dEN1cnJlbnRFeGVjdXRhYmxlUGF0aCgpOwotICAgIGlmICghZXhlY3V0YWJsZVBhdGguaXNOdWxs KCkpCi0gICAgICAgIHJldHVybiBkaXJlY3RvcnlOYW1lKGZpbGVuYW1lVG9TdHJpbmcoZXhlY3V0 YWJsZVBhdGguZGF0YSgpKSk7Ci0gICAgcmV0dXJuIFN0cmluZygpOwotfQotCiBzdGF0aWMgU3Ry aW5nIGZpbmRXZWJLaXRQcm9jZXNzKGNvbnN0IGNoYXIqIHByb2Nlc3NOYW1lKQogewogICAgIHN0 YXRpYyBjb25zdCBjaGFyKiBleGVjRGlyZWN0b3J5ID0gZ19nZXRlbnYoIldFQktJVF9FWEVDX1BB VEgiKTsKQEAgLTUyLDEzICs0Myw2IEBAIHN0YXRpYyBTdHJpbmcgZmluZFdlYktpdFByb2Nlc3Mo Y29uc3QgY2hhciogcHJvY2Vzc05hbWUpCiAgICAgICAgICAgICByZXR1cm4gcHJvY2Vzc1BhdGg7 CiAgICAgfQogCi0gICAgc3RhdGljIFN0cmluZyBleGVjdXRhYmxlUGF0aCA9IGdldEV4ZWN1dGFi bGVQYXRoKCk7Ci0gICAgaWYgKCFleGVjdXRhYmxlUGF0aC5pc051bGwoKSkgewotICAgICAgICBT dHJpbmcgcHJvY2Vzc1BhdGggPSBwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoZXhlY3V0YWJsZVBh dGgsIHByb2Nlc3NOYW1lKTsKLSAgICAgICAgaWYgKGZpbGVFeGlzdHMocHJvY2Vzc1BhdGgpKQot ICAgICAgICAgICAgcmV0dXJuIHByb2Nlc3NQYXRoOwotICAgIH0KLQogICAgIHJldHVybiBwYXRo QnlBcHBlbmRpbmdDb21wb25lbnQoZmlsZW5hbWVUb1N0cmluZyhMSUJFWEVDRElSKSwgcHJvY2Vz c05hbWUpOwogfQogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VM b2cKaW5kZXggODAxZGJkYy4uZmZiNDRlZCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA4LTA4ICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBEbyBu b3QgbG9vayBmb3IgY2hpbGQgcHJvY2Vzc2VzIGluIHRoZSBVSSBwcm9jZXNzIGJpbmFyeSBwYXRo CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU3NTIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1pbmlC cm93c2VyL2d0ay9tYWluLmM6CisgICAgICAgIChtYWluKTogU2V0IFdFQktJVF9FWEVDX1BBVEgg ZW52IHZhci4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrLnB5OgorICAgICAg ICAoR3RrUG9ydC5zZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIpOiBEaXR0by4KKwogMjAxNC0wOC0w NyAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luXSBV bnJldmlld2VkIGdhcmRlbmluZy4KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9t YWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCmluZGV4IDk0MThjYTYuLmJmZmMx YTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMKKysrIGIvVG9vbHMv TWluaUJyb3dzZXIvZ3RrL21haW4uYwpAQCAtMjQwLDYgKzI0MCw3IEBAIGFib3V0VVJJU2NoZW1l UmVxdWVzdENhbGxiYWNrKFdlYktpdFVSSVNjaGVtZVJlcXVlc3QgKnJlcXVlc3QsIGdwb2ludGVy IHVzZXJEYXRhCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogewogICAgIGd0a19p bml0KCZhcmdjLCAmYXJndik7CisgICAgZ19zZXRlbnYoIldFQktJVF9FWEVDX1BBVEgiLCBXRUJL SVRfRVhFQ19QQVRILCBGQUxTRSk7CiAgICAgZ19zZXRlbnYoIldFQktJVF9JTkpFQ1RFRF9CVU5E TEVfUEFUSCIsIFdFQktJVF9JTkpFQ1RFRF9CVU5ETEVfUEFUSCwgRkFMU0UpOwogCiAgICAgY29u c3QgZ2NoYXIgKm11bHRpcHJvY2VzcyA9IGdfZ2V0ZW52KCJNSU5JQlJPV1NFUl9NVUxUSVBST0NF U1MiKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGsucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrLnB5CmluZGV4IGU4MmRiOTAuLmYxN2NkMzgg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGsucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5weQpAQCAtMTEyLDYgKzExMiw3IEBAIGNsYXNz IEd0a1BvcnQoUG9ydCk6CiAgICAgICAgIGVudmlyb25tZW50WydMSUJPVkVSTEFZX1NDUk9MTEJB UiddID0gJzAnCiAgICAgICAgIGVudmlyb25tZW50WydURVNUX1JVTk5FUl9JTkpFQ1RFRF9CVU5E TEVfRklMRU5BTUUnXSA9IHNlbGYuX2J1aWxkX3BhdGgoJ2xpYicsICdsaWJUZXN0UnVubmVySW5q ZWN0ZWRCdW5kbGUuc28nKQogICAgICAgICBlbnZpcm9ubWVudFsnVEVTVF9SVU5ORVJfVEVTVF9Q TFVHSU5fUEFUSCddID0gc2VsZi5fYnVpbGRfcGF0aCgnbGliJykKKyAgICAgICAgZW52aXJvbm1l bnRbJ1dFQktJVF9FWEVDX1BBVEgnXSA9IHNlbGYuX2J1aWxkX3BhdGgoJ2JpbicpCiAgICAgICAg IHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9ubWVudCwgJ1dFQktJ VF9PVVRQVVRESVInKQogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oImxlYWtzIik6CiAgICAg ICAgICAgICAjICBUdXJuIG9mZiBHTGliIG1lbW9yeSBvcHRpbWlzYXRpb25zIGh0dHBzOi8vd2lr aS5nbm9tZS5vcmcvVmFsZ3JpbmQuCg== 248327 2015-03-10 04:51:57 -0700 2015-03-11 07:12:41 -0700 New patch wk-development-builds.diff text/plain 4413 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBkMzgzZjEzLi45MDE4NWJj IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTUtMDMtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIERvIG5vdCBsb29rIGZvciBjaGlsZCBwcm9jZXNzZXMgaW4gdGhlIFVJ IHByb2Nlc3MgYmluYXJ5IHBhdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNTc1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2U6IEFkZCAtRERFVkVM T1BNRU5UX0JVSUxEPTEgdG8gdGhlCisgICAgICAgIGJ1aWxkIGZvciBkZXZlbG9wbWVudCBidWls ZHMuCisKIDIwMTUtMDMtMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPiBhbmQgSm9zw6kgRGFwZW5hIFBheiAgPGpkYXBlbmFAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbR1RLXSBBZGQgYSBjb25maWd1cmUgb3B0aW9uIHRvIGJ1aWxkIHdpdGggT3BlbkdMIEVTIDIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2YTUxOGE0Li45YWRhY2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTUtMDMtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvIG5vdCBsb29rIGZvciBjaGlsZCBwcm9jZXNzZXMgaW4gdGhl IFVJIHByb2Nlc3MgYmluYXJ5IHBhdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNTc1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEl0J3Mgb25seSB1c2VmdWwgZm9yIGludGVybmFsIHRvb2xzIGFuZCB0 ZXN0cywgYnV0IG5ldmVyIHdoZW4KKyAgICAgICAgaW5zdGFsbGVkLCBzaW5jZSB3ZSBkb24ndCBp bnN0YWxsIHRoZSBwcm9jZXNzZXMgaW4gdGhlIGJpbiBkaXIgYnV0CisgICAgICAgIGluIHRoZSBs aWJleGVjIGRpci4KKworICAgICAgICAqIFNoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRo R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6ZmluZFdlYktpdFByb2Nlc3MpOiBPbmx5IGxvb2sg b3IgdGhlIGV4ZWN1dGFibGVzIGluIHRoZQorICAgICAgICBVSSBwcm9jZXNzIGJpbmFyeSBwYXRo IG9yIFdFQktJVF9FWEVDX1BBVEggZm9yIGRldmVsb3BtZW50IGJ1aWxkcy4KKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKGluamVjdGVk QnVuZGxlRGlyZWN0b3J5KTogT25seSBjaGVjaworICAgICAgICBXRUJLSVRfSU5KRUNURURfQlVO RExFX1BBVEggZW52IHZhciBmb3IgZGV2ZWxvcG1lbnQgYnVpbGRzLgorCiAyMDE1LTAzLTA4ICBE ZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TIE1lZGlhXSBWaWRl byBidWZmZXIgcHJvZ3Jlc3MgbWlzc2luZyBvbiBpUGhvbmVzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5jcHAKaW5kZXggNWI1 Yjk0Ny4uODFiYWM0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Qcm9j ZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsv UHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcApAQCAtMjksMTIgKzI5LDE2IEBACiAKICNpbmNs dWRlIDxXZWJDb3JlL0ZpbGVTeXN0ZW0uaD4KICNpbmNsdWRlIDxnbGliLmg+CisKKyNpZiBkZWZp bmVkKERFVkVMT1BNRU5UX0JVSUxEKQogI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dsaWJVdGlsaXRp ZXMuaD4KKyNlbmRpZgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdl YktpdCB7CiAKKyNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQogc3RhdGljIFN0cmluZyBn ZXRFeGVjdXRhYmxlUGF0aCgpCiB7CiAgICAgQ1N0cmluZyBleGVjdXRhYmxlUGF0aCA9IGdldEN1 cnJlbnRFeGVjdXRhYmxlUGF0aCgpOwpAQCAtNDIsOSArNDYsMTEgQEAgc3RhdGljIFN0cmluZyBn ZXRFeGVjdXRhYmxlUGF0aCgpCiAgICAgICAgIHJldHVybiBkaXJlY3RvcnlOYW1lKGZpbGVuYW1l VG9TdHJpbmcoZXhlY3V0YWJsZVBhdGguZGF0YSgpKSk7CiAgICAgcmV0dXJuIFN0cmluZygpOwog fQorI2VuZGlmCiAKIHN0YXRpYyBTdHJpbmcgZmluZFdlYktpdFByb2Nlc3MoY29uc3QgY2hhciog cHJvY2Vzc05hbWUpCiB7CisjaWYgZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKICAgICBzdGF0 aWMgY29uc3QgY2hhciogZXhlY0RpcmVjdG9yeSA9IGdfZ2V0ZW52KCJXRUJLSVRfRVhFQ19QQVRI Iik7CiAgICAgaWYgKGV4ZWNEaXJlY3RvcnkpIHsKICAgICAgICAgU3RyaW5nIHByb2Nlc3NQYXRo ID0gcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KGZpbGVuYW1lVG9TdHJpbmcoZXhlY0RpcmVjdG9y eSksIHByb2Nlc3NOYW1lKTsKQEAgLTU4LDYgKzY0LDcgQEAgc3RhdGljIFN0cmluZyBmaW5kV2Vi S2l0UHJvY2Vzcyhjb25zdCBjaGFyKiBwcm9jZXNzTmFtZSkKICAgICAgICAgaWYgKGZpbGVFeGlz dHMocHJvY2Vzc1BhdGgpKQogICAgICAgICAgICAgcmV0dXJuIHByb2Nlc3NQYXRoOwogICAgIH0K KyNlbmRpZgogCiAgICAgcmV0dXJuIHBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChmaWxlbmFtZVRv U3RyaW5nKExJQkVYRUNESVIpLCBwcm9jZXNzTmFtZSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCmluZGV4IDYwYWIz MWMuLjlmM2M2Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCkBAIC0yMTgsOSArMjE4LDExIEBAIHN0YXRpYyBpbmxp bmUgV2ViS2l0UHJvY2Vzc01vZGVsIHRvV2ViS2l0UHJvY2Vzc01vZGVsKFdlYktpdDo6UHJvY2Vz c01vZGVsIHByb2NlCiAKIHN0YXRpYyBjb25zdCBjaGFyKiBpbmplY3RlZEJ1bmRsZURpcmVjdG9y eSgpCiB7CisjaWYgZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKICAgICBjb25zdCBjaGFyKiBi dW5kbGVEaXJlY3RvcnkgPSBnX2dldGVudigiV0VCS0lUX0lOSkVDVEVEX0JVTkRMRV9QQVRIIik7 CiAgICAgaWYgKGJ1bmRsZURpcmVjdG9yeSAmJiBnX2ZpbGVfdGVzdChidW5kbGVEaXJlY3Rvcnks IEdfRklMRV9URVNUX0lTX0RJUikpCiAgICAgICAgIHJldHVybiBidW5kbGVEaXJlY3Rvcnk7Cisj ZW5kaWYKIAogICAgIHN0YXRpYyBjb25zdCBjaGFyKiBpbmplY3RlZEJ1bmRsZVBhdGggPSBMSUJE SVIgR19ESVJfU0VQQVJBVE9SX1MgIndlYmtpdDJndGstIiBXRUJLSVRHVEtfQVBJX1ZFUlNJT05f U1RSSU5HCiAgICAgICAgIEdfRElSX1NFUEFSQVRPUl9TICJpbmplY3RlZC1idW5kbGUiIEdfRElS X1NFUEFSQVRPUl9TOwpkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2Ug Yi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQppbmRleCA3MTcyYzczLi44NmY0MmJhIDEw MDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQorKysgYi9Tb3VyY2UvY21h a2UvT3B0aW9uc0dUSy5jbWFrZQpAQCAtMjQ4LDYgKzI0OCwxMCBAQCBhZGRfZGVmaW5pdGlvbnMo LURVU0VSX0FHRU5UX0dUS19NQUpPUl9WRVJTSU9OPTYwMSkKIGFkZF9kZWZpbml0aW9ucygtRFVT RVJfQUdFTlRfR1RLX01JTk9SX1ZFUlNJT049MSkKIGFkZF9kZWZpbml0aW9ucygtRFdFQktJVEdU S19BUElfVkVSU0lPTl9TVFJJTkc9IiR7V0VCS0lUR1RLX0FQSV9WRVJTSU9OfSIpCiAKK2lmIChE RVZFTE9QRVJfTU9ERSkKKyAgICBhZGRfZGVmaW5pdGlvbnMoLURERVZFTE9QTUVOVF9CVUlMRD0x KQorZW5kaWYgKCkKKwogaWYgKEVOQUJMRV9WSURFTyBPUiBFTkFCTEVfV0VCX0FVRElPKQogICAg IHNldChHU1RSRUFNRVJfQ09NUE9ORU5UUyBhcHAgcGJ1dGlscykKICAgICBhZGRfZGVmaW5pdGlv bnMoLURXVEZfVVNFX0dTVFJFQU1FUikK