65171 2011-07-26 04:31:34 -0700 CSS Regions build bot should build with "--css-regions" and "--css-exclusion" flags 2012-07-23 23:22:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 57312 0 achicu webkit-unassigned aroben mihnea tony webkit.review.bot wsiegrist oldest_to_newest 442173 0 achicu 2011-07-26 04:31:34 -0700 Add support for regions and exclusions optional features in build bot config file. 442177 1 101984 achicu 2011-07-26 04:38:34 -0700 Created attachment 101984 Patch 442322 2 101984 tony 2011-07-26 09:55:28 -0700 Comment on attachment 101984 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101984&action=review This seems fine to me, but aroben might have some additional feedback. FWIW, on the flexbox bot, I just modified files in the checkout to have it compile with the necessary flags and to enable the layout tests (removed the SKIP line from test_expectations.txt). It's a bit fragile since I have to manually fix merge conflict, but that hasn't happened yet. > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:108 > + if isinstance(features, list): Nit: I would remove this type check, I'm not sure it provides much safety other than hiding config.json errors. Also, it seems like any iterable would work. 442344 3 achicu 2011-07-26 10:37:11 -0700 (In reply to comment #2) > FWIW, on the flexbox bot, I just modified files in the checkout to have it compile with the necessary flags and to enable the layout tests (removed the SKIP line from test_expectations.txt). It's a bit fragile since I have to manually fix merge conflict, but that hasn't happened yet. I think we might better add support to overwrite/preprocess test_expectation. I will add a bug for that. > Nit: I would remove this type check, I'm not sure it provides much safety other than hiding config.json errors. Also, it seems like any iterable would work. Thanks. The value should come from the JSON Decoder, which will only generate dict or list iterable objects. I can move that check at the parse time and throw an exception. 442348 4 101984 aroben 2011-07-26 10:44:29 -0700 Comment on attachment 101984 Patch I agree with Tony's comments. Other than that this looks fine. 442412 5 102034 achicu 2011-07-26 11:40:49 -0700 Created attachment 102034 Patch Moved the check to the parse time. 442427 6 102034 aroben 2011-07-26 12:05:58 -0700 Comment on attachment 102034 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102034&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:728 > + if isinstance(features, list) == False: Better WebKit style would be: if not isinstance(features, list): We don't have this kind of checking for other parts of config.json. Why is this attribute special? > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:729 > + raise Exception, "Builder %r: 'features' parameter needs to be a list of flags that will be passed to build-webkit script. eg. features: ['css-regions']" % builder['name'] I think the more modern way to do this is using constructor syntax: raise Exception("Builder %r:...") 442430 7 102037 achicu 2011-07-26 12:09:31 -0700 Created attachment 102037 Patch It isn't special. I just removed the check. 442441 8 tony 2011-07-26 12:18:52 -0700 +wms for master restart 442442 9 102037 aroben 2011-07-26 12:19:03 -0700 Comment on attachment 102037 Patch Actually, I don't think we can land this yet. Currently the CSSRegions bot is uploading its built frameworks to <http://build.webkit.org/archives/mac-snowleopard-x86_64-release/>. Presumably it's overwriting any builds that were built by Apple's bots and uploaded there, but so far that's harmless because the CSSRegions bot and Apple's bots are building the same code. With this change, the builds will now be different. We need to change the UploadBuiltProduct step to upload these builds to some other place. 442443 10 aroben 2011-07-26 12:19:34 -0700 (In reply to comment #8) > +wms for master restart FYI, this isn't needed anymore. The build master restarts itself automatically. 442446 11 aroben 2011-07-26 12:22:02 -0700 (In reply to comment #9) > (From update of attachment 102037 [details]) > Actually, I don't think we can land this yet. > > Currently the CSSRegions bot is uploading its built frameworks to <http://build.webkit.org/archives/mac-snowleopard-x86_64-release/>. Presumably it's overwriting any builds that were built by Apple's bots and uploaded there, but so far that's harmless because the CSSRegions bot and Apple's bots are building the same code. With this change, the builds will now be different. > > We need to change the UploadBuiltProduct step to upload these builds to some other place. Chiculita pointed out that I was incorrect. UploadBuiltProduct doesn't run at all if your builder has no triggers. 442453 12 achicu 2011-07-26 12:26:09 -0700 (In reply to comment #11) > Chiculita pointed out that I was incorrect. UploadBuiltProduct doesn't run at all if your builder has no triggers. Added https://bugs.webkit.org/show_bug.cgi?id=65200 to also archive and upload the CSS Regions build bot output files. 442524 13 102037 webkit.review.bot 2011-07-26 14:17:27 -0700 Comment on attachment 102037 Patch Clearing flags on attachment: 102037 Committed r91782: <http://trac.webkit.org/changeset/91782> 442525 14 webkit.review.bot 2011-07-26 14:17:32 -0700 All reviewed patches have been landed. Closing bug. 101984 2011-07-26 04:38:34 -0700 2011-07-26 11:40:49 -0700 Patch bug65171.patch text/plain 6944 achicu ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL2NvbmZpZy5qc29uIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggZjI2NDIwYS4uMWQ1NjEwZiAxMDA2NDQKLS0tIGEv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpz b24KKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv Y29uZmlnLmpzb24KQEAgLTI0Myw3ICsyNDMsNyBAQAogICAgICAgICAgICAgICAgICAgICAgICJz bGF2ZW5hbWVzIjogWyJlZmwtbGludXgtc2xhdmUtMSJdCiAgICAgICAgICAgICAgICAgICAgIH0s CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiQ1NTUmVnaW9ucyBTbm93TGVvcGFyZCBJ bnRlbCBSZWxlYXNlIChCdWlsZCkiLCAidHlwZSI6ICJCdWlsZCIsICJidWlsZGRpciI6ICJjc3Ny ZWdpb25zLXNub3dsZW9wYXJkLWludGVsLXJlbGVhc2UiLAotICAgICAgICAgICAgICAgICAgICAg ICJwbGF0Zm9ybSI6ICJtYWMtc25vd2xlb3BhcmQiLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNl IiwgImFyY2hpdGVjdHVyZXMiOiBbIng4Nl82NCJdLAorICAgICAgICAgICAgICAgICAgICAgICJw bGF0Zm9ybSI6ICJtYWMtc25vd2xlb3BhcmQiLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwg ImFyY2hpdGVjdHVyZXMiOiBbIng4Nl82NCJdLCAiZmVhdHVyZXMiOiBbImNzcy1yZWdpb25zIiwg ImNzcy1leGNsdXNpb25zIl0sCiAgICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBb ImFkb2JlLW1hYy1zbGF2ZTEiXQogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgICBdLApkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvbWFzdGVyLmNmZyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKaW5kZXggMzRmNDI1Mi4uNzFhOWQyNyAxMDA2NDQK LS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFz dGVyLmNmZworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9tYXN0ZXIuY2ZnCkBAIC0yOSwxNCArMjksMTUgQEAgY2xhc3MgQ29uZmlndXJlQnVpbGQo YnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgbmFtZSA9ICJjb25maWd1cmUgYnVpbGQiCiAgICAg ZGVzY3JpcHRpb24gPSBbImNvbmZpZ3VyaW5nIGJ1aWxkIl0KICAgICBkZXNjcmlwdGlvbkRvbmUg PSBbImNvbmZpZ3VyZWQgYnVpbGQiXQotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwg Y29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlLCBidWlsZE9ubHksICphcmdzLCAqKmt3YXJncyk6 CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRl Y3R1cmUsIGJ1aWxkT25seSwgZmVhdHVyZXMsICphcmdzLCAqKmt3YXJncyk6CiAgICAgICAgIGJ1 aWxkc3RlcC5CdWlsZFN0ZXAuX19pbml0X18oc2VsZiwgKmFyZ3MsICoqa3dhcmdzKQogICAgICAg ICBzZWxmLnBsYXRmb3JtID0gcGxhdGZvcm0uc3BsaXQoJy0nLCAxKVswXQogICAgICAgICBzZWxm LmZ1bGxQbGF0Zm9ybSA9IHBsYXRmb3JtCiAgICAgICAgIHNlbGYuY29uZmlndXJhdGlvbiA9IGNv bmZpZ3VyYXRpb24KICAgICAgICAgc2VsZi5hcmNoaXRlY3R1cmUgPSBhcmNoaXRlY3R1cmUKICAg ICAgICAgc2VsZi5idWlsZE9ubHkgPSBidWlsZE9ubHkKLSAgICAgICAgc2VsZi5hZGRGYWN0b3J5 QXJndW1lbnRzKHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24s IGFyY2hpdGVjdHVyZT1hcmNoaXRlY3R1cmUsIGJ1aWxkT25seT1idWlsZE9ubHkpCisgICAgICAg IHNlbGYuZmVhdHVyZXMgPSBmZWF0dXJlczsKKyAgICAgICAgc2VsZi5hZGRGYWN0b3J5QXJndW1l bnRzKHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24sIGFyY2hp dGVjdHVyZT1hcmNoaXRlY3R1cmUsIGJ1aWxkT25seT1idWlsZE9ubHksIGZlYXR1cmVzPWZlYXR1 cmVzKQogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICBzZWxmLnNldFByb3BlcnR5KCJw bGF0Zm9ybSIsIHNlbGYucGxhdGZvcm0pCkBAIC00NCw2ICs0NSw3IEBAIGNsYXNzIENvbmZpZ3Vy ZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXApOgogICAgICAgICBzZWxmLnNldFByb3BlcnR5KCJj b25maWd1cmF0aW9uIiwgc2VsZi5jb25maWd1cmF0aW9uKQogICAgICAgICBzZWxmLnNldFByb3Bl cnR5KCJhcmNoaXRlY3R1cmUiLCBzZWxmLmFyY2hpdGVjdHVyZSkKICAgICAgICAgc2VsZi5zZXRQ cm9wZXJ0eSgiYnVpbGRPbmx5Iiwgc2VsZi5idWlsZE9ubHkpCisgICAgICAgIHNlbGYuc2V0UHJv cGVydHkoImZlYXR1cmVzIiwgc2VsZi5mZWF0dXJlcykKICAgICAgICAgc2VsZi5maW5pc2hlZChT VUNDRVNTKQogICAgICAgICByZXR1cm4gZGVmZXIuc3VjY2VlZChOb25lKQogCkBAIC0xMDEsNiAr MTAzLDEyIEBAIGNsYXNzIENvbXBpbGVXZWJLaXQoc2hlbGwuQ29tcGlsZSk6CiAgICAgICAgICAg ICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWydERUJVR19JTkZPUk1BVElPTl9GT1JN QVQ9ZHdhcmYtd2l0aC1kc3ltJ10pCiAKICAgICAgICAgYXBwZW5kQ3VzdG9tQnVpbGRGbGFncyhz ZWxmLCBwbGF0Zm9ybSkKKworICAgICAgICBmZWF0dXJlcyA9IHNlbGYuZ2V0UHJvcGVydHkoJ2Zl YXR1cmVzJykKKyAgICAgICAgaWYgaXNpbnN0YW5jZShmZWF0dXJlcywgbGlzdCk6CisgICAgICAg ICAgICBmb3IgZmVhdHVyZSBpbiBmZWF0dXJlczoKKyAgICAgICAgICAgICAgICBzZWxmLnNldENv bW1hbmQoc2VsZi5jb21tYW5kICsgWyctLScgKyBmZWF0dXJlXSkKKwogICAgICAgICByZXR1cm4g c2hlbGwuQ29tcGlsZS5zdGFydChzZWxmKQogCiAKQEAgLTU4NCw5ICs1OTIsOSBAQCBjbGFzcyBT dGFydEFUU1NlcnZlcihzaGVsbC5TaGVsbENvbW1hbmQpOgogCiAKIGNsYXNzIEZhY3RvcnkoZmFj dG9yeS5CdWlsZEZhY3RvcnkpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29u ZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5KToKKyAgICBkZWYgX19pbml0X18o c2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGJ1aWxkT25seSwg ZmVhdHVyZXM9Tm9uZSk6CiAgICAgICAgIGZhY3RvcnkuQnVpbGRGYWN0b3J5Ll9faW5pdF9fKHNl bGYpCi0gICAgICAgIHNlbGYuYWRkU3RlcChDb25maWd1cmVCdWlsZCwgcGxhdGZvcm09cGxhdGZv cm0sIGNvbmZpZ3VyYXRpb249Y29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlPSIgIi5qb2luKGFy Y2hpdGVjdHVyZXMpLCBidWlsZE9ubHk9YnVpbGRPbmx5KQorICAgICAgICBzZWxmLmFkZFN0ZXAo Q29uZmlndXJlQnVpbGQsIHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9uPWNvbmZpZ3Vy YXRpb24sIGFyY2hpdGVjdHVyZT0iICIuam9pbihhcmNoaXRlY3R1cmVzKSwgYnVpbGRPbmx5PWJ1 aWxkT25seSwgZmVhdHVyZXM9ZmVhdHVyZXMpCiAgICAgICAgIHNlbGYuYWRkU3RlcChDaGVja091 dFNvdXJjZSkKICAgICAgICAgaWYgcGxhdGZvcm0gaW4gKCJ3aW4iLCAiY2hyb21pdW0td2luIik6 CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoS2lsbE9sZFByb2Nlc3NlcykKQEAgLTU5Niw4ICs2 MDQsOCBAQCBjbGFzcyBGYWN0b3J5KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKICAgICAgICAgICAg IHNlbGYuYWRkU3RlcChJbnN0YWxsQ2hyb21pdW1EZXBlbmRlbmNpZXMpCiAKIGNsYXNzIEJ1aWxk RmFjdG9yeShGYWN0b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZp Z3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIHRyaWdnZXJzPU5vbmUpOgotICAgICAgICBGYWN0b3J5 Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBU cnVlKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJj aGl0ZWN0dXJlcywgdHJpZ2dlcnM9Tm9uZSwgKiprd2FyZ3MpOgorICAgICAgICBGYWN0b3J5Ll9f aW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBUcnVl LCAqKmt3YXJncykKICAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBpbGVXZWJLaXQpCiAgICAgICAg IGlmIHRyaWdnZXJzOgogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKEFyY2hpdmVCdWlsdFByb2R1 Y3QpCkBAIC02MTEsOCArNjE5LDggQEAgZGVmIHVuaXRUZXN0c1N1cHBvcnRlZChjb25maWd1cmF0 aW9uLCBwbGF0Zm9ybSk6CiBjbGFzcyBUZXN0RmFjdG9yeShGYWN0b3J5KToKICAgICBUZXN0Q2xh c3MgPSBSdW5XZWJLaXRUZXN0cwogICAgIEV4dHJhY3RUZXN0UmVzdWx0c0NsYXNzID0gRXh0cmFj dFRlc3RSZXN1bHRzCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0 aW9uLCBhcmNoaXRlY3R1cmVzKToKLSAgICAgICAgRmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0 Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgRmFsc2UpCisgICAgZGVmIF9faW5p dF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCAqKmt3YXJn cyk6CisgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRp b24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCAqKmt3YXJncykKICAgICAgICAgaWYgcGxhdGZvcm0g PT0gIm1hYy1sZW9wYXJkIjoKICAgICAgICAgICAgICMgV29yayBhcm91bmQgYW4gQVRTU2VydmVy IGxlYWsuIFNlZSA8aHR0cDovL3dlYmtpdC5vcmcvYi81MTgwNz4uCiAgICAgICAgICAgICBzZWxm LmFkZFN0ZXAoU3RvcEFUU1NlcnZlcikKQEAgLTYzNCw4ICs2NDIsOCBAQCBjbGFzcyBUZXN0RmFj dG9yeShGYWN0b3J5KToKIGNsYXNzIEJ1aWxkQW5kVGVzdEZhY3RvcnkoRmFjdG9yeSk6CiAgICAg VGVzdENsYXNzID0gUnVuV2ViS2l0VGVzdHMKICAgICBFeHRyYWN0VGVzdFJlc3VsdHNDbGFzcyA9 IEV4dHJhY3RUZXN0UmVzdWx0cwotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29u ZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcyk6Ci0gICAgICAgIEZhY3RvcnkuX19pbml0X18oc2Vs ZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlKQorICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywg Kiprd2FyZ3MpOgorICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25m aWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgKiprd2FyZ3MpCiAgICAgICAgIGlmIHBs YXRmb3JtLnN0YXJ0c3dpdGgoImNocm9taXVtIik6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAo Q2xlYW51cENocm9taXVtQ3Jhc2hMb2dzKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ29tcGlsZVdl YktpdCkKQEAgLTcxNyw3ICs3MjUsMTEgQEAgZGVmIGxvYWRCdWlsZGVyQ29uZmlnKGMpOgogICAg ICAgICAgICAgaWYgdmFsdWU6CiAgICAgICAgICAgICAgICAgZmFjdG9yeUFyZ3MuYXBwZW5kKHZh bHVlKQogCi0gICAgICAgIGJ1aWxkZXJbImZhY3RvcnkiXSA9IGZhY3RvcnkoKmZhY3RvcnlBcmdz KQorICAgICAgICBmYWN0b3J5S3dBcmdzID0geworICAgICAgICAgICAgImZlYXR1cmVzIjogYnVp bGRlci5wb3AoImZlYXR1cmVzIiwgW10pCisgICAgICAgIH0KKworICAgICAgICBidWlsZGVyWyJm YWN0b3J5Il0gPSBmYWN0b3J5KCpmYWN0b3J5QXJncywgKipmYWN0b3J5S3dBcmdzKQogCiAgICAg ICAgIGJ1aWxkZXJbImNhdGVnb3J5Il0gPSAibm9uY29yZSIKICAgICAgICAgaWYgd2tiYi5faXNf Y29yZV9idWlsZGVyKGJ1aWxkZXJbJ25hbWUnXSk6CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWU2NTFiNC4uM2RjZjM2OCAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisy MDExLTA3LTI2ICBBbGV4YW5kcnUgQ2hpY3VsaXRhICA8YWNoaWN1QGFkb2JlLmNvbT4KKworICAg ICAgICBDU1MgUmVnaW9ucyBidWlsZCBib3Qgc2hvdWxkIGJ1aWxkIHdpdGggIi0tY3NzLXJlZ2lv bnMiIGFuZCAiLS1jc3MtZXhjbHVzaW9uIiBmbGFncworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUxNzEKKworICAgICAgICBBZGRlZCAiZmVhdHVyZXMi IHBhcmFtZXRlciBpbiBjb25maWcuanNvbiBmb3IgImJ1aWxkZXIiIG9iamVjdHMuIFRoZSBwYXJh bWV0ZXIgaXMgb3B0aW9uYWwgYW5kIG11c3QgYmUgYW4gYXJyYXkuIEFsbCB0aGUgaXRlbXMKKyAg ICAgICAgb2YgdGhlIGFycmF5IHdpbGwgYmUgcGFzc2VkIHRvIHRoZSBidWlsZC13ZWJraXQgc2Ny aXB0LiBUaGUgaXRlbXMgd2lsbCBhdXRvbWF0aWNhbGx5IGJlIHByZWZpeGVkIHdpdGggIi0tIi4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uOgorICAgICAg ICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6 CisKIDIwMTEtMDctMjUgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgSWdub3JlIGxpbmUgZW5kaW5ncyBpbiBDaGFuZ2VMb2dUZXN0cwo= 102034 2011-07-26 11:40:49 -0700 2011-07-26 12:09:31 -0700 Patch bug65171_1.patch text/plain 7161 achicu ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL2NvbmZpZy5qc29uIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggZjI2NDIwYS4uMWQ1NjEwZiAxMDA2NDQKLS0tIGEv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpz b24KKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv Y29uZmlnLmpzb24KQEAgLTI0Myw3ICsyNDMsNyBAQAogICAgICAgICAgICAgICAgICAgICAgICJz bGF2ZW5hbWVzIjogWyJlZmwtbGludXgtc2xhdmUtMSJdCiAgICAgICAgICAgICAgICAgICAgIH0s CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiQ1NTUmVnaW9ucyBTbm93TGVvcGFyZCBJ bnRlbCBSZWxlYXNlIChCdWlsZCkiLCAidHlwZSI6ICJCdWlsZCIsICJidWlsZGRpciI6ICJjc3Ny ZWdpb25zLXNub3dsZW9wYXJkLWludGVsLXJlbGVhc2UiLAotICAgICAgICAgICAgICAgICAgICAg ICJwbGF0Zm9ybSI6ICJtYWMtc25vd2xlb3BhcmQiLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNl IiwgImFyY2hpdGVjdHVyZXMiOiBbIng4Nl82NCJdLAorICAgICAgICAgICAgICAgICAgICAgICJw bGF0Zm9ybSI6ICJtYWMtc25vd2xlb3BhcmQiLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwg ImFyY2hpdGVjdHVyZXMiOiBbIng4Nl82NCJdLCAiZmVhdHVyZXMiOiBbImNzcy1yZWdpb25zIiwg ImNzcy1leGNsdXNpb25zIl0sCiAgICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBb ImFkb2JlLW1hYy1zbGF2ZTEiXQogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgICBdLApkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvbWFzdGVyLmNmZyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKaW5kZXggMzRmNDI1Mi4uOWMyZTNkMiAxMDA2NDQK LS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFz dGVyLmNmZworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9tYXN0ZXIuY2ZnCkBAIC0yOSwxNCArMjksMTUgQEAgY2xhc3MgQ29uZmlndXJlQnVpbGQo YnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgbmFtZSA9ICJjb25maWd1cmUgYnVpbGQiCiAgICAg ZGVzY3JpcHRpb24gPSBbImNvbmZpZ3VyaW5nIGJ1aWxkIl0KICAgICBkZXNjcmlwdGlvbkRvbmUg PSBbImNvbmZpZ3VyZWQgYnVpbGQiXQotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwg Y29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlLCBidWlsZE9ubHksICphcmdzLCAqKmt3YXJncyk6 CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRl Y3R1cmUsIGJ1aWxkT25seSwgZmVhdHVyZXMsICphcmdzLCAqKmt3YXJncyk6CiAgICAgICAgIGJ1 aWxkc3RlcC5CdWlsZFN0ZXAuX19pbml0X18oc2VsZiwgKmFyZ3MsICoqa3dhcmdzKQogICAgICAg ICBzZWxmLnBsYXRmb3JtID0gcGxhdGZvcm0uc3BsaXQoJy0nLCAxKVswXQogICAgICAgICBzZWxm LmZ1bGxQbGF0Zm9ybSA9IHBsYXRmb3JtCiAgICAgICAgIHNlbGYuY29uZmlndXJhdGlvbiA9IGNv bmZpZ3VyYXRpb24KICAgICAgICAgc2VsZi5hcmNoaXRlY3R1cmUgPSBhcmNoaXRlY3R1cmUKICAg ICAgICAgc2VsZi5idWlsZE9ubHkgPSBidWlsZE9ubHkKLSAgICAgICAgc2VsZi5hZGRGYWN0b3J5 QXJndW1lbnRzKHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24s IGFyY2hpdGVjdHVyZT1hcmNoaXRlY3R1cmUsIGJ1aWxkT25seT1idWlsZE9ubHkpCisgICAgICAg IHNlbGYuZmVhdHVyZXMgPSBmZWF0dXJlczsKKyAgICAgICAgc2VsZi5hZGRGYWN0b3J5QXJndW1l bnRzKHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24sIGFyY2hp dGVjdHVyZT1hcmNoaXRlY3R1cmUsIGJ1aWxkT25seT1idWlsZE9ubHksIGZlYXR1cmVzPWZlYXR1 cmVzKQogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICBzZWxmLnNldFByb3BlcnR5KCJw bGF0Zm9ybSIsIHNlbGYucGxhdGZvcm0pCkBAIC00NCw2ICs0NSw3IEBAIGNsYXNzIENvbmZpZ3Vy ZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXApOgogICAgICAgICBzZWxmLnNldFByb3BlcnR5KCJj b25maWd1cmF0aW9uIiwgc2VsZi5jb25maWd1cmF0aW9uKQogICAgICAgICBzZWxmLnNldFByb3Bl cnR5KCJhcmNoaXRlY3R1cmUiLCBzZWxmLmFyY2hpdGVjdHVyZSkKICAgICAgICAgc2VsZi5zZXRQ cm9wZXJ0eSgiYnVpbGRPbmx5Iiwgc2VsZi5idWlsZE9ubHkpCisgICAgICAgIHNlbGYuc2V0UHJv cGVydHkoImZlYXR1cmVzIiwgc2VsZi5mZWF0dXJlcykKICAgICAgICAgc2VsZi5maW5pc2hlZChT VUNDRVNTKQogICAgICAgICByZXR1cm4gZGVmZXIuc3VjY2VlZChOb25lKQogCkBAIC0xMDEsNiAr MTAzLDExIEBAIGNsYXNzIENvbXBpbGVXZWJLaXQoc2hlbGwuQ29tcGlsZSk6CiAgICAgICAgICAg ICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWydERUJVR19JTkZPUk1BVElPTl9GT1JN QVQ9ZHdhcmYtd2l0aC1kc3ltJ10pCiAKICAgICAgICAgYXBwZW5kQ3VzdG9tQnVpbGRGbGFncyhz ZWxmLCBwbGF0Zm9ybSkKKworICAgICAgICBmZWF0dXJlcyA9IHNlbGYuZ2V0UHJvcGVydHkoJ2Zl YXR1cmVzJykKKyAgICAgICAgZm9yIGZlYXR1cmUgaW4gZmVhdHVyZXM6CisgICAgICAgICAgICBz ZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWyctLScgKyBmZWF0dXJlXSkKKwogICAgICAg ICByZXR1cm4gc2hlbGwuQ29tcGlsZS5zdGFydChzZWxmKQogCiAKQEAgLTU4NCw5ICs1OTEsOSBA QCBjbGFzcyBTdGFydEFUU1NlcnZlcihzaGVsbC5TaGVsbENvbW1hbmQpOgogCiAKIGNsYXNzIEZh Y3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0 Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5KToKKyAgICBkZWYg X19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGJ1 aWxkT25seSwgZmVhdHVyZXM9Tm9uZSk6CiAgICAgICAgIGZhY3RvcnkuQnVpbGRGYWN0b3J5Ll9f aW5pdF9fKHNlbGYpCi0gICAgICAgIHNlbGYuYWRkU3RlcChDb25maWd1cmVCdWlsZCwgcGxhdGZv cm09cGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Y29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlPSIg Ii5qb2luKGFyY2hpdGVjdHVyZXMpLCBidWlsZE9ubHk9YnVpbGRPbmx5KQorICAgICAgICBzZWxm LmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQsIHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9u PWNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZT0iICIuam9pbihhcmNoaXRlY3R1cmVzKSwgYnVp bGRPbmx5PWJ1aWxkT25seSwgZmVhdHVyZXM9ZmVhdHVyZXMpCiAgICAgICAgIHNlbGYuYWRkU3Rl cChDaGVja091dFNvdXJjZSkKICAgICAgICAgaWYgcGxhdGZvcm0gaW4gKCJ3aW4iLCAiY2hyb21p dW0td2luIik6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoS2lsbE9sZFByb2Nlc3NlcykKQEAg LTU5Niw4ICs2MDMsOCBAQCBjbGFzcyBGYWN0b3J5KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKICAg ICAgICAgICAgIHNlbGYuYWRkU3RlcChJbnN0YWxsQ2hyb21pdW1EZXBlbmRlbmNpZXMpCiAKIGNs YXNzIEJ1aWxkRmFjdG9yeShGYWN0b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZv cm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIHRyaWdnZXJzPU5vbmUpOgotICAgICAg ICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRl Y3R1cmVzLCBUcnVlKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJh dGlvbiwgYXJjaGl0ZWN0dXJlcywgdHJpZ2dlcnM9Tm9uZSwgKiprd2FyZ3MpOgorICAgICAgICBG YWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1 cmVzLCBUcnVlLCAqKmt3YXJncykKICAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBpbGVXZWJLaXQp CiAgICAgICAgIGlmIHRyaWdnZXJzOgogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKEFyY2hpdmVC dWlsdFByb2R1Y3QpCkBAIC02MTEsOCArNjE4LDggQEAgZGVmIHVuaXRUZXN0c1N1cHBvcnRlZChj b25maWd1cmF0aW9uLCBwbGF0Zm9ybSk6CiBjbGFzcyBUZXN0RmFjdG9yeShGYWN0b3J5KToKICAg ICBUZXN0Q2xhc3MgPSBSdW5XZWJLaXRUZXN0cwogICAgIEV4dHJhY3RUZXN0UmVzdWx0c0NsYXNz ID0gRXh0cmFjdFRlc3RSZXN1bHRzCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBj b25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzKToKLSAgICAgICAgRmFjdG9yeS5fX2luaXRfXyhz ZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgRmFsc2UpCisgICAg ZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVz LCAqKmt3YXJncyk6CisgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNv bmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCAqKmt3YXJncykKICAgICAgICAgaWYg cGxhdGZvcm0gPT0gIm1hYy1sZW9wYXJkIjoKICAgICAgICAgICAgICMgV29yayBhcm91bmQgYW4g QVRTU2VydmVyIGxlYWsuIFNlZSA8aHR0cDovL3dlYmtpdC5vcmcvYi81MTgwNz4uCiAgICAgICAg ICAgICBzZWxmLmFkZFN0ZXAoU3RvcEFUU1NlcnZlcikKQEAgLTYzNCw4ICs2NDEsOCBAQCBjbGFz cyBUZXN0RmFjdG9yeShGYWN0b3J5KToKIGNsYXNzIEJ1aWxkQW5kVGVzdEZhY3RvcnkoRmFjdG9y eSk6CiAgICAgVGVzdENsYXNzID0gUnVuV2ViS2l0VGVzdHMKICAgICBFeHRyYWN0VGVzdFJlc3Vs dHNDbGFzcyA9IEV4dHJhY3RUZXN0UmVzdWx0cwotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0 Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcyk6Ci0gICAgICAgIEZhY3RvcnkuX19p bml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNl KQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0 ZWN0dXJlcywgKiprd2FyZ3MpOgorICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRm b3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgKiprd2FyZ3MpCiAgICAg ICAgIGlmIHBsYXRmb3JtLnN0YXJ0c3dpdGgoImNocm9taXVtIik6CiAgICAgICAgICAgICBzZWxm LmFkZFN0ZXAoQ2xlYW51cENocm9taXVtQ3Jhc2hMb2dzKQogICAgICAgICBzZWxmLmFkZFN0ZXAo Q29tcGlsZVdlYktpdCkKQEAgLTcxNyw3ICs3MjQsMTUgQEAgZGVmIGxvYWRCdWlsZGVyQ29uZmln KGMpOgogICAgICAgICAgICAgaWYgdmFsdWU6CiAgICAgICAgICAgICAgICAgZmFjdG9yeUFyZ3Mu YXBwZW5kKHZhbHVlKQogCi0gICAgICAgIGJ1aWxkZXJbImZhY3RvcnkiXSA9IGZhY3RvcnkoKmZh Y3RvcnlBcmdzKQorICAgICAgICBmZWF0dXJlcyA9IGJ1aWxkZXIucG9wKCJmZWF0dXJlcyIsIFtd KQorICAgICAgICBpZiBpc2luc3RhbmNlKGZlYXR1cmVzLCBsaXN0KSA9PSBGYWxzZToKKyAgICAg ICAgICAgIHJhaXNlIEV4Y2VwdGlvbiwgIkJ1aWxkZXIgJXI6ICdmZWF0dXJlcycgcGFyYW1ldGVy IG5lZWRzIHRvIGJlIGEgbGlzdCBvZiBmbGFncyB0aGF0IHdpbGwgYmUgcGFzc2VkIHRvIGJ1aWxk LXdlYmtpdCBzY3JpcHQuIGVnLiBmZWF0dXJlczogWydjc3MtcmVnaW9ucyddIiAlIGJ1aWxkZXJb J25hbWUnXQorCisgICAgICAgIGZhY3RvcnlLd0FyZ3MgPSB7CisgICAgICAgICAgICAiZmVhdHVy ZXMiOiBmZWF0dXJlcworICAgICAgICB9CisKKyAgICAgICAgYnVpbGRlclsiZmFjdG9yeSJdID0g ZmFjdG9yeSgqZmFjdG9yeUFyZ3MsICoqZmFjdG9yeUt3QXJncykKIAogICAgICAgICBidWlsZGVy WyJjYXRlZ29yeSJdID0gIm5vbmNvcmUiCiAgICAgICAgIGlmIHdrYmIuX2lzX2NvcmVfYnVpbGRl cihidWlsZGVyWyduYW1lJ10pOgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMv Q2hhbmdlTG9nCmluZGV4IGFlNjUxYjQuLjNkY2YzNjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0wNy0yNiAg QWxleGFuZHJ1IENoaWN1bGl0YSAgPGFjaGljdUBhZG9iZS5jb20+CisKKyAgICAgICAgQ1NTIFJl Z2lvbnMgYnVpbGQgYm90IHNob3VsZCBidWlsZCB3aXRoICItLWNzcy1yZWdpb25zIiBhbmQgIi0t Y3NzLWV4Y2x1c2lvbiIgZmxhZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY1MTcxCisKKyAgICAgICAgQWRkZWQgImZlYXR1cmVzIiBwYXJhbWV0ZXIg aW4gY29uZmlnLmpzb24gZm9yICJidWlsZGVyIiBvYmplY3RzLiBUaGUgcGFyYW1ldGVyIGlzIG9w dGlvbmFsIGFuZCBtdXN0IGJlIGFuIGFycmF5LiBBbGwgdGhlIGl0ZW1zCisgICAgICAgIG9mIHRo ZSBhcnJheSB3aWxsIGJlIHBhc3NlZCB0byB0aGUgYnVpbGQtd2Via2l0IHNjcmlwdC4gVGhlIGl0 ZW1zIHdpbGwgYXV0b21hdGljYWxseSBiZSBwcmVmaXhlZCB3aXRoICItLSIuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNvbjoKKyAgICAgICAgKiBCdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOgorCiAyMDExLTA3 LTI1ICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgogCiAgICAgICAgIEln bm9yZSBsaW5lIGVuZGluZ3MgaW4gQ2hhbmdlTG9nVGVzdHMK 102037 2011-07-26 12:09:31 -0700 2011-07-26 14:17:27 -0700 Patch bug65171_2.patch text/plain 6896 achicu ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL2NvbmZpZy5qc29uIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggZjI2NDIwYS4uMWQ1NjEwZiAxMDA2NDQKLS0tIGEv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpz b24KKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv Y29uZmlnLmpzb24KQEAgLTI0Myw3ICsyNDMsNyBAQAogICAgICAgICAgICAgICAgICAgICAgICJz bGF2ZW5hbWVzIjogWyJlZmwtbGludXgtc2xhdmUtMSJdCiAgICAgICAgICAgICAgICAgICAgIH0s CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiQ1NTUmVnaW9ucyBTbm93TGVvcGFyZCBJ bnRlbCBSZWxlYXNlIChCdWlsZCkiLCAidHlwZSI6ICJCdWlsZCIsICJidWlsZGRpciI6ICJjc3Ny ZWdpb25zLXNub3dsZW9wYXJkLWludGVsLXJlbGVhc2UiLAotICAgICAgICAgICAgICAgICAgICAg ICJwbGF0Zm9ybSI6ICJtYWMtc25vd2xlb3BhcmQiLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNl IiwgImFyY2hpdGVjdHVyZXMiOiBbIng4Nl82NCJdLAorICAgICAgICAgICAgICAgICAgICAgICJw bGF0Zm9ybSI6ICJtYWMtc25vd2xlb3BhcmQiLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwg ImFyY2hpdGVjdHVyZXMiOiBbIng4Nl82NCJdLCAiZmVhdHVyZXMiOiBbImNzcy1yZWdpb25zIiwg ImNzcy1leGNsdXNpb25zIl0sCiAgICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBb ImFkb2JlLW1hYy1zbGF2ZTEiXQogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgICBdLApkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvbWFzdGVyLmNmZyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKaW5kZXggMzRmNDI1Mi4uZDhmNDU1YSAxMDA2NDQK LS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFz dGVyLmNmZworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9tYXN0ZXIuY2ZnCkBAIC0yOSwxNCArMjksMTUgQEAgY2xhc3MgQ29uZmlndXJlQnVpbGQo YnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgbmFtZSA9ICJjb25maWd1cmUgYnVpbGQiCiAgICAg ZGVzY3JpcHRpb24gPSBbImNvbmZpZ3VyaW5nIGJ1aWxkIl0KICAgICBkZXNjcmlwdGlvbkRvbmUg PSBbImNvbmZpZ3VyZWQgYnVpbGQiXQotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwg Y29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlLCBidWlsZE9ubHksICphcmdzLCAqKmt3YXJncyk6 CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRl Y3R1cmUsIGJ1aWxkT25seSwgZmVhdHVyZXMsICphcmdzLCAqKmt3YXJncyk6CiAgICAgICAgIGJ1 aWxkc3RlcC5CdWlsZFN0ZXAuX19pbml0X18oc2VsZiwgKmFyZ3MsICoqa3dhcmdzKQogICAgICAg ICBzZWxmLnBsYXRmb3JtID0gcGxhdGZvcm0uc3BsaXQoJy0nLCAxKVswXQogICAgICAgICBzZWxm LmZ1bGxQbGF0Zm9ybSA9IHBsYXRmb3JtCiAgICAgICAgIHNlbGYuY29uZmlndXJhdGlvbiA9IGNv bmZpZ3VyYXRpb24KICAgICAgICAgc2VsZi5hcmNoaXRlY3R1cmUgPSBhcmNoaXRlY3R1cmUKICAg ICAgICAgc2VsZi5idWlsZE9ubHkgPSBidWlsZE9ubHkKLSAgICAgICAgc2VsZi5hZGRGYWN0b3J5 QXJndW1lbnRzKHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24s IGFyY2hpdGVjdHVyZT1hcmNoaXRlY3R1cmUsIGJ1aWxkT25seT1idWlsZE9ubHkpCisgICAgICAg IHNlbGYuZmVhdHVyZXMgPSBmZWF0dXJlczsKKyAgICAgICAgc2VsZi5hZGRGYWN0b3J5QXJndW1l bnRzKHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24sIGFyY2hp dGVjdHVyZT1hcmNoaXRlY3R1cmUsIGJ1aWxkT25seT1idWlsZE9ubHksIGZlYXR1cmVzPWZlYXR1 cmVzKQogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICBzZWxmLnNldFByb3BlcnR5KCJw bGF0Zm9ybSIsIHNlbGYucGxhdGZvcm0pCkBAIC00NCw2ICs0NSw3IEBAIGNsYXNzIENvbmZpZ3Vy ZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXApOgogICAgICAgICBzZWxmLnNldFByb3BlcnR5KCJj b25maWd1cmF0aW9uIiwgc2VsZi5jb25maWd1cmF0aW9uKQogICAgICAgICBzZWxmLnNldFByb3Bl cnR5KCJhcmNoaXRlY3R1cmUiLCBzZWxmLmFyY2hpdGVjdHVyZSkKICAgICAgICAgc2VsZi5zZXRQ cm9wZXJ0eSgiYnVpbGRPbmx5Iiwgc2VsZi5idWlsZE9ubHkpCisgICAgICAgIHNlbGYuc2V0UHJv cGVydHkoImZlYXR1cmVzIiwgc2VsZi5mZWF0dXJlcykKICAgICAgICAgc2VsZi5maW5pc2hlZChT VUNDRVNTKQogICAgICAgICByZXR1cm4gZGVmZXIuc3VjY2VlZChOb25lKQogCkBAIC0xMDEsNiAr MTAzLDExIEBAIGNsYXNzIENvbXBpbGVXZWJLaXQoc2hlbGwuQ29tcGlsZSk6CiAgICAgICAgICAg ICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWydERUJVR19JTkZPUk1BVElPTl9GT1JN QVQ9ZHdhcmYtd2l0aC1kc3ltJ10pCiAKICAgICAgICAgYXBwZW5kQ3VzdG9tQnVpbGRGbGFncyhz ZWxmLCBwbGF0Zm9ybSkKKworICAgICAgICBmZWF0dXJlcyA9IHNlbGYuZ2V0UHJvcGVydHkoJ2Zl YXR1cmVzJykKKyAgICAgICAgZm9yIGZlYXR1cmUgaW4gZmVhdHVyZXM6CisgICAgICAgICAgICBz ZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWyctLScgKyBmZWF0dXJlXSkKKwogICAgICAg ICByZXR1cm4gc2hlbGwuQ29tcGlsZS5zdGFydChzZWxmKQogCiAKQEAgLTU4NCw5ICs1OTEsOSBA QCBjbGFzcyBTdGFydEFUU1NlcnZlcihzaGVsbC5TaGVsbENvbW1hbmQpOgogCiAKIGNsYXNzIEZh Y3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0 Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5KToKKyAgICBkZWYg X19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGJ1 aWxkT25seSwgZmVhdHVyZXM9Tm9uZSk6CiAgICAgICAgIGZhY3RvcnkuQnVpbGRGYWN0b3J5Ll9f aW5pdF9fKHNlbGYpCi0gICAgICAgIHNlbGYuYWRkU3RlcChDb25maWd1cmVCdWlsZCwgcGxhdGZv cm09cGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Y29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlPSIg Ii5qb2luKGFyY2hpdGVjdHVyZXMpLCBidWlsZE9ubHk9YnVpbGRPbmx5KQorICAgICAgICBzZWxm LmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQsIHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9u PWNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZT0iICIuam9pbihhcmNoaXRlY3R1cmVzKSwgYnVp bGRPbmx5PWJ1aWxkT25seSwgZmVhdHVyZXM9ZmVhdHVyZXMpCiAgICAgICAgIHNlbGYuYWRkU3Rl cChDaGVja091dFNvdXJjZSkKICAgICAgICAgaWYgcGxhdGZvcm0gaW4gKCJ3aW4iLCAiY2hyb21p dW0td2luIik6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoS2lsbE9sZFByb2Nlc3NlcykKQEAg LTU5Niw4ICs2MDMsOCBAQCBjbGFzcyBGYWN0b3J5KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKICAg ICAgICAgICAgIHNlbGYuYWRkU3RlcChJbnN0YWxsQ2hyb21pdW1EZXBlbmRlbmNpZXMpCiAKIGNs YXNzIEJ1aWxkRmFjdG9yeShGYWN0b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZv cm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIHRyaWdnZXJzPU5vbmUpOgotICAgICAg ICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRl Y3R1cmVzLCBUcnVlKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJh dGlvbiwgYXJjaGl0ZWN0dXJlcywgdHJpZ2dlcnM9Tm9uZSwgKiprd2FyZ3MpOgorICAgICAgICBG YWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1 cmVzLCBUcnVlLCAqKmt3YXJncykKICAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBpbGVXZWJLaXQp CiAgICAgICAgIGlmIHRyaWdnZXJzOgogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKEFyY2hpdmVC dWlsdFByb2R1Y3QpCkBAIC02MTEsOCArNjE4LDggQEAgZGVmIHVuaXRUZXN0c1N1cHBvcnRlZChj b25maWd1cmF0aW9uLCBwbGF0Zm9ybSk6CiBjbGFzcyBUZXN0RmFjdG9yeShGYWN0b3J5KToKICAg ICBUZXN0Q2xhc3MgPSBSdW5XZWJLaXRUZXN0cwogICAgIEV4dHJhY3RUZXN0UmVzdWx0c0NsYXNz ID0gRXh0cmFjdFRlc3RSZXN1bHRzCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBj b25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzKToKLSAgICAgICAgRmFjdG9yeS5fX2luaXRfXyhz ZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgRmFsc2UpCisgICAg ZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVz LCAqKmt3YXJncyk6CisgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNv bmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCAqKmt3YXJncykKICAgICAgICAgaWYg cGxhdGZvcm0gPT0gIm1hYy1sZW9wYXJkIjoKICAgICAgICAgICAgICMgV29yayBhcm91bmQgYW4g QVRTU2VydmVyIGxlYWsuIFNlZSA8aHR0cDovL3dlYmtpdC5vcmcvYi81MTgwNz4uCiAgICAgICAg ICAgICBzZWxmLmFkZFN0ZXAoU3RvcEFUU1NlcnZlcikKQEAgLTYzNCw4ICs2NDEsOCBAQCBjbGFz cyBUZXN0RmFjdG9yeShGYWN0b3J5KToKIGNsYXNzIEJ1aWxkQW5kVGVzdEZhY3RvcnkoRmFjdG9y eSk6CiAgICAgVGVzdENsYXNzID0gUnVuV2ViS2l0VGVzdHMKICAgICBFeHRyYWN0VGVzdFJlc3Vs dHNDbGFzcyA9IEV4dHJhY3RUZXN0UmVzdWx0cwotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0 Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcyk6Ci0gICAgICAgIEZhY3RvcnkuX19p bml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNl KQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0 ZWN0dXJlcywgKiprd2FyZ3MpOgorICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRm b3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgKiprd2FyZ3MpCiAgICAg ICAgIGlmIHBsYXRmb3JtLnN0YXJ0c3dpdGgoImNocm9taXVtIik6CiAgICAgICAgICAgICBzZWxm LmFkZFN0ZXAoQ2xlYW51cENocm9taXVtQ3Jhc2hMb2dzKQogICAgICAgICBzZWxmLmFkZFN0ZXAo Q29tcGlsZVdlYktpdCkKQEAgLTcxNyw3ICs3MjQsMTEgQEAgZGVmIGxvYWRCdWlsZGVyQ29uZmln KGMpOgogICAgICAgICAgICAgaWYgdmFsdWU6CiAgICAgICAgICAgICAgICAgZmFjdG9yeUFyZ3Mu YXBwZW5kKHZhbHVlKQogCi0gICAgICAgIGJ1aWxkZXJbImZhY3RvcnkiXSA9IGZhY3RvcnkoKmZh Y3RvcnlBcmdzKQorICAgICAgICBmYWN0b3J5S3dBcmdzID0geworICAgICAgICAgICAgImZlYXR1 cmVzIjogYnVpbGRlci5wb3AoImZlYXR1cmVzIiwgW10pCisgICAgICAgIH0KKworICAgICAgICBi dWlsZGVyWyJmYWN0b3J5Il0gPSBmYWN0b3J5KCpmYWN0b3J5QXJncywgKipmYWN0b3J5S3dBcmdz KQogCiAgICAgICAgIGJ1aWxkZXJbImNhdGVnb3J5Il0gPSAibm9uY29yZSIKICAgICAgICAgaWYg d2tiYi5faXNfY29yZV9idWlsZGVyKGJ1aWxkZXJbJ25hbWUnXSk6CmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWU2NTFiNC4uM2RjZjM2OCAxMDA2 NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDExLTA3LTI2ICBBbGV4YW5kcnUgQ2hpY3VsaXRhICA8YWNoaWN1QGFkb2JlLmNv bT4KKworICAgICAgICBDU1MgUmVnaW9ucyBidWlsZCBib3Qgc2hvdWxkIGJ1aWxkIHdpdGggIi0t Y3NzLXJlZ2lvbnMiIGFuZCAiLS1jc3MtZXhjbHVzaW9uIiBmbGFncworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUxNzEKKworICAgICAgICBBZGRlZCAi ZmVhdHVyZXMiIHBhcmFtZXRlciBpbiBjb25maWcuanNvbiBmb3IgImJ1aWxkZXIiIG9iamVjdHMu IFRoZSBwYXJhbWV0ZXIgaXMgb3B0aW9uYWwgYW5kIG11c3QgYmUgYW4gYXJyYXkuIEFsbCB0aGUg aXRlbXMKKyAgICAgICAgb2YgdGhlIGFycmF5IHdpbGwgYmUgcGFzc2VkIHRvIHRoZSBidWlsZC13 ZWJraXQgc2NyaXB0LiBUaGUgaXRlbXMgd2lsbCBhdXRvbWF0aWNhbGx5IGJlIHByZWZpeGVkIHdp dGggIi0tIi4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29u OgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21h c3Rlci5jZmc6CisKIDIwMTEtMDctMjUgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgSWdub3JlIGxpbmUgZW5kaW5ncyBpbiBDaGFuZ2VMb2dUZXN0cwo=