238452 2022-03-28 07:24:56 -0700 [Flatpak SDK] Local dependencies override support 2022-04-05 03:58:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 238454 1 pnormand pnormand aperez bugs-noreply vjaquez webkit-bug-importer oldest_to_newest 1855602 0 pnormand 2022-03-28 07:24:56 -0700 . 1855612 1 455917 pnormand 2022-03-28 07:47:35 -0700 Created attachment 455917 Patch 1856352 2 456111 pnormand 2022-03-30 04:04:50 -0700 Created attachment 456111 Patch 1856732 3 456111 aperez 2022-03-31 01:31:59 -0700 Comment on attachment 456111 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=456111&action=review > Tools/flatpak/local-projects/meson.build:2 > + version : '0.1.0') Nice trick, using a dummy project with the only goal of letting Meson handle things for us 🤯️ Even when it works only for Meson projects, that will cover a good amount of our dependencies these days, including GTK, GLib, glib-networking and a few others -- we can add later on .wrap files when needed for them. 1857848 4 pnormand 2022-04-04 07:41:45 -0700 Thanks for the review! I wanted to update the patch to allow the user to tune meson options with an env var, it's not working yet (for unknown reasons) but whenever I manage to get it working I'd like to update this patch and ask a new review, if that's OK with you. Or I can follow-up in a new patch. 1857906 5 pnormand 2022-04-04 10:08:23 -0700 (In reply to Adrian Perez from comment #3) > Even when it works only for Meson projects It could be made to work with different build-systems as well, Meson has an "externalproject" module that I successfully used in another context: https://mesonbuild.com/External-Project-module.html#external-project-module 1857916 6 456586 pnormand 2022-04-04 10:18:54 -0700 Created attachment 456586 Patch 1858078 7 aperez 2022-04-04 14:29:14 -0700 (In reply to Philippe Normand from comment #5) > (In reply to Adrian Perez from comment #3) > > > Even when it works only for Meson projects > > It could be made to work with different build-systems as well, Meson has an > "externalproject" module that I successfully used in another context: > https://mesonbuild.com/External-Project-module.html#external-project-module Nice! 1858083 8 456586 aperez 2022-04-04 14:33:34 -0700 Comment on attachment 456586 Patch Patch LGTM, with a small nit that would be nice to tackle before landing :) View in context: https://bugs.webkit.org/attachment.cgi?id=456586&action=review > Tools/flatpak/flatpakutils.py:685 > + options = [o for o in os.environ.get('WEBKIT_SDK_LOCAL_DEPS_OPTIONS', '').strip().split(' ') if o] It would be better to use shlex.split() here, to allow passing options that themselves contain spaces by quoting them inside the environment variable, e.g: export WEBKIT_SDK_LOCAL_DEPS_OPTIONS='-Dsomeproject:someoption="value with spaces"' 1858085 9 aperez 2022-04-04 14:35:12 -0700 (In reply to Philippe Normand from comment #4) > Thanks for the review! I wanted to update the patch to allow the user to > tune meson options with an env var, it's not working yet (for unknown > reasons) but whenever I manage to get it working I'd like to update this > patch and ask a new review, if that's OK with you. Or I can follow-up in a > new patch. I would say it is up to you: if you prefer to update the patch for this bug, I can re-review; if you would rather do a follow-up that's fine as well. The latter approach would allow to get the base functionality in trunk faster, maybe ;-) 1858330 10 456689 pnormand 2022-04-05 03:53:16 -0700 Created attachment 456689 [fast-cq] Patch 1858331 11 ews-feeder 2022-04-05 03:57:02 -0700 Committed r292390 (249255@main): <https://commits.webkit.org/249255@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456689. 1858332 12 webkit-bug-importer 2022-04-05 03:58:16 -0700 <rdar://problem/91286192> 455917 2022-03-28 07:47:35 -0700 2022-03-30 04:04:45 -0700 Patch bug-238452-20220328074733.patch text/plain 12257 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxOTYyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODgzZDMxMmJlNmE4Y2Y2NTdjMWEyMjYyODdhODE2OTc0 MjZmMDFjMS4uZGRkNzA2YTFkZDA3ZGU1ZTI2NWQ0ZmI0MzkzYjkzOWI3Y2FiMmM1NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDIyLTAzLTI4ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIExvY2FsIGRlcGVuZGVuY2llcyBvdmVycmlkZSBzdXBw b3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg0 NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVu IHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBXRUJLSVRfU0RLX0VOQUJMRV9MT0NBTF9ERVBTPTEg aXMgc2V0IGF0IGNvbXBpbGUtdGltZSBhbmQKKyAgICAgICAgcnVudGltZSwgc29tZSBkZXBlbmRl bmNpZXMgKGN1cnJlbnRseSBvbmx5IGxpYnNvdXAgYW5kIEdTdHJlYW1lcikgd2lsbCBiZSBwaWNr ZWQgdXAgZnJvbQorICAgICAgICBsb2NhbCBnaXQgY2hlY2tvdXRzIGxvY2F0ZWQgaW4gVG9vbHMv ZmxhdHBhay8uIElmIG5vIGNoZWNrb3V0IGlzIHByZXNlbnQsIG9uZSB3aWxsIGJlIG1hZGUKKyAg ICAgICAgYmFzZWQgb24gdGhlIGNvcnJlc3BvbmRpbmcgLndyYXAgZmlsZS4KKworICAgICAgICBU aGlzIHNldHVwIHJlcGxhY2VzIHRoZSBwcmV2aW91cyBvbmUgdGhhdCB3YXMgc3BlY2lmaWMgdG8g R1N0cmVhbWVyLgorCisgICAgICAgICogZmxhdHBhay9mbGF0cGFrdXRpbHMucHk6CisgICAgICAg IChXZWJraXRGbGF0cGFrLmxvYWRfZnJvbV9hcmdzKToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsu X19pbml0X18pOgorICAgICAgICAoV2Via2l0RmxhdHBhay5zZXR1cF9sb2NhbF9kZXBzKToKKyAg ICAgICAgKFdlYmtpdEZsYXRwYWsuX21lcmdlX2Vudl92YXJpYWJsZXMpOgorICAgICAgICAoV2Vi a2l0RmxhdHBhay5ydW5faW5fc2FuZGJveCk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnNldHVw X2Rldl9lbnYpOgorICAgICAgICAoV2Via2l0RmxhdHBhay5zZXR1cF9nc3RidWlsZCk6IERlbGV0 ZWQuCisgICAgICAgICogZmxhdHBhay9sb2NhbC1wcm9qZWN0cy9tZXNvbi5idWlsZDogQWRkZWQu CisgICAgICAgICogZmxhdHBhay9sb2NhbC1wcm9qZWN0cy9zdWJwcm9qZWN0cy9nc3RyZWFtZXIt bW9ub3JlcG8ud3JhcDogQWRkZWQuCisgICAgICAgICogZmxhdHBhay9sb2NhbC1wcm9qZWN0cy9z dWJwcm9qZWN0cy9saWJzb3VwLndyYXA6IEFkZGVkLgorCiAyMDIyLTAzLTI2ICBNeWxlcyBDLiBN YXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkdQVV0gSW1wb3J0 IFdlYkdQVSBDb25mb3JtYW5jZSBUZXN0IFN1aXRlCmRpZmYgLS1naXQgYS9Ub29scy9mbGF0cGFr L2ZsYXRwYWt1dGlscy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CmluZGV4IDRk MGZiMWQ1ODYzMjYyM2Y5MzJlMDdhNWUwNmZmMTEyYWM4NmE3MGQuLjgyYjQxOWUxMWZhZDc1Yzgz NmU4YTAxOGIwMzMxZDI4OTVlYTE0YmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBh a3V0aWxzLnB5CisrKyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CkBAIC00ODgsOSAr NDg4LDggQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgZ2VuZXJhbC5hZGRfYXJndW1l bnQoIi11IiwgIi0tdXBkYXRlIiwgZGVzdD0idXBkYXRlIiwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYWN0aW9uPSJzdG9yZV90cnVlIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaGVscD0iVXBkYXRlIHRoZSBTREsiKQotICAgICAgICBnZW5lcmFsLmFkZF9hcmd1bWVudCgi LWJnc3QiLCAiLS1idWlsZC1nc3QiLCBkZXN0PSJidWlsZF9nc3QiLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBhY3Rpb249InN0b3JlX3RydWUiLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBoZWxwPSJGb3JjZSByZWJ1aWxkaW5nIGdzdC1idWlsZCwgcmVwb3NpdG9yeSBwYXRo IGlzIGRlZmluZWQgYnkgdGhlIGBHU1RfQlVJTERfUEFUSGAgZW52aXJvbm1lbnQgdmFyaWFibGUu IikKKyAgICAgICAgZ2VuZXJhbC5hZGRfYXJndW1lbnQoIi1iZGVwcyIsICItLWJ1aWxkLWxvY2Fs LWRlcHMiLCBkZXN0PSJidWlsZF9sb2NhbF9kZXBzIiwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYWN0aW9uPSJzdG9yZV90cnVlIiwgaGVscD0iRm9yY2UgcmVidWlsZGluZyBsb2NhbCBk ZXBlbmRlbmNpZXMiKQogICAgICAgICBnZW5lcmFsLmFkZF9hcmd1bWVudCgiLXEiLCAiLS1xdWll dCIsIGRlc3Q9InF1aWV0IiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWN0aW9uPSJz dG9yZV90cnVlIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0iRG8gbm90IHBy aW50IGFueXRoaW5nIikKQEAgLTU1OCw3ICs1NTcsNyBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgog ICAgICAgICBzZWxmLnJlbGVhc2UgPSBGYWxzZQogICAgICAgICBzZWxmLmRlYnVnID0gRmFsc2UK IAotICAgICAgICBzZWxmLmJ1aWxkX2dzdCA9IEZhbHNlCisgICAgICAgIHNlbGYuYnVpbGRfbG9j YWxfZGVwcyA9IEZhbHNlCiAKICAgICAgICAgc2VsZi5wbGF0Zm9ybSA9ICJndGsiCiAgICAgICAg IHNlbGYuY2hlY2tfYXZhaWxhYmxlID0gRmFsc2UKQEAgLTY2OSw1MCArNjY4LDQ1IEBAIGNsYXNz IFdlYmtpdEZsYXRwYWs6CiAKICAgICAgICAgcmV0dXJuIFRydWUKIAotCi0gICAgZGVmIHNldHVw X2dzdGJ1aWxkKHNlbGYsIGJ1aWxkaW5nKToKLSAgICAgICAgZ3N0X2RpciA9IG9zLmVudmlyb24u Z2V0KCdHU1RfQlVJTERfUEFUSCcpCi0gICAgICAgIGlmIG5vdCBnc3RfZGlyOgorICAgIGRlZiBz ZXR1cF9sb2NhbF9kZXBzKHNlbGYsIGJ1aWxkaW5nKToKKyAgICAgICAgaWYgbm90IG9zLmVudmly b24uZ2V0KCdXRUJLSVRfU0RLX0VOQUJMRV9MT0NBTF9ERVBTJyk6CiAgICAgICAgICAgICBpZiBi dWlsZGluZzoKLSAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCIkR1NUX0JVSUxEX1BBVEggZW52 aXJvbm1lbnQgdmFyaWFibGUgbm90IHNldC4gU2tpcHBpbmcgZ3N0LWJ1aWxkXG4iKQorICAgICAg ICAgICAgICAgIF9sb2cuZGVidWcoIiRXRUJLSVRfU0RLX0VOQUJMRV9MT0NBTF9ERVBTIGVudmly b25tZW50IHZhcmlhYmxlIG5vdCBzZXQuIFNraXBwaW5nIGxvY2FsIGRlcGVuZGVuY2llcyBidWls ZCIpCiAgICAgICAgICAgICByZXR1cm4ge30KIAotICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlz dHMob3MucGF0aC5qb2luKGdzdF9kaXIsICdnc3QtZW52LnB5JykpOgotICAgICAgICAgICAgcmFp c2UgUnVudGltZUVycm9yKCdHU1RfQlVJTERfUEFUSCBzZXQgdG8gJXMgYnV0IGl0IGRvZXNuXCd0 IHNlZW0gdG8gYmUgYSB2YWxpZCBgZ3N0LWJ1aWxkYCBjaGVja291dC4nICUgZ3N0X2RpcikKLQot ICAgICAgICBnc3RfYnVpbGRkaXIgPSBvcy5wYXRoLmpvaW4oREVGQVVMVF9CVUlMRF9ST09ULCAn Z3N0LWJ1aWxkJykKLSAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihE RUZBVUxUX0JVSUxEX1JPT1QsICdnc3QtYnVpbGQnLCAnYnVpbGQubmluamEnKSk6CisgICAgICAg IHNyY19kaXIgPSBvcy5wYXRoLmpvaW4oV0VCS0lUX1NPVVJDRV9ESVIsICdUb29scycsICdmbGF0 cGFrJywgJ2xvY2FsLXByb2plY3RzJykKKyAgICAgICAgYnVpbGRfZGlyID0gb3MucGF0aC5qb2lu KERFRkFVTFRfQlVJTERfUk9PVCwgJ2RlcHMtYnVpbGQnKQorICAgICAgICBzYW5kYm94X2J1aWxk X2RpciA9IGNvbnZlcnRfd2Via2l0X3NvdXJjZV9wYXRoX3RvX3NhbmRib3hfcGF0aChidWlsZF9k aXIpCisgICAgICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oYnVpbGRfZGly LCAnYnVpbGQubmluamEnKSk6CiAgICAgICAgICAgICBpZiBub3QgYnVpbGRpbmc6Ci0gICAgICAg ICAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCdUcnlpbmcgdG8gZW50ZXIgZ3N0LWJ1aWxkIGVu diBmcm9tICVzIGJ1dCBpdCBpcyBub3QgYnVpbHQsIG1ha2Ugc3VyZSB0byByZWJ1aWxkIHdlYmtp dC4nICUgZ3N0X2RpcikKKyAgICAgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ1RyeWlu ZyB0byBlbnRlciBkZXBzLWJ1aWxkIGVudiBmcm9tICVzIGJ1dCBpdCBpcyBub3QgYnVpbHQsIG1h a2Ugc3VyZSB0byByZWJ1aWxkIHdlYmtpdC4nLCBzcmNfZGlyKQogCi0gICAgICAgICAgICBhcmdz ID0gWydtZXNvbicsIF0KLSAgICAgICAgICAgIGV4dHJhX2FyZ3MgPSBvcy5lbnZpcm9uLmdldCgn R1NUX0JVSUxEX0FSR1MnLCAnJykKLSAgICAgICAgICAgIGFyZ3MuZXh0ZW5kKHNobGV4LnNwbGl0 KGV4dHJhX2FyZ3MpICsgW2dzdF9kaXIsIGdzdF9idWlsZGRpcl0pCi0gICAgICAgICAgICBDb25z b2xlLm1lc3NhZ2UoIlJ1bm5pbmcgJXMgIiwgJyAnLmpvaW4oYXJncykpCi0gICAgICAgICAgICBz ZWxmLnJ1bl9pbl9zYW5kYm94KCphcmdzLCBidWlsZGluZ19nc3Q9VHJ1ZSwgc3RhcnRfc2NjYWNo ZT1GYWxzZSkKKyAgICAgICAgICAgIGFyZ3MgPSBbJ21lc29uJywgY29udmVydF93ZWJraXRfc291 cmNlX3BhdGhfdG9fc2FuZGJveF9wYXRoKHNyY19kaXIpLCBzYW5kYm94X2J1aWxkX2Rpcl0KKyAg ICAgICAgICAgIHNlbGYucnVuX2luX3NhbmRib3goKmFyZ3MsIGJ1aWxkaW5nX2xvY2FsX2RlcHM9 VHJ1ZSwgc3RhcnRfc2NjYWNoZT1GYWxzZSkKIAogICAgICAgICBpZiBidWlsZGluZzoKLSAgICAg ICAgICAgIENvbnNvbGUubWVzc2FnZSgiQnVpbGRpbmcgYGdzdC1idWlsZGAgJXMgIiwgZ3N0X2Rp cikKLSAgICAgICAgICAgIGlmIHNlbGYucnVuX2luX3NhbmRib3goJ25pbmphJywgJy1DJywgZ3N0 X2J1aWxkZGlyLCBidWlsZGluZ19nc3Q9VHJ1ZSwgc3RhcnRfc2NjYWNoZT1GYWxzZSkgIT0gMDoK LSAgICAgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ0Vycm9yIHdoaWxlIGJ1aWxkaW5n IGdzdC1idWlsZC4nKQotCi0gICAgICAgIGNvbW1hbmQgPSBbb3MucGF0aC5qb2luKGdzdF9kaXIs ICdnc3QtZW52LnB5JyksICctLWJ1aWxkZGlyJywgZ3N0X2J1aWxkZGlyLCAnLS1zcmNkaXInLCBn c3RfZGlyLCAiLS1vbmx5LWVudmlyb25tZW50Il0KLSAgICAgICAgZ3N0X2VudiA9IHJ1bl9zYW5p dGl6ZWQoY29tbWFuZCwgZ2F0aGVyX291dHB1dD1UcnVlKQotICAgICAgICBhbGxvd2xpc3QgPSAo IkxEX0xJQlJBUllfUEFUSCIsICJQQVRIIiwgIlBLR19DT05GSUdfUEFUSCIpCi0gICAgICAgIG5v cGF0aGxpc3QgPSAoIkdTVF9ERUJVRyIsICJHU1RfVkVSU0lPTiIsICJHU1RfRU5WIiwgIkdTVF9U UkFDRVJTIikKKyAgICAgICAgICAgIENvbnNvbGUubWVzc2FnZSgiQnVpbGRpbmcgbG9jYWwgZGVw ZW5kZW5jaWVzIGZyb20gJXMgIiwgc3JjX2RpcikKKyAgICAgICAgICAgIGlmIHNlbGYucnVuX2lu X3NhbmRib3goJ21lc29uJywgJ2NvbXBpbGUnLCAnLUMnLCBzYW5kYm94X2J1aWxkX2RpciwgYnVp bGRpbmdfbG9jYWxfZGVwcz1UcnVlLCBzdGFydF9zY2NhY2hlPUZhbHNlKSAhPSAwOgorICAgICAg ICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignRXJyb3Igd2hpbGUgYnVpbGRpbmcgbG9jYWwg ZGVwZW5kZW5jaWVzLicpCisKKyAgICAgICAgY29tbWFuZCA9IFsnbWVzb24nLCAnZGV2ZW52Jywg Jy1DJywgc2FuZGJveF9idWlsZF9kaXIsICctLWR1bXAnXQorICAgICAgICBsb2NhbF9lbnYgPSBz ZWxmLnJ1bl9pbl9zYW5kYm94KCpjb21tYW5kLCBidWlsZGluZ19sb2NhbF9kZXBzPVRydWUsIHN0 YXJ0X3NjY2FjaGU9RmFsc2UsIGdhdGhlcl9vdXRwdXQ9VHJ1ZSkKICAgICAgICAgZW52ID0ge30K LSAgICAgICAgZm9yIGxpbmUgaW4gW2xpbmUgZm9yIGxpbmUgaW4gZ3N0X2Vudi5zcGxpdGxpbmVz KCkgaWYgbm90IGxpbmUuc3RhcnRzd2l0aCgiZXhwb3J0IildOgorICAgICAgICBmb3IgbGluZSBp biBbbGluZSBmb3IgbGluZSBpbiBsb2NhbF9lbnYuc3BsaXRsaW5lcygpIGlmIG5vdCBsaW5lLnN0 YXJ0c3dpdGgoImV4cG9ydCIpXToKICAgICAgICAgICAgIHRva2VucyA9IGxpbmUuc3BsaXQoIj0i KQogICAgICAgICAgICAgdmFyX25hbWUsIGNvbnRlbnRzID0gdG9rZW5zWzBdLCAiPSIuam9pbih0 b2tlbnNbMTpdKQotICAgICAgICAgICAgaWYgbm90IHZhcl9uYW1lLnN0YXJ0c3dpdGgoIkdTVF8i KSBhbmQgdmFyX25hbWUgbm90IGluIGFsbG93bGlzdDoKLSAgICAgICAgICAgICAgICBjb250aW51 ZQotICAgICAgICAgICAgaWYgdmFyX25hbWUgbm90IGluIG5vcGF0aGxpc3Q6Ci0gICAgICAgICAg ICAgICAgbmV3X2NvbnRlbnRzID0gJzonLmpvaW4oW2NvbnZlcnRfd2Via2l0X3NvdXJjZV9wYXRo X3RvX3NhbmRib3hfcGF0aChwKSBmb3IgcCBpbiBjb250ZW50cy5zcGxpdCgiOiIpXSkKLSAgICAg ICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgbmV3X2NvbnRlbnRzID0gY29udGVudHMucmVw bGFjZSgiJyIsICIiKQotICAgICAgICAgICAgZW52W3Zhcl9uYW1lXSA9IG5ld19jb250ZW50cwor ICAgICAgICAgICAgZW52W3Zhcl9uYW1lXSA9IGNvbnRlbnRzCiAgICAgICAgIHJldHVybiBlbnYK IAorICAgIGRlZiBfbWVyZ2VfZW52X3ZhcmlhYmxlcyhzZWxmLCBlbnZpcm9ubWVudCwgYWRkaXRp b25hbF9lbnZpcm9ubWVudCk6CisgICAgICAgIGZvciB2YXJfbmFtZSwgdmFsdWUgaW4gYWRkaXRp b25hbF9lbnZpcm9ubWVudC5pdGVtcygpOgorICAgICAgICAgICAgaWYgdmFyX25hbWUgbm90IGlu IGVudmlyb25tZW50OgorICAgICAgICAgICAgICAgIGVudmlyb25tZW50W3Zhcl9uYW1lXSA9IHZh bHVlCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGlmIHZhcl9uYW1lLmVuZHN3 aXRoKCdQQVRIJyk6CisgICAgICAgICAgICAgICAgICAgIGVudmlyb25tZW50W3Zhcl9uYW1lXSA9 ICIlczolcyIgJSAoZW52aXJvbm1lbnRbdmFyX25hbWVdLCB2YWx1ZSkKKyAgICAgICAgcmV0dXJu IGVudmlyb25tZW50CisKICAgICBkZWYgaXNfYnJhbmNoX2J1aWxkKHNlbGYpOgogICAgICAgICB0 cnk6CiAgICAgICAgICAgICB3aXRoIG9wZW4ob3MuZGV2bnVsbCwgJ3cnKSBhcyBkZXZudWxsOgpA QCAtNzUxLDEzICs3NDUsMTIgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgZXh0cmFf ZmxhdHBha19hcmdzID0ga3dhcmdzLmdldCgiZXh0cmFfZmxhdHBha19hcmdzIiwgW10pCiAgICAg ICAgIHN0YXJ0X3NjY2FjaGUgPSBrd2FyZ3MuZ2V0KCJzdGFydF9zY2NhY2hlIiwgVHJ1ZSkKICAg ICAgICAgc2tpcF9pY2MgPSBrd2FyZ3MuZ2V0KCJza2lwX2ljYyIsIEZhbHNlKQotICAgICAgICBi dWlsZGluZ19nc3QgPSBrd2FyZ3MuZ2V0KCJidWlsZGluZ19nc3QiLCBGYWxzZSkKKyAgICAgICAg YnVpbGRpbmdfbG9jYWxfZGVwcyA9IGt3YXJncy5nZXQoImJ1aWxkaW5nX2xvY2FsX2RlcHMiLCBG YWxzZSkKICAgICAgICAgZ2F0aGVyX291dHB1dCA9IGt3YXJncy5nZXQoImdhdGhlcl9vdXRwdXQi LCBGYWxzZSkKIAogICAgICAgICBpZiBnYXRoZXJfb3V0cHV0OgogICAgICAgICAgICAgc3RhcnRf c2NjYWNoZSA9IEZhbHNlCiAgICAgICAgICAgICBza2lwX2ljYyA9IFRydWUKLSAgICAgICAgICAg IGJ1aWxkaW5nX2dzdCA9IEZhbHNlCiAKICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UoYXJncywg bGlzdCk6CiAgICAgICAgICAgICBhcmdzID0gbGlzdChhcmdzKQpAQCAtODk2LDcgKzg4OSw3IEBA IGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIHJlbW90ZV9zY2NhY2hlX2NvbmZpZ3MgPSBz ZXQoWyJTQ0NBQ0hFX1JFRElTIiwgIlNDQ0FDSEVfQlVDS0VUIiwgIlNDQ0FDSEVfTUVNQ0FDSEVE IiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlNDQ0FDSEVfR0NTX0JV Q0tFVCIsICJTQ0NBQ0hFX0FaVVJFX0NPTk5FQ1RJT05fU1RSSU5HIiwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIldFQktJVF9VU0VfU0NDQUNIRSJdKQotICAgICAgICBp ZiByZW1vdGVfc2NjYWNoZV9jb25maWdzLmludGVyc2VjdGlvbihzZXQob3MuZW52aXJvbi5rZXlz KCkpKSBhbmQgc3RhcnRfc2NjYWNoZSBhbmQgbm90IGJ1aWxkaW5nX2dzdDoKKyAgICAgICAgaWYg cmVtb3RlX3NjY2FjaGVfY29uZmlncy5pbnRlcnNlY3Rpb24oc2V0KG9zLmVudmlyb24ua2V5cygp KSkgYW5kIHN0YXJ0X3NjY2FjaGUgYW5kIG5vdCBidWlsZGluZ19sb2NhbF9kZXBzOgogICAgICAg ICAgICAgX2xvZy5kZWJ1ZygiRW5hYmxpbmcgbmV0d29yayBhY2Nlc3MgZm9yIHRoZSByZW1vdGUg c2NjYWNoZSIpCiAgICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQuYXBwZW5kKHNoYXJlX25ldHdv cmtfb3B0aW9uKQogCkBAIC05MTMsNyArOTA2LDcgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAg ICAgICAgICAgIGlmIGJ1aWxkaW5nOgogICAgICAgICAgICAgICAgICMgU3Bhd24gdGhlIHNjY2Fj aGUgc2VydmVyIGluIGJhY2tncm91bmQsIGFuZCBhdm9pZCByZWN1cnNpbmcgaGVyZSwgdXNpbmcg YSBib29sIGtleXdvcmQuCiAgICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygiUHJlLXN0YXJ0aW5n IHRoZSBTQ0NhY2hlIGRpc3Qgc2VydmVyIikKLSAgICAgICAgICAgICAgICBzZWxmLnJ1bl9pbl9z YW5kYm94KCJzY2NhY2hlIiwgIi0tc3RhcnQtc2VydmVyIiwgZW52PXNjY2FjaGVfZW52aXJvbm1l bnQsIGJ1aWxkaW5nX2dzdD1idWlsZGluZ19nc3QsCisgICAgICAgICAgICAgICAgc2VsZi5ydW5f aW5fc2FuZGJveCgic2NjYWNoZSIsICItLXN0YXJ0LXNlcnZlciIsIGVudj1zY2NhY2hlX2Vudmly b25tZW50LCBidWlsZGluZ19sb2NhbF9kZXBzPWJ1aWxkaW5nX2xvY2FsX2RlcHMsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHRyYV9mbGF0cGFrX2FyZ3M9W3NoYXJlX25l dHdvcmtfb3B0aW9uXSwgc3RhcnRfc2NjYWNoZT1GYWxzZSkKIAogICAgICAgICAgICAgIyBGb3J3 YXJkIHNjY2FjaGUgc2VydmVyIGVudiB2YXJzIHRvIHNjY2FjaGUgY2xpZW50cy4KQEAgLTk2OSwx NiArOTYyLDExIEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICBwa2dfY29uZmln X3BhdGggPSBzZWxmLmJ1aWxkX3BhdGgKICAgICAgICAgc2FuZGJveF9lbnZpcm9ubWVudFsiUEtH X0NPTkZJR19QQVRIIl0gPSBwa2dfY29uZmlnX3BhdGgKIAotICAgICAgICBpZiBub3QgYnVpbGRp bmdfZ3N0IGFuZCBhcmdzWzBdICE9ICJzY2NhY2hlIjoKLSAgICAgICAgICAgICMgTWVyZ2UgZ3N0 LWJ1aWxkIGVudiB2YXJzIGluIHNhbmRib3ggZW52aXJvbm1lbnQsIHdpdGhvdXQgb3ZlcnJpZGlu ZyBwcmV2aW91c2x5IHNldCBQQVRIIHZhbHVlcy4KLSAgICAgICAgICAgIGdzdF9lbnYgPSBzZWxm LnNldHVwX2dzdGJ1aWxkKGJ1aWxkaW5nKQotICAgICAgICAgICAgZm9yIHZhcl9uYW1lIGluIGxp c3QoZ3N0X2Vudi5rZXlzKCkpOgotICAgICAgICAgICAgICAgIGlmIHZhcl9uYW1lIG5vdCBpbiBz YW5kYm94X2Vudmlyb25tZW50OgotICAgICAgICAgICAgICAgICAgICBzYW5kYm94X2Vudmlyb25t ZW50W3Zhcl9uYW1lXSA9IGdzdF9lbnZbdmFyX25hbWVdCi0gICAgICAgICAgICAgICAgZWxzZToK LSAgICAgICAgICAgICAgICAgICAgY29udGVudHMgPSBnc3RfZW52W3Zhcl9uYW1lXQotICAgICAg ICAgICAgICAgICAgICBpZiB2YXJfbmFtZS5lbmRzd2l0aCgnUEFUSCcpOgotICAgICAgICAgICAg ICAgICAgICAgICAgc2FuZGJveF9lbnZpcm9ubWVudFt2YXJfbmFtZV0gPSAiJXM6JXMiICUgKHNh bmRib3hfZW52aXJvbm1lbnRbdmFyX25hbWVdLCBjb250ZW50cykKKyAgICAgICAgaWYgbm90IGJ1 aWxkaW5nX2xvY2FsX2RlcHMgYW5kIGFyZ3NbMF0gIT0gInNjY2FjaGUiOgorICAgICAgICAgICAg IyBNZXJnZSBsb2NhbCBkZXBlbmRlbmNpZXMgYnVpbGQgZW52IHZhcnMgaW4gc2FuZGJveCBlbnZp cm9ubWVudCwgd2l0aG91dCBvdmVycmlkaW5nCisgICAgICAgICAgICAjIHByZXZpb3VzbHkgc2V0 IFBBVEggdmFsdWVzLgorICAgICAgICAgICAgbG9jYWxfZW52ID0gc2VsZi5zZXR1cF9sb2NhbF9k ZXBzKGJ1aWxkaW5nKQorICAgICAgICAgICAgc2FuZGJveF9lbnZpcm9ubWVudCA9IHNlbGYuX21l cmdlX2Vudl92YXJpYWJsZXMoc2FuZGJveF9lbnZpcm9ubWVudCwgbG9jYWxfZW52KQogCiAgICAg ICAgIGZvciBlbnZ2YXIsIHZhbHVlIGluIHNhbmRib3hfZW52aXJvbm1lbnQuaXRlbXMoKToKICAg ICAgICAgICAgIGZsYXRwYWtfY29tbWFuZC5hcHBlbmQoIi0tZW52PSVzPSVzIiAlIChlbnZ2YXIs IHZhbHVlKSkKQEAgLTEyMTgsNyArMTIwNiw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAg ICAgICAgICAgICAgc2VsZi51c2VyX2NvbW1hbmQuYXBwZW5kKCItLWNtYWtlYXJncz0lcyIgJSBz ZWxmLmNtYWtlYXJncykKIAogICAgICAgICAgICAgcmV0dXJuIHNlbGYucnVuX2luX3NhbmRib3go KnNlbGYudXNlcl9jb21tYW5kICsgc2VsZi5leHRyYV9jb21tYW5kX2FyZ3MpCi0gICAgICAgIGVs aWYgbm90IHNlbGYudXBkYXRlIGFuZCBub3Qgc2VsZi5idWlsZF9nc3QgYW5kIG5vdCBzZWxmLnJl Z2VuZXJhdGVfdG9vbGNoYWluczoKKyAgICAgICAgZWxpZiBub3Qgc2VsZi51cGRhdGUgYW5kIG5v dCBzZWxmLmJ1aWxkX2xvY2FsX2RlcHMgYW5kIG5vdCBzZWxmLnJlZ2VuZXJhdGVfdG9vbGNoYWlu czoKICAgICAgICAgICAgIHJldHVybiBzZWxmLnJ1bl9pbl9zYW5kYm94KCkKIAogICAgICAgICBy ZXR1cm4gMApkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9sb2NhbC1wcm9qZWN0cy9tZXNvbi5i dWlsZCBiL1Rvb2xzL2ZsYXRwYWsvbG9jYWwtcHJvamVjdHMvbWVzb24uYnVpbGQKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uM2ZlNzkyZGY5NTA0YzI4M2I3MjFkMGJlNGYwZTg0ZTBlNWFkMjNjNQotLS0gL2Rldi9udWxs CisrKyBiL1Rvb2xzL2ZsYXRwYWsvbG9jYWwtcHJvamVjdHMvbWVzb24uYnVpbGQKQEAgLTAsMCAr MSwxMSBAQAorcHJvamVjdCgnd2Via2l0LWxvY2FsLWRlcHMnLCAnYycsCisgICAgICAgIHZlcnNp b24gOiAnMC4xLjAnKQorCitzdWJwcm9qZWN0cyA9IFsKKyAgJ2xpYnNvdXAnLAorICAnZ3N0cmVh bWVyLW1vbm9yZXBvJywKK10KKworZm9yZWFjaCBwcm9qZWN0X25hbWUgOiBzdWJwcm9qZWN0cwor ICBzdWJwcm9qID0gc3VicHJvamVjdChwcm9qZWN0X25hbWUsIHJlcXVpcmVkOiB0cnVlKQorZW5k Zm9yZWFjaApkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9sb2NhbC1wcm9qZWN0cy9zdWJwcm9q ZWN0cy9nc3RyZWFtZXItbW9ub3JlcG8ud3JhcCBiL1Rvb2xzL2ZsYXRwYWsvbG9jYWwtcHJvamVj dHMvc3VicHJvamVjdHMvZ3N0cmVhbWVyLW1vbm9yZXBvLndyYXAKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjdiZmU4 OGI1MWYzMzdkNWFlYjYxOGQxNTg1MmI2OTVlNWNjZjcwNQotLS0gL2Rldi9udWxsCisrKyBiL1Rv b2xzL2ZsYXRwYWsvbG9jYWwtcHJvamVjdHMvc3VicHJvamVjdHMvZ3N0cmVhbWVyLW1vbm9yZXBv LndyYXAKQEAgLTAsMCArMSwzIEBACitbd3JhcC1naXRdCit1cmwgPSBodHRwczovL2dpdGxhYi5m cmVlZGVza3RvcC5vcmcvZ3N0cmVhbWVyL2dzdHJlYW1lci5naXQKK3JldmlzaW9uID0gaGVhZApk aWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9sb2NhbC1wcm9qZWN0cy9zdWJwcm9qZWN0cy9saWJz b3VwLndyYXAgYi9Ub29scy9mbGF0cGFrL2xvY2FsLXByb2plY3RzL3N1YnByb2plY3RzL2xpYnNv dXAud3JhcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi40MGM3ZjAzNDAxMTlkYjUwMTI2N2FhN2MwYjMzMjc1MmU3YjBl NmFlCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvZmxhdHBhay9sb2NhbC1wcm9qZWN0cy9zdWJw cm9qZWN0cy9saWJzb3VwLndyYXAKQEAgLTAsMCArMSwzIEBACitbd3JhcC1naXRdCit1cmwgPSBo dHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ25vbWUvbGlic291cC5naXQKK3JldmlzaW9uID0gaGVh ZAo= 456111 2022-03-30 04:04:50 -0700 2022-04-04 10:18:48 -0700 Patch bug-238452-20220330040449.patch text/plain 12900 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMTAyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzE3OWU5MzdjM2QwYTE5MGRlNmIwMGIzOWI1OGY2NDI4 MDljMTAyYi4uZjliNWZhMzM0NTk0Njg1ZDY2OGNmYTAxMDhiMTExZDIxZjFmYWNkOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDIyLTAzLTI4ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIExvY2FsIGRlcGVuZGVuY2llcyBvdmVycmlkZSBzdXBw b3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg0 NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVu IHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBXRUJLSVRfU0RLX0xPQ0FMX0RFUFMgaXMgc2V0IGF0 IGNvbXBpbGUtdGltZSBhbmQgcnVudGltZSwgc29tZQorICAgICAgICBkZXBlbmRlbmNpZXMgKGN1 cnJlbnRseSBvbmx5IGxpYnNvdXAgYW5kIEdTdHJlYW1lcikgd2lsbCBiZSBwaWNrZWQgdXAgZnJv bSBsb2NhbCBnaXQKKyAgICAgICAgY2hlY2tvdXRzIGxvY2F0ZWQgaW4gVG9vbHMvZmxhdHBhay8u IElmIG5vIGNoZWNrb3V0IGlzIHByZXNlbnQsIG9uZSB3aWxsIGJlIG1hZGUgYmFzZWQgb24KKyAg ICAgICAgdGhlIGNvcnJlc3BvbmRpbmcgLndyYXAgZmlsZS4KKworICAgICAgICBFeGFtcGxlOiBX RUJLSVRfU0RLX0xPQ0FMX0RFUFM9bGlic291cCxnc3RyZWFtZXItbW9ub3JlcG8gYnVpbGQtd2Vi a2l0IC0td3BlIC4uLgorCisgICAgICAgIFRoaXMgc2V0dXAgcmVwbGFjZXMgdGhlIHByZXZpb3Vz IG9uZSB0aGF0IHdhcyBzcGVjaWZpYyB0byBHU3RyZWFtZXIuCisKKyAgICAgICAgKiBmbGF0cGFr L2ZsYXRwYWt1dGlscy5weToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsubG9hZF9mcm9tX2FyZ3Mp OgorICAgICAgICAoV2Via2l0RmxhdHBhay5fX2luaXRfXyk6CisgICAgICAgIChXZWJraXRGbGF0 cGFrLnNldHVwX2xvY2FsX2RlcHMpOgorICAgICAgICAoV2Via2l0RmxhdHBhay5fbWVyZ2VfZW52 X3ZhcmlhYmxlcyk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnJ1bl9pbl9zYW5kYm94KToKKyAg ICAgICAgKFdlYmtpdEZsYXRwYWsuc2V0dXBfZGV2X2Vudik6CisgICAgICAgIChXZWJraXRGbGF0 cGFrLnNldHVwX2dzdGJ1aWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiBmbGF0cGFrL2xvY2FsLXBy b2plY3RzL21lc29uLmJ1aWxkOiBBZGRlZC4KKyAgICAgICAgKiBmbGF0cGFrL2xvY2FsLXByb2pl Y3RzL3N1YnByb2plY3RzL2dzdHJlYW1lci1tb25vcmVwby53cmFwOiBBZGRlZC4KKyAgICAgICAg KiBmbGF0cGFrL2xvY2FsLXByb2plY3RzL3N1YnByb2plY3RzL2xpYnNvdXAud3JhcDogQWRkZWQu CisKIDIwMjItMDMtMjkgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBEb24ndCBjcmVhdGUgZGlyZWN0b3JpZXMgb24gaU9TIGlmIHdlIGFyZSBv bmx5IHVzaW5nIGVwaGVtZXJhbCBzdG9yYWdlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9m bGF0cGFrdXRpbHMucHkgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQppbmRleCA0ZDBm YjFkNTg2MzI2MjNmOTMyZTA3YTVlMDZmZjExMmFjODZhNzBkLi40NTZiNmViN2UxMDVmZGFkNjFm NjNkODU3NWQ5OWYxMzhhZWI4ZTZmIDEwMDY0NAotLS0gYS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1 dGlscy5weQorKysgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQpAQCAtNDg4LDkgKzQ4 OCw4IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIGdlbmVyYWwuYWRkX2FyZ3VtZW50 KCItdSIsICItLXVwZGF0ZSIsIGRlc3Q9InVwZGF0ZSIsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGhlbHA9IlVwZGF0ZSB0aGUgU0RLIikKLSAgICAgICAgZ2VuZXJhbC5hZGRfYXJndW1lbnQoIi1i Z3N0IiwgIi0tYnVpbGQtZ3N0IiwgZGVzdD0iYnVpbGRfZ3N0IiwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYWN0aW9uPSJzdG9yZV90cnVlIiwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaGVscD0iRm9yY2UgcmVidWlsZGluZyBnc3QtYnVpbGQsIHJlcG9zaXRvcnkgcGF0aCBp cyBkZWZpbmVkIGJ5IHRoZSBgR1NUX0JVSUxEX1BBVEhgIGVudmlyb25tZW50IHZhcmlhYmxlLiIp CisgICAgICAgIGdlbmVyYWwuYWRkX2FyZ3VtZW50KCItYmRlcHMiLCAiLS1idWlsZC1sb2NhbC1k ZXBzIiwgZGVzdD0iYnVpbGRfbG9jYWxfZGVwcyIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGhlbHA9IkZvcmNlIHJlYnVpbGRpbmcgbG9jYWwgZGVw ZW5kZW5jaWVzIikKICAgICAgICAgZ2VuZXJhbC5hZGRfYXJndW1lbnQoIi1xIiwgIi0tcXVpZXQi LCBkZXN0PSJxdWlldCIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFjdGlvbj0ic3Rv cmVfdHJ1ZSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9IkRvIG5vdCBwcmlu dCBhbnl0aGluZyIpCkBAIC01NTgsNyArNTU3LDcgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAg ICAgICAgc2VsZi5yZWxlYXNlID0gRmFsc2UKICAgICAgICAgc2VsZi5kZWJ1ZyA9IEZhbHNlCiAK LSAgICAgICAgc2VsZi5idWlsZF9nc3QgPSBGYWxzZQorICAgICAgICBzZWxmLmJ1aWxkX2xvY2Fs X2RlcHMgPSBGYWxzZQogCiAgICAgICAgIHNlbGYucGxhdGZvcm0gPSAiZ3RrIgogICAgICAgICBz ZWxmLmNoZWNrX2F2YWlsYWJsZSA9IEZhbHNlCkBAIC02NjksNTAgKzY2OCw0NiBAQCBjbGFzcyBX ZWJraXRGbGF0cGFrOgogCiAgICAgICAgIHJldHVybiBUcnVlCiAKLQotICAgIGRlZiBzZXR1cF9n c3RidWlsZChzZWxmLCBidWlsZGluZyk6Ci0gICAgICAgIGdzdF9kaXIgPSBvcy5lbnZpcm9uLmdl dCgnR1NUX0JVSUxEX1BBVEgnKQotICAgICAgICBpZiBub3QgZ3N0X2RpcjoKKyAgICBkZWYgc2V0 dXBfbG9jYWxfZGVwcyhzZWxmLCBidWlsZGluZyk6CisgICAgICAgIGlmIG5vdCBvcy5lbnZpcm9u LmdldCgnV0VCS0lUX1NES19MT0NBTF9ERVBTJyk6CiAgICAgICAgICAgICBpZiBidWlsZGluZzoK LSAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCIkR1NUX0JVSUxEX1BBVEggZW52aXJvbm1lbnQg dmFyaWFibGUgbm90IHNldC4gU2tpcHBpbmcgZ3N0LWJ1aWxkXG4iKQorICAgICAgICAgICAgICAg IF9sb2cuZGVidWcoIiRXRUJLSVRfU0RLX0xPQ0FMX0RFUFMgZW52aXJvbm1lbnQgdmFyaWFibGUg bm90IHNldC4gU2tpcHBpbmcgbG9jYWwgZGVwZW5kZW5jaWVzIGJ1aWxkIikKICAgICAgICAgICAg IHJldHVybiB7fQogCi0gICAgICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4o Z3N0X2RpciwgJ2dzdC1lbnYucHknKSk6Ci0gICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3Io J0dTVF9CVUlMRF9QQVRIIHNldCB0byAlcyBidXQgaXQgZG9lc25cJ3Qgc2VlbSB0byBiZSBhIHZh bGlkIGBnc3QtYnVpbGRgIGNoZWNrb3V0LicgJSBnc3RfZGlyKQotCi0gICAgICAgIGdzdF9idWls ZGRpciA9IG9zLnBhdGguam9pbihERUZBVUxUX0JVSUxEX1JPT1QsICdnc3QtYnVpbGQnKQotICAg ICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMob3MucGF0aC5qb2luKERFRkFVTFRfQlVJTERfUk9P VCwgJ2dzdC1idWlsZCcsICdidWlsZC5uaW5qYScpKToKKyAgICAgICAgc3JjX2RpciA9IG9zLnBh dGguam9pbihXRUJLSVRfU09VUkNFX0RJUiwgJ1Rvb2xzJywgJ2ZsYXRwYWsnLCAnbG9jYWwtcHJv amVjdHMnKQorICAgICAgICBidWlsZF9kaXIgPSBvcy5wYXRoLmpvaW4oREVGQVVMVF9CVUlMRF9S T09ULCAnZGVwcy1idWlsZCcpCisgICAgICAgIHNhbmRib3hfYnVpbGRfZGlyID0gY29udmVydF93 ZWJraXRfc291cmNlX3BhdGhfdG9fc2FuZGJveF9wYXRoKGJ1aWxkX2RpcikKKyAgICAgICAgaWYg bm90IG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihidWlsZF9kaXIsICdidWlsZC5uaW5qYScp KToKICAgICAgICAgICAgIGlmIG5vdCBidWlsZGluZzoKLSAgICAgICAgICAgICAgICByYWlzZSBS dW50aW1lRXJyb3IoJ1RyeWluZyB0byBlbnRlciBnc3QtYnVpbGQgZW52IGZyb20gJXMgYnV0IGl0 IGlzIG5vdCBidWlsdCwgbWFrZSBzdXJlIHRvIHJlYnVpbGQgd2Via2l0LicgJSBnc3RfZGlyKQor ICAgICAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignVHJ5aW5nIHRvIGVudGVyIGRlcHMt YnVpbGQgZW52IGZyb20gJXMgYnV0IGl0IGlzIG5vdCBidWlsdCwgbWFrZSBzdXJlIHRvIHJlYnVp bGQgd2Via2l0LicsIHNyY19kaXIpCiAKLSAgICAgICAgICAgIGFyZ3MgPSBbJ21lc29uJywgXQot ICAgICAgICAgICAgZXh0cmFfYXJncyA9IG9zLmVudmlyb24uZ2V0KCdHU1RfQlVJTERfQVJHUycs ICcnKQotICAgICAgICAgICAgYXJncy5leHRlbmQoc2hsZXguc3BsaXQoZXh0cmFfYXJncykgKyBb Z3N0X2RpciwgZ3N0X2J1aWxkZGlyXSkKLSAgICAgICAgICAgIENvbnNvbGUubWVzc2FnZSgiUnVu bmluZyAlcyAiLCAnICcuam9pbihhcmdzKSkKLSAgICAgICAgICAgIHNlbGYucnVuX2luX3NhbmRi b3goKmFyZ3MsIGJ1aWxkaW5nX2dzdD1UcnVlLCBzdGFydF9zY2NhY2hlPUZhbHNlKQorICAgICAg ICAgICAgcHJvamVjdHMgPSAnLURzdWJwcm9qZWN0cz0lcycgJSBvcy5lbnZpcm9uWydXRUJLSVRf U0RLX0xPQ0FMX0RFUFMnXQorICAgICAgICAgICAgYXJncyA9IFsnbWVzb24nLCBwcm9qZWN0cywg Y29udmVydF93ZWJraXRfc291cmNlX3BhdGhfdG9fc2FuZGJveF9wYXRoKHNyY19kaXIpLCBzYW5k Ym94X2J1aWxkX2Rpcl0KKyAgICAgICAgICAgIHNlbGYucnVuX2luX3NhbmRib3goKmFyZ3MsIGJ1 aWxkaW5nX2xvY2FsX2RlcHM9VHJ1ZSwgc3RhcnRfc2NjYWNoZT1GYWxzZSkKIAogICAgICAgICBp ZiBidWlsZGluZzoKLSAgICAgICAgICAgIENvbnNvbGUubWVzc2FnZSgiQnVpbGRpbmcgYGdzdC1i dWlsZGAgJXMgIiwgZ3N0X2RpcikKLSAgICAgICAgICAgIGlmIHNlbGYucnVuX2luX3NhbmRib3go J25pbmphJywgJy1DJywgZ3N0X2J1aWxkZGlyLCBidWlsZGluZ19nc3Q9VHJ1ZSwgc3RhcnRfc2Nj YWNoZT1GYWxzZSkgIT0gMDoKLSAgICAgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ0Vy cm9yIHdoaWxlIGJ1aWxkaW5nIGdzdC1idWlsZC4nKQotCi0gICAgICAgIGNvbW1hbmQgPSBbb3Mu cGF0aC5qb2luKGdzdF9kaXIsICdnc3QtZW52LnB5JyksICctLWJ1aWxkZGlyJywgZ3N0X2J1aWxk ZGlyLCAnLS1zcmNkaXInLCBnc3RfZGlyLCAiLS1vbmx5LWVudmlyb25tZW50Il0KLSAgICAgICAg Z3N0X2VudiA9IHJ1bl9zYW5pdGl6ZWQoY29tbWFuZCwgZ2F0aGVyX291dHB1dD1UcnVlKQotICAg ICAgICBhbGxvd2xpc3QgPSAoIkxEX0xJQlJBUllfUEFUSCIsICJQQVRIIiwgIlBLR19DT05GSUdf UEFUSCIpCi0gICAgICAgIG5vcGF0aGxpc3QgPSAoIkdTVF9ERUJVRyIsICJHU1RfVkVSU0lPTiIs ICJHU1RfRU5WIiwgIkdTVF9UUkFDRVJTIikKKyAgICAgICAgICAgIENvbnNvbGUubWVzc2FnZSgi QnVpbGRpbmcgbG9jYWwgZGVwZW5kZW5jaWVzIGZyb20gJXMgIiwgc3JjX2RpcikKKyAgICAgICAg ICAgIGlmIHNlbGYucnVuX2luX3NhbmRib3goJ21lc29uJywgJ2NvbXBpbGUnLCAnLUMnLCBzYW5k Ym94X2J1aWxkX2RpciwgYnVpbGRpbmdfbG9jYWxfZGVwcz1UcnVlLCBzdGFydF9zY2NhY2hlPUZh bHNlKSAhPSAwOgorICAgICAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignRXJyb3Igd2hp bGUgYnVpbGRpbmcgbG9jYWwgZGVwZW5kZW5jaWVzLicpCisKKyAgICAgICAgY29tbWFuZCA9IFsn bWVzb24nLCAnZGV2ZW52JywgJy1DJywgc2FuZGJveF9idWlsZF9kaXIsICctLWR1bXAnXQorICAg ICAgICBsb2NhbF9lbnYgPSBzZWxmLnJ1bl9pbl9zYW5kYm94KCpjb21tYW5kLCBidWlsZGluZ19s b2NhbF9kZXBzPVRydWUsIHN0YXJ0X3NjY2FjaGU9RmFsc2UsIGdhdGhlcl9vdXRwdXQ9VHJ1ZSkK ICAgICAgICAgZW52ID0ge30KLSAgICAgICAgZm9yIGxpbmUgaW4gW2xpbmUgZm9yIGxpbmUgaW4g Z3N0X2Vudi5zcGxpdGxpbmVzKCkgaWYgbm90IGxpbmUuc3RhcnRzd2l0aCgiZXhwb3J0IildOgor ICAgICAgICBmb3IgbGluZSBpbiBbbGluZSBmb3IgbGluZSBpbiBsb2NhbF9lbnYuc3BsaXRsaW5l cygpIGlmIG5vdCBsaW5lLnN0YXJ0c3dpdGgoImV4cG9ydCIpXToKICAgICAgICAgICAgIHRva2Vu cyA9IGxpbmUuc3BsaXQoIj0iKQogICAgICAgICAgICAgdmFyX25hbWUsIGNvbnRlbnRzID0gdG9r ZW5zWzBdLCAiPSIuam9pbih0b2tlbnNbMTpdKQotICAgICAgICAgICAgaWYgbm90IHZhcl9uYW1l LnN0YXJ0c3dpdGgoIkdTVF8iKSBhbmQgdmFyX25hbWUgbm90IGluIGFsbG93bGlzdDoKLSAgICAg ICAgICAgICAgICBjb250aW51ZQotICAgICAgICAgICAgaWYgdmFyX25hbWUgbm90IGluIG5vcGF0 aGxpc3Q6Ci0gICAgICAgICAgICAgICAgbmV3X2NvbnRlbnRzID0gJzonLmpvaW4oW2NvbnZlcnRf d2Via2l0X3NvdXJjZV9wYXRoX3RvX3NhbmRib3hfcGF0aChwKSBmb3IgcCBpbiBjb250ZW50cy5z cGxpdCgiOiIpXSkKLSAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgbmV3X2NvbnRl bnRzID0gY29udGVudHMucmVwbGFjZSgiJyIsICIiKQotICAgICAgICAgICAgZW52W3Zhcl9uYW1l XSA9IG5ld19jb250ZW50cworICAgICAgICAgICAgZW52W3Zhcl9uYW1lXSA9IGNvbnRlbnRzCiAg ICAgICAgIHJldHVybiBlbnYKIAorICAgIGRlZiBfbWVyZ2VfZW52X3ZhcmlhYmxlcyhzZWxmLCBl bnZpcm9ubWVudCwgYWRkaXRpb25hbF9lbnZpcm9ubWVudCk6CisgICAgICAgIGZvciB2YXJfbmFt ZSwgdmFsdWUgaW4gYWRkaXRpb25hbF9lbnZpcm9ubWVudC5pdGVtcygpOgorICAgICAgICAgICAg aWYgdmFyX25hbWUgbm90IGluIGVudmlyb25tZW50OgorICAgICAgICAgICAgICAgIGVudmlyb25t ZW50W3Zhcl9uYW1lXSA9IHZhbHVlCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAg IGlmIHZhcl9uYW1lLmVuZHN3aXRoKCdQQVRIJyk6CisgICAgICAgICAgICAgICAgICAgIGVudmly b25tZW50W3Zhcl9uYW1lXSA9ICIlczolcyIgJSAoZW52aXJvbm1lbnRbdmFyX25hbWVdLCB2YWx1 ZSkKKyAgICAgICAgcmV0dXJuIGVudmlyb25tZW50CisKICAgICBkZWYgaXNfYnJhbmNoX2J1aWxk KHNlbGYpOgogICAgICAgICB0cnk6CiAgICAgICAgICAgICB3aXRoIG9wZW4ob3MuZGV2bnVsbCwg J3cnKSBhcyBkZXZudWxsOgpAQCAtNzUxLDEzICs3NDYsMTIgQEAgY2xhc3MgV2Via2l0RmxhdHBh azoKICAgICAgICAgZXh0cmFfZmxhdHBha19hcmdzID0ga3dhcmdzLmdldCgiZXh0cmFfZmxhdHBh a19hcmdzIiwgW10pCiAgICAgICAgIHN0YXJ0X3NjY2FjaGUgPSBrd2FyZ3MuZ2V0KCJzdGFydF9z Y2NhY2hlIiwgVHJ1ZSkKICAgICAgICAgc2tpcF9pY2MgPSBrd2FyZ3MuZ2V0KCJza2lwX2ljYyIs IEZhbHNlKQotICAgICAgICBidWlsZGluZ19nc3QgPSBrd2FyZ3MuZ2V0KCJidWlsZGluZ19nc3Qi LCBGYWxzZSkKKyAgICAgICAgYnVpbGRpbmdfbG9jYWxfZGVwcyA9IGt3YXJncy5nZXQoImJ1aWxk aW5nX2xvY2FsX2RlcHMiLCBGYWxzZSkKICAgICAgICAgZ2F0aGVyX291dHB1dCA9IGt3YXJncy5n ZXQoImdhdGhlcl9vdXRwdXQiLCBGYWxzZSkKIAogICAgICAgICBpZiBnYXRoZXJfb3V0cHV0Ogog ICAgICAgICAgICAgc3RhcnRfc2NjYWNoZSA9IEZhbHNlCiAgICAgICAgICAgICBza2lwX2ljYyA9 IFRydWUKLSAgICAgICAgICAgIGJ1aWxkaW5nX2dzdCA9IEZhbHNlCiAKICAgICAgICAgaWYgbm90 IGlzaW5zdGFuY2UoYXJncywgbGlzdCk6CiAgICAgICAgICAgICBhcmdzID0gbGlzdChhcmdzKQpA QCAtODk2LDcgKzg5MCw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIHJlbW90ZV9z Y2NhY2hlX2NvbmZpZ3MgPSBzZXQoWyJTQ0NBQ0hFX1JFRElTIiwgIlNDQ0FDSEVfQlVDS0VUIiwg IlNDQ0FDSEVfTUVNQ0FDSEVEIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIlNDQ0FDSEVfR0NTX0JVQ0tFVCIsICJTQ0NBQ0hFX0FaVVJFX0NPTk5FQ1RJT05fU1RSSU5H IiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIldFQktJVF9VU0VfU0ND QUNIRSJdKQotICAgICAgICBpZiByZW1vdGVfc2NjYWNoZV9jb25maWdzLmludGVyc2VjdGlvbihz ZXQob3MuZW52aXJvbi5rZXlzKCkpKSBhbmQgc3RhcnRfc2NjYWNoZSBhbmQgbm90IGJ1aWxkaW5n X2dzdDoKKyAgICAgICAgaWYgcmVtb3RlX3NjY2FjaGVfY29uZmlncy5pbnRlcnNlY3Rpb24oc2V0 KG9zLmVudmlyb24ua2V5cygpKSkgYW5kIHN0YXJ0X3NjY2FjaGUgYW5kIG5vdCBidWlsZGluZ19s b2NhbF9kZXBzOgogICAgICAgICAgICAgX2xvZy5kZWJ1ZygiRW5hYmxpbmcgbmV0d29yayBhY2Nl c3MgZm9yIHRoZSByZW1vdGUgc2NjYWNoZSIpCiAgICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQu YXBwZW5kKHNoYXJlX25ldHdvcmtfb3B0aW9uKQogCkBAIC05MTMsNyArOTA3LDcgQEAgY2xhc3Mg V2Via2l0RmxhdHBhazoKICAgICAgICAgICAgIGlmIGJ1aWxkaW5nOgogICAgICAgICAgICAgICAg ICMgU3Bhd24gdGhlIHNjY2FjaGUgc2VydmVyIGluIGJhY2tncm91bmQsIGFuZCBhdm9pZCByZWN1 cnNpbmcgaGVyZSwgdXNpbmcgYSBib29sIGtleXdvcmQuCiAgICAgICAgICAgICAgICAgX2xvZy5k ZWJ1ZygiUHJlLXN0YXJ0aW5nIHRoZSBTQ0NhY2hlIGRpc3Qgc2VydmVyIikKLSAgICAgICAgICAg ICAgICBzZWxmLnJ1bl9pbl9zYW5kYm94KCJzY2NhY2hlIiwgIi0tc3RhcnQtc2VydmVyIiwgZW52 PXNjY2FjaGVfZW52aXJvbm1lbnQsIGJ1aWxkaW5nX2dzdD1idWlsZGluZ19nc3QsCisgICAgICAg ICAgICAgICAgc2VsZi5ydW5faW5fc2FuZGJveCgic2NjYWNoZSIsICItLXN0YXJ0LXNlcnZlciIs IGVudj1zY2NhY2hlX2Vudmlyb25tZW50LCBidWlsZGluZ19sb2NhbF9kZXBzPWJ1aWxkaW5nX2xv Y2FsX2RlcHMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHRyYV9mbGF0 cGFrX2FyZ3M9W3NoYXJlX25ldHdvcmtfb3B0aW9uXSwgc3RhcnRfc2NjYWNoZT1GYWxzZSkKIAog ICAgICAgICAgICAgIyBGb3J3YXJkIHNjY2FjaGUgc2VydmVyIGVudiB2YXJzIHRvIHNjY2FjaGUg Y2xpZW50cy4KQEAgLTk2OSwxNiArOTYzLDExIEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAg ICAgICAgICBwa2dfY29uZmlnX3BhdGggPSBzZWxmLmJ1aWxkX3BhdGgKICAgICAgICAgc2FuZGJv eF9lbnZpcm9ubWVudFsiUEtHX0NPTkZJR19QQVRIIl0gPSBwa2dfY29uZmlnX3BhdGgKIAotICAg ICAgICBpZiBub3QgYnVpbGRpbmdfZ3N0IGFuZCBhcmdzWzBdICE9ICJzY2NhY2hlIjoKLSAgICAg ICAgICAgICMgTWVyZ2UgZ3N0LWJ1aWxkIGVudiB2YXJzIGluIHNhbmRib3ggZW52aXJvbm1lbnQs IHdpdGhvdXQgb3ZlcnJpZGluZyBwcmV2aW91c2x5IHNldCBQQVRIIHZhbHVlcy4KLSAgICAgICAg ICAgIGdzdF9lbnYgPSBzZWxmLnNldHVwX2dzdGJ1aWxkKGJ1aWxkaW5nKQotICAgICAgICAgICAg Zm9yIHZhcl9uYW1lIGluIGxpc3QoZ3N0X2Vudi5rZXlzKCkpOgotICAgICAgICAgICAgICAgIGlm IHZhcl9uYW1lIG5vdCBpbiBzYW5kYm94X2Vudmlyb25tZW50OgotICAgICAgICAgICAgICAgICAg ICBzYW5kYm94X2Vudmlyb25tZW50W3Zhcl9uYW1lXSA9IGdzdF9lbnZbdmFyX25hbWVdCi0gICAg ICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAgICAgY29udGVudHMgPSBnc3RfZW52 W3Zhcl9uYW1lXQotICAgICAgICAgICAgICAgICAgICBpZiB2YXJfbmFtZS5lbmRzd2l0aCgnUEFU SCcpOgotICAgICAgICAgICAgICAgICAgICAgICAgc2FuZGJveF9lbnZpcm9ubWVudFt2YXJfbmFt ZV0gPSAiJXM6JXMiICUgKHNhbmRib3hfZW52aXJvbm1lbnRbdmFyX25hbWVdLCBjb250ZW50cykK KyAgICAgICAgaWYgbm90IGJ1aWxkaW5nX2xvY2FsX2RlcHMgYW5kIGFyZ3NbMF0gIT0gInNjY2Fj aGUiOgorICAgICAgICAgICAgIyBNZXJnZSBsb2NhbCBkZXBlbmRlbmNpZXMgYnVpbGQgZW52IHZh cnMgaW4gc2FuZGJveCBlbnZpcm9ubWVudCwgd2l0aG91dCBvdmVycmlkaW5nCisgICAgICAgICAg ICAjIHByZXZpb3VzbHkgc2V0IFBBVEggdmFsdWVzLgorICAgICAgICAgICAgbG9jYWxfZW52ID0g c2VsZi5zZXR1cF9sb2NhbF9kZXBzKGJ1aWxkaW5nKQorICAgICAgICAgICAgc2FuZGJveF9lbnZp cm9ubWVudCA9IHNlbGYuX21lcmdlX2Vudl92YXJpYWJsZXMoc2FuZGJveF9lbnZpcm9ubWVudCwg bG9jYWxfZW52KQogCiAgICAgICAgIGZvciBlbnZ2YXIsIHZhbHVlIGluIHNhbmRib3hfZW52aXJv bm1lbnQuaXRlbXMoKToKICAgICAgICAgICAgIGZsYXRwYWtfY29tbWFuZC5hcHBlbmQoIi0tZW52 PSVzPSVzIiAlIChlbnZ2YXIsIHZhbHVlKSkKQEAgLTEyMTgsNyArMTIwNyw3IEBAIGNsYXNzIFdl YmtpdEZsYXRwYWs6CiAgICAgICAgICAgICAgICAgc2VsZi51c2VyX2NvbW1hbmQuYXBwZW5kKCIt LWNtYWtlYXJncz0lcyIgJSBzZWxmLmNtYWtlYXJncykKIAogICAgICAgICAgICAgcmV0dXJuIHNl bGYucnVuX2luX3NhbmRib3goKnNlbGYudXNlcl9jb21tYW5kICsgc2VsZi5leHRyYV9jb21tYW5k X2FyZ3MpCi0gICAgICAgIGVsaWYgbm90IHNlbGYudXBkYXRlIGFuZCBub3Qgc2VsZi5idWlsZF9n c3QgYW5kIG5vdCBzZWxmLnJlZ2VuZXJhdGVfdG9vbGNoYWluczoKKyAgICAgICAgZWxpZiBub3Qg c2VsZi51cGRhdGUgYW5kIG5vdCBzZWxmLmJ1aWxkX2xvY2FsX2RlcHMgYW5kIG5vdCBzZWxmLnJl Z2VuZXJhdGVfdG9vbGNoYWluczoKICAgICAgICAgICAgIHJldHVybiBzZWxmLnJ1bl9pbl9zYW5k Ym94KCkKIAogICAgICAgICByZXR1cm4gMApkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9sb2Nh bC1wcm9qZWN0cy9tZXNvbi5idWlsZCBiL1Rvb2xzL2ZsYXRwYWsvbG9jYWwtcHJvamVjdHMvbWVz b24uYnVpbGQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uN2M4MGQ3MTdkNzFmODAxODI4ODJlY2M1NGRlMjVlNDQ2ZjBh YWM0MwotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL2ZsYXRwYWsvbG9jYWwtcHJvamVjdHMvbWVz b24uYnVpbGQKQEAgLTAsMCArMSw5IEBACitwcm9qZWN0KCd3ZWJraXQtbG9jYWwtZGVwcycsICdj JywKKyAgICAgICAgdmVyc2lvbiA6ICcwLjEuMCcpCisKK2ZvcmVhY2ggcHJvamVjdF9uYW1lOiBn ZXRfb3B0aW9uKCdzdWJwcm9qZWN0cycpLnNwbGl0KCcsJykKKyAgaWYgcHJvamVjdF9uYW1lICE9 ICcnCisgICAgbWVzc2FnZSAoJ0FkZGluZyBsb2NhbCBzdWJwcm9qZWN0ICcgKyBwcm9qZWN0X25h bWUpCisgICAgc3VicHJvaiA9IHN1YnByb2plY3QocHJvamVjdF9uYW1lLCByZXF1aXJlZDogdHJ1 ZSkKKyAgZW5kaWYKK2VuZGZvcmVhY2gKZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvbG9jYWwt cHJvamVjdHMvbWVzb25fb3B0aW9ucy50eHQgYi9Ub29scy9mbGF0cGFrL2xvY2FsLXByb2plY3Rz L21lc29uX29wdGlvbnMudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFlZmNjZmVmODcwNDBiMjZlNTQwOWMxN2Ni N2FlOTU2MThiOTRkMWIKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9mbGF0cGFrL2xvY2FsLXBy b2plY3RzL21lc29uX29wdGlvbnMudHh0CkBAIC0wLDAgKzEgQEAKK29wdGlvbignc3VicHJvamVj dHMnLCB0eXBlIDogJ3N0cmluZycsIHZhbHVlIDogJycsIGRlc2NyaXB0aW9uIDogJ0NvbW1hLXNl cGFyYXRlZCBwcm9qZWN0IG5hbWVzJykKZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvbG9jYWwt cHJvamVjdHMvc3VicHJvamVjdHMvZ3N0cmVhbWVyLW1vbm9yZXBvLndyYXAgYi9Ub29scy9mbGF0 cGFrL2xvY2FsLXByb2plY3RzL3N1YnByb2plY3RzL2dzdHJlYW1lci1tb25vcmVwby53cmFwCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLmY3YmZlODhiNTFmMzM3ZDVhZWI2MThkMTU4NTJiNjk1ZTVjY2Y3MDUKLS0tIC9k ZXYvbnVsbAorKysgYi9Ub29scy9mbGF0cGFrL2xvY2FsLXByb2plY3RzL3N1YnByb2plY3RzL2dz dHJlYW1lci1tb25vcmVwby53cmFwCkBAIC0wLDAgKzEsMyBAQAorW3dyYXAtZ2l0XQordXJsID0g aHR0cHM6Ly9naXRsYWIuZnJlZWRlc2t0b3Aub3JnL2dzdHJlYW1lci9nc3RyZWFtZXIuZ2l0City ZXZpc2lvbiA9IGhlYWQKZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvbG9jYWwtcHJvamVjdHMv c3VicHJvamVjdHMvbGlic291cC53cmFwIGIvVG9vbHMvZmxhdHBhay9sb2NhbC1wcm9qZWN0cy9z dWJwcm9qZWN0cy9saWJzb3VwLndyYXAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDBjN2YwMzQwMTE5ZGI1MDEyNjdh YTdjMGIzMzI3NTJlN2IwZTZhZQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL2ZsYXRwYWsvbG9j YWwtcHJvamVjdHMvc3VicHJvamVjdHMvbGlic291cC53cmFwCkBAIC0wLDAgKzEsMyBAQAorW3dy YXAtZ2l0XQordXJsID0gaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dub21lL2xpYnNvdXAuZ2l0 CityZXZpc2lvbiA9IGhlYWQK 456586 2022-04-04 10:18:54 -0700 2022-04-05 03:53:11 -0700 Patch bug-238452-20220404101852.patch text/plain 13289 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMjkxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTU4NGI2MDc1NTMyODdiNjVjMjk4MmVhMjE5M2ZkNDYz ZDExYTE5MS4uZDZmMjZjNTY1YzBmZmZkYjg4NDlhYzllZDA4NzU4YzU2NmY4ZWVhMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDIyLTA0LTA0ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIExvY2FsIGRlcGVuZGVuY2llcyBvdmVycmlkZSBzdXBw b3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg0 NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVu IHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBXRUJLSVRfU0RLX0xPQ0FMX0RFUFMgaXMgc2V0IGF0 IGNvbXBpbGUtdGltZSBhbmQgcnVudGltZSwgc29tZQorICAgICAgICBkZXBlbmRlbmNpZXMgKGN1 cnJlbnRseSBvbmx5IGxpYnNvdXAgYW5kIEdTdHJlYW1lcikgd2lsbCBiZSBwaWNrZWQgdXAgZnJv bSBsb2NhbCBnaXQKKyAgICAgICAgY2hlY2tvdXRzIGxvY2F0ZWQgaW4gVG9vbHMvZmxhdHBhay8u IElmIG5vIGNoZWNrb3V0IGlzIHByZXNlbnQsIG9uZSB3aWxsIGJlIG1hZGUgYmFzZWQgb24KKyAg ICAgICAgdGhlIGNvcnJlc3BvbmRpbmcgLndyYXAgZmlsZS4KKworICAgICAgICBFeGFtcGxlOiBX RUJLSVRfU0RLX0xPQ0FMX0RFUFM9bGlic291cCxnc3RyZWFtZXItZnVsbCBidWlsZC13ZWJraXQg LS13cGUgLi4uCisKKyAgICAgICAgQWRkaXRpb25hbCBNZXNvbiBvcHRpb25zIGNhbiBiZSBzdXBw bGllZCB3aXRoIFdFQktJVF9TREtfTE9DQUxfREVQU19PUFRJT05TLiBOZXN0ZWQKKyAgICAgICAg c3VicHJvamVjdHMgY29uZmlndXJhdGlvbiBpcyBzdXBwb3J0ZWQgYXMgd2VsbCwgZm9yIGV4YW1w bGU6CisKKyAgICAgICAgZXhwb3J0IFdFQktJVF9TREtfTE9DQUxfREVQU19PUFRJT05TPSItRGdz dHJlYW1lci1mdWxsOmludHJvc3BlY3Rpb249ZGlzYWJsZWQgLURnc3QtcGx1Z2lucy1nb29kOnNv dXA9ZGlzYWJsZWQiCisKKyAgICAgICAgVGhpcyBzZXR1cCByZXBsYWNlcyB0aGUgcHJldmlvdXMg b25lIHRoYXQgd2FzIHNwZWNpZmljIHRvIEdTdHJlYW1lci4KKworICAgICAgICAqIGZsYXRwYWsv ZmxhdHBha3V0aWxzLnB5OgorICAgICAgICAoV2Via2l0RmxhdHBhay5sb2FkX2Zyb21fYXJncyk6 CisgICAgICAgIChXZWJraXRGbGF0cGFrLl9faW5pdF9fKToKKyAgICAgICAgKFdlYmtpdEZsYXRw YWsuc2V0dXBfbG9jYWxfZGVwcyk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLl9tZXJnZV9lbnZf dmFyaWFibGVzKToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsucnVuX2luX3NhbmRib3gpOgorICAg ICAgICAoV2Via2l0RmxhdHBhay5zZXR1cF9kZXZfZW52KToKKyAgICAgICAgKFdlYmtpdEZsYXRw YWsuc2V0dXBfZ3N0YnVpbGQpOiBEZWxldGVkLgorICAgICAgICAqIGZsYXRwYWsvbG9jYWwtcHJv amVjdHMvbWVzb24uYnVpbGQ6IEFkZGVkLgorICAgICAgICAqIGZsYXRwYWsvbG9jYWwtcHJvamVj dHMvc3VicHJvamVjdHMvZ3N0cmVhbWVyLWZ1bGwud3JhcDogQWRkZWQuCisgICAgICAgICogZmxh dHBhay9sb2NhbC1wcm9qZWN0cy9zdWJwcm9qZWN0cy9saWJzb3VwLndyYXA6IEFkZGVkLgorCiAy MDIyLTAzLTMxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTWVyZ2UtUXVldWVdIFJlbW92ZSBjdXN0b20gc3VtbWFyaWVzIHdoZW4gc2tpcHBlZApkaWZm IC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkgYi9Ub29scy9mbGF0cGFrL2Zs YXRwYWt1dGlscy5weQppbmRleCA0ZDBmYjFkNTg2MzI2MjNmOTMyZTA3YTVlMDZmZjExMmFjODZh NzBkLi4xMzM5MjdjY2JiZDZkMjFlZDhkOTgzMDAxOWExZmE3ZGE1ZmI2OWUyIDEwMDY0NAotLS0g YS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQorKysgYi9Ub29scy9mbGF0cGFrL2ZsYXRw YWt1dGlscy5weQpAQCAtNDg4LDkgKzQ4OCw4IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAg ICAgIGdlbmVyYWwuYWRkX2FyZ3VtZW50KCItdSIsICItLXVwZGF0ZSIsIGRlc3Q9InVwZGF0ZSIs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9IlVwZGF0ZSB0aGUgU0RLIikKLSAgICAgICAg Z2VuZXJhbC5hZGRfYXJndW1lbnQoIi1iZ3N0IiwgIi0tYnVpbGQtZ3N0IiwgZGVzdD0iYnVpbGRf Z3N0IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWN0aW9uPSJzdG9yZV90cnVlIiwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0iRm9yY2UgcmVidWlsZGluZyBnc3Qt YnVpbGQsIHJlcG9zaXRvcnkgcGF0aCBpcyBkZWZpbmVkIGJ5IHRoZSBgR1NUX0JVSUxEX1BBVEhg IGVudmlyb25tZW50IHZhcmlhYmxlLiIpCisgICAgICAgIGdlbmVyYWwuYWRkX2FyZ3VtZW50KCIt YmRlcHMiLCAiLS1idWlsZC1sb2NhbC1kZXBzIiwgZGVzdD0iYnVpbGRfbG9jYWxfZGVwcyIsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGhlbHA9IkZv cmNlIHJlYnVpbGRpbmcgbG9jYWwgZGVwZW5kZW5jaWVzIikKICAgICAgICAgZ2VuZXJhbC5hZGRf YXJndW1lbnQoIi1xIiwgIi0tcXVpZXQiLCBkZXN0PSJxdWlldCIsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGhlbHA9IkRvIG5vdCBwcmludCBhbnl0aGluZyIpCkBAIC01NTgsNyArNTU3LDcgQEAg Y2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgc2VsZi5yZWxlYXNlID0gRmFsc2UKICAgICAg ICAgc2VsZi5kZWJ1ZyA9IEZhbHNlCiAKLSAgICAgICAgc2VsZi5idWlsZF9nc3QgPSBGYWxzZQor ICAgICAgICBzZWxmLmJ1aWxkX2xvY2FsX2RlcHMgPSBGYWxzZQogCiAgICAgICAgIHNlbGYucGxh dGZvcm0gPSAiZ3RrIgogICAgICAgICBzZWxmLmNoZWNrX2F2YWlsYWJsZSA9IEZhbHNlCkBAIC02 NjksNTAgKzY2OCw0OCBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogCiAgICAgICAgIHJldHVybiBU cnVlCiAKLQotICAgIGRlZiBzZXR1cF9nc3RidWlsZChzZWxmLCBidWlsZGluZyk6Ci0gICAgICAg IGdzdF9kaXIgPSBvcy5lbnZpcm9uLmdldCgnR1NUX0JVSUxEX1BBVEgnKQotICAgICAgICBpZiBu b3QgZ3N0X2RpcjoKKyAgICBkZWYgc2V0dXBfbG9jYWxfZGVwcyhzZWxmLCBidWlsZGluZyk6Cisg ICAgICAgIGlmIG5vdCBvcy5lbnZpcm9uLmdldCgnV0VCS0lUX1NES19MT0NBTF9ERVBTJyk6CiAg ICAgICAgICAgICBpZiBidWlsZGluZzoKLSAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCIkR1NU X0JVSUxEX1BBVEggZW52aXJvbm1lbnQgdmFyaWFibGUgbm90IHNldC4gU2tpcHBpbmcgZ3N0LWJ1 aWxkXG4iKQorICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoIiRXRUJLSVRfU0RLX0xPQ0FMX0RF UFMgZW52aXJvbm1lbnQgdmFyaWFibGUgbm90IHNldC4gU2tpcHBpbmcgbG9jYWwgZGVwZW5kZW5j aWVzIGJ1aWxkIikKICAgICAgICAgICAgIHJldHVybiB7fQogCi0gICAgICAgIGlmIG5vdCBvcy5w YXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oZ3N0X2RpciwgJ2dzdC1lbnYucHknKSk6Ci0gICAgICAg ICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ0dTVF9CVUlMRF9QQVRIIHNldCB0byAlcyBidXQgaXQg ZG9lc25cJ3Qgc2VlbSB0byBiZSBhIHZhbGlkIGBnc3QtYnVpbGRgIGNoZWNrb3V0LicgJSBnc3Rf ZGlyKQotCi0gICAgICAgIGdzdF9idWlsZGRpciA9IG9zLnBhdGguam9pbihERUZBVUxUX0JVSUxE X1JPT1QsICdnc3QtYnVpbGQnKQotICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMob3MucGF0 aC5qb2luKERFRkFVTFRfQlVJTERfUk9PVCwgJ2dzdC1idWlsZCcsICdidWlsZC5uaW5qYScpKToK KyAgICAgICAgc3JjX2RpciA9IG9zLnBhdGguam9pbihXRUJLSVRfU09VUkNFX0RJUiwgJ1Rvb2xz JywgJ2ZsYXRwYWsnLCAnbG9jYWwtcHJvamVjdHMnKQorICAgICAgICBidWlsZF9kaXIgPSBvcy5w YXRoLmpvaW4oREVGQVVMVF9CVUlMRF9ST09ULCAnZGVwcy1idWlsZCcpCisgICAgICAgIHNhbmRi b3hfYnVpbGRfZGlyID0gY29udmVydF93ZWJraXRfc291cmNlX3BhdGhfdG9fc2FuZGJveF9wYXRo KGJ1aWxkX2RpcikKKyAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihi dWlsZF9kaXIsICdidWlsZC5uaW5qYScpKToKICAgICAgICAgICAgIGlmIG5vdCBidWlsZGluZzoK LSAgICAgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ1RyeWluZyB0byBlbnRlciBnc3Qt YnVpbGQgZW52IGZyb20gJXMgYnV0IGl0IGlzIG5vdCBidWlsdCwgbWFrZSBzdXJlIHRvIHJlYnVp bGQgd2Via2l0LicgJSBnc3RfZGlyKQorICAgICAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJv cignVHJ5aW5nIHRvIGVudGVyIGRlcHMtYnVpbGQgZW52IGZyb20gJXMgYnV0IGl0IGlzIG5vdCBi dWlsdCwgbWFrZSBzdXJlIHRvIHJlYnVpbGQgd2Via2l0LicsIHNyY19kaXIpCiAKLSAgICAgICAg ICAgIGFyZ3MgPSBbJ21lc29uJywgXQotICAgICAgICAgICAgZXh0cmFfYXJncyA9IG9zLmVudmly b24uZ2V0KCdHU1RfQlVJTERfQVJHUycsICcnKQotICAgICAgICAgICAgYXJncy5leHRlbmQoc2hs ZXguc3BsaXQoZXh0cmFfYXJncykgKyBbZ3N0X2RpciwgZ3N0X2J1aWxkZGlyXSkKLSAgICAgICAg ICAgIENvbnNvbGUubWVzc2FnZSgiUnVubmluZyAlcyAiLCAnICcuam9pbihhcmdzKSkKLSAgICAg ICAgICAgIHNlbGYucnVuX2luX3NhbmRib3goKmFyZ3MsIGJ1aWxkaW5nX2dzdD1UcnVlLCBzdGFy dF9zY2NhY2hlPUZhbHNlKQorICAgICAgICAgICAgcHJvamVjdHMgPSAnLURzdWJwcm9qZWN0cz0l cycgJSBvcy5lbnZpcm9uWydXRUJLSVRfU0RLX0xPQ0FMX0RFUFMnXQorICAgICAgICAgICAgb3B0 aW9ucyA9IFtvIGZvciBvIGluIG9zLmVudmlyb24uZ2V0KCdXRUJLSVRfU0RLX0xPQ0FMX0RFUFNf T1BUSU9OUycsICcnKS5zdHJpcCgpLnNwbGl0KCcgJykgaWYgb10KKyAgICAgICAgICAgIGFyZ3Mg PSBbJ21lc29uJywgcHJvamVjdHNdCisgICAgICAgICAgICBhcmdzLmV4dGVuZChvcHRpb25zICsg W2NvbnZlcnRfd2Via2l0X3NvdXJjZV9wYXRoX3RvX3NhbmRib3hfcGF0aChzcmNfZGlyKSwgc2Fu ZGJveF9idWlsZF9kaXJdKQorICAgICAgICAgICAgc2VsZi5ydW5faW5fc2FuZGJveCgqYXJncywg YnVpbGRpbmdfbG9jYWxfZGVwcz1UcnVlLCBzdGFydF9zY2NhY2hlPUZhbHNlKQogCiAgICAgICAg IGlmIGJ1aWxkaW5nOgotICAgICAgICAgICAgQ29uc29sZS5tZXNzYWdlKCJCdWlsZGluZyBgZ3N0 LWJ1aWxkYCAlcyAiLCBnc3RfZGlyKQotICAgICAgICAgICAgaWYgc2VsZi5ydW5faW5fc2FuZGJv eCgnbmluamEnLCAnLUMnLCBnc3RfYnVpbGRkaXIsIGJ1aWxkaW5nX2dzdD1UcnVlLCBzdGFydF9z Y2NhY2hlPUZhbHNlKSAhPSAwOgotICAgICAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcign RXJyb3Igd2hpbGUgYnVpbGRpbmcgZ3N0LWJ1aWxkLicpCi0KLSAgICAgICAgY29tbWFuZCA9IFtv cy5wYXRoLmpvaW4oZ3N0X2RpciwgJ2dzdC1lbnYucHknKSwgJy0tYnVpbGRkaXInLCBnc3RfYnVp bGRkaXIsICctLXNyY2RpcicsIGdzdF9kaXIsICItLW9ubHktZW52aXJvbm1lbnQiXQotICAgICAg ICBnc3RfZW52ID0gcnVuX3Nhbml0aXplZChjb21tYW5kLCBnYXRoZXJfb3V0cHV0PVRydWUpCi0g ICAgICAgIGFsbG93bGlzdCA9ICgiTERfTElCUkFSWV9QQVRIIiwgIlBBVEgiLCAiUEtHX0NPTkZJ R19QQVRIIikKLSAgICAgICAgbm9wYXRobGlzdCA9ICgiR1NUX0RFQlVHIiwgIkdTVF9WRVJTSU9O IiwgIkdTVF9FTlYiLCAiR1NUX1RSQUNFUlMiKQorICAgICAgICAgICAgQ29uc29sZS5tZXNzYWdl KCJCdWlsZGluZyBsb2NhbCBkZXBlbmRlbmNpZXMgZnJvbSAlcyAiLCBzcmNfZGlyKQorICAgICAg ICAgICAgaWYgc2VsZi5ydW5faW5fc2FuZGJveCgnbWVzb24nLCAnY29tcGlsZScsICctQycsIHNh bmRib3hfYnVpbGRfZGlyLCBidWlsZGluZ19sb2NhbF9kZXBzPVRydWUsIHN0YXJ0X3NjY2FjaGU9 RmFsc2UpICE9IDA6CisgICAgICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCdFcnJvciB3 aGlsZSBidWlsZGluZyBsb2NhbCBkZXBlbmRlbmNpZXMuJykKKworICAgICAgICBjb21tYW5kID0g WydtZXNvbicsICdkZXZlbnYnLCAnLUMnLCBzYW5kYm94X2J1aWxkX2RpciwgJy0tZHVtcCddCisg ICAgICAgIGxvY2FsX2VudiA9IHNlbGYucnVuX2luX3NhbmRib3goKmNvbW1hbmQsIGJ1aWxkaW5n X2xvY2FsX2RlcHM9VHJ1ZSwgc3RhcnRfc2NjYWNoZT1GYWxzZSwgZ2F0aGVyX291dHB1dD1UcnVl KQogICAgICAgICBlbnYgPSB7fQotICAgICAgICBmb3IgbGluZSBpbiBbbGluZSBmb3IgbGluZSBp biBnc3RfZW52LnNwbGl0bGluZXMoKSBpZiBub3QgbGluZS5zdGFydHN3aXRoKCJleHBvcnQiKV06 CisgICAgICAgIGZvciBsaW5lIGluIFtsaW5lIGZvciBsaW5lIGluIGxvY2FsX2Vudi5zcGxpdGxp bmVzKCkgaWYgbm90IGxpbmUuc3RhcnRzd2l0aCgiZXhwb3J0IildOgogICAgICAgICAgICAgdG9r ZW5zID0gbGluZS5zcGxpdCgiPSIpCiAgICAgICAgICAgICB2YXJfbmFtZSwgY29udGVudHMgPSB0 b2tlbnNbMF0sICI9Ii5qb2luKHRva2Vuc1sxOl0pCi0gICAgICAgICAgICBpZiBub3QgdmFyX25h bWUuc3RhcnRzd2l0aCgiR1NUXyIpIGFuZCB2YXJfbmFtZSBub3QgaW4gYWxsb3dsaXN0OgotICAg ICAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICBpZiB2YXJfbmFtZSBub3QgaW4gbm9w YXRobGlzdDoKLSAgICAgICAgICAgICAgICBuZXdfY29udGVudHMgPSAnOicuam9pbihbY29udmVy dF93ZWJraXRfc291cmNlX3BhdGhfdG9fc2FuZGJveF9wYXRoKHApIGZvciBwIGluIGNvbnRlbnRz LnNwbGl0KCI6IildKQotICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBuZXdfY29u dGVudHMgPSBjb250ZW50cy5yZXBsYWNlKCInIiwgIiIpCi0gICAgICAgICAgICBlbnZbdmFyX25h bWVdID0gbmV3X2NvbnRlbnRzCisgICAgICAgICAgICBlbnZbdmFyX25hbWVdID0gY29udGVudHMK ICAgICAgICAgcmV0dXJuIGVudgogCisgICAgZGVmIF9tZXJnZV9lbnZfdmFyaWFibGVzKHNlbGYs IGVudmlyb25tZW50LCBhZGRpdGlvbmFsX2Vudmlyb25tZW50KToKKyAgICAgICAgZm9yIHZhcl9u YW1lLCB2YWx1ZSBpbiBhZGRpdGlvbmFsX2Vudmlyb25tZW50Lml0ZW1zKCk6CisgICAgICAgICAg ICBpZiB2YXJfbmFtZSBub3QgaW4gZW52aXJvbm1lbnQ6CisgICAgICAgICAgICAgICAgZW52aXJv bm1lbnRbdmFyX25hbWVdID0gdmFsdWUKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAg ICAgaWYgdmFyX25hbWUuZW5kc3dpdGgoJ1BBVEgnKToKKyAgICAgICAgICAgICAgICAgICAgZW52 aXJvbm1lbnRbdmFyX25hbWVdID0gIiVzOiVzIiAlIChlbnZpcm9ubWVudFt2YXJfbmFtZV0sIHZh bHVlKQorICAgICAgICByZXR1cm4gZW52aXJvbm1lbnQKKwogICAgIGRlZiBpc19icmFuY2hfYnVp bGQoc2VsZik6CiAgICAgICAgIHRyeToKICAgICAgICAgICAgIHdpdGggb3Blbihvcy5kZXZudWxs LCAndycpIGFzIGRldm51bGw6CkBAIC03NTEsMTMgKzc0OCwxMiBAQCBjbGFzcyBXZWJraXRGbGF0 cGFrOgogICAgICAgICBleHRyYV9mbGF0cGFrX2FyZ3MgPSBrd2FyZ3MuZ2V0KCJleHRyYV9mbGF0 cGFrX2FyZ3MiLCBbXSkKICAgICAgICAgc3RhcnRfc2NjYWNoZSA9IGt3YXJncy5nZXQoInN0YXJ0 X3NjY2FjaGUiLCBUcnVlKQogICAgICAgICBza2lwX2ljYyA9IGt3YXJncy5nZXQoInNraXBfaWNj IiwgRmFsc2UpCi0gICAgICAgIGJ1aWxkaW5nX2dzdCA9IGt3YXJncy5nZXQoImJ1aWxkaW5nX2dz dCIsIEZhbHNlKQorICAgICAgICBidWlsZGluZ19sb2NhbF9kZXBzID0ga3dhcmdzLmdldCgiYnVp bGRpbmdfbG9jYWxfZGVwcyIsIEZhbHNlKQogICAgICAgICBnYXRoZXJfb3V0cHV0ID0ga3dhcmdz LmdldCgiZ2F0aGVyX291dHB1dCIsIEZhbHNlKQogCiAgICAgICAgIGlmIGdhdGhlcl9vdXRwdXQ6 CiAgICAgICAgICAgICBzdGFydF9zY2NhY2hlID0gRmFsc2UKICAgICAgICAgICAgIHNraXBfaWNj ID0gVHJ1ZQotICAgICAgICAgICAgYnVpbGRpbmdfZ3N0ID0gRmFsc2UKIAogICAgICAgICBpZiBu b3QgaXNpbnN0YW5jZShhcmdzLCBsaXN0KToKICAgICAgICAgICAgIGFyZ3MgPSBsaXN0KGFyZ3Mp CkBAIC04OTYsNyArODkyLDcgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgcmVtb3Rl X3NjY2FjaGVfY29uZmlncyA9IHNldChbIlNDQ0FDSEVfUkVESVMiLCAiU0NDQUNIRV9CVUNLRVQi LCAiU0NDQUNIRV9NRU1DQUNIRUQiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAiU0NDQUNIRV9HQ1NfQlVDS0VUIiwgIlNDQ0FDSEVfQVpVUkVfQ09OTkVDVElPTl9TVFJJ TkciLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiV0VCS0lUX1VTRV9T Q0NBQ0hFIl0pCi0gICAgICAgIGlmIHJlbW90ZV9zY2NhY2hlX2NvbmZpZ3MuaW50ZXJzZWN0aW9u KHNldChvcy5lbnZpcm9uLmtleXMoKSkpIGFuZCBzdGFydF9zY2NhY2hlIGFuZCBub3QgYnVpbGRp bmdfZ3N0OgorICAgICAgICBpZiByZW1vdGVfc2NjYWNoZV9jb25maWdzLmludGVyc2VjdGlvbihz ZXQob3MuZW52aXJvbi5rZXlzKCkpKSBhbmQgc3RhcnRfc2NjYWNoZSBhbmQgbm90IGJ1aWxkaW5n X2xvY2FsX2RlcHM6CiAgICAgICAgICAgICBfbG9nLmRlYnVnKCJFbmFibGluZyBuZXR3b3JrIGFj Y2VzcyBmb3IgdGhlIHJlbW90ZSBzY2NhY2hlIikKICAgICAgICAgICAgIGZsYXRwYWtfY29tbWFu ZC5hcHBlbmQoc2hhcmVfbmV0d29ya19vcHRpb24pCiAKQEAgLTkxMyw3ICs5MDksNyBAQCBjbGFz cyBXZWJraXRGbGF0cGFrOgogICAgICAgICAgICAgaWYgYnVpbGRpbmc6CiAgICAgICAgICAgICAg ICAgIyBTcGF3biB0aGUgc2NjYWNoZSBzZXJ2ZXIgaW4gYmFja2dyb3VuZCwgYW5kIGF2b2lkIHJl Y3Vyc2luZyBoZXJlLCB1c2luZyBhIGJvb2wga2V5d29yZC4KICAgICAgICAgICAgICAgICBfbG9n LmRlYnVnKCJQcmUtc3RhcnRpbmcgdGhlIFNDQ2FjaGUgZGlzdCBzZXJ2ZXIiKQotICAgICAgICAg ICAgICAgIHNlbGYucnVuX2luX3NhbmRib3goInNjY2FjaGUiLCAiLS1zdGFydC1zZXJ2ZXIiLCBl bnY9c2NjYWNoZV9lbnZpcm9ubWVudCwgYnVpbGRpbmdfZ3N0PWJ1aWxkaW5nX2dzdCwKKyAgICAg ICAgICAgICAgICBzZWxmLnJ1bl9pbl9zYW5kYm94KCJzY2NhY2hlIiwgIi0tc3RhcnQtc2VydmVy IiwgZW52PXNjY2FjaGVfZW52aXJvbm1lbnQsIGJ1aWxkaW5nX2xvY2FsX2RlcHM9YnVpbGRpbmdf bG9jYWxfZGVwcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4dHJhX2Zs YXRwYWtfYXJncz1bc2hhcmVfbmV0d29ya19vcHRpb25dLCBzdGFydF9zY2NhY2hlPUZhbHNlKQog CiAgICAgICAgICAgICAjIEZvcndhcmQgc2NjYWNoZSBzZXJ2ZXIgZW52IHZhcnMgdG8gc2NjYWNo ZSBjbGllbnRzLgpAQCAtOTY5LDE2ICs5NjUsMTEgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAg ICAgICAgICAgIHBrZ19jb25maWdfcGF0aCA9IHNlbGYuYnVpbGRfcGF0aAogICAgICAgICBzYW5k Ym94X2Vudmlyb25tZW50WyJQS0dfQ09ORklHX1BBVEgiXSA9IHBrZ19jb25maWdfcGF0aAogCi0g ICAgICAgIGlmIG5vdCBidWlsZGluZ19nc3QgYW5kIGFyZ3NbMF0gIT0gInNjY2FjaGUiOgotICAg ICAgICAgICAgIyBNZXJnZSBnc3QtYnVpbGQgZW52IHZhcnMgaW4gc2FuZGJveCBlbnZpcm9ubWVu dCwgd2l0aG91dCBvdmVycmlkaW5nIHByZXZpb3VzbHkgc2V0IFBBVEggdmFsdWVzLgotICAgICAg ICAgICAgZ3N0X2VudiA9IHNlbGYuc2V0dXBfZ3N0YnVpbGQoYnVpbGRpbmcpCi0gICAgICAgICAg ICBmb3IgdmFyX25hbWUgaW4gbGlzdChnc3RfZW52LmtleXMoKSk6Ci0gICAgICAgICAgICAgICAg aWYgdmFyX25hbWUgbm90IGluIHNhbmRib3hfZW52aXJvbm1lbnQ6Ci0gICAgICAgICAgICAgICAg ICAgIHNhbmRib3hfZW52aXJvbm1lbnRbdmFyX25hbWVdID0gZ3N0X2Vudlt2YXJfbmFtZV0KLSAg ICAgICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgICAgICBjb250ZW50cyA9IGdzdF9l bnZbdmFyX25hbWVdCi0gICAgICAgICAgICAgICAgICAgIGlmIHZhcl9uYW1lLmVuZHN3aXRoKCdQ QVRIJyk6Ci0gICAgICAgICAgICAgICAgICAgICAgICBzYW5kYm94X2Vudmlyb25tZW50W3Zhcl9u YW1lXSA9ICIlczolcyIgJSAoc2FuZGJveF9lbnZpcm9ubWVudFt2YXJfbmFtZV0sIGNvbnRlbnRz KQorICAgICAgICBpZiBub3QgYnVpbGRpbmdfbG9jYWxfZGVwcyBhbmQgYXJnc1swXSAhPSAic2Nj YWNoZSI6CisgICAgICAgICAgICAjIE1lcmdlIGxvY2FsIGRlcGVuZGVuY2llcyBidWlsZCBlbnYg dmFycyBpbiBzYW5kYm94IGVudmlyb25tZW50LCB3aXRob3V0IG92ZXJyaWRpbmcKKyAgICAgICAg ICAgICMgcHJldmlvdXNseSBzZXQgUEFUSCB2YWx1ZXMuCisgICAgICAgICAgICBsb2NhbF9lbnYg PSBzZWxmLnNldHVwX2xvY2FsX2RlcHMoYnVpbGRpbmcpCisgICAgICAgICAgICBzYW5kYm94X2Vu dmlyb25tZW50ID0gc2VsZi5fbWVyZ2VfZW52X3ZhcmlhYmxlcyhzYW5kYm94X2Vudmlyb25tZW50 LCBsb2NhbF9lbnYpCiAKICAgICAgICAgZm9yIGVudnZhciwgdmFsdWUgaW4gc2FuZGJveF9lbnZp cm9ubWVudC5pdGVtcygpOgogICAgICAgICAgICAgZmxhdHBha19jb21tYW5kLmFwcGVuZCgiLS1l bnY9JXM9JXMiICUgKGVudnZhciwgdmFsdWUpKQpAQCAtMTIxOCw3ICsxMjA5LDcgQEAgY2xhc3Mg V2Via2l0RmxhdHBhazoKICAgICAgICAgICAgICAgICBzZWxmLnVzZXJfY29tbWFuZC5hcHBlbmQo Ii0tY21ha2VhcmdzPSVzIiAlIHNlbGYuY21ha2VhcmdzKQogCiAgICAgICAgICAgICByZXR1cm4g c2VsZi5ydW5faW5fc2FuZGJveCgqc2VsZi51c2VyX2NvbW1hbmQgKyBzZWxmLmV4dHJhX2NvbW1h bmRfYXJncykKLSAgICAgICAgZWxpZiBub3Qgc2VsZi51cGRhdGUgYW5kIG5vdCBzZWxmLmJ1aWxk X2dzdCBhbmQgbm90IHNlbGYucmVnZW5lcmF0ZV90b29sY2hhaW5zOgorICAgICAgICBlbGlmIG5v dCBzZWxmLnVwZGF0ZSBhbmQgbm90IHNlbGYuYnVpbGRfbG9jYWxfZGVwcyBhbmQgbm90IHNlbGYu cmVnZW5lcmF0ZV90b29sY2hhaW5zOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYucnVuX2luX3Nh bmRib3goKQogCiAgICAgICAgIHJldHVybiAwCmRpZmYgLS1naXQgYS9Ub29scy9mbGF0cGFrL2xv Y2FsLXByb2plY3RzL21lc29uLmJ1aWxkIGIvVG9vbHMvZmxhdHBhay9sb2NhbC1wcm9qZWN0cy9t ZXNvbi5idWlsZApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43YzgwZDcxN2Q3MWY4MDE4Mjg4MmVjYzU0ZGUyNWU0NDZm MGFhYzQzCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvZmxhdHBhay9sb2NhbC1wcm9qZWN0cy9t ZXNvbi5idWlsZApAQCAtMCwwICsxLDkgQEAKK3Byb2plY3QoJ3dlYmtpdC1sb2NhbC1kZXBzJywg J2MnLAorICAgICAgICB2ZXJzaW9uIDogJzAuMS4wJykKKworZm9yZWFjaCBwcm9qZWN0X25hbWU6 IGdldF9vcHRpb24oJ3N1YnByb2plY3RzJykuc3BsaXQoJywnKQorICBpZiBwcm9qZWN0X25hbWUg IT0gJycKKyAgICBtZXNzYWdlICgnQWRkaW5nIGxvY2FsIHN1YnByb2plY3QgJyArIHByb2plY3Rf bmFtZSkKKyAgICBzdWJwcm9qID0gc3VicHJvamVjdChwcm9qZWN0X25hbWUsIHJlcXVpcmVkOiB0 cnVlKQorICBlbmRpZgorZW5kZm9yZWFjaApkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9sb2Nh bC1wcm9qZWN0cy9tZXNvbl9vcHRpb25zLnR4dCBiL1Rvb2xzL2ZsYXRwYWsvbG9jYWwtcHJvamVj dHMvbWVzb25fb3B0aW9ucy50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWVmY2NmZWY4NzA0MGIyNmU1NDA5YzE3 Y2I3YWU5NTYxOGI5NGQxYgotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL2ZsYXRwYWsvbG9jYWwt cHJvamVjdHMvbWVzb25fb3B0aW9ucy50eHQKQEAgLTAsMCArMSBAQAorb3B0aW9uKCdzdWJwcm9q ZWN0cycsIHR5cGUgOiAnc3RyaW5nJywgdmFsdWUgOiAnJywgZGVzY3JpcHRpb24gOiAnQ29tbWEt c2VwYXJhdGVkIHByb2plY3QgbmFtZXMnKQpkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9sb2Nh bC1wcm9qZWN0cy9zdWJwcm9qZWN0cy9nc3RyZWFtZXItZnVsbC53cmFwIGIvVG9vbHMvZmxhdHBh ay9sb2NhbC1wcm9qZWN0cy9zdWJwcm9qZWN0cy9nc3RyZWFtZXItZnVsbC53cmFwCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLmY3YmZlODhiNTFmMzM3ZDVhZWI2MThkMTU4NTJiNjk1ZTVjY2Y3MDUKLS0tIC9kZXYvbnVs bAorKysgYi9Ub29scy9mbGF0cGFrL2xvY2FsLXByb2plY3RzL3N1YnByb2plY3RzL2dzdHJlYW1l ci1mdWxsLndyYXAKQEAgLTAsMCArMSwzIEBACitbd3JhcC1naXRdCit1cmwgPSBodHRwczovL2dp dGxhYi5mcmVlZGVza3RvcC5vcmcvZ3N0cmVhbWVyL2dzdHJlYW1lci5naXQKK3JldmlzaW9uID0g aGVhZApkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9sb2NhbC1wcm9qZWN0cy9zdWJwcm9qZWN0 cy9saWJzb3VwLndyYXAgYi9Ub29scy9mbGF0cGFrL2xvY2FsLXByb2plY3RzL3N1YnByb2plY3Rz L2xpYnNvdXAud3JhcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40MGM3ZjAzNDAxMTlkYjUwMTI2N2FhN2MwYjMzMjc1 MmU3YjBlNmFlCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvZmxhdHBhay9sb2NhbC1wcm9qZWN0 cy9zdWJwcm9qZWN0cy9saWJzb3VwLndyYXAKQEAgLTAsMCArMSwzIEBACitbd3JhcC1naXRdCit1 cmwgPSBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ25vbWUvbGlic291cC5naXQKK3JldmlzaW9u ID0gaGVhZAo= 456689 2022-04-05 03:53:16 -0700 2022-04-05 03:57:04 -0700 [fast-cq] Patch bug-238452-20220405035314.patch text/plain 13294 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMzg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzQ1NjllYjU2MGEwM2YyNmRjMGRjMGZiNDcwNWZiN2Rh NGU0MmNiZi4uNjc1NDQwNzE4ZmNkYmMyYWFjZGRiOTU5ZGUyNWM1M2QwOTdhM2ZhNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDIyLTA0LTA1ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIExvY2FsIGRlcGVuZGVuY2llcyBvdmVycmlkZSBzdXBw b3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg0 NTIKKworICAgICAgICBSZXZpZXdlZCBieSBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvLgorCisgICAg ICAgIFdoZW4gdGhlIGVudmlyb25tZW50IHZhcmlhYmxlIFdFQktJVF9TREtfTE9DQUxfREVQUyBp cyBzZXQgYXQgY29tcGlsZS10aW1lIGFuZCBydW50aW1lLCBzb21lCisgICAgICAgIGRlcGVuZGVu Y2llcyAoY3VycmVudGx5IG9ubHkgbGlic291cCBhbmQgR1N0cmVhbWVyKSB3aWxsIGJlIHBpY2tl ZCB1cCBmcm9tIGxvY2FsIGdpdAorICAgICAgICBjaGVja291dHMgbG9jYXRlZCBpbiBUb29scy9m bGF0cGFrLy4gSWYgbm8gY2hlY2tvdXQgaXMgcHJlc2VudCwgb25lIHdpbGwgYmUgbWFkZSBiYXNl ZCBvbgorICAgICAgICB0aGUgY29ycmVzcG9uZGluZyAud3JhcCBmaWxlLgorCisgICAgICAgIEV4 YW1wbGU6IFdFQktJVF9TREtfTE9DQUxfREVQUz1saWJzb3VwLGdzdHJlYW1lci1mdWxsIGJ1aWxk LXdlYmtpdCAtLXdwZSAuLi4KKworICAgICAgICBBZGRpdGlvbmFsIE1lc29uIG9wdGlvbnMgY2Fu IGJlIHN1cHBsaWVkIHdpdGggV0VCS0lUX1NES19MT0NBTF9ERVBTX09QVElPTlMuIE5lc3RlZAor ICAgICAgICBzdWJwcm9qZWN0cyBjb25maWd1cmF0aW9uIGlzIHN1cHBvcnRlZCBhcyB3ZWxsLCBm b3IgZXhhbXBsZToKKworICAgICAgICBleHBvcnQgV0VCS0lUX1NES19MT0NBTF9ERVBTX09QVElP TlM9Ii1EZ3N0cmVhbWVyLWZ1bGw6aW50cm9zcGVjdGlvbj1kaXNhYmxlZCAtRGdzdC1wbHVnaW5z LWdvb2Q6c291cD1kaXNhYmxlZCIKKworICAgICAgICBUaGlzIHNldHVwIHJlcGxhY2VzIHRoZSBw cmV2aW91cyBvbmUgdGhhdCB3YXMgc3BlY2lmaWMgdG8gR1N0cmVhbWVyLgorCisgICAgICAgICog ZmxhdHBhay9mbGF0cGFrdXRpbHMucHk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLmxvYWRfZnJv bV9hcmdzKToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsuX19pbml0X18pOgorICAgICAgICAoV2Vi a2l0RmxhdHBhay5zZXR1cF9sb2NhbF9kZXBzKToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsuX21l cmdlX2Vudl92YXJpYWJsZXMpOgorICAgICAgICAoV2Via2l0RmxhdHBhay5ydW5faW5fc2FuZGJv eCk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnNldHVwX2Rldl9lbnYpOgorICAgICAgICAoV2Vi a2l0RmxhdHBhay5zZXR1cF9nc3RidWlsZCk6IERlbGV0ZWQuCisgICAgICAgICogZmxhdHBhay9s b2NhbC1wcm9qZWN0cy9tZXNvbi5idWlsZDogQWRkZWQuCisgICAgICAgICogZmxhdHBhay9sb2Nh bC1wcm9qZWN0cy9zdWJwcm9qZWN0cy9nc3RyZWFtZXItZnVsbC53cmFwOiBBZGRlZC4KKyAgICAg ICAgKiBmbGF0cGFrL2xvY2FsLXByb2plY3RzL3N1YnByb2plY3RzL2xpYnNvdXAud3JhcDogQWRk ZWQuCisKIDIwMjItMDQtMDUgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4K IAogICAgICAgICB1cGRhdGUtYW5nbGUgb3V0cHV0IHZhcmllcyB1bnByZWRpY3RhYmx5IGR1ZSB0 byBibG9iIGhhc2ggYWJicmV2aWF0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9mbGF0cGFrL2ZsYXRw YWt1dGlscy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CmluZGV4IDRkMGZiMWQ1 ODYzMjYyM2Y5MzJlMDdhNWUwNmZmMTEyYWM4NmE3MGQuLjAyMjQwNGEwNDgyOWFmZjU1YWRiOGIz YzllZDM4OTRlMjRkM2MxZTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxz LnB5CisrKyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CkBAIC00ODgsOSArNDg4LDgg QEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgZ2VuZXJhbC5hZGRfYXJndW1lbnQoIi11 IiwgIi0tdXBkYXRlIiwgZGVzdD0idXBkYXRlIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYWN0aW9uPSJzdG9yZV90cnVlIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVs cD0iVXBkYXRlIHRoZSBTREsiKQotICAgICAgICBnZW5lcmFsLmFkZF9hcmd1bWVudCgiLWJnc3Qi LCAiLS1idWlsZC1nc3QiLCBkZXN0PSJidWlsZF9nc3QiLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBhY3Rpb249InN0b3JlX3RydWUiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBoZWxwPSJGb3JjZSByZWJ1aWxkaW5nIGdzdC1idWlsZCwgcmVwb3NpdG9yeSBwYXRoIGlzIGRl ZmluZWQgYnkgdGhlIGBHU1RfQlVJTERfUEFUSGAgZW52aXJvbm1lbnQgdmFyaWFibGUuIikKKyAg ICAgICAgZ2VuZXJhbC5hZGRfYXJndW1lbnQoIi1iZGVwcyIsICItLWJ1aWxkLWxvY2FsLWRlcHMi LCBkZXN0PSJidWlsZF9sb2NhbF9kZXBzIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg YWN0aW9uPSJzdG9yZV90cnVlIiwgaGVscD0iRm9yY2UgcmVidWlsZGluZyBsb2NhbCBkZXBlbmRl bmNpZXMiKQogICAgICAgICBnZW5lcmFsLmFkZF9hcmd1bWVudCgiLXEiLCAiLS1xdWlldCIsIGRl c3Q9InF1aWV0IiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWN0aW9uPSJzdG9yZV90 cnVlIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0iRG8gbm90IHByaW50IGFu eXRoaW5nIikKQEAgLTU1OCw3ICs1NTcsNyBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAg ICBzZWxmLnJlbGVhc2UgPSBGYWxzZQogICAgICAgICBzZWxmLmRlYnVnID0gRmFsc2UKIAotICAg ICAgICBzZWxmLmJ1aWxkX2dzdCA9IEZhbHNlCisgICAgICAgIHNlbGYuYnVpbGRfbG9jYWxfZGVw cyA9IEZhbHNlCiAKICAgICAgICAgc2VsZi5wbGF0Zm9ybSA9ICJndGsiCiAgICAgICAgIHNlbGYu Y2hlY2tfYXZhaWxhYmxlID0gRmFsc2UKQEAgLTY2OSw1MCArNjY4LDQ4IEBAIGNsYXNzIFdlYmtp dEZsYXRwYWs6CiAKICAgICAgICAgcmV0dXJuIFRydWUKIAotCi0gICAgZGVmIHNldHVwX2dzdGJ1 aWxkKHNlbGYsIGJ1aWxkaW5nKToKLSAgICAgICAgZ3N0X2RpciA9IG9zLmVudmlyb24uZ2V0KCdH U1RfQlVJTERfUEFUSCcpCi0gICAgICAgIGlmIG5vdCBnc3RfZGlyOgorICAgIGRlZiBzZXR1cF9s b2NhbF9kZXBzKHNlbGYsIGJ1aWxkaW5nKToKKyAgICAgICAgaWYgbm90IG9zLmVudmlyb24uZ2V0 KCdXRUJLSVRfU0RLX0xPQ0FMX0RFUFMnKToKICAgICAgICAgICAgIGlmIGJ1aWxkaW5nOgotICAg ICAgICAgICAgICAgIF9sb2cuZGVidWcoIiRHU1RfQlVJTERfUEFUSCBlbnZpcm9ubWVudCB2YXJp YWJsZSBub3Qgc2V0LiBTa2lwcGluZyBnc3QtYnVpbGRcbiIpCisgICAgICAgICAgICAgICAgX2xv Zy5kZWJ1ZygiJFdFQktJVF9TREtfTE9DQUxfREVQUyBlbnZpcm9ubWVudCB2YXJpYWJsZSBub3Qg c2V0LiBTa2lwcGluZyBsb2NhbCBkZXBlbmRlbmNpZXMgYnVpbGQiKQogICAgICAgICAgICAgcmV0 dXJuIHt9CiAKLSAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihnc3Rf ZGlyLCAnZ3N0LWVudi5weScpKToKLSAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignR1NU X0JVSUxEX1BBVEggc2V0IHRvICVzIGJ1dCBpdCBkb2VzblwndCBzZWVtIHRvIGJlIGEgdmFsaWQg YGdzdC1idWlsZGAgY2hlY2tvdXQuJyAlIGdzdF9kaXIpCi0KLSAgICAgICAgZ3N0X2J1aWxkZGly ID0gb3MucGF0aC5qb2luKERFRkFVTFRfQlVJTERfUk9PVCwgJ2dzdC1idWlsZCcpCi0gICAgICAg IGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oREVGQVVMVF9CVUlMRF9ST09ULCAn Z3N0LWJ1aWxkJywgJ2J1aWxkLm5pbmphJykpOgorICAgICAgICBzcmNfZGlyID0gb3MucGF0aC5q b2luKFdFQktJVF9TT1VSQ0VfRElSLCAnVG9vbHMnLCAnZmxhdHBhaycsICdsb2NhbC1wcm9qZWN0 cycpCisgICAgICAgIGJ1aWxkX2RpciA9IG9zLnBhdGguam9pbihERUZBVUxUX0JVSUxEX1JPT1Qs ICdkZXBzLWJ1aWxkJykKKyAgICAgICAgc2FuZGJveF9idWlsZF9kaXIgPSBjb252ZXJ0X3dlYmtp dF9zb3VyY2VfcGF0aF90b19zYW5kYm94X3BhdGgoYnVpbGRfZGlyKQorICAgICAgICBpZiBub3Qg b3MucGF0aC5leGlzdHMob3MucGF0aC5qb2luKGJ1aWxkX2RpciwgJ2J1aWxkLm5pbmphJykpOgog ICAgICAgICAgICAgaWYgbm90IGJ1aWxkaW5nOgotICAgICAgICAgICAgICAgIHJhaXNlIFJ1bnRp bWVFcnJvcignVHJ5aW5nIHRvIGVudGVyIGdzdC1idWlsZCBlbnYgZnJvbSAlcyBidXQgaXQgaXMg bm90IGJ1aWx0LCBtYWtlIHN1cmUgdG8gcmVidWlsZCB3ZWJraXQuJyAlIGdzdF9kaXIpCisgICAg ICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCdUcnlpbmcgdG8gZW50ZXIgZGVwcy1idWls ZCBlbnYgZnJvbSAlcyBidXQgaXQgaXMgbm90IGJ1aWx0LCBtYWtlIHN1cmUgdG8gcmVidWlsZCB3 ZWJraXQuJywgc3JjX2RpcikKIAotICAgICAgICAgICAgYXJncyA9IFsnbWVzb24nLCBdCi0gICAg ICAgICAgICBleHRyYV9hcmdzID0gb3MuZW52aXJvbi5nZXQoJ0dTVF9CVUlMRF9BUkdTJywgJycp Ci0gICAgICAgICAgICBhcmdzLmV4dGVuZChzaGxleC5zcGxpdChleHRyYV9hcmdzKSArIFtnc3Rf ZGlyLCBnc3RfYnVpbGRkaXJdKQotICAgICAgICAgICAgQ29uc29sZS5tZXNzYWdlKCJSdW5uaW5n ICVzICIsICcgJy5qb2luKGFyZ3MpKQotICAgICAgICAgICAgc2VsZi5ydW5faW5fc2FuZGJveCgq YXJncywgYnVpbGRpbmdfZ3N0PVRydWUsIHN0YXJ0X3NjY2FjaGU9RmFsc2UpCisgICAgICAgICAg ICBwcm9qZWN0cyA9ICctRHN1YnByb2plY3RzPSVzJyAlIG9zLmVudmlyb25bJ1dFQktJVF9TREtf TE9DQUxfREVQUyddCisgICAgICAgICAgICBvcHRpb25zID0gc2hsZXguc3BsaXQob3MuZW52aXJv bi5nZXQoJ1dFQktJVF9TREtfTE9DQUxfREVQU19PUFRJT05TJywgJycpKQorICAgICAgICAgICAg YXJncyA9IFsnbWVzb24nLCBwcm9qZWN0c10KKyAgICAgICAgICAgIGFyZ3MuZXh0ZW5kKG9wdGlv bnMgKyBbY29udmVydF93ZWJraXRfc291cmNlX3BhdGhfdG9fc2FuZGJveF9wYXRoKHNyY19kaXIp LCBzYW5kYm94X2J1aWxkX2Rpcl0pCisgICAgICAgICAgICBzZWxmLnJ1bl9pbl9zYW5kYm94KCph cmdzLCBidWlsZGluZ19sb2NhbF9kZXBzPVRydWUsIHN0YXJ0X3NjY2FjaGU9RmFsc2UpCiAKICAg ICAgICAgaWYgYnVpbGRpbmc6Ci0gICAgICAgICAgICBDb25zb2xlLm1lc3NhZ2UoIkJ1aWxkaW5n IGBnc3QtYnVpbGRgICVzICIsIGdzdF9kaXIpCi0gICAgICAgICAgICBpZiBzZWxmLnJ1bl9pbl9z YW5kYm94KCduaW5qYScsICctQycsIGdzdF9idWlsZGRpciwgYnVpbGRpbmdfZ3N0PVRydWUsIHN0 YXJ0X3NjY2FjaGU9RmFsc2UpICE9IDA6Ci0gICAgICAgICAgICAgICAgcmFpc2UgUnVudGltZUVy cm9yKCdFcnJvciB3aGlsZSBidWlsZGluZyBnc3QtYnVpbGQuJykKLQotICAgICAgICBjb21tYW5k ID0gW29zLnBhdGguam9pbihnc3RfZGlyLCAnZ3N0LWVudi5weScpLCAnLS1idWlsZGRpcicsIGdz dF9idWlsZGRpciwgJy0tc3JjZGlyJywgZ3N0X2RpciwgIi0tb25seS1lbnZpcm9ubWVudCJdCi0g ICAgICAgIGdzdF9lbnYgPSBydW5fc2FuaXRpemVkKGNvbW1hbmQsIGdhdGhlcl9vdXRwdXQ9VHJ1 ZSkKLSAgICAgICAgYWxsb3dsaXN0ID0gKCJMRF9MSUJSQVJZX1BBVEgiLCAiUEFUSCIsICJQS0df Q09ORklHX1BBVEgiKQotICAgICAgICBub3BhdGhsaXN0ID0gKCJHU1RfREVCVUciLCAiR1NUX1ZF UlNJT04iLCAiR1NUX0VOViIsICJHU1RfVFJBQ0VSUyIpCisgICAgICAgICAgICBDb25zb2xlLm1l c3NhZ2UoIkJ1aWxkaW5nIGxvY2FsIGRlcGVuZGVuY2llcyBmcm9tICVzICIsIHNyY19kaXIpCisg ICAgICAgICAgICBpZiBzZWxmLnJ1bl9pbl9zYW5kYm94KCdtZXNvbicsICdjb21waWxlJywgJy1D Jywgc2FuZGJveF9idWlsZF9kaXIsIGJ1aWxkaW5nX2xvY2FsX2RlcHM9VHJ1ZSwgc3RhcnRfc2Nj YWNoZT1GYWxzZSkgIT0gMDoKKyAgICAgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ0Vy cm9yIHdoaWxlIGJ1aWxkaW5nIGxvY2FsIGRlcGVuZGVuY2llcy4nKQorCisgICAgICAgIGNvbW1h bmQgPSBbJ21lc29uJywgJ2RldmVudicsICctQycsIHNhbmRib3hfYnVpbGRfZGlyLCAnLS1kdW1w J10KKyAgICAgICAgbG9jYWxfZW52ID0gc2VsZi5ydW5faW5fc2FuZGJveCgqY29tbWFuZCwgYnVp bGRpbmdfbG9jYWxfZGVwcz1UcnVlLCBzdGFydF9zY2NhY2hlPUZhbHNlLCBnYXRoZXJfb3V0cHV0 PVRydWUpCiAgICAgICAgIGVudiA9IHt9Ci0gICAgICAgIGZvciBsaW5lIGluIFtsaW5lIGZvciBs aW5lIGluIGdzdF9lbnYuc3BsaXRsaW5lcygpIGlmIG5vdCBsaW5lLnN0YXJ0c3dpdGgoImV4cG9y dCIpXToKKyAgICAgICAgZm9yIGxpbmUgaW4gW2xpbmUgZm9yIGxpbmUgaW4gbG9jYWxfZW52LnNw bGl0bGluZXMoKSBpZiBub3QgbGluZS5zdGFydHN3aXRoKCJleHBvcnQiKV06CiAgICAgICAgICAg ICB0b2tlbnMgPSBsaW5lLnNwbGl0KCI9IikKICAgICAgICAgICAgIHZhcl9uYW1lLCBjb250ZW50 cyA9IHRva2Vuc1swXSwgIj0iLmpvaW4odG9rZW5zWzE6XSkKLSAgICAgICAgICAgIGlmIG5vdCB2 YXJfbmFtZS5zdGFydHN3aXRoKCJHU1RfIikgYW5kIHZhcl9uYW1lIG5vdCBpbiBhbGxvd2xpc3Q6 Ci0gICAgICAgICAgICAgICAgY29udGludWUKLSAgICAgICAgICAgIGlmIHZhcl9uYW1lIG5vdCBp biBub3BhdGhsaXN0OgotICAgICAgICAgICAgICAgIG5ld19jb250ZW50cyA9ICc6Jy5qb2luKFtj b252ZXJ0X3dlYmtpdF9zb3VyY2VfcGF0aF90b19zYW5kYm94X3BhdGgocCkgZm9yIHAgaW4gY29u dGVudHMuc3BsaXQoIjoiKV0pCi0gICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgIG5l d19jb250ZW50cyA9IGNvbnRlbnRzLnJlcGxhY2UoIiciLCAiIikKLSAgICAgICAgICAgIGVudlt2 YXJfbmFtZV0gPSBuZXdfY29udGVudHMKKyAgICAgICAgICAgIGVudlt2YXJfbmFtZV0gPSBjb250 ZW50cwogICAgICAgICByZXR1cm4gZW52CiAKKyAgICBkZWYgX21lcmdlX2Vudl92YXJpYWJsZXMo c2VsZiwgZW52aXJvbm1lbnQsIGFkZGl0aW9uYWxfZW52aXJvbm1lbnQpOgorICAgICAgICBmb3Ig dmFyX25hbWUsIHZhbHVlIGluIGFkZGl0aW9uYWxfZW52aXJvbm1lbnQuaXRlbXMoKToKKyAgICAg ICAgICAgIGlmIHZhcl9uYW1lIG5vdCBpbiBlbnZpcm9ubWVudDoKKyAgICAgICAgICAgICAgICBl bnZpcm9ubWVudFt2YXJfbmFtZV0gPSB2YWx1ZQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAg ICAgICAgICBpZiB2YXJfbmFtZS5lbmRzd2l0aCgnUEFUSCcpOgorICAgICAgICAgICAgICAgICAg ICBlbnZpcm9ubWVudFt2YXJfbmFtZV0gPSAiJXM6JXMiICUgKGVudmlyb25tZW50W3Zhcl9uYW1l XSwgdmFsdWUpCisgICAgICAgIHJldHVybiBlbnZpcm9ubWVudAorCiAgICAgZGVmIGlzX2JyYW5j aF9idWlsZChzZWxmKToKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgd2l0aCBvcGVuKG9zLmRl dm51bGwsICd3JykgYXMgZGV2bnVsbDoKQEAgLTc1MSwxMyArNzQ4LDEyIEBAIGNsYXNzIFdlYmtp dEZsYXRwYWs6CiAgICAgICAgIGV4dHJhX2ZsYXRwYWtfYXJncyA9IGt3YXJncy5nZXQoImV4dHJh X2ZsYXRwYWtfYXJncyIsIFtdKQogICAgICAgICBzdGFydF9zY2NhY2hlID0ga3dhcmdzLmdldCgi c3RhcnRfc2NjYWNoZSIsIFRydWUpCiAgICAgICAgIHNraXBfaWNjID0ga3dhcmdzLmdldCgic2tp cF9pY2MiLCBGYWxzZSkKLSAgICAgICAgYnVpbGRpbmdfZ3N0ID0ga3dhcmdzLmdldCgiYnVpbGRp bmdfZ3N0IiwgRmFsc2UpCisgICAgICAgIGJ1aWxkaW5nX2xvY2FsX2RlcHMgPSBrd2FyZ3MuZ2V0 KCJidWlsZGluZ19sb2NhbF9kZXBzIiwgRmFsc2UpCiAgICAgICAgIGdhdGhlcl9vdXRwdXQgPSBr d2FyZ3MuZ2V0KCJnYXRoZXJfb3V0cHV0IiwgRmFsc2UpCiAKICAgICAgICAgaWYgZ2F0aGVyX291 dHB1dDoKICAgICAgICAgICAgIHN0YXJ0X3NjY2FjaGUgPSBGYWxzZQogICAgICAgICAgICAgc2tp cF9pY2MgPSBUcnVlCi0gICAgICAgICAgICBidWlsZGluZ19nc3QgPSBGYWxzZQogCiAgICAgICAg IGlmIG5vdCBpc2luc3RhbmNlKGFyZ3MsIGxpc3QpOgogICAgICAgICAgICAgYXJncyA9IGxpc3Qo YXJncykKQEAgLTg5Niw3ICs4OTIsNyBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICBy ZW1vdGVfc2NjYWNoZV9jb25maWdzID0gc2V0KFsiU0NDQUNIRV9SRURJUyIsICJTQ0NBQ0hFX0JV Q0tFVCIsICJTQ0NBQ0hFX01FTUNBQ0hFRCIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICJTQ0NBQ0hFX0dDU19CVUNLRVQiLCAiU0NDQUNIRV9BWlVSRV9DT05ORUNUSU9O X1NUUklORyIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJXRUJLSVRf VVNFX1NDQ0FDSEUiXSkKLSAgICAgICAgaWYgcmVtb3RlX3NjY2FjaGVfY29uZmlncy5pbnRlcnNl Y3Rpb24oc2V0KG9zLmVudmlyb24ua2V5cygpKSkgYW5kIHN0YXJ0X3NjY2FjaGUgYW5kIG5vdCBi dWlsZGluZ19nc3Q6CisgICAgICAgIGlmIHJlbW90ZV9zY2NhY2hlX2NvbmZpZ3MuaW50ZXJzZWN0 aW9uKHNldChvcy5lbnZpcm9uLmtleXMoKSkpIGFuZCBzdGFydF9zY2NhY2hlIGFuZCBub3QgYnVp bGRpbmdfbG9jYWxfZGVwczoKICAgICAgICAgICAgIF9sb2cuZGVidWcoIkVuYWJsaW5nIG5ldHdv cmsgYWNjZXNzIGZvciB0aGUgcmVtb3RlIHNjY2FjaGUiKQogICAgICAgICAgICAgZmxhdHBha19j b21tYW5kLmFwcGVuZChzaGFyZV9uZXR3b3JrX29wdGlvbikKIApAQCAtOTEzLDcgKzkwOSw3IEBA IGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICBpZiBidWlsZGluZzoKICAgICAgICAg ICAgICAgICAjIFNwYXduIHRoZSBzY2NhY2hlIHNlcnZlciBpbiBiYWNrZ3JvdW5kLCBhbmQgYXZv aWQgcmVjdXJzaW5nIGhlcmUsIHVzaW5nIGEgYm9vbCBrZXl3b3JkLgogICAgICAgICAgICAgICAg IF9sb2cuZGVidWcoIlByZS1zdGFydGluZyB0aGUgU0NDYWNoZSBkaXN0IHNlcnZlciIpCi0gICAg ICAgICAgICAgICAgc2VsZi5ydW5faW5fc2FuZGJveCgic2NjYWNoZSIsICItLXN0YXJ0LXNlcnZl ciIsIGVudj1zY2NhY2hlX2Vudmlyb25tZW50LCBidWlsZGluZ19nc3Q9YnVpbGRpbmdfZ3N0LAor ICAgICAgICAgICAgICAgIHNlbGYucnVuX2luX3NhbmRib3goInNjY2FjaGUiLCAiLS1zdGFydC1z ZXJ2ZXIiLCBlbnY9c2NjYWNoZV9lbnZpcm9ubWVudCwgYnVpbGRpbmdfbG9jYWxfZGVwcz1idWls ZGluZ19sb2NhbF9kZXBzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXh0 cmFfZmxhdHBha19hcmdzPVtzaGFyZV9uZXR3b3JrX29wdGlvbl0sIHN0YXJ0X3NjY2FjaGU9RmFs c2UpCiAKICAgICAgICAgICAgICMgRm9yd2FyZCBzY2NhY2hlIHNlcnZlciBlbnYgdmFycyB0byBz Y2NhY2hlIGNsaWVudHMuCkBAIC05NjksMTYgKzk2NSwxMSBAQCBjbGFzcyBXZWJraXRGbGF0cGFr OgogICAgICAgICAgICAgcGtnX2NvbmZpZ19wYXRoID0gc2VsZi5idWlsZF9wYXRoCiAgICAgICAg IHNhbmRib3hfZW52aXJvbm1lbnRbIlBLR19DT05GSUdfUEFUSCJdID0gcGtnX2NvbmZpZ19wYXRo CiAKLSAgICAgICAgaWYgbm90IGJ1aWxkaW5nX2dzdCBhbmQgYXJnc1swXSAhPSAic2NjYWNoZSI6 Ci0gICAgICAgICAgICAjIE1lcmdlIGdzdC1idWlsZCBlbnYgdmFycyBpbiBzYW5kYm94IGVudmly b25tZW50LCB3aXRob3V0IG92ZXJyaWRpbmcgcHJldmlvdXNseSBzZXQgUEFUSCB2YWx1ZXMuCi0g ICAgICAgICAgICBnc3RfZW52ID0gc2VsZi5zZXR1cF9nc3RidWlsZChidWlsZGluZykKLSAgICAg ICAgICAgIGZvciB2YXJfbmFtZSBpbiBsaXN0KGdzdF9lbnYua2V5cygpKToKLSAgICAgICAgICAg ICAgICBpZiB2YXJfbmFtZSBub3QgaW4gc2FuZGJveF9lbnZpcm9ubWVudDoKLSAgICAgICAgICAg ICAgICAgICAgc2FuZGJveF9lbnZpcm9ubWVudFt2YXJfbmFtZV0gPSBnc3RfZW52W3Zhcl9uYW1l XQotICAgICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgICAgIGNvbnRlbnRzID0g Z3N0X2Vudlt2YXJfbmFtZV0KLSAgICAgICAgICAgICAgICAgICAgaWYgdmFyX25hbWUuZW5kc3dp dGgoJ1BBVEgnKToKLSAgICAgICAgICAgICAgICAgICAgICAgIHNhbmRib3hfZW52aXJvbm1lbnRb dmFyX25hbWVdID0gIiVzOiVzIiAlIChzYW5kYm94X2Vudmlyb25tZW50W3Zhcl9uYW1lXSwgY29u dGVudHMpCisgICAgICAgIGlmIG5vdCBidWlsZGluZ19sb2NhbF9kZXBzIGFuZCBhcmdzWzBdICE9 ICJzY2NhY2hlIjoKKyAgICAgICAgICAgICMgTWVyZ2UgbG9jYWwgZGVwZW5kZW5jaWVzIGJ1aWxk IGVudiB2YXJzIGluIHNhbmRib3ggZW52aXJvbm1lbnQsIHdpdGhvdXQgb3ZlcnJpZGluZworICAg ICAgICAgICAgIyBwcmV2aW91c2x5IHNldCBQQVRIIHZhbHVlcy4KKyAgICAgICAgICAgIGxvY2Fs X2VudiA9IHNlbGYuc2V0dXBfbG9jYWxfZGVwcyhidWlsZGluZykKKyAgICAgICAgICAgIHNhbmRi b3hfZW52aXJvbm1lbnQgPSBzZWxmLl9tZXJnZV9lbnZfdmFyaWFibGVzKHNhbmRib3hfZW52aXJv bm1lbnQsIGxvY2FsX2VudikKIAogICAgICAgICBmb3IgZW52dmFyLCB2YWx1ZSBpbiBzYW5kYm94 X2Vudmlyb25tZW50Lml0ZW1zKCk6CiAgICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQuYXBwZW5k KCItLWVudj0lcz0lcyIgJSAoZW52dmFyLCB2YWx1ZSkpCkBAIC0xMjE4LDcgKzEyMDksNyBAQCBj bGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICAgICAgICAgIHNlbGYudXNlcl9jb21tYW5kLmFw cGVuZCgiLS1jbWFrZWFyZ3M9JXMiICUgc2VsZi5jbWFrZWFyZ3MpCiAKICAgICAgICAgICAgIHJl dHVybiBzZWxmLnJ1bl9pbl9zYW5kYm94KCpzZWxmLnVzZXJfY29tbWFuZCArIHNlbGYuZXh0cmFf Y29tbWFuZF9hcmdzKQotICAgICAgICBlbGlmIG5vdCBzZWxmLnVwZGF0ZSBhbmQgbm90IHNlbGYu YnVpbGRfZ3N0IGFuZCBub3Qgc2VsZi5yZWdlbmVyYXRlX3Rvb2xjaGFpbnM6CisgICAgICAgIGVs aWYgbm90IHNlbGYudXBkYXRlIGFuZCBub3Qgc2VsZi5idWlsZF9sb2NhbF9kZXBzIGFuZCBub3Qg c2VsZi5yZWdlbmVyYXRlX3Rvb2xjaGFpbnM6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5ydW5f aW5fc2FuZGJveCgpCiAKICAgICAgICAgcmV0dXJuIDAKZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRw YWsvbG9jYWwtcHJvamVjdHMvbWVzb24uYnVpbGQgYi9Ub29scy9mbGF0cGFrL2xvY2FsLXByb2pl Y3RzL21lc29uLmJ1aWxkCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdjODBkNzE3ZDcxZjgwMTgyODgyZWNjNTRkZTI1 ZTQ0NmYwYWFjNDMKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9mbGF0cGFrL2xvY2FsLXByb2pl Y3RzL21lc29uLmJ1aWxkCkBAIC0wLDAgKzEsOSBAQAorcHJvamVjdCgnd2Via2l0LWxvY2FsLWRl cHMnLCAnYycsCisgICAgICAgIHZlcnNpb24gOiAnMC4xLjAnKQorCitmb3JlYWNoIHByb2plY3Rf bmFtZTogZ2V0X29wdGlvbignc3VicHJvamVjdHMnKS5zcGxpdCgnLCcpCisgIGlmIHByb2plY3Rf bmFtZSAhPSAnJworICAgIG1lc3NhZ2UgKCdBZGRpbmcgbG9jYWwgc3VicHJvamVjdCAnICsgcHJv amVjdF9uYW1lKQorICAgIHN1YnByb2ogPSBzdWJwcm9qZWN0KHByb2plY3RfbmFtZSwgcmVxdWly ZWQ6IHRydWUpCisgIGVuZGlmCitlbmRmb3JlYWNoCmRpZmYgLS1naXQgYS9Ub29scy9mbGF0cGFr L2xvY2FsLXByb2plY3RzL21lc29uX29wdGlvbnMudHh0IGIvVG9vbHMvZmxhdHBhay9sb2NhbC1w cm9qZWN0cy9tZXNvbl9vcHRpb25zLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hZWZjY2ZlZjg3MDQwYjI2ZTU0 MDljMTdjYjdhZTk1NjE4Yjk0ZDFiCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvZmxhdHBhay9s b2NhbC1wcm9qZWN0cy9tZXNvbl9vcHRpb25zLnR4dApAQCAtMCwwICsxIEBACitvcHRpb24oJ3N1 YnByb2plY3RzJywgdHlwZSA6ICdzdHJpbmcnLCB2YWx1ZSA6ICcnLCBkZXNjcmlwdGlvbiA6ICdD b21tYS1zZXBhcmF0ZWQgcHJvamVjdCBuYW1lcycpCmRpZmYgLS1naXQgYS9Ub29scy9mbGF0cGFr L2xvY2FsLXByb2plY3RzL3N1YnByb2plY3RzL2dzdHJlYW1lci1mdWxsLndyYXAgYi9Ub29scy9m bGF0cGFrL2xvY2FsLXByb2plY3RzL3N1YnByb2plY3RzL2dzdHJlYW1lci1mdWxsLndyYXAKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uZjdiZmU4OGI1MWYzMzdkNWFlYjYxOGQxNTg1MmI2OTVlNWNjZjcwNQotLS0gL2Rl di9udWxsCisrKyBiL1Rvb2xzL2ZsYXRwYWsvbG9jYWwtcHJvamVjdHMvc3VicHJvamVjdHMvZ3N0 cmVhbWVyLWZ1bGwud3JhcApAQCAtMCwwICsxLDMgQEAKK1t3cmFwLWdpdF0KK3VybCA9IGh0dHBz Oi8vZ2l0bGFiLmZyZWVkZXNrdG9wLm9yZy9nc3RyZWFtZXIvZ3N0cmVhbWVyLmdpdAorcmV2aXNp b24gPSBoZWFkCmRpZmYgLS1naXQgYS9Ub29scy9mbGF0cGFrL2xvY2FsLXByb2plY3RzL3N1YnBy b2plY3RzL2xpYnNvdXAud3JhcCBiL1Rvb2xzL2ZsYXRwYWsvbG9jYWwtcHJvamVjdHMvc3VicHJv amVjdHMvbGlic291cC53cmFwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQwYzdmMDM0MDExOWRiNTAxMjY3YWE3YzBi MzMyNzUyZTdiMGU2YWUKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9mbGF0cGFrL2xvY2FsLXBy b2plY3RzL3N1YnByb2plY3RzL2xpYnNvdXAud3JhcApAQCAtMCwwICsxLDMgQEAKK1t3cmFwLWdp dF0KK3VybCA9IGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbm9tZS9saWJzb3VwLmdpdAorcmV2 aXNpb24gPSBoZWFkCg==