9290 2006-06-02 22:33:03 -0700 Teach svn-apply and svn-unapply to patch ChangeLogs cleanly 2006-06-03 10:55:20 -0700 1 1 1 Unclassified WebKit Tools / Tests 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer oldest_to_newest 44499 0 ddkilzer 2006-06-02 22:33:03 -0700 I've got a patch to svn-apply and svn-unapply to patch ChangeLog files cleanly. In a nutshell, it sets the patch(1) fuzz factor to 3 when patching ChangeLog files so that trailing context is ignored and the content of the patch is simply prepended to the file. This sometimes causes ChangeLog.orig files to be left behind, though, so the updated scripts also make sure to unlink them if they're found. 44500 1 8676 ddkilzer 2006-06-02 22:37:41 -0700 Created attachment 8676 Patch v1 Patch v1 modifies svn-apply and svn-unapply to do the following: - Use --fuzz=3 when applying or unapplying ChangeLog patches. - Unlink (remove) ChangeLog.orig files if they are created in the process of patching. - Tested with Bug 9234 (for what it's worth). 44514 2 8676 eric 2006-06-03 02:47:49 -0700 Comment on attachment 8676 Patch v1 You might consider only unlinking ChangeLog.orig when it didn't exist before the patch attempt... + unlink($fullpath . ".orig") if ($base eq "ChangeLog"); Otherwise the change looks good. 44516 3 8677 ddkilzer 2006-06-03 04:58:03 -0700 Created attachment 8677 Patch v2 Changes since Patch v1: - Added 2006 to copyright years in svn-apply. - Extracted out applyPatch() method in svn-apply, and unapplyPatch() method in svn-unapply. - Don't remove ChangeLog.orig if it existed before running either svn-apply or svn-unapply per Comment #2. (I'm not sure this buys you much since patch(1) will overwrite the contents of ChangeLog.orig if it exists before the patch is applied.) - Simplify reversing a deletion in svn-unapply by calling "svn revert". (This issue was found while trying to unapply a real patch from Bug 7281.) 44541 4 ddkilzer 2006-06-03 10:55:20 -0700 Committed revision 14710. 8676 2006-06-02 22:37:41 -0700 2006-06-03 04:58:03 -0700 Patch v1 bug-9290-v1.diff text/plain 4252 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CShyZXZpc2lvbiAxNDcwNCkKKysrIFdlYktpdFRvb2xz L1NjcmlwdHMvc3ZuLWFwcGx5CSh3b3JraW5nIGNvcHkpCkBAIC0zNyw2ICszNyw3IEBACiAjICAg UGF0aHMgZnJvbSBJbmRleDogbGluZXMgYXJlIHVzZWQgcmF0aGVyIHRoYW4gdGhlIHBhdGhzIG9u IHRoZSBwYXRjaCBsaW5lcywgd2hpY2gKICMgICAgICAgbWFrZXMgcGF0Y2hlcyBnZW5lcmF0ZWQg YnkgImN2cyBkaWZmIiB3b3JrIChpbmNyZWFzaW5nbHkgdW5pbXBvcnRhbnQgc2luY2Ugd2UKICMg ICAgICAgdXNlIFN1YnZlcnNpb24gbm93KS4KKyMgICBDaGFuZ2VMb2cgcGF0Y2hlcyB1c2UgLS1m dXp6PTMgdG8gcHJldmVudCByZWplY3RzLgogIwogIyBNaXNzaW5nIGZlYXR1cmVzOgogIwpAQCAt NDUsNyArNDYsNiBAQAogIyAgIEhhbmRsZSBmaWxlIG1vdmVzIChyZXF1aXJlcyBwYXRjaGVzIG1h ZGUgYnkgc3ZuLWNyZWF0ZS1wYXRjaCkuCiAjICAgV2hlbiBkb2luZyBhIHJlbW92YWwsIGNoZWNr IHRoYXQgb2xkIGZpbGUgbWF0Y2hlcyB3aGF0J3MgYmVpbmcgcmVtb3ZlZC4KICMgICBOb3RpY2Ug YSBwYXRjaCB0aGF0J3MgYmVpbmcgYXBwbGllZCBhdCB0aGUgIndyb25nIGxldmVsIiBhbmQgbWFr ZSBpdCB3b3JrIGFueXdheS4KLSMgICBEbyBhIHNtYXJ0IG1lcmdlIG9uIENoYW5nZUxvZyBmaWxl cyBpbnN0ZWFkIG9mIGp1c3QgZG9pbmcgYSBub3JtYWwgcGF0Y2guCiAjICAgRG8gYSBkcnkgcnVu IG9uIHRoZSB3aG9sZSBwYXRjaCBhbmQgZG9uJ3QgZG8gYW55dGhpbmcgaWYgcGFydCBvZiB0aGUg cGF0Y2ggaXMKICMgICAgICAgZ29pbmcgdG8gZmFpbCAocHJvYmFibHkgdG9vIHN0cmljdCB1bmxl c3Mgd2UgZG8gdGhlIENoYW5nZUxvZyB0aGluZykuCiAKQEAgLTEyMyw5ICsxMjMsMTIgQEAKIAog ICAgIGlmICghJGFkZGl0aW9uICYmICEkZGVsZXRpb24pIHsKICAgICAgICAgIyBTdGFuZGFyZCBw YXRjaCwgcGF0Y2ggdG9vbCBjYW4gaGFuZGxlIHRoaXMuCi0gICAgICAgIG9wZW4gUEFUQ0gsICJ8 IHBhdGNoIC1wMCIgb3IgZGllICJGYWlsZWQgdG8gcGF0Y2ggJGZ1bGxwYXRoXG4iOworICAgICAg ICBteSAkb3B0aW9ucyA9ICItcDAiOworICAgICAgICAkb3B0aW9ucyAuPSAiIC0tZnV6ej0zIiBp ZiAoJGJhc2UgZXEgIkNoYW5nZUxvZyIpOworICAgICAgICBvcGVuIFBBVENILCAifCBwYXRjaCAk b3B0aW9ucyIgb3IgZGllICJGYWlsZWQgdG8gcGF0Y2ggJGZ1bGxwYXRoXG4iOwogICAgICAgICBw cmludCBQQVRDSCAkcGF0Y2g7CiAgICAgICAgIGNsb3NlIFBBVENIOworICAgICAgICB1bmxpbmso JGZ1bGxwYXRoIC4gIi5vcmlnIikgaWYgKCRiYXNlIGVxICJDaGFuZ2VMb2ciKTsKICAgICB9IGVs c2UgewogICAgICAgICAjIEVpdGhlciBhIGRlbGV0aW9uIG9yIGFuIGFkZGl0aW9uLgogCkluZGV4 OiBXZWJLaXRUb29scy9TY3JpcHRzL3N2bi11bmFwcGx5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRv b2xzL1NjcmlwdHMvc3ZuLXVuYXBwbHkJKHJldmlzaW9uIDE0NzA0KQorKysgV2ViS2l0VG9vbHMv U2NyaXB0cy9zdm4tdW5hcHBseQkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsNyBAQAogIyAg IFBhdGhzIGZyb20gSW5kZXg6IGxpbmVzIGFyZSB1c2VkIHJhdGhlciB0aGFuIHRoZSBwYXRocyBv biB0aGUgcGF0Y2ggbGluZXMsIHdoaWNoCiAjICAgICAgIG1ha2VzIHBhdGNoZXMgZ2VuZXJhdGVk IGJ5ICJjdnMgZGlmZiIgd29yayAoaW5jcmVhc2luZ2x5IHVuaW1wb3J0YW50IHNpbmNlIHdlCiAj ICAgICAgIHVzZSBTdWJ2ZXJzaW9uIG5vdykuCisjICAgQ2hhbmdlTG9nIHBhdGNoZXMgdXNlIC0t ZnV6ej0zIHRvIHByZXZlbnQgcmVqZWN0cy4KICMKICMgTWlzc2luZyBmZWF0dXJlczoKICMKQEAg LTQ0LDcgKzQ1LDYgQEAKICMgICBVc2UgdmVyc2lvbiBudW1iZXJzIGluIHRoZSBwYXRjaCBmaWxl IGFuZCBkbyBhIDMtd2F5IG1lcmdlLgogIyAgIFdoZW4gcmV2ZXJzaW5nIGFuIGFkZGl0aW9uLCBj aGVjayB0aGF0IHRoZSBmaWxlIG1hdGNoZXMgd2hhdCdzIGJlaW5nIHJlbW92ZWQuCiAjICAgTm90 aWNlIGEgcGF0Y2ggdGhhdCdzIGJlaW5nIHVuYXBwbGllZCBhdCB0aGUgIndyb25nIGxldmVsIiBh bmQgbWFrZSBpdCB3b3JrIGFueXdheS4KLSMgICBEbyBhIHNtYXJ0IG1lcmdlIG9uIENoYW5nZUxv ZyBmaWxlcyBpbnN0ZWFkIG9mIGp1c3QgZG9pbmcgYSBub3JtYWwgcGF0Y2guCiAjICAgRG8gYSBk cnkgcnVuIG9uIHRoZSB3aG9sZSBwYXRjaCBhbmQgZG9uJ3QgZG8gYW55dGhpbmcgaWYgcGFydCBv ZiB0aGUgcGF0Y2ggaXMKICMgICAgICAgZ29pbmcgdG8gZmFpbCAocHJvYmFibHkgdG9vIHN0cmlj dCB1bmxlc3Mgd2UgZG8gdGhlIENoYW5nZUxvZyB0aGluZykuCiAKQEAgLTgyLDYgKzgyLDkgQEAK ICAgICBteSAoJHBhdGNoKSA9IEBfOwogICAgIHJldHVybiBpZiAhJHBhdGNoOwogCisgICAgJHBh dGNoID1+IG18XkluZGV4OiAoKChbXi9cbl0qLykqKShbXi9cbl0rKSl8IG9yIGRpZSAiRmFpbGVk IHRvIGZpbmQgSW5kZXg6IGluIFwiJHBhdGNoXCJcbiI7CisgICAgbXkgKCRmdWxscGF0aCwgJHBy ZWZpeCwgJGJhc2UpID0gKCQxLCAkMiwgJDQpOworCiAgICAgbXkgJGRlbGV0aW9uID0gMDsKICAg ICBteSAkYWRkaXRpb24gPSAwOwogCkBAIC05MCwxNiArOTMsMTYgQEAKIAogICAgIGlmICghJGFk ZGl0aW9uICYmICEkZGVsZXRpb24pIHsKICAgICAgICAgIyBTdGFuZGFyZCBwYXRjaCwgcGF0Y2gg dG9vbCBjYW4gaGFuZGxlIHRoaXMuCi0gICAgICAgIG9wZW4gUEFUQ0gsICJ8IHBhdGNoIC1wMCAt UiIgb3IgZGllOworICAgICAgICBteSAkb3B0aW9ucyA9ICItcDAgLVIiOworICAgICAgICAkb3B0 aW9ucyAuPSAiIC0tZnV6ej0zIiBpZiAoJGJhc2UgZXEgIkNoYW5nZUxvZyIpOworICAgICAgICBv cGVuIFBBVENILCAifCBwYXRjaCAkb3B0aW9ucyIgb3IgZGllICJGYWlsZWQgdG8gcGF0Y2ggJGZ1 bGxwYXRoXG4iOwogICAgICAgICBwcmludCBQQVRDSCAkcGF0Y2g7CiAgICAgICAgIGNsb3NlIFBB VENIOworICAgICAgICB1bmxpbmsoJGZ1bGxwYXRoIC4gIi5vcmlnIikgaWYgKCRiYXNlIGVxICJD aGFuZ2VMb2ciKTsKICAgICB9IGVsc2UgewogICAgICAgICAjIEVpdGhlciBhIGRlbGV0aW9uIG9y IGFuIGFkZGl0aW9uLgogCiAgICAgICAgICMgQ2hhbmdlIGRpcmVjdG9yeSBkb3duIGludG8gdGhl IGRpcmVjdG9yeSBpbiBxdWVzdGlvbi4KLSAgICAgICAgJHBhdGNoID1+IG18XkluZGV4OiAoKFte L1xuXSovKSopKFteL1xuXSspfCBvciBkaWUgIkZhaWxlZCB0byBmaW5kIEluZGV4OiBpbiBwYXRj aCI7Ci0gICAgICAgIG15ICRwcmVmaXggPSAkMTsKLSAgICAgICAgbXkgJGJhc2UgPSAkMzsKICAg ICAgICAgaWYgKCRwcmVmaXgpIHsKICAgICAgICAgICAgIGNoZGlyICRwcmVmaXggb3IgZGllICJG YWlsZWQgdG8gY2hkaXIgdG8gJHByZWZpeCI7CiAgICAgICAgIH0KSW5kZXg6IFdlYktpdFRvb2xz L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9u IDE0NzA1KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTMgQEAKKzIwMDYtMDYtMDMgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGtpbHplci5uZXQ+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cDov L2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD05MjkwCisgICAgICAgIFRl YWNoIHN2bi1hcHBseSBhbmQgc3ZuLXVuYXBwbHkgdG8gcGF0Y2ggQ2hhbmdlTG9ncyBjbGVhbmx5 CisKKyAgICAgICAgKiBTY3JpcHRzL3N2bi1hcHBseTogRml4ZWQgdG8gYXBwbHkgQ2hhbmdlTG9n IHBhdGNoZXMgd2l0aG91dCBmYWlsaW5nLgorICAgICAgICAqIFNjcmlwdHMvc3ZuLXVuYXBwbHk6 IERpdHRvLgorCiAyMDA2LTA2LTAyICBTdGV2ZSBGYWxrZW5idXJnICA8c2ZhbGtlbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgZGFyaW4uCg== 8677 2006-06-03 04:58:03 -0700 2006-06-03 09:41:47 -0700 Patch v2 bug-9290-v2.diff text/plain 6128 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CShyZXZpc2lvbiAxNDcwOSkKKysrIFdlYktpdFRvb2xz L1NjcmlwdHMvc3ZuLWFwcGx5CSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNiBAQAogIyEvdXNy L2Jpbi9wZXJsIC13CiAKLSMgQ29weXJpZ2h0IChDKSAyMDA1IEFwcGxlIENvbXB1dGVyLCBJbmMu ICBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMDUsIDIwMDYgQXBwbGUg Q29tcHV0ZXIsIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMKQEAgLTM3LDYgKzM3LDcgQEAKICMgICBQYXRocyBmcm9tIEluZGV4OiBsaW5lcyBh cmUgdXNlZCByYXRoZXIgdGhhbiB0aGUgcGF0aHMgb24gdGhlIHBhdGNoIGxpbmVzLCB3aGljaAog IyAgICAgICBtYWtlcyBwYXRjaGVzIGdlbmVyYXRlZCBieSAiY3ZzIGRpZmYiIHdvcmsgKGluY3Jl YXNpbmdseSB1bmltcG9ydGFudCBzaW5jZSB3ZQogIyAgICAgICB1c2UgU3VidmVyc2lvbiBub3cp LgorIyAgIENoYW5nZUxvZyBwYXRjaGVzIHVzZSAtLWZ1eno9MyB0byBwcmV2ZW50IHJlamVjdHMu CiAjCiAjIE1pc3NpbmcgZmVhdHVyZXM6CiAjCkBAIC00NSw3ICs0Niw2IEBACiAjICAgSGFuZGxl IGZpbGUgbW92ZXMgKHJlcXVpcmVzIHBhdGNoZXMgbWFkZSBieSBzdm4tY3JlYXRlLXBhdGNoKS4K ICMgICBXaGVuIGRvaW5nIGEgcmVtb3ZhbCwgY2hlY2sgdGhhdCBvbGQgZmlsZSBtYXRjaGVzIHdo YXQncyBiZWluZyByZW1vdmVkLgogIyAgIE5vdGljZSBhIHBhdGNoIHRoYXQncyBiZWluZyBhcHBs aWVkIGF0IHRoZSAid3JvbmcgbGV2ZWwiIGFuZCBtYWtlIGl0IHdvcmsgYW55d2F5LgotIyAgIERv IGEgc21hcnQgbWVyZ2Ugb24gQ2hhbmdlTG9nIGZpbGVzIGluc3RlYWQgb2YganVzdCBkb2luZyBh IG5vcm1hbCBwYXRjaC4KICMgICBEbyBhIGRyeSBydW4gb24gdGhlIHdob2xlIHBhdGNoIGFuZCBk b24ndCBkbyBhbnl0aGluZyBpZiBwYXJ0IG9mIHRoZSBwYXRjaCBpcwogIyAgICAgICBnb2luZyB0 byBmYWlsIChwcm9iYWJseSB0b28gc3RyaWN0IHVubGVzcyB3ZSBkbyB0aGUgQ2hhbmdlTG9nIHRo aW5nKS4KIApAQCAtMTA3LDYgKzEwNywxNiBAQAogICAgIHBhdGNoKCRwYXRjaCk7CiB9CiAKK3N1 YiBhcHBseVBhdGNoCit7CisgICAgbXkgKCRwYXRjaCwgJGZ1bGxwYXRoLCAkb3B0aW9ucykgPSBA XzsKKyAgICAkb3B0aW9ucyA9IFtdIGlmICghICRvcHRpb25zKTsKKyAgICBteSAkY29tbWFuZCA9 ICJwYXRjaCAiIC4gam9pbigiICIsICItcDAiLCBAeyRvcHRpb25zfSk7CisgICAgb3BlbiBQQVRD SCwgInwgJGNvbW1hbmQiIG9yIGRpZSAiRmFpbGVkIHRvIHBhdGNoICRmdWxscGF0aFxuIjsKKyAg ICBwcmludCBQQVRDSCAkcGF0Y2g7CisgICAgY2xvc2UgUEFUQ0g7Cit9CisKIHN1YiBwYXRjaAog ewogICAgIG15ICgkcGF0Y2gpID0gQF87CkBAIC0xMjMsOSArMTMzLDE0IEBACiAKICAgICBpZiAo ISRhZGRpdGlvbiAmJiAhJGRlbGV0aW9uKSB7CiAgICAgICAgICMgU3RhbmRhcmQgcGF0Y2gsIHBh dGNoIHRvb2wgY2FuIGhhbmRsZSB0aGlzLgotICAgICAgICBvcGVuIFBBVENILCAifCBwYXRjaCAt cDAiIG9yIGRpZSAiRmFpbGVkIHRvIHBhdGNoICRmdWxscGF0aFxuIjsKLSAgICAgICAgcHJpbnQg UEFUQ0ggJHBhdGNoOwotICAgICAgICBjbG9zZSBQQVRDSDsKKyAgICAgICAgaWYgKCRiYXNlIGVx ICJDaGFuZ2VMb2ciKSB7CisgICAgICAgICAgICBteSAkY2hhbmdlTG9nRG90T3JpZ0V4aXN0ZWQg PSAtZiAiJHtmdWxscGF0aH0ub3JpZyI7CisgICAgICAgICAgICBhcHBseVBhdGNoKCRwYXRjaCwg JGZ1bGxwYXRoLCBbIi0tZnV6ej0zIl0pOworICAgICAgICAgICAgdW5saW5rKCIke2Z1bGxwYXRo fS5vcmlnIikgaWYgKCEgJGNoYW5nZUxvZ0RvdE9yaWdFeGlzdGVkKTsKKyAgICAgICAgfQorICAg ICAgICBlbHNlIHsKKyAgICAgICAgICAgIGFwcGx5UGF0Y2goJHBhdGNoLCAkZnVsbHBhdGgpOwor ICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgIyBFaXRoZXIgYSBkZWxldGlvbiBvciBh biBhZGRpdGlvbi4KIApJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4tdW5hcHBseQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3N2bi11bmFwcGx5CShyZXZpc2lvbiAxNDcw OSkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLXVuYXBwbHkJKHdvcmtpbmcgY29weSkKQEAg LTM1LDYgKzM1LDcgQEAKICMgICBQYXRocyBmcm9tIEluZGV4OiBsaW5lcyBhcmUgdXNlZCByYXRo ZXIgdGhhbiB0aGUgcGF0aHMgb24gdGhlIHBhdGNoIGxpbmVzLCB3aGljaAogIyAgICAgICBtYWtl cyBwYXRjaGVzIGdlbmVyYXRlZCBieSAiY3ZzIGRpZmYiIHdvcmsgKGluY3JlYXNpbmdseSB1bmlt cG9ydGFudCBzaW5jZSB3ZQogIyAgICAgICB1c2UgU3VidmVyc2lvbiBub3cpLgorIyAgIENoYW5n ZUxvZyBwYXRjaGVzIHVzZSAtLWZ1eno9MyB0byBwcmV2ZW50IHJlamVjdHMuCiAjCiAjIE1pc3Np bmcgZmVhdHVyZXM6CiAjCkBAIC00NCw3ICs0NSw2IEBACiAjICAgVXNlIHZlcnNpb24gbnVtYmVy cyBpbiB0aGUgcGF0Y2ggZmlsZSBhbmQgZG8gYSAzLXdheSBtZXJnZS4KICMgICBXaGVuIHJldmVy c2luZyBhbiBhZGRpdGlvbiwgY2hlY2sgdGhhdCB0aGUgZmlsZSBtYXRjaGVzIHdoYXQncyBiZWlu ZyByZW1vdmVkLgogIyAgIE5vdGljZSBhIHBhdGNoIHRoYXQncyBiZWluZyB1bmFwcGxpZWQgYXQg dGhlICJ3cm9uZyBsZXZlbCIgYW5kIG1ha2UgaXQgd29yayBhbnl3YXkuCi0jICAgRG8gYSBzbWFy dCBtZXJnZSBvbiBDaGFuZ2VMb2cgZmlsZXMgaW5zdGVhZCBvZiBqdXN0IGRvaW5nIGEgbm9ybWFs IHBhdGNoLgogIyAgIERvIGEgZHJ5IHJ1biBvbiB0aGUgd2hvbGUgcGF0Y2ggYW5kIGRvbid0IGRv IGFueXRoaW5nIGlmIHBhcnQgb2YgdGhlIHBhdGNoIGlzCiAjICAgICAgIGdvaW5nIHRvIGZhaWwg KHByb2JhYmx5IHRvbyBzdHJpY3QgdW5sZXNzIHdlIGRvIHRoZSBDaGFuZ2VMb2cgdGhpbmcpLgog CkBAIC03NywxMSArNzcsMjQgQEAKIH0KIHBhdGNoKCRwYXRjaCk7CiAKK3N1YiB1bmFwcGx5UGF0 Y2gKK3sKKyAgICBteSAoJHBhdGNoLCAkZnVsbHBhdGgsICRvcHRpb25zKSA9IEBfOworICAgICRv cHRpb25zID0gW10gaWYgKCEgJG9wdGlvbnMpOworICAgIG15ICRjb21tYW5kID0gInBhdGNoICIg LiBqb2luKCIgIiwgIi1wMCIsICItUiIsIEB7JG9wdGlvbnN9KTsKKyAgICBvcGVuIFBBVENILCAi fCAkY29tbWFuZCIgb3IgZGllICJGYWlsZWQgdG8gcGF0Y2ggJGZ1bGxwYXRoXG4iOworICAgIHBy aW50IFBBVENIICRwYXRjaDsKKyAgICBjbG9zZSBQQVRDSDsKK30KKwogc3ViIHBhdGNoCiB7CiAg ICAgbXkgKCRwYXRjaCkgPSBAXzsKICAgICByZXR1cm4gaWYgISRwYXRjaDsKIAorICAgICRwYXRj aCA9fiBtfF5JbmRleDogKCgoW14vXG5dKi8pKikoW14vXG5dKykpfCBvciBkaWUgIkZhaWxlZCB0 byBmaW5kIEluZGV4OiBpbiBcIiRwYXRjaFwiXG4iOworICAgIG15ICgkZnVsbHBhdGgsICRwcmVm aXgsICRiYXNlKSA9ICgkMSwgJDIsICQ0KTsKKwogICAgIG15ICRkZWxldGlvbiA9IDA7CiAgICAg bXkgJGFkZGl0aW9uID0gMDsKIApAQCAtOTAsMzUgKzEwMywyNSBAQAogCiAgICAgaWYgKCEkYWRk aXRpb24gJiYgISRkZWxldGlvbikgewogICAgICAgICAjIFN0YW5kYXJkIHBhdGNoLCBwYXRjaCB0 b29sIGNhbiBoYW5kbGUgdGhpcy4KLSAgICAgICAgb3BlbiBQQVRDSCwgInwgcGF0Y2ggLXAwIC1S IiBvciBkaWU7Ci0gICAgICAgIHByaW50IFBBVENIICRwYXRjaDsKLSAgICAgICAgY2xvc2UgUEFU Q0g7CisgICAgICAgIGlmICgkYmFzZSBlcSAiQ2hhbmdlTG9nIikgeworICAgICAgICAgICAgbXkg JGNoYW5nZUxvZ0RvdE9yaWdFeGlzdGVkID0gLWYgIiR7ZnVsbHBhdGh9Lm9yaWciOworICAgICAg ICAgICAgdW5hcHBseVBhdGNoKCRwYXRjaCwgJGZ1bGxwYXRoLCBbIi0tZnV6ej0zIl0pOworICAg ICAgICAgICAgdW5saW5rKCIke2Z1bGxwYXRofS5vcmlnIikgaWYgKCEgJGNoYW5nZUxvZ0RvdE9y aWdFeGlzdGVkKTsKKyAgICAgICAgfQorICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIHVuYXBw bHlQYXRjaCgkcGF0Y2gsICRmdWxscGF0aCk7CisgICAgICAgIH0KICAgICB9IGVsc2UgewogICAg ICAgICAjIEVpdGhlciBhIGRlbGV0aW9uIG9yIGFuIGFkZGl0aW9uLgogCiAgICAgICAgICMgQ2hh bmdlIGRpcmVjdG9yeSBkb3duIGludG8gdGhlIGRpcmVjdG9yeSBpbiBxdWVzdGlvbi4KLSAgICAg ICAgJHBhdGNoID1+IG18XkluZGV4OiAoKFteL1xuXSovKSopKFteL1xuXSspfCBvciBkaWUgIkZh aWxlZCB0byBmaW5kIEluZGV4OiBpbiBwYXRjaCI7Ci0gICAgICAgIG15ICRwcmVmaXggPSAkMTsK LSAgICAgICAgbXkgJGJhc2UgPSAkMzsKICAgICAgICAgaWYgKCRwcmVmaXgpIHsKICAgICAgICAg ICAgIGNoZGlyICRwcmVmaXggb3IgZGllICJGYWlsZWQgdG8gY2hkaXIgdG8gJHByZWZpeCI7CiAg ICAgICAgIH0KIAogICAgICAgICBpZiAoJGRlbGV0aW9uKSB7CiAgICAgICAgICAgICAjIFJldmVy c2UgYSBkZWxldGlvbi4KLSAgICAgICAgICAgIHN5c3RlbSAic3ZuIiwgImFkZCIsICIkYmFzZSI7 Ci0gICAgICAgICAgICBteSAkZmlsZSA9ICRwYXRjaDsKLSAgICAgICAgICAgIGlmICgkZmlsZSAh fiBzL14oLipcbikqQEBbXlxuXStAQFxuLy8pIHsKLSAgICAgICAgICAgICAgICAjIEVtcHR5IGZp bGUuCi0gICAgICAgICAgICAgICAgJGZpbGUgPSAiIjsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICAgICAgIyBOb24tZW1wdHkgZmlsZTogUmVtb3ZlIGxlYWRpbmcgLSBzaWducy4K LSAgICAgICAgICAgICAgICAkZmlsZSA9fiBzL14tLy87Ci0gICAgICAgICAgICAgICAgJGZpbGUg PX4gcy9cbi0vXG4vZzsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIG9wZW4gRklMRSwgIj4i LCAkYmFzZSBvciBkaWU7Ci0gICAgICAgICAgICBwcmludCBGSUxFICRmaWxlOwotICAgICAgICAg ICAgY2xvc2UgRklMRTsKKyAgICAgICAgICAgIHN5c3RlbSAic3ZuIiwgInJldmVydCIsICIkYmFz ZSI7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAjIFJldmVyc2UgYW4gYWRkaXRpb24u CiAgICAgICAgICAgICBzeXN0ZW0gInN2biIsICJybSIsICItLWZvcmNlIiwgJGJhc2U7CkluZGV4 OiBXZWJLaXRUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvQ2hhbmdl TG9nCShyZXZpc2lvbiAxNDcwOSkKKysrIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDA2LTA2LTAzICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHpl ckBraWx6ZXIubmV0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI5 MAorICAgICAgICBUZWFjaCBzdm4tYXBwbHkgYW5kIHN2bi11bmFwcGx5IHRvIHBhdGNoIENoYW5n ZUxvZ3MgY2xlYW5seQorCisgICAgICAgICogU2NyaXB0cy9zdm4tYXBwbHk6IEZpeGVkIHRvIGFw cGx5IENoYW5nZUxvZyBwYXRjaGVzIHdpdGhvdXQgZmFpbGluZy4KKyAgICAgICAgKiBTY3JpcHRz L3N2bi11bmFwcGx5OiBEaXR0by4gIEFsc28gc2ltcGxpZmllZCByZXZlcnNpbmcgYSBkZWxldGlv bi4KKwogMjAwNi0wNi0wMyAgU3RldmUgRmFsa2VuYnVyZyAgPHNmYWxrZW5AYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IGh5YXR0Lgo=