220081 2020-12-22 00:48:04 -0800 [CMake] Use Apple's ICU as fallback 2021-01-07 12:56:38 -0800 1 1 1 Unclassified WebKit CMake WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 holymonson webkit-unassigned achristensen annulen cdumez ddkilzer don.olmstead ews-watchlist fujii gyuyoung.kim krollin ryuan.choi sergio smoley webkit-bug-importer ysuzuki oldest_to_newest 1716180 0 holymonson 2020-12-22 00:48:04 -0800 [CMake] Add USE_APPLE_ICU option 1716181 1 416654 holymonson 2020-12-22 00:50:27 -0800 Created attachment 416654 Patch 1716182 2 holymonson 2020-12-22 00:55:00 -0800 Add USE_APPLE_ICU option to allow non-Mac ports (GTK or JSCOnly) on Darwin could build with non-Apple ICU. 1716280 3 webkit-bug-importer 2020-12-22 11:19:40 -0800 <rdar://problem/72593973> 1716360 4 fujii 2020-12-22 13:44:34 -0800 What is your motivation? Which port are building? There are only ICU header files in Source/WTF/icu directory. Do you have a actual ICU library of the same version with the headers? 1716361 5 fujii 2020-12-22 13:46:22 -0800 I'm sorry. I didn't read your comment#2. 1716365 6 416654 fujii 2020-12-22 13:49:11 -0800 Comment on attachment 416654 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416654&action=review Looks good to me > ChangeLog:5 > + Could you add your comment#2 in the ChangeLog. 1716444 7 416707 holymonson 2020-12-23 04:07:56 -0800 Created attachment 416707 Patch 1716455 8 416707 achristensen 2020-12-23 08:49:48 -0800 Comment on attachment 416707 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416707&action=review > Source/cmake/OptionsCommon.cmake:103 > +option(USE_APPLE_ICU "Use Apple's internal ICU" ${APPLE}) Should this be in OptionsMac.cmake instead of here? 1716464 9 416707 holymonson 2020-12-23 10:01:51 -0800 Comment on attachment 416707 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416707&action=review >> Source/cmake/OptionsCommon.cmake:103 >> +option(USE_APPLE_ICU "Use Apple's internal ICU" ${APPLE}) > > Should this be in OptionsMac.cmake instead of here? It's not about PORT Mac but about OS(Darwin), it affects other ports. For GTK on Darwin, it usually prefers self-compiled version-specified ICU instead of the Apple one, mainly in the case of cross-platform applications keeping their dependencies unified. An alternative to option USE_APPLE_ICU is, we search ICU normally first, if not found, then fallback to use the Apple shipped one. I can make another patch if you like this approach. 1716590 10 416754 holymonson 2020-12-25 00:39:29 -0800 Created attachment 416754 Patch 1717147 11 416754 don.olmstead 2021-01-04 09:43:27 -0800 Comment on attachment 416754 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416754&action=review Overall looks like a good direction for people wanting to build non Apple ports on Apple hardware. > Source/WTF/ChangeLog:8 > + Drop mandatory using Apple's ICU on APPLE, instead use it only when no others found. I think you could be more descriptive here on what the original behavior is and what was changed to support it. > Source/cmake/WebKitFindPackage.cmake:104 > + set(ICU_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ICU/Headers) Isn't ICU_INCLUDE_DIRS being set somewhere already? Shouldn't that be respected unless there is a difference? 1717625 12 416754 holymonson 2021-01-06 05:33:21 -0800 Comment on attachment 416754 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416754&action=review >> Source/WTF/ChangeLog:8 >> + Drop mandatory using Apple's ICU on APPLE, instead use it only when no others found. > > I think you could be more descriptive here on what the original behavior is and what was changed to support it. sure >> Source/cmake/WebKitFindPackage.cmake:104 >> + set(ICU_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ICU/Headers) > > Isn't ICU_INCLUDE_DIRS being set somewhere already? Shouldn't that be respected unless there is a difference? I don't think so, here ICU_INCLUDE_DIRS is set only when (NOT ICU_FOUND), and this line exists prior to this patch. If it's redundant we should call apple to remove. 1717645 13 417083 holymonson 2021-01-06 07:36:48 -0800 Created attachment 417083 Patch 1717648 14 don.olmstead 2021-01-06 08:03:57 -0800 r=me Bots seem happy. I'm going to give Alex and anyone over at Apple, since they're trying to revive the CMake bits, a chance to cq+ it. If I don't hear any objections I'll just cq+ it this afternoon. Thanks for the patch! Really good idea here. 1717746 15 417083 ysuzuki 2021-01-06 12:40:36 -0800 Comment on attachment 417083 Patch Can you ensure USE_APPLE_ICU is on-by-default in Apple Mac ports? 1717757 16 ysuzuki 2021-01-06 13:12:51 -0800 (In reply to Yusuke Suzuki from comment #15) > Comment on attachment 417083 [details] > Patch > > Can you ensure USE_APPLE_ICU is on-by-default in Apple Mac ports? I think we should pass an option, and find an installed ICU only when an option is provided. It is possible that random ICU is installed in the system (due to homebrew etc.) and I think JSCOnly and Mac ports should not select these ICU by default. 1717837 17 holymonson 2021-01-06 20:02:55 -0800 (In reply to Yusuke Suzuki from comment #16) > (In reply to Yusuke Suzuki from comment #15) > > Comment on attachment 417083 [details] > > Patch > > > > Can you ensure USE_APPLE_ICU is on-by-default in Apple Mac ports? > > I think we should pass an option, and find an installed ICU only when an > option is provided. It is possible that random ICU is installed in the > system (due to homebrew etc.) and I think JSCOnly and Mac ports should not > select these ICU by default. No, this patch could also make Mac port able to built with non-Apple ICU. In OptionsMac.cmake (below), it will find LibXml2 and LibXslt in normal paths (a homebrew one maybe), and ICU seemingly should not be an exception. If a user (not apple official) want to build their own Mac port with own ICU, I didn't find restriction to stick to Apple ICU. Besides, this patch would print out which ICU to be used, I think it will reduce misusing an unexpected lib. Alex and Yusuke, former attachment 416707 is the option-used implement, is it preferred in your opinions? ``` find_package(ICU 60.2 REQUIRED COMPONENTS data i18n uc) find_package(LibXml2 2.8.0 REQUIRED) find_package(LibXslt 1.1.7 REQUIRED) ``` 1717844 18 ysuzuki 2021-01-06 20:31:03 -0800 (In reply to monson from comment #17) > (In reply to Yusuke Suzuki from comment #16) > > (In reply to Yusuke Suzuki from comment #15) > > > Comment on attachment 417083 [details] > > > Patch > > > > > > Can you ensure USE_APPLE_ICU is on-by-default in Apple Mac ports? > > > > I think we should pass an option, and find an installed ICU only when an > > option is provided. It is possible that random ICU is installed in the > > system (due to homebrew etc.) and I think JSCOnly and Mac ports should not > > select these ICU by default. > > No, this patch could also make Mac port able to built with non-Apple ICU. In > OptionsMac.cmake (below), it will find LibXml2 and LibXslt in normal paths > (a homebrew one maybe), and ICU seemingly should not be an exception. > > If a user (not apple official) want to build their own Mac port with own > ICU, I didn't find restriction to stick to Apple ICU. Besides, this patch > would print out which ICU to be used, I think it will reduce misusing an > unexpected lib. > > Alex and Yusuke, former attachment 416707 [details] is the option-used > implement, is it preferred in your opinions? > > > ``` > find_package(ICU 60.2 REQUIRED COMPONENTS data i18n uc) > find_package(LibXml2 2.8.0 REQUIRED) > find_package(LibXslt 1.1.7 REQUIRED) > ``` Yes, I think we should use AppleICU on Mac and JSCOnly ports in a default configuration. Using user-specified ICU is awesome. I really love this feature, and this is really exciting to me as a person who implemented most of Intl features in JavaScriptCore lately. This dramatically makes my work easy. But JSCOnly ports are actively used in the other places. And ICU can be installed unintentionally due to homebrew's dependency or something else. At that time, we do not want to pick that ICU implicitly, which makes build configuration complicated. And this makes getting uniform build product of JSCOnly ports in a given macOS environment difficult. ICU is really complicated library which includes bunch of changes in every release (CLDR changes etc.). So when building, what ICU is used is very important. So, passing explicit option (not using AppleICU) is better in JSCOnly and Mac ports. This way offers the way to enable user-installed ICU feature, while it keeps current JSCOnly / Mac w/ AppleICU built without considering what libraries are installed. 1717845 19 annulen 2021-01-06 20:34:53 -0800 Also note that there are cases when automatic fallback to Apple's ICU is undesirable behavior. For example, if someone is building binaries for distribution in AppStore, using system ICU is not allowed as it's considered to be private system API. 1717847 20 annulen 2021-01-06 20:39:02 -0800 In fact, it might be better to use different cmake package names for "standard" and "Apple" ICU so that it would be obvious if find_package() call site what is going to be used, and port could customize fallback order if it's needed at all. 1717866 21 416707 holymonson 2021-01-06 22:37:08 -0800 Comment on attachment 416707 Patch Hi Yusuke, please review Attachment 416707 if you like that. The new option USE_APPLE_ICU will use ${APPLE} as default, so it won't change behavior of current built if not set. As for Konstantin's idea, maybe it needs someone from apple to give patch because they might be affected most. 1717868 22 416707 ysuzuki 2021-01-06 22:40:11 -0800 Comment on attachment 416707 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416707&action=review >>> Source/cmake/OptionsCommon.cmake:103 >>> +option(USE_APPLE_ICU "Use Apple's internal ICU" ${APPLE}) >> >> Should this be in OptionsMac.cmake instead of here? > > It's not about PORT Mac but about OS(Darwin), it affects other ports. For GTK on Darwin, it usually prefers self-compiled version-specified ICU instead of the Apple one, mainly in the case of cross-platform applications keeping their dependencies unified. > > An alternative to option USE_APPLE_ICU is, we search ICU normally first, if not found, then fallback to use the Apple shipped one. I can make another patch if you like this approach. I think this is OK for the first patch. Then, later, we can put USE_APPLE_ICU to OptionsGTK.cmake / OptionsWPT.cmake etc. to explicitly configure it in each ports. For now, let's put the global status-quo option here since we would like to keep Mac and JSCOnly using AppleICU by-default (while having an option to use user-installed ICU is *AWESOME*, it actually streamlines my Intl work in JSC). Previously, to test whether the given ICU bug is fixed in very new ICU, I was using Linux box. But with this option, I can simply do it in macOS. 1717869 23 ysuzuki 2021-01-06 22:40:57 -0800 (In reply to monson from comment #21) > Comment on attachment 416707 [details] > Patch > > Hi Yusuke, please review Attachment 416707 [details] if you like that. The > new option USE_APPLE_ICU will use ${APPLE} as default, so it won't change > behavior of current built if not set. > > As for Konstantin's idea, maybe it needs someone from apple to give patch > because they might be affected most. Nice, I think this patch looks quite good for the first step. This does not change the status-quo, while it adds new great feature (switching ICU based on option). 1718054 24 ews-feeder 2021-01-07 12:56:34 -0800 Committed r271257: <https://trac.webkit.org/changeset/271257> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416707. 416654 2020-12-22 00:50:27 -0800 2020-12-23 04:07:42 -0800 Patch bug-220081-20201222165029.patch text/plain 3421 holymonson U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGY2NGE4OGE5ZTE1YjJlZmVhODcyOGJj NTMxZTNkYmY0ODkzMzRhNTAuLjY5YzQ1MjBkOTJmNmI3NDI1YjI3YTZlNmYzMGZiY2FiNGE1OWY2 YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMTItMjIgIE1vbnNvbiBTaGFvICA8aG9seW1v bnNvbkBnbWFpbC5jb20+CisKKyAgICAgICAgW0NNYWtlXSBBZGQgVVNFX0FQUExFX0lDVSBvcHRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDA4 MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQ01h a2VMaXN0cy50eHQ6CisKIDIwMjAtMTItMjAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3MDk2OS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XVEYvQ01ha2VMaXN0cy50eHQgYi9Tb3VyY2UvV1RGL0NNYWtlTGlzdHMudHh0Cmlu ZGV4IDdjNjE1YzU1MDFjM2MyNTRiMTZkZjdjMjZiMzgyYzk0OTY2YWNkZDIuLjMyMzVhZGQ0MGUx YzIwZWU2MTdmYjI1MmYzMGFmNGJhZGVlZTU3YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ01h a2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dURi9DTWFrZUxpc3RzLnR4dApAQCAtNiw2ICs2LDYg QEAgYWRkX3N1YmRpcmVjdG9yeSh3dGYpCiAKICMgQXBwbGUgYnVpbGRzIGhhdmUgdGhlIElDVSBo ZWFkZXJzIGNoZWNrZWQgaW50byAke1dURl9ESVJ9L2ljdQogIyBDb3B5IHRoZW0gaW50byAke0lD VV9JTkNMVURFX0RJUlN9IHNvIHRoZSBidWlsZCBiZWhhdmVzIGxpa2UgZmluZF9wYWNrYWdlIHdh cyB1c2VkCi1pZiAoQVBQTEUpCitpZiAoVVNFX0FQUExFX0lDVSkKICAgICBmaWxlKENPUFkgJHtX VEZfRElSfS9pY3UvdW5pY29kZSBERVNUSU5BVElPTiAke0lDVV9JTkNMVURFX0RJUlN9KQogZW5k aWYgKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlIGIvU291 cmNlL2NtYWtlL09wdGlvbnNDb21tb24uY21ha2UKaW5kZXggMmY0MWViMjFiYjUzNjhhZDI4ZGVm NWUwZjhkN2Y1Y2NlOTdjNGM3My4uZGQ0ZGE2ODIyMmFkNjI0YTkwYmUxYzg3MGNmNGM3MTI4MzQ0 Yzg2OSAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNDb21tb24uY21ha2UKKysrIGIv U291cmNlL2NtYWtlL09wdGlvbnNDb21tb24uY21ha2UKQEAgLTEwMCw2ICsxMDAsOCBAQCBvcHRp b24oR0NDX09GRkxJTkVBU01fU09VUkNFX01BUAogICAiUHJvZHVjZSBkZWJ1ZyBsaW5lIGluZm9y bWF0aW9uIGZvciBvZmZsaW5lYXNtLWdlbmVyYXRlZCBjb2RlIgogICAke0dDQ19PRkZMSU5FQVNN X1NPVVJDRV9NQVBfREVGQVVMVH0pCiAKK29wdGlvbihVU0VfQVBQTEVfSUNVICJVc2UgQXBwbGUn cyBpbnRlcm5hbCBJQ1UiICR7QVBQTEV9KQorCiAjIEVuYWJsZSB0aGUgdXNhZ2Ugb2YgT3Blbk1Q LgogIyAgLSBBdCB0aGlzIG1vbWVudCwgT3Blbk1QIGlzIG9ubHkgdXNlZCBhcyBhbiBhbHRlcm5h dGl2ZSBpbXBsZW1lbnRhdGlvbgogIyAgICB0byBuYXRpdmUgdGhyZWFkcyBmb3IgdGhlIHBhcmFs bGVsaXphdGlvbiBvZiB0aGUgU1ZHIGZpbHRlcnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2Uv V2ViS2l0RmluZFBhY2thZ2UuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmluZFBhY2thZ2Uu Y21ha2UKaW5kZXggNjJmNTBjMjgyYTdkMTczMDE2MzU3MzdjZWIyMzgwZTVkOTllMDk2Ny4uOGEw YTE4NjhjNDk2M2NlZjg5NjAyZjU0MGJkNDBjOWQ5YjQ4YjhiNCAxMDA2NDQKLS0tIGEvU291cmNl L2NtYWtlL1dlYktpdEZpbmRQYWNrYWdlLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRG aW5kUGFja2FnZS5jbWFrZQpAQCAtNiw3ICs2LDcgQEAKICMgbmljZXIgdG8gd29yayB3aXRoLgog IwogIyBUaGUgcHVycG9zZSBvZiB0aGlzIGZpbGUgaXMgdG8gbWFrZSB0aGUgYmVoYXZpb3Igb2Yg ZmluZF9wYWNrYWdlIGNvbnNpc3RlbnQKLSMgYWNyb3NzIHBvcnRzIGFuZCBDTWFrZSB2ZXJzaW9u cy4gCisjIGFjcm9zcyBwb3J0cyBhbmQgQ01ha2UgdmVyc2lvbnMuCiAKICMgQ01ha2UgcHJvdmlk ZWQgdGFyZ2V0cy4gUmVtb3ZlIHdyYXBwZXJzIHdoZW5ldmVyIHRoZSBtaW5pbXVtIHZlcnNpb24g aXMgYnVtcGVkLgogIwpAQCAtODYsNyArODYsNyBAQCBtYWNybyhmaW5kX3BhY2thZ2UgcGFja2Fn ZSkKICAgICBlbmRpZiAoKQogCiAgICAgIyBBcHBsZSBidWlsZHMgaGF2ZSBhIHVuaXF1ZSBsb2Nh dGlvbiBmb3IgSUNVCi0gICAgaWYgKEFQUExFIEFORCAiJHtwYWNrYWdlfSIgU1RSRVFVQUwgIklD VSIpCisgICAgaWYgKFVTRV9BUFBMRV9JQ1UgQU5EICIke3BhY2thZ2V9IiBTVFJFUVVBTCAiSUNV IikKICAgICAgICAgc2V0KF9mb3VuZF9wYWNrYWdlIE9OKQogCiAgICAgICAgIHNldChJQ1VfSU5D TFVERV9ESVJTICR7Q01BS0VfQklOQVJZX0RJUn0vSUNVL0hlYWRlcnMpCkBAIC05OCw2ICs5OCw3 IEBAIG1hY3JvKGZpbmRfcGFja2FnZSBwYWNrYWdlKQogCiAgICAgICAgIHNldChJQ1VfTElCUkFS SUVTICR7SUNVX1VDX0xJQlJBUll9KQogICAgICAgICBzZXQoSUNVX0ZPVU5EIE9OKQorICAgICAg ICBtZXNzYWdlKFNUQVRVUyAiRm91bmQgSUNVOiAke0lDVV9MSUJSQVJJRVN9IikKICAgICBlbmRp ZiAoKQogCiAgICAgaWYgKE5PVCBfZm91bmRfcGFja2FnZSkKZGlmZiAtLWdpdCBhL0NoYW5nZUxv ZyBiL0NoYW5nZUxvZwppbmRleCAxMmYwNDgwZTQ4Y2U1OWY0NGY4MTBkZmY0N2U4MjFjNjdhYzgx MWRiLi4wNmNmZGY1MjVlNjAyMWJkZWVmY2I3Y2E1ODYyYTcwMmI1OTBjYThhIDEwMDY0NAotLS0g YS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMTItMjIg IE1vbnNvbiBTaGFvICA8aG9seW1vbnNvbkBnbWFpbC5jb20+CisKKyAgICAgICAgW0NNYWtlXSBB ZGQgVVNFX0FQUExFX0lDVSBvcHRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyMDA4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogU291cmNlL2NtYWtlL09wdGlvbnNDb21tb24uY21ha2U6CisgICAg ICAgICogU291cmNlL2NtYWtlL1dlYktpdEZpbmRQYWNrYWdlLmNtYWtlOgorCiAyMDIwLTEyLTIx ICBSeWFuIEhvc3RldGxlciAgPHJob3N0QGFwcGxlLmNvbT4KIAogICAgICAgICAkKGZpbmRzdHJp bmcgaXBob25lLCQoU0RLUk9PVCkpIGZhaWxzIHdoZW4gU0RLUk9PVCBpcyBub3QgbG93ZXJjYXNl Cg== 416707 2020-12-23 04:07:56 -0800 2021-01-07 12:56:36 -0800 Patch bug-220081-20201223200754.patch text/plain 3675 holymonson U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGY2NGE4OGE5ZTE1YjJlZmVhODcyOGJj NTMxZTNkYmY0ODkzMzRhNTAuLjUyNzljOTQ4N2Y1MTEzY2NkODNlY2Y2ZDMzODg4NWNiMGQzMTYy NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMTItMjIgIE1vbnNvbiBTaGFvICA8aG9seW1v bnNvbkBnbWFpbC5jb20+CisKKyAgICAgICAgW0NNYWtlXSBBZGQgVVNFX0FQUExFX0lDVSBvcHRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDA4 MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBV U0VfQVBQTEVfSUNVIG9wdGlvbiB0byBhbGxvdyBub24tTWFjIHBvcnRzIChHVEsgb3IgSlNDT25s eSkgb24gRGFyd2luIGNvdWxkIGJ1aWxkIHdpdGgKKyAgICAgICAgbm9uLUFwcGxlIElDVS4KKwor ICAgICAgICAqIENNYWtlTGlzdHMudHh0OgorCiAyMDIwLTEyLTIwICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzA5Njku CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dURi9DTWFr ZUxpc3RzLnR4dAppbmRleCA3YzYxNWM1NTAxYzNjMjU0YjE2ZGY3YzI2YjM4MmM5NDk2NmFjZGQy Li4zMjM1YWRkNDBlMWMyMGVlNjE3ZmIyNTJmMzBhZjRiYWRlZWU1N2M4IDEwMDY0NAotLS0gYS9T b3VyY2UvV1RGL0NNYWtlTGlzdHMudHh0CisrKyBiL1NvdXJjZS9XVEYvQ01ha2VMaXN0cy50eHQK QEAgLTYsNiArNiw2IEBAIGFkZF9zdWJkaXJlY3Rvcnkod3RmKQogCiAjIEFwcGxlIGJ1aWxkcyBo YXZlIHRoZSBJQ1UgaGVhZGVycyBjaGVja2VkIGludG8gJHtXVEZfRElSfS9pY3UKICMgQ29weSB0 aGVtIGludG8gJHtJQ1VfSU5DTFVERV9ESVJTfSBzbyB0aGUgYnVpbGQgYmVoYXZlcyBsaWtlIGZp bmRfcGFja2FnZSB3YXMgdXNlZAotaWYgKEFQUExFKQoraWYgKFVTRV9BUFBMRV9JQ1UpCiAgICAg ZmlsZShDT1BZICR7V1RGX0RJUn0vaWN1L3VuaWNvZGUgREVTVElOQVRJT04gJHtJQ1VfSU5DTFVE RV9ESVJTfSkKIGVuZGlmICgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0NvbW1v bi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCmluZGV4IDJmNDFlYjIx YmI1MzY4YWQyOGRlZjVlMGY4ZDdmNWNjZTk3YzRjNzMuLmRkNGRhNjgyMjJhZDYyNGE5MGJlMWM4 NzBjZjRjNzEyODM0NGM4NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9u LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCkBAIC0xMDAsNiAr MTAwLDggQEAgb3B0aW9uKEdDQ19PRkZMSU5FQVNNX1NPVVJDRV9NQVAKICAgIlByb2R1Y2UgZGVi dWcgbGluZSBpbmZvcm1hdGlvbiBmb3Igb2ZmbGluZWFzbS1nZW5lcmF0ZWQgY29kZSIKICAgJHtH Q0NfT0ZGTElORUFTTV9TT1VSQ0VfTUFQX0RFRkFVTFR9KQogCitvcHRpb24oVVNFX0FQUExFX0lD VSAiVXNlIEFwcGxlJ3MgaW50ZXJuYWwgSUNVIiAke0FQUExFfSkKKwogIyBFbmFibGUgdGhlIHVz YWdlIG9mIE9wZW5NUC4KICMgIC0gQXQgdGhpcyBtb21lbnQsIE9wZW5NUCBpcyBvbmx5IHVzZWQg YXMgYW4gYWx0ZXJuYXRpdmUgaW1wbGVtZW50YXRpb24KICMgICAgdG8gbmF0aXZlIHRocmVhZHMg Zm9yIHRoZSBwYXJhbGxlbGl6YXRpb24gb2YgdGhlIFNWRyBmaWx0ZXJzLgpkaWZmIC0tZ2l0IGEv U291cmNlL2NtYWtlL1dlYktpdEZpbmRQYWNrYWdlLmNtYWtlIGIvU291cmNlL2NtYWtlL1dlYktp dEZpbmRQYWNrYWdlLmNtYWtlCmluZGV4IDYyZjUwYzI4MmE3ZDE3MzAxNjM1NzM3Y2ViMjM4MGU1 ZDk5ZTA5NjcuLjhhMGExODY4YzQ5NjNjZWY4OTYwMmY1NDBiZDQwYzlkOWI0OGI4YjQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9jbWFrZS9XZWJLaXRGaW5kUGFja2FnZS5jbWFrZQorKysgYi9Tb3VyY2Uv Y21ha2UvV2ViS2l0RmluZFBhY2thZ2UuY21ha2UKQEAgLTYsNyArNiw3IEBACiAjIG5pY2VyIHRv IHdvcmsgd2l0aC4KICMKICMgVGhlIHB1cnBvc2Ugb2YgdGhpcyBmaWxlIGlzIHRvIG1ha2UgdGhl IGJlaGF2aW9yIG9mIGZpbmRfcGFja2FnZSBjb25zaXN0ZW50Ci0jIGFjcm9zcyBwb3J0cyBhbmQg Q01ha2UgdmVyc2lvbnMuIAorIyBhY3Jvc3MgcG9ydHMgYW5kIENNYWtlIHZlcnNpb25zLgogCiAj IENNYWtlIHByb3ZpZGVkIHRhcmdldHMuIFJlbW92ZSB3cmFwcGVycyB3aGVuZXZlciB0aGUgbWlu aW11bSB2ZXJzaW9uIGlzIGJ1bXBlZC4KICMKQEAgLTg2LDcgKzg2LDcgQEAgbWFjcm8oZmluZF9w YWNrYWdlIHBhY2thZ2UpCiAgICAgZW5kaWYgKCkKIAogICAgICMgQXBwbGUgYnVpbGRzIGhhdmUg YSB1bmlxdWUgbG9jYXRpb24gZm9yIElDVQotICAgIGlmIChBUFBMRSBBTkQgIiR7cGFja2FnZX0i IFNUUkVRVUFMICJJQ1UiKQorICAgIGlmIChVU0VfQVBQTEVfSUNVIEFORCAiJHtwYWNrYWdlfSIg U1RSRVFVQUwgIklDVSIpCiAgICAgICAgIHNldChfZm91bmRfcGFja2FnZSBPTikKIAogICAgICAg ICBzZXQoSUNVX0lOQ0xVREVfRElSUyAke0NNQUtFX0JJTkFSWV9ESVJ9L0lDVS9IZWFkZXJzKQpA QCAtOTgsNiArOTgsNyBAQCBtYWNybyhmaW5kX3BhY2thZ2UgcGFja2FnZSkKIAogICAgICAgICBz ZXQoSUNVX0xJQlJBUklFUyAke0lDVV9VQ19MSUJSQVJZfSkKICAgICAgICAgc2V0KElDVV9GT1VO RCBPTikKKyAgICAgICAgbWVzc2FnZShTVEFUVVMgIkZvdW5kIElDVTogJHtJQ1VfTElCUkFSSUVT fSIpCiAgICAgZW5kaWYgKCkKIAogICAgIGlmIChOT1QgX2ZvdW5kX3BhY2thZ2UpCmRpZmYgLS1n aXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggMTJmMDQ4MGU0OGNlNTlmNDRmODEwZGZm NDdlODIxYzY3YWM4MTFkYi4uYzBkZWUxMDhkMDQwZTFkNmNkOWIwYmEzMTZiZjcwZDE0Nzk4NTNl YSAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDIwLTEyLTIyICBNb25zb24gU2hhbyAgPGhvbHltb25zb25AZ21haWwuY29tPgorCisgICAg ICAgIFtDTWFrZV0gQWRkIFVTRV9BUFBMRV9JQ1Ugb3B0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAwODEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgVVNFX0FQUExFX0lDVSBvcHRpb24gdG8g YWxsb3cgbm9uLU1hYyBwb3J0cyAoR1RLIG9yIEpTQ09ubHkpIG9uIERhcndpbiBjb3VsZCBidWls ZCB3aXRoCisgICAgICAgIG5vbi1BcHBsZSBJQ1UuCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2Uv T3B0aW9uc0NvbW1vbi5jbWFrZToKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvV2ViS2l0RmluZFBh Y2thZ2UuY21ha2U6CisKIDIwMjAtMTItMjEgIFJ5YW4gSG9zdGV0bGVyICA8cmhvc3RAYXBwbGUu Y29tPgogCiAgICAgICAgICQoZmluZHN0cmluZyBpcGhvbmUsJChTREtST09UKSkgZmFpbHMgd2hl biBTREtST09UIGlzIG5vdCBsb3dlcmNhc2UK 416754 2020-12-25 00:39:29 -0800 2021-01-06 07:35:58 -0800 Patch bug-220081-20201225163926.patch text/plain 3694 holymonson U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGY2NGE4OGE5ZTE1YjJlZmVhODcyOGJj NTMxZTNkYmY0ODkzMzRhNTAuLjA2NTQ4NTdkMmJiMDkzOTEzZThkYThjOGYzNGQ0YzA0ZjdlOGE0 MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMTItMjIgIE1vbnNvbiBTaGFvICA8aG9seW1v bnNvbkBnbWFpbC5jb20+CisKKyAgICAgICAgW0NNYWtlXSBVc2UgQXBwbGUncyBJQ1UgYXMgZmFs bGJhY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MDA4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERy b3AgbWFuZGF0b3J5IHVzaW5nIEFwcGxlJ3MgSUNVIG9uIEFQUExFLCBpbnN0ZWFkIHVzZSBpdCBv bmx5IHdoZW4gbm8gb3RoZXJzIGZvdW5kLgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisK IDIwMjAtMTItMjAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLCByZXZlcnRpbmcgcjI3MDk2OS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ01h a2VMaXN0cy50eHQgYi9Tb3VyY2UvV1RGL0NNYWtlTGlzdHMudHh0CmluZGV4IDdjNjE1YzU1MDFj M2MyNTRiMTZkZjdjMjZiMzgyYzk0OTY2YWNkZDIuLjMyMzVhZGQ0MGUxYzIwZWU2MTdmYjI1MmYz MGFmNGJhZGVlZTU3YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ01ha2VMaXN0cy50eHQKKysr IGIvU291cmNlL1dURi9DTWFrZUxpc3RzLnR4dApAQCAtNiw2ICs2LDYgQEAgYWRkX3N1YmRpcmVj dG9yeSh3dGYpCiAKICMgQXBwbGUgYnVpbGRzIGhhdmUgdGhlIElDVSBoZWFkZXJzIGNoZWNrZWQg aW50byAke1dURl9ESVJ9L2ljdQogIyBDb3B5IHRoZW0gaW50byAke0lDVV9JTkNMVURFX0RJUlN9 IHNvIHRoZSBidWlsZCBiZWhhdmVzIGxpa2UgZmluZF9wYWNrYWdlIHdhcyB1c2VkCi1pZiAoQVBQ TEUpCitpZiAoVVNFX0FQUExFX0lDVSkKICAgICBmaWxlKENPUFkgJHtXVEZfRElSfS9pY3UvdW5p Y29kZSBERVNUSU5BVElPTiAke0lDVV9JTkNMVURFX0RJUlN9KQogZW5kaWYgKCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9jbWFrZS9XZWJLaXRGaW5kUGFja2FnZS5jbWFrZSBiL1NvdXJjZS9jbWFrZS9X ZWJLaXRGaW5kUGFja2FnZS5jbWFrZQppbmRleCA2MmY1MGMyODJhN2QxNzMwMTYzNTczN2NlYjIz ODBlNWQ5OWUwOTY3Li5hOWM1MTg0OTZjZmRjNTc2NWU0ZGRlZWFlZmQ4MzFjZDAzZDM5OWM2IDEw MDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvV2ViS2l0RmluZFBhY2thZ2UuY21ha2UKKysrIGIvU291 cmNlL2NtYWtlL1dlYktpdEZpbmRQYWNrYWdlLmNtYWtlCkBAIC02LDcgKzYsNyBAQAogIyBuaWNl ciB0byB3b3JrIHdpdGguCiAjCiAjIFRoZSBwdXJwb3NlIG9mIHRoaXMgZmlsZSBpcyB0byBtYWtl IHRoZSBiZWhhdmlvciBvZiBmaW5kX3BhY2thZ2UgY29uc2lzdGVudAotIyBhY3Jvc3MgcG9ydHMg YW5kIENNYWtlIHZlcnNpb25zLiAKKyMgYWNyb3NzIHBvcnRzIGFuZCBDTWFrZSB2ZXJzaW9ucy4K IAogIyBDTWFrZSBwcm92aWRlZCB0YXJnZXRzLiBSZW1vdmUgd3JhcHBlcnMgd2hlbmV2ZXIgdGhl IG1pbmltdW0gdmVyc2lvbiBpcyBidW1wZWQuCiAjCkBAIC04NSwxOSArODUsMjcgQEAgbWFjcm8o ZmluZF9wYWNrYWdlIHBhY2thZ2UpCiAgICAgICAgIGVuZGlmICgpCiAgICAgZW5kaWYgKCkKIAot ICAgICMgQXBwbGUgYnVpbGRzIGhhdmUgYSB1bmlxdWUgbG9jYXRpb24gZm9yIElDVQorICAgICMg QXBwbGUgYnVpbGRzIGhhdmUgYSB1bmlxdWUgbG9jYXRpb24gZm9yIElDVSwgZmFsbGJhY2sgdXNp bmcgaXQgaWYgbm8gb3RoZXJzIGZvdW5kLgogICAgIGlmIChBUFBMRSBBTkQgIiR7cGFja2FnZX0i IFNUUkVRVUFMICJJQ1UiKQogICAgICAgICBzZXQoX2ZvdW5kX3BhY2thZ2UgT04pCiAKLSAgICAg ICAgc2V0KElDVV9JTkNMVURFX0RJUlMgJHtDTUFLRV9CSU5BUllfRElSfS9JQ1UvSGVhZGVycykK KyAgICAgICAgc2V0KF9hcmd2ICIke0FSR1Z9IikKKyAgICAgICAgbGlzdChSRU1PVkVfSVRFTSBf YXJndiAiUkVRVUlSRUQiKQorICAgICAgICBfZmluZF9wYWNrYWdlKCR7X2FyZ3Z9KQogCi0gICAg ICAgICMgQXBwbGUganVzdCBoYXMgYSBzaW5nbGUgdGJkL2R5bGliIGZvciBJQ1UuCi0gICAgICAg IGZpbmRfbGlicmFyeShJQ1VfSTE4Tl9MSUJSQVJZIGljdWNvcmUpCi0gICAgICAgIGZpbmRfbGli cmFyeShJQ1VfVUNfTElCUkFSWSBpY3Vjb3JlKQotICAgICAgICBmaW5kX2xpYnJhcnkoSUNVX0RB VEFfTElCUkFSWSBpY3Vjb3JlKQorICAgICAgICBpZiAoTk9UIElDVV9GT1VORCkKKyAgICAgICAg ICAgICMgQXBwbGUganVzdCBoYXMgYSBzaW5nbGUgdGJkL2R5bGliIGZvciBJQ1UuCisgICAgICAg ICAgICBmaW5kX2xpYnJhcnkoSUNVX1VDX0xJQlJBUlkgaWN1Y29yZSBSRVFVSVJFRCkKKyAgICAg ICAgICAgIG1lc3NhZ2UoU1RBVFVTICJGb3VuZCBJQ1U6ICR7SUNVX1VDX0xJQlJBUll9IikKIAot ICAgICAgICBzZXQoSUNVX0xJQlJBUklFUyAke0lDVV9VQ19MSUJSQVJZfSkKLSAgICAgICAgc2V0 KElDVV9GT1VORCBPTikKKyAgICAgICAgICAgIHNldChJQ1VfREFUQV9MSUJSQVJZICR7SUNVX1VD X0xJQlJBUll9KQorICAgICAgICAgICAgc2V0KElDVV9JMThOX0xJQlJBUlkgJHtJQ1VfVUNfTElC UkFSWX0pCisgICAgICAgICAgICBzZXQoSUNVX0xJQlJBUklFUyAke0lDVV9VQ19MSUJSQVJZfSkK KyAgICAgICAgICAgIHNldChJQ1VfSU5DTFVERV9ESVJTICR7Q01BS0VfQklOQVJZX0RJUn0vSUNV L0hlYWRlcnMpCisKKyAgICAgICAgICAgIHNldChJQ1VfRk9VTkQgT04pCisgICAgICAgICAgICBz ZXQoVVNFX0FQUExFX0lDVSBPTikKKyAgICAgICAgZW5kaWYgKCkKICAgICBlbmRpZiAoKQogCiAg ICAgaWYgKE5PVCBfZm91bmRfcGFja2FnZSkKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5n ZUxvZwppbmRleCAxMmYwNDgwZTQ4Y2U1OWY0NGY4MTBkZmY0N2U4MjFjNjdhYzgxMWRiLi4yYjk1 OGRiYjIyYWIyYTdmNjNkM2Y0MzE4ZWU2YmQ5OWEwYzk3ODJhIDEwMDY0NAotLS0gYS9DaGFuZ2VM b2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMTItMjIgIE1vbnNvbiBT aGFvICA8aG9seW1vbnNvbkBnbWFpbC5jb20+CisKKyAgICAgICAgW0NNYWtlXSBVc2UgQXBwbGUn cyBJQ1UgYXMgZmFsbGJhY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyMDA4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIERyb3AgbWFuZGF0b3J5IHVzaW5nIEFwcGxlJ3MgSUNVIG9uIEFQUExFLCBpbnN0 ZWFkIHVzZSBpdCBvbmx5IHdoZW4gbm8gb3RoZXJzIGZvdW5kLgorCisgICAgICAgICogU291cmNl L2NtYWtlL1dlYktpdEZpbmRQYWNrYWdlLmNtYWtlOgorCiAyMDIwLTEyLTIxICBSeWFuIEhvc3Rl dGxlciAgPHJob3N0QGFwcGxlLmNvbT4KIAogICAgICAgICAkKGZpbmRzdHJpbmcgaXBob25lLCQo U0RLUk9PVCkpIGZhaWxzIHdoZW4gU0RLUk9PVCBpcyBub3QgbG93ZXJjYXNlCg== 417083 2021-01-06 07:36:48 -0800 2021-01-07 12:46:45 -0800 Patch bug-220081-20210106233639.patch text/plain 4203 holymonson U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDZiZjdhZDNjYTVkOTU0MzJmNDMzZWFm MjhmMDdiODA2YWIwMThhYWIuLjlkNmU5Y2JlMDEzMTcwYjg1ZjJhNDU3NDQ1ODcxNjViMGU5NWE0 NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMTItMjIgIE1vbnNvbiBTaGFvICA8aG9seW1v bnNvbkBnbWFpbC5jb20+CisKKyAgICAgICAgW0NNYWtlXSBVc2UgQXBwbGUncyBJQ1UgYXMgZmFs bGJhY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MDA4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBy aW9yIHRvIHRoaXMgY29tbWl0LCBBcHBsZSdzIElDVSBpcyBtYW5kYXRvcmlseSB1c2VkIG9uIERh cndpbi4gSXQncyBmaW5lIHRvIE1hYyBwb3J0LCBidXQKKyAgICAgICAgbm90IGZyaWVuZGx5IHRv IEdUSyBvciBKU0NPbmx5LiBUaGlzIGNvbW1pdCBsb3dlciB0aGUgcHJpb3JpdHkgb2YgQXBwbGUn cyBJQ1UsIHNvIHdlIGNhbgorICAgICAgICB1c2Ugb3RoZXIgSUNVLCBpZiBhbnksIG9uIERhcndp biBmb3Igbm9uLU1hYyBwb3J0LgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6IFVzZSBVU0Vf QVBQTEVfSUNVLgorCiAyMDIxLTAxLTA1ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlA YXBwbGUuY29tPgogCiAgICAgICAgIE5TQ3Jvc3NXZWJzaXRlVHJhY2tpbmdVc2FnZURlc2NyaXB0 aW9uIGlzIG5vdCB3b3JraW5nIG9uIE1hYywgSVRQIGlzIGFsd2F5cyBlbmFibGVkCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV1RGL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dURi9DTWFrZUxpc3RzLnR4 dAppbmRleCA3YzYxNWM1NTAxYzNjMjU0YjE2ZGY3YzI2YjM4MmM5NDk2NmFjZGQyLi4zMjM1YWRk NDBlMWMyMGVlNjE3ZmIyNTJmMzBhZjRiYWRlZWU1N2M4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RG L0NNYWtlTGlzdHMudHh0CisrKyBiL1NvdXJjZS9XVEYvQ01ha2VMaXN0cy50eHQKQEAgLTYsNiAr Niw2IEBAIGFkZF9zdWJkaXJlY3Rvcnkod3RmKQogCiAjIEFwcGxlIGJ1aWxkcyBoYXZlIHRoZSBJ Q1UgaGVhZGVycyBjaGVja2VkIGludG8gJHtXVEZfRElSfS9pY3UKICMgQ29weSB0aGVtIGludG8g JHtJQ1VfSU5DTFVERV9ESVJTfSBzbyB0aGUgYnVpbGQgYmVoYXZlcyBsaWtlIGZpbmRfcGFja2Fn ZSB3YXMgdXNlZAotaWYgKEFQUExFKQoraWYgKFVTRV9BUFBMRV9JQ1UpCiAgICAgZmlsZShDT1BZ ICR7V1RGX0RJUn0vaWN1L3VuaWNvZGUgREVTVElOQVRJT04gJHtJQ1VfSU5DTFVERV9ESVJTfSkK IGVuZGlmICgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvV2ViS2l0RmluZFBhY2thZ2UuY21h a2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmluZFBhY2thZ2UuY21ha2UKaW5kZXggNjJmNTBjMjgy YTdkMTczMDE2MzU3MzdjZWIyMzgwZTVkOTllMDk2Ny4uYTljNTE4NDk2Y2ZkYzU3NjVlNGRkZWVh ZWZkODMxY2QwM2QzOTljNiAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL1dlYktpdEZpbmRQYWNr YWdlLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGaW5kUGFja2FnZS5jbWFrZQpAQCAt Niw3ICs2LDcgQEAKICMgbmljZXIgdG8gd29yayB3aXRoLgogIwogIyBUaGUgcHVycG9zZSBvZiB0 aGlzIGZpbGUgaXMgdG8gbWFrZSB0aGUgYmVoYXZpb3Igb2YgZmluZF9wYWNrYWdlIGNvbnNpc3Rl bnQKLSMgYWNyb3NzIHBvcnRzIGFuZCBDTWFrZSB2ZXJzaW9ucy4gCisjIGFjcm9zcyBwb3J0cyBh bmQgQ01ha2UgdmVyc2lvbnMuCiAKICMgQ01ha2UgcHJvdmlkZWQgdGFyZ2V0cy4gUmVtb3ZlIHdy YXBwZXJzIHdoZW5ldmVyIHRoZSBtaW5pbXVtIHZlcnNpb24gaXMgYnVtcGVkLgogIwpAQCAtODUs MTkgKzg1LDI3IEBAIG1hY3JvKGZpbmRfcGFja2FnZSBwYWNrYWdlKQogICAgICAgICBlbmRpZiAo KQogICAgIGVuZGlmICgpCiAKLSAgICAjIEFwcGxlIGJ1aWxkcyBoYXZlIGEgdW5pcXVlIGxvY2F0 aW9uIGZvciBJQ1UKKyAgICAjIEFwcGxlIGJ1aWxkcyBoYXZlIGEgdW5pcXVlIGxvY2F0aW9uIGZv ciBJQ1UsIGZhbGxiYWNrIHVzaW5nIGl0IGlmIG5vIG90aGVycyBmb3VuZC4KICAgICBpZiAoQVBQ TEUgQU5EICIke3BhY2thZ2V9IiBTVFJFUVVBTCAiSUNVIikKICAgICAgICAgc2V0KF9mb3VuZF9w YWNrYWdlIE9OKQogCi0gICAgICAgIHNldChJQ1VfSU5DTFVERV9ESVJTICR7Q01BS0VfQklOQVJZ X0RJUn0vSUNVL0hlYWRlcnMpCisgICAgICAgIHNldChfYXJndiAiJHtBUkdWfSIpCisgICAgICAg IGxpc3QoUkVNT1ZFX0lURU0gX2FyZ3YgIlJFUVVJUkVEIikKKyAgICAgICAgX2ZpbmRfcGFja2Fn ZSgke19hcmd2fSkKIAotICAgICAgICAjIEFwcGxlIGp1c3QgaGFzIGEgc2luZ2xlIHRiZC9keWxp YiBmb3IgSUNVLgotICAgICAgICBmaW5kX2xpYnJhcnkoSUNVX0kxOE5fTElCUkFSWSBpY3Vjb3Jl KQotICAgICAgICBmaW5kX2xpYnJhcnkoSUNVX1VDX0xJQlJBUlkgaWN1Y29yZSkKLSAgICAgICAg ZmluZF9saWJyYXJ5KElDVV9EQVRBX0xJQlJBUlkgaWN1Y29yZSkKKyAgICAgICAgaWYgKE5PVCBJ Q1VfRk9VTkQpCisgICAgICAgICAgICAjIEFwcGxlIGp1c3QgaGFzIGEgc2luZ2xlIHRiZC9keWxp YiBmb3IgSUNVLgorICAgICAgICAgICAgZmluZF9saWJyYXJ5KElDVV9VQ19MSUJSQVJZIGljdWNv cmUgUkVRVUlSRUQpCisgICAgICAgICAgICBtZXNzYWdlKFNUQVRVUyAiRm91bmQgSUNVOiAke0lD VV9VQ19MSUJSQVJZfSIpCiAKLSAgICAgICAgc2V0KElDVV9MSUJSQVJJRVMgJHtJQ1VfVUNfTElC UkFSWX0pCi0gICAgICAgIHNldChJQ1VfRk9VTkQgT04pCisgICAgICAgICAgICBzZXQoSUNVX0RB VEFfTElCUkFSWSAke0lDVV9VQ19MSUJSQVJZfSkKKyAgICAgICAgICAgIHNldChJQ1VfSTE4Tl9M SUJSQVJZICR7SUNVX1VDX0xJQlJBUll9KQorICAgICAgICAgICAgc2V0KElDVV9MSUJSQVJJRVMg JHtJQ1VfVUNfTElCUkFSWX0pCisgICAgICAgICAgICBzZXQoSUNVX0lOQ0xVREVfRElSUyAke0NN QUtFX0JJTkFSWV9ESVJ9L0lDVS9IZWFkZXJzKQorCisgICAgICAgICAgICBzZXQoSUNVX0ZPVU5E IE9OKQorICAgICAgICAgICAgc2V0KFVTRV9BUFBMRV9JQ1UgT04pCisgICAgICAgIGVuZGlmICgp CiAgICAgZW5kaWYgKCkKIAogICAgIGlmIChOT1QgX2ZvdW5kX3BhY2thZ2UpCmRpZmYgLS1naXQg YS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggMGMzZGVmMzBmN2E5ZGU3MThiYTA5NDI5OTBm NGQ3NjllNmNjZDE4ZS4uNDI4ZTlmNDMxNWQ0NWRjNzQyOWFlMWMxMWVmZGM5Y2RkOGUwMzRhNSAx MDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisy MDIwLTEyLTIyICBNb25zb24gU2hhbyAgPGhvbHltb25zb25AZ21haWwuY29tPgorCisgICAgICAg IFtDTWFrZV0gVXNlIEFwcGxlJ3MgSUNVIGFzIGZhbGxiYWNrCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAwODEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmlvciB0byB0aGlzIGNvbW1pdCwgQXBwbGUn cyBJQ1UgaXMgbWFuZGF0b3JpbHkgdXNlZCBvbiBEYXJ3aW4uIEl0J3MgZmluZSB0byBNYWMgcG9y dCwgYnV0CisgICAgICAgIG5vdCBmcmllbmRseSB0byBHVEsgb3IgSlNDT25seS4gVGhpcyBjb21t aXQgbG93ZXIgdGhlIHByaW9yaXR5IG9mIEFwcGxlJ3MgSUNVLCBzbyB3ZSBjYW4KKyAgICAgICAg dXNlIG90aGVyIElDVSwgaWYgYW55LCBvbiBEYXJ3aW4gZm9yIG5vbi1NYWMgcG9ydC4KKworICAg ICAgICAqIFNvdXJjZS9jbWFrZS9XZWJLaXRGaW5kUGFja2FnZS5jbWFrZTogQ2hhbmdlIHRvIHNl YXJjaCBub3JtYWwgSUNVIGZpcnN0IHRoZW4gZmFsbGJhY2sgdG8gQXBwbGUncy4KKwogMjAyMS0w MS0wNSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAg ICBbV2luQ2Fpcm9dW2N1cmxdIEVuYWJsZSBDVVJMU1NMT1BUX05BVElWRV9DQSBmbGFnIHRvIHVz ZSBzeXN0ZW0ncyBDQSBjZXJ0cyBpbnN0ZWFkIG9mIGNhY2VydC5wZW0K