166839 2017-01-09 05:21:23 -0800 macOS does not support php7 for layout tests 2017-01-09 09:50:39 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 lforschler lforschler ap commit-queue glenn lforschler ryanhaddad oldest_to_newest 1264947 0 lforschler 2017-01-09 05:21:23 -0800 Currently, the macOS port uses php5. We should plan for the future and support php7. 1264948 1 lforschler 2017-01-09 05:22:14 -0800 The debian port simply searches for a lib7php, and then uses a different apache config. It seems like extending that for macOS would be simple. 1264954 2 298347 lforschler 2017-01-09 05:35:28 -0800 Created attachment 298347 v1 patch to add php7 support for macOS. 1264955 3 commit-queue 2017-01-09 05:37:52 -0800 Attachment 298347 did not pass style-queue: ERROR: Tools/Scripts/webkitpy/port/base.py:1190: trailing whitespace [pep8/W291] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1264957 4 298348 lforschler 2017-01-09 05:53:42 -0800 Created attachment 298348 v2, correct style 1265013 5 298348 ap 2017-01-09 09:09:12 -0800 Comment on attachment 298348 v2, correct style It's unfortunate that the config had to be duplicated again. I hoped that we could pass an option via command line. Could you land this manually while doing an "svn cp" first, to preserve file history? 1265029 6 lforschler 2017-01-09 09:41:31 -0800 Committed revision 210510. 1265037 7 lforschler 2017-01-09 09:45:59 -0800 (new conf file copied over in https://trac.webkit.org/changeset/210509) 298347 2017-01-09 05:35:28 -0800 2017-01-09 05:53:42 -0800 v1 patch to add php7 support for macOS. 166839.patch text/plain 7729 lforschler SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDUwMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE3LTAxLTA5ICBMdWNhcyBGb3JzY2hsZXIgIDxsZm9yc2NobGVyQGFwcGxl LmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTY2ODM5CisgICAgICAgIEFkZCBwaHA3IHN1cHBvcnQgZm9yIG1hY09TLgorICAgICAgICBNaXJy b3IgdGhlIGRlYmlhbiBsb2dpYyB0byBsb29rIGZvciBhIHBocDcgbW9kdWxlIG9uIGRpc2ssIGFu ZCByZXR1cm4gdGhlIGFwcHJvcHJpYXRlIGFwYWNoZSBjb25maWcgZmlsZS4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv cG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5faXNfZGFyd2luX3BocF92ZXJzaW9uXzcpOgor ICAgICAgICAoUG9ydC5fZGViaWFuX3BocF92ZXJzaW9uKToKKyAgICAgICAgKFBvcnQpOgorICAg ICAgICAoUG9ydC5fZGFyd2luX3BocF92ZXJzaW9uKToKKyAgICAgICAgKFBvcnQuX2FwYWNoZV9j b25maWdfZmlsZV9uYW1lX2Zvcl9wbGF0Zm9ybSk6CisKIDIwMTctMDEtMDYgIFBlciBBcm5lIFZv bGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5dIFNvbWUgdGVzdHMgYXJl IGZsYWt5IGJlY2F1c2UgY2VydGFpbiBETExzIGFyZSB3cml0aW5nIHRvIHN0ZG91dC4KSW5kZXg6 IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CShyZXZpc2lvbiAyMTA1MDMpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkod29ya2luZyBjb3B5KQpAQCAtMTE2NCw2 ICsxMTY0LDExIEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybiBUcnVl CiAgICAgICAgIHJldHVybiBGYWxzZQogCisgICAgZGVmIF9pc19kYXJ3aW5fcGhwX3ZlcnNpb25f NyhzZWxmKToKKyAgICAgICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMoIi91c3IvbGliZXhl Yy9hcGFjaGUyL2xpYnBocDcuc28iKToKKyAgICAgICAgICAgIHJldHVybiBUcnVlCisgICAgICAg IHJldHVybiBGYWxzZQorCiAgICAgIyBGSVhNRTogVGhpcyBiZWxvbmdzIG9uIHNvbWUgcGxhdGZv cm0gYWJzdHJhY3Rpb24gaW5zdGVhZCBvZiBQb3J0LgogICAgIGRlZiBfaXNfcmVkaGF0X2Jhc2Vk KHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMoJy9ldGMvcmVk aGF0LXJlbGVhc2UnKQpAQCAtMTE4Miw2ICsxMTg3LDExIEBAIGNsYXNzIFBvcnQob2JqZWN0KToK ICAgICAgICAgaWYgc2VsZi5faXNfZGViaWFuX3BocF92ZXJzaW9uXzcoKToKICAgICAgICAgICAg IHJldHVybiAiLXBocDciCiAgICAgICAgIHJldHVybiAiIgorICAgICAgICAKKyAgICBkZWYgX2Rh cndpbl9waHBfdmVyc2lvbihzZWxmKToKKyAgICAgICAgaWYgc2VsZi5faXNfZGFyd2luX3BocF92 ZXJzaW9uXzcoKToKKyAgICAgICAgICAgIHJldHVybiAiLXBocDciCisgICAgICAgIHJldHVybiAi IgogCiAgICAgZGVmIF9mZWRvcmFfcGhwX3ZlcnNpb24oc2VsZik6CiAgICAgICAgIGlmIHNlbGYu X2lzX2ZlZG9yYV9waHBfdmVyc2lvbl83KCk6CkBAIC0xMTkyLDYgKzEyMDIsOCBAQCBjbGFzcyBQ b3J0KG9iamVjdCk6CiAgICAgZGVmIF9hcGFjaGVfY29uZmlnX2ZpbGVfbmFtZV9mb3JfcGxhdGZv cm0oc2VsZiwgc3lzX3BsYXRmb3JtKToKICAgICAgICAgaWYgc3lzX3BsYXRmb3JtID09ICdjeWd3 aW4nIG9yIHN5c19wbGF0Zm9ybS5zdGFydHN3aXRoKCd3aW4nKToKICAgICAgICAgICAgIHJldHVy biAnYXBhY2hlJyArIHNlbGYuX2FwYWNoZV92ZXJzaW9uKCkgKyAnLWh0dHBkLXdpbi5jb25mJwor ICAgICAgICBpZiBzeXNfcGxhdGZvcm0gPT0gJ2Rhcndpbic6CisgICAgICAgICAgICByZXR1cm4g J2FwYWNoZScgKyBzZWxmLl9hcGFjaGVfdmVyc2lvbigpICsgc2VsZi5fZGFyd2luX3BocF92ZXJz aW9uKCkgKyAnLWh0dHBkLmNvbmYnCiAgICAgICAgIGlmIHN5c19wbGF0Zm9ybS5zdGFydHN3aXRo KCdsaW51eCcpOgogICAgICAgICAgICAgaWYgc2VsZi5faXNfcmVkaGF0X2Jhc2VkKCk6CiAgICAg ICAgICAgICAgICAgcmV0dXJuICdmZWRvcmEtaHR0cGQtJyArIHNlbGYuX2FwYWNoZV92ZXJzaW9u KCkgKyBzZWxmLl9mZWRvcmFfcGhwX3ZlcnNpb24oKSArICcuY29uZicKSW5kZXg6IExheW91dFRl c3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlz aW9uIDIxMDUwMykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDEzIEBACisyMDE3LTAxLTA5ICBMdWNhcyBGb3JzY2hsZXIgIDxsZm9yc2NobGVyQGFw cGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTY2ODM5CisgICAgICAgIEFkZCBwaHA3IHN1cHBvcnQgZm9yIG1hY09TLgorICAgICAgICBU aGlzIHBhdGNoIG1pcnJvcnMgdGhlIHNvbHV0aW9uIHRoYXQgZGViaWFuIHVzZXMsIGJ5IGFkZGlu ZyBhIHBocDcgc3BlY2lmaWMgYXBhY2hlIGNvbmYgZmlsZS4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvY29uZi9hcGFjaGUyLjQtcGhwNy1o dHRwZC5jb25mOiBBZGRlZC4KKwogMjAxNy0wMS0wOSAgQWxlamFuZHJvIEcuIENhc3RybyAgPGFs ZXhAaWdhbGlhLmNvbT4KIAogICAgICAgICBbT1dSXSBVbnNraXAgZmFzdC9tZWRpYXN0cmVhbS9N ZWRpYVN0cmVhbS12aWRlby1lbGVtZW50LXRyYWNrLXN0b3AuaHRtbApJbmRleDogTGF5b3V0VGVz dHMvaHR0cC9jb25mL2FwYWNoZTIuNC1waHA3LWh0dHBkLmNvbmYKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvaHR0cC9jb25mL2FwYWNoZTIuNC1waHA3LWh0dHBkLmNvbmYJKG5vbmV4aXN0ZW50 KQorKysgTGF5b3V0VGVzdHMvaHR0cC9jb25mL2FwYWNoZTIuNC1waHA3LWh0dHBkLmNvbmYJKHdv cmtpbmcgY29weSkKQEAgLTAsMCArMSwxNjMgQEAKK1NlcnZlclJvb3QgIi91c3IiCisKK011dGV4 IGZpbGU6L3RtcC9XZWJLaXQKK1BpZEZpbGUgIi90bXAvV2ViS2l0L2h0dHBkLnBpZCIKK1Njb3Jl Qm9hcmRGaWxlICIvdG1wL1dlYktpdC9odHRwZC5zY29yZWJvYXJkIgorCitUaW1lb3V0IDMwMAor S2VlcEFsaXZlIE9uCitNYXhLZWVwQWxpdmVSZXF1ZXN0cyAxMDAKK0tlZXBBbGl2ZVRpbWVvdXQg MTUKKworTWluU3BhcmVTZXJ2ZXJzIDEKK01heFNwYXJlU2VydmVycyA1CitTdGFydFNlcnZlcnMg MQorTWF4UmVxdWVzdFdvcmtlcnMgMTUwCitNYXhDb25uZWN0aW9uc1BlckNoaWxkIDEwMDAwMAor CitMb2FkTW9kdWxlIGF1dG9pbmRleF9tb2R1bGUgbGliZXhlYy9hcGFjaGUyL21vZF9hdXRvaW5k ZXguc28KK0xvYWRNb2R1bGUgdW5peGRfbW9kdWxlIGxpYmV4ZWMvYXBhY2hlMi9tb2RfdW5peGQu c28KK0xvYWRNb2R1bGUgYWNjZXNzX2NvbXBhdF9tb2R1bGUgbGliZXhlYy9hcGFjaGUyL21vZF9h Y2Nlc3NfY29tcGF0LnNvCitMb2FkTW9kdWxlIGF1dGhuX2NvcmVfbW9kdWxlIGxpYmV4ZWMvYXBh Y2hlMi9tb2RfYXV0aG5fY29yZS5zbworTG9hZE1vZHVsZSBhdXRoel9jb3JlX21vZHVsZSBsaWJl eGVjL2FwYWNoZTIvbW9kX2F1dGh6X2NvcmUuc28KK0xvYWRNb2R1bGUgYXV0aHpfaG9zdF9tb2R1 bGUgbGliZXhlYy9hcGFjaGUyL21vZF9hdXRoel9ob3N0LnNvCitMb2FkTW9kdWxlIGluY2x1ZGVf bW9kdWxlIGxpYmV4ZWMvYXBhY2hlMi9tb2RfaW5jbHVkZS5zbworTG9hZE1vZHVsZSBsb2dfY29u ZmlnX21vZHVsZSBsaWJleGVjL2FwYWNoZTIvbW9kX2xvZ19jb25maWcuc28KK0xvYWRNb2R1bGUg aGVhZGVyc19tb2R1bGUgbGliZXhlYy9hcGFjaGUyL21vZF9oZWFkZXJzLnNvCitMb2FkTW9kdWxl IHNzbF9tb2R1bGUgbGliZXhlYy9hcGFjaGUyL21vZF9zc2wuc28KK0xvYWRNb2R1bGUgbWltZV9t b2R1bGUgbGliZXhlYy9hcGFjaGUyL21vZF9taW1lLnNvCitMb2FkTW9kdWxlIGFzaXNfbW9kdWxl IGxpYmV4ZWMvYXBhY2hlMi9tb2RfYXNpcy5zbworTG9hZE1vZHVsZSBjZ2lfbW9kdWxlIGxpYmV4 ZWMvYXBhY2hlMi9tb2RfY2dpLnNvCitMb2FkTW9kdWxlIG5lZ290aWF0aW9uX21vZHVsZSBsaWJl eGVjL2FwYWNoZTIvbW9kX25lZ290aWF0aW9uLnNvCisjTG9hZE1vZHVsZSBpbWFnZW1hcF9tb2R1 bGUgbGliZXhlYy9hcGFjaGUyL21vZF9pbWFnZW1hcC5zbworTG9hZE1vZHVsZSBhY3Rpb25zX21v ZHVsZSBsaWJleGVjL2FwYWNoZTIvbW9kX2FjdGlvbnMuc28KK0xvYWRNb2R1bGUgYWxpYXNfbW9k dWxlIGxpYmV4ZWMvYXBhY2hlMi9tb2RfYWxpYXMuc28KK0xvYWRNb2R1bGUgcmV3cml0ZV9tb2R1 bGUgbGliZXhlYy9hcGFjaGUyL21vZF9yZXdyaXRlLnNvCitMb2FkTW9kdWxlIHBocDdfbW9kdWxl ICAgICAgICBsaWJleGVjL2FwYWNoZTIvbGlicGhwNy5zbworCitTZXJ2ZXJOYW1lIDEyNy4wLjAu MQorCis8RGlyZWN0b3J5IC8+CisgICAgT3B0aW9ucyBJbmRleGVzIEZvbGxvd1N5bUxpbmtzIE11 bHRpVmlld3MgRXhlY0NHSSBJbmNsdWRlcworICAgIEFsbG93T3ZlcnJpZGUgQWxsCisgICAgT3Jk ZXIgYWxsb3csZGVueQorICAgIEFsbG93IGZyb20gYWxsCis8L0RpcmVjdG9yeT4KKworQWNjZXNz RmlsZU5hbWUgLmh0YWNjZXNzCisKKzxGaWxlcyB+ICJeXC4oW0hoXVtUdF18W0RkXVtTc11fW1Nz XSkiPgorICAgIE9yZGVyIGFsbG93LGRlbnkKKyAgICBEZW55IGZyb20gYWxsCisgICAgU2F0aXNm eSBBbGwKKzwvRmlsZXM+CisKK1VzZUNhbm9uaWNhbE5hbWUgT24KK0hvc3RuYW1lTG9va3VwcyBP ZmYKKworTG9nTGV2ZWwgd2FybgorCitFcnJvckxvZyAiL3RtcC9XZWJLaXQvZXJyb3JfbG9nLnR4 dCIKKworTG9nRm9ybWF0ICIlaCAlbCAldSAldCBcIiVyXCIgJT5zICViIFwiJXtSZWZlcmVyfWlc IiBcIiV7VXNlci1BZ2VudH1pXCIiIGNvbWJpbmVkCitMb2dGb3JtYXQgIiVoICVsICV1ICV0IFwi JXJcIiAlPnMgJWIgJUQiIGNvbW1vbgorTG9nRm9ybWF0ICIle1JlZmVyZXJ9aSAtPiAlVSIgcmVm ZXJlcgorTG9nRm9ybWF0ICIle1VzZXItYWdlbnR9aSIgYWdlbnQKKworU2VydmVyU2lnbmF0dXJl IE9uCisKKzxJZk1vZHVsZSBtb2RfYWxpYXMuYz4KKzwvSWZNb2R1bGU+CisKKzxJZk1vZHVsZSBt b2RfbWltZS5jPgorICAgIEFkZExhbmd1YWdlIGRhIC5kaworICAgIEFkZExhbmd1YWdlIG5sIC5u bAorICAgIEFkZExhbmd1YWdlIGVuIC5lbgorICAgIEFkZExhbmd1YWdlIGV0IC5lZQorICAgIEFk ZExhbmd1YWdlIGZyIC5mcgorICAgIEFkZExhbmd1YWdlIGRlIC5kZQorICAgIEFkZExhbmd1YWdl IGVsIC5lbAorICAgIEFkZExhbmd1YWdlIGhlIC5oZQorICAgIEFkZENoYXJzZXQgSVNPLTg4NTkt OCAuaXNvODg1OS04CisgICAgQWRkTGFuZ3VhZ2UgaXQgLml0CisgICAgQWRkTGFuZ3VhZ2UgamEg LmphCisgICAgQWRkQ2hhcnNldCBJU08tMjAyMi1KUCAuamlzCisgICAgQWRkTGFuZ3VhZ2Uga3Ig LmtyCisgICAgQWRkQ2hhcnNldCBJU08tMjAyMi1LUiAuaXNvLWtyCisgICAgQWRkTGFuZ3VhZ2Ug bm4gLm5uCisgICAgQWRkTGFuZ3VhZ2Ugbm8gLm5vCisgICAgQWRkTGFuZ3VhZ2UgcGwgLnBvCisg ICAgQWRkQ2hhcnNldCBJU08tODg1OS0yIC5pc28tcGwKKyAgICBBZGRMYW5ndWFnZSBwdCAucHQK KyAgICBBZGRMYW5ndWFnZSBwdC1iciAucHQtYnIKKyAgICBBZGRMYW5ndWFnZSBsdHogLmx1Cisg ICAgQWRkTGFuZ3VhZ2UgY2EgLmNhCisgICAgQWRkTGFuZ3VhZ2UgZXMgLmVzCisgICAgQWRkTGFu Z3VhZ2Ugc3YgLnN2CisgICAgQWRkTGFuZ3VhZ2UgY3MgLmN6IC5jcworICAgIEFkZExhbmd1YWdl IHJ1IC5ydQorICAgIEFkZExhbmd1YWdlIHpoLVRXIC56aC10dworICAgIEFkZENoYXJzZXQgQmln NSAgICAgICAgIC5CaWc1ICAgIC5iaWc1CisgICAgQWRkQ2hhcnNldCBXSU5ET1dTLTEyNTEgLmNw LTEyNTEKKyAgICBBZGRDaGFyc2V0IENQODY2ICAgICAgICAuY3A4NjYKKyAgICBBZGRDaGFyc2V0 IElTTy04ODU5LTUgICAuaXNvLXJ1CisgICAgQWRkQ2hhcnNldCBLT0k4LVIgICAgICAgLmtvaTgt cgorICAgIEFkZENoYXJzZXQgVUNTLTIgICAgICAgIC51Y3MyCisgICAgQWRkQ2hhcnNldCBVQ1Mt NCAgICAgICAgLnVjczQKKyAgICBBZGRDaGFyc2V0IFVURi04ICAgICAgICAudXRmOAorCisgICAg PElmTW9kdWxlIG1vZF9uZWdvdGlhdGlvbi5jPgorICAgICAgICBMYW5ndWFnZVByaW9yaXR5IGVu IGRhIG5sIGV0IGZyIGRlIGVsIGl0IGphIGtyIG5vIHBsIHB0IHB0LWJyIHJ1IGx0eiBjYSBlcyBz diB0dworICAgIDwvSWZNb2R1bGU+CisKKyAgICBBZGRUeXBlIGFwcGxpY2F0aW9uL3gtdGFyIC50 Z3oKKworICAgIEFkZEVuY29kaW5nIHgtY29tcHJlc3MgLloKKyAgICBBZGRFbmNvZGluZyB4LWd6 aXAgLmd6IC50Z3oKKworICAgIEFkZEhhbmRsZXIgY2dpLXNjcmlwdCAuY2dpIC5wbAorCisgICAg QWRkVHlwZSB0ZXh0L2h0bWwgLnNodG1sCisgICAgQWRkSGFuZGxlciBzZXJ2ZXItcGFyc2VkIC5z aHRtbAorCisgICAgQWRkSGFuZGxlciBzZW5kLWFzLWlzIGFzaXMKKzwvSWZNb2R1bGU+CisKKzxJ Zk1vZHVsZSBtb2RfcGhwNy5jPgorICAgIEFkZFR5cGUgYXBwbGljYXRpb24veC1odHRwZC1waHAg LnBocAorICAgIEFkZFR5cGUgYXBwbGljYXRpb24veC1odHRwZC1waHAgLmJhdAorICAgIEFkZFR5 cGUgYXBwbGljYXRpb24veC1odHRwZC1waHAtc291cmNlIC5waHBzCisKKyAgICA8SWZNb2R1bGUg bW9kX2Rpci5jPgorICAgICAgICBEaXJlY3RvcnlJbmRleCBpbmRleC5odG1sIGluZGV4LnBocAor ICAgIDwvSWZNb2R1bGU+CisKKyAgICBwaHBfZmxhZyBsb2dfZXJyb3JzIG9uCisgICAgcGhwX2Zs YWcgc2hvcnRfb3Blbl90YWcgb24KKzwvSWZNb2R1bGU+CisKKzxJZk1vZHVsZSBtb2RfcmV3cml0 ZS5jPgorICAgIFJld3JpdGVFbmdpbmUgT24KKyAgICBSZXdyaXRlQ29uZCAle1JFUVVFU1RfTUVU SE9EfSBeVFJBQ0UKKyAgICBSZXdyaXRlUnVsZSAuKiAtIFtGXQorPC9JZk1vZHVsZT4KKworPFZp cnR1YWxIb3N0ICo6ODQ0Mz4KKyAgICBTZXJ2ZXJOYW1lIDEyNy4wLjAuMQorICAgIFNTTEVuZ2lu ZSBPbgorPC9WaXJ0dWFsSG9zdD4KKworIworIyBBcHBsZS1zcGVjaWZpYyBmaWxlc3lzdGVtIHBy b3RlY3Rpb24uCisjCis8RmlsZXMgInJzcmMiPgorICAgIE9yZGVyIGFsbG93LGRlbnkKKyAgICBE ZW55IGZyb20gYWxsCisgICAgU2F0aXNmeSBBbGwKKzwvRmlsZXM+CisKKzxEaXJlY3RvcnkgIH4g Ii4qXC5cLm5hbWVkZm9yayI+CisgICAgT3JkZXIgYWxsb3csZGVueQorICAgIERlbnkgZnJvbSBh bGwKKyAgICBTYXRpc2Z5IEFsbAorPC9EaXJlY3Rvcnk+Cg== 298348 2017-01-09 05:53:42 -0800 2017-01-09 09:50:39 -0800 v2, correct style 166839.patch text/plain 7704 lforschler SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDUwMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE3LTAxLTA5ICBMdWNhcyBGb3JzY2hsZXIgIDxsZm9yc2NobGVyQGFwcGxl LmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTY2ODM5CisgICAgICAgIEFkZCBwaHA3IHN1cHBvcnQgZm9yIG1hY09TLgorICAgICAgICBNaXJy b3IgdGhlIGRlYmlhbiBsb2dpYyB0byBsb29rIGZvciBhIHBocDcgbW9kdWxlIG9uIGRpc2ssIGFu ZCByZXR1cm4gdGhlIGFwcHJvcHJpYXRlIGFwYWNoZSBjb25maWcgZmlsZS4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv cG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5faXNfZGFyd2luX3BocF92ZXJzaW9uXzcpOgor ICAgICAgICAoUG9ydC5fZGViaWFuX3BocF92ZXJzaW9uKToKKyAgICAgICAgKFBvcnQpOgorICAg ICAgICAoUG9ydC5fZGFyd2luX3BocF92ZXJzaW9uKToKKyAgICAgICAgKFBvcnQuX2FwYWNoZV9j b25maWdfZmlsZV9uYW1lX2Zvcl9wbGF0Zm9ybSk6CisKIDIwMTctMDEtMDYgIFBlciBBcm5lIFZv bGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5dIFNvbWUgdGVzdHMgYXJl IGZsYWt5IGJlY2F1c2UgY2VydGFpbiBETExzIGFyZSB3cml0aW5nIHRvIHN0ZG91dC4KSW5kZXg6 IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CShyZXZpc2lvbiAyMTA1MDMpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkod29ya2luZyBjb3B5KQpAQCAtMTE2NCw2 ICsxMTY0LDExIEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybiBUcnVl CiAgICAgICAgIHJldHVybiBGYWxzZQogCisgICAgZGVmIF9pc19kYXJ3aW5fcGhwX3ZlcnNpb25f NyhzZWxmKToKKyAgICAgICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMoIi91c3IvbGliZXhl Yy9hcGFjaGUyL2xpYnBocDcuc28iKToKKyAgICAgICAgICAgIHJldHVybiBUcnVlCisgICAgICAg IHJldHVybiBGYWxzZQorCiAgICAgIyBGSVhNRTogVGhpcyBiZWxvbmdzIG9uIHNvbWUgcGxhdGZv cm0gYWJzdHJhY3Rpb24gaW5zdGVhZCBvZiBQb3J0LgogICAgIGRlZiBfaXNfcmVkaGF0X2Jhc2Vk KHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMoJy9ldGMvcmVk aGF0LXJlbGVhc2UnKQpAQCAtMTE4Myw2ICsxMTg4LDExIEBAIGNsYXNzIFBvcnQob2JqZWN0KToK ICAgICAgICAgICAgIHJldHVybiAiLXBocDciCiAgICAgICAgIHJldHVybiAiIgogCisgICAgZGVm IF9kYXJ3aW5fcGhwX3ZlcnNpb24oc2VsZik6CisgICAgICAgIGlmIHNlbGYuX2lzX2Rhcndpbl9w aHBfdmVyc2lvbl83KCk6CisgICAgICAgICAgICByZXR1cm4gIi1waHA3IgorICAgICAgICByZXR1 cm4gIiIKKwogICAgIGRlZiBfZmVkb3JhX3BocF92ZXJzaW9uKHNlbGYpOgogICAgICAgICBpZiBz ZWxmLl9pc19mZWRvcmFfcGhwX3ZlcnNpb25fNygpOgogICAgICAgICAgICAgcmV0dXJuICItcGhw NyIKQEAgLTExOTIsNiArMTIwMiw4IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICBkZWYgX2Fw YWNoZV9jb25maWdfZmlsZV9uYW1lX2Zvcl9wbGF0Zm9ybShzZWxmLCBzeXNfcGxhdGZvcm0pOgog ICAgICAgICBpZiBzeXNfcGxhdGZvcm0gPT0gJ2N5Z3dpbicgb3Igc3lzX3BsYXRmb3JtLnN0YXJ0 c3dpdGgoJ3dpbicpOgogICAgICAgICAgICAgcmV0dXJuICdhcGFjaGUnICsgc2VsZi5fYXBhY2hl X3ZlcnNpb24oKSArICctaHR0cGQtd2luLmNvbmYnCisgICAgICAgIGlmIHN5c19wbGF0Zm9ybSA9 PSAnZGFyd2luJzoKKyAgICAgICAgICAgIHJldHVybiAnYXBhY2hlJyArIHNlbGYuX2FwYWNoZV92 ZXJzaW9uKCkgKyBzZWxmLl9kYXJ3aW5fcGhwX3ZlcnNpb24oKSArICctaHR0cGQuY29uZicKICAg ICAgICAgaWYgc3lzX3BsYXRmb3JtLnN0YXJ0c3dpdGgoJ2xpbnV4Jyk6CiAgICAgICAgICAgICBp ZiBzZWxmLl9pc19yZWRoYXRfYmFzZWQoKToKICAgICAgICAgICAgICAgICByZXR1cm4gJ2ZlZG9y YS1odHRwZC0nICsgc2VsZi5fYXBhY2hlX3ZlcnNpb24oKSArIHNlbGYuX2ZlZG9yYV9waHBfdmVy c2lvbigpICsgJy5jb25mJwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjEwNTAzKQorKysgTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTctMDEtMDkg IEx1Y2FzIEZvcnNjaGxlciAgPGxmb3JzY2hsZXJAYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjY4MzkKKyAgICAgICAgQWRkIHBo cDcgc3VwcG9ydCBmb3IgbWFjT1MuCisgICAgICAgIFRoaXMgcGF0Y2ggbWlycm9ycyB0aGUgc29s dXRpb24gdGhhdCBkZWJpYW4gdXNlcywgYnkgYWRkaW5nIGEgcGhwNyBzcGVjaWZpYyBhcGFjaGUg Y29uZiBmaWxlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogaHR0cC9jb25mL2FwYWNoZTIuNC1waHA3LWh0dHBkLmNvbmY6IEFkZGVkLgorCiAyMDE3 LTAxLTA5ICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgogCiAgICAgICAg IFtPV1JdIFVuc2tpcCBmYXN0L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLXZpZGVvLWVsZW1lbnQt dHJhY2stc3RvcC5odG1sCkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL2NvbmYvYXBhY2hlMi40LXBo cDctaHR0cGQuY29uZgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL2NvbmYvYXBhY2hl Mi40LXBocDctaHR0cGQuY29uZgkobm9uZXhpc3RlbnQpCisrKyBMYXlvdXRUZXN0cy9odHRwL2Nv bmYvYXBhY2hlMi40LXBocDctaHR0cGQuY29uZgkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDE2 MyBAQAorU2VydmVyUm9vdCAiL3VzciIKKworTXV0ZXggZmlsZTovdG1wL1dlYktpdAorUGlkRmls ZSAiL3RtcC9XZWJLaXQvaHR0cGQucGlkIgorU2NvcmVCb2FyZEZpbGUgIi90bXAvV2ViS2l0L2h0 dHBkLnNjb3JlYm9hcmQiCisKK1RpbWVvdXQgMzAwCitLZWVwQWxpdmUgT24KK01heEtlZXBBbGl2 ZVJlcXVlc3RzIDEwMAorS2VlcEFsaXZlVGltZW91dCAxNQorCitNaW5TcGFyZVNlcnZlcnMgMQor TWF4U3BhcmVTZXJ2ZXJzIDUKK1N0YXJ0U2VydmVycyAxCitNYXhSZXF1ZXN0V29ya2VycyAxNTAK K01heENvbm5lY3Rpb25zUGVyQ2hpbGQgMTAwMDAwCisKK0xvYWRNb2R1bGUgYXV0b2luZGV4X21v ZHVsZSBsaWJleGVjL2FwYWNoZTIvbW9kX2F1dG9pbmRleC5zbworTG9hZE1vZHVsZSB1bml4ZF9t b2R1bGUgbGliZXhlYy9hcGFjaGUyL21vZF91bml4ZC5zbworTG9hZE1vZHVsZSBhY2Nlc3NfY29t cGF0X21vZHVsZSBsaWJleGVjL2FwYWNoZTIvbW9kX2FjY2Vzc19jb21wYXQuc28KK0xvYWRNb2R1 bGUgYXV0aG5fY29yZV9tb2R1bGUgbGliZXhlYy9hcGFjaGUyL21vZF9hdXRobl9jb3JlLnNvCitM b2FkTW9kdWxlIGF1dGh6X2NvcmVfbW9kdWxlIGxpYmV4ZWMvYXBhY2hlMi9tb2RfYXV0aHpfY29y ZS5zbworTG9hZE1vZHVsZSBhdXRoel9ob3N0X21vZHVsZSBsaWJleGVjL2FwYWNoZTIvbW9kX2F1 dGh6X2hvc3Quc28KK0xvYWRNb2R1bGUgaW5jbHVkZV9tb2R1bGUgbGliZXhlYy9hcGFjaGUyL21v ZF9pbmNsdWRlLnNvCitMb2FkTW9kdWxlIGxvZ19jb25maWdfbW9kdWxlIGxpYmV4ZWMvYXBhY2hl Mi9tb2RfbG9nX2NvbmZpZy5zbworTG9hZE1vZHVsZSBoZWFkZXJzX21vZHVsZSBsaWJleGVjL2Fw YWNoZTIvbW9kX2hlYWRlcnMuc28KK0xvYWRNb2R1bGUgc3NsX21vZHVsZSBsaWJleGVjL2FwYWNo ZTIvbW9kX3NzbC5zbworTG9hZE1vZHVsZSBtaW1lX21vZHVsZSBsaWJleGVjL2FwYWNoZTIvbW9k X21pbWUuc28KK0xvYWRNb2R1bGUgYXNpc19tb2R1bGUgbGliZXhlYy9hcGFjaGUyL21vZF9hc2lz LnNvCitMb2FkTW9kdWxlIGNnaV9tb2R1bGUgbGliZXhlYy9hcGFjaGUyL21vZF9jZ2kuc28KK0xv YWRNb2R1bGUgbmVnb3RpYXRpb25fbW9kdWxlIGxpYmV4ZWMvYXBhY2hlMi9tb2RfbmVnb3RpYXRp b24uc28KKyNMb2FkTW9kdWxlIGltYWdlbWFwX21vZHVsZSBsaWJleGVjL2FwYWNoZTIvbW9kX2lt YWdlbWFwLnNvCitMb2FkTW9kdWxlIGFjdGlvbnNfbW9kdWxlIGxpYmV4ZWMvYXBhY2hlMi9tb2Rf YWN0aW9ucy5zbworTG9hZE1vZHVsZSBhbGlhc19tb2R1bGUgbGliZXhlYy9hcGFjaGUyL21vZF9h bGlhcy5zbworTG9hZE1vZHVsZSByZXdyaXRlX21vZHVsZSBsaWJleGVjL2FwYWNoZTIvbW9kX3Jl d3JpdGUuc28KK0xvYWRNb2R1bGUgcGhwN19tb2R1bGUgICAgICAgIGxpYmV4ZWMvYXBhY2hlMi9s aWJwaHA3LnNvCisKK1NlcnZlck5hbWUgMTI3LjAuMC4xCisKKzxEaXJlY3RvcnkgLz4KKyAgICBP cHRpb25zIEluZGV4ZXMgRm9sbG93U3ltTGlua3MgTXVsdGlWaWV3cyBFeGVjQ0dJIEluY2x1ZGVz CisgICAgQWxsb3dPdmVycmlkZSBBbGwKKyAgICBPcmRlciBhbGxvdyxkZW55CisgICAgQWxsb3cg ZnJvbSBhbGwKKzwvRGlyZWN0b3J5PgorCitBY2Nlc3NGaWxlTmFtZSAuaHRhY2Nlc3MKKworPEZp bGVzIH4gIl5cLihbSGhdW1R0XXxbRGRdW1NzXV9bU3NdKSI+CisgICAgT3JkZXIgYWxsb3csZGVu eQorICAgIERlbnkgZnJvbSBhbGwKKyAgICBTYXRpc2Z5IEFsbAorPC9GaWxlcz4KKworVXNlQ2Fu b25pY2FsTmFtZSBPbgorSG9zdG5hbWVMb29rdXBzIE9mZgorCitMb2dMZXZlbCB3YXJuCisKK0Vy cm9yTG9nICIvdG1wL1dlYktpdC9lcnJvcl9sb2cudHh0IgorCitMb2dGb3JtYXQgIiVoICVsICV1 ICV0IFwiJXJcIiAlPnMgJWIgXCIle1JlZmVyZXJ9aVwiIFwiJXtVc2VyLUFnZW50fWlcIiIgY29t YmluZWQKK0xvZ0Zvcm1hdCAiJWggJWwgJXUgJXQgXCIlclwiICU+cyAlYiAlRCIgY29tbW9uCitM b2dGb3JtYXQgIiV7UmVmZXJlcn1pIC0+ICVVIiByZWZlcmVyCitMb2dGb3JtYXQgIiV7VXNlci1h Z2VudH1pIiBhZ2VudAorCitTZXJ2ZXJTaWduYXR1cmUgT24KKworPElmTW9kdWxlIG1vZF9hbGlh cy5jPgorPC9JZk1vZHVsZT4KKworPElmTW9kdWxlIG1vZF9taW1lLmM+CisgICAgQWRkTGFuZ3Vh Z2UgZGEgLmRrCisgICAgQWRkTGFuZ3VhZ2UgbmwgLm5sCisgICAgQWRkTGFuZ3VhZ2UgZW4gLmVu CisgICAgQWRkTGFuZ3VhZ2UgZXQgLmVlCisgICAgQWRkTGFuZ3VhZ2UgZnIgLmZyCisgICAgQWRk TGFuZ3VhZ2UgZGUgLmRlCisgICAgQWRkTGFuZ3VhZ2UgZWwgLmVsCisgICAgQWRkTGFuZ3VhZ2Ug aGUgLmhlCisgICAgQWRkQ2hhcnNldCBJU08tODg1OS04IC5pc284ODU5LTgKKyAgICBBZGRMYW5n dWFnZSBpdCAuaXQKKyAgICBBZGRMYW5ndWFnZSBqYSAuamEKKyAgICBBZGRDaGFyc2V0IElTTy0y MDIyLUpQIC5qaXMKKyAgICBBZGRMYW5ndWFnZSBrciAua3IKKyAgICBBZGRDaGFyc2V0IElTTy0y MDIyLUtSIC5pc28ta3IKKyAgICBBZGRMYW5ndWFnZSBubiAubm4KKyAgICBBZGRMYW5ndWFnZSBu byAubm8KKyAgICBBZGRMYW5ndWFnZSBwbCAucG8KKyAgICBBZGRDaGFyc2V0IElTTy04ODU5LTIg Lmlzby1wbAorICAgIEFkZExhbmd1YWdlIHB0IC5wdAorICAgIEFkZExhbmd1YWdlIHB0LWJyIC5w dC1icgorICAgIEFkZExhbmd1YWdlIGx0eiAubHUKKyAgICBBZGRMYW5ndWFnZSBjYSAuY2EKKyAg ICBBZGRMYW5ndWFnZSBlcyAuZXMKKyAgICBBZGRMYW5ndWFnZSBzdiAuc3YKKyAgICBBZGRMYW5n dWFnZSBjcyAuY3ogLmNzCisgICAgQWRkTGFuZ3VhZ2UgcnUgLnJ1CisgICAgQWRkTGFuZ3VhZ2Ug emgtVFcgLnpoLXR3CisgICAgQWRkQ2hhcnNldCBCaWc1ICAgICAgICAgLkJpZzUgICAgLmJpZzUK KyAgICBBZGRDaGFyc2V0IFdJTkRPV1MtMTI1MSAuY3AtMTI1MQorICAgIEFkZENoYXJzZXQgQ1A4 NjYgICAgICAgIC5jcDg2NgorICAgIEFkZENoYXJzZXQgSVNPLTg4NTktNSAgIC5pc28tcnUKKyAg ICBBZGRDaGFyc2V0IEtPSTgtUiAgICAgICAua29pOC1yCisgICAgQWRkQ2hhcnNldCBVQ1MtMiAg ICAgICAgLnVjczIKKyAgICBBZGRDaGFyc2V0IFVDUy00ICAgICAgICAudWNzNAorICAgIEFkZENo YXJzZXQgVVRGLTggICAgICAgIC51dGY4CisKKyAgICA8SWZNb2R1bGUgbW9kX25lZ290aWF0aW9u LmM+CisgICAgICAgIExhbmd1YWdlUHJpb3JpdHkgZW4gZGEgbmwgZXQgZnIgZGUgZWwgaXQgamEg a3Igbm8gcGwgcHQgcHQtYnIgcnUgbHR6IGNhIGVzIHN2IHR3CisgICAgPC9JZk1vZHVsZT4KKwor ICAgIEFkZFR5cGUgYXBwbGljYXRpb24veC10YXIgLnRnegorCisgICAgQWRkRW5jb2RpbmcgeC1j b21wcmVzcyAuWgorICAgIEFkZEVuY29kaW5nIHgtZ3ppcCAuZ3ogLnRnegorCisgICAgQWRkSGFu ZGxlciBjZ2ktc2NyaXB0IC5jZ2kgLnBsCisKKyAgICBBZGRUeXBlIHRleHQvaHRtbCAuc2h0bWwK KyAgICBBZGRIYW5kbGVyIHNlcnZlci1wYXJzZWQgLnNodG1sCisKKyAgICBBZGRIYW5kbGVyIHNl bmQtYXMtaXMgYXNpcworPC9JZk1vZHVsZT4KKworPElmTW9kdWxlIG1vZF9waHA3LmM+CisgICAg QWRkVHlwZSBhcHBsaWNhdGlvbi94LWh0dHBkLXBocCAucGhwCisgICAgQWRkVHlwZSBhcHBsaWNh dGlvbi94LWh0dHBkLXBocCAuYmF0CisgICAgQWRkVHlwZSBhcHBsaWNhdGlvbi94LWh0dHBkLXBo cC1zb3VyY2UgLnBocHMKKworICAgIDxJZk1vZHVsZSBtb2RfZGlyLmM+CisgICAgICAgIERpcmVj dG9yeUluZGV4IGluZGV4Lmh0bWwgaW5kZXgucGhwCisgICAgPC9JZk1vZHVsZT4KKworICAgIHBo cF9mbGFnIGxvZ19lcnJvcnMgb24KKyAgICBwaHBfZmxhZyBzaG9ydF9vcGVuX3RhZyBvbgorPC9J Zk1vZHVsZT4KKworPElmTW9kdWxlIG1vZF9yZXdyaXRlLmM+CisgICAgUmV3cml0ZUVuZ2luZSBP bgorICAgIFJld3JpdGVDb25kICV7UkVRVUVTVF9NRVRIT0R9IF5UUkFDRQorICAgIFJld3JpdGVS dWxlIC4qIC0gW0ZdCis8L0lmTW9kdWxlPgorCis8VmlydHVhbEhvc3QgKjo4NDQzPgorICAgIFNl cnZlck5hbWUgMTI3LjAuMC4xCisgICAgU1NMRW5naW5lIE9uCis8L1ZpcnR1YWxIb3N0PgorCisj CisjIEFwcGxlLXNwZWNpZmljIGZpbGVzeXN0ZW0gcHJvdGVjdGlvbi4KKyMKKzxGaWxlcyAicnNy YyI+CisgICAgT3JkZXIgYWxsb3csZGVueQorICAgIERlbnkgZnJvbSBhbGwKKyAgICBTYXRpc2Z5 IEFsbAorPC9GaWxlcz4KKworPERpcmVjdG9yeSAgfiAiLipcLlwubmFtZWRmb3JrIj4KKyAgICBP cmRlciBhbGxvdyxkZW55CisgICAgRGVueSBmcm9tIGFsbAorICAgIFNhdGlzZnkgQWxsCis8L0Rp cmVjdG9yeT4K