149941 2015-10-08 16:53:24 -0700 pull-svn.py fails to sync revisions when SVN credentials is not setup 2015-10-08 18:13:54 -0700 1 1 1 Unclassified WebKit WebKit Website WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez jond slewis timothy oldest_to_newest 1131784 0 rniwa 2015-10-08 16:53:24 -0700 The script should have username and password as arguments. 1131790 1 262729 rniwa 2015-10-08 17:03:38 -0700 Created attachment 262729 Patch 1131796 2 262732 rniwa 2015-10-08 17:16:31 -0700 Created attachment 262732 Added an option to set --trust-server-cert 1131799 3 262732 cdumez 2015-10-08 17:43:33 -0700 Comment on attachment 262732 Added an option to set --trust-server-cert View in context: https://bugs.webkit.org/attachment.cgi?id=262732&action=review r=me with comment. > Websites/perf.webkit.org/tools/pull-svn.py:43 > + if 'revisionToFecth' not in repository: revisionToFecth -> revisionToFetch 1131803 4 rniwa 2015-10-08 18:13:54 -0700 Committed r190764: <http://trac.webkit.org/changeset/190764> 262729 2015-10-08 17:03:38 -0700 2015-10-08 17:16:27 -0700 Patch bug-149941-20151008170307.patch text/plain 8986 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMTkwNzYwKQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQwIEBACisyMDE1LTEwLTA4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIHB1bGwtc3ZuLnB5IGZhaWxzIHRvIHN5bmMgcmV2aXNpb25zIHdoZW4gU1ZOIGNy ZWRlbnRpYWxzIGlzIG5vdCBzZXR1cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ5OTQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkZWQgdGhlIHN1cHBvcnQgZm9yIHNwZWNpZnlpbmcgc3VidmVyc2lv biBjcmVkZW50aWFscy4KKworICAgICAgICBBbHNvIGFkZGVkIHRoZSBzdXBwb3J0IGZvciBwdWxs aW5nIGZyb20gbXVsdGlwbGUgc3VidmVyc2lvbiBzZXJ2ZXJzLiBTdWJ2ZXJzaW9uIHNlcnZlcnMg YXJlIHNwZWNpZmllZAorICAgICAgICBpbiBhIEpTT04gY29uZmlndXJhdGlvbiBmaWxlIHNwZWNp ZmllZCBieSAtLXN2bi1jb25maWcgZm9ybWF0dGVkIGFzIGZvbGxvd3M6CisKKyAgICAgICAgWwor ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJuYW1lIjogIldlYktpdCIsCisgICAgICAg ICAgICAgICAgInVybCI6ICJodHRwOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQi LAorICAgICAgICAgICAgICAgICJ1c2VybmFtZSI6ICJ3ZWJraXR0ZW4iLAorICAgICAgICAgICAg ICAgICJwYXNzd29yZCI6ICJ3ZWJraXR0ZW4ncyBwYXNzd29yZCIsCisgICAgICAgICAgICAgICAg ImFjY291bnROYW1lRmluZGVyU2NyaXB0IjoKKyAgICAgICAgICAgICAgICAgICAgWyJweXRob24i LCAiL1ZvbHVtZXMvRGF0YS9XZWJLaXQvVG9vbHMvU2NyaXB0cy93ZWJraXQtcGF0Y2giLCAiZmlu ZC11c2VycyJdCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgLi4uCisgICAgICAgIF0KKwor ICAgICAgICBJbiBhZGRpdGlvbiwgcmVmYWN0b3JlZCBpdCB0byB1c2UgdGhlIHNoYXJlZCBzZXJ2 ZXIgY29uZmlnIEpTT04gZm9yIHRoZSBkYXNoYm9hcmQgYWNjZXNzLgorCisgICAgICAgICogdG9v bHMvcHVsbC1zdm4ucHk6CisgICAgICAgIChtYWluKTogTm93IHRha2VzIC0tc3ZuLWNvbmZpZy1q c29uLCAtLXNlcnZlci1jb25maWctanNvbiwgLS1zZWNvbmRzLXRvLXNsZWVwIGFuZCAtLW1heC1m ZXRjaC1jb3VudAorICAgICAgICBhcyByZXF1aXJlZCBvcHRpb25zIGluc3RlYWQgb2Ygc2V2ZW4g dW5uYW1lZCBhcmd1bWVudHMuCisgICAgICAgIChmZXRjaF9jb21taXRzX2FuZF9zdWJtaXQpOiBF eHRyYWN0ZWQgZnJvbSBtYWluLiBGZXRjaGVzIGF0IG1vc3QgbWF4X2ZldGNoX2NvdW50IG5ldyBy ZXZpc2lvbnMgZnJvbQorICAgICAgICB0aGUgc3VidmVyc2lvbiBzZXJ2ZXIsIGFuZCBzdWJtaXRz IHRoZW0gaW4gYWNjb3JkYW5jZSB3aXRoIHNlcnZlcl9jb25maWcuCisgICAgICAgIChmZXRjaF9j b21taXRfYW5kX3Jlc29sdmVfYXV0aG9yKTogTm93IHRha2VzIGEgc2luZ2xlIHJlcG9zaXRvcnkg ZGljdGlvbmFyeSBpbnN0ZWFkIG9mIHR3byBzZXBhcmF0ZQorICAgICAgICBhcmd1bWVudHMgZm9y IG5hbWUgYW5kIFVSTCB0byBwYXNzIGRvd24gdGhlIHJlcG9zaXRvcnkncyBhdXRoZW50aWNhdGlv biBpbmZvIHRvIGZldGNoX2NvbW1pdC4KKyAgICAgICAgKGZldGNoX2NvbW1pdCk6IERpdHRvLiBB ZGQgYXBwcm9wcmlhdGUgYXJndW1lbnRzIHdoZW4gdXNlcm5hbWUgYW5kIHBhc3N3b3JkcyBhcmUg c3BlY2lmaWVkLgorICAgICAgICAocmVzb2x2ZV9hdXRob3JfbmFtZV9mcm9tX2FjY291bnQpOiBV c2UgYSBsaXN0IGFyZ3VtZW50IGluc3RlYWQgb2YgYSBzaW5nbGUgc3RyaW5nIGFyZ3VtZW50IG5v dyB0aGF0CisgICAgICAgIHRoZSBhcmd1bWVudCBjb21lcyBmcm9tIGEgSlNPTiBpbnN0ZWFkIG9m IHN5cy5hcmd2LgorCiAyMDE1LTEwLTA3ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3Jn PgogCiAgICAgICAgIFVucmV2aWV3ZWQgcmFjZSBjb25kaXRpb24gZml4LiBFeGl0IGVhcmx5IHdo ZW4geFNjYWxlIG9yIHlTY2FsZSBpcyBub3QgZGVmaW5lZC4KSW5kZXg6IFdlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy90b29scy9wdWxsLXN2bi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvdG9vbHMvcHVsbC1zdm4ucHkJKHJldmlzaW9uIDE5MDc2MCkKKysrIFdlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9wdWxsLXN2bi5weQkod29ya2luZyBjb3B5KQpAQCAt MSw1ICsxLDYgQEAKICMhL3Vzci9iaW4vcHl0aG9uCiAKK2ltcG9ydCBhcmdwYXJzZQogaW1wb3J0 IGpzb24KIGltcG9ydCByZQogaW1wb3J0IHN1YnByb2Nlc3MKQEAgLTgsNDYgKzksNTggQEAgaW1w b3J0IHRpbWUKIGltcG9ydCB1cmxsaWIyCiAKIGZyb20geG1sLmRvbS5taW5pZG9tIGltcG9ydCBw YXJzZVN0cmluZyBhcyBwYXJzZVhtbFN0cmluZworZnJvbSB1dGlsIGltcG9ydCBzZXR1cF9hdXRo CiBmcm9tIHV0aWwgaW1wb3J0IHN1Ym1pdF9jb21taXRzCiBmcm9tIHV0aWwgaW1wb3J0IHRleHRf Y29udGVudAogCiAKIGRlZiBtYWluKGFyZ3YpOgotICAgIGlmIGxlbihhcmd2KSA8IDc6Ci0gICAg ICAgIHN5cy5leGl0KCdVc2FnZTogcHVsbC1zdm4gPHJlcG9zaXRvcnktbmFtZT4gPHJlcG9zaXRv cnktVVJMPiA8ZGFzaGJvYXJkLVVSTD4gPHNsYXZlLW5hbWU+IDxzbGF2ZS1wYXNzd29yZD4gPHNl Y29uZHMtdG8tc2xlZXA+IFs8YWNjb3VudC10by1uYW1lLWhlbHBlcj5dJykKKyAgICBwYXJzZXIg PSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNlcigpCisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1z dm4tY29uZmlnLWpzb24nLCByZXF1aXJlZD1UcnVlLCBoZWxwPSdUaGUgcGF0aCB0byBhIEpTT04g ZmlsZSB0aGF0IHNwZWNpZmllcyBzdWJ2ZXJzaW9uIHN5bmNpbmcgb3B0aW9ucycpCisgICAgcGFy c2VyLmFkZF9hcmd1bWVudCgnLS1zZXJ2ZXItY29uZmlnLWpzb24nLCByZXF1aXJlZD1UcnVlLCBo ZWxwPSdUaGUgcGF0aCB0byBhIEpTT04gZmlsZSB0aGF0IHNwZWNpZmllcyB0aGUgcGVyZiBkYXNo Ym9hcmQnKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy0tc2Vjb25kcy10by1zbGVlcCcsIHR5 cGU9ZmxvYXQsIGRlZmF1bHQ9OTAwLCBoZWxwPSdUaGUgc2Vjb25kcyB0byBzbGVlcCBiZXR3ZWVu IGl0ZXJhdGlvbnMnKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy0tbWF4LWZldGNoLWNvdW50 JywgdHlwZT1pbnQsIGRlZmF1bHQ9MTAsIGhlbHA9J1RoZSBudW1iZXIgb2YgY29tbWl0cyB0byBm ZXRjaCBhdCBvbmNlJykKKyAgICBhcmdzID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQorCisgICAgd2l0 aCBvcGVuKGFyZ3Muc2VydmVyX2NvbmZpZ19qc29uKSBhcyBzZXJ2ZXJfY29uZmlnX2pzb246Cisg ICAgICAgIHNlcnZlcl9jb25maWcgPSBqc29uLmxvYWQoc2VydmVyX2NvbmZpZ19qc29uKQorICAg ICAgICBzZXR1cF9hdXRoKHNlcnZlcl9jb25maWdbJ3NlcnZlciddKQogCi0gICAgcmVwb3NpdG9y eV9uYW1lID0gYXJndlsxXQotICAgIHJlcG9zaXRvcnlfdXJsID0gYXJndlsyXQotICAgIGRhc2hi b2FyZF91cmwgPSBhcmd2WzNdCi0gICAgc2xhdmVfbmFtZSA9IGFyZ3ZbNF0KLSAgICBzbGF2ZV9w YXNzd29yZCA9IGFyZ3ZbNV0KLSAgICBzZWNvbmRzX3RvX3NsZWVwID0gZmxvYXQoYXJndls2XSkK LSAgICBhY2NvdW50X3RvX25hbWVfaGVscGVyID0gYXJndls3XSBpZiBsZW4oYXJndikgPiA3IGVs c2UgTm9uZQotCi0gICAgcHJpbnQgIlN1Ym1pdHRpbmcgcmV2aXNpb24gbG9ncyBmb3IgJXMgYXQg JXMgdG8gJXMiICUgKHJlcG9zaXRvcnlfbmFtZSwgcmVwb3NpdG9yeV91cmwsIGRhc2hib2FyZF91 cmwpCi0KLSAgICByZXZpc2lvbl90b19mZXRjaCA9IGRldGVybWluZV9maXJzdF9yZXZpc2lvbl90 b19mZXRjaChkYXNoYm9hcmRfdXJsLCByZXBvc2l0b3J5X25hbWUpCi0gICAgcHJpbnQgIlN0YXJ0 IGZldGNoaW5nIGNvbW1pdHMgYXQgciVkIiAlIHJldmlzaW9uX3RvX2ZldGNoCi0KLSAgICBwZW5k aW5nX2NvbW1pdHNfdG9fc2VuZCA9IFtdCisgICAgd2l0aCBvcGVuKGFyZ3Muc3ZuX2NvbmZpZ19q c29uKSBhcyBzdm5fY29uZmlnX2pzb246CisgICAgICAgIHN2bl9jb25maWcgPSBqc29uLmxvYWQo c3ZuX2NvbmZpZ19qc29uKQogCiAgICAgd2hpbGUgVHJ1ZToKLSAgICAgICAgY29tbWl0ID0gZmV0 Y2hfY29tbWl0X2FuZF9yZXNvbHZlX2F1dGhvcihyZXBvc2l0b3J5X25hbWUsIHJlcG9zaXRvcnlf dXJsLCBhY2NvdW50X3RvX25hbWVfaGVscGVyLCByZXZpc2lvbl90b19mZXRjaCkKLQotICAgICAg ICBpZiBjb21taXQ6Ci0gICAgICAgICAgICBwcmludCAiRmV0Y2hlZCByJWQuIiAlIHJldmlzaW9u X3RvX2ZldGNoCi0gICAgICAgICAgICBwZW5kaW5nX2NvbW1pdHNfdG9fc2VuZCArPSBbY29tbWl0 XQotICAgICAgICAgICAgcmV2aXNpb25fdG9fZmV0Y2ggKz0gMQotICAgICAgICBlbHNlOgotICAg ICAgICAgICAgcHJpbnQgIlJldmlzaW9uICVkIG5vdCBmb3VuZCIgJSByZXZpc2lvbl90b19mZXRj aAotCi0gICAgICAgIGlmIG5vdCBjb21taXQgb3IgbGVuKHBlbmRpbmdfY29tbWl0c190b19zZW5k KSA+PSAxMDoKLSAgICAgICAgICAgIGlmIHBlbmRpbmdfY29tbWl0c190b19zZW5kOgotICAgICAg ICAgICAgICAgIHByaW50ICJTdWJtaXR0aW5nIHRoZSBhYm92ZSBjb21taXRzIHRvICVzLi4uIiAl IGRhc2hib2FyZF91cmwKLSAgICAgICAgICAgICAgICBzdWJtaXRfY29tbWl0cyhwZW5kaW5nX2Nv bW1pdHNfdG9fc2VuZCwgZGFzaGJvYXJkX3VybCwgc2xhdmVfbmFtZSwgc2xhdmVfcGFzc3dvcmQp Ci0gICAgICAgICAgICAgICAgcHJpbnQgIlN1Y2Nlc3NmdWxseSBzdWJtaXR0ZWQuIgotICAgICAg ICAgICAgcGVuZGluZ19jb21taXRzX3RvX3NlbmQgPSBbXQotICAgICAgICAgICAgdGltZS5zbGVl cChzZWNvbmRzX3RvX3NsZWVwKQorICAgICAgICBmb3IgcmVwb3NpdG9yeV9pbmZvIGluIHN2bl9j b25maWc6CisgICAgICAgICAgICBmZXRjaF9jb21taXRzX2FuZF9zdWJtaXQocmVwb3NpdG9yeV9p bmZvLCBzZXJ2ZXJfY29uZmlnLCBhcmdzLm1heF9mZXRjaF9jb3VudCkKKyAgICAgICAgcHJpbnQg IlNsZWVwaW5nIGZvciAlZCBzZWNvbmRzLi4uIiAlIGFyZ3Muc2Vjb25kc190b19zbGVlcAorICAg ICAgICB0aW1lLnNsZWVwKGFyZ3Muc2Vjb25kc190b19zbGVlcCkKKworCitkZWYgZmV0Y2hfY29t bWl0c19hbmRfc3VibWl0KHJlcG9zaXRvcnksIHNlcnZlcl9jb25maWcsIG1heF9mZXRjaF9jb3Vu dCk6CisgICAgYXNzZXJ0ICduYW1lJyBpbiByZXBvc2l0b3J5LCAnVGhlIHJlcG9zaXRvcnkgbmFt ZSBzaG91bGQgYmUgc3BlY2lmaWVkJworICAgIGFzc2VydCAndXJsJyBpbiByZXBvc2l0b3J5LCAn VGhlIFNWTiByZXBvc2l0b3J5IFVSTCBzaG91bGQgYmUgc3BlY2lmaWVkJworCisgICAgaWYgJ3Jl dmlzaW9uVG9GZWN0aCcgbm90IGluIHJlcG9zaXRvcnk6CisgICAgICAgIHByaW50ICJEZXRlcm1p bmluZyB0aGUgc3RhdGluZyByZXZpc2lvbiBmb3IgJXMiICUgcmVwb3NpdG9yeVsnbmFtZSddCisg ICAgICAgIHJlcG9zaXRvcnlbJ3JldmlzaW9uVG9GZWN0aCddID0gZGV0ZXJtaW5lX2ZpcnN0X3Jl dmlzaW9uX3RvX2ZldGNoKHNlcnZlcl9jb25maWdbJ3NlcnZlciddWyd1cmwnXSwgcmVwb3NpdG9y eVsnbmFtZSddKQorCisgICAgcGVuZGluZ19jb21taXRzID0gW10KKyAgICBmb3IgdW51c2VkIGlu IHJhbmdlKG1heF9mZXRjaF9jb3VudCk6CisgICAgICAgIGNvbW1pdCA9IGZldGNoX2NvbW1pdF9h bmRfcmVzb2x2ZV9hdXRob3IocmVwb3NpdG9yeSwgcmVwb3NpdG9yeS5nZXQoJ2FjY291bnROYW1l RmluZGVyU2NyaXB0JywgTm9uZSksIHJlcG9zaXRvcnlbJ3JldmlzaW9uVG9GZWN0aCddKQorICAg ICAgICBpZiBub3QgY29tbWl0OgorICAgICAgICAgICAgYnJlYWsKKyAgICAgICAgcGVuZGluZ19j b21taXRzICs9IFtjb21taXRdCisgICAgICAgIHJlcG9zaXRvcnlbJ3JldmlzaW9uVG9GZWN0aCdd ICs9IDEKKworICAgIGlmIG5vdCBwZW5kaW5nX2NvbW1pdHM6CisgICAgICAgIHByaW50ICJObyBu ZXcgcmV2aXNpb24gZm91bmQgZm9yICVzICh3YWl0aW5nIGZvciByJWQpIiAlIChyZXBvc2l0b3J5 WyduYW1lJ10sIHJlcG9zaXRvcnlbJ3JldmlzaW9uVG9GZWN0aCddKQorICAgICAgICByZXR1cm4K KworICAgIHJldmlzaW9uX2xpc3QgPSAncicgKyAnLCByJy5qb2luKG1hcChsYW1iZGEgY29tbWl0 OiBzdHIoY29tbWl0WydyZXZpc2lvbiddKSwgcGVuZGluZ19jb21taXRzKSkKKyAgICBwcmludCAi U3VibWl0dGluZyByZXZpc2lvbnMgJXMgZm9yICVzIHRvICVzIiAlIChyZXZpc2lvbl9saXN0LCBy ZXBvc2l0b3J5WyduYW1lJ10sIHNlcnZlcl9jb25maWdbJ3NlcnZlciddWyd1cmwnXSkKKyAgICBz dWJtaXRfY29tbWl0cyhwZW5kaW5nX2NvbW1pdHMsIHNlcnZlcl9jb25maWdbJ3NlcnZlciddWyd1 cmwnXSwgc2VydmVyX2NvbmZpZ1snc2xhdmUnXVsnbmFtZSddLCBzZXJ2ZXJfY29uZmlnWydzbGF2 ZSddWydwYXNzd29yZCddKQorICAgIHByaW50ICJTdWNjZXNzZnVsbHkgc3VibWl0dGVkLiIKKyAg ICBwcmludAogCiAKIGRlZiBkZXRlcm1pbmVfZmlyc3RfcmV2aXNpb25fdG9fZmV0Y2goZGFzaGJv YXJkX3VybCwgcmVwb3NpdG9yeV9uYW1lKToKQEAgLTc2LDkgKzg5LDkgQEAgZGVmIGZldGNoX3Jl dmlzaW9uX2Zyb21fZGFzYmhvYXJkKGRhc2hibwogICAgIHJldHVybiBpbnQoY29tbWl0c1swXVsn cmV2aXNpb24nXSkgaWYgY29tbWl0cyBlbHNlIE5vbmUKIAogCi1kZWYgZmV0Y2hfY29tbWl0X2Fu ZF9yZXNvbHZlX2F1dGhvcihyZXBvc2l0b3J5X25hbWUsIHJlcG9zaXRvcnlfdXJsLCBhY2NvdW50 X3RvX25hbWVfaGVscGVyLCByZXZpc2lvbl90b19mZXRjaCk6CitkZWYgZmV0Y2hfY29tbWl0X2Fu ZF9yZXNvbHZlX2F1dGhvcihyZXBvc2l0b3J5LCBhY2NvdW50X3RvX25hbWVfaGVscGVyLCByZXZp c2lvbl90b19mZXRjaCk6CiAgICAgdHJ5OgotICAgICAgICBjb21taXQgPSBmZXRjaF9jb21taXQo cmVwb3NpdG9yeV9uYW1lLCByZXBvc2l0b3J5X3VybCwgcmV2aXNpb25fdG9fZmV0Y2gpCisgICAg ICAgIGNvbW1pdCA9IGZldGNoX2NvbW1pdChyZXBvc2l0b3J5LCByZXZpc2lvbl90b19mZXRjaCkK ICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGVycm9yOgogICAgICAgICBzeXMuZXhpdCgnRmFpbGVk IHRvIGZldGNoIHRoZSBjb21taXQgJWQ6ICVzJyAlIChyZXZpc2lvbl90b19mZXRjaCwgc3RyKGVy cm9yKSkpCiAKQEAgLTk2LDggKzEwOSwxMCBAQCBkZWYgZmV0Y2hfY29tbWl0X2FuZF9yZXNvbHZl X2F1dGhvcihyZXBvCiAgICAgcmV0dXJuIGNvbW1pdAogCiAKLWRlZiBmZXRjaF9jb21taXQocmVw b3NpdG9yeV9uYW1lLCByZXBvc2l0b3J5X3VybCwgcmV2aXNpb24pOgotICAgIGFyZ3MgPSBbJ3N2 bicsICdsb2cnLCAnLS1yZXZpc2lvbicsIHN0cihyZXZpc2lvbiksICctLXhtbCcsIHJlcG9zaXRv cnlfdXJsXQorZGVmIGZldGNoX2NvbW1pdChyZXBvc2l0b3J5LCByZXZpc2lvbik6CisgICAgYXJn cyA9IFsnc3ZuJywgJ2xvZycsICctLXJldmlzaW9uJywgc3RyKHJldmlzaW9uKSwgJy0teG1sJywg cmVwb3NpdG9yeVsndXJsJ10sICctLW5vbi1pbnRlcmFjdGl2ZSddCisgICAgaWYgJ3VzZXJuYW1l JyBpbiByZXBvc2l0b3J5IGFuZCAncGFzc3dvcmQnIGluIHJlcG9zaXRvcnk6CisgICAgICAgIGFy Z3MgKz0gWyctLW5vLWF1dGgtY2FjaGUnLCAnLS11c2VybmFtZScsIHJlcG9zaXRvcnlbJ3VzZXJu YW1lJ10sICctLXBhc3N3b3JkJywgcmVwb3NpdG9yeVsncGFzc3dvcmQnXV0KICAgICB0cnk6CiAg ICAgICAgIG91dHB1dCA9IHN1YnByb2Nlc3MuY2hlY2tfb3V0cHV0KGFyZ3MsIHN0ZGVycj1zdWJw cm9jZXNzLlNURE9VVCkKICAgICBleGNlcHQgc3VicHJvY2Vzcy5DYWxsZWRQcm9jZXNzRXJyb3Ig YXMgZXJyb3I6CkBAIC0xMDksNyArMTI0LDcgQEAgZGVmIGZldGNoX2NvbW1pdChyZXBvc2l0b3J5 X25hbWUsIHJlcG9zaQogICAgIGF1dGhvcl9hY2NvdW50ID0gdGV4dF9jb250ZW50KHhtbC5nZXRF bGVtZW50c0J5VGFnTmFtZSgiYXV0aG9yIilbMF0pCiAgICAgbWVzc2FnZSA9IHRleHRfY29udGVu dCh4bWwuZ2V0RWxlbWVudHNCeVRhZ05hbWUoIm1zZyIpWzBdKQogICAgIHJldHVybiB7Ci0gICAg ICAgICdyZXBvc2l0b3J5JzogcmVwb3NpdG9yeV9uYW1lLAorICAgICAgICAncmVwb3NpdG9yeSc6 IHJlcG9zaXRvcnlbJ25hbWUnXSwKICAgICAgICAgJ3JldmlzaW9uJzogcmV2aXNpb24sCiAgICAg ICAgICd0aW1lJzogdGltZSwKICAgICAgICAgJ2F1dGhvcic6IHsnYWNjb3VudCc6IGF1dGhvcl9h Y2NvdW50fSwKQEAgLTEyMSw3ICsxMzYsNyBAQCBuYW1lX2FjY291bnRfY29tcG91bmRfcmVnZXgg PSByZS5jb21waWxlCiAKIAogZGVmIHJlc29sdmVfYXV0aG9yX25hbWVfZnJvbV9hY2NvdW50KGhl bHBlciwgYWNjb3VudCk6Ci0gICAgb3V0cHV0ID0gc3VicHJvY2Vzcy5jaGVja19vdXRwdXQoaGVs cGVyICsgJyAnICsgYWNjb3VudCwgc2hlbGw9VHJ1ZSkKKyAgICBvdXRwdXQgPSBzdWJwcm9jZXNz LmNoZWNrX291dHB1dChoZWxwZXIgKyBbYWNjb3VudF0pCiAgICAgbWF0Y2ggPSBuYW1lX2FjY291 bnRfY29tcG91bmRfcmVnZXgubWF0Y2gob3V0cHV0KQogICAgIGlmIG1hdGNoOgogICAgICAgICBy ZXR1cm4gbWF0Y2guZ3JvdXAoJ25hbWUnKS5zdHJpcCgnIicpCg== 262732 2015-10-08 17:16:31 -0700 2015-10-08 17:43:33 -0700 Added an option to set --trust-server-cert bug-149941-20151008171600.patch text/plain 9123 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMTkwNzYwKQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQxIEBACisyMDE1LTEwLTA4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIHB1bGwtc3ZuLnB5IGZhaWxzIHRvIHN5bmMgcmV2aXNpb25zIHdoZW4gU1ZOIGNy ZWRlbnRpYWxzIGlzIG5vdCBzZXR1cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ5OTQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkZWQgdGhlIHN1cHBvcnQgZm9yIHNwZWNpZnlpbmcgc3VidmVyc2lv biBjcmVkZW50aWFscy4KKworICAgICAgICBBbHNvIGFkZGVkIHRoZSBzdXBwb3J0IGZvciBwdWxs aW5nIGZyb20gbXVsdGlwbGUgc3VidmVyc2lvbiBzZXJ2ZXJzLiBTdWJ2ZXJzaW9uIHNlcnZlcnMg YXJlIHNwZWNpZmllZAorICAgICAgICBpbiBhIEpTT04gY29uZmlndXJhdGlvbiBmaWxlIHNwZWNp ZmllZCBieSAtLXN2bi1jb25maWcgZm9ybWF0dGVkIGFzIGZvbGxvd3M6CisKKyAgICAgICAgWwor ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJuYW1lIjogIldlYktpdCIsCisgICAgICAg ICAgICAgICAgInVybCI6ICJodHRwOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQi LAorICAgICAgICAgICAgICAgICJ1c2VybmFtZSI6ICJ3ZWJraXR0ZW4iLAorICAgICAgICAgICAg ICAgICJwYXNzd29yZCI6ICJ3ZWJraXR0ZW4ncyBwYXNzd29yZCIsCisgICAgICAgICAgICAgICAg InRydXN0Q2VydGlmaWNhdGUiOiB0cnVlLAorICAgICAgICAgICAgICAgICJhY2NvdW50TmFtZUZp bmRlclNjcmlwdCI6CisgICAgICAgICAgICAgICAgICAgIFsicHl0aG9uIiwgIi9Wb2x1bWVzL0Rh dGEvV2ViS2l0L1Rvb2xzL1NjcmlwdHMvd2Via2l0LXBhdGNoIiwgImZpbmQtdXNlcnMiXQorICAg ICAgICAgICAgfSwKKyAgICAgICAgICAgIC4uLgorICAgICAgICBdCisKKyAgICAgICAgSW4gYWRk aXRpb24sIHJlZmFjdG9yZWQgaXQgdG8gdXNlIHRoZSBzaGFyZWQgc2VydmVyIGNvbmZpZyBKU09O IGZvciB0aGUgZGFzaGJvYXJkIGFjY2Vzcy4KKworICAgICAgICAqIHRvb2xzL3B1bGwtc3ZuLnB5 OgorICAgICAgICAobWFpbik6IE5vdyB0YWtlcyAtLXN2bi1jb25maWctanNvbiwgLS1zZXJ2ZXIt Y29uZmlnLWpzb24sIC0tc2Vjb25kcy10by1zbGVlcCBhbmQgLS1tYXgtZmV0Y2gtY291bnQKKyAg ICAgICAgYXMgcmVxdWlyZWQgb3B0aW9ucyBpbnN0ZWFkIG9mIHNldmVuIHVubmFtZWQgYXJndW1l bnRzLgorICAgICAgICAoZmV0Y2hfY29tbWl0c19hbmRfc3VibWl0KTogRXh0cmFjdGVkIGZyb20g bWFpbi4gRmV0Y2hlcyBhdCBtb3N0IG1heF9mZXRjaF9jb3VudCBuZXcgcmV2aXNpb25zIGZyb20K KyAgICAgICAgdGhlIHN1YnZlcnNpb24gc2VydmVyLCBhbmQgc3VibWl0cyB0aGVtIGluIGFjY29y ZGFuY2Ugd2l0aCBzZXJ2ZXJfY29uZmlnLgorICAgICAgICAoZmV0Y2hfY29tbWl0X2FuZF9yZXNv bHZlX2F1dGhvcik6IE5vdyB0YWtlcyBhIHNpbmdsZSByZXBvc2l0b3J5IGRpY3Rpb25hcnkgaW5z dGVhZCBvZiB0d28gc2VwYXJhdGUKKyAgICAgICAgYXJndW1lbnRzIGZvciBuYW1lIGFuZCBVUkwg dG8gcGFzcyBkb3duIHRoZSByZXBvc2l0b3J5J3MgYXV0aGVudGljYXRpb24gaW5mbyB0byBmZXRj aF9jb21taXQuCisgICAgICAgIChmZXRjaF9jb21taXQpOiBEaXR0by4gQWRkIGFwcHJvcHJpYXRl IGFyZ3VtZW50cyB3aGVuIHVzZXJuYW1lIGFuZCBwYXNzd29yZHMgYXJlIHNwZWNpZmllZC4KKyAg ICAgICAgKHJlc29sdmVfYXV0aG9yX25hbWVfZnJvbV9hY2NvdW50KTogVXNlIGEgbGlzdCBhcmd1 bWVudCBpbnN0ZWFkIG9mIGEgc2luZ2xlIHN0cmluZyBhcmd1bWVudCBub3cgdGhhdAorICAgICAg ICB0aGUgYXJndW1lbnQgY29tZXMgZnJvbSBhIEpTT04gaW5zdGVhZCBvZiBzeXMuYXJndi4KKwog MjAxNS0xMC0wNyAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBV bnJldmlld2VkIHJhY2UgY29uZGl0aW9uIGZpeC4gRXhpdCBlYXJseSB3aGVuIHhTY2FsZSBvciB5 U2NhbGUgaXMgbm90IGRlZmluZWQuCkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9v bHMvcHVsbC1zdm4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rv b2xzL3B1bGwtc3ZuLnB5CShyZXZpc2lvbiAxOTA3NjApCisrKyBXZWJzaXRlcy9wZXJmLndlYmtp dC5vcmcvdG9vbHMvcHVsbC1zdm4ucHkJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw2IEBACiAj IS91c3IvYmluL3B5dGhvbgogCitpbXBvcnQgYXJncGFyc2UKIGltcG9ydCBqc29uCiBpbXBvcnQg cmUKIGltcG9ydCBzdWJwcm9jZXNzCkBAIC04LDQ2ICs5LDU4IEBAIGltcG9ydCB0aW1lCiBpbXBv cnQgdXJsbGliMgogCiBmcm9tIHhtbC5kb20ubWluaWRvbSBpbXBvcnQgcGFyc2VTdHJpbmcgYXMg cGFyc2VYbWxTdHJpbmcKK2Zyb20gdXRpbCBpbXBvcnQgc2V0dXBfYXV0aAogZnJvbSB1dGlsIGlt cG9ydCBzdWJtaXRfY29tbWl0cwogZnJvbSB1dGlsIGltcG9ydCB0ZXh0X2NvbnRlbnQKIAogCiBk ZWYgbWFpbihhcmd2KToKLSAgICBpZiBsZW4oYXJndikgPCA3OgotICAgICAgICBzeXMuZXhpdCgn VXNhZ2U6IHB1bGwtc3ZuIDxyZXBvc2l0b3J5LW5hbWU+IDxyZXBvc2l0b3J5LVVSTD4gPGRhc2hi b2FyZC1VUkw+IDxzbGF2ZS1uYW1lPiA8c2xhdmUtcGFzc3dvcmQ+IDxzZWNvbmRzLXRvLXNsZWVw PiBbPGFjY291bnQtdG8tbmFtZS1oZWxwZXI+XScpCisgICAgcGFyc2VyID0gYXJncGFyc2UuQXJn dW1lbnRQYXJzZXIoKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy0tc3ZuLWNvbmZpZy1qc29u JywgcmVxdWlyZWQ9VHJ1ZSwgaGVscD0nVGhlIHBhdGggdG8gYSBKU09OIGZpbGUgdGhhdCBzcGVj aWZpZXMgc3VidmVyc2lvbiBzeW5jaW5nIG9wdGlvbnMnKQorICAgIHBhcnNlci5hZGRfYXJndW1l bnQoJy0tc2VydmVyLWNvbmZpZy1qc29uJywgcmVxdWlyZWQ9VHJ1ZSwgaGVscD0nVGhlIHBhdGgg dG8gYSBKU09OIGZpbGUgdGhhdCBzcGVjaWZpZXMgdGhlIHBlcmYgZGFzaGJvYXJkJykKKyAgICBw YXJzZXIuYWRkX2FyZ3VtZW50KCctLXNlY29uZHMtdG8tc2xlZXAnLCB0eXBlPWZsb2F0LCBkZWZh dWx0PTkwMCwgaGVscD0nVGhlIHNlY29uZHMgdG8gc2xlZXAgYmV0d2VlbiBpdGVyYXRpb25zJykK KyAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLW1heC1mZXRjaC1jb3VudCcsIHR5cGU9aW50LCBk ZWZhdWx0PTEwLCBoZWxwPSdUaGUgbnVtYmVyIG9mIGNvbW1pdHMgdG8gZmV0Y2ggYXQgb25jZScp CisgICAgYXJncyA9IHBhcnNlci5wYXJzZV9hcmdzKCkKKworICAgIHdpdGggb3BlbihhcmdzLnNl cnZlcl9jb25maWdfanNvbikgYXMgc2VydmVyX2NvbmZpZ19qc29uOgorICAgICAgICBzZXJ2ZXJf Y29uZmlnID0ganNvbi5sb2FkKHNlcnZlcl9jb25maWdfanNvbikKKyAgICAgICAgc2V0dXBfYXV0 aChzZXJ2ZXJfY29uZmlnWydzZXJ2ZXInXSkKIAotICAgIHJlcG9zaXRvcnlfbmFtZSA9IGFyZ3Zb MV0KLSAgICByZXBvc2l0b3J5X3VybCA9IGFyZ3ZbMl0KLSAgICBkYXNoYm9hcmRfdXJsID0gYXJn dlszXQotICAgIHNsYXZlX25hbWUgPSBhcmd2WzRdCi0gICAgc2xhdmVfcGFzc3dvcmQgPSBhcmd2 WzVdCi0gICAgc2Vjb25kc190b19zbGVlcCA9IGZsb2F0KGFyZ3ZbNl0pCi0gICAgYWNjb3VudF90 b19uYW1lX2hlbHBlciA9IGFyZ3ZbN10gaWYgbGVuKGFyZ3YpID4gNyBlbHNlIE5vbmUKLQotICAg IHByaW50ICJTdWJtaXR0aW5nIHJldmlzaW9uIGxvZ3MgZm9yICVzIGF0ICVzIHRvICVzIiAlIChy ZXBvc2l0b3J5X25hbWUsIHJlcG9zaXRvcnlfdXJsLCBkYXNoYm9hcmRfdXJsKQotCi0gICAgcmV2 aXNpb25fdG9fZmV0Y2ggPSBkZXRlcm1pbmVfZmlyc3RfcmV2aXNpb25fdG9fZmV0Y2goZGFzaGJv YXJkX3VybCwgcmVwb3NpdG9yeV9uYW1lKQotICAgIHByaW50ICJTdGFydCBmZXRjaGluZyBjb21t aXRzIGF0IHIlZCIgJSByZXZpc2lvbl90b19mZXRjaAotCi0gICAgcGVuZGluZ19jb21taXRzX3Rv X3NlbmQgPSBbXQorICAgIHdpdGggb3BlbihhcmdzLnN2bl9jb25maWdfanNvbikgYXMgc3ZuX2Nv bmZpZ19qc29uOgorICAgICAgICBzdm5fY29uZmlnID0ganNvbi5sb2FkKHN2bl9jb25maWdfanNv bikKIAogICAgIHdoaWxlIFRydWU6Ci0gICAgICAgIGNvbW1pdCA9IGZldGNoX2NvbW1pdF9hbmRf cmVzb2x2ZV9hdXRob3IocmVwb3NpdG9yeV9uYW1lLCByZXBvc2l0b3J5X3VybCwgYWNjb3VudF90 b19uYW1lX2hlbHBlciwgcmV2aXNpb25fdG9fZmV0Y2gpCi0KLSAgICAgICAgaWYgY29tbWl0Ogot ICAgICAgICAgICAgcHJpbnQgIkZldGNoZWQgciVkLiIgJSByZXZpc2lvbl90b19mZXRjaAotICAg ICAgICAgICAgcGVuZGluZ19jb21taXRzX3RvX3NlbmQgKz0gW2NvbW1pdF0KLSAgICAgICAgICAg IHJldmlzaW9uX3RvX2ZldGNoICs9IDEKLSAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHByaW50 ICJSZXZpc2lvbiAlZCBub3QgZm91bmQiICUgcmV2aXNpb25fdG9fZmV0Y2gKLQotICAgICAgICBp ZiBub3QgY29tbWl0IG9yIGxlbihwZW5kaW5nX2NvbW1pdHNfdG9fc2VuZCkgPj0gMTA6Ci0gICAg ICAgICAgICBpZiBwZW5kaW5nX2NvbW1pdHNfdG9fc2VuZDoKLSAgICAgICAgICAgICAgICBwcmlu dCAiU3VibWl0dGluZyB0aGUgYWJvdmUgY29tbWl0cyB0byAlcy4uLiIgJSBkYXNoYm9hcmRfdXJs Ci0gICAgICAgICAgICAgICAgc3VibWl0X2NvbW1pdHMocGVuZGluZ19jb21taXRzX3RvX3NlbmQs IGRhc2hib2FyZF91cmwsIHNsYXZlX25hbWUsIHNsYXZlX3Bhc3N3b3JkKQotICAgICAgICAgICAg ICAgIHByaW50ICJTdWNjZXNzZnVsbHkgc3VibWl0dGVkLiIKLSAgICAgICAgICAgIHBlbmRpbmdf Y29tbWl0c190b19zZW5kID0gW10KLSAgICAgICAgICAgIHRpbWUuc2xlZXAoc2Vjb25kc190b19z bGVlcCkKKyAgICAgICAgZm9yIHJlcG9zaXRvcnlfaW5mbyBpbiBzdm5fY29uZmlnOgorICAgICAg ICAgICAgZmV0Y2hfY29tbWl0c19hbmRfc3VibWl0KHJlcG9zaXRvcnlfaW5mbywgc2VydmVyX2Nv bmZpZywgYXJncy5tYXhfZmV0Y2hfY291bnQpCisgICAgICAgIHByaW50ICJTbGVlcGluZyBmb3Ig JWQgc2Vjb25kcy4uLiIgJSBhcmdzLnNlY29uZHNfdG9fc2xlZXAKKyAgICAgICAgdGltZS5zbGVl cChhcmdzLnNlY29uZHNfdG9fc2xlZXApCisKKworZGVmIGZldGNoX2NvbW1pdHNfYW5kX3N1Ym1p dChyZXBvc2l0b3J5LCBzZXJ2ZXJfY29uZmlnLCBtYXhfZmV0Y2hfY291bnQpOgorICAgIGFzc2Vy dCAnbmFtZScgaW4gcmVwb3NpdG9yeSwgJ1RoZSByZXBvc2l0b3J5IG5hbWUgc2hvdWxkIGJlIHNw ZWNpZmllZCcKKyAgICBhc3NlcnQgJ3VybCcgaW4gcmVwb3NpdG9yeSwgJ1RoZSBTVk4gcmVwb3Np dG9yeSBVUkwgc2hvdWxkIGJlIHNwZWNpZmllZCcKKworICAgIGlmICdyZXZpc2lvblRvRmVjdGgn IG5vdCBpbiByZXBvc2l0b3J5OgorICAgICAgICBwcmludCAiRGV0ZXJtaW5pbmcgdGhlIHN0YXRp bmcgcmV2aXNpb24gZm9yICVzIiAlIHJlcG9zaXRvcnlbJ25hbWUnXQorICAgICAgICByZXBvc2l0 b3J5WydyZXZpc2lvblRvRmVjdGgnXSA9IGRldGVybWluZV9maXJzdF9yZXZpc2lvbl90b19mZXRj aChzZXJ2ZXJfY29uZmlnWydzZXJ2ZXInXVsndXJsJ10sIHJlcG9zaXRvcnlbJ25hbWUnXSkKKwor ICAgIHBlbmRpbmdfY29tbWl0cyA9IFtdCisgICAgZm9yIHVudXNlZCBpbiByYW5nZShtYXhfZmV0 Y2hfY291bnQpOgorICAgICAgICBjb21taXQgPSBmZXRjaF9jb21taXRfYW5kX3Jlc29sdmVfYXV0 aG9yKHJlcG9zaXRvcnksIHJlcG9zaXRvcnkuZ2V0KCdhY2NvdW50TmFtZUZpbmRlclNjcmlwdCcs IE5vbmUpLCByZXBvc2l0b3J5WydyZXZpc2lvblRvRmVjdGgnXSkKKyAgICAgICAgaWYgbm90IGNv bW1pdDoKKyAgICAgICAgICAgIGJyZWFrCisgICAgICAgIHBlbmRpbmdfY29tbWl0cyArPSBbY29t bWl0XQorICAgICAgICByZXBvc2l0b3J5WydyZXZpc2lvblRvRmVjdGgnXSArPSAxCisKKyAgICBp ZiBub3QgcGVuZGluZ19jb21taXRzOgorICAgICAgICBwcmludCAiTm8gbmV3IHJldmlzaW9uIGZv dW5kIGZvciAlcyAod2FpdGluZyBmb3IgciVkKSIgJSAocmVwb3NpdG9yeVsnbmFtZSddLCByZXBv c2l0b3J5WydyZXZpc2lvblRvRmVjdGgnXSkKKyAgICAgICAgcmV0dXJuCisKKyAgICByZXZpc2lv bl9saXN0ID0gJ3InICsgJywgcicuam9pbihtYXAobGFtYmRhIGNvbW1pdDogc3RyKGNvbW1pdFsn cmV2aXNpb24nXSksIHBlbmRpbmdfY29tbWl0cykpCisgICAgcHJpbnQgIlN1Ym1pdHRpbmcgcmV2 aXNpb25zICVzIGZvciAlcyB0byAlcyIgJSAocmV2aXNpb25fbGlzdCwgcmVwb3NpdG9yeVsnbmFt ZSddLCBzZXJ2ZXJfY29uZmlnWydzZXJ2ZXInXVsndXJsJ10pCisgICAgc3VibWl0X2NvbW1pdHMo cGVuZGluZ19jb21taXRzLCBzZXJ2ZXJfY29uZmlnWydzZXJ2ZXInXVsndXJsJ10sIHNlcnZlcl9j b25maWdbJ3NsYXZlJ11bJ25hbWUnXSwgc2VydmVyX2NvbmZpZ1snc2xhdmUnXVsncGFzc3dvcmQn XSkKKyAgICBwcmludCAiU3VjY2Vzc2Z1bGx5IHN1Ym1pdHRlZC4iCisgICAgcHJpbnQKIAogCiBk ZWYgZGV0ZXJtaW5lX2ZpcnN0X3JldmlzaW9uX3RvX2ZldGNoKGRhc2hib2FyZF91cmwsIHJlcG9z aXRvcnlfbmFtZSk6CkBAIC03Niw5ICs4OSw5IEBAIGRlZiBmZXRjaF9yZXZpc2lvbl9mcm9tX2Rh c2Job2FyZChkYXNoYm8KICAgICByZXR1cm4gaW50KGNvbW1pdHNbMF1bJ3JldmlzaW9uJ10pIGlm IGNvbW1pdHMgZWxzZSBOb25lCiAKIAotZGVmIGZldGNoX2NvbW1pdF9hbmRfcmVzb2x2ZV9hdXRo b3IocmVwb3NpdG9yeV9uYW1lLCByZXBvc2l0b3J5X3VybCwgYWNjb3VudF90b19uYW1lX2hlbHBl ciwgcmV2aXNpb25fdG9fZmV0Y2gpOgorZGVmIGZldGNoX2NvbW1pdF9hbmRfcmVzb2x2ZV9hdXRo b3IocmVwb3NpdG9yeSwgYWNjb3VudF90b19uYW1lX2hlbHBlciwgcmV2aXNpb25fdG9fZmV0Y2gp OgogICAgIHRyeToKLSAgICAgICAgY29tbWl0ID0gZmV0Y2hfY29tbWl0KHJlcG9zaXRvcnlfbmFt ZSwgcmVwb3NpdG9yeV91cmwsIHJldmlzaW9uX3RvX2ZldGNoKQorICAgICAgICBjb21taXQgPSBm ZXRjaF9jb21taXQocmVwb3NpdG9yeSwgcmV2aXNpb25fdG9fZmV0Y2gpCiAgICAgZXhjZXB0IEV4 Y2VwdGlvbiBhcyBlcnJvcjoKICAgICAgICAgc3lzLmV4aXQoJ0ZhaWxlZCB0byBmZXRjaCB0aGUg Y29tbWl0ICVkOiAlcycgJSAocmV2aXNpb25fdG9fZmV0Y2gsIHN0cihlcnJvcikpKQogCkBAIC05 Niw4ICsxMDksMTMgQEAgZGVmIGZldGNoX2NvbW1pdF9hbmRfcmVzb2x2ZV9hdXRob3IocmVwbwog ICAgIHJldHVybiBjb21taXQKIAogCi1kZWYgZmV0Y2hfY29tbWl0KHJlcG9zaXRvcnlfbmFtZSwg cmVwb3NpdG9yeV91cmwsIHJldmlzaW9uKToKLSAgICBhcmdzID0gWydzdm4nLCAnbG9nJywgJy0t cmV2aXNpb24nLCBzdHIocmV2aXNpb24pLCAnLS14bWwnLCByZXBvc2l0b3J5X3VybF0KK2RlZiBm ZXRjaF9jb21taXQocmVwb3NpdG9yeSwgcmV2aXNpb24pOgorICAgIGFyZ3MgPSBbJ3N2bicsICds b2cnLCAnLS1yZXZpc2lvbicsIHN0cihyZXZpc2lvbiksICctLXhtbCcsIHJlcG9zaXRvcnlbJ3Vy bCddLCAnLS1ub24taW50ZXJhY3RpdmUnXQorICAgIGlmICd1c2VybmFtZScgaW4gcmVwb3NpdG9y eSBhbmQgJ3Bhc3N3b3JkJyBpbiByZXBvc2l0b3J5OgorICAgICAgICBhcmdzICs9IFsnLS1uby1h dXRoLWNhY2hlJywgJy0tdXNlcm5hbWUnLCByZXBvc2l0b3J5Wyd1c2VybmFtZSddLCAnLS1wYXNz d29yZCcsIHJlcG9zaXRvcnlbJ3Bhc3N3b3JkJ11dCisgICAgaWYgcmVwb3NpdG9yeS5nZXQoJ3Ry dXN0Q2VydGlmaWNhdGUnLCBGYWxzZSk6CisgICAgICAgIGFyZ3MgKz0gWyctLXRydXN0LXNlcnZl ci1jZXJ0J10KKwogICAgIHRyeToKICAgICAgICAgb3V0cHV0ID0gc3VicHJvY2Vzcy5jaGVja19v dXRwdXQoYXJncywgc3RkZXJyPXN1YnByb2Nlc3MuU1RET1VUKQogICAgIGV4Y2VwdCBzdWJwcm9j ZXNzLkNhbGxlZFByb2Nlc3NFcnJvciBhcyBlcnJvcjoKQEAgLTEwOSw3ICsxMjcsNyBAQCBkZWYg ZmV0Y2hfY29tbWl0KHJlcG9zaXRvcnlfbmFtZSwgcmVwb3NpCiAgICAgYXV0aG9yX2FjY291bnQg PSB0ZXh0X2NvbnRlbnQoeG1sLmdldEVsZW1lbnRzQnlUYWdOYW1lKCJhdXRob3IiKVswXSkKICAg ICBtZXNzYWdlID0gdGV4dF9jb250ZW50KHhtbC5nZXRFbGVtZW50c0J5VGFnTmFtZSgibXNnIilb MF0pCiAgICAgcmV0dXJuIHsKLSAgICAgICAgJ3JlcG9zaXRvcnknOiByZXBvc2l0b3J5X25hbWUs CisgICAgICAgICdyZXBvc2l0b3J5JzogcmVwb3NpdG9yeVsnbmFtZSddLAogICAgICAgICAncmV2 aXNpb24nOiByZXZpc2lvbiwKICAgICAgICAgJ3RpbWUnOiB0aW1lLAogICAgICAgICAnYXV0aG9y JzogeydhY2NvdW50JzogYXV0aG9yX2FjY291bnR9LApAQCAtMTIxLDcgKzEzOSw3IEBAIG5hbWVf YWNjb3VudF9jb21wb3VuZF9yZWdleCA9IHJlLmNvbXBpbGUKIAogCiBkZWYgcmVzb2x2ZV9hdXRo b3JfbmFtZV9mcm9tX2FjY291bnQoaGVscGVyLCBhY2NvdW50KToKLSAgICBvdXRwdXQgPSBzdWJw cm9jZXNzLmNoZWNrX291dHB1dChoZWxwZXIgKyAnICcgKyBhY2NvdW50LCBzaGVsbD1UcnVlKQor ICAgIG91dHB1dCA9IHN1YnByb2Nlc3MuY2hlY2tfb3V0cHV0KGhlbHBlciArIFthY2NvdW50XSkK ICAgICBtYXRjaCA9IG5hbWVfYWNjb3VudF9jb21wb3VuZF9yZWdleC5tYXRjaChvdXRwdXQpCiAg ICAgaWYgbWF0Y2g6CiAgICAgICAgIHJldHVybiBtYXRjaC5ncm91cCgnbmFtZScpLnN0cmlwKCci JykK