124537 2013-11-18 14:07:44 -0800 Build script should fail when any invalid option is passed to it 2022-03-01 03:13:44 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 124581 1 nick.diego nick.diego commit-queue dbates eflews.bot gyuyoung.kim ossy oldest_to_newest 951782 0 nick.diego 2013-11-18 14:07:44 -0800 Build script should fail when any invalid option is passed to it 951786 1 217231 nick.diego 2013-11-18 14:08:54 -0800 Created attachment 217231 Patch 951788 2 217231 thorton 2013-11-18 14:10:59 -0800 Comment on attachment 217231 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217231&action=review > Tools/ChangeLog:7 > + Please write a few words here about the exception (perhaps referencing the revision it was added, and the ARCHS thing I mentioned -- or maybe just generic words). 951793 3 nick.diego 2013-11-18 14:14:45 -0800 (In reply to comment #2) > (From update of attachment 217231 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=217231&action=review > > > Tools/ChangeLog:7 > > + > > Please write a few words here about the exception (perhaps referencing the revision it was added, and the ARCHS thing I mentioned -- or maybe just generic words). Sorry, it was on my git commit message, just forgot to add it in the changelog :) 951797 4 217233 nick.diego 2013-11-18 14:17:45 -0800 Created attachment 217233 Patch 951798 5 217233 thorton 2013-11-18 14:20:16 -0800 Comment on attachment 217233 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217233&action=review > Tools/ChangeLog:10 > + It pass through command-line options only for xcode builds as it s/xcode/Xcode/ > Tools/ChangeLog:12 > + E.g: Tools/Scripts/build-webkit ARCHS="x86 ppc" It's actually i386, I think-o'd before. This is an antique example anyway, so it doesn't really matter. > Tools/ChangeLog:15 > + I confirmed that this still works fine with Xcode. 951800 6 217233 eflews.bot 2013-11-18 14:21:58 -0800 Comment on attachment 217233 Patch Attachment 217233 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/28398006 951804 7 217233 thorton 2013-11-18 14:26:26 -0800 Comment on attachment 217233 Patch Or maybe not? 952183 8 217317 nick.diego 2013-11-19 12:28:43 -0800 Created attachment 217317 Patch 952215 9 217317 dbates 2013-11-19 13:37:58 -0800 Comment on attachment 217317 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217317&action=review > Tools/ChangeLog:11 > + NOTICE: 'build-webkit' pass through command-line options only > + for xcode builds as it has its customized options/features mechanism. This sentence doesn't read well. Maybe: Note, build-webkit will not error out when it encounters an unrecognized command line option when building the Mac or iOS port. For these ports, unrecognized options will be passed through so that Xcode can process them. > Tools/ChangeLog:15 > + options which has to be added to the 'options' hashtable so that Nit: hashtable => hash table > Tools/ChangeLog:17 > + GetOpt::Long::GetOptions will be aware of them. That's is by the > + new function 'initializePrivateOptions' added into webkitdirs module. This sentence doesn't read well. Moreover, I suggest you make this sentence a function-specific remark for initializePrivateOptions() (i.e. move the sentence to line 32 in the change log entry), maybe: (initializePrivateOptions): Added; used internally to expose command line options for non-{iOS, Mac} ports. > Tools/ChangeLog:25 > + (determineIsWK2): > + (isWK2): > + (determineShouldUpdateEfl): > + (shouldUpdateEfl): > + (determineShouldUpdateGtk): > + (shouldUpdateGtk): > + (shouldUseGuardMalloc): > + (determineShouldUseGuardMalloc): Please add the remark "Added" to these change log lines just as you did for initializePrivateOptions() (below). This will make it straightforward to determine when a function was added by searching for the functions name in Trac or SVN/Git history. > Tools/ChangeLog:29 > + In adition, this patch standardizes the way command-line options are Nit: adition => addition > Tools/ChangeLog:32 > + (initilizePrivateOptions): Added. Nit: initilizePrivateOptions => initializePrivateOptions That is, the word "initialize" is misspelled in the name of this function. > Tools/Scripts/build-webkit:133 > + initilizePrivateOptions(\%options); Nit: initilizePrivateOptions => initializePrivateOptions That is, the word "initialize" is misspelled in the name of this function. > Tools/Scripts/webkitdirs.pm:105 > my $shouldUseXPCServiceForWebProcess; > my $shouldUseGuardMalloc; > my $xcodeVersion; > +my $shouldUpdateEfl; > +my $shouldUpdateGtk; We should sort this list of declarations and insert these variable declarations in sorted order. > Tools/Scripts/webkitdirs.pm:899 > +sub determineIsWK2 Please add "()" to the end of this line to force Perl to error when this function is called with an argument. > Tools/Scripts/webkitdirs.pm:1054 > +sub determineShouldUpdateEfl Ditto. > Tools/Scripts/webkitdirs.pm:1060 > +sub shouldUpdateEfl Ditto. > Tools/Scripts/webkitdirs.pm:1392 > +sub shouldUseGuardMalloc Please add "()" to the end of this line to force Perl to error when this function is called with an argument. > Tools/Scripts/webkitdirs.pm:1398 > +sub determineShouldUseGuardMalloc Ditto. > Tools/Scripts/webkitdirs.pm:2360 > +sub initilizePrivateOptions($) Nit: initilizePrivateOptions => initializePrivateOptions That is, the word "initialize" is misspelled in the name of this function. > Tools/Scripts/webkitdirs.pm:2371 > + 'efl' => \$isEfl, > + 'gtk' => \$isGtk, > + 'blackberry' => \$isBlackBerry, > + 'wince' => \$isWinCE, > + 'wincairo' => \$isWinCairo, > + '64-bit' => \$isWin64, > + 'update-efl' => \$shouldUpdateEfl, > + 'update-gtk' => \$shouldUpdateGtk Nit: ' => " We use double quotes for string literals unless we explicitly don't want string interpolation. > Tools/Scripts/webkitdirs.pm:2376 > + determineArchitecture(); > + determinePassedConfiguration(); > + determineIsWK2(); Is this necessary to call these functions? I mean, we'll ultimately call these functions when a caller queries for the such information (e.g. when architecture() is called). 952265 10 nick.diego 2013-11-19 15:20:57 -0800 Thanks for the review. (In reply to comment #9) > (From update of attachment 217317 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=217317&action=review > > > Tools/ChangeLog:11 > > + NOTICE: 'build-webkit' pass through command-line options only > > + for xcode builds as it has its customized options/features mechanism. > > This sentence doesn't read well. Maybe: > > Note, build-webkit will not error out when it encounters an unrecognized command line option when building the Mac or iOS port. For these ports, unrecognized options will be passed through so that Xcode can process them. > > > Tools/ChangeLog:15 > > + options which has to be added to the 'options' hashtable so that > > Nit: hashtable => hash table > > > Tools/ChangeLog:17 > > + GetOpt::Long::GetOptions will be aware of them. That's is by the > > + new function 'initializePrivateOptions' added into webkitdirs module. > > This sentence doesn't read well. Moreover, I suggest you make this sentence a function-specific remark for initializePrivateOptions() (i.e. move the sentence to line 32 in the change log entry), maybe: > > (initializePrivateOptions): Added; used internally to expose command line options for non-{iOS, Mac} ports. > > > Tools/ChangeLog:25 > > + (determineIsWK2): > > + (isWK2): > > + (determineShouldUpdateEfl): > > + (shouldUpdateEfl): > > + (determineShouldUpdateGtk): > > + (shouldUpdateGtk): > > + (shouldUseGuardMalloc): > > + (determineShouldUseGuardMalloc): > > Please add the remark "Added" to these change log lines just as you did for initializePrivateOptions() (below). > > This will make it straightforward to determine when a function was added by searching for the functions name in Trac or SVN/Git history. > > > Tools/ChangeLog:29 > > + In adition, this patch standardizes the way command-line options are > > Nit: adition => addition > > > Tools/ChangeLog:32 > > + (initilizePrivateOptions): Added. > > Nit: initilizePrivateOptions => initializePrivateOptions > > That is, the word "initialize" is misspelled in the name of this function. > > > Tools/Scripts/build-webkit:133 > > + initilizePrivateOptions(\%options); > > Nit: initilizePrivateOptions => initializePrivateOptions > > That is, the word "initialize" is misspelled in the name of this function. > > > Tools/Scripts/webkitdirs.pm:105 > > my $shouldUseXPCServiceForWebProcess; > > my $shouldUseGuardMalloc; > > my $xcodeVersion; > > +my $shouldUpdateEfl; > > +my $shouldUpdateGtk; > > We should sort this list of declarations and insert these variable declarations in sorted order. > > > Tools/Scripts/webkitdirs.pm:899 > > +sub determineIsWK2 > > Please add "()" to the end of this line to force Perl to error when this function is called with an argument. > > > Tools/Scripts/webkitdirs.pm:1054 > > +sub determineShouldUpdateEfl > > Ditto. > > > Tools/Scripts/webkitdirs.pm:1060 > > +sub shouldUpdateEfl > > Ditto. > > > Tools/Scripts/webkitdirs.pm:1392 > > +sub shouldUseGuardMalloc > > Please add "()" to the end of this line to force Perl to error when this function is called with an argument. > > > Tools/Scripts/webkitdirs.pm:1398 > > +sub determineShouldUseGuardMalloc > > Ditto. > > > Tools/Scripts/webkitdirs.pm:2360 > > +sub initilizePrivateOptions($) > > Nit: initilizePrivateOptions => initializePrivateOptions > > That is, the word "initialize" is misspelled in the name of this function. > > > Tools/Scripts/webkitdirs.pm:2371 > > + 'efl' => \$isEfl, > > + 'gtk' => \$isGtk, > > + 'blackberry' => \$isBlackBerry, > > + 'wince' => \$isWinCE, > > + 'wincairo' => \$isWinCairo, > > + '64-bit' => \$isWin64, > > + 'update-efl' => \$shouldUpdateEfl, > > + 'update-gtk' => \$shouldUpdateGtk > > Nit: ' => " > > We use double quotes for string literals unless we explicitly don't want string interpolation. > Fixed all above. > > Tools/Scripts/webkitdirs.pm:2376 > > + determineArchitecture(); > > + determinePassedConfiguration(); > > + determineIsWK2(); > > Is this necessary to call these functions? I mean, we'll ultimately call these functions when a caller queries for the such information (e.g. when architecture() is called). Yes, they should be called some time as you said, but the problem is that if they are not called before "GetOptions" call in "build-webkit", "GetOptions" will fail :( because options like "--debug" "--release" "-2" are handled internally by webkitdir's functions, and are not in the "options" hash table, and calling those functions here process the arguments and remove them from ARGV, preventing "GetOptions" to fail. I preferred do not put those options into the "options" hash table because they have some custom handling (e.g: determinePassedConfiguration()) differently from other options which only set some variable (such as $isEfl, $shouldUpdateGtk, etc), but I'm not sure that's is the best approach to use. 952269 11 217343 nick.diego 2013-11-19 15:25:09 -0800 Created attachment 217343 Patch 955652 12 217343 dbates 2013-12-02 15:43:51 -0800 Comment on attachment 217343 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217343&action=review The proposed patch is brittle. I wish we could come up with less fragile solution. > Tools/ChangeLog:26 > + (buildAutotoolsProject): Calls shouldUpdateGtk Nit: Missing a period at the end of this line. > Tools/ChangeLog:27 > + (buildCMakeProjectOrExit): Calls shouldUpdateEfl Ditto. > Tools/Scripts/build-webkit:133 > + initializePrivateOptions(\%options); Maybe a better name for this function would be appendCommandLineOptionsToDictionary? Also, it seems sufficient to call this function for all ports. The advantage of this approach is that errors introduced to appendCommandLineOptionsToDictionary() and its subroutines will also be noticed by people building for Mac and iOS. This will expedite fixing such errors and/or reverting the culprit commit(s). > Tools/Scripts/webkitdirs.pm:2363 > + my %privateOptions = ( Please add --nix and --inspector-frontend to this dictionary. 1196188 13 217343 beidson 2016-05-24 22:05:18 -0700 Comment on attachment 217343 Patch Assuming that patches for review since 2013 are stale, r- 217231 2013-11-18 14:08:54 -0800 2013-11-18 14:17:40 -0800 Patch bug-124537-20131118182025.patch text/plain 1584 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NDU0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzNkZDFiMWJhN2Q5OGJjNDlhMWVjYWU0OTg5ZjUyZWI4 ODU1ZDcxYS4uMTgyYWM0YjQxZWZlYWIwM2QyM2QxMzA1YWE4ZDUzMDg0NzBkOGQ2YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDEzLTExLTE4ICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3Nz YS5vcmc+CisKKyAgICAgICAgQnVpbGQgc2NyaXB0IHNob3VsZCBmYWlsIHdoZW4gYW55IGludmFs aWQgb3B0aW9uIGlzIHBhc3NlZCB0byBpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDoKKwogMjAxMy0xMS0xOCAg VGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBPY2Nhc2lv bmFsbHksIGh1bmRyZWRzIG9mIHRlc3RzIGZhaWwgd2l0aCBzbWFsbCB0ZXh0IGRpZmZzIG9uIE1h dmVyaWNrcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQgYi9Ub29scy9T Y3JpcHRzL2J1aWxkLXdlYmtpdAppbmRleCAzNzY5ODIzOTRiMGVmMTY4MWQ1NGFjOTE3YTQ4Njk0 NzE2ZjliY2EzLi5jM2NmNmI1ZGQ2MzM0MzE0ZGFhZTNiMTgzM2FhYTAyNTVjZDgwMWRlIDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRzL2J1 aWxkLXdlYmtpdApAQCAtMzYsNyArMzYsNyBAQCB1c2UgRmlsZTo6QmFzZW5hbWU7CiB1c2UgRmls ZTo6RmluZDsKIHVzZSBGaWxlOjpTcGVjOwogdXNlIEZpbmRCaW47Ci11c2UgR2V0b3B0OjpMb25n IHF3KDpjb25maWcgcGFzc190aHJvdWdoKTsKK3VzZSBHZXRvcHQ6Okxvbmc7CiB1c2UgbGliICRG aW5kQmluOjpCaW47CiB1c2Ugd2Via2l0ZGlyczsKIHVzZSB3ZWJraXRwZXJsOjpGZWF0dXJlTGlz dCBxdyhnZXRGZWF0dXJlT3B0aW9uTGlzdCk7CkBAIC00Niw2ICs0NiwxMCBAQCBzdWIgY01ha2VB cmdzRnJvbUZlYXR1cmVzKCk7CiBzdWIgZm9ybWF0QnVpbGRUaW1lKCQpOwogc3ViIHdyaXRlQ29u Z3JhdHMoKTsKIAoraWYgKGlzQXBwbGVNYWNXZWJLaXQoKSB8fCBpc0lPU1dlYktpdCgpKSB7Cisg ICAgR2V0b3B0OjpMb25nOjpDb25maWd1cmUocXcocGFzc190aHJvdWdoKSk7Cit9CisKIG15ICRv cmlnaW5hbFdvcmtpbmdEaXJlY3RvcnkgPSBnZXRjd2QoKTsKIGNoZGlyV2ViS2l0KCk7CiAKQEAg LTEzNCw5ICsxMzgsNyBAQCBmb3JlYWNoIChAZmVhdHVyZXMpIHsKICAgICAkb3B0aW9uc3siJF8t PntvcHRpb259ISJ9ID0gJF8tPnt2YWx1ZX07CiB9CiAKLUdldE9wdGlvbnMoJW9wdGlvbnMpOwot Ci1pZiAoJHNob3dIZWxwKSB7CitpZiAoIUdldE9wdGlvbnMoJW9wdGlvbnMpIHx8ICRzaG93SGVs cCkgewogICAgcHJpbnQgU1RERVJSICR1c2FnZTsKICAgIGV4aXQgMTsKIH0K 217233 2013-11-18 14:17:45 -0800 2013-11-19 12:28:30 -0800 Patch bug-124537-20131118182916.patch text/plain 1913 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NDU0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzNkZDFiMWJhN2Q5OGJjNDlhMWVjYWU0OTg5ZjUyZWI4 ODU1ZDcxYS4uY2RiNDc5OGFjYzBjMWNiNzM4Yjg0OWViYTc5ZTYxOTc3YWNhZmM0YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEzLTExLTE4ICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3Nz YS5vcmc+CisKKyAgICAgICAgQnVpbGQgc2NyaXB0IHNob3VsZCBmYWlsIHdoZW4gYW55IGludmFs aWQgb3B0aW9uIGlzIHBhc3NlZCB0byBpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtb2RpZmllcyBidWlsZC13ZWJraXQgc2NyaXB0 IHNvIHRoYXQgaXQgd2lsbCBmYWlsCisgICAgICAgIHdoZW4gaW52YWxpZC91bmtub3duIGNvbW1h bmQtbGluZSBvcHRpb25zIGFyZSBwYXNzZWQgdG8gaXQuCisgICAgICAgIEl0IHBhc3MgdGhyb3Vn aCBjb21tYW5kLWxpbmUgb3B0aW9ucyBvbmx5IGZvciB4Y29kZSBidWlsZHMgYXMgaXQKKyAgICAg ICAgaGFzIHNvbWUgY3VzdG9taXplZCBvcHRpb25zL2ZlYXR1cmVzIG1lY2hhbmlzbS4KKyAgICAg ICAgRS5nOiBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCBBUkNIUz0ieDg2IHBwYyIKKworICAg ICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OgorCiAyMDEzLTExLTE4ICBUaW0gSG9ydG9uICA8 dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIE9jY2FzaW9uYWxseSwgaHVuZHJl ZHMgb2YgdGVzdHMgZmFpbCB3aXRoIHNtYWxsIHRleHQgZGlmZnMgb24gTWF2ZXJpY2tzCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQt d2Via2l0CmluZGV4IDM3Njk4MjM5NGIwZWYxNjgxZDU0YWM5MTdhNDg2OTQ3MTZmOWJjYTMuLmMz Y2Y2YjVkZDYzMzQzMTRkYWFlM2IxODMzYWFhMDI1NWNkODAxZGUgMTAwNzU1Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvYnVpbGQtd2Via2l0CisrKyBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CkBA IC0zNiw3ICszNiw3IEBAIHVzZSBGaWxlOjpCYXNlbmFtZTsKIHVzZSBGaWxlOjpGaW5kOwogdXNl IEZpbGU6OlNwZWM7CiB1c2UgRmluZEJpbjsKLXVzZSBHZXRvcHQ6OkxvbmcgcXcoOmNvbmZpZyBw YXNzX3Rocm91Z2gpOwordXNlIEdldG9wdDo6TG9uZzsKIHVzZSBsaWIgJEZpbmRCaW46OkJpbjsK IHVzZSB3ZWJraXRkaXJzOwogdXNlIHdlYmtpdHBlcmw6OkZlYXR1cmVMaXN0IHF3KGdldEZlYXR1 cmVPcHRpb25MaXN0KTsKQEAgLTQ2LDYgKzQ2LDEwIEBAIHN1YiBjTWFrZUFyZ3NGcm9tRmVhdHVy ZXMoKTsKIHN1YiBmb3JtYXRCdWlsZFRpbWUoJCk7CiBzdWIgd3JpdGVDb25ncmF0cygpOwogCitp ZiAoaXNBcHBsZU1hY1dlYktpdCgpIHx8IGlzSU9TV2ViS2l0KCkpIHsKKyAgICBHZXRvcHQ6Okxv bmc6OkNvbmZpZ3VyZShxdyhwYXNzX3Rocm91Z2gpKTsKK30KKwogbXkgJG9yaWdpbmFsV29ya2lu Z0RpcmVjdG9yeSA9IGdldGN3ZCgpOwogY2hkaXJXZWJLaXQoKTsKIApAQCAtMTM0LDkgKzEzOCw3 IEBAIGZvcmVhY2ggKEBmZWF0dXJlcykgewogICAgICRvcHRpb25zeyIkXy0+e29wdGlvbn0hIn0g PSAkXy0+e3ZhbHVlfTsKIH0KIAotR2V0T3B0aW9ucyglb3B0aW9ucyk7Ci0KLWlmICgkc2hvd0hl bHApIHsKK2lmICghR2V0T3B0aW9ucyglb3B0aW9ucykgfHwgJHNob3dIZWxwKSB7CiAgICBwcmlu dCBTVERFUlIgJHVzYWdlOwogICAgZXhpdCAxOwogfQo= 217317 2013-11-19 12:28:43 -0800 2013-11-19 15:25:03 -0800 Patch bug-124537-20131119164013.patch text/plain 6639 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NTExCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzJkZmJmMmZiOWViOWM5NmE2M2NhZjE1MWQzZDIzZjlh Y2NmNjU0OS4uNDNhY2JiZTkwNTdlN2UxMDM5ZjM1YmJjNTA5OTVjZTg2NzAzNWJkMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDEzLTExLTE5ICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3Nz YS5vcmc+CisKKyAgICAgICAgQnVpbGQgc2NyaXB0IHNob3VsZCBmYWlsIHdoZW4gYW55IGludmFs aWQgb3B0aW9uIGlzIHBhc3NlZCB0byBpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtb2RpZmllcyBidWlsZC13ZWJraXQgc2NyaXB0 IHNvIHRoYXQgaXQgd2lsbCBmYWlsCisgICAgICAgIHdoZW4gaW52YWxpZC91bmtub3duIGNvbW1h bmQtbGluZSBvcHRpb25zIGFyZSBwYXNzZWQgdG8gaXQuCisgICAgICAgIE5PVElDRTogJ2J1aWxk LXdlYmtpdCcgcGFzcyB0aHJvdWdoIGNvbW1hbmQtbGluZSBvcHRpb25zIG9ubHkKKyAgICAgICAg Zm9yIHhjb2RlIGJ1aWxkcyBhcyBpdCBoYXMgaXRzIGN1c3RvbWl6ZWQgb3B0aW9ucy9mZWF0dXJl cyBtZWNoYW5pc20uCisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDoKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdGRpcnMucG06IFRoZSB3ZWJraXRkaXJzIG1vZHVsZSB1c2VzIHNvbWUg aW50ZXJuYWwKKyAgICAgICAgb3B0aW9ucyB3aGljaCBoYXMgdG8gYmUgYWRkZWQgdG8gdGhlICdv cHRpb25zJyBoYXNodGFibGUgc28gdGhhdAorICAgICAgICBHZXRPcHQ6Okxvbmc6OkdldE9wdGlv bnMgd2lsbCBiZSBhd2FyZSBvZiB0aGVtLiBUaGF0J3MgaXMgYnkgdGhlCisgICAgICAgIG5ldyBm dW5jdGlvbiAnaW5pdGlhbGl6ZVByaXZhdGVPcHRpb25zJyBhZGRlZCBpbnRvIHdlYmtpdGRpcnMg bW9kdWxlLgorICAgICAgICAoZGV0ZXJtaW5lSXNXSzIpOgorICAgICAgICAoaXNXSzIpOgorICAg ICAgICAoZGV0ZXJtaW5lU2hvdWxkVXBkYXRlRWZsKToKKyAgICAgICAgKHNob3VsZFVwZGF0ZUVm bCk6CisgICAgICAgIChkZXRlcm1pbmVTaG91bGRVcGRhdGVHdGspOgorICAgICAgICAoc2hvdWxk VXBkYXRlR3RrKToKKyAgICAgICAgKHNob3VsZFVzZUd1YXJkTWFsbG9jKToKKyAgICAgICAgKGRl dGVybWluZVNob3VsZFVzZUd1YXJkTWFsbG9jKToKKyAgICAgICAgKHNldFVwR3VhcmRNYWxsb2NJ Zk5lZWRlZCk6CisgICAgICAgIChidWlsZEF1dG90b29sc1Byb2plY3QpOgorICAgICAgICAoYnVp bGRDTWFrZVByb2plY3RPckV4aXQpOgorICAgICAgICBJbiBhZGl0aW9uLCB0aGlzIHBhdGNoIHN0 YW5kYXJkaXplcyB0aGUgd2F5IGNvbW1hbmQtbGluZSBvcHRpb25zIGFyZQorICAgICAgICBhY2Nl c3NlZCB0aHJvdWdoIHRoZSBmdW5jdGlvbnMgYWJvdmUgYW5kIHRoZSB1c2Ugb2YgY2hlY2tGb3JB cmd1bWVudCoqCisgICAgICAgIGZ1bmN0aW9ucy4KKyAgICAgICAgKGluaXRpbGl6ZVByaXZhdGVP cHRpb25zKTogQWRkZWQuCisKIDIwMTMtMTEtMTkgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgWWV0IGFub3RoZXIgYnVpbGQgZml4LiBKdXN0IGFsbG93IGFueSBj aGFyYWN0ZXIuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCBiL1Rvb2xz L1NjcmlwdHMvYnVpbGQtd2Via2l0CmluZGV4IDM3Njk4MjM5NGIwZWYxNjgxZDU0YWM5MTdhNDg2 OTQ3MTZmOWJjYTMuLjkzNDRkNGNlMDJmNzgwOWY1ZGIyMmUyMmE3NGYwMDY1ZDU1MDc5ZjggMTAw NzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CisrKyBiL1Rvb2xzL1NjcmlwdHMv YnVpbGQtd2Via2l0CkBAIC0zNiw3ICszNiw3IEBAIHVzZSBGaWxlOjpCYXNlbmFtZTsKIHVzZSBG aWxlOjpGaW5kOwogdXNlIEZpbGU6OlNwZWM7CiB1c2UgRmluZEJpbjsKLXVzZSBHZXRvcHQ6Okxv bmcgcXcoOmNvbmZpZyBwYXNzX3Rocm91Z2gpOwordXNlIEdldG9wdDo6TG9uZzsKIHVzZSBsaWIg JEZpbmRCaW46OkJpbjsKIHVzZSB3ZWJraXRkaXJzOwogdXNlIHdlYmtpdHBlcmw6OkZlYXR1cmVM aXN0IHF3KGdldEZlYXR1cmVPcHRpb25MaXN0KTsKQEAgLTEyNyw2ICsxMjcsMTIgQEAgbXkgJW9w dGlvbnMgPSAoCiAgICAgJ2NvdmVyYWdlJyA9PiBcJGNvdmVyYWdlU3VwcG9ydCwKICk7CiAKK2lm IChpc0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNJT1NXZWJLaXQoKSkgeworICAgIEdldG9wdDo6TG9u Zzo6Q29uZmlndXJlKHF3KHBhc3NfdGhyb3VnaCkpOworfSBlbHNlIHsKKyAgICBpbml0aWxpemVQ cml2YXRlT3B0aW9ucyhcJW9wdGlvbnMpOworfQorCiAjIEJ1aWxkIHVzYWdlIHRleHQgYW5kIG9w dGlvbnMgbGlzdCBmcm9tIGZlYXR1cmVzCiBmb3JlYWNoIChAZmVhdHVyZXMpIHsKICAgICBteSAk b3B0ID0gc3ByaW50ZigiJS0zNXMiLCAiICAtLVtuby1dJF8tPntvcHRpb259Iik7CkBAIC0xMzQs OSArMTQwLDcgQEAgZm9yZWFjaCAoQGZlYXR1cmVzKSB7CiAgICAgJG9wdGlvbnN7IiRfLT57b3B0 aW9ufSEifSA9ICRfLT57dmFsdWV9OwogfQogCi1HZXRPcHRpb25zKCVvcHRpb25zKTsKLQotaWYg KCRzaG93SGVscCkgeworaWYgKCFHZXRPcHRpb25zKCVvcHRpb25zKSB8fCAkc2hvd0hlbHApIHsK ICAgIHByaW50IFNUREVSUiAkdXNhZ2U7CiAgICBleGl0IDE7CiB9CmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5k ZXggZTJhN2NjNTdjNTIyMzUwN2I3YjY0YWI2YjJiZmQ1ZDQzNDE2YmJkOC4uNzYwNzlmMzM5Mzgw MDczODEzZTM0NzZkN2RkZmY5NmMwMDYxNjZmNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTAxLDYg KzEwMSw4IEBAIG15ICRzaG91bGRUYXJnZXRXZWJQcm9jZXNzOwogbXkgJHNob3VsZFVzZVhQQ1Nl cnZpY2VGb3JXZWJQcm9jZXNzOwogbXkgJHNob3VsZFVzZUd1YXJkTWFsbG9jOwogbXkgJHhjb2Rl VmVyc2lvbjsKK215ICRzaG91bGRVcGRhdGVFZmw7CitteSAkc2hvdWxkVXBkYXRlR3RrOwogCiAj IFZhcmlhYmxlcyBmb3IgV2luMzIgc3VwcG9ydAogbXkgJHByb2dyYW1GaWxlc1BhdGg7CkBAIC04 OTQsMTYgKzg5NiwxNSBAQCBzdWIgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BcnJheVJl ZgogICAgIHJldHVybiBzY2FsYXIgQGluZGljZXNUb1JlbW92ZSA+IDA7CiB9CiAKK3N1YiBkZXRl cm1pbmVJc1dLMgoreworICAgIHJldHVybiBpZiBkZWZpbmVkKCRpc1dLMik7CisgICAgJGlzV0sy ID0gY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItMiIpOworfQorCiBzdWIgaXNX SzIoKQogewotICAgIGlmIChkZWZpbmVkKCRpc1dLMikpIHsKLSAgICAgICAgcmV0dXJuICRpc1dL MjsKLSAgICB9Ci0gICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLTIi KSkgewotICAgICAgICAkaXNXSzIgPSAxOwotICAgIH0gZWxzZSB7Ci0gICAgICAgICRpc1dLMiA9 IDA7Ci0gICAgfQorICAgIGRldGVybWluZUlzV0syKCk7CiAgICAgcmV0dXJuICRpc1dLMjsKIH0K IApAQCAtMTA1MCw2ICsxMDUxLDE4IEBAIHN1YiBpc0VmbCgpCiAgICAgcmV0dXJuICRpc0VmbDsK IH0KIAorc3ViIGRldGVybWluZVNob3VsZFVwZGF0ZUVmbAoreworICAgIHJldHVybiBpZiBkZWZp bmVkKCRzaG91bGRVcGRhdGVFZmwpOworICAgICRzaG91bGRVcGRhdGVFZmwgPSBjaGVja0ZvckFy Z3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tdXBkYXRlLWVmbCIpOworfQorCitzdWIgc2hvdWxk VXBkYXRlRWZsCit7CisgICAgZGV0ZXJtaW5lU2hvdWxkVXBkYXRlRWZsKCk7CisgICAgcmV0dXJu ICRzaG91bGRVcGRhdGVFZmw7Cit9CisKIHN1YiBpc0d0aygpCiB7CiAgICAgZGV0ZXJtaW5lSXNH dGsoKTsKQEAgLTEwNjIsNiArMTA3NSwxOCBAQCBzdWIgZGV0ZXJtaW5lSXNHdGsoKQogICAgICRp c0d0ayA9IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1ndGsiKTsKIH0KIAor c3ViIGRldGVybWluZVNob3VsZFVwZGF0ZUd0aygkKQoreworICAgIHJldHVybiBpZiBkZWZpbmVk KCRzaG91bGRVcGRhdGVHdGspOworICAgICRzaG91bGRVcGRhdGVHdGsgPSBjaGVja0ZvckFyZ3Vt ZW50QW5kUmVtb3ZlRnJvbUFycmF5UmVmKCItLXVwZGF0ZS1ndGsiLCBzaGlmdCk7Cit9CisKK3N1 YiBzaG91bGRVcGRhdGVHdGsoJCkKK3sKKyAgICBkZXRlcm1pbmVTaG91bGRVcGRhdGVHdGsoc2hp ZnQpOworICAgIHJldHVybiAkc2hvdWxkVXBkYXRlR3RrOworfQorCiBzdWIgaXNXaW5DRSgpCiB7 CiAgICAgZGV0ZXJtaW5lSXNXaW5DRSgpOwpAQCAtMTM2NCwxNyArMTM4OSwyNSBAQCBzdWIgYXBw ZW5kVG9FbnZpcm9ubWVudFZhcmlhYmxlTGlzdAogICAgIH0KIH0KIAorc3ViIHNob3VsZFVzZUd1 YXJkTWFsbG9jCit7CisgICAgZGV0ZXJtaW5lU2hvdWxkVXNlR3VhcmRNYWxsb2MoKTsKKyAgICBy ZXR1cm4gJHNob3VsZFVzZUd1YXJkTWFsbG9jOworfQorCitzdWIgZGV0ZXJtaW5lU2hvdWxkVXNl R3VhcmRNYWxsb2MKK3sKKyAgICByZXR1cm4gaWYgZGVmaW5lZCgkc2hvdWxkVXNlR3VhcmRNYWxs b2MpOworICAgICRzaG91bGRVc2VHdWFyZE1hbGxvYyA9IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1v dmVGcm9tQVJHVigiLS1ndWFyZC1tYWxsb2MiKTsKK30KKwogc3ViIHNldFVwR3VhcmRNYWxsb2NJ Zk5lZWRlZAogewogICAgIGlmICghaXNEYXJ3aW4oKSkgewogICAgICAgICByZXR1cm47CiAgICAg fQogCi0gICAgaWYgKCFkZWZpbmVkKCRzaG91bGRVc2VHdWFyZE1hbGxvYykpIHsKLSAgICAgICAg JHNob3VsZFVzZUd1YXJkTWFsbG9jID0gY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdW KCItLWd1YXJkLW1hbGxvYyIpOwotICAgIH0KLQotICAgIGlmICgkc2hvdWxkVXNlR3VhcmRNYWxs b2MpIHsKKyAgICBpZiAoc2hvdWxkVXNlR3VhcmRNYWxsb2MoKSkgewogICAgICAgICBhcHBlbmRU b0Vudmlyb25tZW50VmFyaWFibGVMaXN0KCJEWUxEX0lOU0VSVF9MSUJSQVJJRVMiLCAiL3Vzci9s aWIvbGliZ21hbGxvYy5keWxpYiIpOwogICAgIH0KIH0KQEAgLTE5MjAsNyArMTk1Myw3IEBAIHN1 YiBidWlsZEF1dG90b29sc1Byb2plY3QoJEApCiAgICAgICAgIHB1c2ggQGJ1aWxkQXJncywgIi0t ZGlzYWJsZS1kZWJ1ZyI7CiAgICAgfQogCi0gICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1v dmVGcm9tQXJyYXlSZWYoIi0tdXBkYXRlLWd0ayIsIFxAYnVpbGRBcmdzKSkgeworICAgIGlmIChz aG91bGRVcGRhdGVHdGsoXEBidWlsZEFyZ3MpKSB7CiAgICAgICAgICMgRm9yY2UgYXV0b2dlbiB0 byBydW4sIHRvIGNhdGNoIHRoZSBwb3NzaWJseSB1cGRhdGVkIGxpYnJhcmllcy4KICAgICAgICAg c3lzdGVtKCJybSAtZiBwcmV2aW91cy1hdXRvZ2VuLWFyZ3VtZW50cy50eHQiKTsKIApAQCAtMjA1 Miw3ICsyMDg1LDcgQEAgc3ViIGJ1aWxkQ01ha2VQcm9qZWN0T3JFeGl0KCQkJCRAKQogCiAgICAg ZXhpdChleGl0U3RhdHVzKGNsZWFuQ01ha2VHZW5lcmF0ZWRQcm9qZWN0KCkpKSBpZiAkY2xlYW47 CiAKLSAgICBpZiAoaXNFZmwoKSAmJiBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1Yo Ii0tdXBkYXRlLWVmbCIpKSB7CisgICAgaWYgKGlzRWZsKCkgJiYgc2hvdWxkVXBkYXRlRWZsKCkp IHsKICAgICAgICAgc3lzdGVtKCJwZXJsIiwgIiRzb3VyY2VEaXIvVG9vbHMvU2NyaXB0cy91cGRh dGUtd2Via2l0ZWZsLWxpYnMiKSA9PSAwIG9yIGRpZSAkITsKICAgICB9CiAKQEAgLTIzMjQsNCAr MjM1NywyMyBAQCBzdWIgd3JpdGVSZWdpc3RyeVN0cmluZwogICAgIHJldHVybiAhJGVycm9yICYm IHJlYWRSZWdpc3RyeVN0cmluZygkdmFsdWVOYW1lKSBlcSAkc3RyaW5nOwogfQogCitzdWIgaW5p dGlsaXplUHJpdmF0ZU9wdGlvbnMoJCkKK3sKKyAgICBteSAoJG9wdGlvbnNSZWYpID0gQF87Cisg ICAgbXkgJXByaXZhdGVPcHRpb25zID0gKAorICAgICAgICAnZWZsJyA9PiBcJGlzRWZsLAorICAg ICAgICAnZ3RrJyA9PiBcJGlzR3RrLAorICAgICAgICAnYmxhY2tiZXJyeScgPT4gXCRpc0JsYWNr QmVycnksCisgICAgICAgICd3aW5jZScgPT4gXCRpc1dpbkNFLAorICAgICAgICAnd2luY2Fpcm8n ID0+IFwkaXNXaW5DYWlybywKKyAgICAgICAgJzY0LWJpdCcgPT4gXCRpc1dpbjY0LAorICAgICAg ICAndXBkYXRlLWVmbCcgPT4gXCRzaG91bGRVcGRhdGVFZmwsCisgICAgICAgICd1cGRhdGUtZ3Rr JyA9PiBcJHNob3VsZFVwZGF0ZUd0aworICAgICk7CisgICAgQHskb3B0aW9uc1JlZn17a2V5cyAl cHJpdmF0ZU9wdGlvbnN9ID0gdmFsdWVzICVwcml2YXRlT3B0aW9uczsKKyAgICBkZXRlcm1pbmVB cmNoaXRlY3R1cmUoKTsKKyAgICBkZXRlcm1pbmVQYXNzZWRDb25maWd1cmF0aW9uKCk7CisgICAg ZGV0ZXJtaW5lSXNXSzIoKTsKK30KKwogMTsK 217343 2013-11-19 15:25:09 -0800 2022-03-01 03:13:44 -0800 Patch bug-124537-20131119193642.patch text/plain 7382 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NTI1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTJlMjk5ZjUyMTViODEzZTU5ZDdjOGQ0ZWIxMmYyOWY3 M2FlYmQ5Yy4uN2NhOGYxZjg2ODIzMGY2NjdhNmU5YTg0YjgwMmMyMThiOWZlOWFiNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDEzLTExLTE5ICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3Nz YS5vcmc+CisKKyAgICAgICAgQnVpbGQgc2NyaXB0IHNob3VsZCBmYWlsIHdoZW4gYW55IGludmFs aWQgb3B0aW9uIGlzIHBhc3NlZCB0byBpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtb2RpZmllcyBidWlsZC13ZWJraXQgc2NyaXB0 IHNvIHRoYXQgaXQgd2lsbCBmYWlsCisgICAgICAgIHdoZW4gaW52YWxpZC91bmtub3duIGNvbW1h bmQtbGluZSBvcHRpb25zIGFyZSBwYXNzZWQgdG8gaXQuCisgICAgICAgIE5vdGUsIGJ1aWxkLXdl YmtpdCB3aWxsIG5vdCBlcnJvciBvdXQgd2hlbiBpdCBlbmNvdW50ZXJzIGFuCisgICAgICAgIHVu cmVjb2duaXplZCBjb21tYW5kIGxpbmUgb3B0aW9uIHdoZW4gYnVpbGRpbmcgdGhlIE1hYyBvciBp T1MgcG9ydC4KKyAgICAgICAgRm9yIHRoZXNlIHBvcnRzLCB1bnJlY29nbml6ZWQgb3B0aW9ucyB3 aWxsIGJlIHBhc3NlZCB0aHJvdWdoIHNvIHRoYXQKKyAgICAgICAgWGNvZGUgY2FuIHByb2Nlc3Mg dGhlbS4KKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGRldGVybWluZUlzV0syKTogQWRkZWQuCisgICAg ICAgIChpc1dLMik6IEFkZGVkLgorICAgICAgICAoZGV0ZXJtaW5lU2hvdWxkVXBkYXRlRWZsKTog QWRkZWQuCisgICAgICAgIChzaG91bGRVcGRhdGVFZmwpOiBBZGRlZC4KKyAgICAgICAgKGRldGVy bWluZVNob3VsZFVwZGF0ZUd0ayk6IEFkZGVkLgorICAgICAgICAoc2hvdWxkVXBkYXRlR3RrKTog QWRkZWQuCisgICAgICAgIChzaG91bGRVc2VHdWFyZE1hbGxvYyk6IEFkZGVkLgorICAgICAgICAo ZGV0ZXJtaW5lU2hvdWxkVXNlR3VhcmRNYWxsb2MpOiBBZGRlZC4KKyAgICAgICAgKHNldFVwR3Vh cmRNYWxsb2NJZk5lZWRlZCk6IENhbGxzIHNob3VsZFVzZUd1YXJkTWFsbG9jLgorICAgICAgICAo YnVpbGRBdXRvdG9vbHNQcm9qZWN0KTogQ2FsbHMgc2hvdWxkVXBkYXRlR3RrCisgICAgICAgIChi dWlsZENNYWtlUHJvamVjdE9yRXhpdCk6IENhbGxzIHNob3VsZFVwZGF0ZUVmbAorICAgICAgICBJ biBhZGRpdGlvbiwgdGhpcyBwYXRjaCBzdGFuZGFyZGl6ZXMgdGhlIHdheSBjb21tYW5kLWxpbmUg b3B0aW9ucyBhcmUKKyAgICAgICAgYWNjZXNzZWQgdGhyb3VnaCB0aGUgZnVuY3Rpb25zIGFib3Zl IGFuZCB0aGUgdXNlIG9mIGNoZWNrRm9yQXJndW1lbnQqKgorICAgICAgICBmdW5jdGlvbnMuCisg ICAgICAgIChpbml0aWFsaXplUHJpdmF0ZU9wdGlvbnMpOiBBZGRlZDsgdXNlZCBpbnRlcm5hbGx5 IHRvIGV4cG9zZSBjb21tYW5kCisgICAgICAgIGxpbmUgb3B0aW9ucyBmb3Igbm9uLXtpT1MsIE1h Y30gcG9ydHMuCisKIDIwMTMtMTEtMTkgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4K IAogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTUxMzk0Nzk+IFJlZW5hYmxlIHRoZSBKU0MgT2Jq ZWN0aXZlLUMgQVBJIHRlc3RzIG9uIE1vdW50YWluIExpb24gb25jZSB0aGUgYm90cyBhcmUgcnVu bmluZyBYY29kZSA1CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCBiL1Rv b2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CmluZGV4IDM3Njk4MjM5NGIwZWYxNjgxZDU0YWM5MTdh NDg2OTQ3MTZmOWJjYTMuLjZlYWI5YWYyZWJmZmVhOTFlNmE4OTQ4MzRiODczZTQ4MjEzNjRhYTgg MTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CisrKyBiL1Rvb2xzL1Njcmlw dHMvYnVpbGQtd2Via2l0CkBAIC0zNiw3ICszNiw3IEBAIHVzZSBGaWxlOjpCYXNlbmFtZTsKIHVz ZSBGaWxlOjpGaW5kOwogdXNlIEZpbGU6OlNwZWM7CiB1c2UgRmluZEJpbjsKLXVzZSBHZXRvcHQ6 OkxvbmcgcXcoOmNvbmZpZyBwYXNzX3Rocm91Z2gpOwordXNlIEdldG9wdDo6TG9uZzsKIHVzZSBs aWIgJEZpbmRCaW46OkJpbjsKIHVzZSB3ZWJraXRkaXJzOwogdXNlIHdlYmtpdHBlcmw6OkZlYXR1 cmVMaXN0IHF3KGdldEZlYXR1cmVPcHRpb25MaXN0KTsKQEAgLTEyNyw2ICsxMjcsMTIgQEAgbXkg JW9wdGlvbnMgPSAoCiAgICAgJ2NvdmVyYWdlJyA9PiBcJGNvdmVyYWdlU3VwcG9ydCwKICk7CiAK K2lmIChpc0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNJT1NXZWJLaXQoKSkgeworICAgIEdldG9wdDo6 TG9uZzo6Q29uZmlndXJlKHF3KHBhc3NfdGhyb3VnaCkpOworfSBlbHNlIHsKKyAgICBpbml0aWFs aXplUHJpdmF0ZU9wdGlvbnMoXCVvcHRpb25zKTsKK30KKwogIyBCdWlsZCB1c2FnZSB0ZXh0IGFu ZCBvcHRpb25zIGxpc3QgZnJvbSBmZWF0dXJlcwogZm9yZWFjaCAoQGZlYXR1cmVzKSB7CiAgICAg bXkgJG9wdCA9IHNwcmludGYoIiUtMzVzIiwgIiAgLS1bbm8tXSRfLT57b3B0aW9ufSIpOwpAQCAt MTM0LDkgKzE0MCw3IEBAIGZvcmVhY2ggKEBmZWF0dXJlcykgewogICAgICRvcHRpb25zeyIkXy0+ e29wdGlvbn0hIn0gPSAkXy0+e3ZhbHVlfTsKIH0KIAotR2V0T3B0aW9ucyglb3B0aW9ucyk7Ci0K LWlmICgkc2hvd0hlbHApIHsKK2lmICghR2V0T3B0aW9ucyglb3B0aW9ucykgfHwgJHNob3dIZWxw KSB7CiAgICBwcmludCBTVERFUlIgJHVzYWdlOwogICAgZXhpdCAxOwogfQpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt CmluZGV4IGUyYTdjYzU3YzUyMjM1MDdiN2I2NGFiNmIyYmZkNWQ0MzQxNmJiZDguLjY0NWQ3ZjY4 ZjMyOWNmNjc3ZWFiMGQ0ZGI5NWY3Y2Y0ZDJmODYzM2QgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTc2 LDMwICs3NiwzMiBAQCB1c2UgY29uc3RhbnQgSU5DTFVERV9PUFRJT05TX0ZPUl9ERUJVR0dJTkcg PT4gMTsKIG91ciBARVhQT1JUX09LOwogCiBteSAkYXJjaGl0ZWN0dXJlOwotbXkgJG51bWJlck9m Q1BVczsKIG15ICRiYXNlUHJvZHVjdERpcjsKIG15IEBiYXNlUHJvZHVjdERpck9wdGlvbjsKIG15 ICRjb25maWd1cmF0aW9uOwotbXkgJHhjb2RlU0RLOwogbXkgJGNvbmZpZ3VyYXRpb25Gb3JWaXN1 YWxTdHVkaW87CiBteSAkY29uZmlndXJhdGlvblByb2R1Y3REaXI7Ci1teSAkc291cmNlRGlyOwog bXkgJGN1cnJlbnRTVk5SZXZpc2lvbjsKIG15ICRkZWJ1Z2dlcjsKLW15ICRubVBhdGg7Ci1teSAk b3NYVmVyc2lvbjsKIG15ICRnZW5lcmF0ZURzeW07CitteSAkaXNCbGFja0JlcnJ5OworbXkgJGlz RWZsOwogbXkgJGlzR3RrOwotbXkgJGlzV2luQ0U7CitteSAkaXNJbnNwZWN0b3JGcm9udGVuZDsK IG15ICRpc1dpbkNhaXJvOworbXkgJGlzV2luQ0U7CiBteSAkaXNXaW42NDsKLW15ICRpc0VmbDsK LW15ICRpc0JsYWNrQmVycnk7Ci1teSAkaXNJbnNwZWN0b3JGcm9udGVuZDsKIG15ICRpc1dLMjsK K215ICRubVBhdGg7CitteSAkbnVtYmVyT2ZDUFVzOworbXkgJG9zWFZlcnNpb247CitteSAkc291 cmNlRGlyOwogbXkgJHNob3VsZFRhcmdldFdlYlByb2Nlc3M7CitteSAkc2hvdWxkVXBkYXRlRWZs OworbXkgJHNob3VsZFVwZGF0ZUd0azsKIG15ICRzaG91bGRVc2VYUENTZXJ2aWNlRm9yV2ViUHJv Y2VzczsKIG15ICRzaG91bGRVc2VHdWFyZE1hbGxvYzsKK215ICR4Y29kZVNESzsKIG15ICR4Y29k ZVZlcnNpb247CiAKICMgVmFyaWFibGVzIGZvciBXaW4zMiBzdXBwb3J0CkBAIC04OTQsMTYgKzg5 NiwxNSBAQCBzdWIgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BcnJheVJlZgogICAgIHJl dHVybiBzY2FsYXIgQGluZGljZXNUb1JlbW92ZSA+IDA7CiB9CiAKK3N1YiBkZXRlcm1pbmVJc1dL MigpCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQoJGlzV0syKTsKKyAgICAkaXNXSzIgPSBjaGVj a0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0yIik7Cit9CisKIHN1YiBpc1dLMigpCiB7 Ci0gICAgaWYgKGRlZmluZWQoJGlzV0syKSkgewotICAgICAgICByZXR1cm4gJGlzV0syOwotICAg IH0KLSAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItMiIpKSB7Ci0g ICAgICAgICRpc1dLMiA9IDE7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgJGlzV0syID0gMDsKLSAg ICB9CisgICAgZGV0ZXJtaW5lSXNXSzIoKTsKICAgICByZXR1cm4gJGlzV0syOwogfQogCkBAIC0x MDUwLDYgKzEwNTEsMTggQEAgc3ViIGlzRWZsKCkKICAgICByZXR1cm4gJGlzRWZsOwogfQogCitz dWIgZGV0ZXJtaW5lU2hvdWxkVXBkYXRlRWZsKCkKK3sKKyAgICByZXR1cm4gaWYgZGVmaW5lZCgk c2hvdWxkVXBkYXRlRWZsKTsKKyAgICAkc2hvdWxkVXBkYXRlRWZsID0gY2hlY2tGb3JBcmd1bWVu dEFuZFJlbW92ZUZyb21BUkdWKCItLXVwZGF0ZS1lZmwiKTsKK30KKworc3ViIHNob3VsZFVwZGF0 ZUVmbCgpCit7CisgICAgZGV0ZXJtaW5lU2hvdWxkVXBkYXRlRWZsKCk7CisgICAgcmV0dXJuICRz aG91bGRVcGRhdGVFZmw7Cit9CisKIHN1YiBpc0d0aygpCiB7CiAgICAgZGV0ZXJtaW5lSXNHdGso KTsKQEAgLTEwNjIsNiArMTA3NSwxOCBAQCBzdWIgZGV0ZXJtaW5lSXNHdGsoKQogICAgICRpc0d0 ayA9IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1ndGsiKTsKIH0KIAorc3Vi IGRldGVybWluZVNob3VsZFVwZGF0ZUd0aygkKQoreworICAgIHJldHVybiBpZiBkZWZpbmVkKCRz aG91bGRVcGRhdGVHdGspOworICAgICRzaG91bGRVcGRhdGVHdGsgPSBjaGVja0ZvckFyZ3VtZW50 QW5kUmVtb3ZlRnJvbUFycmF5UmVmKCItLXVwZGF0ZS1ndGsiLCBzaGlmdCk7Cit9CisKK3N1YiBz aG91bGRVcGRhdGVHdGsoJCkKK3sKKyAgICBkZXRlcm1pbmVTaG91bGRVcGRhdGVHdGsoc2hpZnQp OworICAgIHJldHVybiAkc2hvdWxkVXBkYXRlR3RrOworfQorCiBzdWIgaXNXaW5DRSgpCiB7CiAg ICAgZGV0ZXJtaW5lSXNXaW5DRSgpOwpAQCAtMTM2NCwxNyArMTM4OSwyNSBAQCBzdWIgYXBwZW5k VG9FbnZpcm9ubWVudFZhcmlhYmxlTGlzdAogICAgIH0KIH0KIAorc3ViIHNob3VsZFVzZUd1YXJk TWFsbG9jKCkKK3sKKyAgICBkZXRlcm1pbmVTaG91bGRVc2VHdWFyZE1hbGxvYygpOworICAgIHJl dHVybiAkc2hvdWxkVXNlR3VhcmRNYWxsb2M7Cit9CisKK3N1YiBkZXRlcm1pbmVTaG91bGRVc2VH dWFyZE1hbGxvYygpCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQoJHNob3VsZFVzZUd1YXJkTWFs bG9jKTsKKyAgICAkc2hvdWxkVXNlR3VhcmRNYWxsb2MgPSBjaGVja0ZvckFyZ3VtZW50QW5kUmVt b3ZlRnJvbUFSR1YoIi0tZ3VhcmQtbWFsbG9jIik7Cit9CisKIHN1YiBzZXRVcEd1YXJkTWFsbG9j SWZOZWVkZWQKIHsKICAgICBpZiAoIWlzRGFyd2luKCkpIHsKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAotICAgIGlmICghZGVmaW5lZCgkc2hvdWxkVXNlR3VhcmRNYWxsb2MpKSB7Ci0gICAgICAg ICRzaG91bGRVc2VHdWFyZE1hbGxvYyA9IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJH VigiLS1ndWFyZC1tYWxsb2MiKTsKLSAgICB9Ci0KLSAgICBpZiAoJHNob3VsZFVzZUd1YXJkTWFs bG9jKSB7CisgICAgaWYgKHNob3VsZFVzZUd1YXJkTWFsbG9jKCkpIHsKICAgICAgICAgYXBwZW5k VG9FbnZpcm9ubWVudFZhcmlhYmxlTGlzdCgiRFlMRF9JTlNFUlRfTElCUkFSSUVTIiwgIi91c3Iv bGliL2xpYmdtYWxsb2MuZHlsaWIiKTsKICAgICB9CiB9CkBAIC0xOTIwLDcgKzE5NTMsNyBAQCBz dWIgYnVpbGRBdXRvdG9vbHNQcm9qZWN0KCRAKQogICAgICAgICBwdXNoIEBidWlsZEFyZ3MsICIt LWRpc2FibGUtZGVidWciOwogICAgIH0KIAotICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVt b3ZlRnJvbUFycmF5UmVmKCItLXVwZGF0ZS1ndGsiLCBcQGJ1aWxkQXJncykpIHsKKyAgICBpZiAo c2hvdWxkVXBkYXRlR3RrKFxAYnVpbGRBcmdzKSkgewogICAgICAgICAjIEZvcmNlIGF1dG9nZW4g dG8gcnVuLCB0byBjYXRjaCB0aGUgcG9zc2libHkgdXBkYXRlZCBsaWJyYXJpZXMuCiAgICAgICAg IHN5c3RlbSgicm0gLWYgcHJldmlvdXMtYXV0b2dlbi1hcmd1bWVudHMudHh0Iik7CiAKQEAgLTIw NTIsNyArMjA4NSw3IEBAIHN1YiBidWlsZENNYWtlUHJvamVjdE9yRXhpdCgkJCQkQCkKIAogICAg IGV4aXQoZXhpdFN0YXR1cyhjbGVhbkNNYWtlR2VuZXJhdGVkUHJvamVjdCgpKSkgaWYgJGNsZWFu OwogCi0gICAgaWYgKGlzRWZsKCkgJiYgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdW KCItLXVwZGF0ZS1lZmwiKSkgeworICAgIGlmIChpc0VmbCgpICYmIHNob3VsZFVwZGF0ZUVmbCgp KSB7CiAgICAgICAgIHN5c3RlbSgicGVybCIsICIkc291cmNlRGlyL1Rvb2xzL1NjcmlwdHMvdXBk YXRlLXdlYmtpdGVmbC1saWJzIikgPT0gMCBvciBkaWUgJCE7CiAgICAgfQogCkBAIC0yMzI0LDQg KzIzNTcsMjMgQEAgc3ViIHdyaXRlUmVnaXN0cnlTdHJpbmcKICAgICByZXR1cm4gISRlcnJvciAm JiByZWFkUmVnaXN0cnlTdHJpbmcoJHZhbHVlTmFtZSkgZXEgJHN0cmluZzsKIH0KIAorc3ViIGlu aXRpYWxpemVQcml2YXRlT3B0aW9ucygkKQoreworICAgIG15ICgkb3B0aW9uc1JlZikgPSBAXzsK KyAgICBteSAlcHJpdmF0ZU9wdGlvbnMgPSAoCisgICAgICAgICJlZmwiID0+IFwkaXNFZmwsCisg ICAgICAgICJndGsiID0+IFwkaXNHdGssCisgICAgICAgICJibGFja2JlcnJ5IiA9PiBcJGlzQmxh Y2tCZXJyeSwKKyAgICAgICAgIndpbmNlIiA9PiBcJGlzV2luQ0UsCisgICAgICAgICJ3aW5jYWly byIgPT4gXCRpc1dpbkNhaXJvLAorICAgICAgICAiNjQtYml0IiA9PiBcJGlzV2luNjQsCisgICAg ICAgICJ1cGRhdGUtZWZsIiA9PiBcJHNob3VsZFVwZGF0ZUVmbCwKKyAgICAgICAgInVwZGF0ZS1n dGsiID0+IFwkc2hvdWxkVXBkYXRlR3RrCisgICAgKTsKKyAgICBAeyRvcHRpb25zUmVmfXtrZXlz ICVwcml2YXRlT3B0aW9uc30gPSB2YWx1ZXMgJXByaXZhdGVPcHRpb25zOworICAgIGRldGVybWlu ZUFyY2hpdGVjdHVyZSgpOworICAgIGRldGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24oKTsKKyAg ICBkZXRlcm1pbmVJc1dLMigpOworfQorCiAxOwo=