212408 2020-05-27 07:09:45 -0700 [Flatpak][GStreamer] all commands, except webkit-build, fails if GST_BUILD_PATH is set 2020-05-29 09:29:20 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build All Linux RESOLVED FIXED InRadar P2 Normal --- 1 vjaquez vjaquez clopez pnormand webkit-bug-importer zan oldest_to_newest 1656359 0 vjaquez 2020-05-27 07:09:45 -0700 Even that bug 212343 solved the compilation, the rest of the operations in flatpak with GST_BUILD_PATH set remains failing. The regression were introduced in r262057 as far as I understand, where the flatpak's argument 'command' were added. 1656360 1 400332 vjaquez 2020-05-27 07:21:17 -0700 Created attachment 400332 Patch 1656795 2 400439 pnormand 2020-05-28 02:32:41 -0700 Created attachment 400439 Patch 1656796 3 400439 pnormand 2020-05-28 02:33:14 -0700 Comment on attachment 400439 Patch Can you check if this variant works on your side? 1656800 4 vjaquez 2020-05-28 03:07:53 -0700 (In reply to Philippe Normand from comment #3) > Comment on attachment 400439 [details] > Patch > > Can you check if this variant works on your side? It seems not. GST_BUILD_PATH=/home/vjaquez/gst/gst-build Tools/Scripts/build-webkit --gtk --debug --help Building flatpak based environment Building `gst-build` /home/vjaquez/gst/gst-build ninja: Entering directory `/app/webkit/WebKitBuild/gst-build ninja: no work to do. usage: gst-env [-h] [--builddir BUILDDIR] [--srcdir SRCDIR] [--sysroot SYSROOT] [--wine WINE] [--winepath WINEPATH] [--only-environment] optional arguments: -h, --help show this help message and exit --builddir BUILDDIR The meson build directory --srcdir SRCDIR The top level source directory --sysroot SYSROOT The sysroot path used during cross-compilation --wine WINE Build a wine env based on specified wine command --winepath WINEPATH Extra path to set to WINEPATH. --only-environment Do not start a shell, only print required environment. 1656810 5 400444 pnormand 2020-05-28 05:13:00 -0700 Created attachment 400444 Patch 1656864 6 vjaquez 2020-05-28 08:38:45 -0700 testing the latest patch, it iterates endlessly on meson reconfiguration. 1656869 7 pnormand 2020-05-28 08:52:21 -0700 Yeah here too, I had to nuke my gst-build build dir, once only though. 1656934 8 vjaquez 2020-05-28 11:10:48 -0700 Yep. Removing WebKitBuild/gst-build everything seems to work as expected \o/ 1657287 9 ews-feeder 2020-05-29 09:28:31 -0700 Committed r262297: <https://trac.webkit.org/changeset/262297> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400444. 1657289 10 webkit-bug-importer 2020-05-29 09:29:20 -0700 <rdar://problem/63761780> 400332 2020-05-27 07:21:17 -0700 2020-05-28 05:12:53 -0700 Patch bug-212408-20200527162116.patch text/plain 3103 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMTk0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjk0Y2ViMjY4ZDRlODgwMTNlODA3YzQ0MzQwNTIxZGFm NGVjYWNjNC4uYjA3M2JjOWY2ZTYxMTk1M2I5NWEyODU0ODgwNmMyZGFiYTllMjI3ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIwLTA1LTI3ICBWw61jdG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGln YWxpYS5jb20+CisKKyAgICAgICAgW0ZsYXRwYWtdW0dTdHJlYW1lcl0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjQwOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV2ZW4gdGhhdCByMjYyMTIxIHNvbHZl ZCB0aGUgY29tcGlsYXRpb24sIHRoZSByZXN0IG9mIG9wZXJhdGlvbnMKKyAgICAgICAgaW4gZmxh dHBhaywgd2l0aCBHU1RfQlVJTERfUEFUSCBzZXQsIHJlbWFpbmVkIGZhaWxpbmcuIFRoZQorICAg ICAgICByZWdyZXNzaW9uIHdlcmUgaW50cm9kdWNlZCBpbiByMjYyMDU3LCBhcyBmYXIgYXMgSSB1 bmRlcnN0YW5kLAorICAgICAgICB3aGVyZSB0aGUgZmxhdHBhaydzIGFyZ3VtZW50ICdjb21tYW5k JyB3ZXJlIGFkZGVkLgorCisgICAgICAgIFRoZSBhcHByb2FjaCBub3cgaXMsIHdoZW4gR1NUX0JV SUxEX1BBVEggaXMgc2V0LCBnc3QtZW52LnB5CisgICAgICAgIHByb2dyYW0gYW5kIGl0cyBhcmd1 bWVudHMgYXJlIHByZXBlbmRlZCB0byB0aGUgYXJndW1lbnQgbGlzdCwgdGh1cworICAgICAgICB0 aGUgZmxhdHBhaydzIG1haW4gY29tbWFuZCBpcyBnc3QtZW52LnB5IHdoaWNoIHNldHMgdGhlCisg ICAgICAgIGNvbXBpbGF0aW9uIGVudmlyb25tZW50IGFuZCBleGVjdXRlIHRoZSByZXN0IG9mIGFy Z3VtZW50cy4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gZml4ZXMgYnVnIDIxMTcyNy4KKwor ICAgICAgICAqIGZsYXRwYWsvZmxhdHBha3V0aWxzLnB5OgorICAgICAgICAoV2Via2l0RmxhdHBh ay5zZXR1cF9nc3RidWlsZCk6IHNpbXBsaWZ5IHRoZSBsb2dpYworICAgICAgICAoV2Via2l0Rmxh dHBhay5ydW5faW5fc2FuZGJveCk6CisKIDIwMjAtMDUtMjcgIFBoaWxpcHBlIE5vcm1hbmQgIDxw bm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtGbGF0cGFrIFNES10gVXBkYXRlIG9wZW54 ciByZWNpcGUKZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5IGIvVG9v bHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKaW5kZXggOTQzZWJkZTkwYjJkMjI2MGU2M2FiMGU2 ZmQyNzZlNDllNWMwNzZhOS4uMjcyZGNhMDA1NzY1NTE4OTQwZGZhZDYwNzVlM2NhZTMyZmI5ODA2 OCAxMDA2NDQKLS0tIGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKKysrIGIvVG9vbHMv ZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKQEAgLTU5MCwxMiArNTkwLDEwIEBAIGNsYXNzIFdlYmtp dEZsYXRwYWs6CiAgICAgICAgICAgICBDb25zb2xlLm1lc3NhZ2UoIlJ1bm5pbmcgJXMgIiwgJyAn LmpvaW4oYXJncykpCiAgICAgICAgICAgICBzZWxmLnJ1bl9pbl9zYW5kYm94KCphcmdzLCBidWls ZGluZ19nc3Q9VHJ1ZSkKIAotICAgICAgICBpZiBub3QgYnVpbGRpbmc6Ci0gICAgICAgICAgICBy ZXR1cm4gW29zLnBhdGguam9pbihnc3RfZGlyLCAnZ3N0LWVudi5weScpLCAnLS1idWlsZGRpcics IGdzdF9idWlsZGRpciwgJy0tc3JjZGlyJywgZ3N0X2Rpcl0KLQotICAgICAgICBDb25zb2xlLm1l c3NhZ2UoIkJ1aWxkaW5nIGBnc3QtYnVpbGRgICVzICIsIGdzdF9kaXIpCi0gICAgICAgIGlmIHNl bGYucnVuX2luX3NhbmRib3goJ25pbmphJywgJy1DJywgZ3N0X2J1aWxkZGlyLCBidWlsZGluZ19n c3Q9VHJ1ZSkgIT0gMDoKLSAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignRXJyb3Igd2hp bGUgYnVpbGRpbmcgZ3N0LWJ1aWxkLicpCisgICAgICAgIGlmIGJ1aWxkaW5nOgorICAgICAgICAg ICAgQ29uc29sZS5tZXNzYWdlKCJCdWlsZGluZyBgZ3N0LWJ1aWxkYCAlcyAiLCBnc3RfZGlyKQor ICAgICAgICAgICAgaWYgc2VsZi5ydW5faW5fc2FuZGJveCgnbmluamEnLCAnLUMnLCBnc3RfYnVp bGRkaXIsIGJ1aWxkaW5nX2dzdD1UcnVlKSAhPSAwOgorICAgICAgICAgICAgICAgIHJhaXNlIFJ1 bnRpbWVFcnJvcignRXJyb3Igd2hpbGUgYnVpbGRpbmcgZ3N0LWJ1aWxkLicpCiAKICAgICAgICAg cmV0dXJuIFtvcy5wYXRoLmpvaW4oZ3N0X2RpciwgJ2dzdC1lbnYucHknKSwgJy0tYnVpbGRkaXIn LCBnc3RfYnVpbGRkaXIsICctLXNyY2RpcicsIGdzdF9kaXJdCiAKQEAgLTc4MiwxMSArNzgwLDEw IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIGZvciBlbnZ2YXIsIHZhbHVlIGluIHNh bmRib3hfZW52aXJvbm1lbnQuaXRlbXMoKToKICAgICAgICAgICAgIGZsYXRwYWtfY29tbWFuZC5h cHBlbmQoIi0tZW52PSVzPSVzIiAlIChlbnZ2YXIsIHZhbHVlKSkKIAotICAgICAgICBnc3RfZW52 ID0gW10KLSAgICAgICAgaWYgbm90IGt3YXJncy5nZXQoJ2J1aWxkaW5nX2dzdCcpOgotICAgICAg ICAgICAgZ3N0X2VudiA9IHNlbGYuc2V0dXBfZ3N0YnVpbGQoYnVpbGRpbmcpCisgICAgICAgIGlm IG5vdCBrd2FyZ3MuZ2V0KCdidWlsZGluZ19nc3QnKSBhbmQgJy1oJyBub3QgaW4gYXJncyBhbmQg Jy0taGVscCcgbm90IGluIGFyZ3M6CisgICAgICAgICAgICBhcmdzID0gc2VsZi5zZXR1cF9nc3Ri dWlsZChidWlsZGluZykgKyBhcmdzCiAKLSAgICAgICAgZmxhdHBha19jb21tYW5kICs9IGV4dHJh X2ZsYXRwYWtfYXJncyArIFsnLS1jb21tYW5kPSVzJyAlIGFyZ3NbMF0sICJvcmcud2Via2l0LlNk ayJdICsgZ3N0X2VudiArIGFyZ3NbMTpdCisgICAgICAgIGZsYXRwYWtfY29tbWFuZCArPSBleHRy YV9mbGF0cGFrX2FyZ3MgKyBbJy0tY29tbWFuZD0lcycgJSBhcmdzWzBdLCAib3JnLndlYmtpdC5T ZGsiXSArIGFyZ3NbMTpdCiAKICAgICAgICAgZmxhdHBha19lbnYgPSBvcy5lbnZpcm9uCiAgICAg ICAgIGZsYXRwYWtfZW52LnVwZGF0ZSh7Cg== 400439 2020-05-28 02:32:41 -0700 2020-05-28 05:12:56 -0700 Patch bug-212408-20200528103239.patch text/plain 4551 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMjM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTgwMTJlMDdmY2YzNDA3NjBhNjJmMTEzODZmOGIxZDg5 Y2FmZDUzNy4uN2U5MjgzZjZlYmVjNmFmZTAyNDAwNGIxYjUxNWI2ZWRkYzFiNzYyMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIwLTA1LTI4ICBWw61jdG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGln YWxpYS5jb20+CisKKyAgICAgICAgW0ZsYXRwYWtdW0dTdHJlYW1lcl0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjQwOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV2ZW4gdGhhdCByMjYyMTIxIHNvbHZl ZCB0aGUgY29tcGlsYXRpb24sIHRoZSByZXN0IG9mIG9wZXJhdGlvbnMKKyAgICAgICAgaW4gZmxh dHBhaywgd2l0aCBHU1RfQlVJTERfUEFUSCBzZXQsIHJlbWFpbmVkIGZhaWxpbmcuIFRoZQorICAg ICAgICByZWdyZXNzaW9uIHdlcmUgaW50cm9kdWNlZCBpbiByMjYyMDU3LCBhcyBmYXIgYXMgSSB1 bmRlcnN0YW5kLAorICAgICAgICB3aGVyZSB0aGUgZmxhdHBhaydzIGFyZ3VtZW50ICdjb21tYW5k JyB3ZXJlIGFkZGVkLgorCisgICAgICAgIFRoZSBhcHByb2FjaCBub3cgaXMsIHdoZW4gR1NUX0JV SUxEX1BBVEggaXMgc2V0LCBnc3QtZW52LnB5CisgICAgICAgIHByb2dyYW0gYW5kIGl0cyBhcmd1 bWVudHMgYXJlIHByZXBlbmRlZCB0byB0aGUgYXJndW1lbnQgbGlzdCwgdGh1cworICAgICAgICB0 aGUgZmxhdHBhaydzIG1haW4gY29tbWFuZCBpcyBnc3QtZW52LnB5IHdoaWNoIHNldHMgdGhlCisg ICAgICAgIGNvbXBpbGF0aW9uIGVudmlyb25tZW50IGFuZCBleGVjdXRlIHRoZSByZXN0IG9mIGFy Z3VtZW50cy4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gZml4ZXMgYnVnIDIxMTcyNy4KKwor ICAgICAgICAqIGZsYXRwYWsvZmxhdHBha3V0aWxzLnB5OgorICAgICAgICAoV2Via2l0RmxhdHBh ay5zZXR1cF9nc3RidWlsZCk6IHNpbXBsaWZ5IHRoZSBsb2dpYworICAgICAgICAoV2Via2l0Rmxh dHBhay5ydW5faW5fc2FuZGJveCk6CisKIDIwMjAtMDUtMjcgIFNhYW0gQmFyYXRpICA8c2JhcmF0 aUBhcHBsZS5jb20+CiAKICAgICAgICAgcmV2ZXJ0IGxvZ2dpbmcgZm9yIGRldGVjdGluZyBmYWls dXJlcyBpbiBydW4tanNjLXN0cmVzcy10ZXN0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9m bGF0cGFrdXRpbHMucHkgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQppbmRleCA5NDNl YmRlOTBiMmQyMjYwZTYzYWIwZTZmZDI3NmU0OWU1YzA3NmE5Li4wMTdlMjFiYTgwY2JhNDI0MDY2 YmM0NjZhZTliYTkwN2Q4YzIzOWU3IDEwMDY0NAotLS0gYS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1 dGlscy5weQorKysgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQpAQCAtMzk0LDggKzM5 NCwxMCBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgIGRlZiBsb2FkX2Zyb21fYXJncyhhcmdz PU5vbmUsIGFkZF9oZWxwPVRydWUpOgogICAgICAgICBzZWxmID0gV2Via2l0RmxhdHBhaygpCiAK LSAgICAgICAgcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIocHJvZz0id2Via2l0LWZs YXRwYWsiLCBhZGRfaGVscD1hZGRfaGVscCkKKyAgICAgICAgcGFyc2VyID0gYXJncGFyc2UuQXJn dW1lbnRQYXJzZXIocHJvZz0id2Via2l0LWZsYXRwYWsiLCBhZGRfaGVscD1GYWxzZSkKICAgICAg ICAgZ2VuZXJhbCA9IHBhcnNlci5hZGRfYXJndW1lbnRfZ3JvdXAoIkdlbmVyYWwiKQorICAgICAg ICBpZiBhZGRfaGVscDoKKyAgICAgICAgICAgIGdlbmVyYWwuYWRkX2FyZ3VtZW50KCctaCcsICct LWhlbHAnLCBhY3Rpb249J3N0b3JlX3RydWUnLCBoZWxwPSJTaG93IGhlbHAiKQogICAgICAgICBn ZW5lcmFsLmFkZF9hcmd1bWVudCgnLS12ZXJib3NlJywgYWN0aW9uPSdzdG9yZV90cnVlJywKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0nU2hvdyBkZWJ1ZyBtZXNzYWdlJykKICAg ICAgICAgZ2VuZXJhbC5hZGRfYXJndW1lbnQoIi0tZGVidWciLApAQCAtNDQxLDYgKzQ0Myw3IEBA IGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIGJ1aWxkb3B0aW9ucy5hZGRfYXJndW1lbnQo Ii0tY21ha2VhcmdzIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSJP bmUgb3IgbW9yZSBvcHRpb25hbCBDTWFrZSBmbGFncyAoZS5nLiAtLWNtYWtlYXJncz1cIi1ERk9P PWJhciAtRENNQUtFX1BSRUZJWF9QQVRIPS91c3IvbG9jYWxcIikiKQogCisgICAgICAgIHNlbGYu cGFyc2VyID0gcGFyc2VyCiAgICAgICAgIF8sIHNlbGYuYXJncyA9IHBhcnNlci5wYXJzZV9rbm93 bl9hcmdzKGFyZ3M9YXJncywgbmFtZXNwYWNlPXNlbGYpCiAKICAgICAgICAgaWYgb3MuZW52aXJv bi5nZXQoJ0NDQUNIRV9QUkVGSVgnKSA9PSAnaWNlY2MnOgpAQCAtNDU0LDYgKzQ1Nyw3IEBAIGNs YXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIHNlbGYuc2RrID0gTm9uZQogICAgICAgICBzZWxm LnVzZXJfcmVwbyA9IE5vbmUKIAorICAgICAgICBzZWxmLmhlbHAgPSBGYWxzZQogICAgICAgICBz ZWxmLnZlcmJvc2UgPSBGYWxzZQogICAgICAgICBzZWxmLnF1aWV0ID0gRmFsc2UKICAgICAgICAg c2VsZi51cGRhdGUgPSBGYWxzZQpAQCAtNTkwLDEyICs1OTQsMTAgQEAgY2xhc3MgV2Via2l0Rmxh dHBhazoKICAgICAgICAgICAgIENvbnNvbGUubWVzc2FnZSgiUnVubmluZyAlcyAiLCAnICcuam9p bihhcmdzKSkKICAgICAgICAgICAgIHNlbGYucnVuX2luX3NhbmRib3goKmFyZ3MsIGJ1aWxkaW5n X2dzdD1UcnVlKQogCi0gICAgICAgIGlmIG5vdCBidWlsZGluZzoKLSAgICAgICAgICAgIHJldHVy biBbb3MucGF0aC5qb2luKGdzdF9kaXIsICdnc3QtZW52LnB5JyksICctLWJ1aWxkZGlyJywgZ3N0 X2J1aWxkZGlyLCAnLS1zcmNkaXInLCBnc3RfZGlyXQotCi0gICAgICAgIENvbnNvbGUubWVzc2Fn ZSgiQnVpbGRpbmcgYGdzdC1idWlsZGAgJXMgIiwgZ3N0X2RpcikKLSAgICAgICAgaWYgc2VsZi5y dW5faW5fc2FuZGJveCgnbmluamEnLCAnLUMnLCBnc3RfYnVpbGRkaXIsIGJ1aWxkaW5nX2dzdD1U cnVlKSAhPSAwOgotICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCdFcnJvciB3aGlsZSBi dWlsZGluZyBnc3QtYnVpbGQuJykKKyAgICAgICAgaWYgYnVpbGRpbmc6CisgICAgICAgICAgICBD b25zb2xlLm1lc3NhZ2UoIkJ1aWxkaW5nIGBnc3QtYnVpbGRgICVzICIsIGdzdF9kaXIpCisgICAg ICAgICAgICBpZiBzZWxmLnJ1bl9pbl9zYW5kYm94KCduaW5qYScsICctQycsIGdzdF9idWlsZGRp ciwgYnVpbGRpbmdfZ3N0PVRydWUpICE9IDA6CisgICAgICAgICAgICAgICAgcmFpc2UgUnVudGlt ZUVycm9yKCdFcnJvciB3aGlsZSBidWlsZGluZyBnc3QtYnVpbGQuJykKIAogICAgICAgICByZXR1 cm4gW29zLnBhdGguam9pbihnc3RfZGlyLCAnZ3N0LWVudi5weScpLCAnLS1idWlsZGRpcicsIGdz dF9idWlsZGRpciwgJy0tc3JjZGlyJywgZ3N0X2Rpcl0KIApAQCAtNzgyLDExICs3ODQsMTAgQEAg Y2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgZm9yIGVudnZhciwgdmFsdWUgaW4gc2FuZGJv eF9lbnZpcm9ubWVudC5pdGVtcygpOgogICAgICAgICAgICAgZmxhdHBha19jb21tYW5kLmFwcGVu ZCgiLS1lbnY9JXM9JXMiICUgKGVudnZhciwgdmFsdWUpKQogCi0gICAgICAgIGdzdF9lbnYgPSBb XQotICAgICAgICBpZiBub3Qga3dhcmdzLmdldCgnYnVpbGRpbmdfZ3N0Jyk6Ci0gICAgICAgICAg ICBnc3RfZW52ID0gc2VsZi5zZXR1cF9nc3RidWlsZChidWlsZGluZykKKyAgICAgICAgaWYgbm90 IGt3YXJncy5nZXQoJ2J1aWxkaW5nX2dzdCcpIGFuZCBub3Qgc2VsZi5oZWxwOgorICAgICAgICAg ICAgYXJncyA9IHNlbGYuc2V0dXBfZ3N0YnVpbGQoYnVpbGRpbmcpICsgYXJncwogCi0gICAgICAg IGZsYXRwYWtfY29tbWFuZCArPSBleHRyYV9mbGF0cGFrX2FyZ3MgKyBbJy0tY29tbWFuZD0lcycg JSBhcmdzWzBdLCAib3JnLndlYmtpdC5TZGsiXSArIGdzdF9lbnYgKyBhcmdzWzE6XQorICAgICAg ICBmbGF0cGFrX2NvbW1hbmQgKz0gZXh0cmFfZmxhdHBha19hcmdzICsgWyctLWNvbW1hbmQ9JXMn ICUgYXJnc1swXSwgIm9yZy53ZWJraXQuU2RrIl0gKyBhcmdzWzE6XQogCiAgICAgICAgIGZsYXRw YWtfZW52ID0gb3MuZW52aXJvbgogICAgICAgICBmbGF0cGFrX2Vudi51cGRhdGUoewpAQCAtODAz LDYgKzgwNCwxMCBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICByZXR1cm4gMAogCiAg ICAgZGVmIG1haW4oc2VsZik6CisgICAgICAgIGlmIHNlbGYuaGVscDoKKyAgICAgICAgICAgIHNl bGYucGFyc2VyLnByaW50X2hlbHAoKQorICAgICAgICAgICAgcmV0dXJuIDAKKwogICAgICAgICBp ZiBzZWxmLmNoZWNrX2F2YWlsYWJsZToKICAgICAgICAgICAgIHJldHVybiAwCiAK 400444 2020-05-28 05:13:00 -0700 2020-05-29 09:28:31 -0700 Patch bug-212408-20200528131259.patch text/plain 6875 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMjM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTgwMTJlMDdmY2YzNDA3NjBhNjJmMTEzODZmOGIxZDg5 Y2FmZDUzNy4uOTg3M2YzMGMzZTcyZjM1MDRkZTBjZTFlYmUyM2VlZDczMDcyYjhiMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDIwLTA1LTI4ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBha11bR1N0cmVhbWVyXSBhbGwgY29tbWFuZHMsIGV4Y2VwdCB3ZWJr aXQtYnVpbGQsIGZhaWxzIGlmIEdTVF9CVUlMRF9QQVRIIGlzIHNldAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyNDA4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3QgcnVuIGdzdC1lbnYucHkgaW4g dGhlIHNhbmRib3ggYmVjYXVzZSB0aGF0IGNhbiBsZWFkIHRvIGNvbW1hbmQtbGluZSBvcHRpb25z IGNsYXNoaW5nCisgICAgICAgIHdpdGggYnVpbGQtd2Via2l0IGFuZCBvdGhlciBXZWJLaXQgc2Ny aXB0cy4gU28gaW5zdGVhZCB3ZSBub3cgcGFyc2UgdGhlIG91dHB1dCBvZiB0aGUKKyAgICAgICAg ZW52aXJvbm1lbnQgdmFyaWFibGVzIGdzdC1idWlsZCByZXF1aXJlcyBhbmQgd2UgZm9yd2FyZCB0 aG9zZSB0byB0aGUgc2FuZGJveC4KKworICAgICAgICAqIGZsYXRwYWsvZmxhdHBha3V0aWxzLnB5 OgorICAgICAgICAocnVuX3Nhbml0aXplZCk6CisgICAgICAgIChjaGVja19mbGF0cGFrKToKKyAg ICAgICAgKEZsYXRwYWtPYmplY3QuZmxhdHBhayk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLmV4 ZWN1dGVfY29tbWFuZCk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnNldHVwX2dzdGJ1aWxkKToK KyAgICAgICAgKFdlYmtpdEZsYXRwYWsucnVuX2luX3NhbmRib3gpOgorICAgICAgICAoZmxhdHBh a19ydW5fc2FuaXRpemVkKTogRGVsZXRlZC4KKwogMjAyMC0wNS0yNyAgU2FhbSBCYXJhdGkgIDxz YmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAgICByZXZlcnQgbG9nZ2luZyBmb3IgZGV0ZWN0aW5n IGZhaWx1cmVzIGluIHJ1bi1qc2Mtc3RyZXNzLXRlc3RzCmRpZmYgLS1naXQgYS9Ub29scy9mbGF0 cGFrL2ZsYXRwYWt1dGlscy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CmluZGV4 IDk0M2ViZGU5MGIyZDIyNjBlNjNhYjBlNmZkMjc2ZTQ5ZTVjMDc2YTkuLjdhNjgyNmRhOGE5YzZi YzQzZmU4NTQ4Y2I0YjM3N2MzYTEzNmZlMzEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2ZsYXRwYWsvZmxh dHBha3V0aWxzLnB5CisrKyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CkBAIC0xMjEs NyArMTIxLDcgQEAgY2xhc3MgQ29uc29sZToKICAgICAgICAgY2xzLmNvbG9yZWRfbWVzc2FnZV9p Zl9zdXBwb3J0ZWQoQ29sb3JzLldBUk5JTkcsIHN0cl9mb3JtYXQsICphcmdzKQogCiAKLWRlZiBm bGF0cGFrX3J1bl9zYW5pdGl6ZWQoY29tbWFuZCwgZ2F0aGVyX291dHB1dD1GYWxzZSk6CitkZWYg cnVuX3Nhbml0aXplZChjb21tYW5kLCBnYXRoZXJfb3V0cHV0PUZhbHNlKToKICAgICAiIiIgUnVu cyBhIGNvbW1hbmQgaW4gYSBzYW50aXplZCBlbnZpcm9ubWVudCBhbmQgb3B0aW9uYWxseSByZXR1 cm5zIGRlY29kZWQgb3V0cHV0IG9yIHJhaXNlcwogICAgICAgICBzdWJwcm9jZXNzLkNhbGxlZFBy b2Nlc3NFcnJvcgogICAgICIiIgpAQCAtMTQ2LDcgKzE0Niw3IEBAIGRlZiBjaGVja19mbGF0cGFr KHZlcmJvc2U9VHJ1ZSk6CiAKICAgICBmb3IgYXBwLCByZXF1aXJlZF92ZXJzaW9uIGluIEZMQVRQ QUtfUkVROgogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBvdXRwdXQgPSBmbGF0cGFrX3J1bl9z YW5pdGl6ZWQoW2FwcCwgIi0tdmVyc2lvbiJdLCBnYXRoZXJfb3V0cHV0PVRydWUpCisgICAgICAg ICAgICBvdXRwdXQgPSBydW5fc2FuaXRpemVkKFthcHAsICItLXZlcnNpb24iXSwgZ2F0aGVyX291 dHB1dD1UcnVlKQogICAgICAgICBleGNlcHQgKHN1YnByb2Nlc3MuQ2FsbGVkUHJvY2Vzc0Vycm9y LCBPU0Vycm9yKToKICAgICAgICAgICAgIGlmIHZlcmJvc2U6CiAgICAgICAgICAgICAgICAgQ29u c29sZS5lcnJvcl9tZXNzYWdlKCJZb3UgbmVlZCB0byBpbnN0YWxsICVzID49ICVzIgpAQCAtMTg0 LDcgKzE4NCw3IEBAIGNsYXNzIEZsYXRwYWtPYmplY3Q6CiAgICAgICAgICAgICBDb25zb2xlLm1l c3NhZ2UoY29tbWVudCkKIAogICAgICAgICBjb21tYW5kID0gWyJmbGF0cGFrIiwgY29tbWFuZF0K LSAgICAgICAgaGVscF9vdXRwdXQgPSBmbGF0cGFrX3J1bl9zYW5pdGl6ZWQoY29tbWFuZCArIFsi LS1oZWxwIl0sIGdhdGhlcl9vdXRwdXQ9VHJ1ZSkKKyAgICAgICAgaGVscF9vdXRwdXQgPSBydW5f c2FuaXRpemVkKGNvbW1hbmQgKyBbIi0taGVscCJdLCBnYXRoZXJfb3V0cHV0PVRydWUpCiAgICAg ICAgIGlmIHNlbGYudXNlciBhbmQgIi0tdXNlciIgaW4gaGVscF9vdXRwdXQ6CiAgICAgICAgICAg ICBjb21tYW5kLmFwcGVuZCgiLS11c2VyIikKICAgICAgICAgaWYgIi0tYXNzdW1leWVzIiBpbiBo ZWxwX291dHB1dDoKQEAgLTE5NSw3ICsxOTUsNyBAQCBjbGFzcyBGbGF0cGFrT2JqZWN0OgogICAg ICAgICBjb21tYW5kLmV4dGVuZChhcmdzKQogCiAgICAgICAgIF9sb2cuZGVidWcoIkV4ZWN1dGlu ZyAlcyIgJSAnICcuam9pbihjb21tYW5kKSkKLSAgICAgICAgb3V0cHV0ID0gZmxhdHBha19ydW5f c2FuaXRpemVkKGNvbW1hbmQsIGdhdGhlcl9vdXRwdXQ9Z2F0aGVyX291dHB1dCBvciBzaG93X291 dHB1dCkKKyAgICAgICAgb3V0cHV0ID0gcnVuX3Nhbml0aXplZChjb21tYW5kLCBnYXRoZXJfb3V0 cHV0PWdhdGhlcl9vdXRwdXQgb3Igc2hvd19vdXRwdXQpCiAgICAgICAgIGlmIHNob3dfb3V0cHV0 OgogICAgICAgICAgICAgcHJpbnQob3V0cHV0LmVuY29kZSgndXRmLTgnKSkKIApAQCAtNDg4LDcg KzQ4OCw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIHNlbGYuc2NjYWNoZV9zY2hl ZHVsZXIgPSBERUZBVUxUX1NDQ0FDSEVfU0NIRURVTEVSCiAKICAgICBkZWYgZXhlY3V0ZV9jb21t YW5kKHNlbGYsIGFyZ3MsIHN0ZG91dD1Ob25lLCBzdGRlcnI9Tm9uZSwgZW52PU5vbmUpOgotICAg ICAgICBfbG9nLmRlYnVnKCdSdW5uaW5nIGluIHNhbmRib3g6ICVzXG4nICUgJyAnLmpvaW4oYXJn cykpCisgICAgICAgIF9sb2cuZGVidWcoJ1J1bm5pbmc6ICVzXG4nICUgJyAnLmpvaW4oYXJncykp CiAgICAgICAgIHJlc3VsdCA9IDAKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgcmVzdWx0ID0g c3VicHJvY2Vzcy5jaGVja19jYWxsKGFyZ3MsIHN0ZG91dD1zdGRvdXQsIHN0ZGVycj1zdGRlcnIs IGVudj1lbnYpCkBAIC01NzksNyArNTc5LDcgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAg ICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihnc3RfZGlyLCAnZ3N0LWVudi5w eScpKToKICAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignR1NUX0JVSUxEX1BBVEggc2V0 IHRvICVzIGJ1dCBpdCBkb2VzblwndCBzZWVtIHRvIGJlIGEgdmFsaWQgYGdzdC1idWlsZGAgY2hl Y2tvdXQuJyAlIGdzdF9kaXIpCiAKLSAgICAgICAgZ3N0X2J1aWxkZGlyID0gb3MucGF0aC5qb2lu KHNlbGYuc2FuZGJveF9zb3VyY2Vfcm9vdCwgIldlYktpdEJ1aWxkIiwgJ2dzdC1idWlsZCcpCisg ICAgICAgIGdzdF9idWlsZGRpciA9IG9zLnBhdGguam9pbihzZWxmLnNvdXJjZV9yb290LCAiV2Vi S2l0QnVpbGQiLCAnZ3N0LWJ1aWxkJykKICAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKG9z LnBhdGguam9pbihzZWxmLmJ1aWxkX3Jvb3QsICdnc3QtYnVpbGQnLCAnYnVpbGQubmluamEnKSk6 CiAgICAgICAgICAgICBpZiBub3QgYnVpbGRpbmc6CiAgICAgICAgICAgICAgICAgcmFpc2UgUnVu dGltZUVycm9yKCdUcnlpbmcgdG8gZW50ZXIgZ3N0LWJ1aWxkIGVudiBmcm9tICVzIGJ1dCBpdCBp cyBub3QgYnVpbHQsIG1ha2Ugc3VyZSB0byByZWJ1aWxkIHdlYmtpdC4nICUgZ3N0X2RpcikKQEAg LTU5MCwxNCArNTkwLDIzIEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICBDb25z b2xlLm1lc3NhZ2UoIlJ1bm5pbmcgJXMgIiwgJyAnLmpvaW4oYXJncykpCiAgICAgICAgICAgICBz ZWxmLnJ1bl9pbl9zYW5kYm94KCphcmdzLCBidWlsZGluZ19nc3Q9VHJ1ZSkKIAotICAgICAgICBp ZiBub3QgYnVpbGRpbmc6Ci0gICAgICAgICAgICByZXR1cm4gW29zLnBhdGguam9pbihnc3RfZGly LCAnZ3N0LWVudi5weScpLCAnLS1idWlsZGRpcicsIGdzdF9idWlsZGRpciwgJy0tc3JjZGlyJywg Z3N0X2Rpcl0KLQotICAgICAgICBDb25zb2xlLm1lc3NhZ2UoIkJ1aWxkaW5nIGBnc3QtYnVpbGRg ICVzICIsIGdzdF9kaXIpCi0gICAgICAgIGlmIHNlbGYucnVuX2luX3NhbmRib3goJ25pbmphJywg Jy1DJywgZ3N0X2J1aWxkZGlyLCBidWlsZGluZ19nc3Q9VHJ1ZSkgIT0gMDoKLSAgICAgICAgICAg IHJhaXNlIFJ1bnRpbWVFcnJvcignRXJyb3Igd2hpbGUgYnVpbGRpbmcgZ3N0LWJ1aWxkLicpCi0K LSAgICAgICAgcmV0dXJuIFtvcy5wYXRoLmpvaW4oZ3N0X2RpciwgJ2dzdC1lbnYucHknKSwgJy0t YnVpbGRkaXInLCBnc3RfYnVpbGRkaXIsICctLXNyY2RpcicsIGdzdF9kaXJdCisgICAgICAgIGlm IGJ1aWxkaW5nOgorICAgICAgICAgICAgQ29uc29sZS5tZXNzYWdlKCJCdWlsZGluZyBgZ3N0LWJ1 aWxkYCAlcyAiLCBnc3RfZGlyKQorICAgICAgICAgICAgaWYgc2VsZi5ydW5faW5fc2FuZGJveCgn bmluamEnLCAnLUMnLCBnc3RfYnVpbGRkaXIsIGJ1aWxkaW5nX2dzdD1UcnVlKSAhPSAwOgorICAg ICAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignRXJyb3Igd2hpbGUgYnVpbGRpbmcgZ3N0 LWJ1aWxkLicpCisKKyAgICAgICAgY29tbWFuZCA9IFtvcy5wYXRoLmpvaW4oZ3N0X2RpciwgJ2dz dC1lbnYucHknKSwgJy0tYnVpbGRkaXInLCBnc3RfYnVpbGRkaXIsICctLXNyY2RpcicsIGdzdF9k aXIsICItLW9ubHktZW52aXJvbm1lbnQiXQorICAgICAgICBnc3RfZW52ID0gcnVuX3Nhbml0aXpl ZChjb21tYW5kLCBnYXRoZXJfb3V0cHV0PVRydWUpCisgICAgICAgIHdoaXRlbGlzdCA9ICgiTERf TElCUkFSWV9QQVRIIiwgIlBBVEgiLCAiUEtHX0NPTkZJR19QQVRIIikKKyAgICAgICAgZW52ID0g W10KKyAgICAgICAgZm9yIGxpbmUgaW4gW2xpbmUgZm9yIGxpbmUgaW4gZ3N0X2Vudi5zcGxpdGxp bmVzKCkgaWYgbm90IGxpbmUuc3RhcnRzd2l0aCgiZXhwb3J0IildOgorICAgICAgICAgICAgdG9r ZW5zID0gbGluZS5zcGxpdCgiPSIpCisgICAgICAgICAgICB2YXJfbmFtZSwgY29udGVudHMgPSB0 b2tlbnNbMF0sICI9Ii5qb2luKHRva2Vuc1sxOl0pCisgICAgICAgICAgICBpZiBub3QgdmFyX25h bWUuc3RhcnRzd2l0aCgiR1NUXyIpIGFuZCB2YXJfbmFtZSBub3QgaW4gd2hpdGVsaXN0OgorICAg ICAgICAgICAgICAgIGNvbnRpbnVlCisgICAgICAgICAgICBuZXdfY29udGVudHMgPSAnOicuam9p bihbc2VsZi5ob3N0X3BhdGhfdG9fc2FuZGJveF9wYXRoKHApIGZvciBwIGluIGNvbnRlbnRzLnNw bGl0KCI6IildKQorICAgICAgICAgICAgZW52LmFwcGVuZCgiLS1lbnY9JXM9JXMiICUgKHZhcl9u YW1lLCBuZXdfY29udGVudHMpKQorICAgICAgICByZXR1cm4gZW52CiAKICAgICBkZWYgaXNfYnJh bmNoX2J1aWxkKHNlbGYpOgogICAgICAgICB0cnk6CkBAIC02NDksNyArNjU4LDcgQEAgY2xhc3Mg V2Via2l0RmxhdHBhazoKIAogICAgICAgICAgICAgaWYgYXJnc1swXSA9PSAiYmFzaCI6CiAgICAg ICAgICAgICAgICAgYXJncy5leHRlbmQoWyctLW5vcHJvZmlsZScsICctLW5vcmMnLCAnLWknXSkK LSAgICAgICAgICAgICAgICBzYW5kYm94X2Vudmlyb25tZW50WyJQUzEiXSA9ICJb8J+TpvCfjJDw n5CxICRGTEFUUEFLX0lEIFxcV11cXCQgIgorICAgICAgICAgICAgICAgIHNhbmRib3hfZW52aXJv bm1lbnRbIlBTMSJdID0gIlvwn5Om8J+MkPCfkLEgJEZMQVRQQUtfSUQgXFxXXVxcJCAiLmRlY29k ZSgidXRmLTgiKQogICAgICAgICAgICAgYnVpbGRpbmcgPSBvcy5wYXRoLmJhc2VuYW1lKGFyZ3Nb MF0pLnN0YXJ0c3dpdGgoImJ1aWxkIikKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGJ1aWxk aW5nID0gRmFsc2UKQEAgLTc4MiwxMSArNzkxLDEwIEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAg ICAgICAgIGZvciBlbnZ2YXIsIHZhbHVlIGluIHNhbmRib3hfZW52aXJvbm1lbnQuaXRlbXMoKToK ICAgICAgICAgICAgIGZsYXRwYWtfY29tbWFuZC5hcHBlbmQoIi0tZW52PSVzPSVzIiAlIChlbnZ2 YXIsIHZhbHVlKSkKIAotICAgICAgICBnc3RfZW52ID0gW10KICAgICAgICAgaWYgbm90IGt3YXJn cy5nZXQoJ2J1aWxkaW5nX2dzdCcpOgotICAgICAgICAgICAgZ3N0X2VudiA9IHNlbGYuc2V0dXBf Z3N0YnVpbGQoYnVpbGRpbmcpCisgICAgICAgICAgICBleHRyYV9mbGF0cGFrX2FyZ3MuZXh0ZW5k KHNlbGYuc2V0dXBfZ3N0YnVpbGQoYnVpbGRpbmcpKQogCi0gICAgICAgIGZsYXRwYWtfY29tbWFu ZCArPSBleHRyYV9mbGF0cGFrX2FyZ3MgKyBbJy0tY29tbWFuZD0lcycgJSBhcmdzWzBdLCAib3Jn LndlYmtpdC5TZGsiXSArIGdzdF9lbnYgKyBhcmdzWzE6XQorICAgICAgICBmbGF0cGFrX2NvbW1h bmQgKz0gZXh0cmFfZmxhdHBha19hcmdzICsgWyctLWNvbW1hbmQ9JXMnICUgYXJnc1swXSwgIm9y Zy53ZWJraXQuU2RrIl0gKyBhcmdzWzE6XQogCiAgICAgICAgIGZsYXRwYWtfZW52ID0gb3MuZW52 aXJvbgogICAgICAgICBmbGF0cGFrX2Vudi51cGRhdGUoewo=