110073 2013-02-17 20:09:26 -0800 Add a script to automatically configure a git clone 2013-12-24 11:10:39 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 126217 1 rniwa rniwa commit-queue darin d-r eric.carlson eric glenn jesus laszlo.gombos mrowe ojan oldest_to_newest 835091 0 rniwa 2013-02-17 20:09:26 -0800 http://trac.webkit.org/wiki/UsingGitWithWebKit has a lot of instruction on how to setup a git clone. e.g. git svn init --prefix=origin/ -T trunk http://svn.webkit.org/repository/webkit git config --replace svn-remote.svn.fetch trunk:refs/remotes/origin/master git config core.webKitBranchBuild true git config merge.changelog.driver "perl Tools/Scripts/resolve-ChangeLogs --fix-merged --merge-driver %O %A %B" git config color.status auto git config color.diff auto git config color.branch auto All of this should be automated in a script so that we don't have to remember to execute them. Since some of the configurations depend on the workflow a particular contributor uses, the script should probably ask a couple of questions at the beginning and set things up automatically based on the answers. 835093 1 eric 2013-02-17 20:15:15 -0800 Don't forget the github workflows too. :) 835095 2 rniwa 2013-02-17 20:18:15 -0800 (In reply to comment #1) > Don't forget the github workflows too. :) Yeah, that's probably the first thing the script should ask. As is, there are too many miscellaneous things each contributor needs to do before he/she can start submitting patches on a git clone while you can just run "svn co" and start writing patches on a subversion checkout. 835102 3 eric 2013-02-17 21:01:23 -0800 Perhaps. We could make a much more straight-forward git contribution path, but currently we're using several divergent git contribution paths as there is no officially sanctioned one. You can't actually use git to contribute directly from a normal git pull/push model, but rather have to use the git-svn bridge. And git.webkit.org itself isn't writeable, so you have to use github for any branches you'd like. :) I'm not saying this is necessarily bad, but they do contribute to this proliferation of secondary solutions. Given the results of Maciej's latest survey, which showed git-usage very high, I'm glad we're considering improving the workflow. :) https://lists.webkit.org/pipermail/webkit-dev/2012-April/020198.html 837279 4 rniwa 2013-02-20 02:11:20 -0800 FYI, I'm not intending to work on this bug. I just filed it for the record so if anyone's interested in adding such a script, please do so. 956093 5 218339 rniwa 2013-12-03 14:17:20 -0800 Created attachment 218339 Adds a new webkit-patch command 956101 6 218339 benjamin 2013-12-03 14:23:10 -0800 Comment on attachment 218339 Adds a new webkit-patch command View in context: https://bugs.webkit.org/attachment.cgi?id=218339&action=review Great idea! > Tools/Scripts/webkitpy/tool/commands/setupgitclone.py:49 > + run_git(["svn", "init", "--prefix=origin/", "-T", "trunk", "http://svn.webkit.org/repository/webkit"]) Should this be using https? 956103 7 218341 rniwa 2013-12-03 14:24:50 -0800 Created attachment 218341 Patch for landing 956106 8 218341 rniwa 2013-12-03 14:26:46 -0800 Comment on attachment 218341 Patch for landing Clearing flags on attachment: 218341 Committed r160039: <http://trac.webkit.org/changeset/160039> 956107 9 rniwa 2013-12-03 14:26:51 -0800 All reviewed patches have been landed. Closing bug. 956121 10 rniwa 2013-12-03 14:35:28 -0800 Committed r160043: <http://trac.webkit.org/changeset/160043> 218339 2013-12-03 14:17:20 -0800 2013-12-03 14:24:46 -0800 Adds a new webkit-patch command bug-110073-20131203141720.patch text/plain 6459 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTkxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTg1NGQyOWUyNzYwZDBkM2Q4NjZkMzgwODQ1OTA1NDgw MTk2MzFhYi4uY2ZjMmU0Mzc3MWI1NjJhNjMwMDIxMTc4MjA2MDNiYjYyNTJmYjM2NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEzLTEyLTAzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAg ICAgIEFkZCBhIHNjcmlwdCB0byBhdXRvbWF0aWNhbGx5IGNvbmZpZ3VyZSBhIGdpdCBjbG9uZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMDczCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgIndl YmtpdC1wYXRjaCBzZXR1cC1naXQtY2xvbmUiIHRvIHNldHVwIGEgYnJhbmQgbmV3IEdpdCBjbG9u ZS4KKworICAgICAgICBUaGlzIGNvbW1hbmQgcnVucyB2YXJpb3VzIGNvbW1hbmRzIGxpc3RlZCBv biBodHRwOi8vdHJhYy53ZWJraXQub3JnL3dpa2kvVXNpbmdHaXRXaXRoV2ViS2l0CisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvX19pbml0X18ucHk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NldHVwZ2l0Y2xvbmUucHk6IEFkZGVk LgorICAgICAgICAoU2V0dXBHaXRDbG9uZSk6CisgICAgICAgIChTZXR1cEdpdENsb25lLmV4ZWN1 dGUpOgorCiAyMDEzLTEyLTAyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAg ICAgICAgcnVuLWpzYy1zdHJlc3MtdGVzdHMgc2hvdWxkIGFsbG93IGZvciB0ZXN0cyB0aGF0IGhh dmUgYSBkaXJlY3RvcnkgY29udGFpbmluZyAuanMgZmlsZXMgbmVzdGVkIHdpdGhpbiBhIGRpcmVj dG9yeSBjb250YWluaW5nIHRoZSBkYXRhCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvY29tbWFuZHMvX19pbml0X18ucHkKaW5kZXggYTU4NGVlMDM3MTg4NjZlZDljYzQ0NzBlNzkz ZmJhZTUwNTRiZjI2NS4uOTdjNmIyNzhmOTVmNTgyMTUwMzRkYTJlNGVjYzY3OTk5NGJlYTg0YiAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL19faW5pdF9f LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9fX2luaXRfXy5w eQpAQCAtMTcsNiArMTcsNyBAQCBmcm9tIHdlYmtpdHB5LnRvb2wuY29tbWFuZHMucXVlcmllcyBp bXBvcnQgKgogZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRzLnF1ZXVlcyBpbXBvcnQgKgogZnJv bSB3ZWJraXRweS50b29sLmNvbW1hbmRzLnJlYmFzZWxpbmUgaW1wb3J0IFJlYmFzZWxpbmUKIGZy b20gd2Via2l0cHkudG9vbC5jb21tYW5kcy5yZWJhc2VsaW5lc2VydmVyIGltcG9ydCBSZWJhc2Vs aW5lU2VydmVyCitmcm9tIHdlYmtpdHB5LnRvb2wuY29tbWFuZHMuc2V0dXBnaXRjbG9uZSBpbXBv cnQgU2V0dXBHaXRDbG9uZQogZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRzLnNoZXJpZmZib3Qg aW1wb3J0ICoKIGZyb20gd2Via2l0cHkudG9vbC5jb21tYW5kcy51cGxvYWQgaW1wb3J0ICoKIGZy b20gd2Via2l0cHkudG9vbC5jb21tYW5kcy5zdWdnZXN0bm9taW5hdGlvbnMgaW1wb3J0ICoKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9zZXR1cGdpdGNs b25lLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NldHVwZ2l0Y2xv bmUucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uZTA0ZWIzMmRhMGZhODc5ZGZkYWQwNTBkZGRiOWZjMGU3YzM3ODY0 MgotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9zZXR1cGdpdGNsb25lLnB5CkBAIC0wLDAgKzEsODYgQEAKKyMgQ29weXJpZ2h0IChjKSAyMDEz IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucyBhcmUKKyMgbWV0OgorIworIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNv ZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjICAgICAqIFJlZGlz dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyMgY29w eXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lcgorIyBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxz IHByb3ZpZGVkIHdpdGggdGhlCisjIGRpc3RyaWJ1dGlvbi4KKyMgICAgICogTmVpdGhlciB0aGUg bmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworIyBjb250cmlidXRvcnMg bWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQor IyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9u LgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVS UyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQg V0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFRIRSBJTVBMSUVE IFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorIyBBIFBBUlRJ Q1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlS SUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJ TkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5U SUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVO VCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyMgREFUQSwg T1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQg T04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklD VCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2Zy b20gd2Via2l0cHkudG9vbC5tdWx0aWNvbW1hbmR0b29sIGltcG9ydCBDb21tYW5kCitmcm9tIHdl YmtpdHB5LmNvbW1vbi5jaGVja291dC5zY20uZ2l0IGltcG9ydCBHaXQKKworCitjbGFzcyBTZXR1 cEdpdENsb25lKENvbW1hbmQpOgorICAgIG5hbWUgPSAic2V0dXAtZ2l0LWNsb25lIgorICAgIGhl bHBfdGV4dCA9ICJDb25maWd1cmVzIGEgbmV3IEdpdCBjbG9uZSBmb3IgdGhlIFdlYktpdCBkZXZl bG9wbWVudCIKKworICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgor ICAgICAgICBpZiBub3QgaXNpbnN0YW5jZSh0b29sLnNjbSgpLCBHaXQpOgorICAgICAgICAgICAg cHJpbnQgIlRoaXMgY29tbWFuZCBvbmx5IHdvcmtzIGluc2lkZSBhIEdpdCBjaGVja291dC4iCisg ICAgICAgICAgICByZXR1cm4KKworICAgICAgICBpZiB0b29sLnNjbSgpLmhhc193b3JraW5nX2Rp cmVjdG9yeV9jaGFuZ2VzKCk6CisgICAgICAgICAgICBwcmludCAiVGhlcmUgYXJlIGxvY2FsIGNo YW5nZXM7IGFib3J0aW5nIHRoZSBjb21tYW5kLiIKKyAgICAgICAgICAgIHJldHVybgorCisgICAg ICAgICMgRklYTUU6IFdlIHNob3VsZG4ndCBiZSB1c2luZyBhIHByaXZhdGQgbWV0aG9kCisgICAg ICAgIHJ1bl9naXQgPSB0b29sLnNjbSgpLl9ydW5fZ2l0CisgICAgICAgIHJ1bl9naXQoWyJwdWxs Il0pCisgICAgICAgIHJ1bl9naXQoWyJzdm4iLCAiaW5pdCIsICItLXByZWZpeD1vcmlnaW4vIiwg Ii1UIiwgInRydW5rIiwgImh0dHA6Ly9zdm4ud2Via2l0Lm9yZy9yZXBvc2l0b3J5L3dlYmtpdCJd KQorICAgICAgICBydW5fZ2l0KFsiY29uZmlnIiwgIi0tcmVwbGFjZSIsICJzdm4tcmVtb3RlLnN2 bi5mZXRjaCB0cnVuazpyZWZzL3JlbW90ZXMvb3JpZ2luL21hc3RlciJdKQorICAgICAgICBydW5f Z2l0KFsic3ZuIiwgImZldGNoIl0pCisKKyAgICAgICAgb3JpZ2luYWxfcGF0aCA9IHRvb2wuZmls ZXN5c3RlbS5hYnNwYXRoKCIuIikKKworICAgICAgICB0b29sLmZpbGVzeXN0ZW0uY2hkaXIoIlRv b2xzL1NjcmlwdHMvIikKKyAgICAgICAgdXNlcm5hbWUgPSB0b29sLmV4ZWN1dGl2ZS5ydW5fYW5k X3Rocm93X2lmX2ZhaWwoWyJwZXJsIiwgIi1lIiwgInVzZSBWQ1NVdGlsczsgcHJpbnQgU1RET1VU IGNoYW5nZUxvZ05hbWUoKTsiXSwgcXVpZXQ9VHJ1ZSkKKyAgICAgICAgaWYgdXNlcm5hbWU6Cisg ICAgICAgICAgICB1c2VybmFtZSA9IHRvb2wudXNlci5wcm9tcHQoIllvdXIgbmFtZToiKQorCisg ICAgICAgIGVtYWlsID0gdG9vbC5leGVjdXRpdmUucnVuX2FuZF90aHJvd19pZl9mYWlsKFsicGVy bCIsICItZSIsICJ1c2UgVkNTVXRpbHM7IHByaW50IFNURE9VVCBjaGFuZ2VMb2dFbWFpbEFkZHJl c3MoKTsiXSwgcXVpZXQ9VHJ1ZSkKKyAgICAgICAgaWYgZW1haWw6CisgICAgICAgICAgICBlbWFp bCA9IHRvb2wudXNlci5wcm9tcHQoIllvdXIgZW1haWwgYWRkcmVzczoiKQorICAgICAgICB0b29s LmZpbGVzeXN0ZW0uY2hkaXIob3JpZ2luYWxfcGF0aCkKKworICAgICAgICBydW5fZ2l0KFsiY29u ZmlnIiwgInVzZXIubmFtZSIsIHVzZXJuYW1lXSkKKyAgICAgICAgcnVuX2dpdChbImNvbmZpZyIs ICJ1c2VyLmVtYWlsIiwgZW1haWxdKQorCisgICAgICAgICMgQmV0dGVyIE9iamVjdGl2ZS1DIGRp ZmYuCisgICAgICAgIHJ1bl9naXQoWyJjb25maWciLCAiZGlmZi5vYmpjcHAueGZ1bmNuYW1lIiwg Il5bLStAYS16QS1aX10uKiQiXSkKKyAgICAgICAgcnVuX2dpdChbImNvbmZpZyIsICJkaWZmLm9i amNwcGhlYWRlci54ZnVuY25hbWUiLCAiXltAYS16QS1aX10uKiQiXSkKKworICAgICAgICBpZiB0 b29sLnVzZXIuY29uZmlybSgiRG8geW91IHdhbnQgdG8gYXV0by1jb2xvciBzdGF0dXMsIGRpZmYs IGFuZCBicmFuY2g/ICh5L24pIik6CisgICAgICAgICAgICBydW5fZ2l0KFsiY29uZmlnIiwgImNv bG9yLnN0YXR1cyIsICJhdXRvIl0pCisgICAgICAgICAgICBydW5fZ2l0KFsiY29uZmlnIiwgImNv bG9yLmRpZmYiLCAiYXV0byJdKQorICAgICAgICAgICAgcnVuX2dpdChbImNvbmZpZyIsICJjb2xv ci5icmFuY2giLCAiYXV0byJdKQorCisgICAgICAgIGlmIHRvb2wudXNlci5jb25maXJtKCJEbyB5 b3UgdXNlIGEgcmViYXNlLWJhc2VkIHdvcmtmbG93PyAoeT15ZXM7IG49bm8sIEkgdXNlIGEgbWVy Z2UtYmFzZWQgd29ya2Zsb3cpIik6CisgICAgICAgICAgICBydW5fZ2l0KFsiY29uZmlnIiwgIm1l cmdlLmNoYW5nZWxvZy5kcml2ZXIiLCAicGVybCBUb29scy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdl TG9ncyAtLWZpeC1tZXJnZWQgLS1tZXJnZS1kcml2ZXIgJU8gJUEgJUIiXSkKKyAgICAgICAgZWxz ZToKKyAgICAgICAgICAgIHJ1bl9naXQoWyJjb25maWciLCAibWVyZ2UuY2hhbmdlbG9nLmRyaXZl ciIsICJwZXJsIFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzIC0tZml4LW1lcmdlZCAt LW1lcmdlLWRyaXZlciAlTyAlQiAlQSJdKQorCisgICAgICAgIGlmIHRvb2wudXNlci5jb25maXJt KCJEbyB5b3Ugd2FudCB0byBhcHBlbmQgdGhlIGdpdCBicmFuY2ggbmFtZSB0byBldmVyeSBidWls ZD8gKGUuZy4gV2ViS2l0QnVpbGQvbXlicmFuY2gvOyB5L24pIik6CisgICAgICAgICAgICBydW5f Z2l0KFsiY29uZmlnIiwgImNvcmUud2ViS2l0QnJhbmNoQnVpbGQiLCAidHJ1ZSJdKQorICAgICAg ICAgICAgcHJpbnQgIllvdSBjYW4gb3ZlcnJpZGUgdGhpcyBvcHRpb24gdmlhIGdpdCBjb25maWcg YnJhbmNoLiRicmFuY2hOYW1lLndlYktpdEJyYW5jaEJ1aWxkICh0cnVlfGZhbHNlKSIKKworICAg ICAgICBwcmludCAiRG9uZSIK 218341 2013-12-03 14:24:50 -0800 2013-12-03 14:26:46 -0800 Patch for landing bug-110073-20131203142449.patch text/plain 6470 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTkxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTg1NGQyOWUyNzYwZDBkM2Q4NjZkMzgwODQ1OTA1NDgw MTk2MzFhYi4uN2M4MTY2MzYzNzJmYjE5OGI5N2Q5YzU5ZGJmMWM5YWUxZmJlYjA3NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEzLTEyLTAzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAg ICAgIEFkZCBhIHNjcmlwdCB0byBhdXRvbWF0aWNhbGx5IGNvbmZpZ3VyZSBhIGdpdCBjbG9uZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMDczCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQmVuamFtaW4gUG91bGFpbi4KKworICAgICAgICBBZGRlZCAi d2Via2l0LXBhdGNoIHNldHVwLWdpdC1jbG9uZSIgdG8gc2V0dXAgYSBicmFuZCBuZXcgR2l0IGNs b25lLgorCisgICAgICAgIFRoaXMgY29tbWFuZCBydW5zIHZhcmlvdXMgY29tbWFuZHMgbGlzdGVk IG9uIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvd2lraS9Vc2luZ0dpdFdpdGhXZWJLaXQKKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9fX2luaXRfXy5weToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2V0dXBnaXRjbG9uZS5weTogQWRk ZWQuCisgICAgICAgIChTZXR1cEdpdENsb25lKToKKyAgICAgICAgKFNldHVwR2l0Q2xvbmUuZXhl Y3V0ZSk6CisKIDIwMTMtMTItMDIgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAog ICAgICAgICBydW4tanNjLXN0cmVzcy10ZXN0cyBzaG91bGQgYWxsb3cgZm9yIHRlc3RzIHRoYXQg aGF2ZSBhIGRpcmVjdG9yeSBjb250YWluaW5nIC5qcyBmaWxlcyBuZXN0ZWQgd2l0aGluIGEgZGly ZWN0b3J5IGNvbnRhaW5pbmcgdGhlIGRhdGEKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9fX2luaXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9fX2luaXRfXy5weQppbmRleCBhNTg0ZWUwMzcxODg2NmVkOWNjNDQ3MGU3 OTNmYmFlNTA1NGJmMjY1Li45N2M2YjI3OGY5NWY1ODIxNTAzNGRhMmU0ZWNjNjc5OTk0YmVhODRi IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvX19pbml0 X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL19faW5pdF9f LnB5CkBAIC0xNyw2ICsxNyw3IEBAIGZyb20gd2Via2l0cHkudG9vbC5jb21tYW5kcy5xdWVyaWVz IGltcG9ydCAqCiBmcm9tIHdlYmtpdHB5LnRvb2wuY29tbWFuZHMucXVldWVzIGltcG9ydCAqCiBm cm9tIHdlYmtpdHB5LnRvb2wuY29tbWFuZHMucmViYXNlbGluZSBpbXBvcnQgUmViYXNlbGluZQog ZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRzLnJlYmFzZWxpbmVzZXJ2ZXIgaW1wb3J0IFJlYmFz ZWxpbmVTZXJ2ZXIKK2Zyb20gd2Via2l0cHkudG9vbC5jb21tYW5kcy5zZXR1cGdpdGNsb25lIGlt cG9ydCBTZXR1cEdpdENsb25lCiBmcm9tIHdlYmtpdHB5LnRvb2wuY29tbWFuZHMuc2hlcmlmZmJv dCBpbXBvcnQgKgogZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRzLnVwbG9hZCBpbXBvcnQgKgog ZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRzLnN1Z2dlc3Rub21pbmF0aW9ucyBpbXBvcnQgKgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NldHVwZ2l0 Y2xvbmUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2V0dXBnaXRj bG9uZS5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi4yMmIyYjI5ZGRmOGQwZjllMmNjY2U3YmQxZmZmMzUzMDVlMTI3 ZWI2Ci0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL3NldHVwZ2l0Y2xvbmUucHkKQEAgLTAsMCArMSw4NiBAQAorIyBDb3B5cmlnaHQgKGMpIDIw MTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zIGFyZQorIyBtZXQ6CisjCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2Ug Y29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgICAgICogUmVk aXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorIyBj b3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlh bHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorIyAgICAgKiBOZWl0aGVyIHRo ZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCisjIGNvbnRyaWJ1dG9y cyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9t CisjIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Np b24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xE RVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElF RCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgVEhFIElNUExJ RUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisjIEEgUEFS VElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09Q WVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1Qs IElORElSRUNULCBJTkNJREVOVEFMLAorIyBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVF TlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFBST0NVUkVN RU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorIyBEQVRB LCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFO RCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RS SUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKwor ZnJvbSB3ZWJraXRweS50b29sLm11bHRpY29tbWFuZHRvb2wgaW1wb3J0IENvbW1hbmQKK2Zyb20g d2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LnNjbS5naXQgaW1wb3J0IEdpdAorCisKK2NsYXNzIFNl dHVwR2l0Q2xvbmUoQ29tbWFuZCk6CisgICAgbmFtZSA9ICJzZXR1cC1naXQtY2xvbmUiCisgICAg aGVscF90ZXh0ID0gIkNvbmZpZ3VyZXMgYSBuZXcgR2l0IGNsb25lIGZvciB0aGUgV2ViS2l0IGRl dmVsb3BtZW50IgorCisgICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6 CisgICAgICAgIGlmIG5vdCBpc2luc3RhbmNlKHRvb2wuc2NtKCksIEdpdCk6CisgICAgICAgICAg ICBwcmludCAiVGhpcyBjb21tYW5kIG9ubHkgd29ya3MgaW5zaWRlIGEgR2l0IGNoZWNrb3V0LiIK KyAgICAgICAgICAgIHJldHVybgorCisgICAgICAgIGlmIHRvb2wuc2NtKCkuaGFzX3dvcmtpbmdf ZGlyZWN0b3J5X2NoYW5nZXMoKToKKyAgICAgICAgICAgIHByaW50ICJUaGVyZSBhcmUgbG9jYWwg Y2hhbmdlczsgYWJvcnRpbmcgdGhlIGNvbW1hbmQuIgorICAgICAgICAgICAgcmV0dXJuCisKKyAg ICAgICAgIyBGSVhNRTogV2Ugc2hvdWxkbid0IGJlIHVzaW5nIGEgcHJpdmF0ZCBtZXRob2QKKyAg ICAgICAgcnVuX2dpdCA9IHRvb2wuc2NtKCkuX3J1bl9naXQKKyAgICAgICAgcnVuX2dpdChbInB1 bGwiXSkKKyAgICAgICAgcnVuX2dpdChbInN2biIsICJpbml0IiwgIi0tcHJlZml4PW9yaWdpbi8i LCAiLVQiLCAidHJ1bmsiLCAiaHR0cHM6Ly9zdm4ud2Via2l0Lm9yZy9yZXBvc2l0b3J5L3dlYmtp dCJdKQorICAgICAgICBydW5fZ2l0KFsiY29uZmlnIiwgIi0tcmVwbGFjZSIsICJzdm4tcmVtb3Rl LnN2bi5mZXRjaCB0cnVuazpyZWZzL3JlbW90ZXMvb3JpZ2luL21hc3RlciJdKQorICAgICAgICBy dW5fZ2l0KFsic3ZuIiwgImZldGNoIl0pCisKKyAgICAgICAgb3JpZ2luYWxfcGF0aCA9IHRvb2wu ZmlsZXN5c3RlbS5hYnNwYXRoKCIuIikKKworICAgICAgICB0b29sLmZpbGVzeXN0ZW0uY2hkaXIo IlRvb2xzL1NjcmlwdHMvIikKKyAgICAgICAgdXNlcm5hbWUgPSB0b29sLmV4ZWN1dGl2ZS5ydW5f YW5kX3Rocm93X2lmX2ZhaWwoWyJwZXJsIiwgIi1lIiwgInVzZSBWQ1NVdGlsczsgcHJpbnQgU1RE T1VUIGNoYW5nZUxvZ05hbWUoKTsiXSwgcXVpZXQ9VHJ1ZSkKKyAgICAgICAgaWYgbm90IHVzZXJu YW1lOgorICAgICAgICAgICAgdXNlcm5hbWUgPSB0b29sLnVzZXIucHJvbXB0KCJZb3VyIG5hbWU6 IikKKworICAgICAgICBlbWFpbCA9IHRvb2wuZXhlY3V0aXZlLnJ1bl9hbmRfdGhyb3dfaWZfZmFp bChbInBlcmwiLCAiLWUiLCAidXNlIFZDU1V0aWxzOyBwcmludCBTVERPVVQgY2hhbmdlTG9nRW1h aWxBZGRyZXNzKCk7Il0sIHF1aWV0PVRydWUpCisgICAgICAgIGlmIG5vdCBlbWFpbDoKKyAgICAg ICAgICAgIGVtYWlsID0gdG9vbC51c2VyLnByb21wdCgiWW91ciBlbWFpbCBhZGRyZXNzOiIpCisg ICAgICAgIHRvb2wuZmlsZXN5c3RlbS5jaGRpcihvcmlnaW5hbF9wYXRoKQorCisgICAgICAgIHJ1 bl9naXQoWyJjb25maWciLCAidXNlci5uYW1lIiwgdXNlcm5hbWVdKQorICAgICAgICBydW5fZ2l0 KFsiY29uZmlnIiwgInVzZXIuZW1haWwiLCBlbWFpbF0pCisKKyAgICAgICAgIyBCZXR0ZXIgT2Jq ZWN0aXZlLUMgZGlmZi4KKyAgICAgICAgcnVuX2dpdChbImNvbmZpZyIsICJkaWZmLm9iamNwcC54 ZnVuY25hbWUiLCAiXlstK0BhLXpBLVpfXS4qJCJdKQorICAgICAgICBydW5fZ2l0KFsiY29uZmln IiwgImRpZmYub2JqY3BwaGVhZGVyLnhmdW5jbmFtZSIsICJeW0BhLXpBLVpfXS4qJCJdKQorCisg ICAgICAgIGlmIHRvb2wudXNlci5jb25maXJtKCJEbyB5b3Ugd2FudCB0byBhdXRvLWNvbG9yIHN0 YXR1cywgZGlmZiwgYW5kIGJyYW5jaD8gKHkvbikiKToKKyAgICAgICAgICAgIHJ1bl9naXQoWyJj b25maWciLCAiY29sb3Iuc3RhdHVzIiwgImF1dG8iXSkKKyAgICAgICAgICAgIHJ1bl9naXQoWyJj b25maWciLCAiY29sb3IuZGlmZiIsICJhdXRvIl0pCisgICAgICAgICAgICBydW5fZ2l0KFsiY29u ZmlnIiwgImNvbG9yLmJyYW5jaCIsICJhdXRvIl0pCisKKyAgICAgICAgaWYgdG9vbC51c2VyLmNv bmZpcm0oIkRvIHlvdSB1c2UgYSByZWJhc2UtYmFzZWQgd29ya2Zsb3c/ICh5PXllczsgbj1ubywg SSB1c2UgYSBtZXJnZS1iYXNlZCB3b3JrZmxvdykiKToKKyAgICAgICAgICAgIHJ1bl9naXQoWyJj b25maWciLCAibWVyZ2UuY2hhbmdlbG9nLmRyaXZlciIsICJwZXJsIFRvb2xzL1NjcmlwdHMvcmVz b2x2ZS1DaGFuZ2VMb2dzIC0tZml4LW1lcmdlZCAtLW1lcmdlLWRyaXZlciAlTyAlQSAlQiJdKQor ICAgICAgICBlbHNlOgorICAgICAgICAgICAgcnVuX2dpdChbImNvbmZpZyIsICJtZXJnZS5jaGFu Z2Vsb2cuZHJpdmVyIiwgInBlcmwgVG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3MgLS1m aXgtbWVyZ2VkIC0tbWVyZ2UtZHJpdmVyICVPICVCICVBIl0pCisKKyAgICAgICAgaWYgdG9vbC51 c2VyLmNvbmZpcm0oIkRvIHlvdSB3YW50IHRvIGFwcGVuZCB0aGUgZ2l0IGJyYW5jaCBuYW1lIHRv IGV2ZXJ5IGJ1aWxkPyAoZS5nLiBXZWJLaXRCdWlsZC9teWJyYW5jaC87IHkvbikiKToKKyAgICAg ICAgICAgIHJ1bl9naXQoWyJjb25maWciLCAiY29yZS53ZWJLaXRCcmFuY2hCdWlsZCIsICJ0cnVl Il0pCisgICAgICAgICAgICBwcmludCAiWW91IGNhbiBvdmVycmlkZSB0aGlzIG9wdGlvbiB2aWEg Z2l0IGNvbmZpZyBicmFuY2guJGJyYW5jaE5hbWUud2ViS2l0QnJhbmNoQnVpbGQgKHRydWV8ZmFs c2UpIgorCisgICAgICAgIHByaW50ICJEb25lIgo=