124581 2013-11-19 08:02:20 -0800 Modify webkitdirs to reuse checkForArgumentAndRemoveFromARGV 2013-11-21 06:39:19 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 124697 124537 1 nick.diego nick.diego bfulgham commit-queue dbates dfarler mrowe ossy rniwa oldest_to_newest 952068 0 nick.diego 2013-11-19 08:02:20 -0800 Modify webkitdirs do reuse checkForArgumentAndRemoveFromARGV 952113 1 217307 nick.diego 2013-11-19 09:52:41 -0800 Created attachment 217307 Patch 952117 2 217308 nick.diego 2013-11-19 10:01:12 -0800 Created attachment 217308 Patch 952138 3 217308 thorton 2013-11-19 11:02:15 -0800 Comment on attachment 217308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217308&action=review > Tools/ChangeLog:9 > + functions instead of reusing them as it's being done by all other functions. s/as it's/as is/, I think? > Tools/ChangeLog:17 > + (checkForArgumentAndRemoveFromArrayRef): Fixes a bug in elements removal. what kind of bug! more explanation would be nice :) > Tools/Scripts/webkitdirs.pm:846 > +sub checkForArgumentAndRemoveFromARGVGettingValue($$) maybe getArgumentAndRemoveFromARGV? 'get' prefix is closer to 'checkFor'. I dunno. > Tools/Scripts/webkitdirs.pm:850 > + return 0 unless ($#matchingIndices != 1); why 0 instead of undef or whatever? 952149 4 nick.diego 2013-11-19 11:38:44 -0800 (In reply to comment #3) > (From update of attachment 217308 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=217308&action=review Thanks for the review. > > > Tools/ChangeLog:9 > > + functions instead of reusing them as it's being done by all other functions. > > s/as it's/as is/, I think? ok > > > Tools/ChangeLog:17 > > + (checkForArgumentAndRemoveFromArrayRef): Fixes a bug in elements removal. > > what kind of bug! more explanation would be nice :) > ok > > Tools/Scripts/webkitdirs.pm:846 > > +sub checkForArgumentAndRemoveFromARGVGettingValue($$) > > maybe getArgumentAndRemoveFromARGV? 'get' prefix is closer to 'checkFor'. I dunno. > I've just followed the pattern the other functions were already using > > Tools/Scripts/webkitdirs.pm:850 > > + return 0 unless ($#matchingIndices != 1); > > why 0 instead of undef or whatever? In this case, the return value is checked in a boolean expression, so '0' or 'undef' has the same effect (in perl) 952151 5 217313 nick.diego 2013-11-19 11:40:18 -0800 Created attachment 217313 Patch 952175 6 217313 dbates 2013-11-19 12:17:34 -0800 Comment on attachment 217313 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217313&action=review This patch looks good. I'm r-'ing this patch because of the lack of a test. > Tools/Scripts/webkitdirs.pm:393 > + if (checkForArgumentAndRemoveFromARGVGettingValue('--sdk', \$sdk)) { Nit: ' => " That is, we use double quotes for string literals unless we explicitly don't want string interpolation. > Tools/Scripts/webkitdirs.pm:395 > + } elsif (checkForArgumentAndRemoveFromARGV('--device')) { Ditto. > Tools/Scripts/webkitdirs.pm:397 > + } elsif (checkForArgumentAndRemoveFromARGV('--sim') || Ditto. > Tools/Scripts/webkitdirs.pm:398 > + checkForArgumentAndRemoveFromARGV('--simulator')) { Ditto. > Tools/Scripts/webkitdirs.pm:614 > + if (checkForArgumentAndRemoveFromARGV('--debug')) { Ditto. > Tools/Scripts/webkitdirs.pm:616 > + } elsif(checkForArgumentAndRemoveFromARGV('--release')) { Ditto. > Tools/Scripts/webkitdirs.pm:618 > + } elsif (checkForArgumentAndRemoveFromARGV('--profile') || checkForArgumentAndRemoveFromARGV('--profiling')) { Ditto. > Tools/Scripts/webkitdirs.pm:653 > + if (checkForArgumentAndRemoveFromARGV('--32-bit')) { Ditto. > Tools/Scripts/webkitdirs.pm:881 > + my $removeOffset = 0; > foreach my $index (@indicesToRemove) { > - splice(@$arrayRef, $index, 1); > + splice(@$arrayRef, $index - $removeOffset++, 1); Can we write a test for this change? You may find it beneficial to look at the tests in <http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/> when writing such a test, including <http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/removeEOL.pl>. 952249 7 nick.diego 2013-11-19 14:47:27 -0800 (In reply to comment #6) > (From update of attachment 217313 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=217313&action=review > > This patch looks good. I'm r-'ing this patch because of the lack of a test. > > > Tools/Scripts/webkitdirs.pm:393 > > + if (checkForArgumentAndRemoveFromARGVGettingValue('--sdk', \$sdk)) { > > Nit: ' => " > > That is, we use double quotes for string literals unless we explicitly don't want string interpolation. > > > Tools/Scripts/webkitdirs.pm:395 > > + } elsif (checkForArgumentAndRemoveFromARGV('--device')) { > > Ditto. > > > Tools/Scripts/webkitdirs.pm:397 > > + } elsif (checkForArgumentAndRemoveFromARGV('--sim') || > > Ditto. > > > Tools/Scripts/webkitdirs.pm:398 > > + checkForArgumentAndRemoveFromARGV('--simulator')) { > > Ditto. > > > Tools/Scripts/webkitdirs.pm:614 > > + if (checkForArgumentAndRemoveFromARGV('--debug')) { > > Ditto. > > > Tools/Scripts/webkitdirs.pm:616 > > + } elsif(checkForArgumentAndRemoveFromARGV('--release')) { > > Ditto. > > > Tools/Scripts/webkitdirs.pm:618 > > + } elsif (checkForArgumentAndRemoveFromARGV('--profile') || checkForArgumentAndRemoveFromARGV('--profiling')) { > > Ditto. > > > Tools/Scripts/webkitdirs.pm:653 > > + if (checkForArgumentAndRemoveFromARGV('--32-bit')) { > > Ditto. > Ok for all above. > > Tools/Scripts/webkitdirs.pm:881 > > + my $removeOffset = 0; > > foreach my $index (@indicesToRemove) { > > - splice(@$arrayRef, $index, 1); > > + splice(@$arrayRef, $index - $removeOffset++, 1); > > Can we write a test for this change? > > You may find it beneficial to look at the tests in <http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/> when writing such a test, including <http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/removeEOL.pl>. Ok, I'll add some unit test cases for it :) thanks 952252 8 217337 nick.diego 2013-11-19 14:50:53 -0800 Created attachment 217337 Patch 952749 9 217337 dbates 2013-11-20 13:19:13 -0800 Comment on attachment 217337 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217337&action=review This patch is close. I'm r-'ing this patch since we should extract the bug fix into a separate bug and patch. See my reasoning below for more details. > Tools/ChangeLog:20 > + (checkForArgumentAndRemoveFromArrayRef): Bugfix: It was removing wrong > + elements when there were more then one occurrence of that argument. > + E.g: Checking for 'a' in {a, b, a, c}, the resulting array would be > + {b, a}, when it should be {b, c}. Please extract this fix into a separate bug and patch. In general, a patch should represent a single bug fix. The advantage of this approach is that it makes it straightforward to track down a regression and/or revert a change set without inadvertently blaming or reverting code that wasn't the cause of a regression. > Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRef.pl:1 > +#!/usr/bin/perl Please add the -w argument to enable warning diagnostics: #!/usr/bin/perl -w > Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRef.pl:26 > +use strict; Please include the warnings module: use warnings; > Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRef.pl:27 > +use Test::Simple tests => 4; I suggest we use module Test::More instead of Test::Simple because it exposes additional assertion routines, such as is_deeply(). The assertion routine is_deeply() can compare complex structures, including arrays, and print where the structures differ (if they do). Then we don't need to implement a custom array equality function. See <http://search.cpan.org/~rjbs/Test-Simple-1.001002/lib/Test/More.pm> for more details. I didn't mean to imply that you should use Test::Simple when I suggested looking at the test <http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/removeEOL.pl> as an example. > Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRef.pl:47 > +sub equalArrays(\@\@) > +{ > + my @array1 = @{ shift() }; > + my @array2 = @{ shift() }; > + return 0 if ($#array1 != $#array2); > + > + for(my $i = 0; $i <= $#array1; ++$i) { > + if ($array1[$i] ne $array2[$i]) { > + return 0; > + } > + } > + return 1; > +} As aforementioned above, I suggest we use Test::More::is_deeply() instead of implemented our own array equality function as the former provides fails with verbose output when there is a difference between the specified arrays. 952767 10 217476 nick.diego 2013-11-20 13:52:44 -0800 Created attachment 217476 Patch 952770 11 nick.diego 2013-11-20 13:58:55 -0800 (In reply to comment #8) > Created an attachment (id=217337) [details] > Patch (In reply to comment #9) > (From update of attachment 217337 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=217337&action=review > > This patch is close. I'm r-'ing this patch since we should extract the bug fix into a separate bug and patch. See my reasoning below for more details. > > > Tools/ChangeLog:20 > > + (checkForArgumentAndRemoveFromArrayRef): Bugfix: It was removing wrong > > + elements when there were more then one occurrence of that argument. > > + E.g: Checking for 'a' in {a, b, a, c}, the resulting array would be > > + {b, a}, when it should be {b, c}. > > Please extract this fix into a separate bug and patch. In general, a patch should represent a single bug fix. The advantage of this approach is that it makes it straightforward to track down a regression and/or revert a change set without inadvertently blaming or reverting code that wasn't the cause of a regression. > Just sent a new patch only without the bug fix and filed a new bug (https://bugs.webkit.org/show_bug.cgi?id=124676) to address the bug separately as you suggested. > > Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRef.pl:1 > > +#!/usr/bin/perl > > Please add the -w argument to enable warning diagnostics: #!/usr/bin/perl -w > > > Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRef.pl:26 > > +use strict; > > Please include the warnings module: use warnings; > > > Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRef.pl:27 > > +use Test::Simple tests => 4; > > I suggest we use module Test::More instead of Test::Simple because it exposes additional assertion routines, such as is_deeply(). The assertion routine is_deeply() can compare complex structures, including arrays, and print where the structures differ (if they do). Then we don't need to implement a custom array equality function. See <http://search.cpan.org/~rjbs/Test-Simple-1.001002/lib/Test/More.pm> for more details. > > I didn't mean to imply that you should use Test::Simple when I suggested looking at the test <http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/removeEOL.pl> as an example. > > > Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRef.pl:47 > > +sub equalArrays(\@\@) > > +{ > > + my @array1 = @{ shift() }; > > + my @array2 = @{ shift() }; > > + return 0 if ($#array1 != $#array2); > > + > > + for(my $i = 0; $i <= $#array1; ++$i) { > > + if ($array1[$i] ne $array2[$i]) { > > + return 0; > > + } > > + } > > + return 1; > > +} > > As aforementioned above, I suggest we use Test::More::is_deeply() instead of implemented our own array equality function as the former provides fails with verbose output when there is a difference between the specified arrays. Sounds good, I'll do that. thanks 952872 12 217476 dbates 2013-11-20 17:12:22 -0800 Comment on attachment 217476 Patch Thank you Nick for iterating on this patch. 952883 13 217476 commit-queue 2013-11-20 17:38:38 -0800 Comment on attachment 217476 Patch Clearing flags on attachment: 217476 Committed r159599: <http://trac.webkit.org/changeset/159599> 952884 14 commit-queue 2013-11-20 17:38:40 -0800 All reviewed patches have been landed. Closing bug. 952937 15 rniwa 2013-11-20 22:05:04 -0800 After this patch, I'm getting errors like the one below everywhere: server:git-webkit rniwa$ Tools/Scripts/run-webkit-tests --debug LayoutTests/fast/dom LayoutTests/fast/html LayoutTests/fast/forms LayoutTests/svg LayoutTests/html5lib/ Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 851. Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 852. Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 851. Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 852. Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 851. Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 852. Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 851. Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 852. Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 851. Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 852. Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 851. Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 852. We're also seeing them on various builders on build.webkit.org. Please fix it ASAP. 953065 16 ossy 2013-11-21 06:39:19 -0800 (In reply to comment #15) > After this patch, I'm getting errors like the one below everywhere: > server:git-webkit rniwa$ Tools/Scripts/run-webkit-tests --debug LayoutTests/fast/dom LayoutTests/fast/html LayoutTests/fast/forms LayoutTests/svg LayoutTests/html5lib/ > Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 851. > Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 852. > Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 851. > Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 852. > Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 851. > Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 852. > Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 851. > Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 852. > Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 851. > Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 852. > Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 851. > Use of uninitialized value in splice at /Volumes/Data/git-webkit/Tools/Scripts/webkitdirs.pm line 852. > > We're also seeing them on various builders on build.webkit.org. > > Please fix it ASAP. fixed in https://trac.webkit.org/changeset/159616 217307 2013-11-19 09:52:41 -0800 2013-11-19 10:01:00 -0800 Patch bug-124581-20131119140412.patch text/plain 5590 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NTA0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzJkZmJmMmZiOWViOWM5NmE2M2NhZjE1MWQzZDIzZjlh Y2NmNjU0OS4uY2QzZWQxNzkwZmQ0N2IyMDgxMzZhN2U1MjJmYmM4YTQyYmEyYmJjNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEzLTExLTE5ICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3Nz YS5vcmc+CisKKyAgICAgICAgTW9kaWZ5IHdlYmtpdGRpcnMgZG8gcmV1c2UgY2hlY2tGb3JBcmd1 bWVudEFuZFJlbW92ZUZyb21BUkdWCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjQ1ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNb2RpZmllZCBzb21lIHN1YnJvdXRpbmVzIHdlcmUgcmVwbGljYXRpbmcg Y29kZSBmcm9tIGNoZWNrRm9yQXJndW1lbnQqKgorICAgICAgICBmdW5jdGlvbnMgaW5zdGVhZCBv ZiByZXVzaW5nIGl0IGFzIGl0J3MgYmVpbmcgZG9uZSBieSBhbGwgb3RoZXIgZnVuY3Rpb25zLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoZGV0ZXJtaW5lWGNv ZGVTREspOgorICAgICAgICAoZGV0ZXJtaW5lUGFzc2VkQ29uZmlndXJhdGlvbik6CisgICAgICAg IChkZXRlcm1pbmVQYXNzZWRBcmNoaXRlY3R1cmUpOgorICAgICAgICAoY2hlY2tGb3JBcmd1bWVu dEFuZFJlbW92ZUZyb21BUkdWKToKKyAgICAgICAgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVG cm9tQVJHVkdldHRpbmdWYWx1ZSk6IEFkZGVkLgorICAgICAgICAoY2hlY2tGb3JBcmd1bWVudEFu ZFJlbW92ZUZyb21BcnJheVJlZik6IEZpeGVzIGEgYnVnIGluIGVsZW1lbnRzIHJlbW92YWwuCisK KwogMjAxMy0xMS0xOSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAg ICBZZXQgYW5vdGhlciBidWlsZCBmaXguIEp1c3QgYWxsb3cgYW55IGNoYXJhY3Rlci4KZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQppbmRleCBlMmE3Y2M1N2M1MjIzNTA3YjdiNjRhYjZiMmJmZDVkNDM0MTZiYmQ4Li4w ZWQxNTBmOWE2OGNhYmYzYjE3MjQxN2FkZWE0MWY1MWMzZGI5OGNkIDEwMDc1NQotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt CkBAIC0zODksMTggKzM4OSwxNCBAQCBzdWIgYXJndW1lbnRzRm9yQ29uZmlndXJhdGlvbigpCiBz dWIgZGV0ZXJtaW5lWGNvZGVTREsKIHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCAkeGNvZGVTREs7 Ci0gICAgZm9yIChteSAkaSA9IDA7ICRpIDw9ICQjQVJHVjsgJGkrKykgewotICAgICAgICBteSAk b3B0ID0gJEFSR1ZbJGldOwotICAgICAgICBpZiAoJG9wdCA9fiAvXi0tc2RrJC9pKSB7Ci0gICAg ICAgICAgICBzcGxpY2UoQEFSR1YsICRpLCAxKTsKLSAgICAgICAgICAgICR4Y29kZVNESyA9IHNw bGljZShAQVJHViwgJGksIDEpOwotICAgICAgICB9IGVsc2lmICgkb3B0ID1+IC9eLS1kZXZpY2Uk L2kpIHsKLSAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwotICAgICAgICAgICAgJHhj b2RlU0RLID0gJ2lwaG9uZW9zLmludGVybmFsJzsKLSAgICAgICAgfSBlbHNpZiAoJG9wdCA9fiAv Xi0tc2ltKHVsYXRvcik/L2kpIHsKLSAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwot ICAgICAgICAgICAgJHhjb2RlU0RLID0gJ2lwaG9uZXNpbXVsYXRvcic7Ci0gICAgICAgIH0KKyAg ICBteSAkc2RrOworICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1ZHZXR0 aW5nVmFsdWUoJy0tc2RrJywgXCRzZGspKSB7CisgICAgICAgICR4Y29kZVNESyA9ICRzZGs7Cisg ICAgfSBlbHNpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCctLWRldmljZScp KSB7CisgICAgICAgICR4Y29kZVNESyA9ICdpcGhvbmVvcy5pbnRlcm5hbCc7CisgICAgfSBlbHNp ZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCctLXNpbScpIHx8CisgICAgICAg IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVignLS1zaW11bGF0b3InKSkgeworICAg ICAgICAkeGNvZGVTREsgPSAnaXBob25lc2ltdWxhdG9yJzsKICAgICB9CiB9CiAKQEAgLTYxMywy OSArNjA5LDE3IEBAIHN1YiBkZXRlcm1pbmVQYXNzZWRDb25maWd1cmF0aW9uCiB7CiAgICAgcmV0 dXJuIGlmICRzZWFyY2hlZEZvclBhc3NlZENvbmZpZ3VyYXRpb247CiAgICAgJHNlYXJjaGVkRm9y UGFzc2VkQ29uZmlndXJhdGlvbiA9IDE7CisgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSB1bmRl ZjsKIAotICAgIGZvciBteSAkaSAoMCAuLiAkI0FSR1YpIHsKLSAgICAgICAgbXkgJG9wdCA9ICRB UkdWWyRpXTsKLSAgICAgICAgaWYgKCRvcHQgPX4gL14tLWRlYnVnJC9pKSB7Ci0gICAgICAgICAg ICBzcGxpY2UoQEFSR1YsICRpLCAxKTsKLSAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9u ID0gIkRlYnVnIjsKLSAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfV2luQ2Fp cm8iIGlmIChpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7Ci0gICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKCRvcHQgPX4gL14tLXJlbGVhc2UkL2kpIHsKLSAgICAg ICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwotICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3Vy YXRpb24gPSAiUmVsZWFzZSI7Ci0gICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAuPSAi X1dpbkNhaXJvIiBpZiAoaXNXaW5DYWlybygpICYmIGlzQ3lnd2luKCkpOwotICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIGlmICgkb3B0ID1+IC9eLS1wcm9maWwoZXxpbmcp JC9pKSB7Ci0gICAgICAgICAgICBzcGxpY2UoQEFSR1YsICRpLCAxKTsKLSAgICAgICAgICAgICRw YXNzZWRDb25maWd1cmF0aW9uID0gIlByb2ZpbGluZyI7Ci0gICAgICAgICAgICAkcGFzc2VkQ29u ZmlndXJhdGlvbiAuPSAiX1dpbkNhaXJvIiBpZiAoaXNXaW5DYWlybygpICYmIGlzQ3lnd2luKCkp OwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CisgICAgaWYgKGNoZWNrRm9yQXJndW1l bnRBbmRSZW1vdmVGcm9tQVJHVignLS1kZWJ1ZycpKSB7CisgICAgICAgICRwYXNzZWRDb25maWd1 cmF0aW9uID0gIkRlYnVnIjsKKyAgICB9IGVsc2lmKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVG cm9tQVJHVignLS1yZWxlYXNlJykpIHsKKyAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAi UmVsZWFzZSI7CisgICAgfSBlbHNpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdW KCctLXByb2ZpbGUnKSB8fCBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoJy0tcHJv ZmlsaW5nJykpIHsKKyAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAiUHJvZmlsaW5nIjsK ICAgICB9Ci0gICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSB1bmRlZjsKKworICAgICRwYXNzZWRD b25maWd1cmF0aW9uIC49ICJfV2luQ2Fpcm8iIGlmIChkZWZpbmVkKCRwYXNzZWRDb25maWd1cmF0 aW9uKSAmJiBpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7CiB9CiAKIHN1YiBwYXNzZWRDb25m aWd1cmF0aW9uCkBAIC02NjUsMTggKzY0OSwxMyBAQCBzdWIgZGV0ZXJtaW5lUGFzc2VkQXJjaGl0 ZWN0dXJlCiAgICAgcmV0dXJuIGlmICRzZWFyY2hlZEZvclBhc3NlZEFyY2hpdGVjdHVyZTsKICAg ICAkc2VhcmNoZWRGb3JQYXNzZWRBcmNoaXRlY3R1cmUgPSAxOwogCi0gICAgZm9yIG15ICRpICgw IC4uICQjQVJHVikgewotICAgICAgICBteSAkb3B0ID0gJEFSR1ZbJGldOwotICAgICAgICBpZiAo JG9wdCA9fiAvXi0tMzItYml0JC9pKSB7Ci0gICAgICAgICAgICBzcGxpY2UoQEFSR1YsICRpLCAx KTsKLSAgICAgICAgICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKLSAgICAgICAgICAgICAg ICAkcGFzc2VkQXJjaGl0ZWN0dXJlID0gYGFyY2hgOwotICAgICAgICAgICAgICAgIGNob21wICRw YXNzZWRBcmNoaXRlY3R1cmU7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm47Cisg ICAgJHBhc3NlZEFyY2hpdGVjdHVyZSA9IHVuZGVmOworICAgIGlmIChjaGVja0ZvckFyZ3VtZW50 QW5kUmVtb3ZlRnJvbUFSR1YoJy0tMzItYml0JykpIHsKKyAgICAgICAgaWYgKGlzQXBwbGVNYWNX ZWJLaXQoKSkgeworICAgICAgICAgICAgJHBhc3NlZEFyY2hpdGVjdHVyZSA9IGBhcmNoYDsKKyAg ICAgICAgICAgIGNob21wICRwYXNzZWRBcmNoaXRlY3R1cmU7CiAgICAgICAgIH0KICAgICB9Ci0g ICAgJHBhc3NlZEFyY2hpdGVjdHVyZSA9IHVuZGVmOwogfQogCiBzdWIgcGFzc2VkQXJjaGl0ZWN0 dXJlCkBAIC04NTgsMTIgKzgzNywyMSBAQCBzdWIgY29tbWFuZEV4aXN0cygkKQogICAgIHJldHVy biBgJGNvbW1hbmQgLS12ZXJzaW9uIDI+ICRkZXZudWxsYDsKIH0KIAotc3ViIGNoZWNrRm9yQXJn dW1lbnRBbmRSZW1vdmVGcm9tQVJHVgorc3ViIGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9t QVJHVigkKQogewogICAgIG15ICRhcmdUb0NoZWNrID0gc2hpZnQ7CiAgICAgcmV0dXJuIGNoZWNr Rm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQXJyYXlSZWYoJGFyZ1RvQ2hlY2ssIFxAQVJHVik7CiB9 CiAKK3N1YiBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1ZHZXR0aW5nVmFsdWUoJCQp Cit7CisgICAgbXkgKCRhcmdUb0NoZWNrLCAkdmFsdWVSZWYpID0gQF87CisgICAgbXkgQG1hdGNo aW5nSW5kaWNlcyA9IGZpbmRNYXRjaGluZ0FyZ3VtZW50cygkYXJnVG9DaGVjaywgXEBBUkdWKTsK KyAgICByZXR1cm4gMCB1bmxlc3MgKCQjbWF0Y2hpbmdJbmRpY2VzICE9IDEpOworICAgIHNwbGlj ZShAQVJHViwgJG1hdGNoaW5nSW5kaWNlc1swXSwgMSk7CisgICAgcmV0dXJuICQkdmFsdWVSZWYg PSBzcGxpY2UoQEFSR1YsICRtYXRjaGluZ0luZGljZXNbMF0sIDEpOworfQorCiBzdWIgZmluZE1h dGNoaW5nQXJndW1lbnRzKCQkKQogewogICAgIG15ICgkYXJnVG9DaGVjaywgJGFycmF5UmVmKSA9 IEBfOwpAQCAtODg4LDggKzg3Niw5IEBAIHN1YiBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJv bUFycmF5UmVmCiB7CiAgICAgbXkgKCRhcmdUb0NoZWNrLCAkYXJyYXlSZWYpID0gQF87CiAgICAg bXkgQGluZGljZXNUb1JlbW92ZSA9IGZpbmRNYXRjaGluZ0FyZ3VtZW50cygkYXJnVG9DaGVjaywg JGFycmF5UmVmKTsKKyAgICBteSAkcmVtb3ZlT2Zmc2V0ID0gMDsKICAgICBmb3JlYWNoIG15ICRp bmRleCAoQGluZGljZXNUb1JlbW92ZSkgewotICAgICAgICBzcGxpY2UoQCRhcnJheVJlZiwgJGlu ZGV4LCAxKTsKKyAgICAgICAgc3BsaWNlKEAkYXJyYXlSZWYsICRpbmRleCAtICRyZW1vdmVPZmZz ZXQrKywgMSk7CiAgICAgfQogICAgIHJldHVybiBzY2FsYXIgQGluZGljZXNUb1JlbW92ZSA+IDA7 CiB9Cg== 217308 2013-11-19 10:01:12 -0800 2013-11-19 11:40:12 -0800 Patch bug-124581-20131119141242.patch text/plain 5580 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NTA0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzJkZmJmMmZiOWViOWM5NmE2M2NhZjE1MWQzZDIzZjlh Y2NmNjU0OS4uOTMyNTYwMTlhM2M4MGZkMDhkYWE1YzYxM2IwMDliNzNhOWZkYjZjMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEzLTExLTE5ICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3Nz YS5vcmc+CisKKyAgICAgICAgTW9kaWZ5IHdlYmtpdGRpcnMgdG8gcmV1c2UgY2hlY2tGb3JBcmd1 bWVudEFuZFJlbW92ZUZyb21BUkdWCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjQ1ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBTb21lIHN1YnJvdXRpbmVzIGFyZSByZXBsaWNhdGluZyBjb2RlIGZyb20g Y2hlY2tGb3JBcmd1bWVudCoqCisgICAgICAgIGZ1bmN0aW9ucyBpbnN0ZWFkIG9mIHJldXNpbmcg dGhlbSBhcyBpdCdzIGJlaW5nIGRvbmUgYnkgYWxsIG90aGVyIGZ1bmN0aW9ucy4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGRldGVybWluZVhjb2RlU0RLKToK KyAgICAgICAgKGRldGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24pOgorICAgICAgICAoZGV0ZXJt aW5lUGFzc2VkQXJjaGl0ZWN0dXJlKToKKyAgICAgICAgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1v dmVGcm9tQVJHVik6CisgICAgICAgIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1ZH ZXR0aW5nVmFsdWUpOiBBZGRlZC4KKyAgICAgICAgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVG cm9tQXJyYXlSZWYpOiBGaXhlcyBhIGJ1ZyBpbiBlbGVtZW50cyByZW1vdmFsLgorCiAyMDEzLTEx LTE5ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFlldCBhbm90 aGVyIGJ1aWxkIGZpeC4gSnVzdCBhbGxvdyBhbnkgY2hhcmFjdGVyLgpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmlu ZGV4IGUyYTdjYzU3YzUyMjM1MDdiN2I2NGFiNmIyYmZkNWQ0MzQxNmJiZDguLjBlZDE1MGY5YTY4 Y2FiZjNiMTcyNDE3YWRlYTQxZjUxYzNkYjk4Y2QgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTM4OSwx OCArMzg5LDE0IEBAIHN1YiBhcmd1bWVudHNGb3JDb25maWd1cmF0aW9uKCkKIHN1YiBkZXRlcm1p bmVYY29kZVNESwogewogICAgIHJldHVybiBpZiBkZWZpbmVkICR4Y29kZVNESzsKLSAgICBmb3Ig KG15ICRpID0gMDsgJGkgPD0gJCNBUkdWOyAkaSsrKSB7Ci0gICAgICAgIG15ICRvcHQgPSAkQVJH VlskaV07Ci0gICAgICAgIGlmICgkb3B0ID1+IC9eLS1zZGskL2kpIHsKLSAgICAgICAgICAgIHNw bGljZShAQVJHViwgJGksIDEpOwotICAgICAgICAgICAgJHhjb2RlU0RLID0gc3BsaWNlKEBBUkdW LCAkaSwgMSk7Ci0gICAgICAgIH0gZWxzaWYgKCRvcHQgPX4gL14tLWRldmljZSQvaSkgewotICAg ICAgICAgICAgc3BsaWNlKEBBUkdWLCAkaSwgMSk7Ci0gICAgICAgICAgICAkeGNvZGVTREsgPSAn aXBob25lb3MuaW50ZXJuYWwnOwotICAgICAgICB9IGVsc2lmICgkb3B0ID1+IC9eLS1zaW0odWxh dG9yKT8vaSkgewotICAgICAgICAgICAgc3BsaWNlKEBBUkdWLCAkaSwgMSk7Ci0gICAgICAgICAg ICAkeGNvZGVTREsgPSAnaXBob25lc2ltdWxhdG9yJzsKLSAgICAgICAgfQorICAgIG15ICRzZGs7 CisgICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVkdldHRpbmdWYWx1ZSgn LS1zZGsnLCBcJHNkaykpIHsKKyAgICAgICAgJHhjb2RlU0RLID0gJHNkazsKKyAgICB9IGVsc2lm IChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoJy0tZGV2aWNlJykpIHsKKyAgICAg ICAgJHhjb2RlU0RLID0gJ2lwaG9uZW9zLmludGVybmFsJzsKKyAgICB9IGVsc2lmIChjaGVja0Zv ckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoJy0tc2ltJykgfHwKKyAgICAgICAgY2hlY2tGb3JB cmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCctLXNpbXVsYXRvcicpKSB7CisgICAgICAgICR4Y29k ZVNESyA9ICdpcGhvbmVzaW11bGF0b3InOwogICAgIH0KIH0KIApAQCAtNjEzLDI5ICs2MDksMTcg QEAgc3ViIGRldGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24KIHsKICAgICByZXR1cm4gaWYgJHNl YXJjaGVkRm9yUGFzc2VkQ29uZmlndXJhdGlvbjsKICAgICAkc2VhcmNoZWRGb3JQYXNzZWRDb25m aWd1cmF0aW9uID0gMTsKKyAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9IHVuZGVmOwogCi0gICAg Zm9yIG15ICRpICgwIC4uICQjQVJHVikgewotICAgICAgICBteSAkb3B0ID0gJEFSR1ZbJGldOwot ICAgICAgICBpZiAoJG9wdCA9fiAvXi0tZGVidWckL2kpIHsKLSAgICAgICAgICAgIHNwbGljZShA QVJHViwgJGksIDEpOwotICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAiRGVidWci OwotICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gIl9XaW5DYWlybyIgaWYgKGlz V2luQ2Fpcm8oKSAmJiBpc0N5Z3dpbigpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg fQotICAgICAgICBpZiAoJG9wdCA9fiAvXi0tcmVsZWFzZSQvaSkgewotICAgICAgICAgICAgc3Bs aWNlKEBBUkdWLCAkaSwgMSk7Ci0gICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJS ZWxlYXNlIjsKLSAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfV2luQ2Fpcm8i IGlmIChpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIH0KLSAgICAgICAgaWYgKCRvcHQgPX4gL14tLXByb2ZpbChlfGluZykkL2kpIHsKLSAg ICAgICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwotICAgICAgICAgICAgJHBhc3NlZENvbmZp Z3VyYXRpb24gPSAiUHJvZmlsaW5nIjsKLSAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9u IC49ICJfV2luQ2Fpcm8iIGlmIChpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7Ci0gICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92 ZUZyb21BUkdWKCctLWRlYnVnJykpIHsKKyAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAi RGVidWciOworICAgIH0gZWxzaWYoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCct LXJlbGVhc2UnKSkgeworICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJSZWxlYXNlIjsK KyAgICB9IGVsc2lmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoJy0tcHJvZmls ZScpIHx8IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVignLS1wcm9maWxpbmcnKSkg eworICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJQcm9maWxpbmciOwogICAgIH0KLSAg ICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9IHVuZGVmOworCisgICAgJHBhc3NlZENvbmZpZ3VyYXRp b24gLj0gIl9XaW5DYWlybyIgaWYgKGRlZmluZWQoJHBhc3NlZENvbmZpZ3VyYXRpb24pICYmIGlz V2luQ2Fpcm8oKSAmJiBpc0N5Z3dpbigpKTsKIH0KIAogc3ViIHBhc3NlZENvbmZpZ3VyYXRpb24K QEAgLTY2NSwxOCArNjQ5LDEzIEBAIHN1YiBkZXRlcm1pbmVQYXNzZWRBcmNoaXRlY3R1cmUKICAg ICByZXR1cm4gaWYgJHNlYXJjaGVkRm9yUGFzc2VkQXJjaGl0ZWN0dXJlOwogICAgICRzZWFyY2hl ZEZvclBhc3NlZEFyY2hpdGVjdHVyZSA9IDE7CiAKLSAgICBmb3IgbXkgJGkgKDAgLi4gJCNBUkdW KSB7Ci0gICAgICAgIG15ICRvcHQgPSAkQVJHVlskaV07Ci0gICAgICAgIGlmICgkb3B0ID1+IC9e LS0zMi1iaXQkL2kpIHsKLSAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwotICAgICAg ICAgICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewotICAgICAgICAgICAgICAgICRwYXNzZWRB cmNoaXRlY3R1cmUgPSBgYXJjaGA7Ci0gICAgICAgICAgICAgICAgY2hvbXAgJHBhc3NlZEFyY2hp dGVjdHVyZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybjsKKyAgICAkcGFzc2Vk QXJjaGl0ZWN0dXJlID0gdW5kZWY7CisgICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVG cm9tQVJHVignLS0zMi1iaXQnKSkgeworICAgICAgICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7 CisgICAgICAgICAgICAkcGFzc2VkQXJjaGl0ZWN0dXJlID0gYGFyY2hgOworICAgICAgICAgICAg Y2hvbXAgJHBhc3NlZEFyY2hpdGVjdHVyZTsKICAgICAgICAgfQogICAgIH0KLSAgICAkcGFzc2Vk QXJjaGl0ZWN0dXJlID0gdW5kZWY7CiB9CiAKIHN1YiBwYXNzZWRBcmNoaXRlY3R1cmUKQEAgLTg1 OCwxMiArODM3LDIxIEBAIHN1YiBjb21tYW5kRXhpc3RzKCQpCiAgICAgcmV0dXJuIGAkY29tbWFu ZCAtLXZlcnNpb24gMj4gJGRldm51bGxgOwogfQogCi1zdWIgY2hlY2tGb3JBcmd1bWVudEFuZFJl bW92ZUZyb21BUkdWCitzdWIgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCQpCiB7 CiAgICAgbXkgJGFyZ1RvQ2hlY2sgPSBzaGlmdDsKICAgICByZXR1cm4gY2hlY2tGb3JBcmd1bWVu dEFuZFJlbW92ZUZyb21BcnJheVJlZigkYXJnVG9DaGVjaywgXEBBUkdWKTsKIH0KIAorc3ViIGNo ZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVkdldHRpbmdWYWx1ZSgkJCkKK3sKKyAgICBt eSAoJGFyZ1RvQ2hlY2ssICR2YWx1ZVJlZikgPSBAXzsKKyAgICBteSBAbWF0Y2hpbmdJbmRpY2Vz ID0gZmluZE1hdGNoaW5nQXJndW1lbnRzKCRhcmdUb0NoZWNrLCBcQEFSR1YpOworICAgIHJldHVy biAwIHVubGVzcyAoJCNtYXRjaGluZ0luZGljZXMgIT0gMSk7CisgICAgc3BsaWNlKEBBUkdWLCAk bWF0Y2hpbmdJbmRpY2VzWzBdLCAxKTsKKyAgICByZXR1cm4gJCR2YWx1ZVJlZiA9IHNwbGljZShA QVJHViwgJG1hdGNoaW5nSW5kaWNlc1swXSwgMSk7Cit9CisKIHN1YiBmaW5kTWF0Y2hpbmdBcmd1 bWVudHMoJCQpCiB7CiAgICAgbXkgKCRhcmdUb0NoZWNrLCAkYXJyYXlSZWYpID0gQF87CkBAIC04 ODgsOCArODc2LDkgQEAgc3ViIGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQXJyYXlSZWYK IHsKICAgICBteSAoJGFyZ1RvQ2hlY2ssICRhcnJheVJlZikgPSBAXzsKICAgICBteSBAaW5kaWNl c1RvUmVtb3ZlID0gZmluZE1hdGNoaW5nQXJndW1lbnRzKCRhcmdUb0NoZWNrLCAkYXJyYXlSZWYp OworICAgIG15ICRyZW1vdmVPZmZzZXQgPSAwOwogICAgIGZvcmVhY2ggbXkgJGluZGV4IChAaW5k aWNlc1RvUmVtb3ZlKSB7Ci0gICAgICAgIHNwbGljZShAJGFycmF5UmVmLCAkaW5kZXgsIDEpOwor ICAgICAgICBzcGxpY2UoQCRhcnJheVJlZiwgJGluZGV4IC0gJHJlbW92ZU9mZnNldCsrLCAxKTsK ICAgICB9CiAgICAgcmV0dXJuIHNjYWxhciBAaW5kaWNlc1RvUmVtb3ZlID4gMDsKIH0K 217313 2013-11-19 11:40:18 -0800 2013-11-19 14:50:47 -0800 Patch bug-124581-20131119155150.patch text/plain 5772 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NTA5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzJkZmJmMmZiOWViOWM5NmE2M2NhZjE1MWQzZDIzZjlh Y2NmNjU0OS4uMTUxMmEyNjI2ZmZhNGJmNWZhMzk4M2VmZWYxMzAxYTBlYTU4NDdiYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEzLTExLTE5ICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3Nz YS5vcmc+CisKKyAgICAgICAgTW9kaWZ5IHdlYmtpdGRpcnMgdG8gcmV1c2UgY2hlY2tGb3JBcmd1 bWVudEFuZFJlbW92ZUZyb21BUkdWCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjQ1ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBTb21lIHN1YnJvdXRpbmVzIGFyZSByZXBsaWNhdGluZyBjb2RlIGZyb20g Y2hlY2tGb3JBcmd1bWVudCoqCisgICAgICAgIGZ1bmN0aW9ucyBpbnN0ZWFkIG9mIHJldXNpbmcg dGhlbSBhcyBpcyBiZWluZyBkb25lIGJ5IGFsbCBvdGhlciBmdW5jdGlvbnMuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVYY29kZVNESyk6Cisg ICAgICAgIChkZXRlcm1pbmVQYXNzZWRDb25maWd1cmF0aW9uKToKKyAgICAgICAgKGRldGVybWlu ZVBhc3NlZEFyY2hpdGVjdHVyZSk6CisgICAgICAgIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3Zl RnJvbUFSR1YpOgorICAgICAgICAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWR2V0 dGluZ1ZhbHVlKTogQWRkZWQuCisgICAgICAgIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJv bUFycmF5UmVmKTogQnVnZml4OiBJdCB3YXMgcmVtb3Zpbmcgd3JvbmcKKyAgICAgICAgZWxlbWVu dHMgd2hlbiB0aGVyZSB3ZXJlIG1vcmUgdGhlbiBvbmUgb2NjdXJyZW5jZSBvZiB0aGF0IGFyZ3Vt ZW50LgorICAgICAgICBFLmc6IENoZWNraW5nIGZvciAnYScgaW4ge2EsIGIsIGEsIGN9LCB0aGUg cmVzdWx0aW5nIGFycmF5IHdvdWxkIGJlCisgICAgICAgIHtiLCBhfSwgd2hlbiBpdCBzaG91bGQg YmUge2IsIGN9LgorCiAyMDEzLTExLTE5ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3Jn PgogCiAgICAgICAgIFlldCBhbm90aGVyIGJ1aWxkIGZpeC4gSnVzdCBhbGxvdyBhbnkgY2hhcmFj dGVyLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGUyYTdjYzU3YzUyMjM1MDdiN2I2NGFiNmIyYmZkNWQ0 MzQxNmJiZDguLjBlZDE1MGY5YTY4Y2FiZjNiMTcyNDE3YWRlYTQxZjUxYzNkYjk4Y2QgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KQEAgLTM4OSwxOCArMzg5LDE0IEBAIHN1YiBhcmd1bWVudHNGb3JDb25maWd1 cmF0aW9uKCkKIHN1YiBkZXRlcm1pbmVYY29kZVNESwogewogICAgIHJldHVybiBpZiBkZWZpbmVk ICR4Y29kZVNESzsKLSAgICBmb3IgKG15ICRpID0gMDsgJGkgPD0gJCNBUkdWOyAkaSsrKSB7Ci0g ICAgICAgIG15ICRvcHQgPSAkQVJHVlskaV07Ci0gICAgICAgIGlmICgkb3B0ID1+IC9eLS1zZGsk L2kpIHsKLSAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwotICAgICAgICAgICAgJHhj b2RlU0RLID0gc3BsaWNlKEBBUkdWLCAkaSwgMSk7Ci0gICAgICAgIH0gZWxzaWYgKCRvcHQgPX4g L14tLWRldmljZSQvaSkgewotICAgICAgICAgICAgc3BsaWNlKEBBUkdWLCAkaSwgMSk7Ci0gICAg ICAgICAgICAkeGNvZGVTREsgPSAnaXBob25lb3MuaW50ZXJuYWwnOwotICAgICAgICB9IGVsc2lm ICgkb3B0ID1+IC9eLS1zaW0odWxhdG9yKT8vaSkgewotICAgICAgICAgICAgc3BsaWNlKEBBUkdW LCAkaSwgMSk7Ci0gICAgICAgICAgICAkeGNvZGVTREsgPSAnaXBob25lc2ltdWxhdG9yJzsKLSAg ICAgICAgfQorICAgIG15ICRzZGs7CisgICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVG cm9tQVJHVkdldHRpbmdWYWx1ZSgnLS1zZGsnLCBcJHNkaykpIHsKKyAgICAgICAgJHhjb2RlU0RL ID0gJHNkazsKKyAgICB9IGVsc2lmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1Yo Jy0tZGV2aWNlJykpIHsKKyAgICAgICAgJHhjb2RlU0RLID0gJ2lwaG9uZW9zLmludGVybmFsJzsK KyAgICB9IGVsc2lmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoJy0tc2ltJykg fHwKKyAgICAgICAgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCctLXNpbXVsYXRv cicpKSB7CisgICAgICAgICR4Y29kZVNESyA9ICdpcGhvbmVzaW11bGF0b3InOwogICAgIH0KIH0K IApAQCAtNjEzLDI5ICs2MDksMTcgQEAgc3ViIGRldGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24K IHsKICAgICByZXR1cm4gaWYgJHNlYXJjaGVkRm9yUGFzc2VkQ29uZmlndXJhdGlvbjsKICAgICAk c2VhcmNoZWRGb3JQYXNzZWRDb25maWd1cmF0aW9uID0gMTsKKyAgICAkcGFzc2VkQ29uZmlndXJh dGlvbiA9IHVuZGVmOwogCi0gICAgZm9yIG15ICRpICgwIC4uICQjQVJHVikgewotICAgICAgICBt eSAkb3B0ID0gJEFSR1ZbJGldOwotICAgICAgICBpZiAoJG9wdCA9fiAvXi0tZGVidWckL2kpIHsK LSAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwotICAgICAgICAgICAgJHBhc3NlZENv bmZpZ3VyYXRpb24gPSAiRGVidWciOwotICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24g Lj0gIl9XaW5DYWlybyIgaWYgKGlzV2luQ2Fpcm8oKSAmJiBpc0N5Z3dpbigpKTsKLSAgICAgICAg ICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBpZiAoJG9wdCA9fiAvXi0tcmVsZWFzZSQv aSkgewotICAgICAgICAgICAgc3BsaWNlKEBBUkdWLCAkaSwgMSk7Ci0gICAgICAgICAgICAkcGFz c2VkQ29uZmlndXJhdGlvbiA9ICJSZWxlYXNlIjsKLSAgICAgICAgICAgICRwYXNzZWRDb25maWd1 cmF0aW9uIC49ICJfV2luQ2Fpcm8iIGlmIChpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7Ci0g ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKCRvcHQgPX4gL14tLXBy b2ZpbChlfGluZykkL2kpIHsKLSAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwotICAg ICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAiUHJvZmlsaW5nIjsKLSAgICAgICAgICAg ICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfV2luQ2Fpcm8iIGlmIChpc1dpbkNhaXJvKCkgJiYg aXNDeWd3aW4oKSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAgICBpZiAoY2hl Y2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCctLWRlYnVnJykpIHsKKyAgICAgICAgJHBh c3NlZENvbmZpZ3VyYXRpb24gPSAiRGVidWciOworICAgIH0gZWxzaWYoY2hlY2tGb3JBcmd1bWVu dEFuZFJlbW92ZUZyb21BUkdWKCctLXJlbGVhc2UnKSkgeworICAgICAgICAkcGFzc2VkQ29uZmln dXJhdGlvbiA9ICJSZWxlYXNlIjsKKyAgICB9IGVsc2lmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVt b3ZlRnJvbUFSR1YoJy0tcHJvZmlsZScpIHx8IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9t QVJHVignLS1wcm9maWxpbmcnKSkgeworICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJQ cm9maWxpbmciOwogICAgIH0KLSAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9IHVuZGVmOworCisg ICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gIl9XaW5DYWlybyIgaWYgKGRlZmluZWQoJHBhc3Nl ZENvbmZpZ3VyYXRpb24pICYmIGlzV2luQ2Fpcm8oKSAmJiBpc0N5Z3dpbigpKTsKIH0KIAogc3Vi IHBhc3NlZENvbmZpZ3VyYXRpb24KQEAgLTY2NSwxOCArNjQ5LDEzIEBAIHN1YiBkZXRlcm1pbmVQ YXNzZWRBcmNoaXRlY3R1cmUKICAgICByZXR1cm4gaWYgJHNlYXJjaGVkRm9yUGFzc2VkQXJjaGl0 ZWN0dXJlOwogICAgICRzZWFyY2hlZEZvclBhc3NlZEFyY2hpdGVjdHVyZSA9IDE7CiAKLSAgICBm b3IgbXkgJGkgKDAgLi4gJCNBUkdWKSB7Ci0gICAgICAgIG15ICRvcHQgPSAkQVJHVlskaV07Ci0g ICAgICAgIGlmICgkb3B0ID1+IC9eLS0zMi1iaXQkL2kpIHsKLSAgICAgICAgICAgIHNwbGljZShA QVJHViwgJGksIDEpOwotICAgICAgICAgICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewotICAg ICAgICAgICAgICAgICRwYXNzZWRBcmNoaXRlY3R1cmUgPSBgYXJjaGA7Ci0gICAgICAgICAgICAg ICAgY2hvbXAgJHBhc3NlZEFyY2hpdGVjdHVyZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAg IHJldHVybjsKKyAgICAkcGFzc2VkQXJjaGl0ZWN0dXJlID0gdW5kZWY7CisgICAgaWYgKGNoZWNr Rm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVignLS0zMi1iaXQnKSkgeworICAgICAgICBpZiAo aXNBcHBsZU1hY1dlYktpdCgpKSB7CisgICAgICAgICAgICAkcGFzc2VkQXJjaGl0ZWN0dXJlID0g YGFyY2hgOworICAgICAgICAgICAgY2hvbXAgJHBhc3NlZEFyY2hpdGVjdHVyZTsKICAgICAgICAg fQogICAgIH0KLSAgICAkcGFzc2VkQXJjaGl0ZWN0dXJlID0gdW5kZWY7CiB9CiAKIHN1YiBwYXNz ZWRBcmNoaXRlY3R1cmUKQEAgLTg1OCwxMiArODM3LDIxIEBAIHN1YiBjb21tYW5kRXhpc3RzKCQp CiAgICAgcmV0dXJuIGAkY29tbWFuZCAtLXZlcnNpb24gMj4gJGRldm51bGxgOwogfQogCi1zdWIg Y2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWCitzdWIgY2hlY2tGb3JBcmd1bWVudEFu ZFJlbW92ZUZyb21BUkdWKCQpCiB7CiAgICAgbXkgJGFyZ1RvQ2hlY2sgPSBzaGlmdDsKICAgICBy ZXR1cm4gY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BcnJheVJlZigkYXJnVG9DaGVjaywg XEBBUkdWKTsKIH0KIAorc3ViIGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVkdldHRp bmdWYWx1ZSgkJCkKK3sKKyAgICBteSAoJGFyZ1RvQ2hlY2ssICR2YWx1ZVJlZikgPSBAXzsKKyAg ICBteSBAbWF0Y2hpbmdJbmRpY2VzID0gZmluZE1hdGNoaW5nQXJndW1lbnRzKCRhcmdUb0NoZWNr LCBcQEFSR1YpOworICAgIHJldHVybiAwIHVubGVzcyAoJCNtYXRjaGluZ0luZGljZXMgIT0gMSk7 CisgICAgc3BsaWNlKEBBUkdWLCAkbWF0Y2hpbmdJbmRpY2VzWzBdLCAxKTsKKyAgICByZXR1cm4g JCR2YWx1ZVJlZiA9IHNwbGljZShAQVJHViwgJG1hdGNoaW5nSW5kaWNlc1swXSwgMSk7Cit9CisK IHN1YiBmaW5kTWF0Y2hpbmdBcmd1bWVudHMoJCQpCiB7CiAgICAgbXkgKCRhcmdUb0NoZWNrLCAk YXJyYXlSZWYpID0gQF87CkBAIC04ODgsOCArODc2LDkgQEAgc3ViIGNoZWNrRm9yQXJndW1lbnRB bmRSZW1vdmVGcm9tQXJyYXlSZWYKIHsKICAgICBteSAoJGFyZ1RvQ2hlY2ssICRhcnJheVJlZikg PSBAXzsKICAgICBteSBAaW5kaWNlc1RvUmVtb3ZlID0gZmluZE1hdGNoaW5nQXJndW1lbnRzKCRh cmdUb0NoZWNrLCAkYXJyYXlSZWYpOworICAgIG15ICRyZW1vdmVPZmZzZXQgPSAwOwogICAgIGZv cmVhY2ggbXkgJGluZGV4IChAaW5kaWNlc1RvUmVtb3ZlKSB7Ci0gICAgICAgIHNwbGljZShAJGFy cmF5UmVmLCAkaW5kZXgsIDEpOworICAgICAgICBzcGxpY2UoQCRhcnJheVJlZiwgJGluZGV4IC0g JHJlbW92ZU9mZnNldCsrLCAxKTsKICAgICB9CiAgICAgcmV0dXJuIHNjYWxhciBAaW5kaWNlc1Rv UmVtb3ZlID4gMDsKIH0K 217337 2013-11-19 14:50:53 -0800 2013-11-20 13:52:37 -0800 Patch bug-124581-20131119190225.patch text/plain 9378 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NTIyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTJlMjk5ZjUyMTViODEzZTU5ZDdjOGQ0ZWIxMmYyOWY3 M2FlYmQ5Yy4uOGM5ZDYzZjFiZWFkMzM3OWEzMmYzNjM1Mzc0NTkwMmJlZWY0MzRiYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDEzLTExLTE5ICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3Nz YS5vcmc+CisKKyAgICAgICAgTW9kaWZ5IHdlYmtpdGRpcnMgdG8gcmV1c2UgY2hlY2tGb3JBcmd1 bWVudEFuZFJlbW92ZUZyb21BUkdWCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjQ1ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBTb21lIHN1YnJvdXRpbmVzIGFyZSByZXBsaWNhdGluZyBjb2RlIGZyb20g Y2hlY2tGb3JBcmd1bWVudCoqCisgICAgICAgIGZ1bmN0aW9ucyBpbnN0ZWFkIG9mIHJldXNpbmcg dGhlbSBhcyBpcyBiZWluZyBkb25lIGJ5IGFsbCBvdGhlciBmdW5jdGlvbnMuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVYY29kZVNESyk6IEFk ZGVkLgorICAgICAgICAoZGV0ZXJtaW5lUGFzc2VkQ29uZmlndXJhdGlvbik6IEFkZGVkLgorICAg ICAgICAoZGV0ZXJtaW5lUGFzc2VkQXJjaGl0ZWN0dXJlKTogQWRkZWQuCisgICAgICAgIChjaGVj a0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YpOiBBZGRlZC4KKyAgICAgICAgKGNoZWNrRm9y QXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVkdldHRpbmdWYWx1ZSk6IEFkZGVkLgorICAgICAgICAo Y2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BcnJheVJlZik6IEJ1Z2ZpeDogSXQgd2FzIHJl bW92aW5nIHdyb25nCisgICAgICAgIGVsZW1lbnRzIHdoZW4gdGhlcmUgd2VyZSBtb3JlIHRoZW4g b25lIG9jY3VycmVuY2Ugb2YgdGhhdCBhcmd1bWVudC4KKyAgICAgICAgRS5nOiBDaGVja2luZyBm b3IgJ2EnIGluIHthLCBiLCBhLCBjfSwgdGhlIHJlc3VsdGluZyBhcnJheSB3b3VsZCBiZQorICAg ICAgICB7YiwgYX0sIHdoZW4gaXQgc2hvdWxkIGJlIHtiLCBjfS4KKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHBlcmwvd2Via2l0ZGlyc191bml0dGVzdC9jaGVja0ZvckFyZ3VtZW50QW5kUmVtb3Zl RnJvbUFycmF5UmVmLnBsOiBBZGRlZDsKKyAgICAgICAgVW5pdCB0ZXN0cyBmb3Igd2Via2l0ZGly czo6Y2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BcnJheVJlZiBmdW5jdGlvbi4KKwogMjAx My0xMS0xOSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xNTEzOTQ3OT4gUmVlbmFibGUgdGhlIEpTQyBPYmplY3RpdmUtQyBBUEkgdGVz dHMgb24gTW91bnRhaW4gTGlvbiBvbmNlIHRoZSBib3RzIGFyZSBydW5uaW5nIFhjb2RlIDUKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbQppbmRleCBlMmE3Y2M1N2M1MjIzNTA3YjdiNjRhYjZiMmJmZDVkNDM0MTZiYmQ4 Li5hYmJkNTlkMjBjYTA2ZmJiM2IzY2E0YTFkNWNhYTY2NGQxMWY2MmY4IDEwMDc1NQotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCkBAIC0zODksMTggKzM4OSwxNCBAQCBzdWIgYXJndW1lbnRzRm9yQ29uZmlndXJhdGlvbigp CiBzdWIgZGV0ZXJtaW5lWGNvZGVTREsKIHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCAkeGNvZGVT REs7Ci0gICAgZm9yIChteSAkaSA9IDA7ICRpIDw9ICQjQVJHVjsgJGkrKykgewotICAgICAgICBt eSAkb3B0ID0gJEFSR1ZbJGldOwotICAgICAgICBpZiAoJG9wdCA9fiAvXi0tc2RrJC9pKSB7Ci0g ICAgICAgICAgICBzcGxpY2UoQEFSR1YsICRpLCAxKTsKLSAgICAgICAgICAgICR4Y29kZVNESyA9 IHNwbGljZShAQVJHViwgJGksIDEpOwotICAgICAgICB9IGVsc2lmICgkb3B0ID1+IC9eLS1kZXZp Y2UkL2kpIHsKLSAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwotICAgICAgICAgICAg JHhjb2RlU0RLID0gJ2lwaG9uZW9zLmludGVybmFsJzsKLSAgICAgICAgfSBlbHNpZiAoJG9wdCA9 fiAvXi0tc2ltKHVsYXRvcik/L2kpIHsKLSAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGksIDEp OwotICAgICAgICAgICAgJHhjb2RlU0RLID0gJ2lwaG9uZXNpbXVsYXRvcic7Ci0gICAgICAgIH0K KyAgICBteSAkc2RrOworICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1ZH ZXR0aW5nVmFsdWUoIi0tc2RrIiwgXCRzZGspKSB7CisgICAgICAgICR4Y29kZVNESyA9ICRzZGs7 CisgICAgfSBlbHNpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLWRldmlj ZSIpKSB7CisgICAgICAgICR4Y29kZVNESyA9ICdpcGhvbmVvcy5pbnRlcm5hbCc7CisgICAgfSBl bHNpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLXNpbSIpIHx8CisgICAg ICAgIGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1zaW11bGF0b3IiKSkgewor ICAgICAgICAkeGNvZGVTREsgPSAnaXBob25lc2ltdWxhdG9yJzsKICAgICB9CiB9CiAKQEAgLTYx MywyOSArNjA5LDE3IEBAIHN1YiBkZXRlcm1pbmVQYXNzZWRDb25maWd1cmF0aW9uCiB7CiAgICAg cmV0dXJuIGlmICRzZWFyY2hlZEZvclBhc3NlZENvbmZpZ3VyYXRpb247CiAgICAgJHNlYXJjaGVk Rm9yUGFzc2VkQ29uZmlndXJhdGlvbiA9IDE7CisgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSB1 bmRlZjsKIAotICAgIGZvciBteSAkaSAoMCAuLiAkI0FSR1YpIHsKLSAgICAgICAgbXkgJG9wdCA9 ICRBUkdWWyRpXTsKLSAgICAgICAgaWYgKCRvcHQgPX4gL14tLWRlYnVnJC9pKSB7Ci0gICAgICAg ICAgICBzcGxpY2UoQEFSR1YsICRpLCAxKTsKLSAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0 aW9uID0gIkRlYnVnIjsKLSAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfV2lu Q2Fpcm8iIGlmIChpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7Ci0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKCRvcHQgPX4gL14tLXJlbGVhc2UkL2kpIHsKLSAg ICAgICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwotICAgICAgICAgICAgJHBhc3NlZENvbmZp Z3VyYXRpb24gPSAiUmVsZWFzZSI7Ci0gICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAu PSAiX1dpbkNhaXJvIiBpZiAoaXNXaW5DYWlybygpICYmIGlzQ3lnd2luKCkpOwotICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIGlmICgkb3B0ID1+IC9eLS1wcm9maWwoZXxp bmcpJC9pKSB7Ci0gICAgICAgICAgICBzcGxpY2UoQEFSR1YsICRpLCAxKTsKLSAgICAgICAgICAg ICRwYXNzZWRDb25maWd1cmF0aW9uID0gIlByb2ZpbGluZyI7Ci0gICAgICAgICAgICAkcGFzc2Vk Q29uZmlndXJhdGlvbiAuPSAiX1dpbkNhaXJvIiBpZiAoaXNXaW5DYWlybygpICYmIGlzQ3lnd2lu KCkpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CisgICAgaWYgKGNoZWNrRm9yQXJn dW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1kZWJ1ZyIpKSB7CisgICAgICAgICRwYXNzZWRDb25m aWd1cmF0aW9uID0gIkRlYnVnIjsKKyAgICB9IGVsc2lmKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1v dmVGcm9tQVJHVigiLS1yZWxlYXNlIikpIHsKKyAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24g PSAiUmVsZWFzZSI7CisgICAgfSBlbHNpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21B UkdWKCItLXByb2ZpbGUiKSB8fCBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0t cHJvZmlsaW5nIikpIHsKKyAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAiUHJvZmlsaW5n IjsKICAgICB9Ci0gICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSB1bmRlZjsKKworICAgICRwYXNz ZWRDb25maWd1cmF0aW9uIC49ICJfV2luQ2Fpcm8iIGlmIChkZWZpbmVkKCRwYXNzZWRDb25maWd1 cmF0aW9uKSAmJiBpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7CiB9CiAKIHN1YiBwYXNzZWRD b25maWd1cmF0aW9uCkBAIC02NjUsMTggKzY0OSwxMyBAQCBzdWIgZGV0ZXJtaW5lUGFzc2VkQXJj aGl0ZWN0dXJlCiAgICAgcmV0dXJuIGlmICRzZWFyY2hlZEZvclBhc3NlZEFyY2hpdGVjdHVyZTsK ICAgICAkc2VhcmNoZWRGb3JQYXNzZWRBcmNoaXRlY3R1cmUgPSAxOwogCi0gICAgZm9yIG15ICRp ICgwIC4uICQjQVJHVikgewotICAgICAgICBteSAkb3B0ID0gJEFSR1ZbJGldOwotICAgICAgICBp ZiAoJG9wdCA9fiAvXi0tMzItYml0JC9pKSB7Ci0gICAgICAgICAgICBzcGxpY2UoQEFSR1YsICRp LCAxKTsKLSAgICAgICAgICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKLSAgICAgICAgICAg ICAgICAkcGFzc2VkQXJjaGl0ZWN0dXJlID0gYGFyY2hgOwotICAgICAgICAgICAgICAgIGNob21w ICRwYXNzZWRBcmNoaXRlY3R1cmU7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm47 CisgICAgJHBhc3NlZEFyY2hpdGVjdHVyZSA9IHVuZGVmOworICAgIGlmIChjaGVja0ZvckFyZ3Vt ZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tMzItYml0IikpIHsKKyAgICAgICAgaWYgKGlzQXBwbGVN YWNXZWJLaXQoKSkgeworICAgICAgICAgICAgJHBhc3NlZEFyY2hpdGVjdHVyZSA9IGBhcmNoYDsK KyAgICAgICAgICAgIGNob21wICRwYXNzZWRBcmNoaXRlY3R1cmU7CiAgICAgICAgIH0KICAgICB9 Ci0gICAgJHBhc3NlZEFyY2hpdGVjdHVyZSA9IHVuZGVmOwogfQogCiBzdWIgcGFzc2VkQXJjaGl0 ZWN0dXJlCkBAIC04NTgsMTIgKzgzNywyMSBAQCBzdWIgY29tbWFuZEV4aXN0cygkKQogICAgIHJl dHVybiBgJGNvbW1hbmQgLS12ZXJzaW9uIDI+ICRkZXZudWxsYDsKIH0KIAotc3ViIGNoZWNrRm9y QXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVgorc3ViIGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVG cm9tQVJHVigkKQogewogICAgIG15ICRhcmdUb0NoZWNrID0gc2hpZnQ7CiAgICAgcmV0dXJuIGNo ZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQXJyYXlSZWYoJGFyZ1RvQ2hlY2ssIFxAQVJHVik7 CiB9CiAKK3N1YiBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1ZHZXR0aW5nVmFsdWUo JCQpCit7CisgICAgbXkgKCRhcmdUb0NoZWNrLCAkdmFsdWVSZWYpID0gQF87CisgICAgbXkgQG1h dGNoaW5nSW5kaWNlcyA9IGZpbmRNYXRjaGluZ0FyZ3VtZW50cygkYXJnVG9DaGVjaywgXEBBUkdW KTsKKyAgICByZXR1cm4gMCB1bmxlc3MgKCQjbWF0Y2hpbmdJbmRpY2VzICE9IDEpOworICAgIHNw bGljZShAQVJHViwgJG1hdGNoaW5nSW5kaWNlc1swXSwgMSk7CisgICAgcmV0dXJuICQkdmFsdWVS ZWYgPSBzcGxpY2UoQEFSR1YsICRtYXRjaGluZ0luZGljZXNbMF0sIDEpOworfQorCiBzdWIgZmlu ZE1hdGNoaW5nQXJndW1lbnRzKCQkKQogewogICAgIG15ICgkYXJnVG9DaGVjaywgJGFycmF5UmVm KSA9IEBfOwpAQCAtODg4LDggKzg3Niw5IEBAIHN1YiBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3Zl RnJvbUFycmF5UmVmCiB7CiAgICAgbXkgKCRhcmdUb0NoZWNrLCAkYXJyYXlSZWYpID0gQF87CiAg ICAgbXkgQGluZGljZXNUb1JlbW92ZSA9IGZpbmRNYXRjaGluZ0FyZ3VtZW50cygkYXJnVG9DaGVj aywgJGFycmF5UmVmKTsKKyAgICBteSAkcmVtb3ZlT2Zmc2V0ID0gMDsKICAgICBmb3JlYWNoIG15 ICRpbmRleCAoQGluZGljZXNUb1JlbW92ZSkgewotICAgICAgICBzcGxpY2UoQCRhcnJheVJlZiwg JGluZGV4LCAxKTsKKyAgICAgICAgc3BsaWNlKEAkYXJyYXlSZWYsICRpbmRleCAtICRyZW1vdmVP ZmZzZXQrKywgMSk7CiAgICAgfQogICAgIHJldHVybiBzY2FsYXIgQGluZGljZXNUb1JlbW92ZSA+ IDA7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvd2Via2l0ZGlyc191 bml0dGVzdC9jaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFycmF5UmVmLnBsIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRwZXJsL3dlYmtpdGRpcnNfdW5pdHRlc3QvY2hlY2tGb3JBcmd1bWVudEFu ZFJlbW92ZUZyb21BcnJheVJlZi5wbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kMWZmZTFlYjY0MjM2ZWNhNzc5YTNk YzAzNTQwYmU3MGY0ZTRhNjA4Ci0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRwZXJsL3dlYmtpdGRpcnNfdW5pdHRlc3QvY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21B cnJheVJlZi5wbApAQCAtMCwwICsxLDc2IEBACisjIS91c3IvYmluL3BlcmwKKyMKKyMgQ29weXJp Z2h0IChDKSAyMDEzIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVz KS4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0 cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQK KyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lci4KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJl cHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1 bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJp YnV0aW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5E IElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnIEFORCBBTlkKKyMgRVhQUkVTUyBPUiBJTVBMSUVE IFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAor IyBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSIFBVUlBPU0UgQVJFCisjIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElO Qy4gT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWQorIyBESVJFQ1QsIElORElS RUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFN QUdFUworIyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7CisjIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9G SVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTgorIyBB TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJ TElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUworIyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKworIyBVbml0IHRl c3RzIG9mIHdlYmtpdGRpcnM6OmNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQXJyYXlSZWYK K3VzZSBzdHJpY3Q7Cit1c2UgVGVzdDo6U2ltcGxlIHRlc3RzID0+IDQ7Cit1c2Ugd2Via2l0ZGly czsKKworbXkgQGFyZ3M7CitteSBAZXhwZWN0ZWQ7CitteSAkcmVzdWx0OworbXkgJHRpdGxlOwor CitzdWIgZXF1YWxBcnJheXMoXEBcQCkKK3sKKyAgICBteSBAYXJyYXkxID0gQHsgc2hpZnQoKSB9 OworICAgIG15IEBhcnJheTIgPSBAeyBzaGlmdCgpIH07CisgICAgcmV0dXJuIDAgaWYgKCQjYXJy YXkxICE9ICQjYXJyYXkyKTsKKworICAgIGZvcihteSAkaSA9IDA7ICRpIDw9ICQjYXJyYXkxOyAr KyRpKSB7CisgICAgICAgIGlmICgkYXJyYXkxWyRpXSBuZSAkYXJyYXkyWyRpXSkgeworICAgICAg ICAgICAgcmV0dXJuIDA7CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIDE7Cit9CisKKyMg VGVzdCBjYXNlICMxCiskdGl0bGUgPSAiY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BcnJh eVJlZjogRW1wdHkgYXJyYXkuIjsKK0BhcmdzID0gKCk7CitAZXhwZWN0ZWQgPSAoKTsKKyRyZXN1 bHQgPSBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFycmF5UmVmKCItLWFueXRoaW5nIiwg XEBhcmdzKTsKK29rKCEkcmVzdWx0ICYmIGVxdWFsQXJyYXlzKEBhcmdzLCBAZXhwZWN0ZWQpLCAk dGl0bGUpOworCisjIFRlc3QgY2FzZSAjMgorJHRpdGxlID0gImNoZWNrRm9yQXJndW1lbnRBbmRS ZW1vdmVGcm9tQXJyYXlSZWY6IE5vdCBmb3VuZCBhcmd1bWVudC4iOworQGFyZ3MgPSAoImEiLCAi YiIsICJjIik7CitAZXhwZWN0ZWQgPSAoImEiLCAiYiIsICJjIik7CiskcmVzdWx0ID0gY2hlY2tG b3JBcmd1bWVudEFuZFJlbW92ZUZyb21BcnJheVJlZigibm90LWZvdW5kIiwgXEBhcmdzKTsKK29r KCEkcmVzdWx0ICYmIGVxdWFsQXJyYXlzKEBhcmdzLCBAZXhwZWN0ZWQpLCAkdGl0bGUpOworCisj IFRlc3QgY2FzZSAjMworJHRpdGxlID0gImNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQXJy YXlSZWY6IE9uZSBvY2N1cnJlbmNlLiI7CitAYXJncyA9ICgiYSIsICJiIiwgImMiKTsKK0BleHBl Y3RlZCA9ICgiYSIsICJjIik7CiskcmVzdWx0ID0gY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZy b21BcnJheVJlZigiYiIsIFxAYXJncyk7CitvaygkcmVzdWx0ICYmIGVxdWFsQXJyYXlzKEBhcmdz LCBAZXhwZWN0ZWQpLCAkdGl0bGUpOworCisjIFRlc3QgY2FzZSAjNAorJHRpdGxlID0gImNoZWNr Rm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQXJyYXlSZWY6IE1vcmUgdGhhbiBvbmUgb2NjdXJyZW5j ZS4iOworQGFyZ3MgPSAoImEiLCAiYiIsICJhIiwgImMiLCAiYSIsICJ4IiwgImEiKTsKK0BleHBl Y3RlZCA9ICgiYiIsICJjIiwgIngiKTsKKyRyZXN1bHQgPSBjaGVja0ZvckFyZ3VtZW50QW5kUmVt b3ZlRnJvbUFycmF5UmVmKCJhIiwgXEBhcmdzKTsKK29rKCRyZXN1bHQgJiYgZXF1YWxBcnJheXMo QGFyZ3MsIEBleHBlY3RlZCksICR0aXRsZSk7CisK 217476 2013-11-20 13:52:44 -0800 2013-11-20 17:38:38 -0800 Patch bug-124581-20131120180417.patch text/plain 5116 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NTgyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTMzZDNkZTIzNTgzYTA5ZWE2ZDdiNWQ0YzA3ZDFjMzRh ZjI1OWVlZS4uOGNmOGZjYzM1MWRlOGExMGU4ODZhOTFjMmIyYzE1ODUwM2Y3MGUyNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDEzLTExLTIwICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3Nz YS5vcmc+CisKKyAgICAgICAgTW9kaWZ5IHdlYmtpdGRpcnMgdG8gcmV1c2UgY2hlY2tGb3JBcmd1 bWVudEFuZFJlbW92ZUZyb21BUkdWCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjQ1ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBTb21lIHN1YnJvdXRpbmVzIGFyZSByZXBsaWNhdGluZyBjb2RlIGZyb20g Y2hlY2tGb3JBcmd1bWVudCoqCisgICAgICAgIGZ1bmN0aW9ucyBpbnN0ZWFkIG9mIHJldXNpbmcg dGhlbSBhcyBpcyBiZWluZyBkb25lIGJ5IGFsbCBvdGhlciBmdW5jdGlvbnMuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVYY29kZVNESyk6IEFk ZGVkLgorICAgICAgICAoZGV0ZXJtaW5lUGFzc2VkQ29uZmlndXJhdGlvbik6IEFkZGVkLgorICAg ICAgICAoZGV0ZXJtaW5lUGFzc2VkQXJjaGl0ZWN0dXJlKTogQWRkZWQuCisgICAgICAgIChjaGVj a0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YpOiBBZGRlZC4KKyAgICAgICAgKGNoZWNrRm9y QXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVkdldHRpbmdWYWx1ZSk6IEFkZGVkLgorCiAyMDEzLTEx LTIwICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHNvbWUg b2Jzb2xldGUgbG9naWMgZnJvbSBXZWJLaXQuYXBwLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGUyYTdj YzU3YzUyMjM1MDdiN2I2NGFiNmIyYmZkNWQ0MzQxNmJiZDguLjFmNjgyZDViNjIzMjAwMGZlMTE1 NzdjYTE5Mzg2ODk0MjlkNDA5MWYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTM4OSwxOCArMzg5LDE0 IEBAIHN1YiBhcmd1bWVudHNGb3JDb25maWd1cmF0aW9uKCkKIHN1YiBkZXRlcm1pbmVYY29kZVNE SwogewogICAgIHJldHVybiBpZiBkZWZpbmVkICR4Y29kZVNESzsKLSAgICBmb3IgKG15ICRpID0g MDsgJGkgPD0gJCNBUkdWOyAkaSsrKSB7Ci0gICAgICAgIG15ICRvcHQgPSAkQVJHVlskaV07Ci0g ICAgICAgIGlmICgkb3B0ID1+IC9eLS1zZGskL2kpIHsKLSAgICAgICAgICAgIHNwbGljZShAQVJH ViwgJGksIDEpOwotICAgICAgICAgICAgJHhjb2RlU0RLID0gc3BsaWNlKEBBUkdWLCAkaSwgMSk7 Ci0gICAgICAgIH0gZWxzaWYgKCRvcHQgPX4gL14tLWRldmljZSQvaSkgewotICAgICAgICAgICAg c3BsaWNlKEBBUkdWLCAkaSwgMSk7Ci0gICAgICAgICAgICAkeGNvZGVTREsgPSAnaXBob25lb3Mu aW50ZXJuYWwnOwotICAgICAgICB9IGVsc2lmICgkb3B0ID1+IC9eLS1zaW0odWxhdG9yKT8vaSkg ewotICAgICAgICAgICAgc3BsaWNlKEBBUkdWLCAkaSwgMSk7Ci0gICAgICAgICAgICAkeGNvZGVT REsgPSAnaXBob25lc2ltdWxhdG9yJzsKLSAgICAgICAgfQorICAgIG15ICRzZGs7CisgICAgaWYg KGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVkdldHRpbmdWYWx1ZSgiLS1zZGsiLCBc JHNkaykpIHsKKyAgICAgICAgJHhjb2RlU0RLID0gJHNkazsKKyAgICB9IGVsc2lmIChjaGVja0Zv ckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tZGV2aWNlIikpIHsKKyAgICAgICAgJHhjb2Rl U0RLID0gJ2lwaG9uZW9zLmludGVybmFsJzsKKyAgICB9IGVsc2lmIChjaGVja0ZvckFyZ3VtZW50 QW5kUmVtb3ZlRnJvbUFSR1YoIi0tc2ltIikgfHwKKyAgICAgICAgY2hlY2tGb3JBcmd1bWVudEFu ZFJlbW92ZUZyb21BUkdWKCItLXNpbXVsYXRvciIpKSB7CisgICAgICAgICR4Y29kZVNESyA9ICdp cGhvbmVzaW11bGF0b3InOwogICAgIH0KIH0KIApAQCAtNjEzLDI5ICs2MDksMTcgQEAgc3ViIGRl dGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24KIHsKICAgICByZXR1cm4gaWYgJHNlYXJjaGVkRm9y UGFzc2VkQ29uZmlndXJhdGlvbjsKICAgICAkc2VhcmNoZWRGb3JQYXNzZWRDb25maWd1cmF0aW9u ID0gMTsKKyAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9IHVuZGVmOwogCi0gICAgZm9yIG15ICRp ICgwIC4uICQjQVJHVikgewotICAgICAgICBteSAkb3B0ID0gJEFSR1ZbJGldOwotICAgICAgICBp ZiAoJG9wdCA9fiAvXi0tZGVidWckL2kpIHsKLSAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGks IDEpOwotICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAiRGVidWciOwotICAgICAg ICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gIl9XaW5DYWlybyIgaWYgKGlzV2luQ2Fpcm8o KSAmJiBpc0N5Z3dpbigpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAg ICBpZiAoJG9wdCA9fiAvXi0tcmVsZWFzZSQvaSkgewotICAgICAgICAgICAgc3BsaWNlKEBBUkdW LCAkaSwgMSk7Ci0gICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJSZWxlYXNlIjsK LSAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfV2luQ2Fpcm8iIGlmIChpc1dp bkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0K LSAgICAgICAgaWYgKCRvcHQgPX4gL14tLXByb2ZpbChlfGluZykkL2kpIHsKLSAgICAgICAgICAg IHNwbGljZShAQVJHViwgJGksIDEpOwotICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24g PSAiUHJvZmlsaW5nIjsKLSAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfV2lu Q2Fpcm8iIGlmIChpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7Ci0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIH0KKyAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdW KCItLWRlYnVnIikpIHsKKyAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAiRGVidWciOwor ICAgIH0gZWxzaWYoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLXJlbGVhc2Ui KSkgeworICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJSZWxlYXNlIjsKKyAgICB9IGVs c2lmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tcHJvZmlsZSIpIHx8IGNo ZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1wcm9maWxpbmciKSkgeworICAgICAg ICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJQcm9maWxpbmciOwogICAgIH0KLSAgICAkcGFzc2Vk Q29uZmlndXJhdGlvbiA9IHVuZGVmOworCisgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gIl9X aW5DYWlybyIgaWYgKGRlZmluZWQoJHBhc3NlZENvbmZpZ3VyYXRpb24pICYmIGlzV2luQ2Fpcm8o KSAmJiBpc0N5Z3dpbigpKTsKIH0KIAogc3ViIHBhc3NlZENvbmZpZ3VyYXRpb24KQEAgLTY2NSwx OCArNjQ5LDEzIEBAIHN1YiBkZXRlcm1pbmVQYXNzZWRBcmNoaXRlY3R1cmUKICAgICByZXR1cm4g aWYgJHNlYXJjaGVkRm9yUGFzc2VkQXJjaGl0ZWN0dXJlOwogICAgICRzZWFyY2hlZEZvclBhc3Nl ZEFyY2hpdGVjdHVyZSA9IDE7CiAKLSAgICBmb3IgbXkgJGkgKDAgLi4gJCNBUkdWKSB7Ci0gICAg ICAgIG15ICRvcHQgPSAkQVJHVlskaV07Ci0gICAgICAgIGlmICgkb3B0ID1+IC9eLS0zMi1iaXQk L2kpIHsKLSAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwotICAgICAgICAgICAgaWYg KGlzQXBwbGVNYWNXZWJLaXQoKSkgewotICAgICAgICAgICAgICAgICRwYXNzZWRBcmNoaXRlY3R1 cmUgPSBgYXJjaGA7Ci0gICAgICAgICAgICAgICAgY2hvbXAgJHBhc3NlZEFyY2hpdGVjdHVyZTsK LSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybjsKKyAgICAkcGFzc2VkQXJjaGl0ZWN0 dXJlID0gdW5kZWY7CisgICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigi LS0zMi1iaXQiKSkgeworICAgICAgICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7CisgICAgICAg ICAgICAkcGFzc2VkQXJjaGl0ZWN0dXJlID0gYGFyY2hgOworICAgICAgICAgICAgY2hvbXAgJHBh c3NlZEFyY2hpdGVjdHVyZTsKICAgICAgICAgfQogICAgIH0KLSAgICAkcGFzc2VkQXJjaGl0ZWN0 dXJlID0gdW5kZWY7CiB9CiAKIHN1YiBwYXNzZWRBcmNoaXRlY3R1cmUKQEAgLTg1OCwxMiArODM3 LDIxIEBAIHN1YiBjb21tYW5kRXhpc3RzKCQpCiAgICAgcmV0dXJuIGAkY29tbWFuZCAtLXZlcnNp b24gMj4gJGRldm51bGxgOwogfQogCi1zdWIgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21B UkdWCitzdWIgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCQpCiB7CiAgICAgbXkg JGFyZ1RvQ2hlY2sgPSBzaGlmdDsKICAgICByZXR1cm4gY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92 ZUZyb21BcnJheVJlZigkYXJnVG9DaGVjaywgXEBBUkdWKTsKIH0KIAorc3ViIGNoZWNrRm9yQXJn dW1lbnRBbmRSZW1vdmVGcm9tQVJHVkdldHRpbmdWYWx1ZSgkJCkKK3sKKyAgICBteSAoJGFyZ1Rv Q2hlY2ssICR2YWx1ZVJlZikgPSBAXzsKKyAgICBteSBAbWF0Y2hpbmdJbmRpY2VzID0gZmluZE1h dGNoaW5nQXJndW1lbnRzKCRhcmdUb0NoZWNrLCBcQEFSR1YpOworICAgIHJldHVybiAwIHVubGVz cyAoJCNtYXRjaGluZ0luZGljZXMgIT0gMSk7CisgICAgc3BsaWNlKEBBUkdWLCAkbWF0Y2hpbmdJ bmRpY2VzWzBdLCAxKTsKKyAgICByZXR1cm4gJCR2YWx1ZVJlZiA9IHNwbGljZShAQVJHViwgJG1h dGNoaW5nSW5kaWNlc1swXSwgMSk7Cit9CisKIHN1YiBmaW5kTWF0Y2hpbmdBcmd1bWVudHMoJCQp CiB7CiAgICAgbXkgKCRhcmdUb0NoZWNrLCAkYXJyYXlSZWYpID0gQF87Cg==