60848 2011-05-14 15:44:20 -0700 svn-{apply, unapply} can't handle Git diff that only changes executable bit 2011-05-15 16:55:29 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates dbates abarth a.renevier ddkilzer eric oldest_to_newest 404132 0 dbates 2011-05-14 15:44:20 -0700 The patch <https://bugs.webkit.org/attachment.cgi?id=90852> failed to apply since it contains a diff that only changes the executable bit of a file, Tools/Scripts/run-gtk-tests. svn-{apply, unapply} can handle the SVN equivalent of this, an SVN property change diff for a file that only has property changes, since it follows naturally from the presence of an SVN property change header (because property changes are separated from content changes in an SVN patch). Git outputs one diff header per file that may include, among other things, file mode information; content changes; or both. We should teach svn-{apply, unapply} how to handle a diff that only changes the executable bit of a file. 404133 1 93572 dbates 2011-05-14 15:47:52 -0700 Created attachment 93572 Patch and unit tests 404224 2 dbates 2011-05-15 16:55:16 -0700 Committed r86515: <http://trac.webkit.org/changeset/86515> 93572 2011-05-14 15:47:52 -0700 2011-05-15 16:55:29 -0700 Patch and unit tests Bug60848.patch text/plain 14529 dbates SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDg2NDk4KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjggQEAKKzIwMTEtMDUtMTQgIERhbmllbCBCYXRlcyAgPGRiYXRlc0B3ZWJraXQub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHN2bi1hcHBs eSBjYW4ndCBoYW5kbGUgR2l0IGRpZmYgdGhhdCBvbmx5IGNoYW5nZXMgZXhlY3V0YWJsZSBiaXQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwODQ4CisK KyAgICAgICAgRml4ZXMgYW4gaXNzdWUgd2hlcmUgc3ZuLXthcHBseSwgdW5hcHBseX0gZmFpbCB0 byBoYW5kbGUgYSBHaXQgZGlmZiBmb3IgYSBmaWxlCisgICAgICAgIHRoYXQgb25seSBoYXMgYW4g ZXhlY3V0YWJsZSBiaXQgY2hhbmdlLgorCisgICAgICAgICogU2NyaXB0cy9WQ1NVdGlscy5wbToK KyAgICAgICAgICAtIE1vZGlmaWVkIHJlZ2V4ICRjaHVua1JhbmdlUmVnRXggdG8gbWF0Y2ggY2h1 bmsgcmFuZ2Ugd2l0aCBlbmRpbmcgdGV4dCwgc2F5OiBAQCAtMiw2ICsyLDE4IEBAIGZvbygpLgor ICAgICAgICAocGFyc2VEaWZmKTogTW9kaWZpZWQgdG8gY291bnQgdGhlIG51bWJlciBvZiB0ZXh0 IGNodW5rcyBpbiB0aGUgZGlmZi4gVGhpcyBzaG91bGQgYWxzbyBoZWxwIHRvd2FyZHMKKyAgICAg ICAgZml4aW5nIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk2ODQ+ LgorICAgICAgICAqIFNjcmlwdHMvc3ZuLWFwcGx5OgorICAgICAgICAocGF0Y2gpOiBPbmx5IHVz ZSBzdGFuZGFyZCBwYXRjaCB0b29sIGlmIHRoZSBwYXRjaCBpcyBub24tZW1wdHkgYW5kIGZvciBh IHRleHQgZmlsZSAoaS5lLiBub3QgYSBiaW5hcnkgcGF0Y2gpLgorICAgICAgICAqIFNjcmlwdHMv c3ZuLXVuYXBwbHk6CisgICAgICAgIChwYXRjaCk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZURpZmYucGw6CisgICAgICAgICAgLSBV cGRhdGVkIGV4cGVjdGVkIHJlc3VsdHMgZm9yIHRlc3QgY2FzZXMgdG8gYWNjb3VudCBmb3IgbnVt VGV4dENodW5rcy4KKyAgICAgICAgICAtIEZpeGVkIG1hbGZvcm1lZCBjaHVuayByYW5nZSBpbiB0 ZXN0IGNhc2VzOiAiR2l0OiBzaW1wbGUiLCBhbmQgIkdpdDogR2l0IGRpZmYgZm9sbG93ZWQgYnkg U1ZOIGRpZmYiLgorICAgICAgICAgIC0gQWRkZWQgdGVzdCBjYXNlICJHaXQ6IGZpbGUgdGhhdCBv bmx5IGhhcyBhbiBleGVjdXRhYmxlIGJpdCBjaGFuZ2UiLgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZURpZmZXaXRoTW9ja0ZpbGVzLnBsOgorICAg ICAgICAgIC0gVXBkYXRlZCBleHBlY3RlZCByZXN1bHRzIGZvciB0ZXN0IGNhc2VzIHRvIGFjY291 bnQgZm9yIG51bVRleHRDaHVua3MuCisKIDIwMTEtMDUtMTQgIEFybm8gUmVuZXZpZXIgIDxhcm5v QHJlbmV2aWVyLm5ldD4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5zb24uCklu ZGV4OiBUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvVkNTVXRpbHMucG0JKHJldmlzaW9uIDg2NDg4KQorKysgVG9vbHMvU2NyaXB0cy9WQ1NVdGls cy5wbQkod29ya2luZyBjb3B5KQpAQCAtOTgsNyArOTgsNyBAQCBteSAkc3ZuVmVyc2lvbjsKICMg UHJvamVjdCB0aW1lIHpvbmUgZm9yIEN1cGVydGlubywgQ0EsIFVTCiBteSAkY2hhbmdlTG9nVGlt ZVpvbmUgPSAiUFNUOFBEVCI7CiAKLW15ICRjaHVua1JhbmdlUmVnRXggPSBxciNeXEBcQCAtKFxk KyksKFxkKykgXCtcZCssKFxkKykgXEBcQCQjOyAjIGUuZy4gQEAgLTIsNiArMiwxOCBAQAorbXkg JGNodW5rUmFuZ2VSZWdFeCA9IHFyI15cQFxAIC0oXGQrKSwoXGQrKSBcK1xkKywoXGQrKSBcQFxA IzsgIyBlLmcuICJAQCAtMiw2ICsyLDE4IEBAIiBvciAiQEAgLTIsNiArMiwxOCBAQCBmb28oKSIK IG15ICRnaXREaWZmU3RhcnRSZWdFeCA9IHFyI15kaWZmIC0tZ2l0IChcdy8pPyguKykgKFx3Lyk/ KFteXHJcbl0rKSM7CiBteSAkc3ZuRGlmZlN0YXJ0UmVnRXggPSBxciNeSW5kZXg6IChbXlxyXG5d KykjOwogbXkgJHN2blByb3BlcnRpZXNTdGFydFJlZ0V4ID0gcXIjXlByb3BlcnR5IGNoYW5nZXMg b246IChbXlxyXG5dKykjOyAjICQxIGlzIG5vcm1hbGx5IHRoZSBzYW1lIGFzIHRoZSBpbmRleCBw YXRoLgpAQCAtODgyLDYgKzg4Miw3IEBAIHN1YiBwYXJzZURpZmYoJCQ7JCkKICAgICBteSAkc3Zu UHJvcGVydGllc0hhc2hSZWY7ICMgTGFzdCBTVk4gcHJvcGVydGllcyBkaWZmIGZvdW5kLCBhcyBy ZXR1cm5lZCBieSBwYXJzZVN2bkRpZmZQcm9wZXJ0aWVzKCkuCiAgICAgbXkgJHN2blRleHQ7CiAg ICAgbXkgJGluZGV4UGF0aEVPTDsKKyAgICBteSAkbnVtVGV4dENodW5rcyA9IDA7CiAgICAgd2hp bGUgKGRlZmluZWQoJGxpbmUpKSB7CiAgICAgICAgIGlmICghJGhlYWRlckhhc2hSZWYgJiYgKCRs aW5lID1+ICRnaXREaWZmU3RhcnRSZWdFeCkpIHsKICAgICAgICAgICAgICMgVGhlbiBhc3N1bWUg YWxsIGRpZmZzIGluIHRoZSBwYXRjaCBhcmUgR2l0LWZvcm1hdHRlZC4gVGhpcwpAQCAtOTA0LDYg KzkwNSw3IEBAIHN1YiBwYXJzZURpZmYoJCQ7JCkKICAgICAgICAgfQogICAgICAgICBpZiAoJGxp bmUgIX4gJGhlYWRlclN0YXJ0UmVnRXgpIHsKICAgICAgICAgICAgICMgVGhlbiB3ZSBhcmUgaW4g dGhlIGJvZHkgb2YgdGhlIGRpZmYuCisgICAgICAgICAgICAkbnVtVGV4dENodW5rcyArPSAkbGlu ZSA9fiAvJGNodW5rUmFuZ2VSZWdFeC87CiAgICAgICAgICAgICBpZiAoJGluZGV4UGF0aEVPTCAm JiAkbGluZSAhfiAvJGNodW5rUmFuZ2VSZWdFeC8pIHsKICAgICAgICAgICAgICAgICAjIFRoZSBj aHVuayByYW5nZSBpcyBwYXJ0IG9mIHRoZSBib2R5IG9mIHRoZSBkaWZmLCBidXQgaXRzIGxpbmUg ZW5kaW5ncyBzaG91bGQndCBiZQogICAgICAgICAgICAgICAgICMgbW9kaWZpZWQgb3IgcGF0Y2go MSkgd2lsbCBjb21wbGFpbi4gU28sIHdlIG9ubHkgbW9kaWZ5IG5vbi1jaHVuayByYW5nZSBsaW5l cy4KQEAgLTk4Myw2ICs5ODUsNyBAQCBzdWIgcGFyc2VEaWZmKCQkOyQpCiAgICAgICAgICMgZGlm ZiBmb3IgYSBmaWxlIHRoYXQgb25seSBoYXMgcHJvcGVydHkgY2hhbmdlcyB3aWxsIG5vdCByZXR1 cm4KICAgICAgICAgIyBhbnkgU1ZOIGNvbnZlcnRlZCB0ZXh0LgogICAgICAgICAkZGlmZkhhc2h7 c3ZuQ29udmVydGVkVGV4dH0gPSAkc3ZuVGV4dCBpZiAkc3ZuVGV4dDsKKyAgICAgICAgJGRpZmZI YXNoe251bVRleHRDaHVua3N9ID0gJG51bVRleHRDaHVua3MgaWYgJHN2blRleHQgJiYgISRoZWFk ZXJIYXNoUmVmLT57aXNCaW5hcnl9OwogICAgICAgICBwdXNoIEBkaWZmSGFzaFJlZnMsIFwlZGlm Zkhhc2g7CiAgICAgfQogCkluZGV4OiBUb29scy9TY3JpcHRzL3N2bi1hcHBseQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3N2bi1hcHBseQkocmV2aXNpb24gODY0ODgpCisrKyBUb29scy9T Y3JpcHRzL3N2bi1hcHBseQkod29ya2luZyBjb3B5KQpAQCAtMzE1LDYgKzMxNSw3IEBAIHN1YiBw YXRjaCgkKQogICAgIG15ICRmdWxsUGF0aCA9ICRkaWZmSGFzaFJlZi0+e2luZGV4UGF0aH07CiAg ICAgbXkgJGlzQmluYXJ5ID0gJGRpZmZIYXNoUmVmLT57aXNCaW5hcnl9OwogICAgIG15ICRpc0dp dCA9ICRkaWZmSGFzaFJlZi0+e2lzR2l0fTsKKyAgICBteSAkaXNOb25FbXB0eVRleHRQYXRjaCA9 ICRwYXRjaCAmJiAkZGlmZkhhc2hSZWYtPntudW1UZXh0Q2h1bmtzfTsKIAogICAgIG15ICRkZWxl dGlvbiA9IDA7CiAgICAgbXkgJGFkZGl0aW9uID0gMDsKQEAgLTMyMiw3ICszMjMsNyBAQCBzdWIg cGF0Y2goJCkKICAgICAkYWRkaXRpb24gPSAxIGlmICgkZGlmZkhhc2hSZWYtPntpc05ld30gfHwg JHBhdGNoID1+IC9cbkBAIC0wLDAgLiogQEAvKTsKICAgICAkZGVsZXRpb24gPSAxIGlmICgkZGlm Zkhhc2hSZWYtPntpc0RlbGV0aW9ufSB8fCAkcGF0Y2ggPX4gL1xuQEAgLiogXCswLDAgQEAvKTsK IAotICAgIGlmICghJGFkZGl0aW9uICYmICEkZGVsZXRpb24gJiYgISRpc0JpbmFyeSkgeworICAg IGlmICghJGFkZGl0aW9uICYmICEkZGVsZXRpb24gJiYgISRpc0JpbmFyeSAmJiAkaXNOb25FbXB0 eVRleHRQYXRjaCkgewogICAgICAgICAjIFN0YW5kYXJkIHBhdGNoLCBwYXRjaCB0b29sIGNhbiBo YW5kbGUgdGhpcy4KICAgICAgICAgaWYgKGJhc2VuYW1lKCRmdWxsUGF0aCkgZXEgIkNoYW5nZUxv ZyIpIHsKICAgICAgICAgICAgIG15ICRjaGFuZ2VMb2dEb3RPcmlnRXhpc3RlZCA9IC1mICIke2Z1 bGxQYXRofS5vcmlnIjsKQEAgLTMzMSw3ICszMzIsNyBAQCBzdWIgcGF0Y2goJCkKICAgICAgICAg ICAgIGFwcGx5UGF0Y2goJG5ld1BhdGNoLCAkZnVsbFBhdGgsIFsiLS1mdXp6PTMiXSk7CiAgICAg ICAgICAgICB1bmxpbmsoIiR7ZnVsbFBhdGh9Lm9yaWciKSBpZiAoISAkY2hhbmdlTG9nRG90T3Jp Z0V4aXN0ZWQpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgYXBwbHlQYXRjaCgkcGF0 Y2gsICRmdWxsUGF0aCkgaWYgJHBhdGNoOworICAgICAgICAgICAgYXBwbHlQYXRjaCgkcGF0Y2gs ICRmdWxsUGF0aCk7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICAjIEVpdGhlciBh IGRlbGV0aW9uLCBhbiBhZGRpdGlvbiBvciBhIGJpbmFyeSBjaGFuZ2UuCkBAIC0zNDcsNyArMzQ4 LDcgQEAgc3ViIHBhdGNoKCQpCiAgICAgICAgIH0gZWxzaWYgKCRkZWxldGlvbikgewogICAgICAg ICAgICAgYXBwbHlQYXRjaCgkcGF0Y2gsICRmdWxsUGF0aCwgWyItLWZvcmNlIl0pIGlmICRwYXRj aDsKICAgICAgICAgICAgIHNjbVJlbW92ZSgkZnVsbFBhdGgpOwotICAgICAgICB9IGVsc2Ugewor ICAgICAgICB9IGVsc2lmICgkYWRkaXRpb24pIHsKICAgICAgICAgICAgICMgQWRkaXRpb24KICAg ICAgICAgICAgIHJlbmFtZSgkZnVsbFBhdGgsICIkZnVsbFBhdGgub3JpZyIpIGlmIC1lICRmdWxs UGF0aDsKICAgICAgICAgICAgIGFwcGx5UGF0Y2goJHBhdGNoLCAkZnVsbFBhdGgpIGlmICRwYXRj aDsKSW5kZXg6IFRvb2xzL1NjcmlwdHMvc3ZuLXVuYXBwbHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv U2NyaXB0cy9zdm4tdW5hcHBseQkocmV2aXNpb24gODY0ODgpCisrKyBUb29scy9TY3JpcHRzL3N2 bi11bmFwcGx5CSh3b3JraW5nIGNvcHkpCkBAIC0xNDUsNiArMTQ1LDcgQEAgc3ViIHBhdGNoKCQp CiAKICAgICBteSAkZnVsbFBhdGggPSAkZGlmZkhhc2hSZWYtPntpbmRleFBhdGh9OwogICAgIG15 ICRpc1N2bkJpbmFyeSA9ICRkaWZmSGFzaFJlZi0+e2lzQmluYXJ5fSAmJiAkZGlmZkhhc2hSZWYt Pntpc1N2bn07CisgICAgbXkgJGlzTm9uRW1wdHlUZXh0UGF0Y2ggPSAkcGF0Y2ggJiYgJGRpZmZI YXNoUmVmLT57bnVtVGV4dENodW5rc307CiAKICAgICAkZGlyZWN0b3JpZXNUb0NoZWNre2Rpcm5h bWUoJGZ1bGxQYXRoKX0gPSAxOwogCkBAIC0xNTQsNyArMTU1LDcgQEAgc3ViIHBhdGNoKCQpCiAg ICAgJGFkZGl0aW9uID0gMSBpZiAoJGRpZmZIYXNoUmVmLT57aXNOZXd9IHx8ICRkaWZmSGFzaFJl Zi0+e2NvcGllZEZyb21QYXRofSB8fCAkcGF0Y2ggPX4gL1xuQEAgLTAsMCAuKiBAQC8pOwogICAg ICRkZWxldGlvbiA9IDEgaWYgKCRkaWZmSGFzaFJlZi0+e2lzRGVsZXRpb259IHx8ICRwYXRjaCA9 fiAvXG5AQCAuKiBcKzAsMCBAQC8pOwogCi0gICAgaWYgKCEkYWRkaXRpb24gJiYgISRkZWxldGlv biAmJiAhJGlzU3ZuQmluYXJ5KSB7CisgICAgaWYgKCEkYWRkaXRpb24gJiYgISRkZWxldGlvbiAm JiAhJGlzU3ZuQmluYXJ5ICYmICRpc05vbkVtcHR5VGV4dFBhdGNoKSB7CiAgICAgICAgICMgU3Rh bmRhcmQgcGF0Y2gsIHBhdGNoIHRvb2wgY2FuIGhhbmRsZSB0aGlzLgogICAgICAgICBpZiAoYmFz ZW5hbWUoJGZ1bGxQYXRoKSBlcSAiQ2hhbmdlTG9nIikgewogICAgICAgICAgICAgbXkgJGNoYW5n ZUxvZ0RvdE9yaWdFeGlzdGVkID0gLWYgIiR7ZnVsbFBhdGh9Lm9yaWciOwpAQCAtMTk4LDcgKzE5 OSw3IEBAIHN1YiBwYXRjaCgkKQogCiAgICAgICAgICAgICAjIFNob3cgc3RhdHVzIGlmIHRoZSBm aWxlIGlzIG1vZGlmZWQKICAgICAgICAgICAgIHN5c3RlbSAic3ZuIiwgInN0YXQiLCAkZnVsbFBh dGg7Ci0gICAgICAgIH0gZWxzZSB7CisgICAgICAgIH0gZWxzaWYgKCRhZGRpdGlvbikgewogICAg ICAgICAgICAgIyBSZXZlcnNlIGFkZGl0aW9uCiAgICAgICAgICAgICAjCiAgICAgICAgICAgICAj IEZJWE1FOiBUaGlzIHNob3VsZCB1c2UgdGhlIHNhbWUgbG9naWMgYXMgc3ZuLWFwcGx5J3MgZGVs ZXRpb24KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9w YXJzZURpZmYucGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0 aWxzX3VuaXR0ZXN0L3BhcnNlRGlmZi5wbAkocmV2aXNpb24gODY0ODgpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VEaWZmLnBsCSh3b3JraW5nIGNv cHkpCkBAIC02MSw2ICs2MSw3IEBAIEluZGV4OiBNYWtlZmlsZQogRU5ECiAgICAgaW5kZXhQYXRo ID0+ICJNYWtlZmlsZSIsCiAgICAgaXNTdm4gPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtzID0+IDEs CiAgICAgc291cmNlUmV2aXNpb24gPT4gIjUzMDUyIiwKIH1dLAogdW5kZWZdLApAQCAtMTc1LDYg KzE3Niw3IEBAIEluZGV4OiBNYWtlZmlsZQogRU5ECiAgICAgaW5kZXhQYXRoID0+ICJNYWtlZmls ZSIsCiAgICAgaXNTdm4gPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtzID0+IDEsCiAgICAgc291cmNl UmV2aXNpb24gPT4gIjUzMDUyIiwKIH1dLAogdW5kZWZdLApAQCAtMjI2LDYgKzIyOCw3IEBAIElu ZGV4OiBNYWtlZmlsZQogRU5ECiAgICAgaW5kZXhQYXRoID0+ICJNYWtlZmlsZSIsCiAgICAgaXNT dm4gPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtzID0+IDEsCiAgICAgc291cmNlUmV2aXNpb24gPT4g IjUzMTMxIiwKIH1dLAogIkluZGV4OiBNYWtlZmlsZV9uZXdcbiJdLApAQCAtMjY0LDYgKzI2Nyw3 IEBAIGluZGV4IGY1ZDVlNzQuLjNiNmFhOTIgMTAwNjQ0CiBFTkQKICAgICBpbmRleFBhdGggPT4g Ik1ha2VmaWxlIiwKICAgICBpc1N2biA9PiAxLAorICAgIG51bVRleHRDaHVua3MgPT4gMSwKICAg ICBzb3VyY2VSZXZpc2lvbiA9PiAiNTMxMzEiLAogfV0sCiB1bmRlZl0sCkBAIC0zMDgsNiArMzEy LDcgQEAgRU5ECiAgICAgZXhlY3V0YWJsZUJpdERlbHRhID0+IDEsCiAgICAgaW5kZXhQYXRoID0+ ICJNYWtlZmlsZSIsCiAgICAgaXNTdm4gPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtzID0+IDEsCiAg ICAgc291cmNlUmV2aXNpb24gPT4gIjYwMDIxIiwKIH1dLAogdW5kZWZdLApAQCAtMzQ4LDYgKzM1 Myw3IEBAIEluZGV4OiBNYWtlZmlsZQogRU5ECiAgICAgaW5kZXhQYXRoID0+ICJNYWtlZmlsZSIs CiAgICAgaXNTdm4gPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtzID0+IDEsCiAgICAgc291cmNlUmV2 aXNpb24gPT4gIjYwMDIxIiwKIH1dLAogIlByb3BlcnR5IGNoYW5nZXMgb246IE1ha2VmaWxlLnNo YXJlZFxuIl0sCkBAIC03OTUsNiArODAxLDcgQEAgRU5ECiAgICAgZXhlY3V0YWJsZUJpdERlbHRh ID0+IDEsCiAgICAgaW5kZXhQYXRoID0+ICJNYWtlZmlsZSIsCiAgICAgaXNTdm4gPT4gMSwKKyAg ICBudW1UZXh0Q2h1bmtzID0+IDEsCiAgICAgc291cmNlUmV2aXNpb24gPT4gIjYwMDIxIiwKIH1d LAogIlByb3BlcnR5IGNoYW5nZXMgb246IE1ha2VmaWxlLnNoYXJlZFxuIl0sCkBAIC04NDYsNiAr ODUzLDcgQEAgRU5ECiAgICAgZXhlY3V0YWJsZUJpdERlbHRhID0+IDEsCiAgICAgaW5kZXhQYXRo ID0+ICJNYWtlZmlsZSIsCiAgICAgaXNTdm4gPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtzID0+IDEs CiAgICAgc291cmNlUmV2aXNpb24gPT4gIjYwMDIxIiwKIH1dLAogIlByb3BlcnR5IGNoYW5nZXMg b246IE1ha2VmaWxlLnNoYXJlZFxyXG4iXSwKQEAgLTg5Nyw2ICs5MDUsNyBAQCBFTkQKICAgICBl eGVjdXRhYmxlQml0RGVsdGEgPT4gLTEsCiAgICAgaW5kZXhQYXRoID0+ICJNYWtlZmlsZSIsCiAg ICAgaXNTdm4gPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtzID0+IDEsCiAgICAgc291cmNlUmV2aXNp b24gPT4gIjYwMDIxIiwKIH1dLAogIkluZGV4OiBNYWtlZmlsZS5zaGFyZWRcbiJdLApAQCAtOTUw LDYgKzk1OSw3IEBAIEVORAogICAgIGV4ZWN1dGFibGVCaXREZWx0YSA9PiAtMSwKICAgICBpbmRl eFBhdGggPT4gIk1ha2VmaWxlIiwKICAgICBpc1N2biA9PiAxLAorICAgIG51bVRleHRDaHVua3Mg PT4gMSwKICAgICBzb3VyY2VSZXZpc2lvbiA9PiAiNjAwMjEiLAogfV0sCiAiSW5kZXg6IE1ha2Vm aWxlLnNoYXJlZFxyXG4iXSwKQEAgLTk2Niw3ICs5NzYsNyBAQCBkaWZmIC0tZ2l0IGEvTWFrZWZp bGUgYi9NYWtlZmlsZQogaW5kZXggZjVkNWU3NC4uM2I2YWE5MiAxMDA2NDQKIC0tLSBhL01ha2Vm aWxlCiArKysgYi9NYWtlZmlsZQotQEAgLTEsMSAxLDEgQEAgcHVibGljOgorQEAgLTEsMSArMSwx IEBAIHB1YmxpYzoKIEVORAogICAgIGV4cGVjdGVkUmV0dXJuID0+IFsKIFt7CkBAIC05NzUsMTAg Kzk4NSwxMSBAQCBJbmRleDogTWFrZWZpbGUKIGluZGV4IGY1ZDVlNzQuLjNiNmFhOTIgMTAwNjQ0 CiAtLS0gTWFrZWZpbGUKICsrKyBNYWtlZmlsZQotQEAgLTEsMSAxLDEgQEAgcHVibGljOgorQEAg LTEsMSArMSwxIEBAIHB1YmxpYzoKIEVORAogICAgIGluZGV4UGF0aCA9PiAiTWFrZWZpbGUiLAog ICAgIGlzR2l0ID0+IDEsCisgICAgbnVtVGV4dENodW5rcyA9PiAxLAogfV0sCiB1bmRlZl0sCiAg ICAgZXhwZWN0ZWROZXh0TGluZSA9PiB1bmRlZiwKQEAgLTEwMTAsNiArMTAyMSw3IEBAIEVORAog ICAgIGluZGV4UGF0aCA9PiAiZm9vLmgiLAogICAgIGlzR2l0ID0+IDEsCiAgICAgaXNOZXcgPT4g MSwKKyAgICBudW1UZXh0Q2h1bmtzID0+IDEsCiB9XSwKICJkaWZmIC0tZ2l0IGEvYmFyIGIvYmFy XG4iXSwKICAgICBleHBlY3RlZE5leHRMaW5lID0+ICJpbmRleCBkNDVkZDQwLi4zNDk0NTI2IDEw MDY0NFxuIiwKQEAgLTEwNDEsNiArMTA1Myw3IEBAIEVORAogICAgIGluZGV4UGF0aCA9PiAiZm9v IiwKICAgICBpc0RlbGV0aW9uID0+IDEsCiAgICAgaXNHaXQgPT4gMSwKKyAgICBudW1UZXh0Q2h1 bmtzID0+IDEsCiB9XSwKICJkaWZmIC0tZ2l0IGEvYmFyIGIvYmFyXG4iXSwKICAgICBleHBlY3Rl ZE5leHRMaW5lID0+ICJpbmRleCBkNDVkZDQwLi4zNDk0NTI2IDEwMDY0NFxuIiwKQEAgLTEwNTMs NyArMTA2Niw3IEBAIGRpZmYgLS1naXQgYS9NYWtlZmlsZSBiL01ha2VmaWxlCiBpbmRleCBmNWQ1 ZTc0Li4zYjZhYTkyIDEwMDY0NAogLS0tIGEvTWFrZWZpbGUKICsrKyBiL01ha2VmaWxlCi1AQCAt MSwxIDEsMSBAQCBwdWJsaWM6CitAQCAtMSwxICsxLDEgQEAgcHVibGljOgogSW5kZXg6IE1ha2Vm aWxlX25ldwogPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQogLS0tIE1ha2VmaWxlX25ldwkocmV2aXNpb24gNTMxMzEpCShm cm9tIE1ha2VmaWxlOjUzMTMxKQpAQCAtMTA2NSwxMyArMTA3OCwzNyBAQCBJbmRleDogTWFrZWZp bGUKIGluZGV4IGY1ZDVlNzQuLjNiNmFhOTIgMTAwNjQ0CiAtLS0gTWFrZWZpbGUKICsrKyBNYWtl ZmlsZQotQEAgLTEsMSAxLDEgQEAgcHVibGljOgorQEAgLTEsMSArMSwxIEBAIHB1YmxpYzoKIElu ZGV4OiBNYWtlZmlsZV9uZXcKID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIC0tLSBNYWtlZmlsZV9uZXcJKHJldmlzaW9u IDUzMTMxKQkoZnJvbSBNYWtlZmlsZTo1MzEzMSkKIEVORAogICAgIGluZGV4UGF0aCA9PiAiTWFr ZWZpbGUiLAogICAgIGlzR2l0ID0+IDEsCisgICAgbnVtVGV4dENodW5rcyA9PiAxLAorfV0sCit1 bmRlZl0sCisgICAgZXhwZWN0ZWROZXh0TGluZSA9PiB1bmRlZiwKK30sCit7CisgICAgIyBOZXcg dGVzdAorICAgIGRpZmZOYW1lID0+ICJHaXQ6IGZpbGUgdGhhdCBvbmx5IGhhcyBhbiBleGVjdXRh YmxlIGJpdCBjaGFuZ2UiLAorICAgIGlucHV0VGV4dCA9PiA8PCdFTkQnLAorZGlmZiAtLWdpdCBh L2ZvbyBiL2Zvbworb2xkIG1vZGUgMTAwNjQ0CituZXcgbW9kZSAxMDA3NTUKK0VORAorICAgIGV4 cGVjdGVkUmV0dXJuID0+IFsKK1t7CisgICAgc3ZuQ29udmVydGVkVGV4dCA9PiAgPDwnRU5EJywK K0luZGV4OiBmb28KK29sZCBtb2RlIDEwMDY0NAorbmV3IG1vZGUgMTAwNzU1CitFTkQKKyAgICBl eGVjdXRhYmxlQml0RGVsdGEgPT4gMSwKKyAgICBpbmRleFBhdGggPT4gImZvbyIsCisgICAgaXNH aXQgPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtzID0+IDAsCiB9XSwKIHVuZGVmXSwKICAgICBleHBl Y3RlZE5leHRMaW5lID0+IHVuZGVmLApAQCAtMTEzMSw2ICsxMTY4LDcgQEAgRU5ECiB7CiAgICAg aW5kZXhQYXRoID0+ICJmb29fbmV3IiwKICAgICBpc0dpdCA9PiAxLAorICAgIG51bVRleHRDaHVu a3MgPT4gMSwKICAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+IDw8J0VORCcsCiBJbmRleDogZm9vX25l dwogc2ltaWxhcml0eSBpbmRleCA5OSUKQEAgLTExNzQsNiArMTIxMiw3IEBAIEVORAogICAgIGV4 ZWN1dGFibGVCaXREZWx0YSA9PiAxLAogICAgIGluZGV4UGF0aCA9PiAiZm9vX25ldyIsCiAgICAg aXNHaXQgPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtzID0+IDAsCiAgICAgc3ZuQ29udmVydGVkVGV4 dCA9PiA8PCdFTkQnLAogSW5kZXg6IGZvb19uZXcKIG9sZCBtb2RlIDEwMDY0NApJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlRGlmZldpdGhNb2Nr RmlsZXMucGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxz X3VuaXR0ZXN0L3BhcnNlRGlmZldpdGhNb2NrRmlsZXMucGwJKHJldmlzaW9uIDg2NDg4KQorKysg VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlRGlmZldpdGhN b2NrRmlsZXMucGwJKHdvcmtpbmcgY29weSkKQEAgLTEwNyw2ICsxMDcsNyBAQCBteSBAdGVzdENh c2VIYXNoUmVmcyA9ICgKICAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+IHN1YnN0aXR1dGVTdHJpbmco JHN2bkRpZmZIZWFkZXIsICJNYWtlZmlsZSIsICJNYWtlZmlsZVdpdGhVbml4RU9MIikgLiAkZGlm ZkJvZHksICMgU2FtZSBhcyBpbnB1dCB0ZXh0CiAgICAgaW5kZXhQYXRoID0+ICJNYWtlZmlsZVdp dGhVbml4RU9MIiwKICAgICBpc1N2biA9PiAxLAorICAgIG51bVRleHRDaHVua3MgPT4gMSwKICAg ICBzb3VyY2VSZXZpc2lvbiA9PiAiNTMwNTIiLAogfV0sCiB1bmRlZl0sCkBAIC0xMjEsNiArMTIy LDcgQEAgdW5kZWZdLAogICAgIHN2bkNvbnZlcnRlZFRleHQgPT4gc3Vic3RpdHV0ZVN0cmluZygk c3ZuRGlmZkhlYWRlciwgIk1ha2VmaWxlIiwgIk1ha2VmaWxlV2l0aFVuaXhFT0wiKSAuICRkaWZm Qm9keSwKICAgICBpbmRleFBhdGggPT4gIk1ha2VmaWxlV2l0aFVuaXhFT0wiLAogICAgIGlzU3Zu ID0+IDEsCisgICAgbnVtVGV4dENodW5rcyA9PiAxLAogICAgIHNvdXJjZVJldmlzaW9uID0+ICI1 MzA1MiIsCiB9XSwKIHVuZGVmXSwKQEAgLTEzNSw2ICsxMzcsNyBAQCB1bmRlZl0sCiAgICAgc3Zu Q29udmVydGVkVGV4dCA9PiBzdWJzdGl0dXRlU3RyaW5nKCRzdm5EaWZmSGVhZGVyLCAiTWFrZWZp bGUiLCAiTWFrZWZpbGVXaXRoV2luZG93c0VPTCIpIC4gdG9XaW5kb3dzTGluZUVuZGluZ3MoJGRp ZmZCb2R5KSwgIyBTYW1lIGFzIGlucHV0IHRleHQKICAgICBpbmRleFBhdGggPT4gIk1ha2VmaWxl V2l0aFdpbmRvd3NFT0wiLAogICAgIGlzU3ZuID0+IDEsCisgICAgbnVtVGV4dENodW5rcyA9PiAx LAogICAgIHNvdXJjZVJldmlzaW9uID0+ICI1MzA1MiIsCiB9XSwKIHVuZGVmXSwKQEAgLTE0OSw2 ICsxNTIsNyBAQCB1bmRlZl0sCiAgICAgc3ZuQ29udmVydGVkVGV4dCA9PiBzdWJzdGl0dXRlU3Ry aW5nKCRzdm5EaWZmSGVhZGVyLCAiTWFrZWZpbGUiLCAiTWFrZWZpbGVXaXRoV2luZG93c0VPTCIp IC4gdG9XaW5kb3dzTGluZUVuZGluZ3MoJGRpZmZCb2R5KSwKICAgICBpbmRleFBhdGggPT4gIk1h a2VmaWxlV2l0aFdpbmRvd3NFT0wiLAogICAgIGlzU3ZuID0+IDEsCisgICAgbnVtVGV4dENodW5r cyA9PiAxLAogICAgIHNvdXJjZVJldmlzaW9uID0+ICI1MzA1MiIsCiB9XSwKIHVuZGVmXSwKQEAg LTE2NCw2ICsxNjgsNyBAQCB1bmRlZl0sCiAgICAgaW5kZXhQYXRoID0+ICJOb25leGlzdGVudEZp bGUiLAogICAgIGlzU3ZuID0+IDEsCiAgICAgaXNOZXcgPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtz ID0+IDEsCiB9XSwKIHVuZGVmXSwKICAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLApAQCAt MTc4LDYgKzE4Myw3IEBAIHVuZGVmXSwKICAgICBpbmRleFBhdGggPT4gIk5vbmV4aXN0ZW50Rmls ZSIsCiAgICAgaXNTdm4gPT4gMSwKICAgICBpc05ldyA9PiAxLAorICAgIG51bVRleHRDaHVua3Mg PT4gMSwKIH1dLAogdW5kZWZdLAogICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gdW5kZWYsCkBAIC0x OTQsNiArMjAwLDcgQEAgdW5kZWZdLAogICAgIHN2bkNvbnZlcnRlZFRleHQgPT4gc3Vic3RpdHV0 ZVN0cmluZygkc3ZuQ29udmVydGVkR2l0RGlmZkhlYWRlciwgIk1ha2VmaWxlIiwgIk1ha2VmaWxl V2l0aFVuaXhFT0wiKSAuICRkaWZmQm9keSwgIyBTYW1lIGFzIGlucHV0IHRleHQKICAgICBpbmRl eFBhdGggPT4gIk1ha2VmaWxlV2l0aFVuaXhFT0wiLAogICAgIGlzR2l0ID0+IDEsCisgICAgbnVt VGV4dENodW5rcyA9PiAxLAogfV0sCiB1bmRlZl0sCiAgICAgZXhwZWN0ZWROZXh0TGluZSA9PiB1 bmRlZiwKQEAgLTIwNyw2ICsyMTQsNyBAQCB1bmRlZl0sCiAgICAgc3ZuQ29udmVydGVkVGV4dCA9 PiBzdWJzdGl0dXRlU3RyaW5nKCRzdm5Db252ZXJ0ZWRHaXREaWZmSGVhZGVyLCAiTWFrZWZpbGUi LCAiTWFrZWZpbGVXaXRoVW5peEVPTCIpIC4gJGRpZmZCb2R5LAogICAgIGluZGV4UGF0aCA9PiAi TWFrZWZpbGVXaXRoVW5peEVPTCIsCiAgICAgaXNHaXQgPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtz ID0+IDEsCiB9XSwKIHVuZGVmXSwKICAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLApAQCAt MjIwLDYgKzIyOCw3IEBAIHVuZGVmXSwKICAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+IHN1YnN0aXR1 dGVTdHJpbmcoJHN2bkNvbnZlcnRlZEdpdERpZmZIZWFkZXIsICJNYWtlZmlsZSIsICJNYWtlZmls ZVdpdGhXaW5kb3dzRU9MIikgLiB0b1dpbmRvd3NMaW5lRW5kaW5ncygkZGlmZkJvZHkpLCAjIFNh bWUgYXMgaW5wdXQgdGV4dAogICAgIGluZGV4UGF0aCA9PiAiTWFrZWZpbGVXaXRoV2luZG93c0VP TCIsCiAgICAgaXNHaXQgPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtzID0+IDEsCiB9XSwKIHVuZGVm XSwKICAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLApAQCAtMjMzLDYgKzI0Miw3IEBAIHVu ZGVmXSwKICAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+IHN1YnN0aXR1dGVTdHJpbmcoJHN2bkNvbnZl cnRlZEdpdERpZmZIZWFkZXIsICJNYWtlZmlsZSIsICJNYWtlZmlsZVdpdGhXaW5kb3dzRU9MIikg LiB0b1dpbmRvd3NMaW5lRW5kaW5ncygkZGlmZkJvZHkpLAogICAgIGluZGV4UGF0aCA9PiAiTWFr ZWZpbGVXaXRoV2luZG93c0VPTCIsCiAgICAgaXNHaXQgPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtz ID0+IDEsCiB9XSwKIHVuZGVmXSwKICAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLApAQCAt MjQ3LDYgKzI1Nyw3IEBAIHVuZGVmXSwKICAgICBpbmRleFBhdGggPT4gIk5vbmV4aXN0ZW50Rmls ZSIsCiAgICAgaXNHaXQgPT4gMSwKICAgICBpc05ldyA9PiAxLAorICAgIG51bVRleHRDaHVua3Mg PT4gMSwKIH1dLAogdW5kZWZdLAogICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gdW5kZWYsCkBAIC0y NjEsNiArMjcyLDcgQEAgdW5kZWZdLAogICAgIGluZGV4UGF0aCA9PiAiTm9uZXhpc3RlbnRGaWxl IiwKICAgICBpc0dpdCA9PiAxLAogICAgIGlzTmV3ID0+IDEsCisgICAgbnVtVGV4dENodW5rcyA9 PiAxLAogfV0sCiB1bmRlZl0sCiAgICAgZXhwZWN0ZWROZXh0TGluZSA9PiB1bmRlZiwK