234624 2021-12-22 16:53:42 -0800 Fix WebKit Build issues when using system content path 2022-01-04 14:29:01 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 msaboff msaboff ap dino eric.carlson ews-watchlist fpizlo jberlin kbr kondapallykalyan webkit-bug-importer oldest_to_newest 1826447 0 msaboff 2021-12-22 16:53:42 -0800 A few more bugs in the recent config file changes for alternate root builds. - For frameworks nested under the WebCore framework, for macOS the directory needs to include the version, e.g. WebCore.framework/Versions/A/Frameworks instead of WebCore.framework/Frameworks. - WebKit needs to have SYSTEM_CONTENT_PATH added to the nested frameworks path (UMBRELLA_FRAMEWORKS_DIR). - WebCore and WebKitLegacy framework locations needs to have the SYSTEM_CONTENT_PATH added. 1826448 1 msaboff 2021-12-22 16:54:13 -0800 <rdar://86828224> 1826462 2 447848 msaboff 2021-12-22 17:25:06 -0800 Created attachment 447848 Patch 1826463 3 ews-watchlist 2021-12-22 17:26:21 -0800 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1826468 4 447848 jberlin 2021-12-22 18:00:20 -0800 Comment on attachment 447848 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447848&action=review > Source/ThirdParty/ANGLE/ChangeLog:9 > + Deleted unussed create-symlink-to-altroot.sh script. Typo: "unussed" 1826474 5 msaboff 2021-12-22 19:06:51 -0800 (In reply to Jessie Berlin from comment #4) > Comment on attachment 447848 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=447848&action=review > > > Source/ThirdParty/ANGLE/ChangeLog:9 > > + Deleted unussed create-symlink-to-altroot.sh script. > > Typo: "unussed" Fixed locally. 1826475 6 msaboff 2021-12-22 19:10:26 -0800 Committed r287382 (?): <https://commits.webkit.org/r287382> 1826559 7 447848 ap 2021-12-23 09:23:20 -0800 Comment on attachment 447848 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447848&action=review > Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig:35 > +INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks; What makes this macOS specific? 1828099 8 ap 2022-01-04 14:29:01 -0800 > What makes this macOS specific? Fixing this is tracked as bug 234857 now. 447848 2021-12-22 17:25:06 -0800 2021-12-22 18:33:35 -0800 Patch 234624.patch text/plain 13675 msaboff SW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4NzM3OCkKKysrIFNv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE2IEBACisyMDIxLTEyLTIyICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgor CisgICAgICAgIEZpeCBXZWJLaXQgQnVpbGQgaXNzdWVzIHdoZW4gdXNpbmcgc3lzdGVtIGNvbnRl bnQgcGF0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjM0NjI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q2hhbmdlZCBJTlNUQUxMX1BBVEggb24gbWFjT1MgYnVpbGRzIHRvIHVzZSBhIGZ1bGx5IHF1YWxp ZmllZCAuLi4vV2ViQ29yZS5mcmFtZXdvcmsvVmVyc2lvbnMvQS9GcmFtZXdvcmtzLgorICAgICAg ICBEZWxldGVkIHVudXNzZWQgY3JlYXRlLXN5bWxpbmstdG8tYWx0cm9vdC5zaCBzY3JpcHQuCisK KyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9BTkdMRS1keW5hbWljLnhjY29uZmlnOgorICAgICAg ICAqIHNjcmlwdHMvY3JlYXRlLXN5bWxpbmstdG8tYWx0cm9vdC5zaDogUmVtb3ZlZC4KKwogMjAy MS0xMi0yMSAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBG aXggc3ltbGlua3MgZm9yIGFsdGVybmF0ZSByb290IGZyYW1ld29yayBsb2NhdGlvbnMKSW5kZXg6 IFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NvbmZpZ3VyYXRpb25zL0FOR0xFLWR5bmFtaWMueGNj b25maWcKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1RoaXJkUGFydHkvQU5HTEUvQ29uZmlndXJhdGlv bnMvQU5HTEUtZHluYW1pYy54Y2NvbmZpZwkocmV2aXNpb24gMjg3Mzc4KQorKysgU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvQ29uZmlndXJhdGlvbnMvQU5HTEUtZHluYW1pYy54Y2NvbmZpZwkod29y a2luZyBjb3B5KQpAQCAtMTUsOSArMTUsOSBAQCBBTkdMRV9PVEhFUl9MREZMQUdTX21hY2NhdGFs eXN0ID0gLWZyYW1lCiBBTkdMRV9PVEhFUl9MREZMQUdTX21hY29zeCA9IC1mcmFtZXdvcmsgSU9L aXQgLWx6OwogCiBJTlNUQUxMX1BBVEggPSAkKElOU1RBTExfUEFUSF9VU0VfU1lTVEVNX0NPTlRF TlRfUEFUSF8kKFVTRV9TWVNURU1fQ09OVEVOVF9QQVRIKSk7Ci1JTlNUQUxMX1BBVEhfVVNFX1NZ U1RFTV9DT05URU5UX1BBVEhfWUVTID0gJChTWVNURU1fQ09OVEVOVF9QQVRIKSQoTk9STUFMX1dF QkNPUkVfRlJBTUVXT1JLU19ESVIpL1dlYkNvcmUuZnJhbWV3b3JrL0ZyYW1ld29ya3M7CitJTlNU QUxMX1BBVEhfVVNFX1NZU1RFTV9DT05URU5UX1BBVEhfWUVTID0gJChTWVNURU1fQ09OVEVOVF9Q QVRIKSQoTk9STUFMX1dFQkNPUkVfRlJBTUVXT1JLU19ESVIpL1dlYkNvcmUuZnJhbWV3b3JrL1Zl cnNpb25zL0EvRnJhbWV3b3JrczsKIElOU1RBTExfUEFUSF9VU0VfU1lTVEVNX0NPTlRFTlRfUEFU SF8gPSAkKElOU1RBTExfUEFUSF9VU0VfU1lTVEVNX0NPTlRFTlRfUEFUSF9OTyk7Ci1JTlNUQUxM X1BBVEhfVVNFX1NZU1RFTV9DT05URU5UX1BBVEhfTk8gPSAkKE5PUk1BTF9XRUJDT1JFX0ZSQU1F V09SS1NfRElSKS9XZWJDb3JlLmZyYW1ld29yay9GcmFtZXdvcmtzOworSU5TVEFMTF9QQVRIX1VT RV9TWVNURU1fQ09OVEVOVF9QQVRIX05PID0gJChOT1JNQUxfV0VCQ09SRV9GUkFNRVdPUktTX0RJ UikvV2ViQ29yZS5mcmFtZXdvcmsvVmVyc2lvbnMvQS9GcmFtZXdvcmtzOwogSU5TVEFMTF9QQVRI X1VTRV9TWVNURU1fQ09OVEVOVF9QQVRIX05PW3Nkaz1tYWNvc3gqXSA9ICQoSU5TVEFMTF9QQVRI X1VTRV9BTFRFUk5BVEVfRlJBTUVXT1JLU19ESVJfJChXS19VU0VfQUxURVJOQVRFX0ZSQU1FV09S S1NfRElSKSk7CiBJTlNUQUxMX1BBVEhfVVNFX0FMVEVSTkFURV9GUkFNRVdPUktTX0RJUl9OTyA9 ICQoSU5TVEFMTF9QQVRIX1VTRV9PVkVSUklERV9GUkFNRVdPUktTX0RJUl8kKFdLX1VTRV9PVkVS UklERV9GUkFNRVdPUktTX0RJUikpOwogSU5TVEFMTF9QQVRIX1VTRV9PVkVSUklERV9GUkFNRVdP UktTX0RJUl9OTyA9ICQoTk9STUFMX1dFQkNPUkVfRlJBTUVXT1JLU19ESVIpL1dlYkNvcmUuZnJh bWV3b3JrL1ZlcnNpb25zL0EvRnJhbWV3b3JrczsKSW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NjcmlwdHMvY3JlYXRlLXN5bWxpbmstdG8tYWx0cm9vdC5zaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zY3JpcHRzL2NyZWF0ZS1zeW1saW5rLXRvLWFsdHJvb3Qu c2gJKHJldmlzaW9uIDI4NzM3OCkKKysrIFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NjcmlwdHMv Y3JlYXRlLXN5bWxpbmstdG8tYWx0cm9vdC5zaAkobm9uZXhpc3RlbnQpCkBAIC0xLDMwICswLDAg QEAKLSMhL2Jpbi96c2gKLQotc2V0IC1lCi0KLWlmIFtbIC16ICIke09VVFBVVF9BTFRFUk5BVEVf Uk9PVF9QQVRIfSIgXV07IHRoZW4KLSAgICBleGl0IDAKLWZpCi0KLWlmIFtbICIke1NLSVBfSU5T VEFMTH0iID0gIllFUyIgXV07IHRoZW4KLSAgICBleGl0IDAKLWZpCi0KLSMgQ29udmVydCBlZy4g YC9TeXN0ZW0vTGlicmFyeS9Qcml2YXRlRnJhbWV3b3Jrc2AgdG8gYC4uLy4uLy4uYAotUkVMQVRJ VkVfUEFUSF9GUk9NX1NZTUxJTktfVE9fUk9PVD0kKGVjaG8gIiR7QUxURVJOQVRFX1JPT1RfUEFU SH0iIHwgc2VkIC1FIC1lICJzL1wvW2EtekEtWjAtOV9dKy8uLlwvL2ciIC1lICJzL1wvJC8vIikK LVNZTUxJTktfVkFMVUU9IiR7UkVMQVRJVkVfUEFUSF9GUk9NX1NZTUxJTktfVE9fUk9PVH0ke0lO U1RBTExfUEFUSH0vJHtGVUxMX1BST0RVQ1RfTkFNRX0iCi0KLWlmIFtbIC1MICIke09VVFBVVF9B TFRFUk5BVEVfUk9PVF9QQVRIfSIgXV07IHRoZW4KLSAgICBFWElTVElOR19TWU1MSU5LX1ZBTFVF PSQocmVhZGxpbmsgIiR7T1VUUFVUX0FMVEVSTkFURV9ST09UX1BBVEh9IikKLQotICAgIGlmIFtb ICIke0VYSVNUSU5HX1NZTUxJTktfVkFMVUV9IiA9PSAiJHtTWU1MSU5LX1ZBTFVFfSIgXV07IHRo ZW4KLSAgICAgICAgZXhpdCAwCi0gICAgZmkKLQotICAgIGVjaG8gIndhcm5pbmc6IGV4aXN0aW5n IHN5bWxpbmsgaXMgaW5jb3JyZWN0OyBleHBlY3RlZCAke1NZTUxJTktfVkFMVUV9LCBnb3QgJHtF WElTVElOR19TWU1MSU5LX1ZBTFVFfSIKLWVsaWYgW1sgLWUgIiR7T1VUUFVUX0FMVEVSTkFURV9S T09UX1BBVEh9IiBdXTsgdGhlbgotICAgIGVjaG8gImVycm9yOiBleHBlY3RlZCBhIHN5bWxpbmsg YXQgJHtPVVRQVVRfQUxURVJOQVRFX1JPT1RfUEFUSH0iCi0gICAgZXhpdCAxCi1maQotCi1sbiAt c2YgIiR7U1lNTElOS19WQUxVRX0iICIke09VVFBVVF9BTFRFUk5BVEVfUk9PVF9QQVRIfSIKClBy b3BlcnR5IGNoYW5nZXMgb246IFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NjcmlwdHMvY3JlYXRl LXN5bWxpbmstdG8tYWx0cm9vdC5zaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkRlbGV0ZWQ6IHN2bjpleGVjdXRhYmxl CiMjIC0xICswLDAgIyMKLSoKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQpJbmRleDog U291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODczNzgpCisrKyBT b3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTQgQEAKKzIwMjEtMTItMjIgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5j b20+CisKKyAgICAgICAgRml4IFdlYktpdCBCdWlsZCBpc3N1ZXMgd2hlbiB1c2luZyBzeXN0ZW0g Y29udGVudCBwYXRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzQ2MjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBDaGFuZ2VkIElOU1RBTExfUEFUSCBvbiBtYWNPUyBidWlsZHMgdG8gdXNlIGZ1bGx5IHF1 YWxpZmllZCAuLi4vV2ViQ29yZS5mcmFtZXdvcmsvVmVyc2lvbnMvQS9GcmFtZXdvcmtzLgorCisg ICAgICAgICogQ29uZmlndXJhdGlvbnMvbGlid2VicnRjLnhjY29uZmlnOgorCiAyMDIxLTEyLTE2 ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQxNzMKSW5kZXg6IFNvdXJjZS9UaGly ZFBhcnR5L2xpYndlYnJ0Yy9Db25maWd1cmF0aW9ucy9saWJ3ZWJydGMueGNjb25maWcKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NvbmZpZ3VyYXRpb25zL2xpYndl YnJ0Yy54Y2NvbmZpZwkocmV2aXNpb24gMjg3Mzc4KQorKysgU291cmNlL1RoaXJkUGFydHkvbGli d2VicnRjL0NvbmZpZ3VyYXRpb25zL2xpYndlYnJ0Yy54Y2NvbmZpZwkod29ya2luZyBjb3B5KQpA QCAtMzIsNyArMzIsNyBAQCBFWFBPUlRFRF9TWU1CT0xTX0ZJTEVbc2RrPWlwaG9uZW9zKl0gPSBD CiBFWFBPUlRFRF9TWU1CT0xTX0ZJTEVbc2RrPWlwaG9uZXNpbXVsYXRvcipdID0gQ29uZmlndXJh dGlvbnMvbGlid2VicnRjLmlPU3NpbS5leHA7CiAKIElOU1RBTExfUEFUSCA9ICQoSU5TVEFMTF9Q QVRIX1VTRV9TWVNURU1fQ09OVEVOVF9QQVRIXyQoVVNFX1NZU1RFTV9DT05URU5UX1BBVEgpKTsK LUlOU1RBTExfUEFUSF9VU0VfU1lTVEVNX0NPTlRFTlRfUEFUSF9ZRVMgPSAkKFNZU1RFTV9DT05U RU5UX1BBVEgpJChOT1JNQUxfV0VCQ09SRV9GUkFNRVdPUktTX0RJUikvV2ViQ29yZS5mcmFtZXdv cmsvRnJhbWV3b3JrczsKK0lOU1RBTExfUEFUSF9VU0VfU1lTVEVNX0NPTlRFTlRfUEFUSF9ZRVMg PSAkKFNZU1RFTV9DT05URU5UX1BBVEgpJChOT1JNQUxfV0VCQ09SRV9GUkFNRVdPUktTX0RJUikv V2ViQ29yZS5mcmFtZXdvcmsvVmVyc2lvbnMvQS9GcmFtZXdvcmtzOwogSU5TVEFMTF9QQVRIX1VT RV9TWVNURU1fQ09OVEVOVF9QQVRIXyA9ICQoSU5TVEFMTF9QQVRIX1VTRV9TWVNURU1fQ09OVEVO VF9QQVRIX05PKTsKIElOU1RBTExfUEFUSF9VU0VfU1lTVEVNX0NPTlRFTlRfUEFUSF9OTyA9ICQo Tk9STUFMX1dFQkNPUkVfRlJBTUVXT1JLU19ESVIpL1dlYkNvcmUuZnJhbWV3b3JrL0ZyYW1ld29y a3M7CiBJTlNUQUxMX1BBVEhfVVNFX1NZU1RFTV9DT05URU5UX1BBVEhfTk9bc2RrPW1hY29zeCpd ID0gJChJTlNUQUxMX1BBVEhfVVNFX09WRVJSSURFX0ZSQU1FV09SS1NfRElSXyQoV0tfVVNFX09W RVJSSURFX0ZSQU1FV09SS1NfRElSKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODczNzgp CisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NiBAQAorMjAyMS0xMi0yMiAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KKwor ICAgICAgICBGaXggV2ViS2l0IEJ1aWxkIGlzc3VlcyB3aGVuIHVzaW5nIHN5c3RlbSBjb250ZW50 IHBhdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz NDYyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENv dmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgQWRkZWQgU1lTVEVNX0NPTlRFTlRf UEFUSCBwcm9jZXNzaW5nIHRvIFdlYkNvcmUncyBub3JtYWwgbG9jYXRpb24uCisKKyAgICAgICAg KiBDb25maWd1cmF0aW9ucy9XZWJDb3JlLnhjY29uZmlnOgorCiAyMDIxLTEyLTIyICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENvbnZlcnQgY3NzMy9z Y3JvbGwtc25hcC9zY3JvbGwtc25hcC13aGVlbC1ldmVudC5odG1sIHRvIHVzZSBtb25pdG9yV2hl ZWxFdmVudHMoKQpJbmRleDogU291cmNlL1dlYkNvcmUvQ29uZmlndXJhdGlvbnMvV2ViQ29yZS54 Y2NvbmZpZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Db25maWd1cmF0aW9ucy9XZWJD b3JlLnhjY29uZmlnCShyZXZpc2lvbiAyODczNzgpCisrKyBTb3VyY2UvV2ViQ29yZS9Db25maWd1 cmF0aW9ucy9XZWJDb3JlLnhjY29uZmlnCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAsOCArMTUwLDEx IEBAIFNFQ1RPUkRFUl9GTEFHUyA9ICQoU0VDVE9SREVSX0ZMQUdTXyQoQ08KIFNFQ1RPUkRFUl9G TEFHU19Qcm9kdWN0aW9uW3Nkaz1pcGhvbmVvcypdID0gLVdsLC1vcmRlcl9maWxlLCQoU0RLUk9P VCkvQXBwbGVJbnRlcm5hbC9PcmRlckZpbGVzL1dlYkNvcmUub3JkZXI7CiBTRUNUT1JERVJfRkxB R1NfUHJvZHVjdGlvbltzZGs9bWFjb3N4Kl0gPSAtV2wsLW9yZGVyX2ZpbGUsV2ViQ29yZS5vcmRl cjsKIAotTk9STUFMX1dFQkNPUkVfRlJBTUVXT1JLU19ESVJbc2RrPWlwaG9uZSpdID0gJChQUk9E VUNUSU9OX0ZSQU1FV09SS1NfRElSKTsKLU5PUk1BTF9XRUJDT1JFX0ZSQU1FV09SS1NfRElSW3Nk az1tYWNvc3gqXSA9ICQoU1lTVEVNX0xJQlJBUllfRElSKS9GcmFtZXdvcmtzL1dlYktpdC5mcmFt ZXdvcmsvVmVyc2lvbnMvQS9GcmFtZXdvcmtzOworTk9STUFMX1dFQkNPUkVfRlJBTUVXT1JLU19Q UkVGSVggPSAkKE5PUk1BTF9XRUJDT1JFX0ZSQU1FV09SS1NfUFJFRklYXyQoVVNFX1NZU1RFTV9D T05URU5UX1BBVEgpKTsKK05PUk1BTF9XRUJDT1JFX0ZSQU1FV09SS1NfUFJFRklYX1lFUyA9ICQo U1lTVEVNX0NPTlRFTlRfUEFUSCk7CisKK05PUk1BTF9XRUJDT1JFX0ZSQU1FV09SS1NfRElSW3Nk az1pcGhvbmUqXSA9ICQoTk9STUFMX1dFQkNPUkVfRlJBTUVXT1JLU19QUkVGSVgpJChQUk9EVUNU SU9OX0ZSQU1FV09SS1NfRElSKTsKK05PUk1BTF9XRUJDT1JFX0ZSQU1FV09SS1NfRElSW3Nkaz1t YWNvc3gqXSA9ICQoTk9STUFMX1dFQkNPUkVfRlJBTUVXT1JLU19QUkVGSVgpJChTWVNURU1fTElC UkFSWV9ESVIpL0ZyYW1ld29ya3MvV2ViS2l0LmZyYW1ld29yay9WZXJzaW9ucy9BL0ZyYW1ld29y a3M7CiAKIFdFQkNPUkVfRlJBTUVXT1JLU19ESVIgPSAkKFdFQkNPUkVfRlJBTUVXT1JLU19ESVJf VVNFX09WRVJSSURFX0ZSQU1FV09SS1NfRElSXyQoV0tfVVNFX09WRVJSSURFX0ZSQU1FV09SS1Nf RElSKSk7CiBXRUJDT1JFX0ZSQU1FV09SS1NfRElSX1VTRV9PVkVSUklERV9GUkFNRVdPUktTX0RJ Ul9OTyA9ICQoTk9STUFMX1dFQkNPUkVfRlJBTUVXT1JLU19ESVIpOwpJbmRleDogU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4NzM3OCkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTItMjIgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBh cHBsZS5jb20+CisKKyAgICAgICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIChPT1BTISkuCisg ICAgICAgIEZpeCBXZWJLaXQgQnVpbGQgaXNzdWVzIHdoZW4gdXNpbmcgc3lzdGVtIGNvbnRlbnQg cGF0aAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZGVkIFNZU1RFTV9DT05URU5UX1BBVEggcHJvY2Vzc2luZyB0byB0aGUgbmVzdGVkIGZyYW1ld29y a3MgcGF0aCAoVU1CUkVMTEFfRlJBTUVXT1JLU19ESVIpLgorCisgICAgICAgICogQ29uZmlndXJh dGlvbnMvQmFzZVRhcmdldC54Y2NvbmZpZzoKKyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9XZWJL aXQueGNjb25maWc6CisKIDIwMjEtMTItMjIgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5j b20+CiAKICAgICAgICAgV2Vic2l0ZURhdGFTdG9yZTo6ZXhjbHVkZURpcmVjdG9yeUZyb21CYWNr dXAgc2hvdWxkIHNldCBhdHRyaWJ1dGUgZm9yIGV4aXN0aW5nIGRpcmVjdG9yaWVzCkluZGV4OiBT b3VyY2UvV2ViS2l0L0NvbmZpZ3VyYXRpb25zL0Jhc2VUYXJnZXQueGNjb25maWcKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9Db25maWd1cmF0aW9ucy9CYXNlVGFyZ2V0LnhjY29uZmlnCShy ZXZpc2lvbiAyODczNzgpCisrKyBTb3VyY2UvV2ViS2l0L0NvbmZpZ3VyYXRpb25zL0Jhc2VUYXJn ZXQueGNjb25maWcJKHdvcmtpbmcgY29weSkKQEAgLTk5LDEzICs5OSwxNiBAQCBKQVZBU0NSSVBU Q09SRV9QUklWQVRFX0hFQURFUlNfRElSX1Byb2R1CiBKQVZBU0NSSVBUQ09SRV9QUklWQVRFX0hF QURFUlNfRElSX1Byb2R1Y3Rpb25fQ09DT0FfVE9VQ0hfTk8gPSAkKFNES1JPT1QpJChQUk9EVUNU SU9OX0ZSQU1FV09SS1NfRElSKS9KYXZhU2NyaXB0Q29yZS5mcmFtZXdvcmsvUHJpdmF0ZUhlYWRl cnM7CiBKQVZBU0NSSVBUQ09SRV9QUklWQVRFX0hFQURFUlNfZW5naW5lZXJpbmcgPSAkKEJVSUxU X1BST0RVQ1RTX0RJUikvSmF2YVNjcmlwdENvcmUuZnJhbWV3b3JrL1ByaXZhdGVIZWFkZXJzOwog CitVTUJSRUxMQV9GUkFNRVdPUktTX1BSRUZJWCA9ICQoVU1CUkVMTEFfRlJBTUVXT1JLU19QUkVG SVhfVVNFX1NZU1RFTV9DT05URU5UX1BBVEhfJChVU0VfU1lTVEVNX0NPTlRFTlRfUEFUSCkpOwor VU1CUkVMTEFfRlJBTUVXT1JLU19QUkVGSVhfVVNFX1NZU1RFTV9DT05URU5UX1BBVEhfWUVTID0g JChTWVNURU1fQ09OVEVOVF9QQVRIKTsKKwogVU1CUkVMTEFfRlJBTUVXT1JLU19ESVIgPSAkKFVN QlJFTExBX0ZSQU1FV09SS1NfRElSXyQoQ09ORklHVVJBVElPTikpOwogVU1CUkVMTEFfRlJBTUVX T1JLU19ESVJfRGVidWcgPSAkKFVNQlJFTExBX0ZSQU1FV09SS1NfRElSX2VuZ2luZWVyaW5nKTsK IFVNQlJFTExBX0ZSQU1FV09SS1NfRElSX1JlbGVhc2UgPSAkKFVNQlJFTExBX0ZSQU1FV09SS1Nf RElSX2VuZ2luZWVyaW5nKTsKIFVNQlJFTExBX0ZSQU1FV09SS1NfRElSX1Byb2R1Y3Rpb24gPSAk KFVNQlJFTExBX0ZSQU1FV09SS1NfRElSX1Byb2R1Y3Rpb25fQ09DT0FfVE9VQ0hfJChXS19JU19D T0NPQV9UT1VDSCkpOwotVU1CUkVMTEFfRlJBTUVXT1JLU19ESVJfUHJvZHVjdGlvbl9DT0NPQV9U T1VDSF9ZRVMgPSAkKFNES1JPT1QpJChXS19BTFRFUk5BVEVfV0VCS0lUX1NES19QQVRIKSQoU1lT VEVNX0xJQlJBUllfRElSKS9Qcml2YXRlRnJhbWV3b3JrczsKK1VNQlJFTExBX0ZSQU1FV09SS1Nf RElSX1Byb2R1Y3Rpb25fQ09DT0FfVE9VQ0hfWUVTID0gJChTREtST09UKSQoVU1CUkVMTEFfRlJB TUVXT1JLU19QUkVGSVgpJChXS19BTFRFUk5BVEVfV0VCS0lUX1NES19QQVRIKSQoU1lTVEVNX0xJ QlJBUllfRElSKS9Qcml2YXRlRnJhbWV3b3JrczsKIFVNQlJFTExBX0ZSQU1FV09SS1NfRElSX1By b2R1Y3Rpb25fQ09DT0FfVE9VQ0hfTk8gPSAkKFNES1JPT1QpJChVTUJSRUxMQV9GUkFNRVdPUktT X0RJUl9Qcm9kdWN0aW9uX21hY29zeF9VU0VfT1ZFUlJJREVfRlJBTUVXT1JLU19ESVJfJChXS19V U0VfT1ZFUlJJREVfRlJBTUVXT1JLU19ESVIpKTsKLVVNQlJFTExBX0ZSQU1FV09SS1NfRElSX1By b2R1Y3Rpb25fbWFjb3N4X1VTRV9PVkVSUklERV9GUkFNRVdPUktTX0RJUl9OTyA9ICQoTkVYVF9S T09UKSQoU1lTVEVNX0xJQlJBUllfRElSKS9GcmFtZXdvcmtzL1dlYktpdC5mcmFtZXdvcmsvVmVy c2lvbnMvQS9GcmFtZXdvcmtzOworVU1CUkVMTEFfRlJBTUVXT1JLU19ESVJfUHJvZHVjdGlvbl9t YWNvc3hfVVNFX09WRVJSSURFX0ZSQU1FV09SS1NfRElSX05PID0gJChORVhUX1JPT1QpJChVTUJS RUxMQV9GUkFNRVdPUktTX1BSRUZJWCkkKFNZU1RFTV9MSUJSQVJZX0RJUikvRnJhbWV3b3Jrcy9X ZWJLaXQuZnJhbWV3b3JrL1ZlcnNpb25zL0EvRnJhbWV3b3JrczsKIFVNQlJFTExBX0ZSQU1FV09S S1NfRElSX1Byb2R1Y3Rpb25fbWFjb3N4X1VTRV9PVkVSUklERV9GUkFNRVdPUktTX0RJUl9ZRVMg PSAkKFdLX09WRVJSSURFX0ZSQU1FV09SS1NfRElSKTsKIFVNQlJFTExBX0ZSQU1FV09SS1NfRElS X2VuZ2luZWVyaW5nID0gJChCVUlMVF9QUk9EVUNUU19ESVIpOwogCkluZGV4OiBTb3VyY2UvV2Vi S2l0L0NvbmZpZ3VyYXRpb25zL1dlYktpdC54Y2NvbmZpZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L0NvbmZpZ3VyYXRpb25zL1dlYktpdC54Y2NvbmZpZwkocmV2aXNpb24gMjg3Mzc4KQor KysgU291cmNlL1dlYktpdC9Db25maWd1cmF0aW9ucy9XZWJLaXQueGNjb25maWcJKHdvcmtpbmcg Y29weSkKQEAgLTQyLDYgKzQyLDExIEBAIERZTElCX0lOU1RBTExfTkFNRV9CQVNFID0gJChEWUxJ Ql9JTlNUQUwKIERZTElCX0lOU1RBTExfTkFNRV9CQVNFX05PID0gJChOT1JNQUxfV0VCS0lUX0ZS QU1FV09SS1NfRElSKTsKIERZTElCX0lOU1RBTExfTkFNRV9CQVNFX1lFUyA9ICQoRFlMSUJfSU5T VEFMTF9OQU1FX0JBU0UpOwogCitBTFRFUk5BVEVfUk9PVF9QQVRIID0gJChEWUxJQl9JTlNUQUxM X05BTUVfQkFTRSk7CisKK09VVFBVVF9BTFRFUk5BVEVfUk9PVF9QQVRIID0gJChPVVRQVVRfQUxU RVJOQVRFX1JPT1RfUEFUSF8kKFVTRV9TWVNURU1fQ09OVEVOVF9QQVRIKSk7CitPVVRQVVRfQUxU RVJOQVRFX1JPT1RfUEFUSF9ZRVMgPSAkKERTVFJPT1QpJChBTFRFUk5BVEVfUk9PVF9QQVRIKS8k KEZVTExfUFJPRFVDVF9OQU1FKTsKKwogTElCUkFSWV9TRUFSQ0hfUEFUSFMgPSAkKGluaGVyaXRl ZCkgIiQoTElCV0VCUlRDX0xJQlJBUllfRElSKSI7CiAKIFdLX0FDQ0VTU0lCSUxJVFlfTERGTEFH UyA9ICQoV0tfQUNDRVNTSUJJTElUWV9MREZMQUdTX0NPQ09BX1RPVUNIXyQoV0tfSVNfQ09DT0Ff VE9VQ0gpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4NzM3 OCkKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDIxLTEyLTIyICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBw bGUuY29tPgorCisgICAgICAgIEZpeCBXZWJLaXQgQnVpbGQgaXNzdWVzIHdoZW4gdXNpbmcgc3lz dGVtIGNvbnRlbnQgcGF0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM0NjI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkZWQgU1lTVEVNX0NPTlRFTlRfUEFUSCBwcm9jZXNzaW5nIHRvIE5PUk1BTF9Q Uk9EVUNUSU9OX0ZSQU1FV09SS1NfRElSLgorCisgICAgICAgICogQ29uZmlndXJhdGlvbnMvV2Vi S2l0TGVnYWN5LnhjY29uZmlnOgorCiAyMDIxLTEyLTIxICBCcmFkeSBFaWRzb24gIDxiZWlkc29u QGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtlIE5vdGlmaWNhdGlvbiBpZGVudGlmaWVycyBiZSBh IFVVSUQgc3RyaW5nIGluc3RlYWQgb2YgYSB1aW50NjRfdApJbmRleDogU291cmNlL1dlYktpdExl Z2FjeS9tYWMvQ29uZmlndXJhdGlvbnMvV2ViS2l0TGVnYWN5LnhjY29uZmlnCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NvbmZpZ3VyYXRpb25zL1dlYktpdExlZ2FjeS54 Y2NvbmZpZwkocmV2aXNpb24gMjg3Mzc4KQorKysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ29u ZmlndXJhdGlvbnMvV2ViS2l0TGVnYWN5LnhjY29uZmlnCSh3b3JraW5nIGNvcHkpCkBAIC0xMTYs OSArMTE2LDEyIEBAIFdFQktJVF9MRUdBQ1lfRlJBTUVXT1JLU19ESVIgPSAkKFdFQktJVF8KIFdF QktJVF9MRUdBQ1lfRlJBTUVXT1JLU19ESVJfVVNFX09WRVJSSURFX0ZSQU1FV09SS1NfRElSX05P ID0gJChOT1JNQUxfV0VCS0lUX0xFR0FDWV9GUkFNRVdPUktTX0RJUik7CiBXRUJLSVRfTEVHQUNZ X0ZSQU1FV09SS1NfRElSX1VTRV9PVkVSUklERV9GUkFNRVdPUktTX0RJUl9ZRVMgPSAkKFdLX09W RVJSSURFX0ZSQU1FV09SS1NfRElSKTsKIAorTk9STUFMX1BST0RVQ1RJT05fRlJBTUVXT1JLU19Q UkVGSVggPSAkKE5PUk1BTF9QUk9EVUNUSU9OX0ZSQU1FV09SS1NfUFJFRklYXyQoVVNFX1NZU1RF TV9DT05URU5UX1BBVEgpKTsKK05PUk1BTF9QUk9EVUNUSU9OX0ZSQU1FV09SS1NfUFJFRklYX1lF UyA9ICQoU1lTVEVNX0NPTlRFTlRfUEFUSCk7CisKIE5PUk1BTF9QUk9EVUNUSU9OX0ZSQU1FV09S S1NfRElSID0gJChOT1JNQUxfUFJPRFVDVElPTl9GUkFNRVdPUktTX0RJUl9DT0NPQV9UT1VDSF8k KFdLX0lTX0NPQ09BX1RPVUNIKSk7Ci1OT1JNQUxfUFJPRFVDVElPTl9GUkFNRVdPUktTX0RJUl9D T0NPQV9UT1VDSF9ZRVMgPSAkKFNES1JPT1QpJChXS19BTFRFUk5BVEVfV0VCS0lUX1NES19QQVRI KSQoU1lTVEVNX0xJQlJBUllfRElSKS9Qcml2YXRlRnJhbWV3b3JrczsKLU5PUk1BTF9QUk9EVUNU SU9OX0ZSQU1FV09SS1NfRElSX0NPQ09BX1RPVUNIX05PID0gJChORVhUX1JPT1QpJChTWVNURU1f TElCUkFSWV9ESVIpL0ZyYW1ld29ya3M7CitOT1JNQUxfUFJPRFVDVElPTl9GUkFNRVdPUktTX0RJ Ul9DT0NPQV9UT1VDSF9ZRVMgPSAkKFNES1JPT1QpJChOT1JNQUxfUFJPRFVDVElPTl9GUkFNRVdP UktTX1BSRUZJWCkkKFdLX0FMVEVSTkFURV9XRUJLSVRfU0RLX1BBVEgpJChTWVNURU1fTElCUkFS WV9ESVIpL1ByaXZhdGVGcmFtZXdvcmtzOworTk9STUFMX1BST0RVQ1RJT05fRlJBTUVXT1JLU19E SVJfQ09DT0FfVE9VQ0hfTk8gPSAkKE5FWFRfUk9PVCkkKE5PUk1BTF9QUk9EVUNUSU9OX0ZSQU1F V09SS1NfUFJFRklYKSQoU1lTVEVNX0xJQlJBUllfRElSKS9GcmFtZXdvcmtzOwogCiBQUk9EVUNU SU9OX0ZSQU1FV09SS1NfRElSID0gJChQUk9EVUNUSU9OX0ZSQU1FV09SS1NfRElSX0NPQ09BX1RP VUNIXyQoV0tfSVNfQ09DT0FfVE9VQ0gpKTsKIFBST0RVQ1RJT05fRlJBTUVXT1JLU19ESVJfQ09D T0FfVE9VQ0hfWUVTID0gJChOT1JNQUxfUFJPRFVDVElPTl9GUkFNRVdPUktTX0RJUik7Cg==