135728 2014-08-07 15:09:46 -0700 Web Inspector: Combine and minify Esprima 2014-08-07 23:49:13 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy commit-queue graouts joepeck saam timothy webkit-bug-importer oldest_to_newest 1027649 0 timothy 2014-08-07 15:09:46 -0700 We should minify Esprima. <rdar://problem/17879560> 1027651 1 236231 timothy 2014-08-07 15:10:50 -0700 Created attachment 236231 Patch 1027680 2 236231 joepeck 2014-08-07 16:11:30 -0700 Comment on attachment 236231 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236231&action=review r=me > Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl:99 > +open(ESLFILE, '<', $esprimaLicenseFile) or die "Unable to open $$esprimaLicenseFile: $!"; Nit: I think the $$ here is unexpected. > Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl:105 > +$ESPRIMA_LICENSE .= " */\n"; We could make this block a function so we can share with the CodeMirror block. They are identical. 1027684 3 236239 timothy 2014-08-07 16:30:05 -0700 Created attachment 236239 Patch 1027702 4 236239 commit-queue 2014-08-07 17:04:42 -0700 Comment on attachment 236239 Patch Rejecting attachment 236239 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'build', '--no-clean', '--no-update', '--build-style=release', '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: Volumes/Data/EWS/WebKit/Source/WebInspectorUI/UserInterface/External/Esprima/LICENSE: No such file or directory at /Volumes/Data/EWS/WebKit/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl line 45. Command /bin/sh failed with exit code 2 ** BUILD FAILED ** The following build commands failed: PhaseScriptExecution Copy\ User\ Interface\ Resources /Volumes/Data/EWS/WebKit/WebKitBuild/WebInspectorUI.build/Release/WebInspectorUI.build/Script-1C60FF1214E6D9AF006CD77D.sh (1 failure) Full output: http://webkit-queues.appspot.com/results/6215676310061056 1027729 5 joepeck 2014-08-07 18:40:27 -0700 (In reply to comment #4) > (From update of attachment 236239 [details]) > Rejecting attachment 236239 [details] from commit-queue. > > Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'build', '--no-clean', '--no-update', '--build-style=release', '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit > > Last 500 characters of output: > Volumes/Data/EWS/WebKit/Source/WebInspectorUI/UserInterface/External/Esprima/LICENSE: No such file or directory at /Volumes/Data/EWS/WebKit/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl line 45. This new patch is missing the LICENSE file. 1027783 6 236267 timothy 2014-08-07 23:09:12 -0700 Created attachment 236267 Patch 1027784 7 timothy 2014-08-07 23:09:22 -0700 Doh! 1027799 8 236267 commit-queue 2014-08-07 23:49:10 -0700 Comment on attachment 236267 Patch Clearing flags on attachment: 236267 Committed r172331: <http://trac.webkit.org/changeset/172331> 1027800 9 commit-queue 2014-08-07 23:49:13 -0700 All reviewed patches have been landed. Closing bug. 236231 2014-08-07 15:10:50 -0700 2014-08-07 16:30:01 -0700 Patch bug-135728-20140807151038.patch text/plain 9286 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBk ZWNkMmE1MTQ3NTFhYTRhMDVmMDFkZGIxYmE1ZmJjNzk4ZjJhNzUxLi41ZTY5OTNmNjQ0YmY1OGI3 N2M1YTA4MWEzMWY2ZTg4MGQwMTIxNTI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxNiBAQAogMjAxNC0wOC0wNyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ29tYmluZSBhbmQgbWluaWZ5IEVzcHJpbWEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTcyOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0 cy9jb21iaW5lLXJlc291cmNlcy5wbDoKKyAgICAgICAgKiBTY3JpcHRzL2NvcHktdXNlci1pbnRl cmZhY2UtcmVzb3VyY2VzLnBsOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvRXh0ZXJuYWwvRXNw cmltYS9MSUNFTlNFOiBBZGRlZC4KKworMjAxNC0wOC0wNyAgVGltb3RoeSBIYXRjaGVyICA8dGlt b3RoeUBhcHBsZS5jb20+CisKICAgICAgICAgRml4IHJlZmVyZW5jZSB0byBtaXNzaW5nIENsb3Nl VGltZWxpbmUuc3ZnIGltYWdlLgogCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IEpvc2VwaCBQ ZWNvcmFyby4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvbWJp bmUtcmVzb3VyY2VzLnBsIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1NjcmlwdHMvY29tYmluZS1y ZXNvdXJjZXMucGwKaW5kZXggM2UwOTk0ZGIzODE5MDI5OTBkNWI3ZjdlMDU4ZmIwM2VlZjQ0YTQ1 OC4uNWFkZDNmYzcyMWU5YjA3ODhkYTU4N2NlN2RkODU2Mzc0ZTFiOGFkMSAxMDA3NTUKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1NjcmlwdHMvY29tYmluZS1yZXNvdXJjZXMucGwKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1NjcmlwdHMvY29tYmluZS1yZXNvdXJjZXMucGwKQEAgLTIx LDggKzIxLDggQEAgR2V0T3B0aW9ucygnb3V0cHV0LWRpcj1zJyA9PiBcJG91dHB1dERpcmVjdG9y eSwKICAgICAgICAgICAgJ2lucHV0LWh0bWwtZGlyPXMnID0+IFwkaHRtbERpcmVjdG9yeSwKICAg ICAgICAgICAgJ2lucHV0LWh0bWw9cycgPT4gXCRodG1sRmlsZSk7CiAKLXVubGVzcyAoZGVmaW5l ZCAkaHRtbEZpbGUgYW5kIGRlZmluZWQgJGRlcml2ZWRTb3VyY2VzRGlyZWN0b3J5IGFuZCBkZWZp bmVkICRvdXRwdXREaXJlY3RvcnkgYW5kIGRlZmluZWQgJG91dHB1dFNjcmlwdE5hbWUgYW5kIGRl ZmluZWQgJG91dHB1dFN0eWxlc2hlZXROYW1lKSB7Ci0gICAgcHJpbnQgIlVzYWdlOiAkMCAtLWlu cHV0LWh0bWwgPHBhdGg+IC0tZGVyaXZlZC1zb3VyY2VzLWRpciA8cGF0aD4gLS1vdXRwdXQtZGly IDxwYXRoPiAtLW91dHB1dC1zY3JpcHQtbmFtZSA8bmFtZT4gLS1vdXRwdXQtc3R5bGUtbmFtZSA8 bmFtZT5cbiI7Cit1bmxlc3MgKGRlZmluZWQgJGh0bWxGaWxlIGFuZCBkZWZpbmVkICRkZXJpdmVk U291cmNlc0RpcmVjdG9yeSBhbmQgZGVmaW5lZCAkb3V0cHV0RGlyZWN0b3J5IGFuZCAoZGVmaW5l ZCAkb3V0cHV0U2NyaXB0TmFtZSBvciBkZWZpbmVkICRvdXRwdXRTdHlsZXNoZWV0TmFtZSkpIHsK KyAgICBwcmludCAiVXNhZ2U6ICQwIC0taW5wdXQtaHRtbCA8cGF0aD4gLS1kZXJpdmVkLXNvdXJj ZXMtZGlyIDxwYXRoPiAtLW91dHB1dC1kaXIgPHBhdGg+IFstLW91dHB1dC1zY3JpcHQtbmFtZSA8 bmFtZT5dIFstLW91dHB1dC1zdHlsZS1uYW1lIDxuYW1lPl1cbiI7CiAgICAgZXhpdDsKIH0KIApA QCAtNzYsOCArNzYsOCBAQCBzdWIgY29uY2F0aW5hdGVGaWxlcygkJCQpCiBteSAkaW5wdXREaXJl Y3RvcnlQYXR0ZXJuID0gIig/IUV4dGVybmFsXC8pW15cIl0qIjsKICRpbnB1dERpcmVjdG9yeVBh dHRlcm4gPSAkaW5wdXREaXJlY3RvcnkgLiAiXC9bXlwiXSoiIGlmICRpbnB1dERpcmVjdG9yeTsK IAotY29uY2F0aW5hdGVGaWxlcygkb3V0cHV0U3R5bGVzaGVldE5hbWUsICI8bGluayByZWw9XCJz dHlsZXNoZWV0XCIgaHJlZj1cIigkaW5wdXREaXJlY3RvcnlQYXR0ZXJuKVwiPiIsICI8bGluayBy ZWw9XCJzdHlsZXNoZWV0XCIgaHJlZj1cIiRvdXRwdXRTdHlsZXNoZWV0TmFtZVwiPiIpOwotY29u Y2F0aW5hdGVGaWxlcygkb3V0cHV0U2NyaXB0TmFtZSwgIjxzY3JpcHQgc3JjPVwiKCRpbnB1dERp cmVjdG9yeVBhdHRlcm4pXCI+PFwvc2NyaXB0PiIsICI8c2NyaXB0IHNyYz1cIiRvdXRwdXRTY3Jp cHROYW1lXCI+PC9zY3JpcHQ+Iik7Citjb25jYXRpbmF0ZUZpbGVzKCRvdXRwdXRTdHlsZXNoZWV0 TmFtZSwgIjxsaW5rIHJlbD1cInN0eWxlc2hlZXRcIiBocmVmPVwiKCRpbnB1dERpcmVjdG9yeVBh dHRlcm4pXCI+IiwgIjxsaW5rIHJlbD1cInN0eWxlc2hlZXRcIiBocmVmPVwiJG91dHB1dFN0eWxl c2hlZXROYW1lXCI+IikgaWYgZGVmaW5lZCAkb3V0cHV0U3R5bGVzaGVldE5hbWU7Citjb25jYXRp bmF0ZUZpbGVzKCRvdXRwdXRTY3JpcHROYW1lLCAiPHNjcmlwdCBzcmM9XCIoJGlucHV0RGlyZWN0 b3J5UGF0dGVybilcIj48XC9zY3JpcHQ+IiwgIjxzY3JpcHQgc3JjPVwiJG91dHB1dFNjcmlwdE5h bWVcIj48L3NjcmlwdD4iKSBpZiBkZWZpbmVkICRvdXRwdXRTY3JpcHROYW1lOwogCiAkaHRtbENv bnRlbnRzID1+IHMvPGhlYWQ+Lio8XC9oZWFkPi88aGVhZD4kaGVhZENvbnRlbnRzPFwvaGVhZD4v c2k7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvcHktdXNl ci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1NjcmlwdHMv Y29weS11c2VyLWludGVyZmFjZS1yZXNvdXJjZXMucGwKaW5kZXggMDk0Y2Y4Y2RiOWM4MDM5NWQ2 ZjA4OGE0ZDhiZWNiY2I5MDExMDRiNy4uYjA0YmJmMGI1NjA1NGMzMjQ5ZDZiOTk3YWNhOTFhMDQ1 NDhhYjk0NCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1NjcmlwdHMvY29weS11 c2VyLWludGVyZmFjZS1yZXNvdXJjZXMucGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Nj cmlwdHMvY29weS11c2VyLWludGVyZmFjZS1yZXNvdXJjZXMucGwKQEAgLTg0LDYgKzg0LDcgQEAg bXkgJHVpUm9vdCA9IEZpbGU6OlNwZWMtPmNhdGRpcigkRU5WeydTUkNST09UJ30sICdVc2VySW50 ZXJmYWNlJyk7CiBteSAkdGFyZ2V0UmVzb3VyY2VQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRF TlZ7J1RBUkdFVF9CVUlMRF9ESVInfSwgJEVOVnsnVU5MT0NBTElaRURfUkVTT1VSQ0VTX0ZPTERF Ul9QQVRIJ30pOwogbXkgJHByb3RvY29sRGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCR0YXJnZXRS ZXNvdXJjZVBhdGgsICdQcm90b2NvbCcpOwogbXkgJGNvZGVNaXJyb3JQYXRoID0gRmlsZTo6U3Bl Yy0+Y2F0ZGlyKCR1aVJvb3QsICdFeHRlcm5hbCcsICdDb2RlTWlycm9yJyk7CitteSAkZXNwcmlt YVBhdGggPSBGaWxlOjpTcGVjLT5jYXRkaXIoJHVpUm9vdCwgJ0V4dGVybmFsJywgJ0VzcHJpbWEn KTsKIAogbXkgJGNvZGVNaXJyb3JMaWNlbnNlRmlsZSA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJGNv ZGVNaXJyb3JQYXRoLCAnTElDRU5TRScpOwogb3BlbihDTUxGSUxFLCAnPCcsICRjb2RlTWlycm9y TGljZW5zZUZpbGUpIG9yIGRpZSAiVW5hYmxlIHRvIG9wZW4gJGNvZGVNaXJyb3JMaWNlbnNlRmls ZTogJCEiOwpAQCAtOTQsNiArOTUsMTUgQEAgd2hpbGUgKDxDTUxGSUxFPikgewogY2xvc2UoQ01M RklMRSk7CiAkQ09ERV9NSVJST1JfTElDRU5TRSAuPSAiICovXG4iOwogCitteSAkZXNwcmltYUxp Y2Vuc2VGaWxlID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkZXNwcmltYVBhdGgsICdMSUNFTlNFJyk7 CitvcGVuKEVTTEZJTEUsICc8JywgJGVzcHJpbWFMaWNlbnNlRmlsZSkgb3IgZGllICJVbmFibGUg dG8gb3BlbiAkJGVzcHJpbWFMaWNlbnNlRmlsZTogJCEiOworbXkgJEVTUFJJTUFfTElDRU5TRSA9 ICIvKlxuIjsKK3doaWxlICg8RVNMRklMRT4pIHsKKyAgICAkRVNQUklNQV9MSUNFTlNFIC49ICcg KiAnIC4gJF87Cit9CitjbG9zZShFU0xGSUxFKTsKKyRFU1BSSU1BX0xJQ0VOU0UgLj0gIiAqL1xu IjsKKwogbWFrZV9wYXRoKCRwcm90b2NvbERpciwgJHRhcmdldFJlc291cmNlUGF0aCk7CiAKICMg Q29weSBvdmVyIGR5bmFtaWNhbGx5IGxvYWRlZCBmaWxlcyBmcm9tIG90aGVyIGZyYW1ld29ya3Ms IGV2ZW4gaWYgd2UgYXJlbid0IGNvbWJpbmluZyByZXNvdXJjZXMuCkBAIC0xMTAsNiArMTIwLDkg QEAgaWYgKGRlZmluZWQgJEVOVnsnQ09NQklORV9JTlNQRUNUT1JfUkVTT1VSQ0VTJ30gJiYgKCRF TlZ7J0NPTUJJTkVfSU5TUEVDVE9SX1JFU08KICAgICBteSAkZGVyaXZlZFNvdXJjZXNNYWluSFRN TCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJGRlcml2ZWRTb3VyY2VzRGlyLCAnTWFpbi5odG1sJyk7 CiAgICAgc3lzdGVtKCRjb21iaW5lUmVzb3VyY2VzQ21kLCAnLS1pbnB1dC1kaXInLCAnRXh0ZXJu YWwvQ29kZU1pcnJvcicsICctLWlucHV0LWh0bWwnLCAkZGVyaXZlZFNvdXJjZXNNYWluSFRNTCwg Jy0taW5wdXQtaHRtbC1kaXInLCAkdWlSb290LCAnLS1kZXJpdmVkLXNvdXJjZXMtZGlyJywgJGRl cml2ZWRTb3VyY2VzRGlyLCAnLS1vdXRwdXQtZGlyJywgJGRlcml2ZWRTb3VyY2VzRGlyLCAnLS1v dXRwdXQtc2NyaXB0LW5hbWUnLCAnQ29kZU1pcnJvci5qcycsICctLW91dHB1dC1zdHlsZS1uYW1l JywgJ0NvZGVNaXJyb3IuY3NzJyk7CiAKKyAgICAjIENvbWJpbmUgdGhlIEVzcHJpbWEgSmF2YVNj cmlwdCBmaWxlcyBpbiBQcm9kdWN0aW9uIGJ1aWxkcyBpbnRvIGEgc2luZ2xlIGZpbGUgKEVzcHJp bWEuanMpLgorICAgIHN5c3RlbSgkY29tYmluZVJlc291cmNlc0NtZCwgJy0taW5wdXQtZGlyJywg J0V4dGVybmFsL0VzcHJpbWEnLCAnLS1pbnB1dC1odG1sJywgJGRlcml2ZWRTb3VyY2VzTWFpbkhU TUwsICctLWlucHV0LWh0bWwtZGlyJywgJHVpUm9vdCwgJy0tZGVyaXZlZC1zb3VyY2VzLWRpcics ICRkZXJpdmVkU291cmNlc0RpciwgJy0tb3V0cHV0LWRpcicsICRkZXJpdmVkU291cmNlc0Rpciwg Jy0tb3V0cHV0LXNjcmlwdC1uYW1lJywgJ0VzcHJpbWEuanMnKTsKKwogICAgICMgUmVtb3ZlIGNv bnNvbGUuYXNzZXJ0IGNhbGxzIGZyb20gdGhlIE1haW4uanMgZmlsZS4KICAgICBteSAkZGVyaXZl ZFNvdXJjZXNNYWluSlMgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRkZXJpdmVkU291cmNlc0Rpciwg J01haW4uanMnKTsKICAgICBzeXN0ZW0oRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkc2NyaXB0c1Jvb3Qs ICdyZW1vdmUtY29uc29sZS1hc3NlcnRzLnBsJyksICctLWlucHV0LXNjcmlwdCcsICRkZXJpdmVk U291cmNlc01haW5KUywgJy0tb3V0cHV0LXNjcmlwdCcsICRkZXJpdmVkU291cmNlc01haW5KUyk7 CkBAIC0xNDAsNiArMTUzLDEwIEBAIGlmIChkZWZpbmVkICRFTlZ7J0NPTUJJTkVfSU5TUEVDVE9S X1JFU09VUkNFUyd9ICYmICgkRU5WeydDT01CSU5FX0lOU1BFQ1RPUl9SRVNPCiAgICAgbXkgJHRh cmdldENvZGVNaXJyb3JDU1MgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCR0YXJnZXRSZXNvdXJjZVBh dGgsICdDb2RlTWlycm9yLmNzcycpOwogICAgIHNlZWRGaWxlKCR0YXJnZXRDb2RlTWlycm9yQ1NT LCAkQ09ERV9NSVJST1JfTElDRU5TRSk7CiAKKyAgICAjIEV4cG9ydCB0aGUgbGljZW5zZSBpbnRv IEVzcHJpbWEuanMuCisgICAgbXkgJHRhcmdldEVzcHJpbWFKUyA9IEZpbGU6OlNwZWMtPmNhdGZp bGUoJHRhcmdldFJlc291cmNlUGF0aCwgJ0VzcHJpbWEuanMnKTsKKyAgICBzZWVkRmlsZSgkdGFy Z2V0RXNwcmltYUpTLCAkRVNQUklNQV9MSUNFTlNFKTsKKwogICAgICMgTWluaWZ5IHRoZSBNYWlu LmpzIGFuZCBNYWluLmNzcyBmaWxlcywgd2l0aCBNYWluLmpzIGFwcGVuZGluZyB0byB0aGUgbGlj ZW5zZSB0aGF0IHdhcyBleHBvcnRlZCBhYm92ZS4KICAgICBteSAkanNNaW5TY3JpcHQgPSBGaWxl OjpTcGVjLT5jYXRmaWxlKCRzY3JpcHRzUm9vdCwgJ2pzbWluLnB5Jyk7CiAgICAgbXkgJGNzc01p blNjcmlwdCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJHNjcmlwdHNSb290LCAnY3NzbWluLnB5Jyk7 CkBAIC0xNTIsNiArMTY5LDEwIEBAIGlmIChkZWZpbmVkICRFTlZ7J0NPTUJJTkVfSU5TUEVDVE9S X1JFU09VUkNFUyd9ICYmICgkRU5WeydDT01CSU5FX0lOU1BFQ1RPUl9SRVNPCiAgICAgc3lzdGVt KHFxKCIkcHl0aG9uIiAiJGpzTWluU2NyaXB0IiA8ICIkZGVyaXZlZFNvdXJlc3NDb2RlTWlycm9y SlMiID4+ICIkdGFyZ2V0Q29kZU1pcnJvckpTIikpIGFuZCBkaWUgIkZhaWxlZCB0byBtaW5pZnkg JGRlcml2ZWRTb3VyZXNzQ29kZU1pcnJvckpTOiAkISI7CiAgICAgc3lzdGVtKHFxKCIkcHl0aG9u IiAiJGNzc01pblNjcmlwdCIgPCAiJGRlcml2ZWRTb3VyY2VzQ29kZU1pcnJvckNTUyIgPj4gIiR0 YXJnZXRDb2RlTWlycm9yQ1NTIikpIGFuZCBkaWUgIkZhaWxlZCB0byBtaW5pZnkgJGRlcml2ZWRT b3VyY2VzQ29kZU1pcnJvckNTUzogJCEiOwogCisgICAgIyBNaW5pZnkgdGhlIEVzcHJpbWEuanMg ZmlsZSwgYXBwZW5kaW5nIHRvIHRoZSBsaWNlbnNlIHRoYXQgd2FzIGV4cG9ydGVkIGFib3ZlLgor ICAgIG15ICRkZXJpdmVkU291cmVzc0VzcHJpbWFKUyA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJGRl cml2ZWRTb3VyY2VzRGlyLCAnRXNwcmltYS5qcycpOworICAgIHN5c3RlbShxcSgiJHB5dGhvbiIg IiRqc01pblNjcmlwdCIgPCAiJGRlcml2ZWRTb3VyZXNzRXNwcmltYUpTIiA+PiAiJHRhcmdldEVz cHJpbWFKUyIpKSBhbmQgZGllICJGYWlsZWQgdG8gbWluaWZ5ICRkZXJpdmVkU291cmVzc0VzcHJp bWFKUzogJCEiOworCiAgICAgIyBDb3B5IG92ZXIgTWFpbi5odG1sIGFuZCB0aGUgSW1hZ2VzIGRp cmVjdG9yeS4KICAgICBjb3B5KCRkZXJpdmVkU291cmNlc01haW5IVE1MLCBGaWxlOjpTcGVjLT5j YXRmaWxlKCR0YXJnZXRSZXNvdXJjZVBhdGgsICdNYWluLmh0bWwnKSk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0V4dGVybmFsL0VzcHJpbWEvTElD RU5TRSBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0V4dGVybmFsL0VzcHJp bWEvTElDRU5TRQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hMzdmZjU5MjE5ZWFlNmIyZTQ0NjAwNWUyMTMzMjY0OTg5 MTFjOGVkCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvRXh0ZXJuYWwvRXNwcmltYS9MSUNFTlNFCkBAIC0wLDAgKzEsMzAgQEAKK0NvcHlyaWdo dCAoQykgMjAxMyBBcml5YSBIaWRheWF0IDxhcml5YS5oaWRheWF0QGdtYWlsLmNvbT4KK0NvcHly aWdodCAoQykgMjAxMyBUaGFkZGVlIFR5bCA8dGhhZGRlZS50eWxAZ21haWwuY29tPgorQ29weXJp Z2h0IChDKSAyMDEzIE1hdGhpYXMgQnluZW5zIDxtYXRoaWFzQHFpd2kuYmU+CitDb3B5cmlnaHQg KEMpIDIwMTIgQXJpeWEgSGlkYXlhdCA8YXJpeWEuaGlkYXlhdEBnbWFpbC5jb20+CitDb3B5cmln aHQgKEMpIDIwMTIgTWF0aGlhcyBCeW5lbnMgPG1hdGhpYXNAcWl3aS5iZT4KK0NvcHlyaWdodCAo QykgMjAxMiBKb29zdC1XaW0gQm9la2VzdGVpam4gPGpvb3N0LXdpbUBib2VrZXN0ZWlqbi5ubD4K K0NvcHlyaWdodCAoQykgMjAxMiBLcmlzIEtvd2FsIDxrcmlzLmtvd2FsQGNpeGFyLmNvbT4KK0Nv cHlyaWdodCAoQykgMjAxMiBZdXN1a2UgU3V6dWtpIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CitD b3B5cmlnaHQgKEMpIDIwMTIgQXJwYWQgQm9yc29zIDxhcnBhZC5ib3Jzb3NAZ29vZ2xlbWFpbC5j b20+CitDb3B5cmlnaHQgKEMpIDIwMTEgQXJpeWEgSGlkYXlhdCA8YXJpeWEuaGlkYXlhdEBnbWFp bC5jb20+CisKK1JlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dAorbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZSBtZXQ6CisKKyogUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgorKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFi b3ZlIGNvcHlyaWdodAorICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVy IG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisKK1RISVMgU09GVFdB UkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMg IkFTIElTIgorQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UKK0FSRSBESVNDTEFJ TUVELiBJTiBOTyBFVkVOVCBTSEFMTCA8Q09QWVJJR0hUIEhPTERFUj4gQkUgTElBQkxFIEZPUiBB TlkKK0RJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1Ig Q09OU0VRVUVOVElBTCBEQU1BR0VTCisoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBS T0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7CitMT1NTIE9GIFVTRSwg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQKK09OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBT VFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YKK1RISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCg== 236239 2014-08-07 16:30:05 -0700 2014-08-07 23:09:09 -0700 Patch bug-135728-20140807162953.patch text/plain 9154 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBk ZWNkMmE1MTQ3NTFhYTRhMDVmMDFkZGIxYmE1ZmJjNzk4ZjJhNzUxLi5lMzViZTI1OGY2OWM3NmMy NDllNTg4MDhmYzg1YjVkNjFjZDhkYjYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxNiBAQAogMjAxNC0wOC0wNyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ29tYmluZSBhbmQgbWluaWZ5IEVzcHJpbWEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTcyOAor CisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICAqIFNjcmlw dHMvY29tYmluZS1yZXNvdXJjZXMucGw6CisgICAgICAgICogU2NyaXB0cy9jb3B5LXVzZXItaW50 ZXJmYWNlLXJlc291cmNlcy5wbDoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0V4dGVybmFsL0Vz cHJpbWEvTElDRU5TRTogQWRkZWQuCisKKzIwMTQtMDgtMDcgIFRpbW90aHkgSGF0Y2hlciAgPHRp bW90aHlAYXBwbGUuY29tPgorCiAgICAgICAgIEZpeCByZWZlcmVuY2UgdG8gbWlzc2luZyBDbG9z ZVRpbWVsaW5lLnN2ZyBpbWFnZS4KIAogICAgICAgICBSdWJiZXItc3RhbXBlZCBieSBKb3NlcGgg UGVjb3Jhcm8uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9jb21i aW5lLXJlc291cmNlcy5wbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvbWJpbmUt cmVzb3VyY2VzLnBsCmluZGV4IDNlMDk5NGRiMzgxOTAyOTkwZDViN2Y3ZTA1OGZiMDNlZWY0NGE0 NTguLjVhZGQzZmM3MjFlOWIwNzg4ZGE1ODdjZTdkZDg1NjM3NGUxYjhhZDEgMTAwNzU1Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvbWJpbmUtcmVzb3VyY2VzLnBsCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvbWJpbmUtcmVzb3VyY2VzLnBsCkBAIC0y MSw4ICsyMSw4IEBAIEdldE9wdGlvbnMoJ291dHB1dC1kaXI9cycgPT4gXCRvdXRwdXREaXJlY3Rv cnksCiAgICAgICAgICAgICdpbnB1dC1odG1sLWRpcj1zJyA9PiBcJGh0bWxEaXJlY3RvcnksCiAg ICAgICAgICAgICdpbnB1dC1odG1sPXMnID0+IFwkaHRtbEZpbGUpOwogCi11bmxlc3MgKGRlZmlu ZWQgJGh0bWxGaWxlIGFuZCBkZWZpbmVkICRkZXJpdmVkU291cmNlc0RpcmVjdG9yeSBhbmQgZGVm aW5lZCAkb3V0cHV0RGlyZWN0b3J5IGFuZCBkZWZpbmVkICRvdXRwdXRTY3JpcHROYW1lIGFuZCBk ZWZpbmVkICRvdXRwdXRTdHlsZXNoZWV0TmFtZSkgewotICAgIHByaW50ICJVc2FnZTogJDAgLS1p bnB1dC1odG1sIDxwYXRoPiAtLWRlcml2ZWQtc291cmNlcy1kaXIgPHBhdGg+IC0tb3V0cHV0LWRp ciA8cGF0aD4gLS1vdXRwdXQtc2NyaXB0LW5hbWUgPG5hbWU+IC0tb3V0cHV0LXN0eWxlLW5hbWUg PG5hbWU+XG4iOwordW5sZXNzIChkZWZpbmVkICRodG1sRmlsZSBhbmQgZGVmaW5lZCAkZGVyaXZl ZFNvdXJjZXNEaXJlY3RvcnkgYW5kIGRlZmluZWQgJG91dHB1dERpcmVjdG9yeSBhbmQgKGRlZmlu ZWQgJG91dHB1dFNjcmlwdE5hbWUgb3IgZGVmaW5lZCAkb3V0cHV0U3R5bGVzaGVldE5hbWUpKSB7 CisgICAgcHJpbnQgIlVzYWdlOiAkMCAtLWlucHV0LWh0bWwgPHBhdGg+IC0tZGVyaXZlZC1zb3Vy Y2VzLWRpciA8cGF0aD4gLS1vdXRwdXQtZGlyIDxwYXRoPiBbLS1vdXRwdXQtc2NyaXB0LW5hbWUg PG5hbWU+XSBbLS1vdXRwdXQtc3R5bGUtbmFtZSA8bmFtZT5dXG4iOwogICAgIGV4aXQ7CiB9CiAK QEAgLTc2LDggKzc2LDggQEAgc3ViIGNvbmNhdGluYXRlRmlsZXMoJCQkKQogbXkgJGlucHV0RGly ZWN0b3J5UGF0dGVybiA9ICIoPyFFeHRlcm5hbFwvKVteXCJdKiI7CiAkaW5wdXREaXJlY3RvcnlQ YXR0ZXJuID0gJGlucHV0RGlyZWN0b3J5IC4gIlwvW15cIl0qIiBpZiAkaW5wdXREaXJlY3Rvcnk7 CiAKLWNvbmNhdGluYXRlRmlsZXMoJG91dHB1dFN0eWxlc2hlZXROYW1lLCAiPGxpbmsgcmVsPVwi c3R5bGVzaGVldFwiIGhyZWY9XCIoJGlucHV0RGlyZWN0b3J5UGF0dGVybilcIj4iLCAiPGxpbmsg cmVsPVwic3R5bGVzaGVldFwiIGhyZWY9XCIkb3V0cHV0U3R5bGVzaGVldE5hbWVcIj4iKTsKLWNv bmNhdGluYXRlRmlsZXMoJG91dHB1dFNjcmlwdE5hbWUsICI8c2NyaXB0IHNyYz1cIigkaW5wdXRE aXJlY3RvcnlQYXR0ZXJuKVwiPjxcL3NjcmlwdD4iLCAiPHNjcmlwdCBzcmM9XCIkb3V0cHV0U2Ny aXB0TmFtZVwiPjwvc2NyaXB0PiIpOworY29uY2F0aW5hdGVGaWxlcygkb3V0cHV0U3R5bGVzaGVl dE5hbWUsICI8bGluayByZWw9XCJzdHlsZXNoZWV0XCIgaHJlZj1cIigkaW5wdXREaXJlY3RvcnlQ YXR0ZXJuKVwiPiIsICI8bGluayByZWw9XCJzdHlsZXNoZWV0XCIgaHJlZj1cIiRvdXRwdXRTdHls ZXNoZWV0TmFtZVwiPiIpIGlmIGRlZmluZWQgJG91dHB1dFN0eWxlc2hlZXROYW1lOworY29uY2F0 aW5hdGVGaWxlcygkb3V0cHV0U2NyaXB0TmFtZSwgIjxzY3JpcHQgc3JjPVwiKCRpbnB1dERpcmVj dG9yeVBhdHRlcm4pXCI+PFwvc2NyaXB0PiIsICI8c2NyaXB0IHNyYz1cIiRvdXRwdXRTY3JpcHRO YW1lXCI+PC9zY3JpcHQ+IikgaWYgZGVmaW5lZCAkb3V0cHV0U2NyaXB0TmFtZTsKIAogJGh0bWxD b250ZW50cyA9fiBzLzxoZWFkPi4qPFwvaGVhZD4vPGhlYWQ+JGhlYWRDb250ZW50czxcL2hlYWQ+ L3NpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9jb3B5LXVz ZXItaW50ZXJmYWNlLXJlc291cmNlcy5wbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRz L2NvcHktdXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsCmluZGV4IDA5NGNmOGNkYjljODAzOTVk NmYwODhhNGQ4YmVjYmNiOTAxMTA0YjcuLmExNzRhMDI4Y2JjODRmYWQzOWJmZmE0NWFmMTBiNzU3 ZDMxMTg2YmYgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvcHkt dXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9T Y3JpcHRzL2NvcHktdXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsCkBAIC0zOCwxMyArMzgsMjgg QEAgc3ViIHNlZWRGaWxlKCQkKQogICAgIH0KIH0KIAotbXkgJExJQ0VOU0UgPSA8PCdFT0YnOwor c3ViIHJlYWRMaWNlbnNlRmlsZSgkKQoreworICAgIG15ICgkbGljZW5zZUZpbGVQYXRoKSA9IEBf OworCisgICAgb3BlbihMSUNFTlNFX0ZJTEUsICc8JywgJGxpY2Vuc2VGaWxlUGF0aCkgb3IgZGll ICJVbmFibGUgdG8gb3BlbiAkbGljZW5zZUZpbGVQYXRoOiAkISI7CisKKyAgICBteSAkbGljZW5z ZSA9ICIvKlxuIjsKKyAgICAkbGljZW5zZSAuPSAnICogJyAuICRfIHdoaWxlIDxMSUNFTlNFX0ZJ TEU+OworICAgICRsaWNlbnNlIC49ICIgKi9cbiI7CisKKyAgICBjbG9zZShMSUNFTlNFX0ZJTEUp OworCisgICAgcmV0dXJuICRsaWNlbnNlOworfQorCitteSAkaW5zcGVjdG9yTGljZW5zZSA9IDw8 J0VPRic7CiAvKgogICogQ29weXJpZ2h0IChDKSAyMDA3LTIwMTQgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAyMDA5LTIwMTEgR29vZ2xlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KLSAqIENvcHlyaWdodCAoQykgMjAwOS0yMDEwIEpvc2VwaCBQZWNv cmFyby4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAwOCBNYXR0IExp bGVrLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA4LTIwMDkgQW50 aG9ueSBSaWNhdWQgPHJpa0B3ZWJraXQub3JnPgorICogQ29weXJpZ2h0IChDKSAyMDA5LTIwMTAg Sm9zZXBoIFBlY29yYXJvLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAy MDA5LTIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAo QykgMjAwOSAyODAgTm9ydGggSW5jLiBBbGwgUmlnaHRzIFJlc2VydmVkLgogICogQ29weXJpZ2h0 IChDKSAyMDEwIE5pa2l0YSBWYXNpbHlldi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHly aWdodCAoQykgMjAxMSBCcmlhbiBHcmluc3RlYWQgQWxsIHJpZ2h0cyByZXNlcnZlZC4KQEAgLTUy LDcgKzY3LDcgQEAgbXkgJExJQ0VOU0UgPSA8PCdFT0YnOwogICogQ29weXJpZ2h0IChDKSAyMDEz IFNhbXN1bmcgRWxlY3Ryb25pY3MuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQg KEMpIDIwMTMgU2Vva2p1IEt3b24gKHNlb2tqdS5rd29uQGdtYWlsLmNvbSkKICAqIENvcHlyaWdo dCAoQykgMjAxMyBBZG9iZSBTeXN0ZW1zIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqIENv cHlyaWdodCAoQykgMjAxMyBVbml2ZXJzaXR5IG9mIFdhc2hpbmd0b24uIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTMtMjAxNCBVbml2ZXJzaXR5IG9mIFdhc2hpbmd0 b24uIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMK QEAgLTg0LDE1ICs5OSwxMCBAQCBteSAkdWlSb290ID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRFTlZ7 J1NSQ1JPT1QnfSwgJ1VzZXJJbnRlcmZhY2UnKTsKIG15ICR0YXJnZXRSZXNvdXJjZVBhdGggPSBG aWxlOjpTcGVjLT5jYXRkaXIoJEVOVnsnVEFSR0VUX0JVSUxEX0RJUid9LCAkRU5WeydVTkxPQ0FM SVpFRF9SRVNPVVJDRVNfRk9MREVSX1BBVEgnfSk7CiBteSAkcHJvdG9jb2xEaXIgPSBGaWxlOjpT cGVjLT5jYXRkaXIoJHRhcmdldFJlc291cmNlUGF0aCwgJ1Byb3RvY29sJyk7CiBteSAkY29kZU1p cnJvclBhdGggPSBGaWxlOjpTcGVjLT5jYXRkaXIoJHVpUm9vdCwgJ0V4dGVybmFsJywgJ0NvZGVN aXJyb3InKTsKK215ICRlc3ByaW1hUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGRpcigkdWlSb290LCAn RXh0ZXJuYWwnLCAnRXNwcmltYScpOwogCi1teSAkY29kZU1pcnJvckxpY2Vuc2VGaWxlID0gRmls ZTo6U3BlYy0+Y2F0ZmlsZSgkY29kZU1pcnJvclBhdGgsICdMSUNFTlNFJyk7Ci1vcGVuKENNTEZJ TEUsICc8JywgJGNvZGVNaXJyb3JMaWNlbnNlRmlsZSkgb3IgZGllICJVbmFibGUgdG8gb3BlbiAk Y29kZU1pcnJvckxpY2Vuc2VGaWxlOiAkISI7Ci1teSAkQ09ERV9NSVJST1JfTElDRU5TRSA9ICIv KlxuIjsKLXdoaWxlICg8Q01MRklMRT4pIHsKLSAgICAkQ09ERV9NSVJST1JfTElDRU5TRSAuPSAn ICogJyAuICRfOwotfQotY2xvc2UoQ01MRklMRSk7Ci0kQ09ERV9NSVJST1JfTElDRU5TRSAuPSAi ICovXG4iOworbXkgJGNvZGVNaXJyb3JMaWNlbnNlID0gcmVhZExpY2Vuc2VGaWxlKEZpbGU6OlNw ZWMtPmNhdGZpbGUoJGNvZGVNaXJyb3JQYXRoLCAnTElDRU5TRScpKTsKK215ICRlc3ByaW1hTWly cm9yTGljZW5zZSA9IHJlYWRMaWNlbnNlRmlsZShGaWxlOjpTcGVjLT5jYXRmaWxlKCRlc3ByaW1h UGF0aCwgJ0xJQ0VOU0UnKSk7CiAKIG1ha2VfcGF0aCgkcHJvdG9jb2xEaXIsICR0YXJnZXRSZXNv dXJjZVBhdGgpOwogCkBAIC0xMTAsNiArMTIwLDkgQEAgaWYgKGRlZmluZWQgJEVOVnsnQ09NQklO RV9JTlNQRUNUT1JfUkVTT1VSQ0VTJ30gJiYgKCRFTlZ7J0NPTUJJTkVfSU5TUEVDVE9SX1JFU08K ICAgICBteSAkZGVyaXZlZFNvdXJjZXNNYWluSFRNTCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJGRl cml2ZWRTb3VyY2VzRGlyLCAnTWFpbi5odG1sJyk7CiAgICAgc3lzdGVtKCRjb21iaW5lUmVzb3Vy Y2VzQ21kLCAnLS1pbnB1dC1kaXInLCAnRXh0ZXJuYWwvQ29kZU1pcnJvcicsICctLWlucHV0LWh0 bWwnLCAkZGVyaXZlZFNvdXJjZXNNYWluSFRNTCwgJy0taW5wdXQtaHRtbC1kaXInLCAkdWlSb290 LCAnLS1kZXJpdmVkLXNvdXJjZXMtZGlyJywgJGRlcml2ZWRTb3VyY2VzRGlyLCAnLS1vdXRwdXQt ZGlyJywgJGRlcml2ZWRTb3VyY2VzRGlyLCAnLS1vdXRwdXQtc2NyaXB0LW5hbWUnLCAnQ29kZU1p cnJvci5qcycsICctLW91dHB1dC1zdHlsZS1uYW1lJywgJ0NvZGVNaXJyb3IuY3NzJyk7CiAKKyAg ICAjIENvbWJpbmUgdGhlIEVzcHJpbWEgSmF2YVNjcmlwdCBmaWxlcyBpbiBQcm9kdWN0aW9uIGJ1 aWxkcyBpbnRvIGEgc2luZ2xlIGZpbGUgKEVzcHJpbWEuanMpLgorICAgIHN5c3RlbSgkY29tYmlu ZVJlc291cmNlc0NtZCwgJy0taW5wdXQtZGlyJywgJ0V4dGVybmFsL0VzcHJpbWEnLCAnLS1pbnB1 dC1odG1sJywgJGRlcml2ZWRTb3VyY2VzTWFpbkhUTUwsICctLWlucHV0LWh0bWwtZGlyJywgJHVp Um9vdCwgJy0tZGVyaXZlZC1zb3VyY2VzLWRpcicsICRkZXJpdmVkU291cmNlc0RpciwgJy0tb3V0 cHV0LWRpcicsICRkZXJpdmVkU291cmNlc0RpciwgJy0tb3V0cHV0LXNjcmlwdC1uYW1lJywgJ0Vz cHJpbWEuanMnKTsKKwogICAgICMgUmVtb3ZlIGNvbnNvbGUuYXNzZXJ0IGNhbGxzIGZyb20gdGhl IE1haW4uanMgZmlsZS4KICAgICBteSAkZGVyaXZlZFNvdXJjZXNNYWluSlMgPSBGaWxlOjpTcGVj LT5jYXRmaWxlKCRkZXJpdmVkU291cmNlc0RpciwgJ01haW4uanMnKTsKICAgICBzeXN0ZW0oRmls ZTo6U3BlYy0+Y2F0ZmlsZSgkc2NyaXB0c1Jvb3QsICdyZW1vdmUtY29uc29sZS1hc3NlcnRzLnBs JyksICctLWlucHV0LXNjcmlwdCcsICRkZXJpdmVkU291cmNlc01haW5KUywgJy0tb3V0cHV0LXNj cmlwdCcsICRkZXJpdmVkU291cmNlc01haW5KUyk7CkBAIC0xMjgsMTcgKzE0MSwyMSBAQCBpZiAo ZGVmaW5lZCAkRU5WeydDT01CSU5FX0lOU1BFQ1RPUl9SRVNPVVJDRVMnfSAmJiAoJEVOVnsnQ09N QklORV9JTlNQRUNUT1JfUkVTTwogCiAgICAgIyBFeHBvcnQgdGhlIGxpY2Vuc2UgaW50byBNYWlu LmpzLgogICAgIG15ICR0YXJnZXRNYWluSlMgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCR0YXJnZXRS ZXNvdXJjZVBhdGgsICdNYWluLmpzJyk7Ci0gICAgc2VlZEZpbGUoJHRhcmdldE1haW5KUywgJExJ Q0VOU0UpOworICAgIHNlZWRGaWxlKCR0YXJnZXRNYWluSlMsICRpbnNwZWN0b3JMaWNlbnNlKTsK IAogICAgIG15ICR0YXJnZXRNYWluQ1NTID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkdGFyZ2V0UmVz b3VyY2VQYXRoLCAnTWFpbi5jc3MnKTsKLSAgICBzZWVkRmlsZSgkdGFyZ2V0TWFpbkNTUywgJExJ Q0VOU0UpOworICAgIHNlZWRGaWxlKCR0YXJnZXRNYWluQ1NTLCAkaW5zcGVjdG9yTGljZW5zZSk7 CiAKICAgICAjIEV4cG9ydCB0aGUgbGljZW5zZSBpbnRvIENvZGVNaXJyb3IuanMgYW5kIENvZGVN aXJyb3IuY3NzLgogICAgIG15ICR0YXJnZXRDb2RlTWlycm9ySlMgPSBGaWxlOjpTcGVjLT5jYXRm aWxlKCR0YXJnZXRSZXNvdXJjZVBhdGgsICdDb2RlTWlycm9yLmpzJyk7Ci0gICAgc2VlZEZpbGUo JHRhcmdldENvZGVNaXJyb3JKUywgJENPREVfTUlSUk9SX0xJQ0VOU0UpOworICAgIHNlZWRGaWxl KCR0YXJnZXRDb2RlTWlycm9ySlMsICRjb2RlTWlycm9yTGljZW5zZSk7CiAKICAgICBteSAkdGFy Z2V0Q29kZU1pcnJvckNTUyA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJHRhcmdldFJlc291cmNlUGF0 aCwgJ0NvZGVNaXJyb3IuY3NzJyk7Ci0gICAgc2VlZEZpbGUoJHRhcmdldENvZGVNaXJyb3JDU1Ms ICRDT0RFX01JUlJPUl9MSUNFTlNFKTsKKyAgICBzZWVkRmlsZSgkdGFyZ2V0Q29kZU1pcnJvckNT UywgJGNvZGVNaXJyb3JMaWNlbnNlKTsKKworICAgICMgRXhwb3J0IHRoZSBsaWNlbnNlIGludG8g RXNwcmltYS5qcy4KKyAgICBteSAkdGFyZ2V0RXNwcmltYUpTID0gRmlsZTo6U3BlYy0+Y2F0Zmls ZSgkdGFyZ2V0UmVzb3VyY2VQYXRoLCAnRXNwcmltYS5qcycpOworICAgIHNlZWRGaWxlKCR0YXJn ZXRFc3ByaW1hSlMsICRlc3ByaW1hTWlycm9yTGljZW5zZSk7CiAKICAgICAjIE1pbmlmeSB0aGUg TWFpbi5qcyBhbmQgTWFpbi5jc3MgZmlsZXMsIHdpdGggTWFpbi5qcyBhcHBlbmRpbmcgdG8gdGhl IGxpY2Vuc2UgdGhhdCB3YXMgZXhwb3J0ZWQgYWJvdmUuCiAgICAgbXkgJGpzTWluU2NyaXB0ID0g RmlsZTo6U3BlYy0+Y2F0ZmlsZSgkc2NyaXB0c1Jvb3QsICdqc21pbi5weScpOwpAQCAtMTUyLDYg KzE2OSwxMCBAQCBpZiAoZGVmaW5lZCAkRU5WeydDT01CSU5FX0lOU1BFQ1RPUl9SRVNPVVJDRVMn fSAmJiAoJEVOVnsnQ09NQklORV9JTlNQRUNUT1JfUkVTTwogICAgIHN5c3RlbShxcSgiJHB5dGhv biIgIiRqc01pblNjcmlwdCIgPCAiJGRlcml2ZWRTb3VyZXNzQ29kZU1pcnJvckpTIiA+PiAiJHRh cmdldENvZGVNaXJyb3JKUyIpKSBhbmQgZGllICJGYWlsZWQgdG8gbWluaWZ5ICRkZXJpdmVkU291 cmVzc0NvZGVNaXJyb3JKUzogJCEiOwogICAgIHN5c3RlbShxcSgiJHB5dGhvbiIgIiRjc3NNaW5T Y3JpcHQiIDwgIiRkZXJpdmVkU291cmNlc0NvZGVNaXJyb3JDU1MiID4+ICIkdGFyZ2V0Q29kZU1p cnJvckNTUyIpKSBhbmQgZGllICJGYWlsZWQgdG8gbWluaWZ5ICRkZXJpdmVkU291cmNlc0NvZGVN aXJyb3JDU1M6ICQhIjsKIAorICAgICMgTWluaWZ5IHRoZSBFc3ByaW1hLmpzIGZpbGUsIGFwcGVu ZGluZyB0byB0aGUgbGljZW5zZSB0aGF0IHdhcyBleHBvcnRlZCBhYm92ZS4KKyAgICBteSAkZGVy aXZlZFNvdXJlc3NFc3ByaW1hSlMgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRkZXJpdmVkU291cmNl c0RpciwgJ0VzcHJpbWEuanMnKTsKKyAgICBzeXN0ZW0ocXEoIiRweXRob24iICIkanNNaW5TY3Jp cHQiIDwgIiRkZXJpdmVkU291cmVzc0VzcHJpbWFKUyIgPj4gIiR0YXJnZXRFc3ByaW1hSlMiKSkg YW5kIGRpZSAiRmFpbGVkIHRvIG1pbmlmeSAkZGVyaXZlZFNvdXJlc3NFc3ByaW1hSlM6ICQhIjsK KwogICAgICMgQ29weSBvdmVyIE1haW4uaHRtbCBhbmQgdGhlIEltYWdlcyBkaXJlY3RvcnkuCiAg ICAgY29weSgkZGVyaXZlZFNvdXJjZXNNYWluSFRNTCwgRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkdGFy Z2V0UmVzb3VyY2VQYXRoLCAnTWFpbi5odG1sJykpOwogCg== 236267 2014-08-07 23:09:12 -0700 2014-08-07 23:49:10 -0700 Patch bug-135728-20140807230901.patch text/plain 11327 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBk ZWNkMmE1MTQ3NTFhYTRhMDVmMDFkZGIxYmE1ZmJjNzk4ZjJhNzUxLi5lMzViZTI1OGY2OWM3NmMy NDllNTg4MDhmYzg1YjVkNjFjZDhkYjYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxNiBAQAogMjAxNC0wOC0wNyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ29tYmluZSBhbmQgbWluaWZ5IEVzcHJpbWEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTcyOAor CisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICAqIFNjcmlw dHMvY29tYmluZS1yZXNvdXJjZXMucGw6CisgICAgICAgICogU2NyaXB0cy9jb3B5LXVzZXItaW50 ZXJmYWNlLXJlc291cmNlcy5wbDoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0V4dGVybmFsL0Vz cHJpbWEvTElDRU5TRTogQWRkZWQuCisKKzIwMTQtMDgtMDcgIFRpbW90aHkgSGF0Y2hlciAgPHRp bW90aHlAYXBwbGUuY29tPgorCiAgICAgICAgIEZpeCByZWZlcmVuY2UgdG8gbWlzc2luZyBDbG9z ZVRpbWVsaW5lLnN2ZyBpbWFnZS4KIAogICAgICAgICBSdWJiZXItc3RhbXBlZCBieSBKb3NlcGgg UGVjb3Jhcm8uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9jb21i aW5lLXJlc291cmNlcy5wbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvbWJpbmUt cmVzb3VyY2VzLnBsCmluZGV4IDNlMDk5NGRiMzgxOTAyOTkwZDViN2Y3ZTA1OGZiMDNlZWY0NGE0 NTguLjVhZGQzZmM3MjFlOWIwNzg4ZGE1ODdjZTdkZDg1NjM3NGUxYjhhZDEgMTAwNzU1Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvbWJpbmUtcmVzb3VyY2VzLnBsCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvbWJpbmUtcmVzb3VyY2VzLnBsCkBAIC0y MSw4ICsyMSw4IEBAIEdldE9wdGlvbnMoJ291dHB1dC1kaXI9cycgPT4gXCRvdXRwdXREaXJlY3Rv cnksCiAgICAgICAgICAgICdpbnB1dC1odG1sLWRpcj1zJyA9PiBcJGh0bWxEaXJlY3RvcnksCiAg ICAgICAgICAgICdpbnB1dC1odG1sPXMnID0+IFwkaHRtbEZpbGUpOwogCi11bmxlc3MgKGRlZmlu ZWQgJGh0bWxGaWxlIGFuZCBkZWZpbmVkICRkZXJpdmVkU291cmNlc0RpcmVjdG9yeSBhbmQgZGVm aW5lZCAkb3V0cHV0RGlyZWN0b3J5IGFuZCBkZWZpbmVkICRvdXRwdXRTY3JpcHROYW1lIGFuZCBk ZWZpbmVkICRvdXRwdXRTdHlsZXNoZWV0TmFtZSkgewotICAgIHByaW50ICJVc2FnZTogJDAgLS1p bnB1dC1odG1sIDxwYXRoPiAtLWRlcml2ZWQtc291cmNlcy1kaXIgPHBhdGg+IC0tb3V0cHV0LWRp ciA8cGF0aD4gLS1vdXRwdXQtc2NyaXB0LW5hbWUgPG5hbWU+IC0tb3V0cHV0LXN0eWxlLW5hbWUg PG5hbWU+XG4iOwordW5sZXNzIChkZWZpbmVkICRodG1sRmlsZSBhbmQgZGVmaW5lZCAkZGVyaXZl ZFNvdXJjZXNEaXJlY3RvcnkgYW5kIGRlZmluZWQgJG91dHB1dERpcmVjdG9yeSBhbmQgKGRlZmlu ZWQgJG91dHB1dFNjcmlwdE5hbWUgb3IgZGVmaW5lZCAkb3V0cHV0U3R5bGVzaGVldE5hbWUpKSB7 CisgICAgcHJpbnQgIlVzYWdlOiAkMCAtLWlucHV0LWh0bWwgPHBhdGg+IC0tZGVyaXZlZC1zb3Vy Y2VzLWRpciA8cGF0aD4gLS1vdXRwdXQtZGlyIDxwYXRoPiBbLS1vdXRwdXQtc2NyaXB0LW5hbWUg PG5hbWU+XSBbLS1vdXRwdXQtc3R5bGUtbmFtZSA8bmFtZT5dXG4iOwogICAgIGV4aXQ7CiB9CiAK QEAgLTc2LDggKzc2LDggQEAgc3ViIGNvbmNhdGluYXRlRmlsZXMoJCQkKQogbXkgJGlucHV0RGly ZWN0b3J5UGF0dGVybiA9ICIoPyFFeHRlcm5hbFwvKVteXCJdKiI7CiAkaW5wdXREaXJlY3RvcnlQ YXR0ZXJuID0gJGlucHV0RGlyZWN0b3J5IC4gIlwvW15cIl0qIiBpZiAkaW5wdXREaXJlY3Rvcnk7 CiAKLWNvbmNhdGluYXRlRmlsZXMoJG91dHB1dFN0eWxlc2hlZXROYW1lLCAiPGxpbmsgcmVsPVwi c3R5bGVzaGVldFwiIGhyZWY9XCIoJGlucHV0RGlyZWN0b3J5UGF0dGVybilcIj4iLCAiPGxpbmsg cmVsPVwic3R5bGVzaGVldFwiIGhyZWY9XCIkb3V0cHV0U3R5bGVzaGVldE5hbWVcIj4iKTsKLWNv bmNhdGluYXRlRmlsZXMoJG91dHB1dFNjcmlwdE5hbWUsICI8c2NyaXB0IHNyYz1cIigkaW5wdXRE aXJlY3RvcnlQYXR0ZXJuKVwiPjxcL3NjcmlwdD4iLCAiPHNjcmlwdCBzcmM9XCIkb3V0cHV0U2Ny aXB0TmFtZVwiPjwvc2NyaXB0PiIpOworY29uY2F0aW5hdGVGaWxlcygkb3V0cHV0U3R5bGVzaGVl dE5hbWUsICI8bGluayByZWw9XCJzdHlsZXNoZWV0XCIgaHJlZj1cIigkaW5wdXREaXJlY3RvcnlQ YXR0ZXJuKVwiPiIsICI8bGluayByZWw9XCJzdHlsZXNoZWV0XCIgaHJlZj1cIiRvdXRwdXRTdHls ZXNoZWV0TmFtZVwiPiIpIGlmIGRlZmluZWQgJG91dHB1dFN0eWxlc2hlZXROYW1lOworY29uY2F0 aW5hdGVGaWxlcygkb3V0cHV0U2NyaXB0TmFtZSwgIjxzY3JpcHQgc3JjPVwiKCRpbnB1dERpcmVj dG9yeVBhdHRlcm4pXCI+PFwvc2NyaXB0PiIsICI8c2NyaXB0IHNyYz1cIiRvdXRwdXRTY3JpcHRO YW1lXCI+PC9zY3JpcHQ+IikgaWYgZGVmaW5lZCAkb3V0cHV0U2NyaXB0TmFtZTsKIAogJGh0bWxD b250ZW50cyA9fiBzLzxoZWFkPi4qPFwvaGVhZD4vPGhlYWQ+JGhlYWRDb250ZW50czxcL2hlYWQ+ L3NpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9jb3B5LXVz ZXItaW50ZXJmYWNlLXJlc291cmNlcy5wbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRz L2NvcHktdXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsCmluZGV4IDA5NGNmOGNkYjljODAzOTVk NmYwODhhNGQ4YmVjYmNiOTAxMTA0YjcuLmExNzRhMDI4Y2JjODRmYWQzOWJmZmE0NWFmMTBiNzU3 ZDMxMTg2YmYgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvcHkt dXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9T Y3JpcHRzL2NvcHktdXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsCkBAIC0zOCwxMyArMzgsMjgg QEAgc3ViIHNlZWRGaWxlKCQkKQogICAgIH0KIH0KIAotbXkgJExJQ0VOU0UgPSA8PCdFT0YnOwor c3ViIHJlYWRMaWNlbnNlRmlsZSgkKQoreworICAgIG15ICgkbGljZW5zZUZpbGVQYXRoKSA9IEBf OworCisgICAgb3BlbihMSUNFTlNFX0ZJTEUsICc8JywgJGxpY2Vuc2VGaWxlUGF0aCkgb3IgZGll ICJVbmFibGUgdG8gb3BlbiAkbGljZW5zZUZpbGVQYXRoOiAkISI7CisKKyAgICBteSAkbGljZW5z ZSA9ICIvKlxuIjsKKyAgICAkbGljZW5zZSAuPSAnICogJyAuICRfIHdoaWxlIDxMSUNFTlNFX0ZJ TEU+OworICAgICRsaWNlbnNlIC49ICIgKi9cbiI7CisKKyAgICBjbG9zZShMSUNFTlNFX0ZJTEUp OworCisgICAgcmV0dXJuICRsaWNlbnNlOworfQorCitteSAkaW5zcGVjdG9yTGljZW5zZSA9IDw8 J0VPRic7CiAvKgogICogQ29weXJpZ2h0IChDKSAyMDA3LTIwMTQgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAyMDA5LTIwMTEgR29vZ2xlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KLSAqIENvcHlyaWdodCAoQykgMjAwOS0yMDEwIEpvc2VwaCBQZWNv cmFyby4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAwOCBNYXR0IExp bGVrLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA4LTIwMDkgQW50 aG9ueSBSaWNhdWQgPHJpa0B3ZWJraXQub3JnPgorICogQ29weXJpZ2h0IChDKSAyMDA5LTIwMTAg Sm9zZXBoIFBlY29yYXJvLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAy MDA5LTIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAo QykgMjAwOSAyODAgTm9ydGggSW5jLiBBbGwgUmlnaHRzIFJlc2VydmVkLgogICogQ29weXJpZ2h0 IChDKSAyMDEwIE5pa2l0YSBWYXNpbHlldi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHly aWdodCAoQykgMjAxMSBCcmlhbiBHcmluc3RlYWQgQWxsIHJpZ2h0cyByZXNlcnZlZC4KQEAgLTUy LDcgKzY3LDcgQEAgbXkgJExJQ0VOU0UgPSA8PCdFT0YnOwogICogQ29weXJpZ2h0IChDKSAyMDEz IFNhbXN1bmcgRWxlY3Ryb25pY3MuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQg KEMpIDIwMTMgU2Vva2p1IEt3b24gKHNlb2tqdS5rd29uQGdtYWlsLmNvbSkKICAqIENvcHlyaWdo dCAoQykgMjAxMyBBZG9iZSBTeXN0ZW1zIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqIENv cHlyaWdodCAoQykgMjAxMyBVbml2ZXJzaXR5IG9mIFdhc2hpbmd0b24uIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTMtMjAxNCBVbml2ZXJzaXR5IG9mIFdhc2hpbmd0 b24uIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMK QEAgLTg0LDE1ICs5OSwxMCBAQCBteSAkdWlSb290ID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRFTlZ7 J1NSQ1JPT1QnfSwgJ1VzZXJJbnRlcmZhY2UnKTsKIG15ICR0YXJnZXRSZXNvdXJjZVBhdGggPSBG aWxlOjpTcGVjLT5jYXRkaXIoJEVOVnsnVEFSR0VUX0JVSUxEX0RJUid9LCAkRU5WeydVTkxPQ0FM SVpFRF9SRVNPVVJDRVNfRk9MREVSX1BBVEgnfSk7CiBteSAkcHJvdG9jb2xEaXIgPSBGaWxlOjpT cGVjLT5jYXRkaXIoJHRhcmdldFJlc291cmNlUGF0aCwgJ1Byb3RvY29sJyk7CiBteSAkY29kZU1p cnJvclBhdGggPSBGaWxlOjpTcGVjLT5jYXRkaXIoJHVpUm9vdCwgJ0V4dGVybmFsJywgJ0NvZGVN aXJyb3InKTsKK215ICRlc3ByaW1hUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGRpcigkdWlSb290LCAn RXh0ZXJuYWwnLCAnRXNwcmltYScpOwogCi1teSAkY29kZU1pcnJvckxpY2Vuc2VGaWxlID0gRmls ZTo6U3BlYy0+Y2F0ZmlsZSgkY29kZU1pcnJvclBhdGgsICdMSUNFTlNFJyk7Ci1vcGVuKENNTEZJ TEUsICc8JywgJGNvZGVNaXJyb3JMaWNlbnNlRmlsZSkgb3IgZGllICJVbmFibGUgdG8gb3BlbiAk Y29kZU1pcnJvckxpY2Vuc2VGaWxlOiAkISI7Ci1teSAkQ09ERV9NSVJST1JfTElDRU5TRSA9ICIv KlxuIjsKLXdoaWxlICg8Q01MRklMRT4pIHsKLSAgICAkQ09ERV9NSVJST1JfTElDRU5TRSAuPSAn ICogJyAuICRfOwotfQotY2xvc2UoQ01MRklMRSk7Ci0kQ09ERV9NSVJST1JfTElDRU5TRSAuPSAi ICovXG4iOworbXkgJGNvZGVNaXJyb3JMaWNlbnNlID0gcmVhZExpY2Vuc2VGaWxlKEZpbGU6OlNw ZWMtPmNhdGZpbGUoJGNvZGVNaXJyb3JQYXRoLCAnTElDRU5TRScpKTsKK215ICRlc3ByaW1hTWly cm9yTGljZW5zZSA9IHJlYWRMaWNlbnNlRmlsZShGaWxlOjpTcGVjLT5jYXRmaWxlKCRlc3ByaW1h UGF0aCwgJ0xJQ0VOU0UnKSk7CiAKIG1ha2VfcGF0aCgkcHJvdG9jb2xEaXIsICR0YXJnZXRSZXNv dXJjZVBhdGgpOwogCkBAIC0xMTAsNiArMTIwLDkgQEAgaWYgKGRlZmluZWQgJEVOVnsnQ09NQklO RV9JTlNQRUNUT1JfUkVTT1VSQ0VTJ30gJiYgKCRFTlZ7J0NPTUJJTkVfSU5TUEVDVE9SX1JFU08K ICAgICBteSAkZGVyaXZlZFNvdXJjZXNNYWluSFRNTCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJGRl cml2ZWRTb3VyY2VzRGlyLCAnTWFpbi5odG1sJyk7CiAgICAgc3lzdGVtKCRjb21iaW5lUmVzb3Vy Y2VzQ21kLCAnLS1pbnB1dC1kaXInLCAnRXh0ZXJuYWwvQ29kZU1pcnJvcicsICctLWlucHV0LWh0 bWwnLCAkZGVyaXZlZFNvdXJjZXNNYWluSFRNTCwgJy0taW5wdXQtaHRtbC1kaXInLCAkdWlSb290 LCAnLS1kZXJpdmVkLXNvdXJjZXMtZGlyJywgJGRlcml2ZWRTb3VyY2VzRGlyLCAnLS1vdXRwdXQt ZGlyJywgJGRlcml2ZWRTb3VyY2VzRGlyLCAnLS1vdXRwdXQtc2NyaXB0LW5hbWUnLCAnQ29kZU1p cnJvci5qcycsICctLW91dHB1dC1zdHlsZS1uYW1lJywgJ0NvZGVNaXJyb3IuY3NzJyk7CiAKKyAg ICAjIENvbWJpbmUgdGhlIEVzcHJpbWEgSmF2YVNjcmlwdCBmaWxlcyBpbiBQcm9kdWN0aW9uIGJ1 aWxkcyBpbnRvIGEgc2luZ2xlIGZpbGUgKEVzcHJpbWEuanMpLgorICAgIHN5c3RlbSgkY29tYmlu ZVJlc291cmNlc0NtZCwgJy0taW5wdXQtZGlyJywgJ0V4dGVybmFsL0VzcHJpbWEnLCAnLS1pbnB1 dC1odG1sJywgJGRlcml2ZWRTb3VyY2VzTWFpbkhUTUwsICctLWlucHV0LWh0bWwtZGlyJywgJHVp Um9vdCwgJy0tZGVyaXZlZC1zb3VyY2VzLWRpcicsICRkZXJpdmVkU291cmNlc0RpciwgJy0tb3V0 cHV0LWRpcicsICRkZXJpdmVkU291cmNlc0RpciwgJy0tb3V0cHV0LXNjcmlwdC1uYW1lJywgJ0Vz cHJpbWEuanMnKTsKKwogICAgICMgUmVtb3ZlIGNvbnNvbGUuYXNzZXJ0IGNhbGxzIGZyb20gdGhl IE1haW4uanMgZmlsZS4KICAgICBteSAkZGVyaXZlZFNvdXJjZXNNYWluSlMgPSBGaWxlOjpTcGVj LT5jYXRmaWxlKCRkZXJpdmVkU291cmNlc0RpciwgJ01haW4uanMnKTsKICAgICBzeXN0ZW0oRmls ZTo6U3BlYy0+Y2F0ZmlsZSgkc2NyaXB0c1Jvb3QsICdyZW1vdmUtY29uc29sZS1hc3NlcnRzLnBs JyksICctLWlucHV0LXNjcmlwdCcsICRkZXJpdmVkU291cmNlc01haW5KUywgJy0tb3V0cHV0LXNj cmlwdCcsICRkZXJpdmVkU291cmNlc01haW5KUyk7CkBAIC0xMjgsMTcgKzE0MSwyMSBAQCBpZiAo ZGVmaW5lZCAkRU5WeydDT01CSU5FX0lOU1BFQ1RPUl9SRVNPVVJDRVMnfSAmJiAoJEVOVnsnQ09N QklORV9JTlNQRUNUT1JfUkVTTwogCiAgICAgIyBFeHBvcnQgdGhlIGxpY2Vuc2UgaW50byBNYWlu LmpzLgogICAgIG15ICR0YXJnZXRNYWluSlMgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCR0YXJnZXRS ZXNvdXJjZVBhdGgsICdNYWluLmpzJyk7Ci0gICAgc2VlZEZpbGUoJHRhcmdldE1haW5KUywgJExJ Q0VOU0UpOworICAgIHNlZWRGaWxlKCR0YXJnZXRNYWluSlMsICRpbnNwZWN0b3JMaWNlbnNlKTsK IAogICAgIG15ICR0YXJnZXRNYWluQ1NTID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkdGFyZ2V0UmVz b3VyY2VQYXRoLCAnTWFpbi5jc3MnKTsKLSAgICBzZWVkRmlsZSgkdGFyZ2V0TWFpbkNTUywgJExJ Q0VOU0UpOworICAgIHNlZWRGaWxlKCR0YXJnZXRNYWluQ1NTLCAkaW5zcGVjdG9yTGljZW5zZSk7 CiAKICAgICAjIEV4cG9ydCB0aGUgbGljZW5zZSBpbnRvIENvZGVNaXJyb3IuanMgYW5kIENvZGVN aXJyb3IuY3NzLgogICAgIG15ICR0YXJnZXRDb2RlTWlycm9ySlMgPSBGaWxlOjpTcGVjLT5jYXRm aWxlKCR0YXJnZXRSZXNvdXJjZVBhdGgsICdDb2RlTWlycm9yLmpzJyk7Ci0gICAgc2VlZEZpbGUo JHRhcmdldENvZGVNaXJyb3JKUywgJENPREVfTUlSUk9SX0xJQ0VOU0UpOworICAgIHNlZWRGaWxl KCR0YXJnZXRDb2RlTWlycm9ySlMsICRjb2RlTWlycm9yTGljZW5zZSk7CiAKICAgICBteSAkdGFy Z2V0Q29kZU1pcnJvckNTUyA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJHRhcmdldFJlc291cmNlUGF0 aCwgJ0NvZGVNaXJyb3IuY3NzJyk7Ci0gICAgc2VlZEZpbGUoJHRhcmdldENvZGVNaXJyb3JDU1Ms ICRDT0RFX01JUlJPUl9MSUNFTlNFKTsKKyAgICBzZWVkRmlsZSgkdGFyZ2V0Q29kZU1pcnJvckNT UywgJGNvZGVNaXJyb3JMaWNlbnNlKTsKKworICAgICMgRXhwb3J0IHRoZSBsaWNlbnNlIGludG8g RXNwcmltYS5qcy4KKyAgICBteSAkdGFyZ2V0RXNwcmltYUpTID0gRmlsZTo6U3BlYy0+Y2F0Zmls ZSgkdGFyZ2V0UmVzb3VyY2VQYXRoLCAnRXNwcmltYS5qcycpOworICAgIHNlZWRGaWxlKCR0YXJn ZXRFc3ByaW1hSlMsICRlc3ByaW1hTWlycm9yTGljZW5zZSk7CiAKICAgICAjIE1pbmlmeSB0aGUg TWFpbi5qcyBhbmQgTWFpbi5jc3MgZmlsZXMsIHdpdGggTWFpbi5qcyBhcHBlbmRpbmcgdG8gdGhl IGxpY2Vuc2UgdGhhdCB3YXMgZXhwb3J0ZWQgYWJvdmUuCiAgICAgbXkgJGpzTWluU2NyaXB0ID0g RmlsZTo6U3BlYy0+Y2F0ZmlsZSgkc2NyaXB0c1Jvb3QsICdqc21pbi5weScpOwpAQCAtMTUyLDYg KzE2OSwxMCBAQCBpZiAoZGVmaW5lZCAkRU5WeydDT01CSU5FX0lOU1BFQ1RPUl9SRVNPVVJDRVMn fSAmJiAoJEVOVnsnQ09NQklORV9JTlNQRUNUT1JfUkVTTwogICAgIHN5c3RlbShxcSgiJHB5dGhv biIgIiRqc01pblNjcmlwdCIgPCAiJGRlcml2ZWRTb3VyZXNzQ29kZU1pcnJvckpTIiA+PiAiJHRh cmdldENvZGVNaXJyb3JKUyIpKSBhbmQgZGllICJGYWlsZWQgdG8gbWluaWZ5ICRkZXJpdmVkU291 cmVzc0NvZGVNaXJyb3JKUzogJCEiOwogICAgIHN5c3RlbShxcSgiJHB5dGhvbiIgIiRjc3NNaW5T Y3JpcHQiIDwgIiRkZXJpdmVkU291cmNlc0NvZGVNaXJyb3JDU1MiID4+ICIkdGFyZ2V0Q29kZU1p cnJvckNTUyIpKSBhbmQgZGllICJGYWlsZWQgdG8gbWluaWZ5ICRkZXJpdmVkU291cmNlc0NvZGVN aXJyb3JDU1M6ICQhIjsKIAorICAgICMgTWluaWZ5IHRoZSBFc3ByaW1hLmpzIGZpbGUsIGFwcGVu ZGluZyB0byB0aGUgbGljZW5zZSB0aGF0IHdhcyBleHBvcnRlZCBhYm92ZS4KKyAgICBteSAkZGVy aXZlZFNvdXJlc3NFc3ByaW1hSlMgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRkZXJpdmVkU291cmNl c0RpciwgJ0VzcHJpbWEuanMnKTsKKyAgICBzeXN0ZW0ocXEoIiRweXRob24iICIkanNNaW5TY3Jp cHQiIDwgIiRkZXJpdmVkU291cmVzc0VzcHJpbWFKUyIgPj4gIiR0YXJnZXRFc3ByaW1hSlMiKSkg YW5kIGRpZSAiRmFpbGVkIHRvIG1pbmlmeSAkZGVyaXZlZFNvdXJlc3NFc3ByaW1hSlM6ICQhIjsK KwogICAgICMgQ29weSBvdmVyIE1haW4uaHRtbCBhbmQgdGhlIEltYWdlcyBkaXJlY3RvcnkuCiAg ICAgY29weSgkZGVyaXZlZFNvdXJjZXNNYWluSFRNTCwgRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkdGFy Z2V0UmVzb3VyY2VQYXRoLCAnTWFpbi5odG1sJykpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9FeHRlcm5hbC9Fc3ByaW1hL0xJQ0VOU0UgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9FeHRlcm5hbC9Fc3ByaW1hL0xJQ0VOU0UK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uYTM3ZmY1OTIxOWVhZTZiMmU0NDYwMDVlMjEzMzI2NDk4OTExYzhlZAotLS0g L2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0V4dGVy bmFsL0VzcHJpbWEvTElDRU5TRQpAQCAtMCwwICsxLDMwIEBACitDb3B5cmlnaHQgKEMpIDIwMTMg QXJpeWEgSGlkYXlhdCA8YXJpeWEuaGlkYXlhdEBnbWFpbC5jb20+CitDb3B5cmlnaHQgKEMpIDIw MTMgVGhhZGRlZSBUeWwgPHRoYWRkZWUudHlsQGdtYWlsLmNvbT4KK0NvcHlyaWdodCAoQykgMjAx MyBNYXRoaWFzIEJ5bmVucyA8bWF0aGlhc0BxaXdpLmJlPgorQ29weXJpZ2h0IChDKSAyMDEyIEFy aXlhIEhpZGF5YXQgPGFyaXlhLmhpZGF5YXRAZ21haWwuY29tPgorQ29weXJpZ2h0IChDKSAyMDEy IE1hdGhpYXMgQnluZW5zIDxtYXRoaWFzQHFpd2kuYmU+CitDb3B5cmlnaHQgKEMpIDIwMTIgSm9v c3QtV2ltIEJvZWtlc3RlaWpuIDxqb29zdC13aW1AYm9la2VzdGVpam4ubmw+CitDb3B5cmlnaHQg KEMpIDIwMTIgS3JpcyBLb3dhbCA8a3Jpcy5rb3dhbEBjaXhhci5jb20+CitDb3B5cmlnaHQgKEMp IDIwMTIgWXVzdWtlIFN1enVraSA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgorQ29weXJpZ2h0IChD KSAyMDEyIEFycGFkIEJvcnNvcyA8YXJwYWQuYm9yc29zQGdvb2dsZW1haWwuY29tPgorQ29weXJp Z2h0IChDKSAyMDExIEFyaXlhIEhpZGF5YXQgPGFyaXlhLmhpZGF5YXRAZ21haWwuY29tPgorCitS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKK21vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucyBhcmUgbWV0OgorCisqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3Vy Y2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyogUmVkaXN0 cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyIGluIHRoZQorICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMg cHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorCitUSElTIFNPRlRXQVJFIElTIFBST1ZJ REVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTICJBUyBJUyIKK0FO RCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLCBUSEUKK0lNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFCitBUkUgRElTQ0xBSU1FRC4gSU4gTk8g RVZFTlQgU0hBTEwgPENPUFlSSUdIVCBIT0xERVI+IEJFIExJQUJMRSBGT1IgQU5ZCitESVJFQ1Qs IElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJ QUwgREFNQUdFUworKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP RiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOworTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBS T0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5ECitPTiBB TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJ TElUWSwgT1IgVE9SVAorKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lO RyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCitUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgo=