209648 2020-03-27 03:34:22 -0700 [Flatpak SDK] build-webkit --flatpak-cmakeargs option is ignored 2020-04-03 02:22:13 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand aperez bugs-noreply clopez tsaunier webkit-bug-importer zan oldest_to_newest 1634784 0 pnormand 2020-03-27 03:34:22 -0700 Because build-webkit spawns webkit-flatpak --command="build-webkit ..." instead of webkit-flatpak -b. I'm not sure this -b makes much sense anymore. 1634787 1 pnormand 2020-03-27 03:40:02 -0700 Generally speaking, I think webkit-flatpak has too many, redundant, options... Maybe we can remove most of those? For instance, --tests doesn't seem necessary as we should use run-webkit-tests directly. Dunno. Just some thoughts :) 1636506 2 395170 pnormand 2020-04-01 08:43:25 -0700 Created attachment 395170 Patch 1636535 3 clopez 2020-04-01 09:44:24 -0700 Speaking for myself I use none of those.. I run the scripts (run-minibrowser, run-webkit-tests, etc) directly and I expect those scripts to work automatically with flatpak if I have previously built the third-party libraries with flatpak. But I don't know if somebody else uses this :? 1636544 4 pnormand 2020-04-01 09:54:22 -0700 To my knowledge Thibault was the only one using webkit-flatpak directly. I use it occasionally but only to get in the sandbox or run gdb. I also use the existing scripts whenever possible. 1636658 5 aperez 2020-04-01 14:30:06 -0700 (In reply to Philippe Normand from comment #4) > To my knowledge Thibault was the only one using webkit-flatpak directly. I > use it occasionally but only to get in the sandbox or run gdb. I also use > the existing scripts whenever possible. I have used “webkit-flatpak” directly sometimes, most of the time it's nicer to use the existing scripts, but having the escape hatch to do things “by hand” with the Flatpak environment is handy — the same way as having the “jhbuild-wrapper” script has been useful sometimes. 1636831 6 pnormand 2020-04-02 01:45:50 -0700 Which webkit-flatpak options do you use? This patch doesn't remove all of them :) 1637288 7 pnormand 2020-04-03 02:21:34 -0700 Committed r259451: <https://trac.webkit.org/changeset/259451> 1637289 8 webkit-bug-importer 2020-04-03 02:22:13 -0700 <rdar://problem/61251129> 395170 2020-04-01 08:43:25 -0700 2020-04-03 01:45:09 -0700 Patch bug-209648-20200401164324.patch text/plain 14666 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MzQ1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjVhZDY4YTVkMjg0MDg5NDdkOTA1ZjI3YzQxYWZjYzUz MmFjMDVhMi4uODcxMTUzZTJiYThiNWI1Y2RiZWQwYTEzNDMyNWQwY2I0YWUxN2UxYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIwLTA0LTAxICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIGJ1aWxkLXdlYmtpdCAtLWZsYXRwYWstY21ha2Vhcmdz IG9wdGlvbiBpcyBpZ25vcmVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDk2NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIHJlbW92ZXMgcmVkdW5kYW50IG9wdGlvbnMgZnJvbSB3ZWJr aXQtZmxhdHBhaywKKyAgICAgICAgY29ycmVjdGx5IGhhbmRsZXMgdGhlIGNtYWtlYXJncyBvcHRp b24gYW5kIHJlZHVjZXMgdGhlIGFtb3VudCBvZgorICAgICAgICBgZmxhdHBhayBsaXN0YCBjYWxs cyBwZXJmb3JtZWQuCisKKyAgICAgICAgKiBmbGF0cGFrL2ZsYXRwYWt1dGlscy5weToKKyAgICAg ICAgKGNoZWNrX2ZsYXRwYWspOgorICAgICAgICAoRmxhdHBha1BhY2thZ2VzLl9faW5pdF9fKToK KyAgICAgICAgKEZsYXRwYWtQYWNrYWdlLmlzX2luc3RhbGxlZCk6CisgICAgICAgIChXZWJraXRG bGF0cGFrLmxvYWRfZnJvbV9hcmdzKToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsuX19pbml0X18p OgorICAgICAgICAoV2Via2l0RmxhdHBhay5jbGVhbl9hcmdzKToKKyAgICAgICAgKFdlYmtpdEZs YXRwYWsucnVuX2luX3NhbmRib3gpOgorICAgICAgICAoV2Via2l0RmxhdHBhay5tYWluKToKKyAg ICAgICAgKFdlYmtpdEZsYXRwYWsuc2V0dXBfZGV2X2Vudik6CisgICAgICAgIChXZWJraXRGbGF0 cGFrLnJ1bl9nZGIpOgorCiAyMDIwLTA0LTAxICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRA aWdhbGlhLmNvbT4KIAogICAgICAgICBbRmxhdHBhayBTREtdIE1pZ3JhdGlvbiB0byB2ZXJzaW9u IDAuMgpkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkgYi9Ub29scy9m bGF0cGFrL2ZsYXRwYWt1dGlscy5weQppbmRleCAzOWVjZjhlOGU0YmJkODRkZDEwZTVhY2JhMzBl YWZlYTY5MjhmYmM3Li45YTkyN2E5ZDM3MDdkYzAzOTU0MjAzODYxY2ZiYTY1ZDIxM2E1NmNhIDEw MDY0NAotLS0gYS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQorKysgYi9Ub29scy9mbGF0 cGFrL2ZsYXRwYWt1dGlscy5weQpAQCAtMTMwLDcgKzEzMCw3IEBAIGRlZiBjaGVja19mbGF0cGFr KHZlcmJvc2U9VHJ1ZSk6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIg dG8gYmUgYWJsZSB0byB1c2UgdGhlICclcycgc2NyaXB0LlxuXG4iCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJZb3UgY2FuIGZpbmQgc29tZSBpbmZvcm1hdGlvbnMgYWJv dXQiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgaG93IHRvIGluc3Rh bGwgaXQgZm9yIHlvdXIgZGlzdHJpYnV0aW9uIGF0OlxuIgotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiICAgICogaHR0cDovL2ZsYXRwYWsub3JnLyVzXG4iLCBhcHAsIHJl cXVpcmVkX3ZlcnNpb24sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIg ICAgKiBodHRwczovL2ZsYXRwYWsub3JnLyVzXG4iLCBhcHAsIHJlcXVpcmVkX3ZlcnNpb24sCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN5cy5hcmd2WzBdKQogICAgICAg ICAgICAgcmV0dXJuIEZhbHNlCiAKQEAgLTE4MSwxMSArMTgxLDggQEAgY2xhc3MgRmxhdHBha1Bh Y2thZ2VzKEZsYXRwYWtPYmplY3QpOgogCiAgICAgICAgIHNlbGYucmVwb3MgPSByZXBvcwogCi0g ICAgICAgIHNlbGYucGFja2FnZXMgPSBzZWxmLl9fZGV0ZWN0X3J1bnRpbWVzKCkKLQotICAgIGRl ZiBfX2RldGVjdF9wYWNrYWdlcyhzZWxmLCAqYXJncyk6CiAgICAgICAgIHBhY2tzID0gW10KLSAg ICAgICAgb3V0ID0gc2VsZi5mbGF0cGFrKCJsaXN0IiwgIi0tY29sdW1ucz1hcHBsaWNhdGlvbixh cmNoLGJyYW5jaCxvcmlnaW4iLCAqYXJncykKKyAgICAgICAgb3V0ID0gc2VsZi5mbGF0cGFrKCJs aXN0IiwgIi0tY29sdW1ucz1hcHBsaWNhdGlvbixhcmNoLGJyYW5jaCxvcmlnaW4iLCAiLWEiKQog ICAgICAgICBwYWNrYWdlX2RlZnMgPSBbbGluZSBmb3IgbGluZSBpbiBvdXQuc3BsaXQoIlxuIikg aWYgbGluZV0KICAgICAgICAgZm9yIHBhY2thZ2VfZGVmIGluIHBhY2thZ2VfZGVmczoKICAgICAg ICAgICAgIG5hbWUsIGFyY2gsIGJyYW5jaCwgb3JpZ2luID0gcGFja2FnZV9kZWYuc3BsaXQoIlx0 IikKQEAgLTE5NSwxMCArMTkyLDcgQEAgY2xhc3MgRmxhdHBha1BhY2thZ2VzKEZsYXRwYWtPYmpl Y3QpOgogCiAgICAgICAgICAgICBwYWNrcy5hcHBlbmQoRmxhdHBha1BhY2thZ2UobmFtZSwgYnJh bmNoLCByZXBvLCBhcmNoKSkKIAotICAgICAgICByZXR1cm4gcGFja3MKLQotICAgIGRlZiBfX2Rl dGVjdF9ydW50aW1lcyhzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX19kZXRlY3RfcGFja2Fn ZXMoIi0tcnVudGltZSIpCisgICAgICAgIHNlbGYucGFja2FnZXMgPSBwYWNrcwogCiAgICAgZGVm IF9faXRlcl9fKHNlbGYpOgogICAgICAgICBmb3IgcGFja2FnZSBpbiBzZWxmLnBhY2thZ2VzOgpA QCAtMzI5LDExICszMjMsOCBAQCBjbGFzcyBGbGF0cGFrUGFja2FnZShGbGF0cGFrT2JqZWN0KToK ICAgICAgICAgICAgICMgQnVuZGxlIGluc3RhbGxlZCBmcm9tIGZpbGUKICAgICAgICAgICAgIHJl dHVybiBUcnVlCiAKLSAgICAgICAgc2VsZi5yZXBvLnJlcG9zLnVwZGF0ZSgpCiAgICAgICAgIGZv ciBwYWNrYWdlIGluIHNlbGYucmVwby5yZXBvcy5wYWNrYWdlczoKLSAgICAgICAgICAgIGlmIHBh Y2thZ2UubmFtZSA9PSBzZWxmLm5hbWUgYW5kIFwKLSAgICAgICAgICAgICAgICAgICAgcGFja2Fn ZS5icmFuY2ggPT0gYnJhbmNoIGFuZCBcCi0gICAgICAgICAgICAgICAgICAgIHBhY2thZ2UuYXJj aCA9PSBzZWxmLmFyY2g6CisgICAgICAgICAgICBpZiBwYWNrYWdlLm5hbWUgPT0gc2VsZi5uYW1l IGFuZCBwYWNrYWdlLmJyYW5jaCA9PSBicmFuY2ggYW5kIHBhY2thZ2UuYXJjaCA9PSBzZWxmLmFy Y2g6CiAgICAgICAgICAgICAgICAgcmV0dXJuIFRydWUKIAogICAgICAgICByZXR1cm4gRmFsc2UK QEAgLTM4MCwzMiArMzcxLDIyIEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIGdlbmVy YWwuYWRkX2FyZ3VtZW50KCctLXZlcmJvc2UnLCBhY3Rpb249J3N0b3JlX3RydWUnLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSdTaG93IGRlYnVnIG1lc3NhZ2UnKQogICAgICAg ICBnZW5lcmFsLmFkZF9hcmd1bWVudCgiLS1kZWJ1ZyIsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGhlbHA9IkNvbXBpbGUgd2l0aCBEZWJ1ZyBjb25maWd1cmF0aW9uLCBhbHNvIGluc3Rh bGxzIFNkayBkZWJ1ZyBzeW1ib2xlcy4iLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBo ZWxwPSJDb21waWxlIHdpdGggRGVidWcgY29uZmlndXJhdGlvbiwgYWxzbyBpbnN0YWxscyBTZGsg ZGVidWcgc3ltYm9scy4iLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhY3Rpb249InN0 b3JlX3RydWUiKQogICAgICAgICBnZW5lcmFsLmFkZF9hcmd1bWVudCgiLS1yZWxlYXNlIiwgaGVs cD0iQ29tcGlsZSB3aXRoIFJlbGVhc2UgY29uZmlndXJhdGlvbi4iLCBhY3Rpb249InN0b3JlX3Ry dWUiKQotICAgICAgICBnZW5lcmFsLmFkZF9hcmd1bWVudCgnLS1wbGF0Zm9ybScsIGFjdGlvbj0n c3RvcmUnLCBoZWxwPSdQbGF0Zm9ybSB0byB1c2UgKGUuZy4sICJtYWMtbGlvbiIpJyksCiAgICAg ICAgIGdlbmVyYWwuYWRkX2FyZ3VtZW50KCctLWd0aycsIGFjdGlvbj0nc3RvcmVfY29uc3QnLCBk ZXN0PSdwbGF0Zm9ybScsIGNvbnN0PSdndGsnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBoZWxwPSdBbGlhcyBmb3IgLS1wbGF0Zm9ybT1ndGsnKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBoZWxwPSdTZXR1cCBidWlsZCBkaXJlY3RvcnkgZm9yIHRoZSBHVEsgcG9ydCcpCiAg ICAgICAgIGdlbmVyYWwuYWRkX2FyZ3VtZW50KCctLXdwZScsIGFjdGlvbj0nc3RvcmVfY29uc3Qn LCBkZXN0PSdwbGF0Zm9ybScsIGNvbnN0PSd3cGUnLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBoZWxwPSgnQWxpYXMgZm9yIC0tcGxhdGZvcm09d3BlJykpCi0gICAgICAgIGdlbmVyYWwu YWRkX2FyZ3VtZW50KCItbmYiLCAiLS1uby1mbGF0cGFrLXVwZGF0ZSIsIGRlc3Q9Im5vX2ZsYXRw YWtfdXBkYXRlIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWN0aW9uPSJzdG9yZV90 cnVlIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0iRG8gbm90IHVwZGF0ZSBm bGFwdGFrIHJ1bnRpbWUvc2RrIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0o J1NldHVwIGJ1aWxkIGRpcmVjdG9yeSBmb3IgdGhlIFdQRSBwb3J0JykpCiAgICAgICAgIGdlbmVy YWwuYWRkX2FyZ3VtZW50KCItdSIsICItLXVwZGF0ZSIsIGRlc3Q9InVwZGF0ZSIsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGhlbHA9IlVwZGF0ZSB0aGUgcnVudGltZS9zZGsvYXBwIGFuZCByZWJ1 aWxkIHRoZSBkZXZlbG9wbWVudCBlbnZpcm9ubWVudCBpZiBuZWVkZWQiKQotICAgICAgICBnZW5l cmFsLmFkZF9hcmd1bWVudCgiLWIiLCAiLS1idWlsZC13ZWJraXQiLCBkZXN0PSJidWlsZF93ZWJr aXQiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhY3Rpb249InN0b3JlX3RydWUiLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSJGb3JjZSByZWJ1aWxkaW5nIHRoZSBh cHAuIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0iVXBkYXRlIHRoZSBTREsi KQogICAgICAgICBnZW5lcmFsLmFkZF9hcmd1bWVudCgiLWJnc3QiLCAiLS1idWlsZC1nc3QiLCBk ZXN0PSJidWlsZF9nc3QiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhY3Rpb249InN0 b3JlX3RydWUiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSJGb3JjZSByZWJ1 aWxkaW5nIGdzdC1idWlsZCwgcmVwb3NpdG9yeSBwYXRoIGlzIGRlZmluZWQgYnkgdGhlIGBHU1Rf QlVJTERfUEFUSGAgZW52aXJvbm1lbnQgdmFyaWFibGUuIikKICAgICAgICAgZ2VuZXJhbC5hZGRf YXJndW1lbnQoIi1xIiwgIi0tcXVpZXQiLCBkZXN0PSJxdWlldCIsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGhlbHA9IkRvIG5vdCBwcmludCBhbnl0aGluZyIpCi0gICAgICAgIGdlbmVyYWwuYWRk X2FyZ3VtZW50KCItdCIsICItLXRlc3RzIiwgZGVzdD0icnVuX3Rlc3RzIiwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbmFyZ3M9YXJncGFyc2UuUkVNQUlOREVSLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBoZWxwPSJSdW4gTGF5b3V0VGVzdHMiKQogICAgICAgICBnZW5lcmFs LmFkZF9hcmd1bWVudCgiLWMiLCAiLS1jb21tYW5kIiwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbmFyZ3M9YXJncGFyc2UuUkVNQUlOREVSLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBoZWxwPSJUaGUgY29tbWFuZCB0byBydW4gaW4gdGhlIHNhbmRib3giLApAQCAtNDIwLDEz ICs0MDEsOSBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICBkZWJ1Z29wdGlvbnMuYWRk X2FyZ3VtZW50KCItbSIsICItLWNvcmVkdW1wY3RsLW1hdGNoZXMiLCBkZWZhdWx0PSIiLCBoZWxw PSdBcmd1bWVudHMgdG8gcGFzcyB0byBnZGIuJykKIAogICAgICAgICBidWlsZG9wdGlvbnMgPSBw YXJzZXIuYWRkX2FyZ3VtZW50X2dyb3VwKCJFeHRyYSBidWlsZCBhcmd1bWVudHMiKQotICAgICAg ICBidWlsZG9wdGlvbnMuYWRkX2FyZ3VtZW50KCItLW1ha2VhcmdzIiwgaGVscD0iT3B0aW9uYWwg TWFrZWZpbGUgZmxhZ3MiKQogICAgICAgICBidWlsZG9wdGlvbnMuYWRkX2FyZ3VtZW50KCItLWNt YWtlYXJncyIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0iT25lIG9y IG1vcmUgb3B0aW9uYWwgQ01ha2UgZmxhZ3MgKGUuZy4gLS1jbWFrZWFyZ3M9XCItREZPTz1iYXIg LURDTUFLRV9QUkVGSVhfUEFUSD0vdXNyL2xvY2FsXCIpIikKIAotICAgICAgICBnZW5lcmFsLmFk ZF9hcmd1bWVudCgiLS1jbGVhbiIsIGRlc3Q9ImNsZWFuIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0iQ2xlYW4gcHJldmlvdXMgYnVpbGRz IGFuZCByZXN0YXJ0IGZyb20gc2NyYXRjaCIpCi0KICAgICAgICAgXywgc2VsZi5hcmdzID0gcGFy c2VyLnBhcnNlX2tub3duX2FyZ3MoYXJncz1hcmdzLCBuYW1lc3BhY2U9c2VsZikKIAogICAgICAg ICBpZiBvcy5lbnZpcm9uLmdldCgnQ0NBQ0hFX1BSRUZJWCcpID09ICdpY2VjYyc6CkBAIC00NDMs MzUgKzQyMCwyMCBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICBzZWxmLnF1aWV0ID0g RmFsc2UKICAgICAgICAgc2VsZi51cGRhdGUgPSBGYWxzZQogICAgICAgICBzZWxmLmFyZ3MgPSBb XQotICAgICAgICBzZWxmLmZpbmlzaF9hcmdzID0gTm9uZQogICAgICAgICBzZWxmLmdkYl9zdGFj a190cmFjZSA9IEZhbHNlCiAKLSAgICAgICAgc2VsZi5ub19mbGF0cGFrX3VwZGF0ZSA9IEZhbHNl CiAgICAgICAgIHNlbGYucmVsZWFzZSA9IEZhbHNlCiAgICAgICAgIHNlbGYuZGVidWcgPSBGYWxz ZQotICAgICAgICBzZWxmLmNsZWFuID0gRmFsc2UKLSAgICAgICAgc2VsZi5ydW5fdGVzdHMgPSBO b25lCiAgICAgICAgIHNlbGYuc291cmNlX3Jvb3QgPSBvcy5wYXRoLm5vcm1wYXRoKG9zLnBhdGgu YWJzcGF0aChvcy5wYXRoLmpvaW4oc2NyaXB0ZGlyLCAnLi4vLi4vJykpKQogICAgICAgICAjIFdo ZXJlIHRoZSBzb3VyY2UgZm9sZGVyIGlzIG1vdW50ZWQgaW5zaWRlIHRoZSBzYW5kYm94LgogICAg ICAgICBzZWxmLnNhbmRib3hfc291cmNlX3Jvb3QgPSAiL2FwcC93ZWJraXQiCiAKLSAgICAgICAg c2VsZi5idWlsZF93ZWJraXQgPSBGYWxzZQogICAgICAgICBzZWxmLmJ1aWxkX2dzdCA9IEZhbHNl Ci0gICAgICAgIHNlbGYuYnVpbGRfYWxsID0gRmFsc2UKIAogICAgICAgICBzZWxmLnNka19icmFu Y2ggPSAiMC4yIgogICAgICAgICBzZWxmLnBsYXRmb3JtID0gImd0ayIKICAgICAgICAgc2VsZi5i dWlsZF90eXBlID0gIlJlbGVhc2UiCi0gICAgICAgIHNlbGYubWFuaWZlc3RfcGF0aCA9IE5vbmUK LSAgICAgICAgc2VsZi5uYW1lID0gTm9uZQotICAgICAgICBzZWxmLmJ1aWxkX25hbWUgPSBOb25l Ci0gICAgICAgIHNlbGYuZmxhdHBha19yb290X3BhdGggPSBOb25lCi0gICAgICAgIHNlbGYuY2Fj aGVfcGF0aCA9IE5vbmUKLSAgICAgICAgc2VsZi5mbGF0cGFrX2RlZmF1bHRfYXJncyA9IFtdCiAg ICAgICAgIHNlbGYuY2hlY2tfYXZhaWxhYmxlID0gRmFsc2UKLQotICAgICAgICAjIERlZmF1bHQg YXBwbGljYXRpb24gdG8gcnVuIGluIHRoZSBzYW5kYm94Ci0gICAgICAgIHNlbGYuY29tbWFuZCA9 IE5vbmUKICAgICAgICAgc2VsZi51c2VyX2NvbW1hbmQgPSBbXQogCiAgICAgICAgICMgZGVidWcg b3B0aW9ucwpAQCAtNDgwLDcgKzQ0Miw2IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAKICAgICAg ICAgIyBFeHRyYSBidWlsZCBvcHRpb25zCiAgICAgICAgIHNlbGYuY21ha2VhcmdzID0gIiIKLSAg ICAgICAgc2VsZi5tYWtlYXJncyA9ICIiCiAKICAgICAgICAgc2VsZi51c2VfaWNlY3JlYW0gPSBG YWxzZQogICAgICAgICBzZWxmLmljY192ZXJzaW9uID0gTm9uZQpAQCAtNTAxLDE3ICs0NjIsMTEg QEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgICAgIHNlbGYuZGVidWcgPSBwb3J0LmRl ZmF1bHRfY29uZmlndXJhdGlvbigpID09ICJEZWJ1ZyIKIAogICAgICAgICBzZWxmLmJ1aWxkX3R5 cGUgPSAiRGVidWciIGlmIHNlbGYuZGVidWcgZWxzZSAiUmVsZWFzZSIKLQogICAgICAgICBzZWxm LnBsYXRmb3JtID0gc2VsZi5wbGF0Zm9ybS51cHBlcigpCiAKICAgICAgICAgaWYgc2VsZi5nZGIg aXMgTm9uZSBhbmQgJy0tZ2RiJyBpbiBzeXMuYXJndjoKICAgICAgICAgICAgIHNlbGYuZ2RiID0g VHJ1ZQogCi0gICAgICAgIHNlbGYuY29tbWFuZCA9ICIlcyAlcyAlcyIgJSAob3MucGF0aC5qb2lu KHNlbGYuc2FuZGJveF9zb3VyY2Vfcm9vdCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIlRvb2xzL1NjcmlwdHMvcnVuLW1pbmlicm93c2VyIiksCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tIiArIHNlbGYucGxhdGZvcm0u bG93ZXIoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiIC0tZGVidWci IGlmIHNlbGYuZGVidWcgZWxzZSAiIC0tcmVsZWFzZSIpCi0KICAgICAgICAgc2VsZi5mbGF0cGFr X2J1aWxkX3BhdGggPSBvcy5lbnZpcm9uWyJGTEFUUEFLX1VTRVJfRElSIl0KIAogICAgICAgICBi dWlsZF9yb290ID0gb3MucGF0aC5qb2luKHNlbGYuc291cmNlX3Jvb3QsICdXZWJLaXRCdWlsZCcp CkBAIC01MjcsNyArNDgyLDYgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgaWYgbm90 IGNoZWNrX2ZsYXRwYWsoKToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogCi0gICAgICAgIHNl bGYuZmluaXNoX2FyZ3MgPSBbXQogICAgICAgICBzZWxmLl9yZXNldF9yZXBvc2l0b3J5KCkKIAog ICAgICAgICB0cnk6CkBAIC03MjIsOSArNjc2LDggQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAg ICAgICAgZ3N0X2VudiA9IFtdCiAgICAgICAgIGlmIG5vdCBrd2FyZ3MuZ2V0KCdidWlsZGluZ19n c3QnKToKICAgICAgICAgICAgIGdzdF9lbnYgPSBzZWxmLnNldHVwX2dzdGJ1aWxkKGJ1aWxkaW5n KQotICAgICAgICBmbGF0cGFrX2NvbW1hbmQgKz0gc2VsZi5maW5pc2hfYXJncyArIGV4dHJhX2Zs YXRwYWtfYXJncyArIFwKLSAgICAgICAgICAgIFtzZWxmLmZsYXRwYWtfYnVpbGRfcGF0aF0gKyBn c3RfZW52ICsgYXJncwogCisgICAgICAgIGZsYXRwYWtfY29tbWFuZCArPSBleHRyYV9mbGF0cGFr X2FyZ3MgKyBbc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGhdICsgZ3N0X2VudiArIGFyZ3MKICAgICAg ICAgX2xvZy5kZWJ1ZygnUnVubmluZyBpbiBzYW5kYm94OiAlc1xuJyAlICcgJy5qb2luKGZsYXRw YWtfY29tbWFuZCkpCiAKICAgICAgICAgdHJ5OgpAQCAtNzQ0LDI0ICs2OTcsMTkgQEAgY2xhc3Mg V2Via2l0RmxhdHBhazoKICAgICAgICAgaWYgbm90IHNlbGYuY2xlYW5fYXJncygpOgogICAgICAg ICAgICAgcmV0dXJuIDEKIAotICAgICAgICBpZiBzZWxmLmNsZWFuOgotICAgICAgICAgICAgaWYg b3MucGF0aC5leGlzdHMoc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGgpOgotICAgICAgICAgICAgICAg IHNodXRpbC5ybXRyZWUoc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGgpCi0gICAgICAgICAgICBpZiBv cy5wYXRoLmV4aXN0cyhzZWxmLmJ1aWxkX3BhdGgpOgotICAgICAgICAgICAgICAgIHNodXRpbC5y bXRyZWUoc2VsZi5idWlsZF9wYXRoKQotCiAgICAgICAgIGlmIHNlbGYudXBkYXRlOgogICAgICAg ICAgICAgQ29uc29sZS5tZXNzYWdlKCJVcGRhdGluZyBGbGF0cGFrICVzIGVudmlyb25tZW50IiAl IHNlbGYuYnVpbGRfdHlwZSkKLSAgICAgICAgICAgIGlmIG5vdCBzZWxmLm5vX2ZsYXRwYWtfdXBk YXRlOgotICAgICAgICAgICAgICAgIHJlcG8gPSBzZWxmLnNka19yZXBvCi0gICAgICAgICAgICAg ICAgcmVwby5mbGF0cGFrKCJ1cGRhdGUiKQotICAgICAgICAgICAgICAgIGZvciBwYWNrYWdlIGlu IHNlbGYuX2dldF9wYWNrYWdlcygpOgotICAgICAgICAgICAgICAgICAgICBpZiBwYWNrYWdlLm5h bWUuc3RhcnRzd2l0aCgib3JnLndlYmtpdCIpIGFuZCByZXBvLmlzX2FwcF9pbnN0YWxsZWQocGFj a2FnZS5uYW1lKSBcCi0gICAgICAgICAgICAgICAgICAgICAgIGFuZCBub3QgcmVwby5pc19hcHBf aW5zdGFsbGVkKHBhY2thZ2UubmFtZSwgYnJhbmNoPXNlbGYuc2RrX2JyYW5jaCk6Ci0gICAgICAg ICAgICAgICAgICAgICAgICBDb25zb2xlLm1lc3NhZ2UoIk5ldyBTREsgdmVyc2lvbiBhdmFpbGFi bGUsIHJlbW92aW5nIGxvY2FsIFVzZXJGbGF0cGFrIGRpcmVjdG9yeSBiZWZvcmUgc3dpdGNoaW5n IHRvIG5ldyB2ZXJzaW9uIikKLSAgICAgICAgICAgICAgICAgICAgICAgIHNodXRpbC5ybXRyZWUo c2VsZi5mbGF0cGFrX2J1aWxkX3BhdGgpCi0gICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9y ZXNldF9yZXBvc2l0b3J5KCkKLSAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAg ICAgICByZXBvID0gc2VsZi5zZGtfcmVwbworICAgICAgICAgICAgcmVwby5mbGF0cGFrKCJ1cGRh dGUiKQorICAgICAgICAgICAgZm9yIHBhY2thZ2UgaW4gc2VsZi5fZ2V0X3BhY2thZ2VzKCk6Cisg ICAgICAgICAgICAgICAgaWYgcGFja2FnZS5uYW1lLnN0YXJ0c3dpdGgoIm9yZy53ZWJraXQiKSBh bmQgcmVwby5pc19hcHBfaW5zdGFsbGVkKHBhY2thZ2UubmFtZSkgXAorICAgICAgICAgICAgICAg ICAgIGFuZCBub3QgcmVwby5pc19hcHBfaW5zdGFsbGVkKHBhY2thZ2UubmFtZSwgYnJhbmNoPXNl bGYuc2RrX2JyYW5jaCk6CisgICAgICAgICAgICAgICAgICAgIENvbnNvbGUubWVzc2FnZSgiTmV3 IFNESyB2ZXJzaW9uIGF2YWlsYWJsZSwgcmVtb3ZpbmcgbG9jYWwgVXNlckZsYXRwYWsgZGlyZWN0 b3J5IGJlZm9yZSBzd2l0Y2hpbmcgdG8gbmV3IHZlcnNpb24iKQorICAgICAgICAgICAgICAgICAg ICBzaHV0aWwucm10cmVlKHNlbGYuZmxhdHBha19idWlsZF9wYXRoKQorICAgICAgICAgICAgICAg ICAgICBzZWxmLl9yZXNldF9yZXBvc2l0b3J5KCkKKyAgICAgICAgICAgICAgICAgICAgYnJlYWsK KyAgICAgICAgICAgICAgICBlbGlmIG5vdCByZXBvLmlzX2FwcF9pbnN0YWxsZWQocGFja2FnZS5u YW1lKToKKyAgICAgICAgICAgICAgICAgICAgcGFja2FnZS5pbnN0YWxsKCkKIAogICAgICAgICBy ZXR1cm4gc2VsZi5zZXR1cF9kZXZfZW52KCkKIApAQCAtNzkxLDcgKzczOSw3IEBAIGNsYXNzIFdl YmtpdEZsYXRwYWs6CiAgICAgICAgICAgICBzZWxmLmljY192ZXJzaW9uID0gb3MucGF0aC5qb2lu KHNlbGYuc291cmNlX3Jvb3QsIGljY192ZXJzaW9uX2ZpbGVuYW1lKQogCiAgICAgZGVmIHNldHVw X2Rldl9lbnYoc2VsZik6Ci0gICAgICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpv aW4oc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGgsICJydW50aW1lIiwgIm9yZy53ZWJraXQuU2RrIikp IG9yIHNlbGYudXBkYXRlIG9yIHNlbGYuYnVpbGRfYWxsOgorICAgICAgICBpZiBub3Qgb3MucGF0 aC5leGlzdHMob3MucGF0aC5qb2luKHNlbGYuZmxhdHBha19idWlsZF9wYXRoLCAicnVudGltZSIs ICJvcmcud2Via2l0LlNkayIpKSBvciBzZWxmLnVwZGF0ZToKICAgICAgICAgICAgIHNlbGYuaW5z dGFsbF9hbGwoKQogICAgICAgICAgICAgc2VsZi5zZXR1cF9pY2VjYygpCiAgICAgICAgICAgICBz ZWxmLnNhdmVfY29uZmlnKCkKQEAgLTgwMiwzMSArNzUwLDE3IEBAIGNsYXNzIFdlYmtpdEZsYXRw YWs6CiAgICAgICAgICAgICAgICAgICAgIENvbnNvbGUuZXJyb3JfbWVzc2FnZSgiRmxhdHBhayBw YWNrYWdlICVzIG5vdCBpbnN0YWxsZWQuIFBsZWFzZSB1cGRhdGUgeW91ciBTREs6IFRvb2xzL1Nj cmlwdHMvdXBkYXRlLXdlYmtpdC1mbGF0cGFrIiwgcGFja2FnZSkKICAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIDEKIAotICAgICAgICBidWlsZF90eXBlID0gIi0tZGVidWciIGlmIHNlbGYuZGVi dWcgZWxzZSAiLS1yZWxlYXNlIgotCi0gICAgICAgIGlmIHNlbGYuYnVpbGRfd2Via2l0OgotICAg ICAgICAgICAgYnVpbGRlciA9IFsKLSAgICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4oc2VsZi5z YW5kYm94X3NvdXJjZV9yb290LCAnVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQnKSwKLSAgICAg ICAgICAgICAgICBidWlsZF90eXBlLCAnLS0nICsgc2VsZi5wbGF0Zm9ybS5sb3dlcigpXQotICAg ICAgICAgICAgaWYgc2VsZi5tYWtlYXJnczoKLSAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVu ZCgiLS1tYWtlYXJncz0lcyIgJSBzZWxmLm1ha2VhcmdzKQotICAgICAgICAgICAgaWYgc2VsZi5j bWFrZWFyZ3M6Ci0gICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoIi0tY21ha2VhcmdzPSVz IiAlIHNlbGYuY21ha2VhcmdzKQotICAgICAgICAgICAgQ29uc29sZS5tZXNzYWdlKCJCdWlsZGlu ZyB3ZWJraXQiKQotICAgICAgICAgICAgcmVzID0gc2VsZi5ydW5faW5fc2FuZGJveCgqYnVpbGRl cikKLQotICAgICAgICAgICAgaWYgcmVzOgotICAgICAgICAgICAgICAgIHJldHVybiByZXMKLQot ICAgICAgICBpZiBzZWxmLnJ1bl90ZXN0cyBpcyBub3QgTm9uZToKLSAgICAgICAgICAgIHRlc3Rf bGF1bmNoZXIgPSBbb3MucGF0aC5qb2luKHNlbGYuc2FuZGJveF9zb3VyY2Vfcm9vdCwgJ1Rvb2xz L1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cycpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBidWlsZF90eXBlLCAnLS0nICsgc2VsZi5wbGF0Zm9ybS5sb3dlcigpXSArIHNlbGYucnVuX3Rl c3RzCi0gICAgICAgICAgICByZXR1cm4gc2VsZi5ydW5faW5fc2FuZGJveCgqdGVzdF9sYXVuY2hl cikKLSAgICAgICAgZWxpZiBzZWxmLmdkYiBvciBzZWxmLmdkYl9zdGFja190cmFjZToKKyAgICAg ICAgaWYgc2VsZi5nZGIgb3Igc2VsZi5nZGJfc3RhY2tfdHJhY2U6CiAgICAgICAgICAgICByZXR1 cm4gc2VsZi5ydW5fZ2RiKCkKICAgICAgICAgZWxpZiBzZWxmLnVzZXJfY29tbWFuZDoKKyAgICAg ICAgICAgIHByb2dyYW0gPSBzZWxmLnVzZXJfY29tbWFuZFswXQorICAgICAgICAgICAgaWYgcHJv Z3JhbS5lbmRzd2l0aCgiYnVpbGQtd2Via2l0Iik6CisgICAgICAgICAgICAgICAgQ29uc29sZS5t ZXNzYWdlKCJCdWlsZGluZyB3ZWJraXQiKQorICAgICAgICAgICAgICAgIGlmIHNlbGYuY21ha2Vh cmdzOgorICAgICAgICAgICAgICAgICAgICBzZWxmLnVzZXJfY29tbWFuZC5hcHBlbmQoIi0tY21h a2VhcmdzPSVzIiAlIHNlbGYuY21ha2VhcmdzKQorCiAgICAgICAgICAgICByZXR1cm4gc2VsZi5y dW5faW5fc2FuZGJveCgqc2VsZi51c2VyX2NvbW1hbmQpCi0gICAgICAgIGVsaWYgbm90IHNlbGYu dXBkYXRlIGFuZCBub3Qgc2VsZi5idWlsZF93ZWJraXQgYW5kIG5vdCBzZWxmLmJ1aWxkX2dzdDoK KyAgICAgICAgZWxpZiBub3Qgc2VsZi51cGRhdGUgYW5kIG5vdCBzZWxmLmJ1aWxkX2dzdDoKICAg ICAgICAgICAgIHJldHVybiBzZWxmLnJ1bl9pbl9zYW5kYm94KCkKIAogICAgICAgICByZXR1cm4g MApAQCAtODY3LDcgKzgwMSw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICB0 cnk6CiAgICAgICAgICAgICAgICAgc3VicHJvY2Vzcy5jaGVja19vdXRwdXQoWyd3aGljaCcsICdj b3JlZHVtcGN0bCddKQogICAgICAgICAgICAgZXhjZXB0IHN1YnByb2Nlc3MuQ2FsbGVkUHJvY2Vz c0Vycm9yIGFzIGU6Ci0gICAgICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiJ2NvcmVkdW1w Y3RsJyBub3QgcHJlc2VudCBvbiB0aGUgc3lzdGVtLCBjYW4ndCBydW4uICglcylcbiIgJSBlKQor ICAgICAgICAgICAgICAgIENvbnNvbGUubWVzc2FnZSgiJ2NvcmVkdW1wY3RsJyBub3QgcHJlc2Vu dCBvbiB0aGUgc3lzdGVtLCBjYW4ndCBydW4uICglcylcbiIsIGUpCiAgICAgICAgICAgICAgICAg cmV0dXJuIGUucmV0dXJuY29kZQogCiAgICAgICAgICMgV2UgbmVlZCBhY2Nlc3MgdG8gdGhlIGhv c3QgZnJvbSB0aGUgc2FuZGJveCB0byBydW4uCkBAIC04ODMsNyArODE3LDcgQEAgY2xhc3MgV2Vi a2l0RmxhdHBhazoKICAgICAgICAgICAgICAgICAgICAgd2l0aCBvcGVuKHN0ZGVyci5uYW1lLCAn cicpIGFzIHN0ZGVycmY6CiAgICAgICAgICAgICAgICAgICAgICAgICBzdGRlcnIgPSBzdGRlcnJm LnJlYWQoKQogICAgICAgICAgICAgICAgICAgICBjbWQgPSAnICcuam9pbihlcnIuY21kKQotICAg ICAgICAgICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRlKCInJXMnIHJldHVybmVkIGEgbm9uLXpl cm8gZXhpdCBjb2RlLiBTdGRlcnI6ICVzIiAlIChjbWQsIHN0ZGVycikpCisgICAgICAgICAgICAg ICAgICAgIENvbnNvbGUubWVzc2FnZSgiJyVzJyByZXR1cm5lZCBhIG5vbi16ZXJvIGV4aXQgY29k ZS4gU3RkZXJyOiAlcyIsIGNtZCwgc3RkZXJyKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4g ZXJyLnJldHVybmNvZGUKIAogICAgICAgICAgICAgICAgIHdpdGggb3BlbihzdGRlcnIubmFtZSwg J3InKSBhcyBzdGRlcnJmOgo=