38320 2010-04-29 04:43:24 -0700 svn-apply: Add an "isBinary" property to the hashes returned by parseDiff() and parseDiffHeader() 2010-05-06 19:54:27 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 38319 1 cjerdonek cjerdonek cjerdonek dbates eric oldest_to_newest 218959 0 cjerdonek 2010-04-29 04:43:24 -0700 This will allow us to address part of this FIXME in both svn-apply and svn-unapply: > # FIXME: This information should be extracted from the diff file as > # part of the parsing stage, i.e. the call to parsePatch(). > $addition = 1 if ($patch =~ /\n--- .+\(revision 0\)\r?\n/ || $patch =~ /\n@@ -0,0 .* @@/) && !exists($copiedFiles{$fullPath}); > $deletion = 1 if $patch =~ /\n@@ .* \+0,0 @@/; > $isBinary = 1 if $patch =~ /\nCannot display: file marked as a binary type\./; > $isGitBinary = 1 if $patch =~ /\nGIT binary patch\n/; This can be fixed by adjusting this area of VCSUtils's parseDiffHeader(): > } elsif (s/^\+\+\+ \S+/+++ $indexPath/ || > /^Cannot display: file marked as a binary type.$/ || # SVN binary > /^GIT binary patch$/) { > # +++ > $foundHeaderEnding = 1; > } 221267 1 55153 cjerdonek 2010-05-05 13:50:06 -0700 Created attachment 55153 Proposed patch 221268 2 cjerdonek 2010-05-05 13:52:39 -0700 I didn't know until now that svn-unapply didn't support binary files in Git diffs. How is the commit-queue, etc. able to get away with that? 221451 3 eric 2010-05-05 19:56:19 -0700 The commit-queue does not use svn-unapply. svn-unapply is basically quilt-like functionality which Darin Adler and others built in WebKit to work around SVN's short-commings. 222065 4 dbates 2010-05-06 16:57:03 -0700 How did you come to the decision to remove scmFormat and instead use two different keys isSvn and isGit? I take it to get rid of doing a string comparison. 222109 5 cjerdonek 2010-05-06 18:40:08 -0700 (In reply to comment #4) > How did you come to the decision to remove scmFormat and instead use two > different keys isSvn and isGit? I take it to get rid of doing a string > comparison. Yes, more or less. I originally thought that a single key-value for the type would be simplest. But in the end the code turned out to be cleaner with two key-value pairs isGit and isSvn. 222111 6 cjerdonek 2010-05-06 18:50:05 -0700 (In reply to comment #5) > (In reply to comment #4) > > How did you come to the decision to remove scmFormat and instead use two > > different keys isSvn and isGit? I take it to get rid of doing a string > > comparison. > > Yes, more or less. I originally thought that a single key-value for the type > would be simplest. But in the end the code turned out to be cleaner with two > key-value pairs isGit and isSvn. Also, I'm now convinced that using "key not present" is acceptable and even desirable to represent false for our diffHash-related objects. Otherwise, each time we add a specialized property we would have to update every unit test, which isn't scalable. Given that "key not present" is acceptable, having two key-values isGit and isSvn becomes more acceptable since then only one would ever have to be set. 222121 7 55153 dbates 2010-05-06 19:33:24 -0700 Comment on attachment 55153 Proposed patch Looks good to me. By the way, I've noticed that we interchange between "SVN", "Svn", and "svn" throughout VCSUtils. Similarly, we interchange between "git" and "Git". We should consider standardizing around one. This does not need to be addressed in this patch, just wanted to point it out. 222129 8 55153 cjerdonek 2010-05-06 19:54:21 -0700 Comment on attachment 55153 Proposed patch Clearing flags on attachment: 55153 Committed r58929: <http://trac.webkit.org/changeset/58929> 222130 9 cjerdonek 2010-05-06 19:54:27 -0700 All reviewed patches have been landed. Closing bug. 55153 2010-05-05 13:50:06 -0700 2010-05-06 19:54:21 -0700 Proposed patch _patch-38320-1.diff text/plain 16889 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3NjA5MDUyLi4xMDA2YTg4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMTAtMDUt MDUgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlZCB0aGUgbmVlZCBmb3Ig c3ZuLWFwcGx5IGFuZCAtdW5hcHBseSB0byByZS1wYXJzZSB3aGV0aGVyCisgICAgICAgIGEgZGlm ZiBpcyBiaW5hcnkgb3Igbm90LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zODMyMAorCisgICAgICAgICogU2NyaXB0cy9WQ1NVdGlscy5wbToKKyAg ICAgICAgICAtIEFkanVzdGVkIHBhcnNlR2l0RGlmZkhlYWRlcigpIHRvIHNldCB0aGUgaXNCaW5h cnkga2V5LgorICAgICAgICAgIC0gQWRqdXN0ZWQgcGFyc2VTdm5EaWZmSGVhZGVyKCkgdG8gc2V0 IHRoZSBpc0JpbmFyeSBrZXkuCisgICAgICAgICAgLSBBZGp1c3RlZCBwYXJzZURpZmZIZWFkZXIo KSB0byBzZXQgdGhlIGlzQmluYXJ5IGtleS4KKyAgICAgICAgICAtIENoYW5nZWQgdGhlIHNjbUZv cm1hdCBrZXkgc2V0IGJ5IHBhcnNlRGlmZkhlYWRlcigpIHRvCisgICAgICAgICAgICBpc0dpdCBh bmQgaXNTdm4ga2V5cy4KKyAgICAgICAgICAtIEFkanVzdGVkIHBhcnNlRGlmZigpIHRvIHNldCB0 aGUgaXNCaW5hcnksIGlzR2l0LCBhbmQgaXNTdm4ga2V5cy4KKworICAgICAgICAqIFNjcmlwdHMv c3ZuLWFwcGx5OgorICAgICAgICAgIC0gVXBkYXRlZCB0aGUgcGF0Y2goKSBtZXRob2QgdG8gdXNl IHRoZSBpc0JpbmFyeSwgaXNHaXQsIGFuZAorICAgICAgICAgICAgaXNTdm4ga2V5cy4KKworICAg ICAgICAqIFNjcmlwdHMvc3ZuLXVuYXBwbHk6CisgICAgICAgICAgLSBVcGRhdGVkIHRoZSBwYXRj aCgpIG1ldGhvZCB0byB1c2UgdGhlIGlzQmluYXJ5IGFuZCBpc1N2biBrZXlzLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlRGlmZi5wbDoKKyAg ICAgICAgICAtIFVwZGF0ZWQgdGhlIHVuaXQgdGVzdHMgYXMgbmVjZXNzYXJ5LgorICAgICAgICAg IC0gQWRkZWQgYSB0ZXN0IGNhc2UgdG8gdGVzdCB0aGF0IHRoZSBpc0JpbmFyeSBrZXkgaXMgZ2V0 dGluZyBzZXQgcHJvcGVybHkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRp bHNfdW5pdHRlc3QvcGFyc2VEaWZmSGVhZGVyLnBsOgorICAgICAgICAgIC0gVXBkYXRlZCB0aGUg dW5pdCB0ZXN0cyBhcyBuZWNlc3NhcnkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwv VkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VHaXREaWZmSGVhZGVyLnBsOgorICAgICAgICAgIC0gVXBk YXRlZCB0aGUgdW5pdCB0ZXN0cyBhcyBuZWNlc3NhcnkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VTdm5EaWZmSGVhZGVyLnBsOgorICAgICAg ICAgIC0gVXBkYXRlZCB0aGUgdW5pdCB0ZXN0cyBhcyBuZWNlc3NhcnkuCisKIDIwMTAtMDUtMDQg IENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0 aWxzLnBtIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQppbmRleCBkMGFhNDI2Li4w OGE3ZjdjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KQEAgLTQzMCw2ICs0MzAsNyBAQCBzdWIg aXNFeGVjdXRhYmxlKCQpCiAjICAgICAgICAgICAgICAgICAgICAgICAgIHJlbW92ZWQuICBGb3Ig bmV3IGFuZCBkZWxldGVkIGZpbGVzLCB0aGUgdmFsdWUgaXMgMAogIyAgICAgICAgICAgICAgICAg ICAgICAgICBvbmx5IGlmIHRoZSBuZXcgb3IgZGVsZXRlZCBmaWxlIGlzIG5vdCBleGVjdXRhYmxl LgogIyAgICAgaW5kZXhQYXRoOiB0aGUgcGF0aCBpbiB0aGUgIkluZGV4OiIgbGluZS4KKyMgICAg IGlzQmluYXJ5OiB3aGV0aGVyIHRoZSBkaWZmIGlzIGZvciBhIGJpbmFyeSBmaWxlLgogIyAgICAg c3ZuQ29udmVydGVkVGV4dDogdGhlIGhlYWRlciB0ZXh0IHdpdGggc29tZSBsaW5lcyBjb252ZXJ0 ZWQgdG8gU1ZOCiAjICAgICAgICAgICAgICAgICAgICAgICBmb3JtYXQuICBHaXQtc3BlY2lmaWMg bGluZXMgYXJlIHByZXNlcnZlZC4KICMgICAkbGFzdFJlYWRMaW5lOiB0aGUgbGluZSBsYXN0IHJl YWQgZnJvbSAkZmlsZUhhbmRsZS4KQEAgLTQ1MCw2ICs0NTEsNyBAQCBzdWIgcGFyc2VHaXREaWZm SGVhZGVyKCQkKQogICAgIH0KIAogICAgIG15ICRmb3VuZEhlYWRlckVuZGluZzsKKyAgICBteSAk aXNCaW5hcnk7CiAgICAgbXkgJG5ld0V4ZWN1dGFibGVCaXQgPSAwOwogICAgIG15ICRvbGRFeGVj dXRhYmxlQml0ID0gMDsKICAgICBteSAkc3ZuQ29udmVydGVkVGV4dDsKQEAgLTQ3NSw2ICs0Nzcs NyBAQCBzdWIgcGFyc2VHaXREaWZmSGVhZGVyKCQkKQogICAgICAgICAgICAgICAgICJsaW5lOiBc IiRfXCIuICBCZSBzdXJlIHRvIHVzZSB0aGUgLS1iaW5hcnkgZmxhZyB3aGVuIGludm9raW5nIFwi Z2l0IGRpZmZcIiAiLgogICAgICAgICAgICAgICAgICJ3aXRoIGRpZmZzIGNvbnRhaW5pbmcgYmlu YXJ5IGZpbGVzLiIpOwogICAgICAgICB9IGVsc2lmICgvXkdJVCBiaW5hcnkgcGF0Y2gkLyApIHsK KyAgICAgICAgICAgICRpc0JpbmFyeSA9IDE7CiAgICAgICAgICAgICAkZm91bmRIZWFkZXJFbmRp bmcgPSAxOwogICAgICAgICB9CiAKQEAgLTQ5MSw2ICs0OTQsNyBAQCBzdWIgcGFyc2VHaXREaWZm SGVhZGVyKCQkKQogCiAgICAgJGhlYWRlcntleGVjdXRhYmxlQml0RGVsdGF9ID0gJGV4ZWN1dGFi bGVCaXREZWx0YTsKICAgICAkaGVhZGVye2luZGV4UGF0aH0gPSAkaW5kZXhQYXRoOworICAgICRo ZWFkZXJ7aXNCaW5hcnl9ID0gJGlzQmluYXJ5IGlmIGRlZmluZWQoJGlzQmluYXJ5KTsKICAgICAk aGVhZGVye3N2bkNvbnZlcnRlZFRleHR9ID0gJHN2bkNvbnZlcnRlZFRleHQ7CiAKICAgICByZXR1 cm4gKFwlaGVhZGVyLCAkXyk7CkBAIC01MTMsNiArNTE3LDcgQEAgc3ViIHBhcnNlR2l0RGlmZkhl YWRlcigkJCkKICMgICAgIGNvcGllZEZyb21QYXRoOiBpZiBhIGZpbGUgY29weSwgdGhlIHBhdGgg ZnJvbSB3aGljaCB0aGUgZmlsZSB3YXMKICMgICAgICAgICAgICAgICAgICAgICBjb3BpZWQuIE90 aGVyd2lzZSwgdW5kZWZpbmVkLgogIyAgICAgaW5kZXhQYXRoOiB0aGUgcGF0aCBpbiB0aGUgIklu ZGV4OiIgbGluZS4KKyMgICAgIGlzQmluYXJ5OiB3aGV0aGVyIHRoZSBkaWZmIGlzIGZvciBhIGJp bmFyeSBmaWxlLgogIyAgICAgc291cmNlUmV2aXNpb246IHRoZSByZXZpc2lvbiBudW1iZXIgb2Yg dGhlIHNvdXJjZS4gVGhpcyBpcyB0aGUgc2FtZQogIyAgICAgICAgICAgICAgICAgICAgIGFzIHRo ZSByZXZpc2lvbiBudW1iZXIgdGhlIGZpbGUgd2FzIGNvcGllZCBmcm9tLCBpbgogIyAgICAgICAg ICAgICAgICAgICAgIHRoZSBjYXNlIG9mIGEgZmlsZSBjb3B5LgpAQCAtNTM0LDYgKzUzOSw3IEBA IHN1YiBwYXJzZVN2bkRpZmZIZWFkZXIoJCQpCiAgICAgbXkgJGNvcGllZEZyb21QYXRoOwogICAg IG15ICRmb3VuZEhlYWRlckVuZGluZzsKICAgICBteSAkaW5kZXhQYXRoOworICAgIG15ICRpc0Jp bmFyeTsKICAgICBteSAkc291cmNlUmV2aXNpb247CiAgICAgbXkgJHN2bkNvbnZlcnRlZFRleHQ7 CiAgICAgd2hpbGUgKDEpIHsKQEAgLTU1OCw5ICs1NjQsMTAgQEAgc3ViIHBhcnNlU3ZuRGlmZkhl YWRlcigkJCkKICAgICAgICAgICAgICAgICAgICAgICAgICJzb3VyY2UgcmV2aXNpb24gbnVtYmVy IFwiJHNvdXJjZVJldmlzaW9uXCIuIikgaWYgKCQyICE9ICRzb3VyY2VSZXZpc2lvbik7CiAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2lmIChzL15cK1wrXCsg XFMrLysrKyAkaW5kZXhQYXRoLyB8fAotICAgICAgICAgICAgICAgICAvXkNhbm5vdCBkaXNwbGF5 OiBmaWxlIG1hcmtlZCBhcyBhIGJpbmFyeSB0eXBlLiQvKSB7Ci0gICAgICAgICAgICAjICsrKwor ICAgICAgICB9IGVsc2lmIChzL15cK1wrXCsgXFMrLysrKyAkaW5kZXhQYXRoLykgeworICAgICAg ICAgICAgJGZvdW5kSGVhZGVyRW5kaW5nID0gMTsKKyAgICAgICAgfSBlbHNpZiAoL15DYW5ub3Qg ZGlzcGxheTogZmlsZSBtYXJrZWQgYXMgYSBiaW5hcnkgdHlwZS4kLykgeworICAgICAgICAgICAg JGlzQmluYXJ5ID0gMTsKICAgICAgICAgICAgICRmb3VuZEhlYWRlckVuZGluZyA9IDE7CiAgICAg ICAgIH0KIApAQCAtNTc5LDYgKzU4Niw3IEBAIHN1YiBwYXJzZVN2bkRpZmZIZWFkZXIoJCQpCiAK ICAgICAkaGVhZGVye2NvcGllZEZyb21QYXRofSA9ICRjb3BpZWRGcm9tUGF0aDsKICAgICAkaGVh ZGVye2luZGV4UGF0aH0gPSAkaW5kZXhQYXRoOworICAgICRoZWFkZXJ7aXNCaW5hcnl9ID0gJGlz QmluYXJ5IGlmIGRlZmluZWQoJGlzQmluYXJ5KTsKICAgICAkaGVhZGVye3NvdXJjZVJldmlzaW9u fSA9ICRzb3VyY2VSZXZpc2lvbjsKICAgICAkaGVhZGVye3N2bkNvbnZlcnRlZFRleHR9ID0gJHN2 bkNvbnZlcnRlZFRleHQ7CiAKQEAgLTYwNyw3ICs2MTUsOSBAQCBzdWIgcGFyc2VTdm5EaWZmSGVh ZGVyKCQkKQogIyAgICAgICAgICAgICAgICAgICAgICAgICByZW1vdmVkLiAgRm9yIG5ldyBhbmQg ZGVsZXRlZCBmaWxlcywgdGhlIHZhbHVlIGlzIDAKICMgICAgICAgICAgICAgICAgICAgICAgICAg b25seSBpZiB0aGUgbmV3IG9yIGRlbGV0ZWQgZmlsZSBpcyBub3QgZXhlY3V0YWJsZS4KICMgICAg IGluZGV4UGF0aDogdGhlIHBhdGggdG8gdGhlIGZpbGUuCi0jICAgICBzY21Gb3JtYXQ6IHRoZSBz dHJpbmcgImdpdCIgb3IgInN2biIgZGVwZW5kaW5nIG9uIHRoZSBmb3JtYXQuCisjICAgICBpc0Jp bmFyeTogd2hldGhlciB0aGUgZGlmZiBpcyBmb3IgYSBiaW5hcnkgZmlsZS4KKyMgICAgIGlzR2l0 OiB3aGV0aGVyIHRoZSBkaWZmIGlzIEdpdC1mb3JtYXR0ZWQuCisjICAgICBpc1N2bjogd2hldGhl ciB0aGUgZGlmZiBpcyBTVk4tZm9ybWF0dGVkLgogIyAgICAgc291cmNlUmV2aXNpb246IHRoZSBy ZXZpc2lvbiBudW1iZXIgb2YgdGhlIHNvdXJjZS4gVGhpcyBpcyB0aGUgc2FtZQogIyAgICAgICAg ICAgICAgICAgICAgIGFzIHRoZSByZXZpc2lvbiBudW1iZXIgdGhlIGZpbGUgd2FzIGNvcGllZCBm cm9tLCBpbgogIyAgICAgICAgICAgICAgICAgICAgIHRoZSBjYXNlIG9mIGEgZmlsZSBjb3B5LgpA QCAtNjE5LDI4ICs2MjksMzAgQEAgc3ViIHBhcnNlRGlmZkhlYWRlcigkJCkKICAgICBteSAoJGZp bGVIYW5kbGUsICRsaW5lKSA9IEBfOwogCiAgICAgbXkgJGhlYWRlcjsgICMgVGhpcyBpcyBhIGhh c2ggcmVmLgorICAgIG15ICRpc0dpdDsKKyAgICBteSAkaXNTdm47CiAgICAgbXkgJGxhc3RSZWFk TGluZTsKLSAgICBteSAkc2NtRm9ybWF0OwogCiAgICAgaWYgKCRsaW5lID1+IC9eSW5kZXg6Lykg ewotICAgICAgICAkc2NtRm9ybWF0ID0gInN2biI7CisgICAgICAgICRpc1N2biA9IDE7CiAgICAg ICAgICgkaGVhZGVyLCAkbGFzdFJlYWRMaW5lKSA9IHBhcnNlU3ZuRGlmZkhlYWRlcigkZmlsZUhh bmRsZSwgJGxpbmUpOwogICAgIH0gZWxzaWYgKCRsaW5lID1+IC9eZGlmZiAtLWdpdC8pIHsKLSAg ICAgICAgJHNjbUZvcm1hdCA9ICJnaXQiOworICAgICAgICAkaXNHaXQgPSAxOwogICAgICAgICAo JGhlYWRlciwgJGxhc3RSZWFkTGluZSkgPSBwYXJzZUdpdERpZmZIZWFkZXIoJGZpbGVIYW5kbGUs ICRsaW5lKTsKICAgICB9IGVsc2UgewogICAgICAgICBkaWUoIkZpcnN0IGxpbmUgb2YgZGlmZiBk b2VzIG5vdCBiZWdpbiB3aXRoIFwiSW5kZXg6XCIgb3IgXCJkaWZmIC0tZ2l0XCI6IFwiJGxpbmVc IiIpOwogICAgIH0KIAotICAgICMgSW5pdGlhbGl6ZSBub24tZXhpc3RlbnQgdmFsdWVzIHRvIHRo ZWlyIGRlZmF1bHRzLiAgV2UgbmVlZCB0byBkbyB0aGlzCi0gICAgIyBldmVuIHdoZW4gdW5kZWYg aXMgZXhwZWN0ZWQgc2luY2UgdGhlIHVuaXQgdGVzdHMgY2FuIGRpc3Rpbmd1aXNoCi0gICAgIyBi ZXR3ZWVuIHRoZSB2YWx1ZSB1bmRlZiBhbmQgYSBrZXkgbm90IGV4aXN0aW5nLgorICAgICMgRklY TUU6IERvIG5vdCBzZXQga2V5LXZhbHVlcyBmb3IgdmFsdWVzIHRoYXQgYXJlIG5vdCBkZWZpbmVk LgorICAgICMgICAgICAgIFJlbHkgaW5zdGVhZCBvbiB0aGUgZmFjdCB0aGF0IFBlcmwgZXZhbHVh dGVzIG5vbi1leGlzdGVudAorICAgICMgICAgICAgIGtleS12YWx1ZXMgdG8gZmFsc2UuICBUaGlz IGtlZXBzIHRoZSB1bml0IHRlc3RzIHNtYWxsZXIKKyAgICAjICAgICAgICBhbmQgZWFzaWVyIHRv IG1haW50YWluIHNpbmNlIGFkZGluZyBzdXBwb3J0IGZvciBuZXcga2V5cworICAgICMgICAgICAg IHdpbGwgbm90IHJlcXVpcmUgdXBkYXRpbmcgZXZlcnkgdW5pdCB0ZXN0IGNhc2UuCiAgICAgJGhl YWRlci0+e2NvcGllZEZyb21QYXRofSA9IHVuZGVmIGlmICFkZWZpbmVkKCRoZWFkZXItPntjb3Bp ZWRGcm9tUGF0aH0pOwogICAgICRoZWFkZXItPntleGVjdXRhYmxlQml0RGVsdGF9ID0gMCBpZiAh ZGVmaW5lZCgkaGVhZGVyLT57ZXhlY3V0YWJsZUJpdERlbHRhfSk7Ci0gICAgIyBpbmRleFBhdGg6 IGFscmVhZHkgc2V0IGJ5IGJvdGggcGFyc2UgaW1wbGVtZW50YXRpb25zLgotICAgICRoZWFkZXIt PntzY21Gb3JtYXR9ID0gJHNjbUZvcm1hdDsKKyAgICAkaGVhZGVyLT57aXNHaXR9ID0gJGlzR2l0 IGlmIGRlZmluZWQoJGlzR2l0KTsKKyAgICAkaGVhZGVyLT57aXNTdm59ID0gJGlzU3ZuIGlmIGRl ZmluZWQoJGlzU3ZuKTsKICAgICAkaGVhZGVyLT57c291cmNlUmV2aXNpb259ID0gdW5kZWYgaWYg IWRlZmluZWQoJGhlYWRlci0+e3NvdXJjZVJldmlzaW9ufSk7Ci0gICAgIyBzdm5Db252ZXJ0ZWRU ZXh0OiBhbHJlYWR5IHNldCBieSBib3RoIHBhcnNlIGltcGxlbWVudGF0aW9ucy4KIAogICAgIHJl dHVybiAoJGhlYWRlciwgJGxhc3RSZWFkTGluZSk7CiB9CkBAIC02NjMsNiArNjc1LDkgQEAgc3Vi IHBhcnNlRGlmZkhlYWRlcigkJCkKICMgICAgICAgICAgICAgICAgICAgY29waWVkLiBPdGhlcndp c2UsIHVuZGVmaW5lZC4KICMgICBpbmRleFBhdGg6IHRoZSBwYXRoIG9mIHRoZSBmaWxlLiBGb3Ig U1ZOLWZvcm1hdHRlZCBkaWZmcywgdGhpcyBpcwogIyAgICAgICAgICAgICAgdGhlIHNhbWUgYXMg dGhlIHBhdGggaW4gdGhlICJJbmRleDoiIGxpbmUuCisjICAgaXNCaW5hcnk6IHdoZXRoZXIgdGhl IGRpZmYgaXMgZm9yIGEgYmluYXJ5IGZpbGUuCisjICAgaXNHaXQ6IHdoZXRoZXIgdGhlIGRpZmYg aXMgR2l0LWZvcm1hdHRlZC4KKyMgICBpc1N2bjogd2hldGhlciB0aGUgZGlmZiBpcyBTVk4tZm9y bWF0dGVkLgogIyAgIHNvdXJjZVJldmlzaW9uOiB0aGUgcmV2aXNpb24gbnVtYmVyIG9mIHRoZSBz b3VyY2UuIFRoaXMgaXMgdGhlIHNhbWUKICMgICAgICAgICAgICAgICAgICAgYXMgdGhlIHJldmlz aW9uIG51bWJlciB0aGUgZmlsZSB3YXMgY29waWVkIGZyb20sIGluCiAjICAgICAgICAgICAgICAg ICAgIHRoZSBjYXNlIG9mIGEgZmlsZSBjb3B5LgpAQCAtNzIyLDcgKzczNyw5IEBAIHN1YiBwYXJz ZURpZmYoJCQpCiAgICAgJGRpZmZIYXNoUmVme2NvcGllZEZyb21QYXRofSA9ICRoZWFkZXJIYXNo UmVmLT57Y29waWVkRnJvbVBhdGh9OwogICAgICMgRklYTUU6IEFkZCBleGVjdXRhYmxlQml0RGVs dGEgYXMgYSBrZXkuCiAgICAgJGRpZmZIYXNoUmVme2luZGV4UGF0aH0gPSAkaGVhZGVySGFzaFJl Zi0+e2luZGV4UGF0aH07Ci0gICAgIyBGSVhNRTogQWxzbyBhZGQgc2NtRm9ybWF0IGZyb20gdGhl ICRoZWFkZXJIYXNoUmVmLgorICAgICRkaWZmSGFzaFJlZntpc0JpbmFyeX0gPSAkaGVhZGVySGFz aFJlZi0+e2lzQmluYXJ5fSBpZiBkZWZpbmVkKCRoZWFkZXJIYXNoUmVmLT57aXNCaW5hcnl9KTsK KyAgICAkZGlmZkhhc2hSZWZ7aXNHaXR9ID0gJGhlYWRlckhhc2hSZWYtPntpc0dpdH0gaWYgZGVm aW5lZCgkaGVhZGVySGFzaFJlZi0+e2lzR2l0fSk7CisgICAgJGRpZmZIYXNoUmVme2lzU3ZufSA9 ICRoZWFkZXJIYXNoUmVmLT57aXNTdm59IGlmIGRlZmluZWQoJGhlYWRlckhhc2hSZWYtPntpc1N2 bn0pOwogICAgICRkaWZmSGFzaFJlZntzb3VyY2VSZXZpc2lvbn0gPSAkaGVhZGVySGFzaFJlZi0+ e3NvdXJjZVJldmlzaW9ufTsKICAgICAjIEZJWE1FOiBSZW1vdmUgdGhlIG5lZWQgZm9yIHN2bkNv bnZlcnRlZFRleHQuICBTZWUgdGhlICVkaWZmSGFzaAogICAgICMgICAgICAgIGNvZGUgY29tbWVu dHMgYWJvdmUgZm9yIG1vcmUgaW5mb3JtYXRpb24uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3N2bi1hcHBseSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CmluZGV4IGNk NzVjOTkuLmI0OWNjZWMgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CkBAIC0zMDQsMjEgKzMwNCwyMCBA QCBzdWIgcGF0Y2goJCkKICAgICBteSAoJGRpZmZIYXNoUmVmKSA9IEBfOwogCiAgICAgbXkgJHBh dGNoID0gJGRpZmZIYXNoUmVmLT57c3ZuQ29udmVydGVkVGV4dH07CisKICAgICBteSAkZnVsbFBh dGggPSAkZGlmZkhhc2hSZWYtPntpbmRleFBhdGh9OworICAgIG15ICRpc0JpbmFyeSA9ICRkaWZm SGFzaFJlZi0+e2lzQmluYXJ5fTsKKyAgICBteSAkaXNHaXQgPSAkZGlmZkhhc2hSZWYtPntpc0dp dH07CiAKICAgICBteSAkZGVsZXRpb24gPSAwOwogICAgIG15ICRhZGRpdGlvbiA9IDA7Ci0gICAg bXkgJGlzQmluYXJ5ID0gMDsKLSAgICBteSAkaXNHaXRCaW5hcnkgPSAwOwogCiAgICAgIyBGSVhN RTogVGhpcyBpbmZvcm1hdGlvbiBzaG91bGQgYmUgZXh0cmFjdGVkIGZyb20gdGhlIGRpZmYgZmls ZSBhcwogICAgICMgICAgICAgIHBhcnQgb2YgdGhlIHBhcnNpbmcgc3RhZ2UsIGkuZS4gdGhlIGNh bGwgdG8gcGFyc2VQYXRjaCgpLgogICAgICRhZGRpdGlvbiA9IDEgaWYgKCRwYXRjaCA9fiAvXG4t LS0gLitcKHJldmlzaW9uIDBcKVxyP1xuLyB8fCAkcGF0Y2ggPX4gL1xuQEAgLTAsMCAuKiBAQC8p ICYmICFleGlzdHMoJGNvcGllZEZpbGVzeyRmdWxsUGF0aH0pOwogICAgICRkZWxldGlvbiA9IDEg aWYgJHBhdGNoID1+IC9cbkBAIC4qIFwrMCwwIEBALzsKLSAgICAkaXNCaW5hcnkgPSAxIGlmICRw YXRjaCA9fiAvXG5DYW5ub3QgZGlzcGxheTogZmlsZSBtYXJrZWQgYXMgYSBiaW5hcnkgdHlwZVwu LzsKLSAgICAkaXNHaXRCaW5hcnkgPSAxIGlmICRwYXRjaCA9fiAvXG5HSVQgYmluYXJ5IHBhdGNo XG4vOwogCi0gICAgaWYgKCEkYWRkaXRpb24gJiYgISRkZWxldGlvbiAmJiAhJGlzQmluYXJ5ICYm ICEkaXNHaXRCaW5hcnkpIHsKKyAgICBpZiAoISRhZGRpdGlvbiAmJiAhJGRlbGV0aW9uICYmICEk aXNCaW5hcnkpIHsKICAgICAgICAgIyBTdGFuZGFyZCBwYXRjaCwgcGF0Y2ggdG9vbCBjYW4gaGFu ZGxlIHRoaXMuCiAgICAgICAgIGlmIChiYXNlbmFtZSgkZnVsbFBhdGgpIGVxICJDaGFuZ2VMb2ci KSB7CiAgICAgICAgICAgICBteSAkY2hhbmdlTG9nRG90T3JpZ0V4aXN0ZWQgPSAtZiAiJHtmdWxs UGF0aH0ub3JpZyI7CkBAIC0zMzMsMTEgKzMzMiwxMSBAQCBzdWIgcGF0Y2goJCkKICAgICAgICAg YWRkRGlyZWN0b3JpZXNJZk5lZWRlZChkaXJuYW1lKCRmdWxsUGF0aCkpOwogCiAgICAgICAgIGlm ICgkaXNCaW5hcnkpIHsKLSAgICAgICAgICAgICMgQmluYXJ5IGNoYW5nZQotICAgICAgICAgICAg aGFuZGxlQmluYXJ5Q2hhbmdlKCRmdWxsUGF0aCwgJHBhdGNoKTsKLSAgICAgICAgfSBlbHNpZiAo JGlzR2l0QmluYXJ5KSB7Ci0gICAgICAgICAgICAjIEdpdCBiaW5hcnkgY2hhbmdlCi0gICAgICAg ICAgICBoYW5kbGVHaXRCaW5hcnlDaGFuZ2UoJGZ1bGxQYXRoLCAkcGF0Y2gpOworICAgICAgICAg ICAgaWYgKCRpc0dpdCkgeworICAgICAgICAgICAgICAgIGhhbmRsZUdpdEJpbmFyeUNoYW5nZSgk ZnVsbFBhdGgsICRwYXRjaCk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAg IGhhbmRsZUJpbmFyeUNoYW5nZSgkZnVsbFBhdGgsICRwYXRjaCk7CisgICAgICAgICAgICB9CiAg ICAgICAgIH0gZWxzaWYgKCRkZWxldGlvbikgewogICAgICAgICAgICAgIyBEZWxldGlvbgogICAg ICAgICAgICAgYXBwbHlQYXRjaCgkcGF0Y2gsICRmdWxsUGF0aCwgWyItLWZvcmNlIl0pOwpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4tdW5hcHBseSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvc3ZuLXVuYXBwbHkKaW5kZXggNDY1YWQ1Ny4uNDNhMGQ1YSAxMDA3NTUKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy9zdm4tdW5hcHBseQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3N2 bi11bmFwcGx5CkBAIC0xNDAsMjEgKzE0MCwyMSBAQCBzdWIgcGF0Y2goJCkKICAgICBteSAoJGRp ZmZIYXNoUmVmKSA9IEBfOwogCiAgICAgbXkgJHBhdGNoID0gJGRpZmZIYXNoUmVmLT57c3ZuQ29u dmVydGVkVGV4dH07CisKICAgICBteSAkZnVsbFBhdGggPSAkZGlmZkhhc2hSZWYtPntpbmRleFBh dGh9OworICAgIG15ICRpc1N2bkJpbmFyeSA9ICRkaWZmSGFzaFJlZi0+e2lzQmluYXJ5fSAmJiAk ZGlmZkhhc2hSZWYtPntpc1N2bn07CiAKICAgICAkZGlyZWN0b3JpZXNUb0NoZWNre2Rpcm5hbWUo JGZ1bGxQYXRoKX0gPSAxOwogCiAgICAgbXkgJGRlbGV0aW9uID0gMDsKICAgICBteSAkYWRkaXRp b24gPSAwOwotICAgIG15ICRpc0JpbmFyeSA9IDA7CiAKICAgICAjIEZJWE1FOiBUaGlzIGluZm9y bWF0aW9uIHNob3VsZCBiZSBleHRyYWN0ZWQgZnJvbSB0aGUgZGlmZiBmaWxlIGFzCiAgICAgIyAg ICAgICAgcGFydCBvZiB0aGUgcGFyc2luZyBzdGFnZSwgaS5lLiB0aGUgY2FsbCB0byBwYXJzZVBh dGNoKCkuCiAgICAgJGFkZGl0aW9uID0gMSBpZiAoJHBhdGNoID1+IC9cbi0tLSAuK1wocmV2aXNp b24gMFwpXG4vIHx8ICRwYXRjaCA9fiAvXG5AQCAtMCwwIC4qIEBALyk7CiAgICAgJGRlbGV0aW9u ID0gMSBpZiAkcGF0Y2ggPX4gL1xuQEAgLiogXCswLDAgQEAvOwotICAgICRpc0JpbmFyeSA9IDEg aWYgJHBhdGNoID1+IC9cbkNhbm5vdCBkaXNwbGF5OiBmaWxlIG1hcmtlZCBhcyBhIGJpbmFyeSB0 eXBlXC4vOwogCi0gICAgaWYgKCEkYWRkaXRpb24gJiYgISRkZWxldGlvbiAmJiAhJGlzQmluYXJ5 KSB7CisgICAgaWYgKCEkYWRkaXRpb24gJiYgISRkZWxldGlvbiAmJiAhJGlzU3ZuQmluYXJ5KSB7 CiAgICAgICAgICMgU3RhbmRhcmQgcGF0Y2gsIHBhdGNoIHRvb2wgY2FuIGhhbmRsZSB0aGlzLgog ICAgICAgICBpZiAoYmFzZW5hbWUoJGZ1bGxQYXRoKSBlcSAiQ2hhbmdlTG9nIikgewogICAgICAg ICAgICAgbXkgJGNoYW5nZUxvZ0RvdE9yaWdFeGlzdGVkID0gLWYgIiR7ZnVsbFBhdGh9Lm9yaWci OwpAQCAtMTY2LDcgKzE2Niw4IEBAIHN1YiBwYXRjaCgkKQogICAgIH0gZWxzZSB7CiAgICAgICAg ICMgRWl0aGVyIGEgZGVsZXRpb24sIGFuIGFkZGl0aW9uIG9yIGEgYmluYXJ5IGNoYW5nZS4KIAot ICAgICAgICBpZiAoJGlzQmluYXJ5KSB7CisgICAgICAgICMgRklYTUU6IEFkZCBzdXBwb3J0IGZv ciBHaXQgYmluYXJ5IGZpbGVzLgorICAgICAgICBpZiAoJGlzU3ZuQmluYXJ5KSB7CiAgICAgICAg ICAgICAjIFJldmVyc2UgYmluYXJ5IGNoYW5nZQogICAgICAgICAgICAgdW5saW5rKCRmdWxsUGF0 aCkgaWYgKC1lICRmdWxsUGF0aCk7CiAgICAgICAgICAgICBzeXN0ZW0gInN2biIsICJyZXZlcnQi LCAkZnVsbFBhdGg7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwv VkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VEaWZmLnBsIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlRGlmZi5wbAppbmRleCAyZDVlZmYyLi5hZjE0 NTYxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNf dW5pdHRlc3QvcGFyc2VEaWZmLnBsCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cGVy bC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZURpZmYucGwKQEAgLTYxLDYgKzYxLDcgQEAgSW5kZXg6 IE1ha2VmaWxlCiBFTkQKICAgICBjb3BpZWRGcm9tUGF0aCA9PiB1bmRlZiwKICAgICBpbmRleFBh dGggPT4gIk1ha2VmaWxlIiwKKyAgICBpc1N2biA9PiAxLAogICAgIHNvdXJjZVJldmlzaW9uID0+ ICI1MzA1MiIsCiB9LAogdW5kZWZdLApAQCAtNjgsNiArNjksNDggQEAgdW5kZWZdLAogfSwKIHsK ICAgICAjIE5ldyB0ZXN0CisgICAgZGlmZk5hbWUgPT4gIlNWTjogYmluYXJ5IGZpbGUgKGlzQmlu YXJ5IHRydWUpIiwKKyAgICBpbnB1dFRleHQgPT4gPDwnRU5EJywKK0luZGV4OiB0ZXN0X2ZpbGUu c3dmCis9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09CitDYW5ub3QgZGlzcGxheTogZmlsZSBtYXJrZWQgYXMgYSBiaW5hcnkg dHlwZS4KK3N2bjptaW1lLXR5cGUgPSBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0KKworUHJvcGVy dHkgY2hhbmdlcyBvbjogdGVzdF9maWxlLnN3ZgorX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXworTmFtZTogc3ZuOm1pbWUt dHlwZQorICAgKyBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0KKworCitRMWRUQngwQUFBQjQyaXRn NEdsZ1lKakd3TUREeU9ETXhNRHczNEdCZ1FFQUpQUURKQT09CitFTkQKKyAgICBleHBlY3RlZFJl dHVybiA9PiBbCit7CisgICAgc3ZuQ29udmVydGVkVGV4dCA9PiAgPDwnRU5EJywgIyBTYW1lIGFz IGlucHV0IHRleHQKK0luZGV4OiB0ZXN0X2ZpbGUuc3dmCis9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CitDYW5ub3QgZGlz cGxheTogZmlsZSBtYXJrZWQgYXMgYSBiaW5hcnkgdHlwZS4KK3N2bjptaW1lLXR5cGUgPSBhcHBs aWNhdGlvbi9vY3RldC1zdHJlYW0KKworUHJvcGVydHkgY2hhbmdlcyBvbjogdGVzdF9maWxlLnN3 ZgorX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXworTmFtZTogc3ZuOm1pbWUtdHlwZQorICAgKyBhcHBsaWNhdGlvbi9vY3Rl dC1zdHJlYW0KKworCitRMWRUQngwQUFBQjQyaXRnNEdsZ1lKakd3TUREeU9ETXhNRHczNEdCZ1FF QUpQUURKQT09CitFTkQKKyAgICBjb3BpZWRGcm9tUGF0aCA9PiB1bmRlZiwKKyAgICBpbmRleFBh dGggPT4gInRlc3RfZmlsZS5zd2YiLAorICAgIGlzQmluYXJ5ID0+IDEsCisgICAgaXNTdm4gPT4g MSwKKyAgICBzb3VyY2VSZXZpc2lvbiA9PiB1bmRlZiwKK30sCit1bmRlZl0sCisgICAgZXhwZWN0 ZWROZXh0TGluZSA9PiB1bmRlZiwKK30sCit7CisgICAgIyBOZXcgdGVzdAogICAgIGRpZmZOYW1l ID0+ICJTVk46IGxlYWRpbmcganVuayIsCiAgICAgaW5wdXRUZXh0ID0+IDw8J0VORCcsCiAKQEAg LTEwMSw2ICsxNDQsNyBAQCBJbmRleDogTWFrZWZpbGUKIEVORAogICAgIGNvcGllZEZyb21QYXRo ID0+IHVuZGVmLAogICAgIGluZGV4UGF0aCA9PiAiTWFrZWZpbGUiLAorICAgIGlzU3ZuID0+IDEs CiAgICAgc291cmNlUmV2aXNpb24gPT4gIjUzMDUyIiwKIH0sCiB1bmRlZl0sCkBAIC0xMjksNiAr MTczLDcgQEAgSW5kZXg6IE1ha2VmaWxlX25ldwogRU5ECiAgICAgY29waWVkRnJvbVBhdGggPT4g Ik1ha2VmaWxlIiwKICAgICBpbmRleFBhdGggPT4gIk1ha2VmaWxlX25ldyIsCisgICAgaXNTdm4g PT4gMSwKICAgICBzb3VyY2VSZXZpc2lvbiA9PiAiNTMxMzEiLAogfSwKIHVuZGVmXSwKQEAgLTE2 MCw2ICsyMDUsNyBAQCBJbmRleDogTWFrZWZpbGUKIEVORAogICAgIGNvcGllZEZyb21QYXRoID0+ IHVuZGVmLAogICAgIGluZGV4UGF0aCA9PiAiTWFrZWZpbGUiLAorICAgIGlzU3ZuID0+IDEsCiAg ICAgc291cmNlUmV2aXNpb24gPT4gIjUzMTMxIiwKIH0sCiAiSW5kZXg6IE1ha2VmaWxlX25ld1xu Il0sCkBAIC0xOTgsMTEgKzI0NCwxNSBAQCBpbmRleCBmNWQ1ZTc0Li4zYjZhYTkyIDEwMDY0NAog RU5ECiAgICAgY29waWVkRnJvbVBhdGggPT4gdW5kZWYsCiAgICAgaW5kZXhQYXRoID0+ICJNYWtl ZmlsZSIsCisgICAgaXNTdm4gPT4gMSwKICAgICBzb3VyY2VSZXZpc2lvbiA9PiAiNTMxMzEiLAog fSwKIHVuZGVmXSwKICAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLAogfSwKKyMjIyMKKyMg ICAgR2l0IHRlc3QgY2FzZXMKKyMjCiB7CiAgICAgIyBOZXcgdGVzdAogICAgIGRpZmZOYW1lID0+ ICJHaXQ6IHNpbXBsZSIsCkBAIC0yMjQsNiArMjc0LDcgQEAgaW5kZXggZjVkNWU3NC4uM2I2YWE5 MiAxMDA2NDQKIEVORAogICAgIGNvcGllZEZyb21QYXRoID0+IHVuZGVmLAogICAgIGluZGV4UGF0 aCA9PiAiTWFrZWZpbGUiLAorICAgIGlzR2l0ID0+IDEsCiAgICAgc291cmNlUmV2aXNpb24gPT4g dW5kZWYsCiB9LAogdW5kZWZdLApAQCAtMjU2LDYgKzMwNyw3IEBAIEluZGV4OiBNYWtlZmlsZV9u ZXcKIEVORAogICAgIGNvcGllZEZyb21QYXRoID0+IHVuZGVmLAogICAgIGluZGV4UGF0aCA9PiAi TWFrZWZpbGUiLAorICAgIGlzR2l0ID0+IDEsCiAgICAgc291cmNlUmV2aXNpb24gPT4gdW5kZWYs CiB9LAogdW5kZWZdLApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJs L1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlRGlmZkhlYWRlci5wbCBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZURpZmZIZWFkZXIucGwKaW5kZXgg ZDQ0NmY3NC4uNzRiNjlkYSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw ZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlRGlmZkhlYWRlci5wbAorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VEaWZmSGVhZGVyLnBs CkBAIC03MCw3ICs3MCw3IEBAIEVORAogICAgIGNvcGllZEZyb21QYXRoID0+ICJjb3BpZWRfZnJv bV9wYXRoLnB5IiwKICAgICBleGVjdXRhYmxlQml0RGVsdGEgPT4gMCwKICAgICBpbmRleFBhdGgg PT4gImluZGV4X3BhdGgucHkiLAotICAgIHNjbUZvcm1hdCA9PiAic3ZuIiwKKyAgICBpc1N2biA9 PiAxLAogICAgIHNvdXJjZVJldmlzaW9uID0+IDUzMDQ4LAogfSwKICJAQCAtMCwwICsxLDcgQEBc biJdLApAQCAtOTYsNyArOTYsNyBAQCBFTkQKICAgICBjb3BpZWRGcm9tUGF0aCA9PiB1bmRlZiwK ICAgICBleGVjdXRhYmxlQml0RGVsdGEgPT4gMSwKICAgICBpbmRleFBhdGggPT4gImZvby5leGUi LAotICAgIHNjbUZvcm1hdCA9PiAiZ2l0IiwKKyAgICBpc0dpdCA9PiAxLAogICAgIHNvdXJjZVJl dmlzaW9uID0+IHVuZGVmLAogfSwKIHVuZGVmXSwKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZUdpdERpZmZIZWFkZXIucGwg Yi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VH aXREaWZmSGVhZGVyLnBsCmluZGV4IDA0Yzc1NzIuLmM3NzViYTIgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZUdpdERpZmZI ZWFkZXIucGwKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3Vu aXR0ZXN0L3BhcnNlR2l0RGlmZkhlYWRlci5wbApAQCAtMTM1LDYgKzEzNSw3IEBAIEdJVCBiaW5h cnkgcGF0Y2gKIEVORAogICAgIGV4ZWN1dGFibGVCaXREZWx0YSA9PiAwLAogICAgIGluZGV4UGF0 aCA9PiAiZm9vLmdpZiIsCisgICAgaXNCaW5hcnkgPT4gMSwKIH0sCiAibGl0ZXJhbCA3XG4iXSwK ICAgICBleHBlY3RlZE5leHRMaW5lID0+ICJPY21ZZXgmcmVEYTtzTzgqRjlMKUJcbiIsCkBAIC0x NjQsNiArMTY1LDcgQEAgR0lUIGJpbmFyeSBwYXRjaAogRU5ECiAgICAgZXhlY3V0YWJsZUJpdERl bHRhID0+IDAsCiAgICAgaW5kZXhQYXRoID0+ICJmb28uZ2lmIiwKKyAgICBpc0JpbmFyeSA9PiAx LAogfSwKICJsaXRlcmFsIDBcbiJdLAogICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gIkhjbVY/ZDAw MDAxXG4iLApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0 aWxzX3VuaXR0ZXN0L3BhcnNlU3ZuRGlmZkhlYWRlci5wbCBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZVN2bkRpZmZIZWFkZXIucGwKaW5kZXgg ZjU4ODQ4ZC4uZjJmOGFiMyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw ZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlU3ZuRGlmZkhlYWRlci5wbAorKysgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VTdm5EaWZmSGVh ZGVyLnBsCkBAIC0xOTcsNiArMTk3LDcgQEAgQ2Fubm90IGRpc3BsYXk6IGZpbGUgbWFya2VkIGFz IGEgYmluYXJ5IHR5cGUuCiBFTkQKICAgICBjb3BpZWRGcm9tUGF0aCA9PiB1bmRlZiwKICAgICBp bmRleFBhdGggPT4gInRlc3RfZmlsZS5zd2YiLAorICAgIGlzQmluYXJ5ID0+IDEsCiAgICAgc291 cmNlUmV2aXNpb24gPT4gdW5kZWYsCiB9LAogInN2bjptaW1lLXR5cGUgPSBhcHBsaWNhdGlvbi9v Y3RldC1zdHJlYW1cbiJdLAo=