212086 2020-05-19 09:57:47 -0700 [FlatPak SDK] Missing ruby gems json and highline 2020-05-20 08:20:16 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 clopez pnormand aperez bugs-noreply pnormand zan oldest_to_newest 1654041 0 clopez 2020-05-19 09:57:47 -0700 From https://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20%28Tests%29/builds/13771/steps/jscore-test/logs/stdio Running: /usr/bin/env ruby Tools/Scripts/run-jsc-stress-tests -j /app/webkit/WebKitBuild/Release/bin/jsc -o /app/webkit/WebKitBuild/Release/bin/jsc-stress-results PerformanceTests/SunSpider/tests/sunspider-1.0 PerformanceTests/JetStream/cdjs/cdjs-tests.yaml PerformanceTests/ARES-6/Air/airjs-tests.yaml PerformanceTests/ARES-6/Basic/basic-tests.yaml JSTests/executableAllocationFuzz.yaml JSTests/exceptionFuzz.yaml PerformanceTests/SunSpider/no-architecture-specific-optimizations.yaml PerformanceTests/SunSpider/shadow-chicken.yaml PerformanceTests/SunSpider/tests/v8-v6 JSTests/stress JSTests/microbenchmarks JSTests/slowMicrobenchmarks.yaml PerformanceTests/SunSpider/profiler-test.yaml LayoutTests/jsc-layout-tests.yaml JSTests/typeProfiler.yaml JSTests/controlFlowProfiler.yaml JSTests/es6.yaml JSTests/modules.yaml JSTests/complex.yaml JSTests/ChakraCore.yaml JSTests/wasm.yaml JSTests/mozilla/mozilla-tests.yaml --memory-limited -- Warning: did not find json or highline; some features will be disabled. Run "sudo gem install json highline" to fix the issue. Error: #<LoadError: cannot load such file -- highline> 1654058 1 pnormand 2020-05-19 10:25:56 -0700 Seems like buildstream doesn't handle "ruby gems" yet. 1654388 2 399830 pnormand 2020-05-20 05:40:53 -0700 Created attachment 399830 Patch 1654395 3 399830 clopez 2020-05-20 06:12:06 -0700 Comment on attachment 399830 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=399830&action=review > Tools/buildstream/elements/sdk/ruby-highline.bst:22 > + mkdir /tmp/gem-tmp > + gem install --local --install-dir /tmp/gem-tmp/ *.gem > + mkdir -p %{install-root}/%{prefix}/lib/%{gcc_triplet}/ruby/2.6.0/ > + mv /tmp/gem-tmp/gems/*/lib/* %{install-root}/%{prefix}/lib/%{gcc_triplet}/ruby/2.6.0/ I suggest to add a final step to ensure of cleaning the temp-directory, so in can start from a clean state in case of rebuild. rm -fr /tmp/gem-tmp > Tools/buildstream/elements/sdk/ruby-json.bst:19 > + mkdir /tmp/gem-tmp > + gem install --local --install-dir /tmp/gem-tmp/ *.gem > + mkdir -p %{install-root}/%{prefix}/lib/%{gcc_triplet}/ruby/2.6.0/ > + mv /tmp/gem-tmp/gems/*/lib/* %{install-root}/%{prefix}/lib/%{gcc_triplet}/ruby/2.6.0/ ditto 1654396 4 399830 aperez 2020-05-20 06:19:28 -0700 Comment on attachment 399830 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=399830&action=review > Tools/buildstream/elements/sdk/ruby-highline.bst:22 > + mv /tmp/gem-tmp/gems/*/lib/* %{install-root}/%{prefix}/lib/%{gcc_triplet}/ruby/2.6.0/ Why not asking Ruby itself where it wants libraries installed? Also, the “gem install“ command could be instructed to copy files directly inside the target installation directory instead of manually moving files around. This command should be enough: gem install --local --ignore-dependencies --no-user-install --no-document \ --install-dir "$(ruby -e'puts Gem.default_dir')" \ --bindir /usr/bin --build-root '%{install-root}' \ file.gem (This is basically what GNU/Linux distributions do for Ruby packages.) 1654398 5 aperez 2020-05-20 06:20:36 -0700 (In reply to Carlos Alberto Lopez Perez from comment #3) > Comment on attachment 399830 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=399830&action=review > > > Tools/buildstream/elements/sdk/ruby-highline.bst:22 > > + mkdir /tmp/gem-tmp > > + gem install --local --install-dir /tmp/gem-tmp/ *.gem > > + mkdir -p %{install-root}/%{prefix}/lib/%{gcc_triplet}/ruby/2.6.0/ > > + mv /tmp/gem-tmp/gems/*/lib/* %{install-root}/%{prefix}/lib/%{gcc_triplet}/ruby/2.6.0/ > > I suggest to add a final step to ensure of cleaning the temp-directory, so > in can start from a clean state in case of rebuild. > rm -fr /tmp/gem-tmp That should not be needed with Buildstream, AFAIU the sandbox is always recreated afresh on every rebuild. Anyway that won't be needed using the alternative that I have proposed in my review. 1654401 6 clopez 2020-05-20 06:29:22 -0700 (In reply to Adrian Perez from comment #4) > Comment on attachment 399830 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=399830&action=review > > > Tools/buildstream/elements/sdk/ruby-highline.bst:22 > > + mv /tmp/gem-tmp/gems/*/lib/* %{install-root}/%{prefix}/lib/%{gcc_triplet}/ruby/2.6.0/ > > Why not asking Ruby itself where it wants libraries installed? Also, the > “gem install“ command could be instructed to copy files directly inside > the target installation directory instead of manually moving files around. > This command should be enough: > > gem install --local --ignore-dependencies --no-user-install --no-document \ > --install-dir "$(ruby -e'puts Gem.default_dir')" \ > --bindir /usr/bin --build-root '%{install-root}' \ > file.gem > > (This is basically what GNU/Linux distributions do for Ruby packages.) It seems this will still leave some "trash" in the install dir. Other arch packages do a manual step of cleaning after that. Check for example: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/ruby-json#n44 But maybe that cache files are needed to keep the "gem" command working so it can recognize installed gems and can uninstall them. Given that we don't have a package manager inside flatpak, it can be a good idea to leave that gem cache installed so the gem command can work inside flatpak and be able to detect installed gems. No strong opinion on any of this, just sharing what i found. 1654409 7 399836 pnormand 2020-05-20 07:02:48 -0700 Created attachment 399836 Patch 1654410 8 pnormand 2020-05-20 07:03:26 -0700 Thanks for the reviews. If you like this new version let's land it :) 1654427 9 399836 aperez 2020-05-20 07:38:11 -0700 Comment on attachment 399836 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=399836&action=review All looking nice and tidy now! =) > Tools/buildstream/elements/sdk/ruby-highline.bst:19 > + gem install --local --ignore-dependencies --no-user-install --no-document --install-dir "$(ruby -e'puts Gem.default_dir')" --bindir %{install-root}%{prefix}/bin --build-root '%{install-root}' *.gem Oh, using %{prefix} here is even an improvement over what I suggested. Neat. 1654443 10 ews-feeder 2020-05-20 08:20:15 -0700 Committed r261918: <https://trac.webkit.org/changeset/261918> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399836. 399830 2020-05-20 05:40:53 -0700 2020-05-20 07:02:44 -0700 Patch bug-212086-20200520134052.patch text/plain 4045 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTA5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTAxN2EzN2Q1OTc2YjEyMjJjMmVkNjhmNjJmYjk3MDJl YjFjZDUzNy4uNjA0YzFhYzlmNTQwYTM4YTliZDg5NzJlODk0ZTk0ZjRhZjM4MjFlZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIwLTA1LTIwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdFBhayBTREtdIE1pc3NpbmcgcnVieSBnZW1zIGpzb24gYW5kIGhpZ2hs aW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIw ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg dGhlIGpzb24gYW5kIGhpZ2hsaW5lIFJ1YnkgZ2VtcyBpbiB0aGUgRmxhdHBhayBTREsuCisgICAg ICAgIAorICAgICAgICAqIGJ1aWxkc3RyZWFtL2VsZW1lbnRzL3Nkay1wbGF0Zm9ybS5ic3Q6Cisg ICAgICAgICogYnVpbGRzdHJlYW0vZWxlbWVudHMvc2RrL3J1YnktaGlnaGxpbmUuYnN0OiBBZGRl ZC4KKyAgICAgICAgKiBidWlsZHN0cmVhbS9lbGVtZW50cy9zZGsvcnVieS1qc29uLmJzdDogQWRk ZWQuCisgICAgICAgICogYnVpbGRzdHJlYW0vcHJvamVjdC5jb25mOgorCiAyMDIwLTA1LTIwICBQ aGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbRmxhdHBh ayBTREtdIEFkZCBidWJibGV3cmFwIC4uLiB3cmFwcGVyCmRpZmYgLS1naXQgYS9Ub29scy9idWls ZHN0cmVhbS9lbGVtZW50cy9zZGstcGxhdGZvcm0uYnN0IGIvVG9vbHMvYnVpbGRzdHJlYW0vZWxl bWVudHMvc2RrLXBsYXRmb3JtLmJzdAppbmRleCAwNzZmZWU1ZTczNzE0NWU4YzQ5MGQ2NmI2M2Ew OTNiYWIxOTRmNDQxLi5hNTYyZDNjMTIyYTVmODZkOGMxYmVlMWQ4NDUyZjhkMWY5NjkxOGZlIDEw MDY0NAotLS0gYS9Ub29scy9idWlsZHN0cmVhbS9lbGVtZW50cy9zZGstcGxhdGZvcm0uYnN0Cisr KyBiL1Rvb2xzL2J1aWxkc3RyZWFtL2VsZW1lbnRzL3Nkay1wbGF0Zm9ybS5ic3QKQEAgLTUzLDYg KzUzLDggQEAgZGVwZW5kczoKIC0gc2RrL3B5dGhvbjItc2l4LmJzdAogLSBzZGsvcHl0aG9uMi1z dWJwcm9jZXNzMzIuYnN0CiAtIHNkay9weXRob24yLmJzdAorLSBzZGsvcnVieS1qc29uLmJzdAor LSBzZGsvcnVieS1oaWdobGluZS5ic3QKIC0gc2RrL3NoYXJlZC1taW1lLWluZm8uYnN0CiAtIHNk ay9zdWJ2ZXJzaW9uLmJzdAogLSBzZGsvdjRsdXRpbHMuYnN0CmRpZmYgLS1naXQgYS9Ub29scy9i dWlsZHN0cmVhbS9lbGVtZW50cy9zZGsvcnVieS1oaWdobGluZS5ic3QgYi9Ub29scy9idWlsZHN0 cmVhbS9lbGVtZW50cy9zZGsvcnVieS1oaWdobGluZS5ic3QKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTA0NzM0YjEz ZDUwZmE1NzUyN2VlYzE0ZmEyNGZjYjIzOGI1ZjNlMQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xz L2J1aWxkc3RyZWFtL2VsZW1lbnRzL3Nkay9ydWJ5LWhpZ2hsaW5lLmJzdApAQCAtMCwwICsxLDI4 IEBACitraW5kOiBtYW51YWwKK3NvdXJjZXM6CistIGtpbmQ6IHJlbW90ZQorICB1cmw6IHJ1Ynlf Z2VtczpoaWdobGluZS0yLjAuMy5nZW0KKyAgcmVmOiAyZGRkNWMxMjdkNDY5MjcyMTQ4NmY5MTcz NzMwNzIzNmZlMDA1MzUyZDEyYTQyMDJlMjZjNDg2MTRmNzE5NDc5CistIGtpbmQ6IHJlbW90ZQor ICB1cmw6IGh0dHBzOi8vcnVieWdlbXMub3JnL3NwZWNzLjQuOC5negorICByZWY6IGRlYjJjNTIy MTA2MTM1NGZlOGMyZGUwYmY1MWM3YWY0YmY2OGJhOTJmNmRiYjI2MDZjNGQ2NGI5Y2NlNWEyMmIK K2J1aWxkLWRlcGVuZHM6CistIGZyZWVkZXNrdG9wLXNkay5ic3Q6Y29tcG9uZW50cy9ydWJ5LmJz dAorZGVwZW5kczoKKy0gZnJlZWRlc2t0b3Atc2RrLmJzdDpib290c3RyYXAtaW1wb3J0LmJzdAor LSBmcmVlZGVza3RvcC1zZGsuYnN0OmNvbXBvbmVudHMvcnVieS5ic3QKKworY29uZmlnOgorICBp bnN0YWxsLWNvbW1hbmRzOgorICAgICg+KToKKyAgICAtIHwKKyAgICAgIG1rZGlyIC90bXAvZ2Vt LXRtcAorICAgICAgZ2VtIGluc3RhbGwgLS1sb2NhbCAtLWluc3RhbGwtZGlyIC90bXAvZ2VtLXRt cC8gKi5nZW0KKyAgICAgIG1rZGlyIC1wICV7aW5zdGFsbC1yb290fS8le3ByZWZpeH0vbGliLyV7 Z2NjX3RyaXBsZXR9L3J1YnkvMi42LjAvCisgICAgICBtdiAvdG1wL2dlbS10bXAvZ2Vtcy8qL2xp Yi8qICV7aW5zdGFsbC1yb290fS8le3ByZWZpeH0vbGliLyV7Z2NjX3RyaXBsZXR9L3J1YnkvMi42 LjAvCisKK3B1YmxpYzoKKyAgYnN0OgorICAgIGludGVncmF0aW9uLWNvbW1hbmRzOgorICAgIC0g fAorICAgICAgcnVieSAtZSAicmVxdWlyZSAnaGlnaGxpbmUnIgpkaWZmIC0tZ2l0IGEvVG9vbHMv YnVpbGRzdHJlYW0vZWxlbWVudHMvc2RrL3J1YnktanNvbi5ic3QgYi9Ub29scy9idWlsZHN0cmVh bS9lbGVtZW50cy9zZGsvcnVieS1qc29uLmJzdApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iYTg4Mzk1NDU1ZWVkYzhh M2ZkOTlhOWU3MWQzNmMzN2FjZTdmMDRkCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvYnVpbGRz dHJlYW0vZWxlbWVudHMvc2RrL3J1YnktanNvbi5ic3QKQEAgLTAsMCArMSwyNSBAQAora2luZDog bWFudWFsCitzb3VyY2VzOgorLSBraW5kOiByZW1vdGUKKyAgdXJsOiBydWJ5X2dlbXM6anNvbi0x LjguNS5nZW0KKyAgcmVmOiA3MGY3ZTIxYmM2NmRhMWRiZjkyNTk2OGY5ZDg4YmU4MTFiY2M1YWNl MGJjNjE0YzdlODM4MjQxYTBiOGM5ZmI3CitidWlsZC1kZXBlbmRzOgorLSBmcmVlZGVza3RvcC1z ZGsuYnN0OmNvbXBvbmVudHMvcnVieS5ic3QKK2RlcGVuZHM6CistIGZyZWVkZXNrdG9wLXNkay5i c3Q6Ym9vdHN0cmFwLWltcG9ydC5ic3QKKy0gZnJlZWRlc2t0b3Atc2RrLmJzdDpjb21wb25lbnRz L3J1YnkuYnN0CisKK2NvbmZpZzoKKyAgaW5zdGFsbC1jb21tYW5kczoKKyAgICAoPik6CisgICAg LSB8CisgICAgICBta2RpciAvdG1wL2dlbS10bXAKKyAgICAgIGdlbSBpbnN0YWxsIC0tbG9jYWwg LS1pbnN0YWxsLWRpciAvdG1wL2dlbS10bXAvICouZ2VtCisgICAgICBta2RpciAtcCAle2luc3Rh bGwtcm9vdH0vJXtwcmVmaXh9L2xpYi8le2djY190cmlwbGV0fS9ydWJ5LzIuNi4wLworICAgICAg bXYgL3RtcC9nZW0tdG1wL2dlbXMvKi9saWIvKiAle2luc3RhbGwtcm9vdH0vJXtwcmVmaXh9L2xp Yi8le2djY190cmlwbGV0fS9ydWJ5LzIuNi4wLworCitwdWJsaWM6CisgIGJzdDoKKyAgICBpbnRl Z3JhdGlvbi1jb21tYW5kczoKKyAgICAtIHwKKyAgICAgIHJ1YnkgLWUgInJlcXVpcmUgJ2pzb24n IgpkaWZmIC0tZ2l0IGEvVG9vbHMvYnVpbGRzdHJlYW0vcHJvamVjdC5jb25mIGIvVG9vbHMvYnVp bGRzdHJlYW0vcHJvamVjdC5jb25mCmluZGV4IDVhMmFmM2M1ZWJkODgwZWI0YTQzY2M1MWU0ZmVm NTlkMjJlZTFjYmYuLjkxZDUxNTZjNzI2NmI2YTJjNzhhMmRjOWM4MmE2YTY4MDY3NTVhYWIgMTAw NjQ0Ci0tLSBhL1Rvb2xzL2J1aWxkc3RyZWFtL3Byb2plY3QuY29uZgorKysgYi9Ub29scy9idWls ZHN0cmVhbS9wcm9qZWN0LmNvbmYKQEAgLTQ3LDYgKzQ3LDcgQEAgYWxpYXNlczoKICAgcmF3X2dp dGh1YnVzZXJjb250ZW50X2NvbTogaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tLwog ICBnbm9tZV9kb3dubG9hZHM6IGh0dHBzOi8vZG93bmxvYWQuZ25vbWUub3JnL3NvdXJjZXMvCiAg IGdzdF9kb3dubG9hZHM6IGh0dHBzOi8vZ3N0cmVhbWVyLmZyZWVkZXNrdG9wLm9yZy9zcmMvCisg IHJ1YnlfZ2VtczogaHR0cHM6Ly9ydWJ5Z2Vtcy5vcmcvZG93bmxvYWRzLwogCiAjIFNvbWUgb3Zl cnJpZGVzIHRvIHRoZSBkZWZhdWx0IHNhbmRib3ggZXhlY3V0aW9uIGVudmlyb25tZW50CiAjCg== 399836 2020-05-20 07:02:48 -0700 2020-05-20 08:20:15 -0700 Patch bug-212086-20200520150246.patch text/plain 3941 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTA5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTAxN2EzN2Q1OTc2YjEyMjJjMmVkNjhmNjJmYjk3MDJl YjFjZDUzNy4uZDk5NTUzOGVkMGVhNjRhMTZhNDEwOTJjYmQ5ZThjZjg2ZWZlMGI5MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIwLTA1LTIwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdFBhayBTREtdIE1pc3NpbmcgcnVieSBnZW1zIGpzb24gYW5kIGhpZ2hs aW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIw ODYKKworICAgICAgICBSZXZpZXdlZCBieSDFvWFuIERvYmVyxaFlay4KKworICAgICAgICBBZGQg dGhlIGpzb24gYW5kIGhpZ2hsaW5lIFJ1YnkgZ2VtcyBpbiB0aGUgRmxhdHBhayBTREsuCisKKyAg ICAgICAgKiBidWlsZHN0cmVhbS9lbGVtZW50cy9zZGstcGxhdGZvcm0uYnN0OgorICAgICAgICAq IGJ1aWxkc3RyZWFtL2VsZW1lbnRzL3Nkay9ydWJ5LWhpZ2hsaW5lLmJzdDogQWRkZWQuCisgICAg ICAgICogYnVpbGRzdHJlYW0vZWxlbWVudHMvc2RrL3J1YnktanNvbi5ic3Q6IEFkZGVkLgorICAg ICAgICAqIGJ1aWxkc3RyZWFtL3Byb2plY3QuY29uZjoKKwogMjAyMC0wNS0yMCAgUGhpbGlwcGUg Tm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0ZsYXRwYWsgU0RLXSBB ZGQgYnViYmxld3JhcCAuLi4gd3JhcHBlcgpkaWZmIC0tZ2l0IGEvVG9vbHMvYnVpbGRzdHJlYW0v ZWxlbWVudHMvc2RrLXBsYXRmb3JtLmJzdCBiL1Rvb2xzL2J1aWxkc3RyZWFtL2VsZW1lbnRzL3Nk ay1wbGF0Zm9ybS5ic3QKaW5kZXggMDc2ZmVlNWU3MzcxNDVlOGM0OTBkNjZiNjNhMDkzYmFiMTk0 ZjQ0MS4uYTU2MmQzYzEyMmE1Zjg2ZDhjMWJlZTFkODQ1MmY4ZDFmOTY5MThmZSAxMDA2NDQKLS0t IGEvVG9vbHMvYnVpbGRzdHJlYW0vZWxlbWVudHMvc2RrLXBsYXRmb3JtLmJzdAorKysgYi9Ub29s cy9idWlsZHN0cmVhbS9lbGVtZW50cy9zZGstcGxhdGZvcm0uYnN0CkBAIC01Myw2ICs1Myw4IEBA IGRlcGVuZHM6CiAtIHNkay9weXRob24yLXNpeC5ic3QKIC0gc2RrL3B5dGhvbjItc3VicHJvY2Vz czMyLmJzdAogLSBzZGsvcHl0aG9uMi5ic3QKKy0gc2RrL3J1YnktanNvbi5ic3QKKy0gc2RrL3J1 YnktaGlnaGxpbmUuYnN0CiAtIHNkay9zaGFyZWQtbWltZS1pbmZvLmJzdAogLSBzZGsvc3VidmVy c2lvbi5ic3QKIC0gc2RrL3Y0bHV0aWxzLmJzdApkaWZmIC0tZ2l0IGEvVG9vbHMvYnVpbGRzdHJl YW0vZWxlbWVudHMvc2RrL3J1YnktaGlnaGxpbmUuYnN0IGIvVG9vbHMvYnVpbGRzdHJlYW0vZWxl bWVudHMvc2RrL3J1YnktaGlnaGxpbmUuYnN0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjRjODRhNzE3ZTMxOWJjODc5 OWYyNjRmYjVkZWMwMjY1NjMzNmQ0MjcKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9idWlsZHN0 cmVhbS9lbGVtZW50cy9zZGsvcnVieS1oaWdobGluZS5ic3QKQEAgLTAsMCArMSwyNSBAQAora2lu ZDogbWFudWFsCitzb3VyY2VzOgorLSBraW5kOiByZW1vdGUKKyAgdXJsOiBydWJ5X2dlbXM6aGln aGxpbmUtMi4wLjMuZ2VtCisgIHJlZjogMmRkZDVjMTI3ZDQ2OTI3MjE0ODZmOTE3MzczMDcyMzZm ZTAwNTM1MmQxMmE0MjAyZTI2YzQ4NjE0ZjcxOTQ3OQorLSBraW5kOiByZW1vdGUKKyAgdXJsOiBo dHRwczovL3J1YnlnZW1zLm9yZy9zcGVjcy40LjguZ3oKKyAgcmVmOiBkZWIyYzUyMjEwNjEzNTRm ZThjMmRlMGJmNTFjN2FmNGJmNjhiYTkyZjZkYmIyNjA2YzRkNjRiOWNjZTVhMjJiCitidWlsZC1k ZXBlbmRzOgorLSBmcmVlZGVza3RvcC1zZGsuYnN0OmNvbXBvbmVudHMvcnVieS5ic3QKK2RlcGVu ZHM6CistIGZyZWVkZXNrdG9wLXNkay5ic3Q6Ym9vdHN0cmFwLWltcG9ydC5ic3QKKy0gZnJlZWRl c2t0b3Atc2RrLmJzdDpjb21wb25lbnRzL3J1YnkuYnN0CisKK2NvbmZpZzoKKyAgaW5zdGFsbC1j b21tYW5kczoKKyAgICAoPik6CisgICAgLSB8CisgICAgICBnZW0gaW5zdGFsbCAtLWxvY2FsIC0t aWdub3JlLWRlcGVuZGVuY2llcyAtLW5vLXVzZXItaW5zdGFsbCAtLW5vLWRvY3VtZW50IC0taW5z dGFsbC1kaXIgIiQocnVieSAtZSdwdXRzIEdlbS5kZWZhdWx0X2RpcicpIiAtLWJpbmRpciAle2lu c3RhbGwtcm9vdH0le3ByZWZpeH0vYmluIC0tYnVpbGQtcm9vdCAnJXtpbnN0YWxsLXJvb3R9JyAq LmdlbQorCitwdWJsaWM6CisgIGJzdDoKKyAgICBpbnRlZ3JhdGlvbi1jb21tYW5kczoKKyAgICAt IHwKKyAgICAgIHJ1YnkgLWUgInJlcXVpcmUgJ2hpZ2hsaW5lJyIKZGlmZiAtLWdpdCBhL1Rvb2xz L2J1aWxkc3RyZWFtL2VsZW1lbnRzL3Nkay9ydWJ5LWpzb24uYnN0IGIvVG9vbHMvYnVpbGRzdHJl YW0vZWxlbWVudHMvc2RrL3J1YnktanNvbi5ic3QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNjZiYTVhYmI3MDcwM2Fh M2E3NTM1NDQxOTNhZDQyYzQwOWRmNDVjZgotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL2J1aWxk c3RyZWFtL2VsZW1lbnRzL3Nkay9ydWJ5LWpzb24uYnN0CkBAIC0wLDAgKzEsMjIgQEAKK2tpbmQ6 IG1hbnVhbAorc291cmNlczoKKy0ga2luZDogcmVtb3RlCisgIHVybDogcnVieV9nZW1zOmpzb24t MS44LjUuZ2VtCisgIHJlZjogNzBmN2UyMWJjNjZkYTFkYmY5MjU5NjhmOWQ4OGJlODExYmNjNWFj ZTBiYzYxNGM3ZTgzODI0MWEwYjhjOWZiNworYnVpbGQtZGVwZW5kczoKKy0gZnJlZWRlc2t0b3At c2RrLmJzdDpjb21wb25lbnRzL3J1YnkuYnN0CitkZXBlbmRzOgorLSBmcmVlZGVza3RvcC1zZGsu YnN0OmJvb3RzdHJhcC1pbXBvcnQuYnN0CistIGZyZWVkZXNrdG9wLXNkay5ic3Q6Y29tcG9uZW50 cy9ydWJ5LmJzdAorCitjb25maWc6CisgIGluc3RhbGwtY29tbWFuZHM6CisgICAgKD4pOgorICAg IC0gfAorICAgICAgZ2VtIGluc3RhbGwgLS1sb2NhbCAtLWlnbm9yZS1kZXBlbmRlbmNpZXMgLS1u by11c2VyLWluc3RhbGwgLS1uby1kb2N1bWVudCAtLWluc3RhbGwtZGlyICIkKHJ1YnkgLWUncHV0 cyBHZW0uZGVmYXVsdF9kaXInKSIgLS1iaW5kaXIgJXtpbnN0YWxsLXJvb3R9JXtwcmVmaXh9L2Jp biAtLWJ1aWxkLXJvb3QgJyV7aW5zdGFsbC1yb290fScgKi5nZW0KKworcHVibGljOgorICBic3Q6 CisgICAgaW50ZWdyYXRpb24tY29tbWFuZHM6CisgICAgLSB8CisgICAgICBydWJ5IC1lICJyZXF1 aXJlICdqc29uJyIKZGlmZiAtLWdpdCBhL1Rvb2xzL2J1aWxkc3RyZWFtL3Byb2plY3QuY29uZiBi L1Rvb2xzL2J1aWxkc3RyZWFtL3Byb2plY3QuY29uZgppbmRleCA1YTJhZjNjNWViZDg4MGViNGE0 M2NjNTFlNGZlZjU5ZDIyZWUxY2JmLi45MWQ1MTU2YzcyNjZiNmEyYzc4YTJkYzljODJhNmE2ODA2 NzU1YWFiIDEwMDY0NAotLS0gYS9Ub29scy9idWlsZHN0cmVhbS9wcm9qZWN0LmNvbmYKKysrIGIv VG9vbHMvYnVpbGRzdHJlYW0vcHJvamVjdC5jb25mCkBAIC00Nyw2ICs0Nyw3IEBAIGFsaWFzZXM6 CiAgIHJhd19naXRodWJ1c2VyY29udGVudF9jb206IGh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250 ZW50LmNvbS8KICAgZ25vbWVfZG93bmxvYWRzOiBodHRwczovL2Rvd25sb2FkLmdub21lLm9yZy9z b3VyY2VzLwogICBnc3RfZG93bmxvYWRzOiBodHRwczovL2dzdHJlYW1lci5mcmVlZGVza3RvcC5v cmcvc3JjLworICBydWJ5X2dlbXM6IGh0dHBzOi8vcnVieWdlbXMub3JnL2Rvd25sb2Fkcy8KIAog IyBTb21lIG92ZXJyaWRlcyB0byB0aGUgZGVmYXVsdCBzYW5kYm94IGV4ZWN1dGlvbiBlbnZpcm9u bWVudAogIwo=