217521 2020-10-09 10:39:36 -0700 [webkitscmpy] Handle svn info run from directory 2020-10-09 15:24:35 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=215862 InRadar P2 Normal --- 1 jbedard jbedard dewei_zhu webkit-bug-importer oldest_to_newest 1696263 0 jbedard 2020-10-09 10:39:36 -0700 svn info will return the last revision changes for a specific directory. This is a tab problematic when trying to use `svn info` from the Tools/Scripts directory, which is a pretty common practice. 1696264 1 webkit-bug-importer 2020-10-09 10:40:07 -0700 <rdar://problem/70144173> 1696270 2 410951 jbedard 2020-10-09 11:01:27 -0700 Created attachment 410951 Patch 1696367 3 dewei_zhu 2020-10-09 14:29:16 -0700 r=me 1696370 4 410977 jbedard 2020-10-09 14:45:05 -0700 Created attachment 410977 Patch for landing 1696378 5 ews-feeder 2020-10-09 15:24:35 -0700 Committed r268293: <https://trac.webkit.org/changeset/268293> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410977. 410951 2020-10-09 11:01:27 -0700 2020-10-09 14:45:03 -0700 Patch bug-217521-20201009110126.patch text/plain 6487 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODI2OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDIwLTEwLTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEhhbmRsZSBzdm4gaW5mbyBydW4gZnJvbSBkaXJl Y3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx NzUyMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzAxNDQxNzM+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHk6CisgICAgICAgIChTdm4uX19pbml0X18p OiBTZXQgdGhlIHJvb3RfcGF0aCwgc28gdGhhdCBzdm4gaW5mbyBpcyBydW4gZnJvbSB0aGUgdG9w IGxldmVsLgorICAgICAgICAoU3ZuLmluZm8pOiBSZWx5IG9uIHJvb3RfcGF0aCwgbm90IHBhdGgu CisgICAgICAgIChTdm4ucm9vdF9wYXRoKTogVXNlIHNlbGYuX3Jvb3RfcGF0aCBpbnN0ZWFkIG9m IHNlbGYuaW5mbygpIGNhbGwuCisgICAgICAgIChTdm4ubGlzdCk6IFJlbHkgb24gcm9vdF9wYXRo LCBub3QgcGF0aC4KKyAgICAgICAgKFN2bi5fY2FjaGVfcmV2aXNpb25zKTogIERpdHRvLgorICAg ICAgICAoU3ZuLnJlbW90ZSk6IFRoZSByZXBvc2l0b3J5IHJvb3Qgd2lsbCBub3QgY2hhbmdlIGR1 cmluZyBhIHNpbmdsZSBjb21tYW5kIGludm9jYXRpb24uCisgICAgICAgIChTdm4uX2JyYW5jaF9m b3IpOiBIYW5kbGUgaW5pdGlhbCBicmFuY2ggY29tbWl0cywgd2hpY2guIG1heSBoYXZlIG5vbi1z dGFuZGFyZCBjaGFuZ2UgbGlzdHMuCisgICAgICAgIChTdm4uY29tbWl0KTogUmVseSBvbiByb290 X3BhdGgsIG5vdCBwYXRoLCBjZXJ0YWluIHN2biBpbmZvIGNhbGxzIHdpbGwgbm90IGNoYW5nZSBk dXJpbmcKKyAgICAgICAgdGhlIGludm9jYXRpb24gb2YgYSBzaW5nbGUgcHJvZ3JhbS4KKwogMjAy MC0xMC0wOSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAg ICAgICBQcm9tb3RlIFdLV2ViVmlldyBtZWRpYSBwbGF5YmFjayBTUEkgdG8gQVBJCkluZGV4OiBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4u cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvbG9jYWwvc3ZuLnB5CShyZXZpc2lvbiAyNjgyNjcpCisrKyBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHkJKHdvcmtpbmcg Y29weSkKQEAgLTQ3LDYgKzQ3LDEwIEBAIGNsYXNzIFN2bihTY20pOgogCiAgICAgZGVmIF9faW5p dF9fKHNlbGYsIHBhdGgsIGRldl9icmFuY2hlcz1Ob25lLCBwcm9kX2JyYW5jaGVzPU5vbmUpOgog ICAgICAgICBzdXBlcihTdm4sIHNlbGYpLl9faW5pdF9fKHBhdGgsIGRldl9icmFuY2hlcz1kZXZf YnJhbmNoZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9icmFuY2hlcykKKworICAgICAgICBzZWxmLl9y b290X3BhdGggPSBzZWxmLnBhdGgKKyAgICAgICAgc2VsZi5fcm9vdF9wYXRoID0gc2VsZi5pbmZv KGNhY2hlZD1GYWxzZSkuZ2V0KCdXb3JraW5nIENvcHkgUm9vdCBQYXRoJykKKwogICAgICAgICBp ZiBub3Qgc2VsZi5yb290X3BhdGg6CiAgICAgICAgICAgICByYWlzZSBPU0Vycm9yKCdQcm92aWRl ZCBwYXRoIHt9IGlzIG5vdCBhIHN2biByZXBvc2l0b3J5Jy5mb3JtYXQocGF0aCkpCiAKQEAgLTY2 LDcgKzcwLDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgIGFkZGl0aW9uYWxfYXJncyA9IFsn Xi9icmFuY2hlcy97fScuZm9ybWF0KGJyYW5jaCldIGlmIGJyYW5jaCBhbmQgYnJhbmNoICE9IHNl bGYuZGVmYXVsdF9icmFuY2ggZWxzZSBbXQogICAgICAgICBhZGRpdGlvbmFsX2FyZ3MgKz0gWyct cicsIHN0cihyZXZpc2lvbildIGlmIHJldmlzaW9uIGVsc2UgW10KIAotICAgICAgICBpbmZvX3Jl c3VsdCA9IHJ1bihbc2VsZi5leGVjdXRhYmxlLCAnaW5mbyddICsgYWRkaXRpb25hbF9hcmdzLCBj d2Q9c2VsZi5wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKQorICAg ICAgICBpbmZvX3Jlc3VsdCA9IHJ1bihbc2VsZi5leGVjdXRhYmxlLCAnaW5mbyddICsgYWRkaXRp b25hbF9hcmdzLCBjd2Q9c2VsZi5yb290X3BhdGgsIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29k aW5nPSd1dGYtOCcpCiAgICAgICAgIGlmIGluZm9fcmVzdWx0LnJldHVybmNvZGU6CiAgICAgICAg ICAgICByZXR1cm4ge30KIApAQCAtODIsNyArODYsNyBAQCBjbGFzcyBTdm4oU2NtKToKIAogICAg IEBwcm9wZXJ0eQogICAgIGRlZiByb290X3BhdGgoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxm LmluZm8oY2FjaGVkPVRydWUpLmdldCgnV29ya2luZyBDb3B5IFJvb3QgUGF0aCcpCisgICAgICAg IHJldHVybiBzZWxmLl9yb290X3BhdGgKIAogICAgIEBwcm9wZXJ0eQogICAgIGRlZiBkZWZhdWx0 X2JyYW5jaChzZWxmKToKQEAgLTk2LDcgKzEwMCw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAg ICByZXR1cm4gc2VsZi5pbmZvKClbJ1JlbGF0aXZlIFVSTCddWzI6XQogCiAgICAgZGVmIGxpc3Qo c2VsZiwgY2F0ZWdvcnkpOgotICAgICAgICBsaXN0X3Jlc3VsdCA9IHJ1bihbc2VsZi5leGVjdXRh YmxlLCAnbGlzdCcsICdeL3t9Jy5mb3JtYXQoY2F0ZWdvcnkpXSwgY3dkPXNlbGYucGF0aCwgY2Fw dHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04JykKKyAgICAgICAgbGlzdF9yZXN1bHQg PSBydW4oW3NlbGYuZXhlY3V0YWJsZSwgJ2xpc3QnLCAnXi97fScuZm9ybWF0KGNhdGVnb3J5KV0s IGN3ZD1zZWxmLnJvb3RfcGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04 JykKICAgICAgICAgaWYgbGlzdF9yZXN1bHQucmV0dXJuY29kZToKICAgICAgICAgICAgIHJldHVy biBbXQogICAgICAgICByZXR1cm4gW2VsZW1lbnQucnN0cmlwKCcvJykgZm9yIGVsZW1lbnQgaW4g bGlzdF9yZXN1bHQuc3Rkb3V0LnNwbGl0bGluZXMoKV0KQEAgLTEzOCw3ICsxNDIsNyBAQCBjbGFz cyBTdm4oU2NtKToKIAogICAgICAgICAgICAgbG9nID0gc3VicHJvY2Vzcy5Qb3BlbigKICAgICAg ICAgICAgICAgICBbc2VsZi5leGVjdXRhYmxlLCAnbG9nJywgJy1xJywgYnJhbmNoX2FyZ10sCi0g ICAgICAgICAgICAgICAgY3dkPXNlbGYucGF0aCwKKyAgICAgICAgICAgICAgICBjd2Q9c2VsZi5y b290X3BhdGgsCiAgICAgICAgICAgICAgICAgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwKICAgICAg ICAgICAgICAgICBzdGRlcnI9c3VicHJvY2Vzcy5QSVBFLAogICAgICAgICAgICAgICAgICoqa3dh cmdzCkBAIC0xOTIsNyArMTk2LDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgIHJldHVybiBz ZWxmLl9jb21taXRfY291bnQocmV2aXNpb249c2VsZi5fbWV0YWRhdGFfY2FjaGVbYnJhbmNoXVsw XSwgYnJhbmNoPXNlbGYuZGVmYXVsdF9icmFuY2gpCiAKICAgICBkZWYgcmVtb3RlKHNlbGYsIG5h bWU9Tm9uZSk6Ci0gICAgICAgIHJldHVybiBzZWxmLmluZm8oKVsnUmVwb3NpdG9yeSBSb290J10K KyAgICAgICAgcmV0dXJuIHNlbGYuaW5mbyhjYWNoZWQ9VHJ1ZSlbJ1JlcG9zaXRvcnkgUm9vdCdd CiAKICAgICBkZWYgX2JyYW5jaF9mb3Ioc2VsZiwgcmV2aXNpb24pOgogICAgICAgICBjYW5kaWRh dGVzID0gW2JyYW5jaCBmb3IgYnJhbmNoLCByZXZpc2lvbnMgaW4gc2VsZi5fbWV0YWRhdGFfY2Fj aGUuaXRlbXMoKSBpZiBicmFuY2ggIT0gJ3ZlcnNpb24nIGFuZCByZXZpc2lvbiBpbiByZXZpc2lv bnNdCkBAIC0yMDQsNyArMjA4LDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAKICAgICAgICAgcHJvY2Vz cyA9IHJ1bigKICAgICAgICAgICAgIFtzZWxmLmV4ZWN1dGFibGUsICdsb2cnLCAnLXYnLCAnLXEn LCBzZWxmLnJlbW90ZSgpLCAnLXInLCBzdHIocmV2aXNpb24pLCAnLWwnLCAnMSddLAotICAgICAg ICAgICAgY3dkPXNlbGYucGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04 JywKKyAgICAgICAgICAgIGN3ZD1zZWxmLnJvb3RfcGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwg ZW5jb2Rpbmc9J3V0Zi04JywKICAgICAgICAgKQogCiAgICAgICAgICMgSWYgd2UgZGlkbid0IGdl dCBhIHZhbGlkIGFuc3dlciBmcm9tIHRoZSByZW1vdGUsIGJ1dCB3ZSBmb3VuZCBhIG1hdGNoaW5n IGNhbmRpZGF0ZSwgd2UgcmV0dXJuIHRoYXQuCkBAIC0yMjksNyArMjMzLDcgQEAgY2xhc3MgU3Zu KFNjbSk6CiAKICAgICAgICAgaWYgbGVuKHBhcnRpYWwpIDw9IDM6CiAgICAgICAgICAgICByYWlz ZSBzZWxmLkV4Y2VwdGlvbignTWFsZm9ybWVkIHNldCAgb2YgZWRpdGVkIGZpbGVzJykKLSAgICAg ICAgcGFydGlhbCA9IHBhcnRpYWxbMjpdCisgICAgICAgIHBhcnRpYWwgPSBwYXJ0aWFsWzI6XS5z cGxpdCgnICcpWzBdCiAgICAgICAgIHJldHVybiBwYXJ0aWFsLnNwbGl0KCcvJylbMiBpZiBwYXJ0 aWFsLnN0YXJ0c3dpdGgoJy9icmFuY2hlcycpIGVsc2UgMV0KIAogICAgIGRlZiBjb21taXQoc2Vs ZiwgaGFzaD1Ob25lLCByZXZpc2lvbj1Ob25lLCBpZGVudGlmaWVyPU5vbmUsIGJyYW5jaD1Ob25l KToKQEAgLTI3Miw3ICsyNzYsNyBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAgICAgICAgICAgICBi cmFuY2ggPSBzZWxmLmRlZmF1bHRfYnJhbmNoCiAKICAgICAgICAgICAgIHJldmlzaW9uID0gc2Vs Zi5fbWV0YWRhdGFfY2FjaGVbYnJhbmNoXVtpZGVudGlmaWVyXQotICAgICAgICAgICAgaW5mbyA9 IHNlbGYuaW5mbyhicmFuY2g9YnJhbmNoLCByZXZpc2lvbj1yZXZpc2lvbikKKyAgICAgICAgICAg IGluZm8gPSBzZWxmLmluZm8oY2FjaGVkPVRydWUsIGJyYW5jaD1icmFuY2gsIHJldmlzaW9uPXJl dmlzaW9uKQogICAgICAgICAgICAgYnJhbmNoID0gc2VsZi5fYnJhbmNoX2ZvcihyZXZpc2lvbikK IAogICAgICAgICBlbGlmIHJldmlzaW9uOgpAQCAtMjgwLDcgKzI4NCw3IEBAIGNsYXNzIFN2bihT Y20pOgogICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoJ0Nhbm5vdCBkZWZpbmUgYm90 aCBicmFuY2ggYW5kIHJldmlzaW9uJykKICAgICAgICAgICAgIHJldmlzaW9uID0gQ29tbWl0Ll9w YXJzZV9yZXZpc2lvbihyZXZpc2lvbiwgZG9fYXNzZXJ0PVRydWUpCiAgICAgICAgICAgICBicmFu Y2ggPSBzZWxmLl9icmFuY2hfZm9yKHJldmlzaW9uKQotICAgICAgICAgICAgaW5mbyA9IHNlbGYu aW5mbyhicmFuY2g9YnJhbmNoLCByZXZpc2lvbj1yZXZpc2lvbikKKyAgICAgICAgICAgIGluZm8g PSBzZWxmLmluZm8oY2FjaGVkPVRydWUsIGJyYW5jaD1icmFuY2gsIHJldmlzaW9uPXJldmlzaW9u KQogCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBicmFuY2ggPSBicmFuY2ggb3Igc2VsZi5i cmFuY2gKQEAgLTMxOCw3ICszMjIsNyBAQCBjbGFzcyBTdm4oU2NtKToKIAogICAgICAgICBicmFu Y2hfYXJnID0gJ14ve317fScuZm9ybWF0KCcnIGlmIGJyYW5jaCA9PSBzZWxmLmRlZmF1bHRfYnJh bmNoIGVsc2UgJ2JyYW5jaGVzLycsIGJyYW5jaCkKICAgICAgICAgbG9nID0gcnVuKAotICAgICAg ICAgICAgW3NlbGYuZXhlY3V0YWJsZSwgJ2xvZycsICctbCcsICcxJywgJy1yJywgc3RyKHJldmlz aW9uKSwgYnJhbmNoX2FyZ10sIGN3ZD1zZWxmLnBhdGgsCisgICAgICAgICAgICBbc2VsZi5leGVj dXRhYmxlLCAnbG9nJywgJy1sJywgJzEnLCAnLXInLCBzdHIocmV2aXNpb24pLCBicmFuY2hfYXJn XSwgY3dkPXNlbGYucm9vdF9wYXRoLAogICAgICAgICAgICAgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwg ZW5jb2Rpbmc9J3V0Zi04JywKICAgICAgICAgKQogICAgICAgICBzcGxpdF9sb2cgPSBsb2cuc3Rk b3V0LnNwbGl0bGluZXMoKQpAQCAtMzMwLDcgKzMzNCw3IEBAIGNsYXNzIFN2bihTY20pOgogICAg ICAgICAgICAgICAgICAgICBicmVhawogCiAgICAgICAgICAgICBhdXRob3IgPSBDb250cmlidXRv ci5mcm9tX3NjbV9sb2coYXV0aG9yX2xpbmUpCi0gICAgICAgICAgICBtZXNzYWdlID0gJ1xuJy5q b2luKHNwbGl0X2xvZ1szOl0pCisgICAgICAgICAgICBtZXNzYWdlID0gJ1xuJy5qb2luKHNwbGl0 X2xvZ1szOi0xXSkKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNlbGYubG9nKCdGYWlsZWQg dG8gY29ubmVjdCB0byByZW1vdGUsIGNhbm5vdCBjb21wdXRlIGNvbW1pdCBtZXNzYWdlJykKICAg ICAgICAgICAgIGVtYWlsID0gaW5mb1snTGFzdCBDaGFuZ2VkIEF1dGhvciddCg== 410977 2020-10-09 14:45:05 -0700 2020-10-09 15:24:35 -0700 Patch for landing bug-217521-20201009144504.patch text/plain 7173 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODI4OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDIwLTEwLTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEhhbmRsZSBzdm4gaW5mbyBydW4gZnJvbSBkaXJl Y3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx NzUyMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzAxNDQxNzM+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgRGV3ZWkgWmh1LgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHk6CisgICAg ICAgIChTdm4uX19pbml0X18pOiBTZXQgdGhlIHJvb3RfcGF0aCwgc28gdGhhdCBzdm4gaW5mbyBp cyBydW4gZnJvbSB0aGUgdG9wIGxldmVsLgorICAgICAgICAoU3ZuLmluZm8pOiBSZWx5IG9uIHJv b3RfcGF0aCwgbm90IHBhdGguCisgICAgICAgIChTdm4ucm9vdF9wYXRoKTogVXNlIHNlbGYuX3Jv b3RfcGF0aCBpbnN0ZWFkIG9mIHNlbGYuaW5mbygpIGNhbGwuCisgICAgICAgIChTdm4ubGlzdCk6 IFJlbHkgb24gcm9vdF9wYXRoLCBub3QgcGF0aC4KKyAgICAgICAgKFN2bi5fY2FjaGVfcmV2aXNp b25zKTogIERpdHRvLgorICAgICAgICAoU3ZuLnJlbW90ZSk6IFRoZSByZXBvc2l0b3J5IHJvb3Qg d2lsbCBub3QgY2hhbmdlIGR1cmluZyBhIHNpbmdsZSBjb21tYW5kIGludm9jYXRpb24uCisgICAg ICAgIChTdm4uX2JyYW5jaF9mb3IpOiBIYW5kbGUgaW5pdGlhbCBicmFuY2ggY29tbWl0cywgd2hp Y2guIG1heSBoYXZlIG5vbi1zdGFuZGFyZCBjaGFuZ2UgbGlzdHMuCisgICAgICAgIChTdm4uY29t bWl0KTogUmVseSBvbiByb290X3BhdGgsIG5vdCBwYXRoLCBjZXJ0YWluIHN2biBpbmZvIGNhbGxz IHdpbGwgbm90IGNoYW5nZSBkdXJpbmcKKyAgICAgICAgdGhlIGludm9jYXRpb24gb2YgYSBzaW5n bGUgcHJvZ3JhbS4KKwogMjAyMC0xMC0wOSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl bkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT046IFtNYWMgUmVsZWFzZV0gMiBDb29r aWUgQVBJIGFyZSBmYWlsaW5nCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQkocmV2aXNpb24g MjY4Mjg5KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IElt cG9ydEVycm9yOgogICAgICAgICAiUGxlYXNlIGluc3RhbGwgd2Via2l0Y29yZXB5IHdpdGggYHBp cCBpbnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWluZGV4LXVybCA8cGFja2FnZSBpbmRleCBV Ukw+YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDEsIDEpCit2ZXJzaW9uID0gVmVy c2lvbigwLCAxLCAyKQogCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdkYXRldXRpbCcs IFZlcnNpb24oMiwgOCwgMSksIHB5cGlfbmFtZT0ncHl0aG9uLWRhdGV1dGlsJykpCiAKSW5kZXg6 IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2 bi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9sb2NhbC9zdm4ucHkJKHJldmlzaW9uIDI2ODI4OSkKKysrIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQkod29ya2lu ZyBjb3B5KQpAQCAtNDcsNiArNDcsMTAgQEAgY2xhc3MgU3ZuKFNjbSk6CiAKICAgICBkZWYgX19p bml0X18oc2VsZiwgcGF0aCwgZGV2X2JyYW5jaGVzPU5vbmUsIHByb2RfYnJhbmNoZXM9Tm9uZSk6 CiAgICAgICAgIHN1cGVyKFN2biwgc2VsZikuX19pbml0X18ocGF0aCwgZGV2X2JyYW5jaGVzPWRl dl9icmFuY2hlcywgcHJvZF9icmFuY2hlcz1wcm9kX2JyYW5jaGVzKQorCisgICAgICAgIHNlbGYu X3Jvb3RfcGF0aCA9IHNlbGYucGF0aAorICAgICAgICBzZWxmLl9yb290X3BhdGggPSBzZWxmLmlu Zm8oY2FjaGVkPUZhbHNlKS5nZXQoJ1dvcmtpbmcgQ29weSBSb290IFBhdGgnKQorCiAgICAgICAg IGlmIG5vdCBzZWxmLnJvb3RfcGF0aDoKICAgICAgICAgICAgIHJhaXNlIE9TRXJyb3IoJ1Byb3Zp ZGVkIHBhdGgge30gaXMgbm90IGEgc3ZuIHJlcG9zaXRvcnknLmZvcm1hdChwYXRoKSkKIApAQCAt NjYsNyArNzAsNyBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAgICAgYWRkaXRpb25hbF9hcmdzID0g WydeL2JyYW5jaGVzL3t9Jy5mb3JtYXQoYnJhbmNoKV0gaWYgYnJhbmNoIGFuZCBicmFuY2ggIT0g c2VsZi5kZWZhdWx0X2JyYW5jaCBlbHNlIFtdCiAgICAgICAgIGFkZGl0aW9uYWxfYXJncyArPSBb Jy1yJywgc3RyKHJldmlzaW9uKV0gaWYgcmV2aXNpb24gZWxzZSBbXQogCi0gICAgICAgIGluZm9f cmVzdWx0ID0gcnVuKFtzZWxmLmV4ZWN1dGFibGUsICdpbmZvJ10gKyBhZGRpdGlvbmFsX2FyZ3Ms IGN3ZD1zZWxmLnBhdGgsIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYtOCcpCisg ICAgICAgIGluZm9fcmVzdWx0ID0gcnVuKFtzZWxmLmV4ZWN1dGFibGUsICdpbmZvJ10gKyBhZGRp dGlvbmFsX2FyZ3MsIGN3ZD1zZWxmLnJvb3RfcGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5j b2Rpbmc9J3V0Zi04JykKICAgICAgICAgaWYgaW5mb19yZXN1bHQucmV0dXJuY29kZToKICAgICAg ICAgICAgIHJldHVybiB7fQogCkBAIC04Miw3ICs4Niw3IEBAIGNsYXNzIFN2bihTY20pOgogCiAg ICAgQHByb3BlcnR5CiAgICAgZGVmIHJvb3RfcGF0aChzZWxmKToKLSAgICAgICAgcmV0dXJuIHNl bGYuaW5mbyhjYWNoZWQ9VHJ1ZSkuZ2V0KCdXb3JraW5nIENvcHkgUm9vdCBQYXRoJykKKyAgICAg ICAgcmV0dXJuIHNlbGYuX3Jvb3RfcGF0aAogCiAgICAgQHByb3BlcnR5CiAgICAgZGVmIGRlZmF1 bHRfYnJhbmNoKHNlbGYpOgpAQCAtOTYsNyArMTAwLDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAg ICAgIHJldHVybiBzZWxmLmluZm8oKVsnUmVsYXRpdmUgVVJMJ11bMjpdCiAKICAgICBkZWYgbGlz dChzZWxmLCBjYXRlZ29yeSk6Ci0gICAgICAgIGxpc3RfcmVzdWx0ID0gcnVuKFtzZWxmLmV4ZWN1 dGFibGUsICdsaXN0JywgJ14ve30nLmZvcm1hdChjYXRlZ29yeSldLCBjd2Q9c2VsZi5wYXRoLCBj YXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKQorICAgICAgICBsaXN0X3Jlc3Vs dCA9IHJ1bihbc2VsZi5leGVjdXRhYmxlLCAnbGlzdCcsICdeL3t9Jy5mb3JtYXQoY2F0ZWdvcnkp XSwgY3dkPXNlbGYucm9vdF9wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGluZz0ndXRm LTgnKQogICAgICAgICBpZiBsaXN0X3Jlc3VsdC5yZXR1cm5jb2RlOgogICAgICAgICAgICAgcmV0 dXJuIFtdCiAgICAgICAgIHJldHVybiBbZWxlbWVudC5yc3RyaXAoJy8nKSBmb3IgZWxlbWVudCBp biBsaXN0X3Jlc3VsdC5zdGRvdXQuc3BsaXRsaW5lcygpXQpAQCAtMTM4LDcgKzE0Miw3IEBAIGNs YXNzIFN2bihTY20pOgogCiAgICAgICAgICAgICBsb2cgPSBzdWJwcm9jZXNzLlBvcGVuKAogICAg ICAgICAgICAgICAgIFtzZWxmLmV4ZWN1dGFibGUsICdsb2cnLCAnLXEnLCBicmFuY2hfYXJnXSwK LSAgICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLAorICAgICAgICAgICAgICAgIGN3ZD1zZWxm LnJvb3RfcGF0aCwKICAgICAgICAgICAgICAgICBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLAogICAg ICAgICAgICAgICAgIHN0ZGVycj1zdWJwcm9jZXNzLlBJUEUsCiAgICAgICAgICAgICAgICAgKipr d2FyZ3MKQEAgLTE5Miw3ICsxOTYsNyBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAgICAgcmV0dXJu IHNlbGYuX2NvbW1pdF9jb3VudChyZXZpc2lvbj1zZWxmLl9tZXRhZGF0YV9jYWNoZVticmFuY2hd WzBdLCBicmFuY2g9c2VsZi5kZWZhdWx0X2JyYW5jaCkKIAogICAgIGRlZiByZW1vdGUoc2VsZiwg bmFtZT1Ob25lKToKLSAgICAgICAgcmV0dXJuIHNlbGYuaW5mbygpWydSZXBvc2l0b3J5IFJvb3Qn XQorICAgICAgICByZXR1cm4gc2VsZi5pbmZvKGNhY2hlZD1UcnVlKVsnUmVwb3NpdG9yeSBSb290 J10KIAogICAgIGRlZiBfYnJhbmNoX2ZvcihzZWxmLCByZXZpc2lvbik6CiAgICAgICAgIGNhbmRp ZGF0ZXMgPSBbYnJhbmNoIGZvciBicmFuY2gsIHJldmlzaW9ucyBpbiBzZWxmLl9tZXRhZGF0YV9j YWNoZS5pdGVtcygpIGlmIGJyYW5jaCAhPSAndmVyc2lvbicgYW5kIHJldmlzaW9uIGluIHJldmlz aW9uc10KQEAgLTIwNCw3ICsyMDgsNyBAQCBjbGFzcyBTdm4oU2NtKToKIAogICAgICAgICBwcm9j ZXNzID0gcnVuKAogICAgICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSwgJ2xvZycsICctdicsICct cScsIHNlbGYucmVtb3RlKCksICctcicsIHN0cihyZXZpc2lvbiksICctbCcsICcxJ10sCi0gICAg ICAgICAgICBjd2Q9c2VsZi5wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGluZz0ndXRm LTgnLAorICAgICAgICAgICAgY3dkPXNlbGYucm9vdF9wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVl LCBlbmNvZGluZz0ndXRmLTgnLAogICAgICAgICApCiAKICAgICAgICAgIyBJZiB3ZSBkaWRuJ3Qg Z2V0IGEgdmFsaWQgYW5zd2VyIGZyb20gdGhlIHJlbW90ZSwgYnV0IHdlIGZvdW5kIGEgbWF0Y2hp bmcgY2FuZGlkYXRlLCB3ZSByZXR1cm4gdGhhdC4KQEAgLTIyOSw3ICsyMzMsNyBAQCBjbGFzcyBT dm4oU2NtKToKIAogICAgICAgICBpZiBsZW4ocGFydGlhbCkgPD0gMzoKICAgICAgICAgICAgIHJh aXNlIHNlbGYuRXhjZXB0aW9uKCdNYWxmb3JtZWQgc2V0ICBvZiBlZGl0ZWQgZmlsZXMnKQotICAg ICAgICBwYXJ0aWFsID0gcGFydGlhbFsyOl0KKyAgICAgICAgcGFydGlhbCA9IHBhcnRpYWxbMjpd LnNwbGl0KCcgJylbMF0KICAgICAgICAgcmV0dXJuIHBhcnRpYWwuc3BsaXQoJy8nKVsyIGlmIHBh cnRpYWwuc3RhcnRzd2l0aCgnL2JyYW5jaGVzJykgZWxzZSAxXQogCiAgICAgZGVmIGNvbW1pdChz ZWxmLCBoYXNoPU5vbmUsIHJldmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwgYnJhbmNoPU5v bmUpOgpAQCAtMjcyLDcgKzI3Niw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgICAg IGJyYW5jaCA9IHNlbGYuZGVmYXVsdF9icmFuY2gKIAogICAgICAgICAgICAgcmV2aXNpb24gPSBz ZWxmLl9tZXRhZGF0YV9jYWNoZVticmFuY2hdW2lkZW50aWZpZXJdCi0gICAgICAgICAgICBpbmZv ID0gc2VsZi5pbmZvKGJyYW5jaD1icmFuY2gsIHJldmlzaW9uPXJldmlzaW9uKQorICAgICAgICAg ICAgaW5mbyA9IHNlbGYuaW5mbyhjYWNoZWQ9VHJ1ZSwgYnJhbmNoPWJyYW5jaCwgcmV2aXNpb249 cmV2aXNpb24pCiAgICAgICAgICAgICBicmFuY2ggPSBzZWxmLl9icmFuY2hfZm9yKHJldmlzaW9u KQogCiAgICAgICAgIGVsaWYgcmV2aXNpb246CkBAIC0yODAsNyArMjg0LDcgQEAgY2xhc3MgU3Zu KFNjbSk6CiAgICAgICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignQ2Fubm90IGRlZmluZSBi b3RoIGJyYW5jaCBhbmQgcmV2aXNpb24nKQogICAgICAgICAgICAgcmV2aXNpb24gPSBDb21taXQu X3BhcnNlX3JldmlzaW9uKHJldmlzaW9uLCBkb19hc3NlcnQ9VHJ1ZSkKICAgICAgICAgICAgIGJy YW5jaCA9IHNlbGYuX2JyYW5jaF9mb3IocmV2aXNpb24pCi0gICAgICAgICAgICBpbmZvID0gc2Vs Zi5pbmZvKGJyYW5jaD1icmFuY2gsIHJldmlzaW9uPXJldmlzaW9uKQorICAgICAgICAgICAgaW5m byA9IHNlbGYuaW5mbyhjYWNoZWQ9VHJ1ZSwgYnJhbmNoPWJyYW5jaCwgcmV2aXNpb249cmV2aXNp b24pCiAKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGJyYW5jaCA9IGJyYW5jaCBvciBzZWxm LmJyYW5jaApAQCAtMzE4LDcgKzMyMiw3IEBAIGNsYXNzIFN2bihTY20pOgogCiAgICAgICAgIGJy YW5jaF9hcmcgPSAnXi97fXt9Jy5mb3JtYXQoJycgaWYgYnJhbmNoID09IHNlbGYuZGVmYXVsdF9i cmFuY2ggZWxzZSAnYnJhbmNoZXMvJywgYnJhbmNoKQogICAgICAgICBsb2cgPSBydW4oCi0gICAg ICAgICAgICBbc2VsZi5leGVjdXRhYmxlLCAnbG9nJywgJy1sJywgJzEnLCAnLXInLCBzdHIocmV2 aXNpb24pLCBicmFuY2hfYXJnXSwgY3dkPXNlbGYucGF0aCwKKyAgICAgICAgICAgIFtzZWxmLmV4 ZWN1dGFibGUsICdsb2cnLCAnLWwnLCAnMScsICctcicsIHN0cihyZXZpc2lvbiksIGJyYW5jaF9h cmddLCBjd2Q9c2VsZi5yb290X3BhdGgsCiAgICAgICAgICAgICBjYXB0dXJlX291dHB1dD1UcnVl LCBlbmNvZGluZz0ndXRmLTgnLAogICAgICAgICApCiAgICAgICAgIHNwbGl0X2xvZyA9IGxvZy5z dGRvdXQuc3BsaXRsaW5lcygpCkBAIC0zMzAsNyArMzM0LDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAg ICAgICAgICAgICAgICAgICAgIGJyZWFrCiAKICAgICAgICAgICAgIGF1dGhvciA9IENvbnRyaWJ1 dG9yLmZyb21fc2NtX2xvZyhhdXRob3JfbGluZSkKLSAgICAgICAgICAgIG1lc3NhZ2UgPSAnXG4n LmpvaW4oc3BsaXRfbG9nWzM6XSkKKyAgICAgICAgICAgIG1lc3NhZ2UgPSAnXG4nLmpvaW4oc3Bs aXRfbG9nWzM6LTFdKQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5sb2coJ0ZhaWxl ZCB0byBjb25uZWN0IHRvIHJlbW90ZSwgY2Fubm90IGNvbXB1dGUgY29tbWl0IG1lc3NhZ2UnKQog ICAgICAgICAgICAgZW1haWwgPSBpbmZvWydMYXN0IENoYW5nZWQgQXV0aG9yJ10K