115281 2013-04-26 15:26:38 -0700 WebKit tools cannot apply git patches for filenames containing spaces 2013-05-19 23:30:34 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED DUPLICATE 111066 InRadar P2 Major --- 1 scooper webkit-unassigned ap commit-queue dbates ddkilzer dfarler lforschler mrowe scooper oldest_to_newest 882053 0 scooper 2013-04-26 15:26:38 -0700 The tools cannot handle patches for files that have spaces in their names. See here for a patch that fails to apply... https://bug-115142-attachments.webkit.org/attachment.cgi?id=199861 It was trying to patch the file, Source/WebKit2/Resources/PlugInSandboxProfiles/com.macromedia.Flash Player.plugin.sb To see the tool failure... https://webkit-queues.appspot.com/patch/199570 You can see the output here.... https://webkit-queues.appspot.com/results/34412 https://webkit-queues.appspot.com/results/191141 https://webkit-queues.appspot.com/results/108267 https://webkit-queues.appspot.com/results/80803 https://webkit-queues.appspot.com/results/66244 https://webkit-queues.appspot.com/results/97422 https://webkit-queues.appspot.com/results/73329 https://webkit-queues.appspot.com/results/108270 https://webkit-queues.appspot.com/results/108276 882054 1 ap 2013-04-26 15:28:27 -0700 Looks like this is an issue with git patches, but not with svn ones. 882055 2 ap 2013-04-26 15:33:01 -0700 The script that needs to be fixed in likely Tools/Scripts/svn-apply. 882056 3 scooper 2013-04-26 15:34:39 -0700 There were two files that had spaces in their names in this patch... Source/WebKit2/Resources/PlugInSandboxProfiles/com.macromedia.QuckTime Plugin.plugin.sb Source/WebKit2/Resources/PlugInSandboxProfiles/com.macromedia.Flash Player.plugin.sb It was the first one that appears in the logs for the failing patch application. 882058 4 scooper 2013-04-26 15:35:15 -0700 What does a svn patch look like then? How is it different from the git patch? 882063 5 199867 ap 2013-04-26 15:49:40 -0700 Created attachment 199867 An example of svn patch Attaching the same patch, re-made with svn. 882073 6 mrowe 2013-04-26 16:26:24 -0700 The difficulty is in parsing this line: diff --git a/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.QuickTime Plugin.plugin.sb b/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.QuickTime Plugin.plugin.sb There's no obvious delimiter between the two filenames. 882084 7 scooper 2013-04-26 16:55:48 -0700 There is a faulty regex: $gitDiffStartRegEx. It is not sufficient to parse arguments containing spaces. The logic in parseGitDiffHeader() doesn’t help, because it assumes the regex actually can parse all filenames. That isn’t how it is done for SVN. There are perfectly good and easily parseable filenames on the line following the “diff” line. However, the following diff will parse my patch (although there may be issues with other tools) — I just debugged this to the point where it can parse the diffs. diff --git a/Tools/Scripts/VCSUtils.pm b/Tools/Scripts/VCSUtils.pm index cf87db3..fb6380a 100644 --- a/Tools/Scripts/VCSUtils.pm +++ b/Tools/Scripts/VCSUtils.pm @@ -107,7 +107,7 @@ my $svnVersion; # Project time zone for Cupertino, CA, US my $changeLogTimeZone = "PST8PDT"; -my $gitDiffStartRegEx = qr#^diff --git (\w/)?(.+) (\w/)?([^\r\n]+)#; +my $gitDiffStartRegEx = qr#^diff --git (\w/)(.+) (\w/)([^\r\n]+?)$#; my $svnDiffStartRegEx = qr#^Index: ([^\r\n]+)#; my $svnPropertiesStartRegEx = qr#^Property changes on: ([^\r\n]+)#; # $1 is normally the same as the index path. my $svnPropertyStartRegEx = qr#^(Modified|Name|Added|Deleted): ([^\r\n]+)#; # $2 is the name of the property. The fix works by making sure the starting a/ or b/ are not optional, the 2nd regex is *not* greedy and the whole regex needs to be terminally anchored (to force the consumption of the whole string). 882086 8 mrowe 2013-04-26 17:02:55 -0700 The leading a/ b/ were intentionally made optional back in r58741 / bug 32438. 882088 9 scooper 2013-04-26 17:05:53 -0700 Then parseGitDiffHeader() has to be rewritten to get the filenames from the ^--- and ^+++ lines. 882108 10 scooper 2013-04-26 18:06:44 -0700 svn-apply also mangles git patches in a way that “patch” cannot apply them to files with spaces. It is not clear what is going on, but patch does do something special when there is an “Index:” line. I’m giving up on looking at this. 889698 11 201923 ap 2013-05-15 23:02:15 -0700 Created attachment 201923 proposed fix I don't really know what I'm doing here (neither Perl nor the structure of patches). Please review carefully. I think that the trick here was that +++ and --- lines are really of this format: --- Source/WebKit2/Resources/PlugInSandboxProfiles/com.macromedia.Flash Player.plugin.sb<TAB>(revision 149145) When there are no spaces, a path alone suffices, but if there are spaces, at least the tab is desired. 889700 12 201924 ap 2013-05-15 23:14:23 -0700 Created attachment 201924 proposed patch Actually, looks like git patches do the same thing with tabs, so let's preserve these more carefully. 890505 13 201924 ddkilzer 2013-05-17 10:27:32 -0700 Comment on attachment 201924 proposed patch I'm overriding darin's r+ with an r- because this doesn't have a test added for the changes. Tests for this method are in Tools/Scripts/webkitperl/VCSUtils_unittest/parseGitDiffHeader.pl. To run the tests, use: ./Tools/Scripts/test-webkitperl 890532 14 ap 2013-05-17 11:22:34 -0700 I didn't know that we had secret regression tests for this tool! Looks like the patch is not good. Svn and git "+++" and "---" lines are different - looks like one likes to put /dev/null there when adding or deleting files, and another does not. Unsure how to fix. 890539 15 ap 2013-05-17 11:26:14 -0700 <rdar://problem/13925627> 891123 16 dbates 2013-05-19 23:30:34 -0700 *** This bug has been marked as a duplicate of bug 111066 *** 199867 2013-04-26 15:49:40 -0700 2013-04-26 15:49:40 -0700 An example of svn patch symlink.txt text/plain 15812 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0OTIxMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEzLTA0LTI2ICBTaW1vbiBD b29wZXIgIDxzY29vcGVyQGFwcGxlLmNvbT4KKworICAgICAgICBQZXJtaXQgfi9MaWJyYXJ5IG9y IH4vTGlicmFyeS9QcmVmZXJlbmNlcyB0byBiZSBzeW1saW5rcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1MTQyCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8xMjk1MzYwMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBQYXNzIGluIHR3byBuZXcgcGFyYW1ldGVycyB3aGljaCBhcmUgdGhlIHJlc29sdmVk IHBhdGhzIHRvIH4vTGlicmFyeQorICAgICAgICBhbmQgfi9MaWJyYXJ5L1ByZWZlcmVuY2VzLiBB ZGRlZCBuZXcgZXhwYW5zaW9uIGZ1bmN0aW9ucyBhbmQKKyAgICAgICAgc3Vic3RpdHV0ZWQgdGhl IG5ldyBmdW5jdGlvbnMgZm9yIGhvbWUtcmVnZXgsIGhvbWUtc3VicGF0aCBhbmQKKyAgICAgICAg aG9tZS1saXRlcmFsIGZvciBwbGFjZXMgcmVmZXJlbmNpbmcgcmVzb3VyY2VzIGluICJ+L0xpYnJh cnkiIG9yCisgICAgICAgICJ+L0xpYnJhcnkvUHJlZmVyZW5jZXMiLgorCisgICAgICAgICogUmVz b3VyY2VzL1BsdWdJblNhbmRib3hQcm9maWxlcy9jb20uYXBwbGUuUXVpY2tUaW1lIFBsdWdpbi5w bHVnaW4uc2I6CisgICAgICAgICogUmVzb3VyY2VzL1BsdWdJblNhbmRib3hQcm9maWxlcy9jb20u YXBwbGUuV2ViS2l0LnBsdWdpbi1jb21tb24uc2I6CisgICAgICAgICogUmVzb3VyY2VzL1BsdWdJ blNhbmRib3hQcm9maWxlcy9jb20uYXBwbGUuaXN0LmRzLmFwcGxlY29ubmVjdC53ZWJwbHVnaW4u c2I6CisgICAgICAgICogUmVzb3VyY2VzL1BsdWdJblNhbmRib3hQcm9maWxlcy9jb20ubWFjcm9t ZWRpYS5GbGFzaCBQbGF5ZXIucGx1Z2luLnNiOgorICAgICAgICAqIFJlc291cmNlcy9QbHVnSW5T YW5kYm94UHJvZmlsZXMvY29tLm1pY3Jvc29mdC5TaWx2ZXJsaWdodFBsdWdpbi5zYjoKKyAgICAg ICAgKiBSZXNvdXJjZXMvUGx1Z0luU2FuZGJveFByb2ZpbGVzL2NvbS5vcmFjbGUuamF2YS5KYXZh QXBwbGV0UGx1Z2luLnNiOgorICAgICAgICAqIFNoYXJlZC9tYWMvQ2hpbGRQcm9jZXNzTWFjLm1t OgorICAgICAgICAoV2ViS2l0OjpDaGlsZFByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KToKKwog MjAxMy0wNC0yNiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAg ICBbV0syXSBXS0NvbnRleHRDbGllbnQgZG9lc24ndCBuZWVkIHRvIGJlIHZlcnNpb25lZCB5ZXQK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1Jlc291cmNlcy9QbHVnSW5TYW5kYm94UHJvZmlsZXMvY29t LmFwcGxlLlF1aWNrVGltZSBQbHVnaW4ucGx1Z2luLnNiCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1Jlc291cmNlcy9QbHVnSW5TYW5kYm94UHJvZmlsZXMvY29tLmFwcGxlLlF1aWNrVGlt ZSBQbHVnaW4ucGx1Z2luLnNiCShyZXZpc2lvbiAxNDkxNDUpCisrKyBTb3VyY2UvV2ViS2l0Mi9S ZXNvdXJjZXMvUGx1Z0luU2FuZGJveFByb2ZpbGVzL2NvbS5hcHBsZS5RdWlja1RpbWUgUGx1Z2lu LnBsdWdpbi5zYgkod29ya2luZyBjb3B5KQpAQCAtMiw4ICsyLDggQEAKIChzaGFyZWQtcHJlZmVy ZW5jZXMtcmVhZCAiY29tLmFwcGxlLnF1aWNrdGltZS5wbHVnaW4ucHJlZmVyZW5jZXMiKQogCiAo YWxsb3cgZmlsZS1yZWFkKiBmaWxlLXdyaXRlKgotICAgIChob21lLXN1YnBhdGggIi9MaWJyYXJ5 L0NhY2hlcy9RdWlja1RpbWUiKQotICAgIChob21lLWxpdGVyYWwgIi9MaWJyYXJ5L1ByZWZlcmVu Y2VzL1F1aWNrVGltZSBQcmVmZXJlbmNlcyIpKQorICAgIChob21lLWxpYnJhcnktc3VicGF0aCAi L0NhY2hlcy9RdWlja1RpbWUiKQorICAgIChob21lLWxpYnJhcnktcHJlZmVyZW5jZXMtbGl0ZXJh bCAiL1F1aWNrVGltZSBQcmVmZXJlbmNlcyIpKQogCiAoYWxsb3cgbmV0d29yay1pbmJvdW5kIChs b2NhbCB1ZHApKQogKGFsbG93IG5ldHdvcmstb3V0Ym91bmQgKHJlbW90ZSB1ZHApKQpJbmRleDog U291cmNlL1dlYktpdDIvUmVzb3VyY2VzL1BsdWdJblNhbmRib3hQcm9maWxlcy9jb20uYXBwbGUu V2ViS2l0LnBsdWdpbi1jb21tb24uc2IKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUmVz b3VyY2VzL1BsdWdJblNhbmRib3hQcm9maWxlcy9jb20uYXBwbGUuV2ViS2l0LnBsdWdpbi1jb21t b24uc2IJKHJldmlzaW9uIDE0OTE0NSkKKysrIFNvdXJjZS9XZWJLaXQyL1Jlc291cmNlcy9QbHVn SW5TYW5kYm94UHJvZmlsZXMvY29tLmFwcGxlLldlYktpdC5wbHVnaW4tY29tbW9uLnNiCSh3b3Jr aW5nIGNvcHkpCkBAIC01LDE1ICs1LDI3IEBACiAoaW1wb3J0ICJzeXN0ZW0uc2IiKQogCiA7OyBV dGlsaXR5IGZ1bmN0aW9ucwotKGRlZmluZSAoaG9tZS1yZWdleCBob21lLXJlbGF0aXZlLXJlZ2V4 KQotICAgIChyZWdleCAoc3RyaW5nLWFwcGVuZCAiXiIgKHJlZ2V4LXF1b3RlIChwYXJhbSAiSE9N RV9ESVIiKSkgaG9tZS1yZWxhdGl2ZS1yZWdleCkpKQotCi0oZGVmaW5lIChob21lLXN1YnBhdGgg aG9tZS1yZWxhdGl2ZS1zdWJwYXRoKQotICAgIChzdWJwYXRoIChzdHJpbmctYXBwZW5kIChwYXJh bSAiSE9NRV9ESVIiKSBob21lLXJlbGF0aXZlLXN1YnBhdGgpKSkKLQogKGRlZmluZSAoaG9tZS1s aXRlcmFsIGhvbWUtcmVsYXRpdmUtbGl0ZXJhbCkKICAgICAobGl0ZXJhbCAoc3RyaW5nLWFwcGVu ZCAocGFyYW0gIkhPTUVfRElSIikgaG9tZS1yZWxhdGl2ZS1saXRlcmFsKSkpCiAKKyhkZWZpbmUg KGhvbWUtbGlicmFyeS1yZWdleCBob21lLWxpYnJhcnktcmVsYXRpdmUtcmVnZXgpCisgICAgKHJl Z2V4IChzdHJpbmctYXBwZW5kICJeIiAocmVnZXgtcXVvdGUgKHBhcmFtICJIT01FX0xJQlJBUllf RElSIikpIGhvbWUtbGlicmFyeS1yZWxhdGl2ZS1yZWdleCkpKQorCisoZGVmaW5lIChob21lLWxp YnJhcnktc3VicGF0aCBob21lLWxpYnJhcnktcmVsYXRpdmUtc3VicGF0aCkKKyAgICAoc3VicGF0 aCAoc3RyaW5nLWFwcGVuZCAocGFyYW0gIkhPTUVfTElCUkFSWV9ESVIiKSBob21lLWxpYnJhcnkt cmVsYXRpdmUtc3VicGF0aCkpKQorCisoZGVmaW5lIChob21lLWxpYnJhcnktbGl0ZXJhbCBob21l LWxpYnJhcnktcmVsYXRpdmUtbGl0ZXJhbCkKKyAgICAobGl0ZXJhbCAoc3RyaW5nLWFwcGVuZCAo cGFyYW0gIkhPTUVfTElCUkFSWV9ESVIiKSBob21lLWxpYnJhcnktcmVsYXRpdmUtbGl0ZXJhbCkp KQorCisoZGVmaW5lIChob21lLWxpYnJhcnktcHJlZmVyZW5jZXMtcmVnZXggaG9tZS1saWJyYXJ5 LXByZWZlcmVuY2VzLXJlbGF0aXZlLXJlZ2V4KQorICAgIChyZWdleCAoc3RyaW5nLWFwcGVuZCAi XiIgKHJlZ2V4LXF1b3RlIChwYXJhbSAiSE9NRV9MSUJSQVJZX1BSRUZFUkVOQ0VTX0RJUiIpKSBo b21lLWxpYnJhcnktcHJlZmVyZW5jZXMtcmVsYXRpdmUtcmVnZXgpKSkKKworKGRlZmluZSAoaG9t ZS1saWJyYXJ5LXByZWZlcmVuY2VzLXN1YnBhdGggaG9tZS1saWJyYXJ5LXByZWZlcmVuY2VzLXJl bGF0aXZlLXN1YnBhdGgpCisgICAgKHN1YnBhdGggKHN0cmluZy1hcHBlbmQgKHBhcmFtICJIT01F X0xJQlJBUllfUFJFRkVSRU5DRVNfRElSIikgaG9tZS1saWJyYXJ5LXByZWZlcmVuY2VzLXJlbGF0 aXZlLXN1YnBhdGgpKSkKKworKGRlZmluZSAoaG9tZS1saWJyYXJ5LXByZWZlcmVuY2VzLWxpdGVy YWwgaG9tZS1saWJyYXJ5LXByZWZlcmVuY2VzLXJlbGF0aXZlLWxpdGVyYWwpCisgICAgKGxpdGVy YWwgKHN0cmluZy1hcHBlbmQgKHBhcmFtICJIT01FX0xJQlJBUllfUFJFRkVSRU5DRVNfRElSIikg aG9tZS1saWJyYXJ5LXByZWZlcmVuY2VzLXJlbGF0aXZlLWxpdGVyYWwpKSkKKwogKGRlZmluZSAo c2hhcmVkLXByZWZlcmVuY2VzLXJlYWQgLiBkb21haW5zKQogICAoZm9yLWVhY2ggKGxhbWJkYSAo ZG9tYWluKQogICAgICAgICAgICAgICAoYmVnaW4KQEAgLTIyLDggKzM0LDggQEAKICAgICAgICAg ICAgICAgICA7IChUZW1wb3JhcnkpIGJhY2t3YXJkIGNvbXBhdGliaWxpdHkgd2l0aCBub24tQ0ZQ cmVmZXJlbmNlcyByZWFkZXJzLgogICAgICAgICAgICAgICAgIChhbGxvdyBmaWxlLXJlYWQqCiAg ICAgICAgICAgICAgICAgICAgICAgIChsaXRlcmFsIChzdHJpbmctYXBwZW5kICIvTGlicmFyeS9Q cmVmZXJlbmNlcy8iIGRvbWFpbiAiLnBsaXN0IikpCi0gICAgICAgICAgICAgICAgICAgICAgICho b21lLWxpdGVyYWwgKHN0cmluZy1hcHBlbmQgIi9MaWJyYXJ5L1ByZWZlcmVuY2VzLyIgZG9tYWlu ICIucGxpc3QiKSkKLSAgICAgICAgICAgICAgICAgICAgICAgKGhvbWUtcmVnZXggKHN0cmluZy1h cHBlbmQgIyIvTGlicmFyeS9QcmVmZXJlbmNlcy9CeUhvc3QvIiAocmVnZXgtcXVvdGUgZG9tYWlu KSAjIlwuLipcLnBsaXN0JCIpKSkpKQorICAgICAgICAgICAgICAgICAgICAgICAoaG9tZS1saWJy YXJ5LXByZWZlcmVuY2VzLWxpdGVyYWwgKHN0cmluZy1hcHBlbmQgIi8iIGRvbWFpbiAiLnBsaXN0 IikpCisgICAgICAgICAgICAgICAgICAgICAgIChob21lLWxpYnJhcnktcHJlZmVyZW5jZXMtcmVn ZXggKHN0cmluZy1hcHBlbmQgIyIvQnlIb3N0LyIgKHJlZ2V4LXF1b3RlIGRvbWFpbikgIyJcLi4q XC5wbGlzdCQiKSkpKSkKICAgICAgICAgICAgIGRvbWFpbnMpKQogCiAoZGVmaW5lIChzaGFyZWQt cHJlZmVyZW5jZXMtcmVhZC13cml0ZSAuIGRvbWFpbnMpCkBAIC0zNCw4ICs0Niw4IEBACiAgICAg ICAgICAgICAgICAgOyAoVGVtcG9yYXJ5KSBiYWNrd2FyZCBjb21wYXRpYmlsaXR5IHdpdGggbm9u LUNGUHJlZmVyZW5jZXMgcmVhZGVycyAvIHdyaXRlcnMuCiAgICAgICAgICAgICAgICAgKGFsbG93 IGZpbGUtcmVhZCogZmlsZS13cml0ZSoKICAgICAgICAgICAgICAgICAgICAgICAgKGxpdGVyYWwg KHN0cmluZy1hcHBlbmQgIi9MaWJyYXJ5L1ByZWZlcmVuY2VzLyIgZG9tYWluICIucGxpc3QiKSkK LSAgICAgICAgICAgICAgICAgICAgICAgKGhvbWUtbGl0ZXJhbCAoc3RyaW5nLWFwcGVuZCAiL0xp YnJhcnkvUHJlZmVyZW5jZXMvIiBkb21haW4gIi5wbGlzdCIpKQotICAgICAgICAgICAgICAgICAg ICAgICAoaG9tZS1yZWdleCAoc3RyaW5nLWFwcGVuZCAjIi9MaWJyYXJ5L1ByZWZlcmVuY2VzL0J5 SG9zdC8iIChyZWdleC1xdW90ZSBkb21haW4pICMiXC4uKlwucGxpc3QkIikpKSkpCisgICAgICAg ICAgICAgICAgICAgICAgIChob21lLWxpYnJhcnktcHJlZmVyZW5jZXMtbGl0ZXJhbCAoc3RyaW5n LWFwcGVuZCAiLyIgZG9tYWluICIucGxpc3QiKSkKKyAgICAgICAgICAgICAgICAgICAgICAgKGhv bWUtbGlicmFyeS1wcmVmZXJlbmNlcy1yZWdleCAoc3RyaW5nLWFwcGVuZCAjIi9CeUhvc3QvIiAo cmVnZXgtcXVvdGUgZG9tYWluKSAjIlwuLipcLnBsaXN0JCIpKSkpKQogICAgICAgICAgICAgZG9t YWlucykpCiAKIApAQCAtODAsNiArOTIsNyBAQAogICAgICJjb20uYXBwbGUuc3lzdGVtc291bmQi CiAgICAgImNvbS5hcHBsZS51bml2ZXJzYWxhY2Nlc3MiCiAgICAgImNvbS5hcHBsZS5XZWJGb3Vu ZGF0aW9uIgorICAgICJjb20uYXBwbGUuV2ViS2l0LlBsdWdpblByb2Nlc3MiCiAgICAgInBicyIK ICAgICAiY29tLmFwcGxlLlNlcnZpY2VzTWVudS5TZXJ2aWNlcyIpCiAKQEAgLTkxLDM1ICsxMDQs MzUgQEAKIAogICAgIChyZWdleCAjIl4vTGlicmFyeS9QcmVmZXJlbmNlcy9jb21cLmFwcGxlXC5z ZWN1cml0eSIpCiAgICAgKGhvbWUtbGl0ZXJhbCAiLy5DRlVzZXJUZXh0RW5jb2RpbmciKQotICAg IChob21lLXN1YnBhdGggIi9MaWJyYXJ5L0F1ZGlvIikKLSAgICAoaG9tZS1zdWJwYXRoICIvTGli cmFyeS9Db2xvclBpY2tlcnMiKQotICAgIChob21lLXN1YnBhdGggIi9MaWJyYXJ5L0NvbG9yU3lu YyIpCi0gICAgKGhvbWUtc3VicGF0aCAiL0xpYnJhcnkvQ29tcG9uZW50cyIpCisgICAgKGhvbWUt bGlicmFyeS1zdWJwYXRoICIvQXVkaW8iKQorICAgIChob21lLWxpYnJhcnktc3VicGF0aCAiL0Nv bG9yUGlja2VycyIpCisgICAgKGhvbWUtbGlicmFyeS1zdWJwYXRoICIvQ29sb3JTeW5jIikKKyAg ICAoaG9tZS1saWJyYXJ5LXN1YnBhdGggIi9Db21wb25lbnRzIikKICAgICAoc3VicGF0aCAiL0xp YnJhcnkvQ29udGV4dHVhbCBNZW51IEl0ZW1zIikKLSAgICAoaG9tZS1zdWJwYXRoICIvTGlicmFy eS9JbnB1dCBNZXRob2RzIikKLSAgICAoaG9tZS1zdWJwYXRoICIvTGlicmFyeS9LZXlCaW5kaW5n cyIpCi0gICAgKGhvbWUtc3VicGF0aCAiL0xpYnJhcnkvS2V5Ym9hcmQgTGF5b3V0cyIpCisgICAg KGhvbWUtbGlicmFyeS1zdWJwYXRoICIvSW5wdXQgTWV0aG9kcyIpCisgICAgKGhvbWUtbGlicmFy eS1zdWJwYXRoICIvS2V5QmluZGluZ3MiKQorICAgIChob21lLWxpYnJhcnktc3VicGF0aCAiL0tl eWJvYXJkIExheW91dHMiKQogICAgIChzdWJwYXRoICIvTGlicmFyeS9Gb250cyIpCi0gICAgKGhv bWUtc3VicGF0aCAiL0xpYnJhcnkvRm9udHMiKQorICAgIChob21lLWxpYnJhcnktc3VicGF0aCAi L0ZvbnRzIikKICAgICAoc3VicGF0aCAiL0xpYnJhcnkvU3BlbGxpbmciKQotICAgIChob21lLXN1 YnBhdGggIi9MaWJyYXJ5L1NwZWxsaW5nIikKKyAgICAoaG9tZS1saWJyYXJ5LXN1YnBhdGggIi9T cGVsbGluZyIpCiAgICAgKHN1YnBhdGggIi9MaWJyYXJ5L1BERiBTZXJ2aWNlcyIpCi0gICAgKGhv bWUtc3VicGF0aCAiL0xpYnJhcnkvUERGIFNlcnZpY2VzIikKLSAgICAoaG9tZS1saXRlcmFsICIv TGlicmFyeS9QcmVmZXJlbmNlcy9RdWlja1RpbWUgUHJlZmVyZW5jZXMiKQorICAgIChob21lLWxp YnJhcnktc3VicGF0aCAiL1BERiBTZXJ2aWNlcyIpCisgICAgKGhvbWUtbGlicmFyeS1wcmVmZXJl bmNlcy1saXRlcmFsICIvUXVpY2tUaW1lIFByZWZlcmVuY2VzIikKIAotICAgIChob21lLWxpdGVy YWwgIi9MaWJyYXJ5L0NhY2hlcy9jb20uYXBwbGUuY29yZWF1ZGlvLmNvbXBvbmVudHMucGxpc3Qi KQorICAgIChob21lLWxpYnJhcnktbGl0ZXJhbCAiL0NhY2hlcy9jb20uYXBwbGUuY29yZWF1ZGlv LmNvbXBvbmVudHMucGxpc3QiKQogCiAgICAgKHN1YnBhdGggIi9MaWJyYXJ5L0F1ZGlvL1BsdWct SW5zL0NvbXBvbmVudHMiKQotICAgIChob21lLXN1YnBhdGggIi9MaWJyYXJ5L0F1ZGlvL1BsdWct SW5zL0NvbXBvbmVudHMiKQorICAgIChob21lLWxpYnJhcnktc3VicGF0aCAiL0F1ZGlvL1BsdWct SW5zL0NvbXBvbmVudHMiKQogICAgIChzdWJwYXRoICIvTGlicmFyeS9BdWRpby9QbHVnLUlucy9I QUwiKQogICAgIChzdWJwYXRoICIvTGlicmFyeS9RdWlja1RpbWUiKQotICAgIChob21lLXN1YnBh dGggIi9MaWJyYXJ5L1F1aWNrVGltZSIpCisgICAgKGhvbWUtbGlicmFyeS1zdWJwYXRoICIvUXVp Y2tUaW1lIikKICAgICAoc3VicGF0aCAiL0xpYnJhcnkvVmlkZW8vUGx1Zy1JbnMiKQotICAgICho b21lLXN1YnBhdGggIi9MaWJyYXJ5L0NhY2hlcy9RdWlja1RpbWUiKQorICAgIChob21lLWxpYnJh cnktc3VicGF0aCAiL0NhY2hlcy9RdWlja1RpbWUiKQogCiAgICAgKGxpdGVyYWwgIi9MaWJyYXJ5 L0FwcGxpY2F0aW9uIFN1cHBvcnQvQ3Jhc2hSZXBvcnRlci9TdWJtaXREaWFnSW5mby5kb21haW5z IikKIAotICAgIChob21lLWxpdGVyYWwgIi9MaWJyYXJ5L0FwcGxpY2F0aW9uIFN1cHBvcnQvU3lu Y1NlcnZpY2VzL0xvY2FsL0NsaWVudHNXaXRoQ2hhbmdlcy9jb20uYXBwbGUuS2V5Y2hhaW4iKQor ICAgIChob21lLWxpYnJhcnktbGl0ZXJhbCAiL0FwcGxpY2F0aW9uIFN1cHBvcnQvU3luY1NlcnZp Y2VzL0xvY2FsL0NsaWVudHNXaXRoQ2hhbmdlcy9jb20uYXBwbGUuS2V5Y2hhaW4iKQogCiAgICAg KHN1YnBhdGggIi9MaWJyYXJ5L0NvbG9yU3luYyIpCiAKQEAgLTEyOSwxMCArMTQyLDggQEAKIAog OzsgUmVhZC13cml0ZSBwcmVmZXJlbmNlcyBhbmQgZGF0YQogKGFsbG93IGZpbGUqCi0gICAgKGhv bWUtcmVnZXggIyIvTGlicmFyeS9QcmVmZXJlbmNlcy9jb21cLmFwcGxlXC5XZWJLaXRcLlBsdWdp blByb2Nlc3NcLnBsaXN0IikKLQogICAgIDs7IEZJWE1FOiBUaGlzIHNob3VsZCBiZSByZW1vdmVk IHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzEwNDc5Njg1PiBpcyBmaXhlZC4KLSAgICAoaG9tZS1zdWJw YXRoICIvTGlicmFyeS9LZXljaGFpbnMiKSkKKyAgICAoaG9tZS1saWJyYXJ5LXN1YnBhdGggIi9L ZXljaGFpbnMiKSkKIAogOzsgSU9LaXQgdXNlciBjbGllbnRzCiAoYWxsb3cgaW9raXQtb3BlbgpA QCAtMjI2LDcgKzIzNyw3IEBACiAgICAgICAgIChsaXRlcmFsICIvcHJpdmF0ZS9ldGMvY3Vwcy9s cG9wdGlvbnMiKQogICAgICAgICAoc3VicGF0aCAiL3ByaXZhdGUvZXRjL2N1cHMvcHBkIikKICAg ICAgICAgKHN1YnBhdGggIi9wcml2YXRlL3Zhci9ydW4vY3Vwc2QiKQotICAgICAgICAoaG9tZS1s aXRlcmFsICIvTGlicmFyeS9QcmVmZXJlbmNlcy9vcmcuY3Vwcy5QcmludGluZ1ByZWZzLnBsaXN0 IikpKQorICAgICAgICAoc2hhcmVkLXByZWZlcmVuY2VzLXJlYWQgIm9yZy5jdXBzLlByaW50aW5n UHJlZnMiKSkpCiAKIDs7IFRleHQgU2VydmljZXMgTWFuYWdlcgogKGFsbG93IGlva2l0LXNldC1w cm9wZXJ0aWVzIChpb2tpdC1wcm9wZXJ0eSAiQ2Fwc0xvY2tEZWxheU92ZXJyaWRlIikpCkBAIC0y NDYsMTUgKzI1NywxNCBAQAogCiA7OyBTaWxlbnRseSBibG9jayBhY2Nlc3MgdG8gc29tZSByZXNv dXJjZXMKIChkZW55IGZpbGUtcmVhZCogZmlsZS13cml0ZSogKHdpdGggbm8tbG9nKQotICAgICho b21lLXJlZ2V4ICMiL0xpYnJhcnkvUHJlZmVyZW5jZXMvY29tXC5hcHBsZVwuaW50ZXJuZXRjb25m aWdwcml2XC5wbGlzdCIpCi0gICAgKGhvbWUtcmVnZXggIyIvTGlicmFyeS9QcmVmZXJlbmNlcy9j b21cLmFwcGxlXC5pbnRlcm5ldGNvbmZpZ1wucGxpc3QiKQorICAgIChob21lLWxpYnJhcnktcHJl ZmVyZW5jZXMtcmVnZXggIyIvY29tXC5hcHBsZVwuaW50ZXJuZXRjb25maWcocHJpdik/XC5wbGlz dCIpCiAKICAgICA7OyBGSVhNRTogU2hvdWxkIGJlIHJlbW92ZWQgYWZ0ZXIgPHJkYXI6Ly9wcm9i bGVtLzk0MjI5NTc+IGlzIGZpeGVkLgotICAgIChob21lLWxpdGVyYWwgIi9MaWJyYXJ5L0NhY2hl cy9DYWNoZS5kYiIpCisgICAgKGhvbWUtbGlicmFyeS1saXRlcmFsICIvQ2FjaGVzL0NhY2hlLmRi IikKIAogICAgIDs7IEZJWE1FOiBTaG91bGQgYmUgcmVtb3ZlZCBhZnRlciA8cmRhcjovL3Byb2Js ZW0vMTA0NjM4ODE+IGlzIGZpeGVkLgotICAgIChob21lLWxpdGVyYWwgIi9MaWJyYXJ5L1ByZWZl cmVuY2VzL2NvbS5hcHBsZS5MYXVuY2hTZXJ2aWNlcy5RdWFyYW50aW5lRXZlbnRzVjIiKQotICAg IChob21lLWxpdGVyYWwgIi9MaWJyYXJ5L1ByZWZlcmVuY2VzL2NvbS5hcHBsZS5MYXVuY2hTZXJ2 aWNlcy5RdWFyYW50aW5lRXZlbnRzVjItam91cm5hbCIpKQorICAgIChob21lLWxpYnJhcnktcHJl ZmVyZW5jZXMtbGl0ZXJhbCAiL2NvbS5hcHBsZS5MYXVuY2hTZXJ2aWNlcy5RdWFyYW50aW5lRXZl bnRzVjIiKQorICAgIChob21lLWxpYnJhcnktcHJlZmVyZW5jZXMtbGl0ZXJhbCAiL2NvbS5hcHBs ZS5MYXVuY2hTZXJ2aWNlcy5RdWFyYW50aW5lRXZlbnRzVjItam91cm5hbCIpKQogCiAoZGVueSBt YWNoLWxvb2t1cCAod2l0aCBuby1sb2cpCiAgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuRlNF dmVudHMiKQpJbmRleDogU291cmNlL1dlYktpdDIvUmVzb3VyY2VzL1BsdWdJblNhbmRib3hQcm9m aWxlcy9jb20uYXBwbGUuaXN0LmRzLmFwcGxlY29ubmVjdC53ZWJwbHVnaW4uc2IKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvUmVzb3VyY2VzL1BsdWdJblNhbmRib3hQcm9maWxlcy9jb20u YXBwbGUuaXN0LmRzLmFwcGxlY29ubmVjdC53ZWJwbHVnaW4uc2IJKHJldmlzaW9uIDE0OTE0NSkK KysrIFNvdXJjZS9XZWJLaXQyL1Jlc291cmNlcy9QbHVnSW5TYW5kYm94UHJvZmlsZXMvY29tLmFw cGxlLmlzdC5kcy5hcHBsZWNvbm5lY3Qud2VicGx1Z2luLnNiCSh3b3JraW5nIGNvcHkpCkBAIC0y Miw3ICsyMiw3IEBACiAoYWxsb3cgZmlsZS1yZWFkKgogICAgIChzdWJwYXRoICIvTGlicmFyeS9L ZXJiZXJvc1BsdWdpbnMvR1NTQVBJIikKICAgICAobGl0ZXJhbCAiL0xpYnJhcnkvUHJlZmVyZW5j ZXMvZWR1Lm1pdC5LZXJiZXJvcyIpCi0gICAgKGhvbWUtbGl0ZXJhbCAiL0xpYnJhcnkvUHJlZmVy ZW5jZXMvZWR1Lm1pdC5LZXJiZXJvcyIpKQorICAgIChob21lLWxpYnJhcnktcHJlZmVyZW5jZXMt bGl0ZXJhbCAiL2VkdS5taXQuS2VyYmVyb3MiKSkKIAogKGFsbG93IGZpbGUtcmVhZCoKICAgICAo bGl0ZXJhbCAiL3ByaXZhdGUvZXRjL3NlcnZpY2VzIikpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9S ZXNvdXJjZXMvUGx1Z0luU2FuZGJveFByb2ZpbGVzL2NvbS5tYWNyb21lZGlhLkZsYXNoIFBsYXll ci5wbHVnaW4uc2IKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUmVzb3VyY2VzL1BsdWdJ blNhbmRib3hQcm9maWxlcy9jb20ubWFjcm9tZWRpYS5GbGFzaCBQbGF5ZXIucGx1Z2luLnNiCShy ZXZpc2lvbiAxNDkxNDUpCisrKyBTb3VyY2UvV2ViS2l0Mi9SZXNvdXJjZXMvUGx1Z0luU2FuZGJv eFByb2ZpbGVzL2NvbS5tYWNyb21lZGlhLkZsYXNoIFBsYXllci5wbHVnaW4uc2IJKHdvcmtpbmcg Y29weSkKQEAgLTUsMjMgKzUsMjMgQEAKICAgICAoaG9tZS1saXRlcmFsICIvbW1zLmNmZyIpKQog CiAoZGVueSBmaWxlLXJlYWQteGF0dHIgKHdpdGggbm8tbG9nKQotICAgIChob21lLWxpdGVyYWwg Ii9MaWJyYXJ5L0NhY2hlcyIpCi0gICAgKGhvbWUtbGl0ZXJhbCAiL0xpYnJhcnkvUHJlZmVyZW5j ZXMiKSkKKyAgICAoaG9tZS1saWJyYXJ5LWxpdGVyYWwgIi9DYWNoZXMiKQorICAgIChob21lLWxp YnJhcnktcHJlZmVyZW5jZXMtbGl0ZXJhbCAiLyIpKQogCiAoYWxsb3cgZmlsZS1yZWFkKiBmaWxl LXdyaXRlLWNyZWF0ZSBmaWxlLXdyaXRlLW1vZGUKLSAgICAoaG9tZS1saXRlcmFsICIvTGlicmFy eS9DYWNoZXMvQWRvYmUiKQotICAgIChob21lLWxpdGVyYWwgIi9MaWJyYXJ5L1ByZWZlcmVuY2Vz L01hY3JvbWVkaWEiKSkKKyAgICAoaG9tZS1saWJyYXJ5LWxpdGVyYWwgIi9DYWNoZXMvQWRvYmUi KQorICAgIChob21lLWxpYnJhcnktcHJlZmVyZW5jZXMtbGl0ZXJhbCAiL01hY3JvbWVkaWEiKSkK IAogKGFsbG93IGZpbGUtcmVhZCogZmlsZS13cml0ZSoKICAgICAobGl0ZXJhbCAiL0xpYnJhcnkv QXBwbGljYXRpb24gU3VwcG9ydC9NYWNyb21lZGlhL21tcy5jZmciKQotICAgIChob21lLWxpdGVy YWwgIi9MaWJyYXJ5L0FwcGxpY2F0aW9uIFN1cHBvcnQvTWFjcm9tZWRpYS9tbXMuY2ZnIikKLSAg ICAoaG9tZS1zdWJwYXRoICIvTGlicmFyeS9DYWNoZXMvQWRvYmUvRmxhc2ggUGxheWVyIikKLSAg ICAoaG9tZS1zdWJwYXRoICIvTGlicmFyeS9QcmVmZXJlbmNlcy9NYWNyb21lZGlhL0ZsYXNoIFBs YXllciIpKQorICAgIChob21lLWxpYnJhcnktbGl0ZXJhbCAiL0FwcGxpY2F0aW9uIFN1cHBvcnQv TWFjcm9tZWRpYS9tbXMuY2ZnIikKKyAgICAoaG9tZS1saWJyYXJ5LXN1YnBhdGggIi9DYWNoZXMv QWRvYmUvRmxhc2ggUGxheWVyIikKKyAgICAoaG9tZS1saWJyYXJ5LXByZWZlcmVuY2VzLXN1YnBh dGggIi9NYWNyb21lZGlhL0ZsYXNoIFBsYXllciIpKQogCiAoYWxsb3cgZmlsZS1yZWFkKgogICAg IChsaXRlcmFsICIvTGlicmFyeS9QcmVmZXJlbmNlUGFuZXMvRmxhc2ggUGxheWVyLnByZWZQYW5l IikKLSAgICAoaG9tZS1saXRlcmFsICIvTGlicmFyeS9QcmVmZXJlbmNlUGFuZXMvRmxhc2ggUGxh eWVyLnByZWZQYW5lIikKLSAgICAoaG9tZS1yZWdleCAiL0xpYnJhcnkvQXBwbGljYXRpb24gU3Vw cG9ydC9NYWNyb21lZGlhL3NzXC4oY2ZnfGNmbnxzZ24pJCIpKQorICAgIChob21lLWxpYnJhcnkt bGl0ZXJhbCAiL1ByZWZlcmVuY2VQYW5lcy9GbGFzaCBQbGF5ZXIucHJlZlBhbmUiKQorICAgICho b21lLWxpYnJhcnktcmVnZXggIi9BcHBsaWNhdGlvbiBTdXBwb3J0L01hY3JvbWVkaWEvc3NcLihj Zmd8Y2ZufHNnbikkIikpCiAKIChhbGxvdyBmaWxlLXJlYWQqIGZpbGUtd3JpdGUqCiAgICAgKG1v dW50LXJlbGF0aXZlLXJlZ2V4ICMiXi9cLlRlbXBvcmFyeUl0ZW1zLyIpKQpJbmRleDogU291cmNl L1dlYktpdDIvUmVzb3VyY2VzL1BsdWdJblNhbmRib3hQcm9maWxlcy9jb20ubWljcm9zb2Z0LlNp bHZlcmxpZ2h0UGx1Z2luLnNiCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1Jlc291cmNl cy9QbHVnSW5TYW5kYm94UHJvZmlsZXMvY29tLm1pY3Jvc29mdC5TaWx2ZXJsaWdodFBsdWdpbi5z YgkocmV2aXNpb24gMTQ5MTQ1KQorKysgU291cmNlL1dlYktpdDIvUmVzb3VyY2VzL1BsdWdJblNh bmRib3hQcm9maWxlcy9jb20ubWljcm9zb2Z0LlNpbHZlcmxpZ2h0UGx1Z2luLnNiCSh3b3JraW5n IGNvcHkpCkBAIC04LDE0ICs4LDE0IEBACiAoc2hhcmVkLXByZWZlcmVuY2VzLXJlYWQtd3JpdGUg ImNvbS5taWNyb3NvZnQuc2lsdmVybGlnaHQiKQogCiAoYWxsb3cgZmlsZS13cml0ZS1jcmVhdGUK LSAgICAoaG9tZS1saXRlcmFsICIvTGlicmFyeS9BcHBsaWNhdGlvbiBTdXBwb3J0L01pY3Jvc29m dCIpKQorICAgIChob21lLWxpYnJhcnktbGl0ZXJhbCAiL0FwcGxpY2F0aW9uIFN1cHBvcnQvTWlj cm9zb2Z0IikpCiAKIChhbGxvdyBmaWxlLXJlYWQqIGZpbGUtd3JpdGUqCiAgICAgOzsgU2lnaCwg bW9kZSA3NzcgaW4gL0xpYnJhcnkuCiAgICAgKHN1YnBhdGggIi9MaWJyYXJ5L0FwcGxpY2F0aW9u IFN1cHBvcnQvTWljcm9zb2Z0L1BsYXlSZWFkeSIpCi0gICAgKGhvbWUtc3VicGF0aCAiL0xpYnJh cnkvQXBwbGljYXRpb24gU3VwcG9ydC9NaWNyb3NvZnQvUGxheVJlYWR5IikKLSAgICAoaG9tZS1z dWJwYXRoICIvTGlicmFyeS9BcHBsaWNhdGlvbiBTdXBwb3J0L01pY3Jvc29mdC9TaWx2ZXJsaWdo dCIpCi0gICAgKGhvbWUtc3VicGF0aCAiL0xpYnJhcnkvQ2FjaGVzL1RlbXBvcmFyeUl0ZW1zIikp CisgICAgKGhvbWUtbGlicmFyeS1zdWJwYXRoICIvQXBwbGljYXRpb24gU3VwcG9ydC9NaWNyb3Nv ZnQvUGxheVJlYWR5IikKKyAgICAoaG9tZS1saWJyYXJ5LXN1YnBhdGggIi9BcHBsaWNhdGlvbiBT dXBwb3J0L01pY3Jvc29mdC9TaWx2ZXJsaWdodCIpCisgICAgKGhvbWUtbGlicmFyeS1zdWJwYXRo ICIvQ2FjaGVzL1RlbXBvcmFyeUl0ZW1zIikpCiAKIDs7IEZJWE1FOiA8cmRhcjovL3Byb2JsZW0v MTM2MzYwNzg+CiAoYWxsb3cgaXBjLXBvc2l4LXNobSoKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1Jl c291cmNlcy9QbHVnSW5TYW5kYm94UHJvZmlsZXMvY29tLm9yYWNsZS5qYXZhLkphdmFBcHBsZXRQ bHVnaW4uc2IKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUmVzb3VyY2VzL1BsdWdJblNh bmRib3hQcm9maWxlcy9jb20ub3JhY2xlLmphdmEuSmF2YUFwcGxldFBsdWdpbi5zYgkocmV2aXNp b24gMTQ5MTQ1KQorKysgU291cmNlL1dlYktpdDIvUmVzb3VyY2VzL1BsdWdJblNhbmRib3hQcm9m aWxlcy9jb20ub3JhY2xlLmphdmEuSmF2YUFwcGxldFBsdWdpbi5zYgkod29ya2luZyBjb3B5KQpA QCAtMTksMTMgKzE5LDEzIEBACiAoc2hhcmVkLXByZWZlcmVuY2VzLXJlYWQtd3JpdGUgImNvbS5v cmFjbGUuamF2YWRlcGxveW1lbnQucGxpc3QiKQogCiAoYWxsb3cgZmlsZS1yZWFkKiBmaWxlLXdy aXRlKgotICAgIChob21lLXN1YnBhdGggIi9MaWJyYXJ5L1NhdmVkIEFwcGxpY2F0aW9uIFN0YXRl L25ldC5qYXZhLm9wZW5qZGsuY21kLnNhdmVkU3RhdGUiKQotICAgIChob21lLXN1YnBhdGggIi9M aWJyYXJ5L0FwcGxpY2F0aW9uIFN1cHBvcnQvT3JhY2xlL0phdmEvRGVwbG95bWVudCIpCi0gICAg KGhvbWUtc3VicGF0aCAiL0xpYnJhcnkvQ2FjaGVzL0phdmEiKSkKKyAgICAoaG9tZS1saWJyYXJ5 LXN1YnBhdGggIi9TYXZlZCBBcHBsaWNhdGlvbiBTdGF0ZS9uZXQuamF2YS5vcGVuamRrLmNtZC5z YXZlZFN0YXRlIikKKyAgICAoaG9tZS1saWJyYXJ5LXN1YnBhdGggIi9BcHBsaWNhdGlvbiBTdXBw b3J0L09yYWNsZS9KYXZhL0RlcGxveW1lbnQiKQorICAgIChob21lLWxpYnJhcnktc3VicGF0aCAi L0NhY2hlcy9KYXZhIikpCiAKIChhbGxvdyBmaWxlLXdyaXRlLWNyZWF0ZQotICAgIChob21lLWxp dGVyYWwgIi9MaWJyYXJ5L0FwcGxpY2F0aW9uIFN1cHBvcnQvT3JhY2xlIikKLSAgICAoaG9tZS1s aXRlcmFsICIvTGlicmFyeS9BcHBsaWNhdGlvbiBTdXBwb3J0L09yYWNsZS9KYXZhIikpCisgICAg KGhvbWUtbGlicmFyeS1saXRlcmFsICIvQXBwbGljYXRpb24gU3VwcG9ydC9PcmFjbGUiKQorICAg IChob21lLWxpYnJhcnktbGl0ZXJhbCAiL0FwcGxpY2F0aW9uIFN1cHBvcnQvT3JhY2xlL0phdmEi KSkKIAogKGFsbG93IG5ldHdvcmstYmluZCBuZXR3b3JrLW91dGJvdW5kIChzdWJwYXRoIChwYXJh bSAiREFSV0lOX1VTRVJfVEVNUF9ESVIiKSkpCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJl ZC9tYWMvQ2hpbGRQcm9jZXNzTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1No YXJlZC9tYWMvQ2hpbGRQcm9jZXNzTWFjLm1tCShyZXZpc2lvbiAxNDkxNDUpCisrKyBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvbWFjL0NoaWxkUHJvY2Vzc01hYy5tbQkod29ya2luZyBjb3B5KQpAQCAt MTM5LDYgKzEzOSwxNSBAQCB2b2lkIENoaWxkUHJvY2Vzczo6aW5pdGlhbGl6ZVNhbmRib3goY29u CiAKICAgICBzYW5kYm94UGFyYW1ldGVycy5hZGRQYXRoUGFyYW1ldGVyKCJIT01FX0RJUiIsIHB3 ZC5wd19kaXIpOwogCisgICAgU3RyaW5nIHBhdGggPSBTdHJpbmc6OmZyb21VVEY4KHB3ZC5wd19k aXIpOworICAgIHBhdGguYXBwZW5kKCIvTGlicmFyeSIpOworCisgICAgc2FuZGJveFBhcmFtZXRl cnMuYWRkUGF0aFBhcmFtZXRlcigiSE9NRV9MSUJSQVJZX0RJUiIsIGZpbGVTeXN0ZW1SZXByZXNl bnRhdGlvbihwYXRoKS5kYXRhKCkpOworCisgICAgcGF0aC5hcHBlbmQoIi9QcmVmZXJlbmNlcyIp OworCisgICAgc2FuZGJveFBhcmFtZXRlcnMuYWRkUGF0aFBhcmFtZXRlcigiSE9NRV9MSUJSQVJZ X1BSRUZFUkVOQ0VTX0RJUiIsIGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihwYXRoKS5kYXRhKCkp OworCiAgICAgc3dpdGNoIChzYW5kYm94UGFyYW1ldGVycy5tb2RlKCkpIHsKICAgICBjYXNlIFNh bmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnM6OlVzZURlZmF1bHRTYW5kYm94UHJvZmlsZVBh dGg6CiAgICAgY2FzZSBTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzOjpVc2VPdmVycmlk ZVNhbmRib3hQcm9maWxlUGF0aDogewo= 201923 2013-05-15 23:02:15 -0700 2013-05-15 23:14:23 -0700 proposed fix GitWithSpaces.txt text/plain 3018 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MDE3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDEzLTA1LTE1ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFdlYktpdCB0b29scyBjYW5ub3QgYXBwbHkgZ2l0IHBhdGNoZXMgZm9yIGZp bGVuYW1lcyBjb250YWluaW5nIHNwYWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE1MjgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL1ZDU1V0aWxzLnBtOiAocGFyc2VHaXREaWZmSGVh ZGVyKTogQ292ZXJ0ICsrKyBhbmQgLS0tIGxpbmVzIG1vcmUgYWNjdXJhdGVseS4KKwogMjAxMy0w NS0xNSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2lu ZG93c10gVXBkYXRlIHZhcmlvdXMgYnVpbGQgdG9vbHMgdG8gdW5kZXJzdGFuZCBWUzIwMTAgZW52 aXJvbm1lbnQuCkluZGV4OiBUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0JKHJldmlzaW9uIDE0OTkyNykKKysrIFRvb2xzL1Nj cmlwdHMvVkNTVXRpbHMucG0JKHdvcmtpbmcgY29weSkKQEAgLTEwNyw3ICsxMDcsNyBAQCBteSAk c3ZuVmVyc2lvbjsKICMgUHJvamVjdCB0aW1lIHpvbmUgZm9yIEN1cGVydGlubywgQ0EsIFVTCiBt eSAkY2hhbmdlTG9nVGltZVpvbmUgPSAiUFNUOFBEVCI7CiAKLW15ICRnaXREaWZmU3RhcnRSZWdF eCA9IHFyI15kaWZmIC0tZ2l0IChcdy8pPyguKykgKFx3Lyk/KFteXHJcbl0rKSM7CitteSAkZ2l0 RGlmZlN0YXJ0UmVnRXggPSBxciNeZGlmZiAtLWdpdCAoXHcvKT8oLispIChcdy8pPyhbXlxyXG5d KykjOyAjIFRoaXMgZG9lc24ndCBtYXRjaCBmaWxlIHBhdGggY29ycmVjdGx5IGlmIHRoZXJlIGFy ZSBzcGFjZXMgaW4gaXQuCiBteSAkc3ZuRGlmZlN0YXJ0UmVnRXggPSBxciNeSW5kZXg6IChbXlxy XG5dKykjOwogbXkgJHN2blByb3BlcnRpZXNTdGFydFJlZ0V4ID0gcXIjXlByb3BlcnR5IGNoYW5n ZXMgb246IChbXlxyXG5dKykjOyAjICQxIGlzIG5vcm1hbGx5IHRoZSBzYW1lIGFzIHRoZSBpbmRl eCBwYXRoLgogbXkgJHN2blByb3BlcnR5U3RhcnRSZWdFeCA9IHFyI14oTW9kaWZpZWR8TmFtZXxB ZGRlZHxEZWxldGVkKTogKFteXHJcbl0rKSM7ICMgJDIgaXMgdGhlIG5hbWUgb2YgdGhlIHByb3Bl cnR5LgpAQCAtNjU5LDYgKzY1OSw5IEBAIHN1YiBwYXJzZUdpdERpZmZIZWFkZXIoJCQpCiAgICAg ICAgICMgVGhlIGZpcnN0IGFuZCBzZWNvbmQgcGF0aHMgY2FuIGRpZmZlciBpbiB0aGUgY2FzZSBv ZiBjb3BpZXMKICAgICAgICAgIyBhbmQgcmVuYW1lcy4gIFdlIHVzZSB0aGUgc2Vjb25kIGZpbGUg cGF0aCBiZWNhdXNlIGl0IGlzIHRoZQogICAgICAgICAjIGRlc3RpbmF0aW9uIHBhdGguCisgICAg ICAgICMgRklYTUU6IERvZXMgaXQgbWF0dGVyIHdoYXQgdGhlIEluZGV4IGxpbmUgY29udGFpbnM/ CisgICAgICAgICMgJGluZGV4UGF0aCB3aWxsIGJlIGluY29ycmVjdCBpZiB0aGVyZSBhcmUgc3Bh Y2VzIGluIGZpbGUKKyAgICAgICAgIyBwYXRoLCBzZWUgYnVnIDExNTI4MS4KICAgICAgICAgJGlu ZGV4UGF0aCA9IGFkanVzdFBhdGhGb3JSZWNlbnRSZW5hbWluZ3MoJDQpOwogICAgICAgICAjIFVz ZSAkUE9TVE1BVENIIHRvIHByZXNlcnZlIHRoZSBlbmQtb2YtbGluZSBjaGFyYWN0ZXIuCiAgICAg ICAgICRfID0gIkluZGV4OiAkaW5kZXhQYXRoJFBPU1RNQVRDSCI7ICMgQ29udmVydCB0byBTVk4g Zm9ybWF0LgpAQCAtNzAxLDEwICs3MDQsMTQgQEAgc3ViIHBhcnNlR2l0RGlmZkhlYWRlcigkJCkK ICAgICAgICAgICAgICMgICAgICAgIHBlcm1pdCB1cyB0byB1c2UgInN2biBtb3ZlIiBhbmQgImdp dCBtb3ZlIi4KICAgICAgICAgICAgICRjb3BpZWRGcm9tUGF0aCA9ICQxOwogICAgICAgICAgICAg JHNob3VsZERlbGV0ZVNvdXJjZSA9IDE7Ci0gICAgICAgIH0gZWxzaWYgKC9eLS0tIFxTKy8pIHsK LSAgICAgICAgICAgICRfID0gIi0tLSAkaW5kZXhQYXRoIjsgIyBDb252ZXJ0IHRvIFNWTiBmb3Jt YXQuCi0gICAgICAgIH0gZWxzaWYgKC9eXCtcK1wrIFxTKy8pIHsKLSAgICAgICAgICAgICRfID0g IisrKyAkaW5kZXhQYXRoIjsgIyBDb252ZXJ0IHRvIFNWTiBmb3JtYXQuCisgICAgICAgIH0gZWxz aWYgKC9eLS0tIChcd1wvKT8oLispJC8pIHsKKyAgICAgICAgICAgICMgQ29udmVydCB0byBTVk4g Zm9ybWF0LiBUaGUgdGFiIGNoYXJhY3RlciBpcyBuZWNlc3NhcnkgZm9yIHBhdGhzIHRoYXQgY29u dGFpbiBzcGFjZXMuCisgICAgICAgICAgICAkXyA9ICItLS0gIiAuIGFkanVzdFBhdGhGb3JSZWNl bnRSZW5hbWluZ3MoJDIpIC4gIlx0IjsKKyAgICAgICAgfSBlbHNpZiAoL15cK1wrXCsgKFx3XC8p PyguKykkLykgeworICAgICAgICAgICAgIyBVcGRhdGUgJGluZGV4UGF0aCwgYXMgdGhlIGZpcnN0 IGxpbmUgY291bGQgaGF2ZSBiZWVuIG1pc3BhcnNlZC4KKyAgICAgICAgICAgICRpbmRleFBhdGgg PSBhZGp1c3RQYXRoRm9yUmVjZW50UmVuYW1pbmdzKCQyKTsKKyAgICAgICAgICAgICMgQ29udmVy dCB0byBTVk4gZm9ybWF0LiBUaGUgdGFiIGNoYXJhY3RlciBpcyBuZWNlc3NhcnkgZm9yIHBhdGhz IHRoYXQgY29udGFpbiBzcGFjZXMuCisgICAgICAgICAgICAkXyA9ICIrKysgJGluZGV4UGF0aFx0 IjsKICAgICAgICAgICAgICRmb3VuZEhlYWRlckVuZGluZyA9IDE7CiAgICAgICAgIH0gZWxzaWYg KC9eR0lUIGJpbmFyeSBwYXRjaCQvICkgewogICAgICAgICAgICAgJGlzQmluYXJ5ID0gMTsK 201924 2013-05-15 23:14:23 -0700 2013-05-17 10:27:32 -0700 proposed patch GitWithSpaces.txt text/plain 2974 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MDE3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDEzLTA1LTE1ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFdlYktpdCB0b29scyBjYW5ub3QgYXBwbHkgZ2l0IHBhdGNoZXMgZm9yIGZp bGVuYW1lcyBjb250YWluaW5nIHNwYWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE1MjgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL1ZDU1V0aWxzLnBtOiAocGFyc2VHaXREaWZmSGVh ZGVyKTogQ292ZXJ0ICsrKyBhbmQgLS0tIGxpbmVzIG1vcmUgYWNjdXJhdGVseS4KKwogMjAxMy0w NS0xNSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2lu ZG93c10gVXBkYXRlIHZhcmlvdXMgYnVpbGQgdG9vbHMgdG8gdW5kZXJzdGFuZCBWUzIwMTAgZW52 aXJvbm1lbnQuCkluZGV4OiBUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0JKHJldmlzaW9uIDE0OTkyNykKKysrIFRvb2xzL1Nj cmlwdHMvVkNTVXRpbHMucG0JKHdvcmtpbmcgY29weSkKQEAgLTEwNyw3ICsxMDcsNyBAQCBteSAk c3ZuVmVyc2lvbjsKICMgUHJvamVjdCB0aW1lIHpvbmUgZm9yIEN1cGVydGlubywgQ0EsIFVTCiBt eSAkY2hhbmdlTG9nVGltZVpvbmUgPSAiUFNUOFBEVCI7CiAKLW15ICRnaXREaWZmU3RhcnRSZWdF eCA9IHFyI15kaWZmIC0tZ2l0IChcdy8pPyguKykgKFx3Lyk/KFteXHJcbl0rKSM7CitteSAkZ2l0 RGlmZlN0YXJ0UmVnRXggPSBxciNeZGlmZiAtLWdpdCAoXHcvKT8oLispIChcdy8pPyhbXlxyXG5d KykjOyAjIFRoaXMgZG9lc24ndCBtYXRjaCBmaWxlIHBhdGggY29ycmVjdGx5IGlmIHRoZXJlIGFy ZSBzcGFjZXMgaW4gaXQuCiBteSAkc3ZuRGlmZlN0YXJ0UmVnRXggPSBxciNeSW5kZXg6IChbXlxy XG5dKykjOwogbXkgJHN2blByb3BlcnRpZXNTdGFydFJlZ0V4ID0gcXIjXlByb3BlcnR5IGNoYW5n ZXMgb246IChbXlxyXG5dKykjOyAjICQxIGlzIG5vcm1hbGx5IHRoZSBzYW1lIGFzIHRoZSBpbmRl eCBwYXRoLgogbXkgJHN2blByb3BlcnR5U3RhcnRSZWdFeCA9IHFyI14oTW9kaWZpZWR8TmFtZXxB ZGRlZHxEZWxldGVkKTogKFteXHJcbl0rKSM7ICMgJDIgaXMgdGhlIG5hbWUgb2YgdGhlIHByb3Bl cnR5LgpAQCAtNjU5LDYgKzY1OSw5IEBAIHN1YiBwYXJzZUdpdERpZmZIZWFkZXIoJCQpCiAgICAg ICAgICMgVGhlIGZpcnN0IGFuZCBzZWNvbmQgcGF0aHMgY2FuIGRpZmZlciBpbiB0aGUgY2FzZSBv ZiBjb3BpZXMKICAgICAgICAgIyBhbmQgcmVuYW1lcy4gIFdlIHVzZSB0aGUgc2Vjb25kIGZpbGUg cGF0aCBiZWNhdXNlIGl0IGlzIHRoZQogICAgICAgICAjIGRlc3RpbmF0aW9uIHBhdGguCisgICAg ICAgICMgRklYTUU6IERvZXMgaXQgbWF0dGVyIHdoYXQgdGhlIEluZGV4IGxpbmUgY29udGFpbnM/ CisgICAgICAgICMgJGluZGV4UGF0aCB3aWxsIGJlIGluY29ycmVjdCBpZiB0aGVyZSBhcmUgc3Bh Y2VzIGluIGZpbGUKKyAgICAgICAgIyBwYXRoLCBzZWUgYnVnIDExNTI4MS4KICAgICAgICAgJGlu ZGV4UGF0aCA9IGFkanVzdFBhdGhGb3JSZWNlbnRSZW5hbWluZ3MoJDQpOwogICAgICAgICAjIFVz ZSAkUE9TVE1BVENIIHRvIHByZXNlcnZlIHRoZSBlbmQtb2YtbGluZSBjaGFyYWN0ZXIuCiAgICAg ICAgICRfID0gIkluZGV4OiAkaW5kZXhQYXRoJFBPU1RNQVRDSCI7ICMgQ29udmVydCB0byBTVk4g Zm9ybWF0LgpAQCAtNzAxLDEwICs3MDQsMTQgQEAgc3ViIHBhcnNlR2l0RGlmZkhlYWRlcigkJCkK ICAgICAgICAgICAgICMgICAgICAgIHBlcm1pdCB1cyB0byB1c2UgInN2biBtb3ZlIiBhbmQgImdp dCBtb3ZlIi4KICAgICAgICAgICAgICRjb3BpZWRGcm9tUGF0aCA9ICQxOwogICAgICAgICAgICAg JHNob3VsZERlbGV0ZVNvdXJjZSA9IDE7Ci0gICAgICAgIH0gZWxzaWYgKC9eLS0tIFxTKy8pIHsK LSAgICAgICAgICAgICRfID0gIi0tLSAkaW5kZXhQYXRoIjsgIyBDb252ZXJ0IHRvIFNWTiBmb3Jt YXQuCi0gICAgICAgIH0gZWxzaWYgKC9eXCtcK1wrIFxTKy8pIHsKLSAgICAgICAgICAgICRfID0g IisrKyAkaW5kZXhQYXRoIjsgIyBDb252ZXJ0IHRvIFNWTiBmb3JtYXQuCisgICAgICAgIH0gZWxz aWYgKC9eLS0tIChcd1wvKT8oW15cdF0rKShcdD8pLykgeworICAgICAgICAgICAgbXkgJHBvc3Np Ymx5VGFiID0gJDM7CisgICAgICAgICAgICAkXyA9ICItLS0gIiAuIGFkanVzdFBhdGhGb3JSZWNl bnRSZW5hbWluZ3MoJDIpIC4gIiRwb3NzaWJseVRhYiI7ICMgQ29udmVydCB0byBTVk4gZm9ybWF0 LgorICAgICAgICB9IGVsc2lmICgvXlwrXCtcKyAoXHdcLyk/KFteXHRdKykoXHQ/KS8pIHsKKyAg ICAgICAgICAgICMgVXBkYXRlICRpbmRleFBhdGgsIGFzIHRoZSBmaXJzdCBsaW5lIGNvdWxkIGhh dmUgYmVlbiBtaXNwYXJzZWQuCisgICAgICAgICAgICAkaW5kZXhQYXRoID0gYWRqdXN0UGF0aEZv clJlY2VudFJlbmFtaW5ncygkMik7CisgICAgICAgICAgICBteSAkcG9zc2libHlUYWIgPSAkMzsK KyAgICAgICAgICAgICRfID0gIisrKyAkaW5kZXhQYXRoJHBvc3NpYmx5VGFiIjsgIyBDb252ZXJ0 IHRvIFNWTiBmb3JtYXQuCiAgICAgICAgICAgICAkZm91bmRIZWFkZXJFbmRpbmcgPSAxOwogICAg ICAgICB9IGVsc2lmICgvXkdJVCBiaW5hcnkgcGF0Y2gkLyApIHsKICAgICAgICAgICAgICRpc0Jp bmFyeSA9IDE7Cg==