166914 2017-01-10 17:32:21 -0800 'webkit-patch post' no longer works with moved/copied files 2017-01-18 12:19:19 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=166948 https://bugs.webkit.org/show_bug.cgi?id=165953 InRadar P2 Normal --- 167169 1 sam jbedard ap commit-queue dbates ddkilzer jbedard lforschler webkit-bug-importer oldest_to_newest 1265611 0 sam 2017-01-10 17:32:21 -0800 If I move rename a file (using svn rename foo.txt bar.txt) and then upload a patch with that move using webkit-patch post, the bots are not able to apply the change. (See bug https://bugs.webkit.org/show_bug.cgi?id=166913 with result https://webkit-queues.webkit.org/results/2866798). The bot gives the following output: Failed to run "['/Volumes/Data/StyleQueue/Webkit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-misc-style', 'apply-attachment', '--no-update', '--non-interactive', 298531]" exit_code: 2 cwd: /Volumes/Data/StyleQueue/Webkit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=298531&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=166913&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Processing patch 298531 from bug 166913. Failed to run "[u'/Volumes/Data/StyleQueue/Webkit/Tools/Scripts/svn-apply', '--force']" exit_code: 255 cwd: /Volumes/Data/StyleQueue/Webkit Did not find end of header block corresponding to index path "Source/WebCore/bindings/js/JSSQLStatementErrorCallbackCustom.cpp". at /Volumes/Data/StyleQueue/Webkit/Tools/Scripts/VCSUtils.pm line 980, <ARGV> line 249. Failed to run "[u'/Volumes/Data/StyleQueue/Webkit/Tools/Scripts/svn-apply', '--force']" exit_code: 255 cwd: /Volumes/Data/StyleQueue/Webkit 1265617 1 sam 2017-01-10 17:34:18 -0800 I'm using: svn, version 1.9.4 (r1740329) compiled Jul 14 2016, 14:02:40 on x86_64-apple-darwin15.0.0 1265619 2 sam 2017-01-10 17:35:23 -0800 Manually uploading a patch created with svn-create-patch also does not work. 1265630 3 ap 2017-01-10 17:51:05 -0800 Sounds related to bug 165953. 1265788 4 jbedard 2017-01-11 09:48:44 -0800 This is not a regression from 165953, it's that svn 1.9 has different behavior when moving files. I'll look into it. 1265828 5 jbedard 2017-01-11 10:49:08 -0800 svn 1.7.19 actually has a more serious version of this issue (although, at least in part, this was a bug in svn). 1265851 6 jbedard 2017-01-11 11:43:32 -0800 This bug is in svn-create-patch. In the case that a file has multiple indices with the same name, we should ignore the duplicates. Will have a patch posted shortly. 1265941 7 298625 jbedard 2017-01-11 16:12:07 -0800 Created attachment 298625 Patch 1265947 8 jbedard 2017-01-11 16:18:47 -0800 This isn't the only issue with svn 1.9. There is a related issue in Tools/Scripts/webkitpy/common/checkout/diff_parser.py which also occurs with renamed files. It is less serious, however, since it is in the style checker and shouldn't block anyone's workflow. Bug 166948 is tracking this issue. 1265948 9 webkit-bug-importer 2017-01-11 16:19:30 -0800 <rdar://problem/29979707> 1265995 10 298625 dbates 2017-01-11 17:27:51 -0800 Comment on attachment 298625 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298625&action=review > Tools/Scripts/svn-create-patch:257 > + my $validFlag = 1; > while (<DIFF>) { > - $patch .= $_; > + > + if (/$svnDiffStartRegEx/) { > + if (grep { $_ eq $1 } @indecies ) { > + $validFlag = 0; > + } else { > + push (@indecies, $1); > + $validFlag = 1; > + } > + } > + if ($validFlag) { > + $patch .= $_; > + } > + if (/$svnDiffStartEndRegEx/) { > + $validFlag = 1; > + } > } This does not seem like the correct approach. From my understanding `svn diff --diff-cmd diff -x -$diffOptions '$escapedFile'` now prints an "Index: " line for an added file $escapedFile with history in SVN 1.9. In earlier versions of SVN, it would return nothing. On first glance, this seems like a bug in SVN. Or can we opt into the old behavior? 1266157 11 298625 jbedard 2017-01-12 08:45:46 -0800 Comment on attachment 298625 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298625&action=review >> Tools/Scripts/svn-create-patch:257 >> } > > This does not seem like the correct approach. From my understanding `svn diff --diff-cmd diff -x -$diffOptions '$escapedFile'` now prints an "Index: " line for an added file $escapedFile with history in SVN 1.9. In earlier versions of SVN, it would return nothing. On first glance, this seems like a bug in SVN. Or can we opt into the old behavior? That's correct. Even if this is a bug in SVN (which it might be since I don't see anything noting it in the release logs) I'm not sure what we're doing here is correct. After sleeping on this, I think this is the incorrect change, and I will update the patch with one I believe more accurately encapsulates the problem. It doesn't make sense to print out an index for a file and then, immediately after, print an index for the very same file, whether it's empty or not. If the duplicate index is not empty, it seems that it's data should just be included with initial index. 1266158 12 298684 jbedard 2017-01-12 08:54:35 -0800 Created attachment 298684 Patch 1266225 13 298684 dbates 2017-01-12 11:42:05 -0800 Comment on attachment 298684 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298684&action=review > Tools/ChangeLog:7 > + We should explain the purpose of this change to workaround an SVN 1.9 bug for moved/copied files without post change. We should also file a SVN bug for this issue, if one does not already exist, and reference its URL in our description and in a comment in generateDiff() where we apply the workaround. > Tools/Scripts/svn-create-patch:222 > + my $currentIndex = ""; It seems sufficient to track the number of diff chunks emitted by "svn diff" (or track that there is at least one text chunk is emitted) to fix this bug as opposed to tracking the file we are generating a diff for and quasi-parsing the diff. See my remark below. > Tools/Scripts/svn-create-patch:231 > + $currentIndex = $fileData->{path}; Ditto. > Tools/Scripts/svn-create-patch:259 > + > + my $svnDiffStartRegEx = qr#^Index: ([^\r\n]+)#; > + my $svnDiffStartEndRegEx = qr#^=+\n#; > + my $validFlag = 1; > + > while (<DIFF>) { > - $patch .= $_; > + > + if (/$svnDiffStartRegEx/) { > + if ($1 eq $currentIndex) { > + $validFlag = 0; > + } else { > + $currentIndex = $1; > + $validFlag = 1; > + } > + } > + if ($validFlag) { > + $patch .= $_; > + } > + if (/$svnDiffStartEndRegEx/) { > + $validFlag = 1; > + } > } > close DIFF; I would write this as: my $numTextChunks = 0; while (<DIFF>) { $numTextChunks += 1 if parseChunkRange($_); $patch .= $_; } close DIFF; if (!$numTextChunks) { # For moved/copied files without post changes SVN 1.9 or greater emits a diff with an empty # body as opposed to emitting nothing as in earlier versions of SVN. For example, copy file # A.txt to B.txt then the diff of B.txt in SVN 1.9 or greater is: # Index: B.txt # =================================================================== # Therefore we ignore emitting such a diff. $patch = ""; } 1266231 14 dbates 2017-01-12 12:01:43 -0800 To clarify, I like the idea in the patch to fix up $patch when we detect that it is a diff without an en empty body (as emitted by SVN 1.9 or greater for a move/copy without post changes). The reason I r-'ed the patch is because it duplicated some of the parsing logic that is in VCSUtils.pm when it seems sufficient to make use of VCSUtils::parseChunkRanges() to detect chunks (we are interested in a diff with at least one chunk) and avoid such duplication. I was also unhappy with the ChangeLog as it did not explain the motivation for this change. I would like to see another iteration of this patch. As mentioned in comment 10 and comment 13, I feel that the behavior change to svn diff in SVN 1.9 for moved/copied files without post changes is a bug. We should file this bug with the Apache Subversion project. 1266232 15 dbates 2017-01-12 12:02:44 -0800 (In reply to comment #14) > To clarify, I like the idea in the patch to fix up $patch when we detect > that it is a diff without an en empty body (as emitted by SVN 1.9 or greater > for a move/copy without post changes). * diff with an empty body 1266290 16 298710 jbedard 2017-01-12 14:34:17 -0800 Created attachment 298710 Patch 1266330 17 298710 dbates 2017-01-12 15:22:33 -0800 Comment on attachment 298710 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298710&action=review There are issues with this patch and is not representative of the code change I suggested in comment #13. Did this code not work out? If so, what were the issues. > Tools/ChangeLog:8 > + SVN 1.9 has a bug where when a file has been moved, the svn diff of the new Reiterating what I said in comment 13, please file a SVN bug for this issue and reference it in this ChangeLog. Please explain that this bug affects both copy and move operations. > Tools/ChangeLog:9 > + file outputs only the index of the file with no changes. This work-around work-around => workaround "the index with no changes" => the "Index" line with an empty body. > Tools/Scripts/svn-create-patch:234 > + my $numTextChuncks = 0; numTextChuncks => numTextChunks I suggest that we move the initialization of this variable to before the while loop and after open() so that it is closer to where it is used to improve readability. This is good practice to follow in general, especially in other languages (e.g. C++) where there are higher costs and possible side-effects to construction and destruction of objects. > Tools/Scripts/svn-create-patch:237 > + $numTextChuncks += 1; The word "chunks" has a specific meaning in the domain of diffs and patches. It represents a section of a diff that begins with a chunk range line of the form "@@ -1,3 +1,14 @@". That is, a chunk is not an arbitrary line of text in a diff. Unconditionality incrementing the number of text chunks makes this code brittle to future changes to the output of "svn diff". I mean, this bug was caused by us assuming (incorrectly) that "svn diff" would only emit a diff with at least one chunk. As it turns out, "svn diff" in SVN 1.9 emits a diff with zero chunks for a copied/moved file without post changes. We should explicitly check that "svn diff" emitted a diff with at least one chunk as the prerequisite that we captured a valid diff/patch. This approach will fix this bug and is less brittle in the face of future of SVN changes/bugs. > Tools/Scripts/svn-create-patch:254 > + if ($numTextChuncks > 2) { > + # For moved/copied files without post changes SVN 1.9 or greater emits a diff with an empty > + # body as opposed to emitting nothing as in earlier versions of SVN. For example, move file > + # A.txt to B.txt then the diff of B.txt in SVN 1.9 or greater is: > + # Index: B.txt > + # =================================================================== > + # Therefore we ignore emitting such a diff. > + print $patch; > + } Will the placement of this work when the copied/moved file is a ChangeLog? The code I wrote in comment 13, handles this case and avoid the need to conditionally call print $patch (if patch is the empty string print will emit nothing). I also prefer formatting I used in analogous comment in comment #13 as it demarcates the comment text from the example text. I prefer the example using a copy as opposed to move, though I do not have a strong opinion on this. 1266397 18 298743 jbedard 2017-01-12 17:47:56 -0800 Created attachment 298743 Manual patch 1266428 19 298743 dbates 2017-01-12 23:12:08 -0800 Comment on attachment 298743 Manual patch View in context: https://bugs.webkit.org/attachment.cgi?id=298743&action=review Did you have a chance to read through all of my comments in comment 17? You seem to have selectively addressed some of my comments and not others without providing a reason for the ones not addressed. Please read though my comments in comment 17 and address them. > Tools/ChangeLog:8 > + SVN 1.9 has a bug where when a file has been moved, the svn diff of the new The bug also affects copies. > Tools/Scripts/svn-create-patch:250 > + # Index: B.txt I would appreciate if you could preserve the original indentation of the example as seen in comment 13. The indentation of the example improves the readability of this comment by demarcating the example from the first and last paragraphs. 1266467 20 jbedard 2017-01-13 09:09:01 -0800 (In reply to comment #19) > Comment on attachment 298743 [details] > Manual patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=298743&action=review > > Did you have a chance to read through all of my comments in comment 17? You > seem to have selectively addressed some of my comments and not others > without providing a reason for the ones not addressed. Please read though my > comments in comment 17 and address them. > I had drafted but apparently not posted my reason for not including the subversion bug information. Unfortunately, subversion's issue tracker was offline yesterday. It's back up today, but they request that bugs first be sent to users@subversion.apache.org (which has been done) but these issue don't immediately receive tracking information. I will look through tracked issues this morning to see if this has already been filed. 1266481 21 jbedard 2017-01-13 09:42:09 -0800 (In reply to comment #20) > ... A small update on currently tracked Subversion issues. Issue 4662 (https://issues.apache.org/jira/browse/SVN-4662) has an example of the kind of malformed patch we're concerned with, but has to with applying this type of patch, not generating it. Reading through this issue, it seems that an empty index IS legal. Perhaps this change really belongs in svn-apply-patch. I still think that we should keep these changes, because the empty index is confusing, but I also think that we should consider the empty index when applying patches as well. 1266487 22 dbates 2017-01-13 09:58:40 -0800 <http://mail-archives.apache.org/mod_mbox/subversion-users/201701.mbox/%3cd5095b46-b418-fa19-03d4-b1d18e4d2b1c@apache.org%3e> 1266488 23 dbates 2017-01-13 09:59:30 -0800 (In reply to comment #22) > <http://mail-archives.apache.org/mod_mbox/subversion-users/201701.mbox/ > %3cd5095b46-b418-fa19-03d4-b1d18e4d2b1c@apache.org%3e> err, the email thread begins at <http://mail-archives.apache.org/mod_mbox/subversion-users/201701.mbox/%3cCF9BDE0A-7454-4405-8259-1120C6B76A03@apple.com%3e> 1266490 24 298764 jbedard 2017-01-13 10:00:45 -0800 Created attachment 298764 Patch 1266522 25 298764 dbates 2017-01-13 10:53:58 -0800 Comment on attachment 298764 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298764&action=review > Tools/ChangeLog:9 > + file outputs only the index line with an empty body. This workaround Nit: index => "Index:" From my understanding Subversion does not have a concept of an "index" (like Git does), refer to modified/added/deleted files in a working copy as files in an index, or refer to the working copy revision as a revision in an index. The svn diff tool emits a file where each diff is preceded by an "Index:" line. > Tools/ChangeLog:10 > + ignores such an output from svn diff. A bug has been filed with SVN, a link to the Nit: "an output" => output Minor (no need to fix): Given that Apache Subversion has an issue tracker, <https://issues.apache.org/jira/browse/SVN>, it seems a bit imprecise to say "a bug has been filed" when we do not have URL for an issue in the issue tracker as of the time of writing. I would be more precise to say that we have raised this issue to the Subversion users@subversion.apache.org mailing lists in <http://mail-archives.apache.org/mod_mbox/subversion-users/201701.mbox/%3cCF9BDE0A-7454-4405-8259-1120C6B76A03@apple.com%3e>. According to <https://subversion.apache.org/reporting-issues.html> this is the first step towards creating a formal issue in the issue tracker. > Tools/ChangeLog:16 > + (generateDiff): Ignore an index with an empty body. Nit: index => "Index:" See my remark on line 9 for my reasoning. > Tools/Scripts/svn-create-patch:254 > + > + if (!$numTextChunks) { > + # For moved/copied files without post changes SVN 1.9 or greater emits a diff with an empty > + # body as opposed to emitting nothing as in earlier versions of SVN. For example, move file > + # A.txt to B.txt then the diff of B.txt in SVN 1.9 or greater is: > + # Index: B.txt > + # =================================================================== > + # Therefore we ignore emitting such a diff. > + $patch = ""; > + } Repeating my question from comment 17, "will the placement of this [code] work when the copied/moved file is a ChangeLog?" The placement of this code disagrees with the placement of the analogous code in my original code snippet in comment 13 and, as I raised in comment 17, I suspect that this proposed placement will not handle moved/copied ChangeLog files. Regardless of whether fixChangeLogPatch() is resilient to a $patch of the form: [[ Index: ChangeLog =================================================================== ]] it seems bad programming practice to pass it such a patch. Therefore, I suggest that we respect the placement of the "if (!numTextChunks)"-block in my original code snippet in comment 13 that followed the "close DIFF;" (line 240) statement. 1266539 26 298775 jbedard 2017-01-13 11:37:09 -0800 Created attachment 298775 Patch 1266545 27 298775 dbates 2017-01-13 11:54:58 -0800 Comment on attachment 298775 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298775&action=review > Tools/Scripts/svn-create-patch:250 > + Did you intend to put this empty line? > Tools/Scripts/svn-create-patch:255 > + Did you intend to put this empty line? 1266558 28 298782 jbedard 2017-01-13 12:52:48 -0800 Created attachment 298782 Patch 1266564 29 298782 dbates 2017-01-13 13:02:17 -0800 Comment on attachment 298782 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298782&action=review > Tools/ChangeLog:5 > + Please put the radar bug URL under the WebKit URL. 1266666 30 298809 jbedard 2017-01-13 16:57:19 -0800 Created attachment 298809 Patch 1266691 31 dbates 2017-01-13 17:19:35 -0800 (In reply to comment #30) > Created attachment 298809 [details] > Patch Thanks for updating the patch with the radar URL. Looks good. 1267408 32 298809 commit-queue 2017-01-17 10:53:57 -0800 Comment on attachment 298809 Patch Clearing flags on attachment: 298809 Committed r210820: <http://trac.webkit.org/changeset/210820> 1267409 33 commit-queue 2017-01-17 10:54:04 -0800 All reviewed patches have been landed. Closing bug. 298625 2017-01-11 16:12:07 -0800 2017-01-12 08:54:31 -0800 Patch bug-166914-20170111161028.patch text/plain 2282 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDYwMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE3LTAxLTExICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICAnd2Via2l0LXBhdGNoIHBvc3QnIG5vIGxvbmdlciB3b3JrcyB3aXRoIHJl bmFtZWQgZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2NjkxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoOiBBZGQgcmVnZXhlcywgbGlzdCBvZiB2aXNp dGVkIGluZGljZXMuCisgICAgICAgIChnZW5lcmF0ZURpZmYpOiBEbyBub3Qgb3V0cHV0IGNoYW5n ZXMgaWYgYW4gaW5kZXggaGFzIGJlZW4gdmlzaXRlZC4KKyAgICAgICAgKG1hbnVmYWN0dXJlUGF0 Y2hGb3JBZGRpdGlvbldpdGhIaXN0b3J5KTogQWRkIHZpc2l0ZWQgZmlsZSB0byBpbmRpY2VzIGxp c3QuCisKIDIwMTctMDEtMTEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAK ICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggYWZ0ZXIgcjIxMDU5OS4KSW5kZXg6IFRvb2xz L1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3N2 bi1jcmVhdGUtcGF0Y2gJKHJldmlzaW9uIDIxMDU4NykKKysrIFRvb2xzL1NjcmlwdHMvc3ZuLWNy ZWF0ZS1wYXRjaAkod29ya2luZyBjb3B5KQpAQCAtODEsNiArODEsMTAgQEAgbXkgJGNoZWNrV2Vi S2l0U3R5bGUgPSAwOwogbXkgJGlnbm9yZUNoYW5nZWxvZ3MgPSAwOwogbXkgJGRldk51bGwgPSBG aWxlOjpTcGVjLT5kZXZudWxsKCk7CiAKK215IEBpbmRlY2llcyA9ICgpOworbXkgJHN2bkRpZmZT dGFydFJlZ0V4ID0gcXIjXkluZGV4OiAoW15cclxuXSspIzsKK215ICRzdm5EaWZmU3RhcnRFbmRS ZWdFeCA9IHFyI149K1xuIzsKKwogbXkgJHJlc3VsdCA9IEdldE9wdGlvbnMoCiAgICAgImhlbHAi ICAgICAgID0+IFwkc2hvd0hlbHAsCiAgICAgImlnbm9yZS1jaGFuZ2Vsb2dzIiA9PiBcJGlnbm9y ZUNoYW5nZWxvZ3MsCkBAIC0yMzIsOCArMjM2LDI0IEBAIHN1YiBnZW5lcmF0ZURpZmYoJCQpCiAg ICAgbXkgJGRpZmZPcHRpb25zID0gZGlmZk9wdGlvbnNGb3JGaWxlKCRmaWxlKTsKICAgICBteSAk ZXNjYXBlZEZpbGUgPSBlc2NhcGVTdWJ2ZXJzaW9uUGF0aCgkZmlsZSk7CiAgICAgb3BlbiBESUZG LCAic3ZuIGRpZmYgLS1kaWZmLWNtZCBkaWZmIC14IC0kZGlmZk9wdGlvbnMgJyRlc2NhcGVkRmls ZScgfCIgb3IgZGllOworCisgICAgbXkgJHZhbGlkRmxhZyA9IDE7CiAgICAgd2hpbGUgKDxESUZG PikgewotICAgICAgICAkcGF0Y2ggLj0gJF87CisKKyAgICAgICAgaWYgKC8kc3ZuRGlmZlN0YXJ0 UmVnRXgvKSB7CisgICAgICAgICAgICBpZiAoZ3JlcCB7ICRfIGVxICQxIH0gQGluZGVjaWVzICkg eworICAgICAgICAgICAgICAgICR2YWxpZEZsYWcgPSAwOworICAgICAgICAgICAgfSBlbHNlIHsK KyAgICAgICAgICAgICAgICBwdXNoIChAaW5kZWNpZXMsICQxKTsKKyAgICAgICAgICAgICAgICAk dmFsaWRGbGFnID0gMTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICBpZiAoJHZh bGlkRmxhZykgeworICAgICAgICAgICAgJHBhdGNoIC49ICRfOworICAgICAgICB9CisgICAgICAg IGlmICgvJHN2bkRpZmZTdGFydEVuZFJlZ0V4LykgeworICAgICAgICAgICAgJHZhbGlkRmxhZyA9 IDE7CisgICAgICAgIH0KICAgICB9CiAgICAgY2xvc2UgRElGRjsKICAgICBpZiAoYmFzZW5hbWUo JGZpbGUpIGVxICJDaGFuZ2VMb2ciKSB7CkBAIC0zMDUsNiArMzI1LDggQEAgc3ViIG1hbnVmYWN0 dXJlUGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0bwogewogICAgIG15ICgkZmlsZURhdGEpID0gQF87 CiAgICAgbXkgJGZpbGUgPSAkZmlsZURhdGEtPntwYXRofTsKKyAgICBwdXNoIChAaW5kZWNpZXMs ICRmaWxlKTsKKwogICAgIHByaW50ICJJbmRleDogJHtmaWxlfVxuIjsKICAgICBwcmludCAiPSIg eCA2NywgIlxuIjsKICAgICBteSAkc291cmNlRmlsZSA9ICRmaWxlRGF0YS0+e3NvdXJjZUZpbGV9 Owo= 298684 2017-01-12 08:54:35 -0800 2017-01-12 14:34:13 -0800 Patch bug-166914-20170112085256.patch text/plain 2122 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDY2MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE3LTAxLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICAnd2Via2l0LXBhdGNoIHBvc3QnIG5vIGxvbmdlciB3b3JrcyB3aXRoIHJl bmFtZWQgZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2NjkxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoOgorICAgICAgICAoZ2VuZXJhdGVEaWZmKTog Q29tYmluZSBpbmRpY2VzIG9mIHRoZSBzYW1lIG5hbWUgaWYgdGhleSBhcmUgc2lkZSBieSBzaWRl LgorCiAyMDE3LTAxLTEyICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBGb2xsb3d1cCBmaXggYWZ0ZXIgcjIxMDUwMy4KSW5kZXg6IFRvb2xzL1NjcmlwdHMv c3ZuLWNyZWF0ZS1wYXRjaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUt cGF0Y2gJKHJldmlzaW9uIDIxMDU4NykKKysrIFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRj aAkod29ya2luZyBjb3B5KQpAQCAtMjE5LDYgKzIxOSw3IEBAIHN1YiBnZW5lcmF0ZURpZmYoJCQp CiB7CiAgICAgbXkgKCRmaWxlRGF0YSwgJHByZWZpeCkgPSBAXzsKICAgICBteSAkZmlsZSA9IEZp bGU6OlNwZWMtPmNhdGRpcigkcHJlZml4LCAkZmlsZURhdGEtPntwYXRofSk7CisgICAgbXkgJGN1 cnJlbnRJbmRleCA9ICIiOwogICAgIAogICAgIGlmICgkaWdub3JlQ2hhbmdlbG9ncyAmJiBiYXNl bmFtZSgkZmlsZSkgZXEgIkNoYW5nZUxvZyIpIHsKICAgICAgICAgcmV0dXJuIDA7CkBAIC0yMjcs MTMgKzIyOCwzMyBAQCBzdWIgZ2VuZXJhdGVEaWZmKCQkKQogICAgIG15ICRwYXRjaCA9ICIiOwog ICAgIGlmICgkZmlsZURhdGEtPnttb2RpZmljYXRpb25UeXBlfSBlcSAiYWRkaXRpb25XaXRoSGlz dG9yeSIpIHsKICAgICAgICAgbWFudWZhY3R1cmVQYXRjaEZvckFkZGl0aW9uV2l0aEhpc3Rvcnko JGZpbGVEYXRhKTsKKyAgICAgICAgJGN1cnJlbnRJbmRleCA9ICRmaWxlRGF0YS0+e3BhdGh9Owog ICAgIH0KIAogICAgIG15ICRkaWZmT3B0aW9ucyA9IGRpZmZPcHRpb25zRm9yRmlsZSgkZmlsZSk7 CiAgICAgbXkgJGVzY2FwZWRGaWxlID0gZXNjYXBlU3VidmVyc2lvblBhdGgoJGZpbGUpOwogICAg IG9wZW4gRElGRiwgInN2biBkaWZmIC0tZGlmZi1jbWQgZGlmZiAteCAtJGRpZmZPcHRpb25zICck ZXNjYXBlZEZpbGUnIHwiIG9yIGRpZTsKKworICAgIG15ICRzdm5EaWZmU3RhcnRSZWdFeCA9IHFy I15JbmRleDogKFteXHJcbl0rKSM7CisgICAgbXkgJHN2bkRpZmZTdGFydEVuZFJlZ0V4ID0gcXIj Xj0rXG4jOworICAgIG15ICR2YWxpZEZsYWcgPSAxOworICAgIAogICAgIHdoaWxlICg8RElGRj4p IHsKLSAgICAgICAgJHBhdGNoIC49ICRfOworCisgICAgICAgIGlmICgvJHN2bkRpZmZTdGFydFJl Z0V4LykgeworICAgICAgICAgICAgaWYgKCQxIGVxICAkY3VycmVudEluZGV4KSB7CisgICAgICAg ICAgICAgICAgJHZhbGlkRmxhZyA9IDA7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgICAgICRjdXJyZW50SW5kZXggPSAkMTsKKyAgICAgICAgICAgICAgICAkdmFsaWRGbGFnID0g MTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICBpZiAoJHZhbGlkRmxhZykgewor ICAgICAgICAgICAgJHBhdGNoIC49ICRfOworICAgICAgICB9CisgICAgICAgIGlmICgvJHN2bkRp ZmZTdGFydEVuZFJlZ0V4LykgeworICAgICAgICAgICAgJHZhbGlkRmxhZyA9IDE7CisgICAgICAg IH0KICAgICB9CiAgICAgY2xvc2UgRElGRjsKICAgICBpZiAoYmFzZW5hbWUoJGZpbGUpIGVxICJD aGFuZ2VMb2ciKSB7Cg== 298710 2017-01-12 14:34:17 -0800 2017-01-12 17:47:56 -0800 Patch bug-166914-20170112143237.patch text/plain 2197 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDY4MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE3LTAxLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICAnd2Via2l0LXBhdGNoIHBvc3QnIG5vIGxvbmdlciB3b3JrcyB3aXRoIG1v dmVkL2NvcGllZCBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY2OTE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgU1ZOIDEuOSBoYXMgYSBidWcgd2hlcmUgd2hlbiBhIGZpbGUgaGFzIGJlZW4gbW92 ZWQsIHRoZSBzdm4gZGlmZiBvZiB0aGUgbmV3CisgICAgICAgIGZpbGUgb3V0cHV0cyBvbmx5IHRo ZSBpbmRleCBvZiB0aGUgZmlsZSB3aXRoIG5vIGNoYW5nZXMuICBUaGlzIHdvcmstYXJvdW5kCisg ICAgICAgIGlnbm9yZXMgc3VjaCBhbiBvdXRwdXQgZnJvbSBzdm4gZGlmZi4KKworICAgICAgICAq IFNjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaDoKKyAgICAgICAgKGdlbmVyYXRlRGlmZik6IElnbm9y ZSBjaGFuZ2VzIDIgb3IgbGVzcyBsaW5lLgorCiAyMDE3LTAxLTEyICBTYW0gV2VpbmlnICA8c2Ft QHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIHRoZSBhYmlsaXR5IHRvIGZpbHRlciB0aGUgc2V0 IG9mIGJpbmRpbmdzIHRlc3RzIHlvdSB3YW50IHRvIHJ1bgpJbmRleDogVG9vbHMvU2NyaXB0cy9z dm4tY3JlYXRlLXBhdGNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1w YXRjaAkocmV2aXNpb24gMjEwNTEyKQorKysgVG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNo CSh3b3JraW5nIGNvcHkpCkBAIC0yMzEsOCArMjMxLDEwIEBAIHN1YiBnZW5lcmF0ZURpZmYoJCQp CiAKICAgICBteSAkZGlmZk9wdGlvbnMgPSBkaWZmT3B0aW9uc0ZvckZpbGUoJGZpbGUpOwogICAg IG15ICRlc2NhcGVkRmlsZSA9IGVzY2FwZVN1YnZlcnNpb25QYXRoKCRmaWxlKTsKKyAgICBteSAk bnVtVGV4dENodW5ja3MgPSAwOwogICAgIG9wZW4gRElGRiwgInN2biBkaWZmIC0tZGlmZi1jbWQg ZGlmZiAteCAtJGRpZmZPcHRpb25zICckZXNjYXBlZEZpbGUnIHwiIG9yIGRpZTsKICAgICB3aGls ZSAoPERJRkY+KSB7CisgICAgICAgICRudW1UZXh0Q2h1bmNrcyArPSAxOwogICAgICAgICAkcGF0 Y2ggLj0gJF87CiAgICAgfQogICAgIGNsb3NlIERJRkY7CkBAIC0yNDAsNyArMjQyLDE2IEBAIHN1 YiBnZW5lcmF0ZURpZmYoJCQpCiAgICAgICAgIG15ICRjaGFuZ2VMb2dIYXNoID0gZml4Q2hhbmdl TG9nUGF0Y2goJHBhdGNoKTsKICAgICAgICAgJHBhdGNoID0gJGNoYW5nZUxvZ0hhc2gtPntwYXRj aH07ICAgCiAgICAgfQotICAgIHByaW50ICRwYXRjaDsKKworICAgIGlmICgkbnVtVGV4dENodW5j a3MgPiAyKSB7CisgICAgICAgICMgRm9yIG1vdmVkL2NvcGllZCBmaWxlcyB3aXRob3V0IHBvc3Qg Y2hhbmdlcyBTVk4gMS45IG9yIGdyZWF0ZXIgZW1pdHMgYSBkaWZmIHdpdGggYW4gZW1wdHkKKyAg ICAgICAgIyBib2R5IGFzIG9wcG9zZWQgdG8gZW1pdHRpbmcgbm90aGluZyBhcyBpbiBlYXJsaWVy IHZlcnNpb25zIG9mIFNWTi4gRm9yIGV4YW1wbGUsIG1vdmUgZmlsZQorICAgICAgICAjIEEudHh0 IHRvIEIudHh0IHRoZW4gdGhlIGRpZmYgb2YgQi50eHQgaW4gU1ZOIDEuOSBvciBncmVhdGVyIGlz OgorICAgICAgICAjIEluZGV4OiBCLnR4dAorICAgICAgICAjID09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKyAgICAgICAg IyBUaGVyZWZvcmUgd2UgaWdub3JlIGVtaXR0aW5nIHN1Y2ggYSBkaWZmLgorICAgICAgICBwcmlu dCAkcGF0Y2g7CisgICAgfQogICAgIGlmICgkZmlsZURhdGEtPntpc0JpbmFyeX0pIHsKICAgICAg ICAgcHJpbnQgIlxuIiBpZiAoJHBhdGNoICYmICRwYXRjaCA9fiBtL1xuXFMrJC9tKTsKICAgICAg ICAgb3V0cHV0QmluYXJ5Q29udGVudCgkZmlsZSk7Cg== 298743 2017-01-12 17:47:56 -0800 2017-01-13 10:00:41 -0800 Manual patch patch.diff text/plain 2173 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDY4OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE3LTAxLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICAnd2Via2l0LXBhdGNoIHBvc3QnIG5vIGxvbmdlciB3b3JrcyB3aXRoIG1v dmVkL2NvcGllZCBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY2OTE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgU1ZOIDEuOSBoYXMgYSBidWcgd2hlcmUgd2hlbiBhIGZpbGUgaGFzIGJlZW4gbW92 ZWQsIHRoZSBzdm4gZGlmZiBvZiB0aGUgbmV3CisgICAgICAgIGZpbGUgb3V0cHV0cyBvbmx5IHRo ZSBpbmRleCBsaW5lIHdpdGggYW4gZW1wdHkgYm9keS4gIFRoaXMgd29ya2Fyb3VuZAorICAgICAg ICBpZ25vcmVzIHN1Y2ggYW4gb3V0cHV0IGZyb20gc3ZuIGRpZmYuCisKKyAgICAgICAgKiBTY3Jp cHRzL3N2bi1jcmVhdGUtcGF0Y2g6CisgICAgICAgIChnZW5lcmF0ZURpZmYpOiBJZ25vcmUgYW4g aW5kZXggd2l0aCBhbiBlbXB0eSBib2R5LgorCiAyMDE3LTAxLTEyICBTYW0gV2VpbmlnICA8c2Ft QHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIHRoZSBhYmlsaXR5IHRvIGZpbHRlciB0aGUgc2V0 IG9mIGJpbmRpbmdzIHRlc3RzIHlvdSB3YW50IHRvIHJ1bgpJbmRleDogVG9vbHMvU2NyaXB0cy9z dm4tY3JlYXRlLXBhdGNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1w YXRjaAkocmV2aXNpb24gMjEwNjg5KQorKysgVG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNo CSh3b3JraW5nIGNvcHkpCkBAIC0yMzIsNyArMjMyLDkgQEAgc3ViIGdlbmVyYXRlRGlmZigkJCkK ICAgICBteSAkZGlmZk9wdGlvbnMgPSBkaWZmT3B0aW9uc0ZvckZpbGUoJGZpbGUpOwogICAgIG15 ICRlc2NhcGVkRmlsZSA9IGVzY2FwZVN1YnZlcnNpb25QYXRoKCRmaWxlKTsKICAgICBvcGVuIERJ RkYsICJzdm4gZGlmZiAtLWRpZmYtY21kIGRpZmYgLXggLSRkaWZmT3B0aW9ucyAnJGVzY2FwZWRG aWxlJyB8IiBvciBkaWU7CisgICAgbXkgJG51bVRleHRDaHVua3MgPSAwOwogICAgIHdoaWxlICg8 RElGRj4pIHsKKyAgICAgICAgJG51bVRleHRDaHVua3MgKz0gMSBpZiBwYXJzZUNodW5rUmFuZ2Uo JF8pOwogICAgICAgICAkcGF0Y2ggLj0gJF87CiAgICAgfQogICAgIGNsb3NlIERJRkY7CkBAIC0y NDAsNiArMjQyLDE2IEBAIHN1YiBnZW5lcmF0ZURpZmYoJCQpCiAgICAgICAgIG15ICRjaGFuZ2VM b2dIYXNoID0gZml4Q2hhbmdlTG9nUGF0Y2goJHBhdGNoKTsKICAgICAgICAgJHBhdGNoID0gJGNo YW5nZUxvZ0hhc2gtPntwYXRjaH07ICAgCiAgICAgfQorCisgICAgaWYgKCEkbnVtVGV4dENodW5r cykgeworICAgICAgICAjIEZvciBtb3ZlZC9jb3BpZWQgZmlsZXMgd2l0aG91dCBwb3N0IGNoYW5n ZXMgU1ZOIDEuOSBvciBncmVhdGVyIGVtaXRzIGEgZGlmZiB3aXRoIGFuIGVtcHR5CisgICAgICAg ICMgYm9keSBhcyBvcHBvc2VkIHRvIGVtaXR0aW5nIG5vdGhpbmcgYXMgaW4gZWFybGllciB2ZXJz aW9ucyBvZiBTVk4uIEZvciBleGFtcGxlLCBtb3ZlIGZpbGUKKyAgICAgICAgIyBBLnR4dCB0byBC LnR4dCB0aGVuIHRoZSBkaWZmIG9mIEIudHh0IGluIFNWTiAxLjkgb3IgZ3JlYXRlciBpczoKKyAg ICAgICAgIyBJbmRleDogQi50eHQKKyAgICAgICAgIyA9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CisgICAgICAgICMgVGhl cmVmb3JlIHdlIGlnbm9yZSBlbWl0dGluZyBzdWNoIGEgZGlmZi4KKyAgICAgICAgJHBhdGNoID0g IiI7CisgICAgfQogICAgIHByaW50ICRwYXRjaDsKICAgICBpZiAoJGZpbGVEYXRhLT57aXNCaW5h cnl9KSB7CiAgICAgICAgIHByaW50ICJcbiIgaWYgKCRwYXRjaCAmJiAkcGF0Y2ggPX4gbS9cblxT KyQvbSk7Cg== 298764 2017-01-13 10:00:45 -0800 2017-01-13 11:37:04 -0800 Patch bug-166914-20170113095903.patch text/plain 2449 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDczMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE3LTAxLTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICAnd2Via2l0LXBhdGNoIHBvc3QnIG5vIGxvbmdlciB3b3JrcyB3aXRoIG1v dmVkL2NvcGllZCBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY2OTE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgU1ZOIDEuOSBoYXMgYSBidWcgd2hlcmUgd2hlbiBhIGZpbGUgaGFzIGJlZW4gbW92 ZWQgb3IgY29waWVkLCB0aGUgc3ZuIGRpZmYgb2YgdGhlIG5ldworICAgICAgICBmaWxlIG91dHB1 dHMgb25seSB0aGUgaW5kZXggbGluZSB3aXRoIGFuIGVtcHR5IGJvZHkuICBUaGlzIHdvcmthcm91 bmQKKyAgICAgICAgaWdub3JlcyBzdWNoIGFuIG91dHB1dCBmcm9tIHN2biBkaWZmLiAgQSBidWcg aGFzIGJlZW4gZmlsZWQgd2l0aCBTVk4sIGEgbGluayB0byB0aGUKKyAgICAgICAgcHVibGljIGVt YWlsIGxpc3QgdHJhY2tpbmcgdGhpcyBidWcgaXMgYmVsb3cuCisgICAgICAgIGh0dHA6Ly9tYWls LWFyY2hpdmVzLmFwYWNoZS5vcmcvbW9kX21ib3gvc3VidmVyc2lvbi11c2Vycy8yMDE3MDEubWJv eC8lM2NDRjlCREUwQS03NDU0LTQ0MDUtODI1OS0xMTIwQzZCNzZBMDNAYXBwbGUuY29tJTNlCisg ICAgICAgIAorCisgICAgICAgICogU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoOgorICAgICAgICAo Z2VuZXJhdGVEaWZmKTogSWdub3JlIGFuIGluZGV4IHdpdGggYW4gZW1wdHkgYm9keS4KKwogMjAx Ny0wMS0xMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBL RVlCT0FSRF9LRVlfQVRUUklCVVRFIC8gS0VZQk9BUkRfQ09ERV9BVFRSSUJVVEUgdG8gRmVhdHVy ZURlZmluZXMueGNjb25maWcKSW5kZXg6IFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gJKHJldmlzaW9uIDIx MDczMCkKKysrIFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAkod29ya2luZyBjb3B5KQpA QCAtMjMyLDcgKzIzMiw5IEBAIHN1YiBnZW5lcmF0ZURpZmYoJCQpCiAgICAgbXkgJGRpZmZPcHRp b25zID0gZGlmZk9wdGlvbnNGb3JGaWxlKCRmaWxlKTsKICAgICBteSAkZXNjYXBlZEZpbGUgPSBl c2NhcGVTdWJ2ZXJzaW9uUGF0aCgkZmlsZSk7CiAgICAgb3BlbiBESUZGLCAic3ZuIGRpZmYgLS1k aWZmLWNtZCBkaWZmIC14IC0kZGlmZk9wdGlvbnMgJyRlc2NhcGVkRmlsZScgfCIgb3IgZGllOwor ICAgIG15ICRudW1UZXh0Q2h1bmtzID0gMDsKICAgICB3aGlsZSAoPERJRkY+KSB7CisgICAgICAg ICRudW1UZXh0Q2h1bmtzICs9IDEgaWYgcGFyc2VDaHVua1JhbmdlKCRfKTsKICAgICAgICAgJHBh dGNoIC49ICRfOwogICAgIH0KICAgICBjbG9zZSBESUZGOwpAQCAtMjQwLDYgKzI0MiwxNiBAQCBz dWIgZ2VuZXJhdGVEaWZmKCQkKQogICAgICAgICBteSAkY2hhbmdlTG9nSGFzaCA9IGZpeENoYW5n ZUxvZ1BhdGNoKCRwYXRjaCk7CiAgICAgICAgICRwYXRjaCA9ICRjaGFuZ2VMb2dIYXNoLT57cGF0 Y2h9OyAgIAogICAgIH0KKworICAgIGlmICghJG51bVRleHRDaHVua3MpIHsKKyAgICAgICAgIyBG b3IgbW92ZWQvY29waWVkIGZpbGVzIHdpdGhvdXQgcG9zdCBjaGFuZ2VzIFNWTiAxLjkgb3IgZ3Jl YXRlciBlbWl0cyBhIGRpZmYgd2l0aCBhbiBlbXB0eQorICAgICAgICAjIGJvZHkgYXMgb3Bwb3Nl ZCB0byBlbWl0dGluZyBub3RoaW5nIGFzIGluIGVhcmxpZXIgdmVyc2lvbnMgb2YgU1ZOLiBGb3Ig ZXhhbXBsZSwgbW92ZSBmaWxlCisgICAgICAgICMgQS50eHQgdG8gQi50eHQgdGhlbiB0aGUgZGlm ZiBvZiBCLnR4dCBpbiBTVk4gMS45IG9yIGdyZWF0ZXIgaXM6CisgICAgICAgICMgICAgIEluZGV4 OiBCLnR4dAorICAgICAgICAjICAgICA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CisgICAgICAgICMgVGhlcmVmb3JlIHdl IGlnbm9yZSBlbWl0dGluZyBzdWNoIGEgZGlmZi4KKyAgICAgICAgJHBhdGNoID0gIiI7CisgICAg fQogICAgIHByaW50ICRwYXRjaDsKICAgICBpZiAoJGZpbGVEYXRhLT57aXNCaW5hcnl9KSB7CiAg ICAgICAgIHByaW50ICJcbiIgaWYgKCRwYXRjaCAmJiAkcGF0Y2ggPX4gbS9cblxTKyQvbSk7Cg== 298775 2017-01-13 11:37:09 -0800 2017-01-13 12:52:44 -0800 Patch bug-166914-20170113113528.patch text/plain 2440 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDczOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE3LTAxLTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICAnd2Via2l0LXBhdGNoIHBvc3QnIG5vIGxvbmdlciB3b3JrcyB3aXRoIG1v dmVkL2NvcGllZCBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY2OTE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFuaWVsIEJhdGVzLgorCisg ICAgICAgIFNWTiAxLjkgaGFzIGEgYnVnIHdoZXJlIHdoZW4gYSBmaWxlIGhhcyBiZWVuIG1vdmVk IG9yIGNvcGllZCwgdGhlIHN2biBkaWZmIG9mIHRoZSBuZXcKKyAgICAgICAgZmlsZSBvdXRwdXRz IG9ubHkgdGhlICJJbmRleDoiIGxpbmUgd2l0aCBhbiBlbXB0eSBib2R5LiAgVGhpcyB3b3JrYXJv dW5kCisgICAgICAgIGlnbm9yZXMgc3VjaCBvdXRwdXQgZnJvbSBzdm4gZGlmZi4gIEEgaXNzdWUg aGFzIGJlZW4gZmlsZWQgd2l0aCBTVk4sIGEgbGluayB0byB0aGUKKyAgICAgICAgcHVibGljIGVt YWlsIGxpc3QgdHJhY2tpbmcgdGhpcyBidWcgaXMgYmVsb3cuCisgICAgICAgIGh0dHA6Ly9tYWls LWFyY2hpdmVzLmFwYWNoZS5vcmcvbW9kX21ib3gvc3VidmVyc2lvbi11c2Vycy8yMDE3MDEubWJv eC8lM2NDRjlCREUwQS03NDU0LTQ0MDUtODI1OS0xMTIwQzZCNzZBMDNAYXBwbGUuY29tJTNlCisg ICAgICAgIAorCisgICAgICAgICogU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoOgorICAgICAgICAo Z2VuZXJhdGVEaWZmKTogSWdub3JlIGFuICJJbmRleDoiIGxpbmUgd2l0aCBhbiBlbXB0eSBib2R5 LgorCiAyMDE3LTAxLTEzICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgog CiAgICAgICAgIHJ1bi1qc2MtYmVuY2htYXJrcycgZWNobyBzaG91bGQgaGF2ZSAtZSBvcHRpb24K SW5kZXg6IFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gJKHJldmlzaW9uIDIxMDczOSkKKysrIFRvb2xzL1Nj cmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAkod29ya2luZyBjb3B5KQpAQCAtMjMyLDE0ICsyMzIsMjcg QEAgc3ViIGdlbmVyYXRlRGlmZigkJCkKICAgICBteSAkZGlmZk9wdGlvbnMgPSBkaWZmT3B0aW9u c0ZvckZpbGUoJGZpbGUpOwogICAgIG15ICRlc2NhcGVkRmlsZSA9IGVzY2FwZVN1YnZlcnNpb25Q YXRoKCRmaWxlKTsKICAgICBvcGVuIERJRkYsICJzdm4gZGlmZiAtLWRpZmYtY21kIGRpZmYgLXgg LSRkaWZmT3B0aW9ucyAnJGVzY2FwZWRGaWxlJyB8IiBvciBkaWU7CisgICAgbXkgJG51bVRleHRD aHVua3MgPSAwOwogICAgIHdoaWxlICg8RElGRj4pIHsKKyAgICAgICAgJG51bVRleHRDaHVua3Mg Kz0gMSBpZiBwYXJzZUNodW5rUmFuZ2UoJF8pOwogICAgICAgICAkcGF0Y2ggLj0gJF87CiAgICAg fQogICAgIGNsb3NlIERJRkY7CisgICAgaWYgKCEkbnVtVGV4dENodW5rcykgeworICAgICAgICAj IEZvciBtb3ZlZC9jb3BpZWQgZmlsZXMgd2l0aG91dCBwb3N0IGNoYW5nZXMgU1ZOIDEuOSBvciBn cmVhdGVyIGVtaXRzIGEgZGlmZiB3aXRoIGFuIGVtcHR5CisgICAgICAgICMgYm9keSBhcyBvcHBv c2VkIHRvIGVtaXR0aW5nIG5vdGhpbmcgYXMgaW4gZWFybGllciB2ZXJzaW9ucyBvZiBTVk4uIEZv ciBleGFtcGxlLCBtb3ZlIGZpbGUKKyAgICAgICAgIyBBLnR4dCB0byBCLnR4dCB0aGVuIHRoZSBk aWZmIG9mIEIudHh0IGluIFNWTiAxLjkgb3IgZ3JlYXRlciBpczoKKyAgICAgICAgIyAgICAgSW5k ZXg6IEIudHh0CisgICAgICAgICMgICAgID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKyAgICAgICAgIyBUaGVyZWZvcmUg d2UgaWdub3JlIGVtaXR0aW5nIHN1Y2ggYSBkaWZmLgorICAgICAgICAkcGF0Y2ggPSAiIjsKKyAg ICB9CisKICAgICBpZiAoYmFzZW5hbWUoJGZpbGUpIGVxICJDaGFuZ2VMb2ciKSB7CiAgICAgICAg IG15ICRjaGFuZ2VMb2dIYXNoID0gZml4Q2hhbmdlTG9nUGF0Y2goJHBhdGNoKTsKICAgICAgICAg JHBhdGNoID0gJGNoYW5nZUxvZ0hhc2gtPntwYXRjaH07ICAgCiAgICAgfQorICAgIAogICAgIHBy aW50ICRwYXRjaDsKICAgICBpZiAoJGZpbGVEYXRhLT57aXNCaW5hcnl9KSB7CiAgICAgICAgIHBy aW50ICJcbiIgaWYgKCRwYXRjaCAmJiAkcGF0Y2ggPX4gbS9cblxTKyQvbSk7Cg== 298782 2017-01-13 12:52:48 -0800 2017-01-13 16:57:15 -0800 Patch bug-166914-20170113125106.patch text/plain 2315 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDczOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE3LTAxLTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICAnd2Via2l0LXBhdGNoIHBvc3QnIG5vIGxvbmdlciB3b3JrcyB3aXRoIG1v dmVkL2NvcGllZCBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY2OTE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFuaWVsIEJhdGVzLgorCisg ICAgICAgIFNWTiAxLjkgaGFzIGEgYnVnIHdoZXJlIHdoZW4gYSBmaWxlIGhhcyBiZWVuIG1vdmVk IG9yIGNvcGllZCwgdGhlIHN2biBkaWZmIG9mIHRoZSBuZXcKKyAgICAgICAgZmlsZSBvdXRwdXRz IG9ubHkgdGhlICJJbmRleDoiIGxpbmUgd2l0aCBhbiBlbXB0eSBib2R5LiAgVGhpcyB3b3JrYXJv dW5kCisgICAgICAgIGlnbm9yZXMgc3VjaCBvdXRwdXQgZnJvbSBzdm4gZGlmZi4gIEEgaXNzdWUg aGFzIGJlZW4gZmlsZWQgd2l0aCBTVk4sIGEgbGluayB0byB0aGUKKyAgICAgICAgcHVibGljIGVt YWlsIGxpc3QgdHJhY2tpbmcgdGhpcyBidWcgaXMgYmVsb3cuCisgICAgICAgIGh0dHA6Ly9tYWls LWFyY2hpdmVzLmFwYWNoZS5vcmcvbW9kX21ib3gvc3VidmVyc2lvbi11c2Vycy8yMDE3MDEubWJv eC8lM2NDRjlCREUwQS03NDU0LTQ0MDUtODI1OS0xMTIwQzZCNzZBMDNAYXBwbGUuY29tJTNlCisg ICAgICAgIAorCisgICAgICAgICogU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoOgorICAgICAgICAo Z2VuZXJhdGVEaWZmKTogSWdub3JlIGFuICJJbmRleDoiIGxpbmUgd2l0aCBhbiBlbXB0eSBib2R5 LgorCiAyMDE3LTAxLTEzICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgog CiAgICAgICAgIHJ1bi1qc2MtYmVuY2htYXJrcycgZWNobyBzaG91bGQgaGF2ZSAtZSBvcHRpb24K SW5kZXg6IFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gJKHJldmlzaW9uIDIxMDczOSkKKysrIFRvb2xzL1Nj cmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAkod29ya2luZyBjb3B5KQpAQCAtMjMyLDEwICsyMzIsMjEg QEAgc3ViIGdlbmVyYXRlRGlmZigkJCkKICAgICBteSAkZGlmZk9wdGlvbnMgPSBkaWZmT3B0aW9u c0ZvckZpbGUoJGZpbGUpOwogICAgIG15ICRlc2NhcGVkRmlsZSA9IGVzY2FwZVN1YnZlcnNpb25Q YXRoKCRmaWxlKTsKICAgICBvcGVuIERJRkYsICJzdm4gZGlmZiAtLWRpZmYtY21kIGRpZmYgLXgg LSRkaWZmT3B0aW9ucyAnJGVzY2FwZWRGaWxlJyB8IiBvciBkaWU7CisgICAgbXkgJG51bVRleHRD aHVua3MgPSAwOwogICAgIHdoaWxlICg8RElGRj4pIHsKKyAgICAgICAgJG51bVRleHRDaHVua3Mg Kz0gMSBpZiBwYXJzZUNodW5rUmFuZ2UoJF8pOwogICAgICAgICAkcGF0Y2ggLj0gJF87CiAgICAg fQogICAgIGNsb3NlIERJRkY7CisgICAgaWYgKCEkbnVtVGV4dENodW5rcykgeworICAgICAgICAj IEZvciBtb3ZlZC9jb3BpZWQgZmlsZXMgd2l0aG91dCBwb3N0IGNoYW5nZXMgU1ZOIDEuOSBvciBn cmVhdGVyIGVtaXRzIGEgZGlmZiB3aXRoIGFuIGVtcHR5CisgICAgICAgICMgYm9keSBhcyBvcHBv c2VkIHRvIGVtaXR0aW5nIG5vdGhpbmcgYXMgaW4gZWFybGllciB2ZXJzaW9ucyBvZiBTVk4uIEZv ciBleGFtcGxlLCBtb3ZlIGZpbGUKKyAgICAgICAgIyBBLnR4dCB0byBCLnR4dCB0aGVuIHRoZSBk aWZmIG9mIEIudHh0IGluIFNWTiAxLjkgb3IgZ3JlYXRlciBpczoKKyAgICAgICAgIyAgICAgSW5k ZXg6IEIudHh0CisgICAgICAgICMgICAgID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKyAgICAgICAgIyBUaGVyZWZvcmUg d2UgaWdub3JlIGVtaXR0aW5nIHN1Y2ggYSBkaWZmLgorICAgICAgICAkcGF0Y2ggPSAiIjsKKyAg ICB9CiAgICAgaWYgKGJhc2VuYW1lKCRmaWxlKSBlcSAiQ2hhbmdlTG9nIikgewogICAgICAgICBt eSAkY2hhbmdlTG9nSGFzaCA9IGZpeENoYW5nZUxvZ1BhdGNoKCRwYXRjaCk7CiAgICAgICAgICRw YXRjaCA9ICRjaGFuZ2VMb2dIYXNoLT57cGF0Y2h9OyAgIAo= 298809 2017-01-13 16:57:19 -0800 2017-01-17 10:53:57 -0800 Patch bug-166914-20170113165537.patch text/plain 2350 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDc0MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDE3LTAxLTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICAnd2Via2l0LXBhdGNoIHBvc3QnIG5vIGxvbmdlciB3b3JrcyB3aXRoIG1v dmVkL2NvcGllZCBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY2OTE0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTk3OTcwNz4KKworICAg ICAgICBSZXZpZXdlZCBieSBEYW5pZWwgQmF0ZXMuCisKKyAgICAgICAgU1ZOIDEuOSBoYXMgYSBi dWcgd2hlcmUgd2hlbiBhIGZpbGUgaGFzIGJlZW4gbW92ZWQgb3IgY29waWVkLCB0aGUgc3ZuIGRp ZmYgb2YgdGhlIG5ldworICAgICAgICBmaWxlIG91dHB1dHMgb25seSB0aGUgIkluZGV4OiIgbGlu ZSB3aXRoIGFuIGVtcHR5IGJvZHkuICBUaGlzIHdvcmthcm91bmQKKyAgICAgICAgaWdub3JlcyBz dWNoIG91dHB1dCBmcm9tIHN2biBkaWZmLiAgQSBpc3N1ZSBoYXMgYmVlbiBmaWxlZCB3aXRoIFNW TiwgYSBsaW5rIHRvIHRoZQorICAgICAgICBwdWJsaWMgZW1haWwgbGlzdCB0cmFja2luZyB0aGlz IGJ1ZyBpcyBiZWxvdy4KKyAgICAgICAgaHR0cDovL21haWwtYXJjaGl2ZXMuYXBhY2hlLm9yZy9t b2RfbWJveC9zdWJ2ZXJzaW9uLXVzZXJzLzIwMTcwMS5tYm94LyUzY0NGOUJERTBBLTc0NTQtNDQw NS04MjU5LTExMjBDNkI3NkEwM0BhcHBsZS5jb20lM2UKKyAgICAgICAgCisKKyAgICAgICAgKiBT Y3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2g6CisgICAgICAgIChnZW5lcmF0ZURpZmYpOiBJZ25vcmUg YW4gIkluZGV4OiIgbGluZSB3aXRoIGFuIGVtcHR5IGJvZHkuCisKIDIwMTctMDEtMTMgIFl1c3Vr ZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CiAKICAgICAgICAgcnVuLWpzYy1iZW5j aG1hcmtzJyBlY2hvIHNob3VsZCBoYXZlIC1lIG9wdGlvbgpJbmRleDogVG9vbHMvU2NyaXB0cy9z dm4tY3JlYXRlLXBhdGNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1w YXRjaAkocmV2aXNpb24gMjEwNzQyKQorKysgVG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNo CSh3b3JraW5nIGNvcHkpCkBAIC0yMzIsMTAgKzIzMiwyMSBAQCBzdWIgZ2VuZXJhdGVEaWZmKCQk KQogICAgIG15ICRkaWZmT3B0aW9ucyA9IGRpZmZPcHRpb25zRm9yRmlsZSgkZmlsZSk7CiAgICAg bXkgJGVzY2FwZWRGaWxlID0gZXNjYXBlU3VidmVyc2lvblBhdGgoJGZpbGUpOwogICAgIG9wZW4g RElGRiwgInN2biBkaWZmIC0tZGlmZi1jbWQgZGlmZiAteCAtJGRpZmZPcHRpb25zICckZXNjYXBl ZEZpbGUnIHwiIG9yIGRpZTsKKyAgICBteSAkbnVtVGV4dENodW5rcyA9IDA7CiAgICAgd2hpbGUg KDxESUZGPikgeworICAgICAgICAkbnVtVGV4dENodW5rcyArPSAxIGlmIHBhcnNlQ2h1bmtSYW5n ZSgkXyk7CiAgICAgICAgICRwYXRjaCAuPSAkXzsKICAgICB9CiAgICAgY2xvc2UgRElGRjsKKyAg ICBpZiAoISRudW1UZXh0Q2h1bmtzKSB7CisgICAgICAgICMgRm9yIG1vdmVkL2NvcGllZCBmaWxl cyB3aXRob3V0IHBvc3QgY2hhbmdlcyBTVk4gMS45IG9yIGdyZWF0ZXIgZW1pdHMgYSBkaWZmIHdp dGggYW4gZW1wdHkKKyAgICAgICAgIyBib2R5IGFzIG9wcG9zZWQgdG8gZW1pdHRpbmcgbm90aGlu ZyBhcyBpbiBlYXJsaWVyIHZlcnNpb25zIG9mIFNWTi4gRm9yIGV4YW1wbGUsIG1vdmUgZmlsZQor ICAgICAgICAjIEEudHh0IHRvIEIudHh0IHRoZW4gdGhlIGRpZmYgb2YgQi50eHQgaW4gU1ZOIDEu OSBvciBncmVhdGVyIGlzOgorICAgICAgICAjICAgICBJbmRleDogQi50eHQKKyAgICAgICAgIyAg ICAgPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQorICAgICAgICAjIFRoZXJlZm9yZSB3ZSBpZ25vcmUgZW1pdHRpbmcgc3Vj aCBhIGRpZmYuCisgICAgICAgICRwYXRjaCA9ICIiOworICAgIH0KICAgICBpZiAoYmFzZW5hbWUo JGZpbGUpIGVxICJDaGFuZ2VMb2ciKSB7CiAgICAgICAgIG15ICRjaGFuZ2VMb2dIYXNoID0gZml4 Q2hhbmdlTG9nUGF0Y2goJHBhdGNoKTsKICAgICAgICAgJHBhdGNoID0gJGNoYW5nZUxvZ0hhc2gt PntwYXRjaH07ICAgCg==