116114 2013-05-14 12:08:35 -0700 [Windows] Identify proper run environment for scripts 2013-05-14 17:15:05 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham commit-queue dbates oldest_to_newest 888966 0 bfulgham 2013-05-14 12:08:35 -0700 With the VS2010 (and beyond) builds we are targeting x86 and x64 build targets. Consequently, we need a way for our scripts to know if they should run using the 'bin' directory (for 64-bit stuff), or the new 'bin32' directory (for 32-bit stuff). This patch updated webkitdirs.pm with new logic to identify the specific build being used, and which run path to use based on the Visual Studio revision. We do not currently build the 64-bit version, so we hard-code the 32-bit path for now. A future update will identify and run the 64-bit variation. 888968 1 201739 bfulgham 2013-05-14 12:11:51 -0700 Created attachment 201739 Patch 889001 2 201739 ddkilzer 2013-05-14 13:10:29 -0700 Comment on attachment 201739 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201739&action=review r=me, but consider extracting the duplicate code into a method. > Tools/Scripts/webkitdirs.pm:1627 > my $programFilesPath = $ENV{'PROGRAMFILES(X86)'} || $ENV{'PROGRAMFILES'} || "C:\\Program Files"; Since this code is now duplicated in determineVisualStudioInstallDir(), should we put this in a function? I'd feel a little better if we did. 889006 3 201749 bfulgham 2013-05-14 13:19:54 -0700 Created attachment 201749 Patch 889007 4 201750 bfulgham 2013-05-14 13:21:17 -0700 Created attachment 201750 Patch 889012 5 201753 bfulgham 2013-05-14 13:31:16 -0700 Created attachment 201753 Patch 889013 6 201754 bfulgham 2013-05-14 13:32:41 -0700 Created attachment 201754 Patch 889054 7 201754 ddkilzer 2013-05-14 16:03:24 -0700 Comment on attachment 201754 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201754&action=review r=me with added return statements. Thanks! > Tools/Scripts/webkitdirs.pm:421 > + $programFilesPath = $ENV{'PROGRAMFILES(X86)'} || $ENV{'PROGRAMFILES'} || "C:\\Program Files"; We should probably have a 'return $programFilesPath;' after this line. I know Perl will do the right thing here, but it's a little too non-obvious for people who aren't Perl experts. > Tools/Scripts/webkitdirs.pm:434 > + chomp($vsInstallDir = `cygpath "$vsInstallDir"`) if isCygwin(); Ditto for return statement here. (Actually, will chomp() do the right thing here?) > Tools/Scripts/webkitdirs.pm:443 > + $vsVersion = ($installDir =~ /Microsoft Visual Studio ([0-9]+\.[0-9]*)/) ? $1 : "8"; Ditto for return statement here. 889070 8 bfulgham 2013-05-14 17:15:05 -0700 Committed r150092: <http://trac.webkit.org/changeset/150092> 201739 2013-05-14 12:11:51 -0700 2013-05-14 13:19:52 -0700 Patch bug-116114-20130514121048.patch text/plain 3826 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MDA4MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEzLTA1LTE0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBJZGVudGlmeSBwcm9wZXIgcnVuIGVudmlyb25tZW50IGZv ciBzY3JpcHRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE2MTE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRGV0ZXJtaW5lIChiYXNlZCBvbiBWaXN1YWwgU3R1ZGlvIHZlcnNpb24pIHdoaWNoIHBhdGgg dG8gdXNlIGZvcgorICAgICAgICBleGVjdXRhYmxlcyAoYmluIHZlcnN1cyBiaW4zMikuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVWaXN1YWxT dHVkaW9JbnN0YWxsRGlyKTogQWRkZWQuCisgICAgICAgIChkZXRlcm1pbmVWaXN1YWxTdHVkaW9W ZXJzaW9uKTogQWRkZWQuCisgICAgICAgIChkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJvZHVjdERp cik6IE1vZGlmaWVkIHRvIGNob29zZSBwcm9wZXIgYmluCisgICAgICAgIG9yIGJpbjMyIGRpcmVj dG9yeS4KKyAgICAgICAgKHZpc3VhbFN0dWRpb1ZlcnNpb24pOiBBZGRlZAorICAgICAgICAoc2V0 dXBDeWd3aW5FbnYpOiBNb2RpZmllZCB0byB1c2UgbmV3IGRldGVybWluZVZpc3VhbFN0dWRpb0lu c3RhbGxEaXIKKwogMjAxMy0wNS0xNCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNv bT4KIAogICAgICAgICBbV2luZG93c10gU3dpdGNoIHRvIGVtYmVkZGVkIG1hbmlmZXN0IGNvbW1h bmRzIGZvciBsYXVuY2hlciBleGVjdXRhYmxlcy4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlz aW9uIDE1MDA4MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5 KQpAQCAtMTA1LDYgKzEwNSw4IEBAIG15ICR4Y29kZVZlcnNpb247CiAKICMgVmFyaWFibGVzIGZv ciBXaW4zMiBzdXBwb3J0CiBteSAkdmNCdWlsZFBhdGg7CitteSAkdnNJbnN0YWxsRGlyOworbXkg JHZzVmVyc2lvbjsKIG15ICR3aW5kb3dzU291cmNlRGlyOwogbXkgJHdpblZlcnNpb247CiBteSAk d2lsbFVzZVZDRXhwcmVzc1doZW5CdWlsZGluZyA9IDA7CkBAIC00MTEsNiArNDEzLDI5IEBAIHN1 YiB4Y29kZVNESwogICAgIHJldHVybiAkeGNvZGVTREs7CiB9CiAKK3N1YiBkZXRlcm1pbmVWaXN1 YWxTdHVkaW9JbnN0YWxsRGlyCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQgJHZzSW5zdGFsbERp cjsKKworICAgIGlmICgkRU5WeydWU0lOU1RBTExESVInfSkgeworICAgICAgICAkdnNJbnN0YWxs RGlyID0gJEVOVnsnVlNJTlNUQUxMRElSJ307CisgICAgICAgICR2c0luc3RhbGxEaXIgPX4gc3xb XFwvXSR8fDsKKyAgICB9IGVsc2UgeworICAgICAgICBteSAkcHJvZ3JhbUZpbGVzUGF0aCA9ICRF TlZ7J1BST0dSQU1GSUxFUyhYODYpJ30gfHwgJEVOVnsnUFJPR1JBTUZJTEVTJ30gfHwgIkM6XFxQ cm9ncmFtIEZpbGVzIjsKKyAgICAgICAgJHZzSW5zdGFsbERpciA9IEZpbGU6OlNwZWMtPmNhdGRp cigkcHJvZ3JhbUZpbGVzUGF0aCwgIk1pY3Jvc29mdCBWaXN1YWwgU3R1ZGlvIDgiKTsKKyAgICB9 CisgICAgY2hvbXAoJHZzSW5zdGFsbERpciA9IGBjeWdwYXRoICIkdnNJbnN0YWxsRGlyImApIGlm IGlzQ3lnd2luKCk7Cit9CisKK3N1YiBkZXRlcm1pbmVWaXN1YWxTdHVkaW9WZXJzaW9uCit7Cisg ICAgcmV0dXJuIGlmIGRlZmluZWQgJHZzVmVyc2lvbjsKKworICAgIGRldGVybWluZVZpc3VhbFN0 dWRpb0luc3RhbGxEaXIoKTsKKworICAgICR2c1ZlcnNpb24gPSAoJHZzSW5zdGFsbERpciA9fiAv TWljcm9zb2Z0IFZpc3VhbCBTdHVkaW8gKFswLTldK1wuWzAtOV0qKS8pID8gJDEgOiAiOCI7Cit9 CisKIHN1YiBkZXRlcm1pbmVDb25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGlvCiB7CiAgICAgcmV0 dXJuIGlmIGRlZmluZWQgJGNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW87CkBAIC00MzQsNyAr NDU5LDggQEAgc3ViIGRldGVybWluZUNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyCiAgICAgZGV0ZXJt aW5lQmFzZVByb2R1Y3REaXIoKTsKICAgICBkZXRlcm1pbmVDb25maWd1cmF0aW9uKCk7CiAgICAg aWYgKGlzQXBwbGVXaW5XZWJLaXQoKSkgewotICAgICAgICAkY29uZmlndXJhdGlvblByb2R1Y3RE aXIgPSBGaWxlOjpTcGVjLT5jYXRkaXIoJGJhc2VQcm9kdWN0RGlyLCBjb25maWd1cmF0aW9uRm9y VmlzdWFsU3R1ZGlvKCksICJiaW4iKTsKKyAgICAgICAgbXkgJGJpbkRpciA9ICh2aXN1YWxTdHVk aW9WZXJzaW9uKCkgZXEgIjgiKSA/ICJiaW4iIDogImJpbjMyIjsKKyAgICAgICAgJGNvbmZpZ3Vy YXRpb25Qcm9kdWN0RGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRiYXNlUHJvZHVjdERpciwgY29u ZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbygpLCAkYmluRGlyKTsKICAgICB9IGVsc2UgewogICAg ICAgICBpZiAodXNlc1BlckNvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSgpKSB7CiAgICAgICAg ICAgICAkY29uZmlndXJhdGlvblByb2R1Y3REaXIgPSAiJGJhc2VQcm9kdWN0RGlyIjsKQEAgLTQ5 OSw2ICs1MjUsMTIgQEAgc3ViIGNvbmZpZ3VyYXRpb24oKQogICAgIHJldHVybiAkY29uZmlndXJh dGlvbjsKIH0KIAorc3ViIHZpc3VhbFN0dWRpb1ZlcnNpb24oKQoreworICAgIGRldGVybWluZVZp c3VhbFN0dWRpb1ZlcnNpb24oKTsKKyAgICByZXR1cm4gJHZzVmVyc2lvbjsKK30KKwogc3ViIGNv bmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKQogewogICAgIGRldGVybWluZUNvbmZpZ3VyYXRp b25Gb3JWaXN1YWxTdHVkaW8oKTsKQEAgLTE1OTEsMTQgKzE2MjMsOCBAQCBzdWIgc2V0dXBDeWd3 aW5FbnYoKQogICAgIHJldHVybiBpZiAhaXNDeWd3aW4oKSAmJiAhaXNXaW5kb3dzKCk7CiAgICAg cmV0dXJuIGlmICR2Y0J1aWxkUGF0aDsKIAotICAgIG15ICR2c0luc3RhbGxEaXI7CisgICAgZGV0 ZXJtaW5lVmlzdWFsU3R1ZGlvSW5zdGFsbERpcigpOwogICAgIG15ICRwcm9ncmFtRmlsZXNQYXRo ID0gJEVOVnsnUFJPR1JBTUZJTEVTKFg4NiknfSB8fCAkRU5WeydQUk9HUkFNRklMRVMnfSB8fCAi QzpcXFByb2dyYW0gRmlsZXMiOwotICAgIGlmICgkRU5WeydWU0lOU1RBTExESVInfSkgewotICAg ICAgICAkdnNJbnN0YWxsRGlyID0gJEVOVnsnVlNJTlNUQUxMRElSJ307Ci0gICAgfSBlbHNlIHsK LSAgICAgICAgJHZzSW5zdGFsbERpciA9IEZpbGU6OlNwZWMtPmNhdGRpcigkcHJvZ3JhbUZpbGVz UGF0aCwgIk1pY3Jvc29mdCBWaXN1YWwgU3R1ZGlvIDgiKTsKLSAgICB9Ci0gICAgY2hvbXAoJHZz SW5zdGFsbERpciA9IGBjeWdwYXRoICIkdnNJbnN0YWxsRGlyImApIGlmIGlzQ3lnd2luKCk7CiAg ICAgJHZjQnVpbGRQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkdnNJbnN0YWxsRGlyLCBxdyhD b21tb243IElERSBkZXZlbnYuY29tKSk7CiAgICAgaWYgKC1lICR2Y0J1aWxkUGF0aCkgewogICAg ICAgICAjIFZpc3VhbCBTdHVkaW8gaXMgaW5zdGFsbGVkOyB3ZSBjYW4gdXNlIHBkZXZlbnYgdG8g YnVpbGQuCg== 201749 2013-05-14 13:19:54 -0700 2013-05-14 13:21:15 -0700 Patch bug-116114-20130514131851.patch text/plain 4103 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MDA4MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEzLTA1LTE0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBJZGVudGlmeSBwcm9wZXIgcnVuIGVudmlyb25tZW50IGZv ciBzY3JpcHRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE2MTE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRGV0ZXJtaW5lIChiYXNlZCBvbiBWaXN1YWwgU3R1ZGlvIHZlcnNpb24pIHdoaWNoIHBhdGgg dG8gdXNlIGZvcgorICAgICAgICBleGVjdXRhYmxlcyAoYmluIHZlcnN1cyBiaW4zMikuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVWaXN1YWxT dHVkaW9JbnN0YWxsRGlyKTogQWRkZWQuCisgICAgICAgIChkZXRlcm1pbmVWaXN1YWxTdHVkaW9W ZXJzaW9uKTogQWRkZWQuCisgICAgICAgIChkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJvZHVjdERp cik6IE1vZGlmaWVkIHRvIGNob29zZSBwcm9wZXIgYmluCisgICAgICAgIG9yIGJpbjMyIGRpcmVj dG9yeS4KKyAgICAgICAgKHZpc3VhbFN0dWRpb1ZlcnNpb24pOiBBZGRlZAorICAgICAgICAoc2V0 dXBDeWd3aW5FbnYpOiBNb2RpZmllZCB0byB1c2UgbmV3IGRldGVybWluZVZpc3VhbFN0dWRpb0lu c3RhbGxEaXIKKwogMjAxMy0wNS0xNCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNv bT4KIAogICAgICAgICBbV2luZG93c10gU3dpdGNoIHRvIGVtYmVkZGVkIG1hbmlmZXN0IGNvbW1h bmRzIGZvciBsYXVuY2hlciBleGVjdXRhYmxlcy4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlz aW9uIDE1MDA4MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5 KQpAQCAtMTA0LDcgKzEwNCwxMCBAQCBteSAkc2hvdWxkVXNlR3VhcmRNYWxsb2M7CiBteSAkeGNv ZGVWZXJzaW9uOwogCiAjIFZhcmlhYmxlcyBmb3IgV2luMzIgc3VwcG9ydAorbXkgJHByb2dyYW1G aWxlc1BhdGg7CiBteSAkdmNCdWlsZFBhdGg7CitteSAkdnNJbnN0YWxsRGlyOworbXkgJHZzVmVy c2lvbjsKIG15ICR3aW5kb3dzU291cmNlRGlyOwogbXkgJHdpblZlcnNpb247CiBteSAkd2lsbFVz ZVZDRXhwcmVzc1doZW5CdWlsZGluZyA9IDA7CkBAIC00MTEsNiArNDE0LDM2IEBAIHN1YiB4Y29k ZVNESwogICAgIHJldHVybiAkeGNvZGVTREs7CiB9CiAKK3N1YiBkZXRlcm1pbmVQcm9ncmFtRmls ZXNQYXRoCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQgJHByb2dyYW1GaWxlc1BhdGg7CisKKyAg ICAkcHJvZ3JhbUZpbGVzUGF0aCA9ICRFTlZ7J1BST0dSQU1GSUxFUyhYODYpJ30gfHwgJEVOVnsn UFJPR1JBTUZJTEVTJ30gfHwgIkM6XFxQcm9ncmFtIEZpbGVzIjsKK30KKworCitzdWIgZGV0ZXJt aW5lVmlzdWFsU3R1ZGlvSW5zdGFsbERpcgoreworICAgIHJldHVybiBpZiBkZWZpbmVkICR2c0lu c3RhbGxEaXI7CisKKyAgICBpZiAoJEVOVnsnVlNJTlNUQUxMRElSJ30pIHsKKyAgICAgICAgJHZz SW5zdGFsbERpciA9ICRFTlZ7J1ZTSU5TVEFMTERJUid9OworICAgICAgICAkdnNJbnN0YWxsRGly ID1+IHN8W1xcL10kfHw7CisgICAgfSBlbHNlIHsKKyAgICAgICAgJHZzSW5zdGFsbERpciA9IEZp bGU6OlNwZWMtPmNhdGRpcihwcm9ncmFtRmlsZXNQYXRoKCksICJNaWNyb3NvZnQgVmlzdWFsIFN0 dWRpbyA4Iik7CisgICAgfQorICAgIGNob21wKCR2c0luc3RhbGxEaXIgPSBgY3lncGF0aCAiJHZz SW5zdGFsbERpciJgKSBpZiBpc0N5Z3dpbigpOworfQorCitzdWIgZGV0ZXJtaW5lVmlzdWFsU3R1 ZGlvVmVyc2lvbgoreworICAgIHJldHVybiBpZiBkZWZpbmVkICR2c1ZlcnNpb247CisKKyAgICBk ZXRlcm1pbmVWaXN1YWxTdHVkaW9JbnN0YWxsRGlyKCk7CisKKyAgICAkdnNWZXJzaW9uID0gKCR2 c0luc3RhbGxEaXIgPX4gL01pY3Jvc29mdCBWaXN1YWwgU3R1ZGlvIChbMC05XStcLlswLTldKikv KSA/ICQxIDogIjgiOworfQorCiBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbkZvclZpc3VhbFN0 dWRpbwogewogICAgIHJldHVybiBpZiBkZWZpbmVkICRjb25maWd1cmF0aW9uRm9yVmlzdWFsU3R1 ZGlvOwpAQCAtNDM0LDcgKzQ2Nyw4IEBAIHN1YiBkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJvZHVj dERpcgogICAgIGRldGVybWluZUJhc2VQcm9kdWN0RGlyKCk7CiAgICAgZGV0ZXJtaW5lQ29uZmln dXJhdGlvbigpOwogICAgIGlmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKLSAgICAgICAgJGNvbmZp Z3VyYXRpb25Qcm9kdWN0RGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRiYXNlUHJvZHVjdERpciwg Y29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbygpLCAiYmluIik7CisgICAgICAgIG15ICRiaW5E aXIgPSAodmlzdWFsU3R1ZGlvVmVyc2lvbigpIGVxICI4IikgPyAiYmluIiA6ICJiaW4zMiI7Cisg ICAgICAgICRjb25maWd1cmF0aW9uUHJvZHVjdERpciA9IEZpbGU6OlNwZWMtPmNhdGRpcigkYmFz ZVByb2R1Y3REaXIsIGNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKSwgJGJpbkRpcik7CiAg ICAgfSBlbHNlIHsKICAgICAgICAgaWYgKHVzZXNQZXJDb25maWd1cmF0aW9uQnVpbGREaXJlY3Rv cnkoKSkgewogICAgICAgICAgICAgJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyID0gIiRiYXNlUHJv ZHVjdERpciI7CkBAIC00OTksNiArNTMzLDE5IEBAIHN1YiBjb25maWd1cmF0aW9uKCkKICAgICBy ZXR1cm4gJGNvbmZpZ3VyYXRpb247CiB9CiAKKworc3ViIHByb2dyYW1GaWxlc1BhdGgoKQorewor ICAgIGRldGVybWluZVByb2dyYW1GaWxlc1BhdGgoKTsKKyAgICByZXR1cm4gJHByb2dyYW1GaWxl c1BhdGg7Cit9CisKK3N1YiB2aXN1YWxTdHVkaW9WZXJzaW9uKCkKK3sKKyAgICBkZXRlcm1pbmVW aXN1YWxTdHVkaW9WZXJzaW9uKCk7CisgICAgcmV0dXJuICR2c1ZlcnNpb247Cit9CisKIHN1YiBj b25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGlvKCkKIHsKICAgICBkZXRlcm1pbmVDb25maWd1cmF0 aW9uRm9yVmlzdWFsU3R1ZGlvKCk7CkBAIC0xNTkxLDE0ICsxNjM4LDggQEAgc3ViIHNldHVwQ3ln d2luRW52KCkKICAgICByZXR1cm4gaWYgIWlzQ3lnd2luKCkgJiYgIWlzV2luZG93cygpOwogICAg IHJldHVybiBpZiAkdmNCdWlsZFBhdGg7CiAKLSAgICBteSAkdnNJbnN0YWxsRGlyOwotICAgIG15 ICRwcm9ncmFtRmlsZXNQYXRoID0gJEVOVnsnUFJPR1JBTUZJTEVTKFg4NiknfSB8fCAkRU5WeydQ Uk9HUkFNRklMRVMnfSB8fCAiQzpcXFByb2dyYW0gRmlsZXMiOwotICAgIGlmICgkRU5WeydWU0lO U1RBTExESVInfSkgewotICAgICAgICAkdnNJbnN0YWxsRGlyID0gJEVOVnsnVlNJTlNUQUxMRElS J307Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgJHZzSW5zdGFsbERpciA9IEZpbGU6OlNwZWMtPmNh dGRpcigkcHJvZ3JhbUZpbGVzUGF0aCwgIk1pY3Jvc29mdCBWaXN1YWwgU3R1ZGlvIDgiKTsKLSAg ICB9Ci0gICAgY2hvbXAoJHZzSW5zdGFsbERpciA9IGBjeWdwYXRoICIkdnNJbnN0YWxsRGlyImAp IGlmIGlzQ3lnd2luKCk7CisgICAgZGV0ZXJtaW5lVmlzdWFsU3R1ZGlvSW5zdGFsbERpcigpOwor ICAgIG15ICRwcm9ncmFtRmlsZXNQYXRoID0gcHJvZ3JhbUZpbGVzUGF0aCgpOwogICAgICR2Y0J1 aWxkUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJHZzSW5zdGFsbERpciwgcXcoQ29tbW9uNyBJ REUgZGV2ZW52LmNvbSkpOwogICAgIGlmICgtZSAkdmNCdWlsZFBhdGgpIHsKICAgICAgICAgIyBW aXN1YWwgU3R1ZGlvIGlzIGluc3RhbGxlZDsgd2UgY2FuIHVzZSBwZGV2ZW52IHRvIGJ1aWxkLgo= 201750 2013-05-14 13:21:17 -0700 2013-05-14 13:31:14 -0700 Patch bug-116114-20130514132014.patch text/plain 4099 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MDA4MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEzLTA1LTE0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBJZGVudGlmeSBwcm9wZXIgcnVuIGVudmlyb25tZW50IGZv ciBzY3JpcHRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE2MTE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRGV0ZXJtaW5lIChiYXNlZCBvbiBWaXN1YWwgU3R1ZGlvIHZlcnNpb24pIHdoaWNoIHBhdGgg dG8gdXNlIGZvcgorICAgICAgICBleGVjdXRhYmxlcyAoYmluIHZlcnN1cyBiaW4zMikuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVWaXN1YWxT dHVkaW9JbnN0YWxsRGlyKTogQWRkZWQuCisgICAgICAgIChkZXRlcm1pbmVWaXN1YWxTdHVkaW9W ZXJzaW9uKTogQWRkZWQuCisgICAgICAgIChkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJvZHVjdERp cik6IE1vZGlmaWVkIHRvIGNob29zZSBwcm9wZXIgYmluCisgICAgICAgIG9yIGJpbjMyIGRpcmVj dG9yeS4KKyAgICAgICAgKHZpc3VhbFN0dWRpb1ZlcnNpb24pOiBBZGRlZAorICAgICAgICAoc2V0 dXBDeWd3aW5FbnYpOiBNb2RpZmllZCB0byB1c2UgbmV3IGRldGVybWluZVZpc3VhbFN0dWRpb0lu c3RhbGxEaXIKKwogMjAxMy0wNS0xNCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNv bT4KIAogICAgICAgICBbV2luZG93c10gU3dpdGNoIHRvIGVtYmVkZGVkIG1hbmlmZXN0IGNvbW1h bmRzIGZvciBsYXVuY2hlciBleGVjdXRhYmxlcy4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlz aW9uIDE1MDA4MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5 KQpAQCAtMTA0LDcgKzEwNCwxMCBAQCBteSAkc2hvdWxkVXNlR3VhcmRNYWxsb2M7CiBteSAkeGNv ZGVWZXJzaW9uOwogCiAjIFZhcmlhYmxlcyBmb3IgV2luMzIgc3VwcG9ydAorbXkgJHByb2dyYW1G aWxlc1BhdGg7CiBteSAkdmNCdWlsZFBhdGg7CitteSAkdnNJbnN0YWxsRGlyOworbXkgJHZzVmVy c2lvbjsKIG15ICR3aW5kb3dzU291cmNlRGlyOwogbXkgJHdpblZlcnNpb247CiBteSAkd2lsbFVz ZVZDRXhwcmVzc1doZW5CdWlsZGluZyA9IDA7CkBAIC00MTEsNiArNDE0LDM1IEBAIHN1YiB4Y29k ZVNESwogICAgIHJldHVybiAkeGNvZGVTREs7CiB9CiAKK3N1YiBkZXRlcm1pbmVQcm9ncmFtRmls ZXNQYXRoCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQgJHByb2dyYW1GaWxlc1BhdGg7CisKKyAg ICAkcHJvZ3JhbUZpbGVzUGF0aCA9ICRFTlZ7J1BST0dSQU1GSUxFUyhYODYpJ30gfHwgJEVOVnsn UFJPR1JBTUZJTEVTJ30gfHwgIkM6XFxQcm9ncmFtIEZpbGVzIjsKK30KKworc3ViIGRldGVybWlu ZVZpc3VhbFN0dWRpb0luc3RhbGxEaXIKK3sKKyAgICByZXR1cm4gaWYgZGVmaW5lZCAkdnNJbnN0 YWxsRGlyOworCisgICAgaWYgKCRFTlZ7J1ZTSU5TVEFMTERJUid9KSB7CisgICAgICAgICR2c0lu c3RhbGxEaXIgPSAkRU5WeydWU0lOU1RBTExESVInfTsKKyAgICAgICAgJHZzSW5zdGFsbERpciA9 fiBzfFtcXC9dJHx8OworICAgIH0gZWxzZSB7CisgICAgICAgICR2c0luc3RhbGxEaXIgPSBGaWxl OjpTcGVjLT5jYXRkaXIocHJvZ3JhbUZpbGVzUGF0aCgpLCAiTWljcm9zb2Z0IFZpc3VhbCBTdHVk aW8gOCIpOworICAgIH0KKyAgICBjaG9tcCgkdnNJbnN0YWxsRGlyID0gYGN5Z3BhdGggIiR2c0lu c3RhbGxEaXIiYCkgaWYgaXNDeWd3aW4oKTsKK30KKworc3ViIGRldGVybWluZVZpc3VhbFN0dWRp b1ZlcnNpb24KK3sKKyAgICByZXR1cm4gaWYgZGVmaW5lZCAkdnNWZXJzaW9uOworCisgICAgZGV0 ZXJtaW5lVmlzdWFsU3R1ZGlvSW5zdGFsbERpcigpOworCisgICAgJHZzVmVyc2lvbiA9ICgkdnNJ bnN0YWxsRGlyID1+IC9NaWNyb3NvZnQgVmlzdWFsIFN0dWRpbyAoWzAtOV0rXC5bMC05XSopLykg PyAkMSA6ICI4IjsKK30KKwogc3ViIGRldGVybWluZUNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVk aW8KIHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCAkY29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRp bzsKQEAgLTQzNCw3ICs0NjYsOCBAQCBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvblByb2R1Y3RE aXIKICAgICBkZXRlcm1pbmVCYXNlUHJvZHVjdERpcigpOwogICAgIGRldGVybWluZUNvbmZpZ3Vy YXRpb24oKTsKICAgICBpZiAoaXNBcHBsZVdpbldlYktpdCgpKSB7Ci0gICAgICAgICRjb25maWd1 cmF0aW9uUHJvZHVjdERpciA9IEZpbGU6OlNwZWMtPmNhdGRpcigkYmFzZVByb2R1Y3REaXIsIGNv bmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKSwgImJpbiIpOworICAgICAgICBteSAkYmluRGly ID0gKHZpc3VhbFN0dWRpb1ZlcnNpb24oKSBlcSAiOCIpID8gImJpbiIgOiAiYmluMzIiOworICAg ICAgICAkY29uZmlndXJhdGlvblByb2R1Y3REaXIgPSBGaWxlOjpTcGVjLT5jYXRkaXIoJGJhc2VQ cm9kdWN0RGlyLCBjb25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGlvKCksICRiaW5EaXIpOwogICAg IH0gZWxzZSB7CiAgICAgICAgIGlmICh1c2VzUGVyQ29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5 KCkpIHsKICAgICAgICAgICAgICRjb25maWd1cmF0aW9uUHJvZHVjdERpciA9ICIkYmFzZVByb2R1 Y3REaXIiOwpAQCAtNDk5LDYgKzUzMiwxOCBAQCBzdWIgY29uZmlndXJhdGlvbigpCiAgICAgcmV0 dXJuICRjb25maWd1cmF0aW9uOwogfQogCitzdWIgcHJvZ3JhbUZpbGVzUGF0aCgpCit7CisgICAg ZGV0ZXJtaW5lUHJvZ3JhbUZpbGVzUGF0aCgpOworICAgIHJldHVybiAkcHJvZ3JhbUZpbGVzUGF0 aDsKK30KKworc3ViIHZpc3VhbFN0dWRpb1ZlcnNpb24oKQoreworICAgIGRldGVybWluZVZpc3Vh bFN0dWRpb1ZlcnNpb24oKTsKKyAgICByZXR1cm4gJHZzVmVyc2lvbjsKK30KKwogc3ViIGNvbmZp Z3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKQogewogICAgIGRldGVybWluZUNvbmZpZ3VyYXRpb25G b3JWaXN1YWxTdHVkaW8oKTsKQEAgLTE1OTEsMTQgKzE2MzYsOCBAQCBzdWIgc2V0dXBDeWd3aW5F bnYoKQogICAgIHJldHVybiBpZiAhaXNDeWd3aW4oKSAmJiAhaXNXaW5kb3dzKCk7CiAgICAgcmV0 dXJuIGlmICR2Y0J1aWxkUGF0aDsKIAotICAgIG15ICR2c0luc3RhbGxEaXI7Ci0gICAgbXkgJHBy b2dyYW1GaWxlc1BhdGggPSAkRU5WeydQUk9HUkFNRklMRVMoWDg2KSd9IHx8ICRFTlZ7J1BST0dS QU1GSUxFUyd9IHx8ICJDOlxcUHJvZ3JhbSBGaWxlcyI7Ci0gICAgaWYgKCRFTlZ7J1ZTSU5TVEFM TERJUid9KSB7Ci0gICAgICAgICR2c0luc3RhbGxEaXIgPSAkRU5WeydWU0lOU1RBTExESVInfTsK LSAgICB9IGVsc2UgewotICAgICAgICAkdnNJbnN0YWxsRGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGly KCRwcm9ncmFtRmlsZXNQYXRoLCAiTWljcm9zb2Z0IFZpc3VhbCBTdHVkaW8gOCIpOwotICAgIH0K LSAgICBjaG9tcCgkdnNJbnN0YWxsRGlyID0gYGN5Z3BhdGggIiR2c0luc3RhbGxEaXIiYCkgaWYg aXNDeWd3aW4oKTsKKyAgICBkZXRlcm1pbmVWaXN1YWxTdHVkaW9JbnN0YWxsRGlyKCk7CisgICAg bXkgJHByb2dyYW1GaWxlc1BhdGggPSBwcm9ncmFtRmlsZXNQYXRoKCk7CiAgICAgJHZjQnVpbGRQ YXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkdnNJbnN0YWxsRGlyLCBxdyhDb21tb243IElERSBk ZXZlbnYuY29tKSk7CiAgICAgaWYgKC1lICR2Y0J1aWxkUGF0aCkgewogICAgICAgICAjIFZpc3Vh bCBTdHVkaW8gaXMgaW5zdGFsbGVkOyB3ZSBjYW4gdXNlIHBkZXZlbnYgdG8gYnVpbGQuCg== 201753 2013-05-14 13:31:16 -0700 2013-05-14 13:32:39 -0700 Patch bug-116114-20130514133013.patch text/plain 4402 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MDA4MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEzLTA1LTE0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBJZGVudGlmeSBwcm9wZXIgcnVuIGVudmlyb25tZW50IGZv ciBzY3JpcHRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE2MTE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRGV0ZXJtaW5lIChiYXNlZCBvbiBWaXN1YWwgU3R1ZGlvIHZlcnNpb24pIHdoaWNoIHBhdGgg dG8gdXNlIGZvcgorICAgICAgICBleGVjdXRhYmxlcyAoYmluIHZlcnN1cyBiaW4zMikuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVWaXN1YWxT dHVkaW9JbnN0YWxsRGlyKTogQWRkZWQuCisgICAgICAgIChkZXRlcm1pbmVWaXN1YWxTdHVkaW9W ZXJzaW9uKTogQWRkZWQuCisgICAgICAgIChkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJvZHVjdERp cik6IE1vZGlmaWVkIHRvIGNob29zZSBwcm9wZXIgYmluCisgICAgICAgIG9yIGJpbjMyIGRpcmVj dG9yeS4KKyAgICAgICAgKHZpc3VhbFN0dWRpb1ZlcnNpb24pOiBBZGRlZAorICAgICAgICAoc2V0 dXBDeWd3aW5FbnYpOiBNb2RpZmllZCB0byB1c2UgbmV3IGRldGVybWluZVZpc3VhbFN0dWRpb0lu c3RhbGxEaXIKKwogMjAxMy0wNS0xNCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNv bT4KIAogICAgICAgICBbV2luZG93c10gU3dpdGNoIHRvIGVtYmVkZGVkIG1hbmlmZXN0IGNvbW1h bmRzIGZvciBsYXVuY2hlciBleGVjdXRhYmxlcy4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlz aW9uIDE1MDA4MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5 KQpAQCAtMTA0LDcgKzEwNCwxMCBAQCBteSAkc2hvdWxkVXNlR3VhcmRNYWxsb2M7CiBteSAkeGNv ZGVWZXJzaW9uOwogCiAjIFZhcmlhYmxlcyBmb3IgV2luMzIgc3VwcG9ydAorbXkgJHByb2dyYW1G aWxlc1BhdGg7CiBteSAkdmNCdWlsZFBhdGg7CitteSAkdnNJbnN0YWxsRGlyOworbXkgJHZzVmVy c2lvbjsKIG15ICR3aW5kb3dzU291cmNlRGlyOwogbXkgJHdpblZlcnNpb247CiBteSAkd2lsbFVz ZVZDRXhwcmVzc1doZW5CdWlsZGluZyA9IDA7CkBAIC00MTEsNiArNDE0LDM1IEBAIHN1YiB4Y29k ZVNESwogICAgIHJldHVybiAkeGNvZGVTREs7CiB9CiAKK3N1YiBwcm9ncmFtRmlsZXNQYXRoCit7 CisgICAgcmV0dXJuICRwcm9ncmFtRmlsZXNQYXRoIGlmIGRlZmluZWQgJHByb2dyYW1GaWxlc1Bh dGg7CisKKyAgICAkcHJvZ3JhbUZpbGVzUGF0aCA9ICRFTlZ7J1BST0dSQU1GSUxFUyhYODYpJ30g fHwgJEVOVnsnUFJPR1JBTUZJTEVTJ30gfHwgIkM6XFxQcm9ncmFtIEZpbGVzIjsKK30KKworc3Vi IHZpc3VhbFN0dWRpb0luc3RhbGxEaXIKK3sKKyAgICByZXR1cm4gJHZzSW5zdGFsbERpciBpZiBk ZWZpbmVkICR2c0luc3RhbGxEaXI7CisKKyAgICBpZiAoJEVOVnsnVlNJTlNUQUxMRElSJ30pIHsK KyAgICAgICAgJHZzSW5zdGFsbERpciA9ICRFTlZ7J1ZTSU5TVEFMTERJUid9OworICAgICAgICAk dnNJbnN0YWxsRGlyID1+IHN8W1xcL10kfHw7CisgICAgfSBlbHNlIHsKKyAgICAgICAgJHZzSW5z dGFsbERpciA9IEZpbGU6OlNwZWMtPmNhdGRpcihwcm9ncmFtRmlsZXNQYXRoKCksICJNaWNyb3Nv ZnQgVmlzdWFsIFN0dWRpbyA4Iik7CisgICAgfQorICAgIGNob21wKCR2c0luc3RhbGxEaXIgPSBg Y3lncGF0aCAiJHZzSW5zdGFsbERpciJgKSBpZiBpc0N5Z3dpbigpOworfQorCitzdWIgdmlzdWFs U3R1ZGlvVmVyc2lvbgoreworICAgIHJldHVybiBpZiBkZWZpbmVkICR2c1ZlcnNpb247CisKKyAg ICBteSAkaW5zdGFsbERpciA9IHZpc3VhbFN0dWRpb0luc3RhbGxEaXIoKTsKKworICAgICR2c1Zl cnNpb24gPSAoJGluc3RhbGxEaXIgPX4gL01pY3Jvc29mdCBWaXN1YWwgU3R1ZGlvIChbMC05XStc LlswLTldKikvKSA/ICQxIDogIjgiOworfQorCiBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbkZv clZpc3VhbFN0dWRpbwogewogICAgIHJldHVybiBpZiBkZWZpbmVkICRjb25maWd1cmF0aW9uRm9y VmlzdWFsU3R1ZGlvOwpAQCAtNDM0LDcgKzQ2Niw4IEBAIHN1YiBkZXRlcm1pbmVDb25maWd1cmF0 aW9uUHJvZHVjdERpcgogICAgIGRldGVybWluZUJhc2VQcm9kdWN0RGlyKCk7CiAgICAgZGV0ZXJt aW5lQ29uZmlndXJhdGlvbigpOwogICAgIGlmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKLSAgICAg ICAgJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRiYXNlUHJv ZHVjdERpciwgY29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbygpLCAiYmluIik7CisgICAgICAg IG15ICRiaW5EaXIgPSAodmlzdWFsU3R1ZGlvVmVyc2lvbigpIGVxICI4IikgPyAiYmluIiA6ICJi aW4zMiI7CisgICAgICAgICRjb25maWd1cmF0aW9uUHJvZHVjdERpciA9IEZpbGU6OlNwZWMtPmNh dGRpcigkYmFzZVByb2R1Y3REaXIsIGNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKSwgJGJp bkRpcik7CiAgICAgfSBlbHNlIHsKICAgICAgICAgaWYgKHVzZXNQZXJDb25maWd1cmF0aW9uQnVp bGREaXJlY3RvcnkoKSkgewogICAgICAgICAgICAgJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyID0g IiRiYXNlUHJvZHVjdERpciI7CkBAIC0xNTkxLDIyICsxNjI0LDE1IEBAIHN1YiBzZXR1cEN5Z3dp bkVudigpCiAgICAgcmV0dXJuIGlmICFpc0N5Z3dpbigpICYmICFpc1dpbmRvd3MoKTsKICAgICBy ZXR1cm4gaWYgJHZjQnVpbGRQYXRoOwogCi0gICAgbXkgJHZzSW5zdGFsbERpcjsKLSAgICBteSAk cHJvZ3JhbUZpbGVzUGF0aCA9ICRFTlZ7J1BST0dSQU1GSUxFUyhYODYpJ30gfHwgJEVOVnsnUFJP R1JBTUZJTEVTJ30gfHwgIkM6XFxQcm9ncmFtIEZpbGVzIjsKLSAgICBpZiAoJEVOVnsnVlNJTlNU QUxMRElSJ30pIHsKLSAgICAgICAgJHZzSW5zdGFsbERpciA9ICRFTlZ7J1ZTSU5TVEFMTERJUid9 OwotICAgIH0gZWxzZSB7Ci0gICAgICAgICR2c0luc3RhbGxEaXIgPSBGaWxlOjpTcGVjLT5jYXRk aXIoJHByb2dyYW1GaWxlc1BhdGgsICJNaWNyb3NvZnQgVmlzdWFsIFN0dWRpbyA4Iik7Ci0gICAg fQotICAgIGNob21wKCR2c0luc3RhbGxEaXIgPSBgY3lncGF0aCAiJHZzSW5zdGFsbERpciJgKSBp ZiBpc0N5Z3dpbigpOwotICAgICR2Y0J1aWxkUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJHZz SW5zdGFsbERpciwgcXcoQ29tbW9uNyBJREUgZGV2ZW52LmNvbSkpOworICAgIG15ICRwcm9ncmFt RmlsZXNQYXRoID0gcHJvZ3JhbUZpbGVzUGF0aCgpOworICAgICR2Y0J1aWxkUGF0aCA9IEZpbGU6 OlNwZWMtPmNhdGZpbGUodmlzdWFsU3R1ZGlvSW5zdGFsbERpcigpLCBxdyhDb21tb243IElERSBk ZXZlbnYuY29tKSk7CiAgICAgaWYgKC1lICR2Y0J1aWxkUGF0aCkgewogICAgICAgICAjIFZpc3Vh bCBTdHVkaW8gaXMgaW5zdGFsbGVkOyB3ZSBjYW4gdXNlIHBkZXZlbnYgdG8gYnVpbGQuCiAgICAg ICAgICMgRklYTUU6IE1ha2UgcGRldmVudiB3b3JrIHdpdGggbm9uLUN5Z3dpbiBQZXJsLgogICAg ICAgICAkdmNCdWlsZFBhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxlKHNvdXJjZURpcigpLCBxdyhU b29scyBTY3JpcHRzIHBkZXZlbnYpKSBpZiBpc0N5Z3dpbigpOwogICAgIH0gZWxzZSB7CiAgICAg ICAgICMgVmlzdWFsIFN0dWRpbyBub3QgZm91bmQsIHRyeSBWQysrIEV4cHJlc3MKLSAgICAgICAg JHZjQnVpbGRQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkdnNJbnN0YWxsRGlyLCBxdyhDb21t b243IElERSBWQ0V4cHJlc3MuZXhlKSk7CisgICAgICAgICR2Y0J1aWxkUGF0aCA9IEZpbGU6OlNw ZWMtPmNhdGZpbGUodmlzdWFsU3R1ZGlvSW5zdGFsbERpcigpLCBxdyhDb21tb243IElERSBWQ0V4 cHJlc3MuZXhlKSk7CiAgICAgICAgIGlmICghIC1lICR2Y0J1aWxkUGF0aCkgewogICAgICAgICAg ICAgcHJpbnQgIioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKipcbiI7CiAgICAgICAgICAgICBwcmludCAiQ2Fubm90IGZpbmQgJyR2Y0J1 aWxkUGF0aCdcbiI7Cg== 201754 2013-05-14 13:32:41 -0700 2013-05-14 16:03:23 -0700 Patch bug-116114-20130514133138.patch text/plain 4413 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MDA4MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEzLTA1LTE0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBJZGVudGlmeSBwcm9wZXIgcnVuIGVudmlyb25tZW50IGZv ciBzY3JpcHRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE2MTE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRGV0ZXJtaW5lIChiYXNlZCBvbiBWaXN1YWwgU3R1ZGlvIHZlcnNpb24pIHdoaWNoIHBhdGgg dG8gdXNlIGZvcgorICAgICAgICBleGVjdXRhYmxlcyAoYmluIHZlcnN1cyBiaW4zMikuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVWaXN1YWxT dHVkaW9JbnN0YWxsRGlyKTogQWRkZWQuCisgICAgICAgIChkZXRlcm1pbmVWaXN1YWxTdHVkaW9W ZXJzaW9uKTogQWRkZWQuCisgICAgICAgIChkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJvZHVjdERp cik6IE1vZGlmaWVkIHRvIGNob29zZSBwcm9wZXIgYmluCisgICAgICAgIG9yIGJpbjMyIGRpcmVj dG9yeS4KKyAgICAgICAgKHZpc3VhbFN0dWRpb1ZlcnNpb24pOiBBZGRlZAorICAgICAgICAoc2V0 dXBDeWd3aW5FbnYpOiBNb2RpZmllZCB0byB1c2UgbmV3IGRldGVybWluZVZpc3VhbFN0dWRpb0lu c3RhbGxEaXIKKwogMjAxMy0wNS0xNCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNv bT4KIAogICAgICAgICBbV2luZG93c10gU3dpdGNoIHRvIGVtYmVkZGVkIG1hbmlmZXN0IGNvbW1h bmRzIGZvciBsYXVuY2hlciBleGVjdXRhYmxlcy4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlz aW9uIDE1MDA4MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5 KQpAQCAtMTA0LDcgKzEwNCwxMCBAQCBteSAkc2hvdWxkVXNlR3VhcmRNYWxsb2M7CiBteSAkeGNv ZGVWZXJzaW9uOwogCiAjIFZhcmlhYmxlcyBmb3IgV2luMzIgc3VwcG9ydAorbXkgJHByb2dyYW1G aWxlc1BhdGg7CiBteSAkdmNCdWlsZFBhdGg7CitteSAkdnNJbnN0YWxsRGlyOworbXkgJHZzVmVy c2lvbjsKIG15ICR3aW5kb3dzU291cmNlRGlyOwogbXkgJHdpblZlcnNpb247CiBteSAkd2lsbFVz ZVZDRXhwcmVzc1doZW5CdWlsZGluZyA9IDA7CkBAIC00MTEsNiArNDE0LDM1IEBAIHN1YiB4Y29k ZVNESwogICAgIHJldHVybiAkeGNvZGVTREs7CiB9CiAKK3N1YiBwcm9ncmFtRmlsZXNQYXRoCit7 CisgICAgcmV0dXJuICRwcm9ncmFtRmlsZXNQYXRoIGlmIGRlZmluZWQgJHByb2dyYW1GaWxlc1Bh dGg7CisKKyAgICAkcHJvZ3JhbUZpbGVzUGF0aCA9ICRFTlZ7J1BST0dSQU1GSUxFUyhYODYpJ30g fHwgJEVOVnsnUFJPR1JBTUZJTEVTJ30gfHwgIkM6XFxQcm9ncmFtIEZpbGVzIjsKK30KKworc3Vi IHZpc3VhbFN0dWRpb0luc3RhbGxEaXIKK3sKKyAgICByZXR1cm4gJHZzSW5zdGFsbERpciBpZiBk ZWZpbmVkICR2c0luc3RhbGxEaXI7CisKKyAgICBpZiAoJEVOVnsnVlNJTlNUQUxMRElSJ30pIHsK KyAgICAgICAgJHZzSW5zdGFsbERpciA9ICRFTlZ7J1ZTSU5TVEFMTERJUid9OworICAgICAgICAk dnNJbnN0YWxsRGlyID1+IHN8W1xcL10kfHw7CisgICAgfSBlbHNlIHsKKyAgICAgICAgJHZzSW5z dGFsbERpciA9IEZpbGU6OlNwZWMtPmNhdGRpcihwcm9ncmFtRmlsZXNQYXRoKCksICJNaWNyb3Nv ZnQgVmlzdWFsIFN0dWRpbyA4Iik7CisgICAgfQorICAgIGNob21wKCR2c0luc3RhbGxEaXIgPSBg Y3lncGF0aCAiJHZzSW5zdGFsbERpciJgKSBpZiBpc0N5Z3dpbigpOworfQorCitzdWIgdmlzdWFs U3R1ZGlvVmVyc2lvbgoreworICAgIHJldHVybiAkdnNWZXJzaW9uIGlmIGRlZmluZWQgJHZzVmVy c2lvbjsKKworICAgIG15ICRpbnN0YWxsRGlyID0gdmlzdWFsU3R1ZGlvSW5zdGFsbERpcigpOwor CisgICAgJHZzVmVyc2lvbiA9ICgkaW5zdGFsbERpciA9fiAvTWljcm9zb2Z0IFZpc3VhbCBTdHVk aW8gKFswLTldK1wuWzAtOV0qKS8pID8gJDEgOiAiOCI7Cit9CisKIHN1YiBkZXRlcm1pbmVDb25m aWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGlvCiB7CiAgICAgcmV0dXJuIGlmIGRlZmluZWQgJGNvbmZp Z3VyYXRpb25Gb3JWaXN1YWxTdHVkaW87CkBAIC00MzQsNyArNDY2LDggQEAgc3ViIGRldGVybWlu ZUNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyCiAgICAgZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIoKTsK ICAgICBkZXRlcm1pbmVDb25maWd1cmF0aW9uKCk7CiAgICAgaWYgKGlzQXBwbGVXaW5XZWJLaXQo KSkgewotICAgICAgICAkY29uZmlndXJhdGlvblByb2R1Y3REaXIgPSBGaWxlOjpTcGVjLT5jYXRk aXIoJGJhc2VQcm9kdWN0RGlyLCBjb25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGlvKCksICJiaW4i KTsKKyAgICAgICAgbXkgJGJpbkRpciA9ICh2aXN1YWxTdHVkaW9WZXJzaW9uKCkgZXEgIjgiKSA/ ICJiaW4iIDogImJpbjMyIjsKKyAgICAgICAgJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyID0gRmls ZTo6U3BlYy0+Y2F0ZGlyKCRiYXNlUHJvZHVjdERpciwgY29uZmlndXJhdGlvbkZvclZpc3VhbFN0 dWRpbygpLCAkYmluRGlyKTsKICAgICB9IGVsc2UgewogICAgICAgICBpZiAodXNlc1BlckNvbmZp Z3VyYXRpb25CdWlsZERpcmVjdG9yeSgpKSB7CiAgICAgICAgICAgICAkY29uZmlndXJhdGlvblBy b2R1Y3REaXIgPSAiJGJhc2VQcm9kdWN0RGlyIjsKQEAgLTE1OTEsMjIgKzE2MjQsMTUgQEAgc3Vi IHNldHVwQ3lnd2luRW52KCkKICAgICByZXR1cm4gaWYgIWlzQ3lnd2luKCkgJiYgIWlzV2luZG93 cygpOwogICAgIHJldHVybiBpZiAkdmNCdWlsZFBhdGg7CiAKLSAgICBteSAkdnNJbnN0YWxsRGly OwotICAgIG15ICRwcm9ncmFtRmlsZXNQYXRoID0gJEVOVnsnUFJPR1JBTUZJTEVTKFg4NiknfSB8 fCAkRU5WeydQUk9HUkFNRklMRVMnfSB8fCAiQzpcXFByb2dyYW0gRmlsZXMiOwotICAgIGlmICgk RU5WeydWU0lOU1RBTExESVInfSkgewotICAgICAgICAkdnNJbnN0YWxsRGlyID0gJEVOVnsnVlNJ TlNUQUxMRElSJ307Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgJHZzSW5zdGFsbERpciA9IEZpbGU6 OlNwZWMtPmNhdGRpcigkcHJvZ3JhbUZpbGVzUGF0aCwgIk1pY3Jvc29mdCBWaXN1YWwgU3R1ZGlv IDgiKTsKLSAgICB9Ci0gICAgY2hvbXAoJHZzSW5zdGFsbERpciA9IGBjeWdwYXRoICIkdnNJbnN0 YWxsRGlyImApIGlmIGlzQ3lnd2luKCk7Ci0gICAgJHZjQnVpbGRQYXRoID0gRmlsZTo6U3BlYy0+ Y2F0ZmlsZSgkdnNJbnN0YWxsRGlyLCBxdyhDb21tb243IElERSBkZXZlbnYuY29tKSk7CisgICAg bXkgJHByb2dyYW1GaWxlc1BhdGggPSBwcm9ncmFtRmlsZXNQYXRoKCk7CisgICAgJHZjQnVpbGRQ YXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSh2aXN1YWxTdHVkaW9JbnN0YWxsRGlyKCksIHF3KENv bW1vbjcgSURFIGRldmVudi5jb20pKTsKICAgICBpZiAoLWUgJHZjQnVpbGRQYXRoKSB7CiAgICAg ICAgICMgVmlzdWFsIFN0dWRpbyBpcyBpbnN0YWxsZWQ7IHdlIGNhbiB1c2UgcGRldmVudiB0byBi dWlsZC4KICAgICAgICAgIyBGSVhNRTogTWFrZSBwZGV2ZW52IHdvcmsgd2l0aCBub24tQ3lnd2lu IFBlcmwuCiAgICAgICAgICR2Y0J1aWxkUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoc291cmNl RGlyKCksIHF3KFRvb2xzIFNjcmlwdHMgcGRldmVudikpIGlmIGlzQ3lnd2luKCk7CiAgICAgfSBl bHNlIHsKICAgICAgICAgIyBWaXN1YWwgU3R1ZGlvIG5vdCBmb3VuZCwgdHJ5IFZDKysgRXhwcmVz cwotICAgICAgICAkdmNCdWlsZFBhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCR2c0luc3RhbGxE aXIsIHF3KENvbW1vbjcgSURFIFZDRXhwcmVzcy5leGUpKTsKKyAgICAgICAgJHZjQnVpbGRQYXRo ID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSh2aXN1YWxTdHVkaW9JbnN0YWxsRGlyKCksIHF3KENvbW1v bjcgSURFIFZDRXhwcmVzcy5leGUpKTsKICAgICAgICAgaWYgKCEgLWUgJHZjQnVpbGRQYXRoKSB7 CiAgICAgICAgICAgICBwcmludCAiKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKlxuIjsKICAgICAgICAgICAgIHByaW50ICJDYW5ub3Qg ZmluZCAnJHZjQnVpbGRQYXRoJ1xuIjsK