235459 2022-01-21 15:32:59 -0800 WebKit fails to build - error: 'webrtc/rtc_base/network.h' file not found 2022-01-21 17:38:48 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 msaboff webkit-unassigned eric.carlson ews-watchlist mark.lam webkit-bug-importer oldest_to_newest 1832914 0 msaboff 2022-01-21 15:32:59 -0800 When building with a SYSTEM_CONTENT_PATH, we can fail when building WebKit: .../Source/WebKit/Shared/RTCNetwork.h:32:10: fatal error: 'webrtc/rtc_base/network.h' file not found #include <webrtc/rtc_base/network.h> ^~~~~~~~~~~~~~~~~~~~~~~~~~~ 1832915 1 msaboff 2022-01-21 15:33:14 -0800 <rdar://87829404> 1832923 2 449705 msaboff 2022-01-21 15:42:40 -0800 Created attachment 449705 Patch 1832934 3 449705 mark.lam 2022-01-21 16:45:01 -0800 Comment on attachment 449705 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=449705&action=review I'm not super familiar with the plumbing of all the settings variables, but this patch LGTM. > Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh:27 > + RELATIVE_PATH_FROM_SYMLINK_TO_ROOT=$(echo "${PUBLIC_FOLDER_PREFIX}" | sed -E -e "s/\/[a-zA-Z0-9_]+/..\//g" -e "s/\/$//") Why is this "s/\/$//" needed? > Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh:28 > + SYMLINK_VALUE="${RELATIVE_PATH_FROM_SYMLINK_TO_ROOT}${INSTALL_FOLDER_PREFIX}/${TARGET}" nit: call this SYMLINK_TARGET instead? > Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh:52 > + if [[ ! -d ${SYSTEM_PUBLIC_HEADER_PREFIX} ]]; then > + mkdir -p ${SYSTEM_PUBLIC_HEADER_PREFIX} > + fi Can't you do this just once outside of the for loop? The only difference is that moving this out would create this directory even if HEADER_FOLDER_LIST is empty. But we know it'll never be empty, right? > Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh:64 > + if [[ ! -d ${SYSTEM_PUBLIC_LIBRARY_PREFIX} ]]; then > + mkdir -p ${SYSTEM_PUBLIC_LIBRARY_PREFIX} > + fi Ditto. Do this outside the for loop? 1832939 4 msaboff 2022-01-21 16:54:50 -0800 (In reply to Mark Lam from comment #3) > Comment on attachment 449705 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=449705&action=review > > I'm not super familiar with the plumbing of all the settings variables, but > this patch LGTM. > > > Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh:27 > > + RELATIVE_PATH_FROM_SYMLINK_TO_ROOT=$(echo "${PUBLIC_FOLDER_PREFIX}" | sed -E -e "s/\/[a-zA-Z0-9_]+/..\//g" -e "s/\/$//") > > Why is this "s/\/$//" needed? To eliminate any trailing '/'. > > Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh:28 > > + SYMLINK_VALUE="${RELATIVE_PATH_FROM_SYMLINK_TO_ROOT}${INSTALL_FOLDER_PREFIX}/${TARGET}" > > nit: call this SYMLINK_TARGET instead? This follows some the name of other similar scripts. > > Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh:52 > > + if [[ ! -d ${SYSTEM_PUBLIC_HEADER_PREFIX} ]]; then > > + mkdir -p ${SYSTEM_PUBLIC_HEADER_PREFIX} > > + fi > > Can't you do this just once outside of the for loop? The only difference is > that moving this out would create this directory even if HEADER_FOLDER_LIST > is empty. But we know it'll never be empty, right? > > > Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh:64 > > + if [[ ! -d ${SYSTEM_PUBLIC_LIBRARY_PREFIX} ]]; then > > + mkdir -p ${SYSTEM_PUBLIC_LIBRARY_PREFIX} > > + fi > > Ditto. Do this outside the for loop? I moved both of these to above the loop. 1832946 5 msaboff 2022-01-21 17:38:48 -0800 Committed r288391 (246288@trunk): <https://commits.webkit.org/246288@trunk> 449705 2022-01-21 15:42:40 -0800 2022-01-21 16:45:01 -0800 Patch 235459.patch text/plain 19079 msaboff SW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5nZUxvZwkocmV2aXNpb24gMjg4Mzg0 KQorKysgU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAxLTIxICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZA YXBwbGUuY29tPgorCisgICAgICAgIFdlYktpdCBmYWlscyB0byBidWlsZCAtIGVycm9yOiAnd2Vi cnRjL3J0Y19iYXNlL25ldHdvcmsuaCcgZmlsZSBub3QgZm91bmQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ1OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIG5lZWRlZCB0byBjcmVhdGUgc3ltbGlu a3MgZnJvbSB0aGUgc3RhbmRhcmQgbG9jYXRpb24gdG8gdGhlIFNZU1RFTV9DT05URU5UX1BBVEgg bG9jYXRpb24uCisgICAgICAgIFRoaXMgaXMgbmVlZGVkIGZvciBib3RoIHRoZSBpbmNsdWRlIGZp bGVzIGFuZCBhcmNoaXZlIGxpYnJhcmllcy4KKworICAgICAgICAqIENvbmZpZ3VyYXRpb25zL2Jv cmluZ3NzbC54Y2NvbmZpZzoKKyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9saWJzcnRwLnhjY29u ZmlnOgorICAgICAgICAqIENvbmZpZ3VyYXRpb25zL2xpYnZweC54Y2NvbmZpZzoKKyAgICAgICAg KiBDb25maWd1cmF0aW9ucy9saWJ3ZWJtLnhjY29uZmlnOgorICAgICAgICAqIENvbmZpZ3VyYXRp b25zL2xpYndlYnJ0Yy54Y2NvbmZpZzoKKyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9saWJ5dXYu eGNjb25maWc6CisgICAgICAgICogQ29uZmlndXJhdGlvbnMvb3B1cy54Y2NvbmZpZzoKKyAgICAg ICAgKiBDb25maWd1cmF0aW9ucy91c3JzY3RwLnhjY29uZmlnOgorICAgICAgICAqIFNjcmlwdHM6 IEFkZGVkLgorICAgICAgICAqIFNjcmlwdHMvY3JlYXRlLXN5bWxpbmstdG8tYWx0cm9vdC5zaDog QWRkZWQuCisgICAgICAgICogbGlid2VicnRjLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisK IDIwMjItMDEtMTkgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAg IGxpYnZweCBmaXJzdHBhc3MuYyBpcyBub3QgbmVlZGVkCkluZGV4OiBTb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ29uZmlndXJhdGlvbnMvYm9yaW5nc3NsLnhjY29uZmlnCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Db25maWd1cmF0aW9ucy9ib3Jpbmdzc2wu eGNjb25maWcJKHJldmlzaW9uIDI4ODM4MykKKysrIFNvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0 Yy9Db25maWd1cmF0aW9ucy9ib3Jpbmdzc2wueGNjb25maWcJKHdvcmtpbmcgY29weSkKQEAgLTYs OSArNiwxMyBAQCBDTEFOR19XQVJOX0lOVF9DT05WRVJTSU9OID0gWUVTOwogR0NDX1dBUk5fNjRf VE9fMzJfQklUX0NPTlZFUlNJT04gPSBOTzsKIENPTUJJTkVfSElEUElfSU1BR0VTID0gTk87CiBF TkFCTEVfU1RSSUNUX09CSkNfTVNHU0VORCA9IFlFUzsKKworSU5TVEFMTF9QQVRIX1BSRUZJWCA9 ICQoSU5TVEFMTF9QQVRIX1BSRUZJWF9VU0VfU1lTVEVNX0NPTlRFTlRfUEFUSF8kKFVTRV9TWVNU RU1fQ09OVEVOVF9QQVRIKSk7CitJTlNUQUxMX1BBVEhfUFJFRklYX1VTRV9TWVNURU1fQ09OVEVO VF9QQVRIX1lFUyA9ICQoU1lTVEVNX0NPTlRFTlRfUEFUSCk7CisKIEhFQURFUl9TRUFSQ0hfUEFU SFMgPSBTb3VyY2UvdGhpcmRfcGFydHkvYm9yaW5nc3NsL3NyYy9pbmNsdWRlOwotSU5TVEFMTF9Q QVRIID0gL3Vzci9sb2NhbC9saWI7Ci1QVUJMSUNfSEVBREVSU19GT0xERVJfUEFUSCA9IC91c3Iv bG9jYWwvaW5jbHVkZS9saWJ3ZWJydGM7CitJTlNUQUxMX1BBVEggPSAkKElOU1RBTExfUEFUSF9Q UkVGSVgpL3Vzci9sb2NhbC9saWI7CitQVUJMSUNfSEVBREVSU19GT0xERVJfUEFUSCA9ICQoSU5T VEFMTF9QQVRIX1BSRUZJWCkvdXNyL2xvY2FsL2luY2x1ZGUvbGlid2VicnRjOwogVVNFX0hFQURF Uk1BUCA9IE5POwogR0NDX1dBUk5fVU5VU0VEX0ZVTkNUSU9OID0gTk87CiAKSW5kZXg6IFNvdXJj ZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Db25maWd1cmF0aW9ucy9saWJzcnRwLnhjY29uZmlnCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Db25maWd1cmF0aW9ucy9s aWJzcnRwLnhjY29uZmlnCShyZXZpc2lvbiAyODgzODMpCisrKyBTb3VyY2UvVGhpcmRQYXJ0eS9s aWJ3ZWJydGMvQ29uZmlndXJhdGlvbnMvbGlic3J0cC54Y2NvbmZpZwkod29ya2luZyBjb3B5KQpA QCAtNyw4ICs3LDExIEBAIEdDQ19XQVJOXzY0X1RPXzMyX0JJVF9DT05WRVJTSU9OID0gTk87CiBD T01CSU5FX0hJRFBJX0lNQUdFUyA9IE5POwogRU5BQkxFX1NUUklDVF9PQkpDX01TR1NFTkQgPSBZ RVM7CiAKK0lOU1RBTExfUEFUSF9QUkVGSVggPSAkKElOU1RBTExfUEFUSF9QUkVGSVhfVVNFX1NZ U1RFTV9DT05URU5UX1BBVEhfJChVU0VfU1lTVEVNX0NPTlRFTlRfUEFUSCkpOworSU5TVEFMTF9Q QVRIX1BSRUZJWF9VU0VfU1lTVEVNX0NPTlRFTlRfUEFUSF9ZRVMgPSAkKFNZU1RFTV9DT05URU5U X1BBVEgpOworCiBIRUFERVJfU0VBUkNIX1BBVEhTID0gU291cmNlL3RoaXJkX3BhcnR5L2xpYnNy dHAvaW5jbHVkZSBTb3VyY2UvdGhpcmRfcGFydHkvbGlic3J0cC9jb25maWcgU291cmNlL3RoaXJk X3BhcnR5L2JvcmluZ3NzbC9zcmMvaW5jbHVkZSBTb3VyY2UvdGhpcmRfcGFydHkvbGlic3J0cCBT b3VyY2UvdGhpcmRfcGFydHkvbGlic3J0cC9jcnlwdG8vaW5jbHVkZTsKLUlOU1RBTExfUEFUSCA9 IC91c3IvbG9jYWwvbGliOwotUFVCTElDX0hFQURFUlNfRk9MREVSX1BBVEggPSAvdXNyL2xvY2Fs L2luY2x1ZGUvbGlid2VicnRjOworSU5TVEFMTF9QQVRIID0gJChJTlNUQUxMX1BBVEhfUFJFRklY KS91c3IvbG9jYWwvbGliOworUFVCTElDX0hFQURFUlNfRk9MREVSX1BBVEggPSAkKElOU1RBTExf UEFUSF9QUkVGSVgpL3Vzci9sb2NhbC9pbmNsdWRlL2xpYndlYnJ0YzsKIFVTRV9IRUFERVJNQVAg PSBOTzsKIEdDQ19QUkVQUk9DRVNTT1JfREVGSU5JVElPTlMgPSBWOF9ERVBSRUNBVElPTl9XQVJO SU5HUyBFTkFCTEVfTk9USUZJQ0FUSU9OUyBFTkFCTEVfUExVR0lOUz0xIEVOQUJMRV9QREY9MSBF TkFCTEVfUFJJTlRJTkc9MSBFTkFCTEVfQkFTSUNfUFJJTlRJTkc9MSBFTkFCTEVfUFJJTlRfUFJF VklFVz0xIEVOQUJMRV9TUEVMTENIRUNLPTEgVVNFX0JST1dTRVJfU1BFTExDSEVDS0VSPTEgTk9f VENNQUxMT0MgVVNFX0VYVEVSTkFMX1BPUFVQX01FTlU9MSBFTkFCTEVfV0VCUlRDPTEgRU5BQkxF X0VYVEVOU0lPTlM9MSBFTkFCTEVfVEFTS19NQU5BR0VSPTEgRU5BQkxFX1RIRU1FUz0xIEVOQUJM RV9TRVNTSU9OX1NFUlZJQ0U9MSBFTkFCTEVfU1VQRVJWSVNFRF9VU0VSUz0xIEZVTExfU0FGRV9C Uk9XU0lORyBTQUZFX0JST1dTSU5HX0NTRCBTQUZFX0JST1dTSU5HX0RCX0xPQ0FMIENIUk9NSVVN X0JVSUxEIEVOQUJMRV9NRURJQV9ST1VURVI9MSBGSUVMRFRSSUFMX1RFU1RJTkdfRU5BQkxFRCBD Ul9DTEFOR19SRVZJU0lPTj0yODQ5NzktMSBDUl9YQ09ERV9WRVJTSU9OPTA4MjAgX19BU1NFUlRf TUFDUk9TX0RFRklORV9WRVJTSU9OU19XSVRIT1VUX1VOREVSU0NPUkU9MCBfREVCVUcgRFlOQU1J Q19BTk5PVEFUSU9OU19FTkFCTEVEPTEgV1RGX1VTRV9EWU5BTUlDX0FOTk9UQVRJT05TPTEgUEFD S0FHRV9TVFJJTkc9IlwibGlic3J0cDIgMi4wLjAtcHJlXCIiIFBBQ0tBR0VfVkVSU0lPTj0iXCIy LjAuMC1wcmVcIiIgSEFWRV9DT05GSUdfSCBPUEVOU1NMIEhBVkVfU1RETElCX0ggSEFWRV9TVFJJ TkdfSCBIQVZFX1NURElOVF9IIEhBVkVfSU5UVFlQRVNfSCBIQVZFX0lOVDE2X1QgSEFWRV9JTlQz Ml9UIEhBVkVfSU5UOF9UIEhBVkVfVUlOVDE2X1QgSEFWRV9VSU5UMzJfVCBIQVZFX1VJTlQ2NF9U IEhBVkVfVUlOVDhfVCBIQVZFX0FSUEFfSU5FVF9IIEhBVkVfTkVUSU5FVF9JTl9IIEhBVkVfU1lT X1RZUEVTX0ggSEFWRV9VTklTVERfSCBHQ00gJChpbmhlcml0ZWQpOwpJbmRleDogU291cmNlL1Ro aXJkUGFydHkvbGlid2VicnRjL0NvbmZpZ3VyYXRpb25zL2xpYnZweC54Y2NvbmZpZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ29uZmlndXJhdGlvbnMvbGlidnB4 LnhjY29uZmlnCShyZXZpc2lvbiAyODgzODMpCisrKyBTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJy dGMvQ29uZmlndXJhdGlvbnMvbGlidnB4LnhjY29uZmlnCSh3b3JraW5nIGNvcHkpCkBAIC03LDEx ICs3LDE0IEBAIEdDQ19XQVJOXzY0X1RPXzMyX0JJVF9DT05WRVJTSU9OID0gTk87CiBDT01CSU5F X0hJRFBJX0lNQUdFUyA9IE5POwogRU5BQkxFX1NUUklDVF9PQkpDX01TR1NFTkQgPSBZRVM7CiAK K0lOU1RBTExfUEFUSF9QUkVGSVggPSAkKElOU1RBTExfUEFUSF9QUkVGSVhfVVNFX1NZU1RFTV9D T05URU5UX1BBVEhfJChVU0VfU1lTVEVNX0NPTlRFTlRfUEFUSCkpOworSU5TVEFMTF9QQVRIX1BS RUZJWF9VU0VfU1lTVEVNX0NPTlRFTlRfUEFUSF9ZRVMgPSAkKFNZU1RFTV9DT05URU5UX1BBVEgp OworCiBIRUFERVJfU0VBUkNIX1BBVEhTW2FyY2g9eDg2XzY0XSA9IFNvdXJjZS90aGlyZF9wYXJ0 eS9saWJ2cHgvc291cmNlL2NvbmZpZy9tYWMveDY0IFNvdXJjZS90aGlyZF9wYXJ0eS9saWJ2cHgv c291cmNlL2xpYnZweCBTb3VyY2UvdGhpcmRfcGFydHkvbGlidnB4L3NvdXJjZS9jb25maWc7CiBI RUFERVJfU0VBUkNIX1BBVEhTW2FyY2g9YXJtNjQqXSA9IFNvdXJjZS90aGlyZF9wYXJ0eS9saWJ2 cHgvc291cmNlL2NvbmZpZy9pb3MvYXJtNjQgU291cmNlL3RoaXJkX3BhcnR5L2xpYnZweC9zb3Vy Y2UvbGlidnB4IFNvdXJjZS90aGlyZF9wYXJ0eS9saWJ2cHgvc291cmNlL2NvbmZpZzsKIAotSU5T VEFMTF9QQVRIID0gL3Vzci9sb2NhbC9saWI7Ci1QVUJMSUNfSEVBREVSU19GT0xERVJfUEFUSCA9 IC91c3IvbG9jYWwvaW5jbHVkZS9saWJ3ZWJydGM7CitJTlNUQUxMX1BBVEggPSAkKElOU1RBTExf UEFUSF9QUkVGSVgpL3Vzci9sb2NhbC9saWI7CitQVUJMSUNfSEVBREVSU19GT0xERVJfUEFUSCA9 ICQoSU5TVEFMTF9QQVRIX1BSRUZJWCkvdXNyL2xvY2FsL2luY2x1ZGUvbGlid2VicnRjOwogVVNF X0hFQURFUk1BUCA9IE5POwogCiBHQ0NfUFJFUFJPQ0VTU09SX0RFRklOSVRJT05TW3Nkaz1pcGhv bmVzaW11bGF0b3IqXSA9ICQoaW5oZXJpdGVkKSBXRUJSVENfV0VCS0lUX0RJU0FCTEVfSEFSRFdB UkVfQUNDRUxFUkFUSU9OOwpJbmRleDogU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NvbmZp Z3VyYXRpb25zL2xpYndlYm0ueGNjb25maWcKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1RoaXJkUGFy dHkvbGlid2VicnRjL0NvbmZpZ3VyYXRpb25zL2xpYndlYm0ueGNjb25maWcJKHJldmlzaW9uIDI4 ODM4MykKKysrIFNvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Db25maWd1cmF0aW9ucy9saWJ3 ZWJtLnhjY29uZmlnCSh3b3JraW5nIGNvcHkpCkBAIC01LDggKzUsMTEgQEAgQ0xBTkdfV0FSTl9F TlVNX0NPTlZFUlNJT04gPSBZRVM7CiBDTEFOR19XQVJOX0lOVF9DT05WRVJTSU9OID0gWUVTOwog R0NDX1dBUk5fNjRfVE9fMzJfQklUX0NPTlZFUlNJT04gPSBOTzsKIAorSU5TVEFMTF9QQVRIX1BS RUZJWCA9ICQoSU5TVEFMTF9QQVRIX1BSRUZJWF9VU0VfU1lTVEVNX0NPTlRFTlRfUEFUSF8kKFVT RV9TWVNURU1fQ09OVEVOVF9QQVRIKSk7CitJTlNUQUxMX1BBVEhfUFJFRklYX1VTRV9TWVNURU1f Q09OVEVOVF9QQVRIX1lFUyA9ICQoU1lTVEVNX0NPTlRFTlRfUEFUSCk7CisKIEhFQURFUl9TRUFS Q0hfUEFUSFMgPSBTb3VyY2UvdGhpcmRfcGFydHkvbGlid2VibSBTb3VyY2UvdGhpcmRfcGFydHkv bGlid2VibS93ZWJtX3BhcnNlciBTb3VyY2UvdGhpcmRfcGFydHkvbGlid2VibS93ZWJtX3BhcnNl ci9pbmNsdWRlOwogCi1JTlNUQUxMX1BBVEggPSAvdXNyL2xvY2FsL2xpYjsKLVBVQkxJQ19IRUFE RVJTX0ZPTERFUl9QQVRIID0gL3Vzci9sb2NhbC9pbmNsdWRlL3dlYm07CitJTlNUQUxMX1BBVEgg PSAkKElOU1RBTExfUEFUSF9QUkVGSVgpL3Vzci9sb2NhbC9saWI7CitQVUJMSUNfSEVBREVSU19G T0xERVJfUEFUSCA9ICQoSU5TVEFMTF9QQVRIX1BSRUZJWCkvdXNyL2xvY2FsL2luY2x1ZGUvd2Vi bTsKIFVTRV9IRUFERVJNQVAgPSBOTzsKSW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0 Yy9Db25maWd1cmF0aW9ucy9saWJ3ZWJydGMueGNjb25maWcKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1RoaXJkUGFydHkvbGlid2VicnRjL0NvbmZpZ3VyYXRpb25zL2xpYndlYnJ0Yy54Y2NvbmZpZwko cmV2aXNpb24gMjg4MzgzKQorKysgU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NvbmZpZ3Vy YXRpb25zL2xpYndlYnJ0Yy54Y2NvbmZpZwkod29ya2luZyBjb3B5KQpAQCAtNDUsMTUgKzQ1LDIz IEBAIERZTElCX0lOU1RBTExfTkFNRV9CQVNFX1VTRV9PVkVSUklERV9GUkEKIERZTElCX0lOU1RB TExfTkFNRV9CQVNFX1dLX1JFTE9DQVRBQkxFX0ZSQU1FV09SS1NfID0gJChEWUxJQl9JTlNUQUxM X05BTUVfQkFTRSk7CiBEWUxJQl9JTlNUQUxMX05BTUVfQkFTRV9XS19SRUxPQ0FUQUJMRV9GUkFN RVdPUktTX1lFUyA9IEBsb2FkZXJfcGF0aC8uLi8uLi8uLi87CiAKLUFMVEVSTkFURV9ST09UX1BB VEggPSAkKERZTElCX0lOU1RBTExfTkFNRV9CQVNFKTsKLQotT1VUUFVUX0FMVEVSTkFURV9ST09U X1BBVEggPSAkKE9VVFBVVF9BTFRFUk5BVEVfUk9PVF9QQVRIXyQoVVNFX1NZU1RFTV9DT05URU5U X1BBVEgpKTsKLU9VVFBVVF9BTFRFUk5BVEVfUk9PVF9QQVRIX1lFUyA9ICQoRFNUUk9PVCkkKEFM VEVSTkFURV9ST09UX1BBVEgpLyQoRlVMTF9QUk9EVUNUX05BTUUpOwotCiBHQ0NfV0FSTl82NF9U T18zMl9CSVRfQ09OVkVSU0lPTiA9IE5POwogSEVBREVSX1NFQVJDSF9QQVRIUyA9IFNvdXJjZSBT b3VyY2UvdGhpcmRfcGFydHkvanNvbmNwcC9zb3VyY2UvaW5jbHVkZSBTb3VyY2UvdGhpcmRfcGFy dHkvbGlic3J0cC9jcnlwdG8vaW5jbHVkZSBTb3VyY2UvdGhpcmRfcGFydHkvbGlic3J0cC9pbmNs dWRlIFNvdXJjZS90aGlyZF9wYXJ0eS9ib3Jpbmdzc2wvc3JjL2luY2x1ZGUgU291cmNlL3RoaXJk X3BhcnR5L2xpYnl1di9pbmNsdWRlIFNvdXJjZS90aGlyZF9wYXJ0eS91c3JzY3RwIFNvdXJjZS90 aGlyZF9wYXJ0eS91c3JzY3RwL3VzcnNjdHBsaWIgU291cmNlL3RoaXJkX3BhcnR5L3VzcnNjdHAv dXNyc2N0cGxpYi91c3JzY3RwbGliIFNvdXJjZS93ZWJydGMvc2RrL29iamMvRnJhbWV3b3JrL0hl YWRlcnMgU291cmNlL3dlYnJ0Yy9jb21tb25fYXVkaW8vc2lnbmFsX3Byb2Nlc3NpbmcvaW5jbHVk ZSBTb3VyY2Uvd2VicnRjL21vZHVsZXMvYXVkaW9fY29kaW5nL2NvZGVjcy9pc2FjL21haW4vaW5j bHVkZSBTb3VyY2UvdGhpcmRfcGFydHkvb3B1cy9zcmMvY2VsdCBTb3VyY2UvdGhpcmRfcGFydHkv b3B1cy9zcmMvaW5jbHVkZSBTb3VyY2UvdGhpcmRfcGFydHkvb3B1cy9zcmMvc3JjIFNvdXJjZS93 ZWJydGMvbW9kdWxlcy9hdWRpb19kZXZpY2UvbWFjIFNvdXJjZS90aGlyZF9wYXJ0eS91c3JzY3Rw L3VzcnNjdHBsaWIvdXNyc2N0cGxpYi9uZXRpbmV0IFNvdXJjZS93ZWJydGMvbW9kdWxlcy9hdWRp b19kZXZpY2UvaW9zIFNvdXJjZS93ZWJydGMgU291cmNlL3dlYnJ0Yy9zZGsvb2JqYyBTb3VyY2Uv d2VicnRjL3Nkay9vYmpjL2Jhc2UgU291cmNlL3dlYnJ0Yy9zZGsvb2JqYy9GcmFtZXdvcmsvQ2xh c3NlcyBTb3VyY2UvdGhpcmRfcGFydHkvbGlic3J0cC9jb25maWcgU291cmNlL3dlYnJ0Yy9zZGsv b2JqYy9GcmFtZXdvcmsvQ2xhc3Nlcy9Db21tb24gU291cmNlL3dlYnJ0Yy9zZGsvb2JqYy9GcmFt ZXdvcmsvQ2xhc3Nlcy9WaWRlbyBTb3VyY2Uvd2VicnRjL3Nkay9vYmpjL0ZyYW1ld29yay9DbGFz c2VzL1BlZXJDb25uZWN0aW9uIFNvdXJjZS90aGlyZF9wYXJ0eS9hYnNlaWwtY3BwIFNvdXJjZS90 aGlyZF9wYXJ0eS9saWJ2cHgvc291cmNlL2xpYnZweCBTb3VyY2UvdGhpcmRfcGFydHkvbGlid2Vi bS93ZWJtX3BhcnNlci9pbmNsdWRlOwogCi1QVUJMSUNfSEVBREVSU19GT0xERVJfUEFUSCA9IC91 c3IvbG9jYWwvaW5jbHVkZS9saWJ3ZWJydGM7CitQVUJMSUNfSEVBREVSU19GT0xERVJfUFJFRklY ID0gL3Vzci9sb2NhbC9pbmNsdWRlOworSU5TVEFMTF9QVUJMSUNfSEVBREVSX1BSRUZJWCA9ICQo SU5TVEFMTF9QQVRIX1BSRUZJWCkkKFBVQkxJQ19IRUFERVJTX0ZPTERFUl9QUkVGSVgpOworU1lT VEVNX1BVQkxJQ19IRUFERVJfUFJFRklYID0gJChTWVNURU1fUFVCTElDX0hFQURFUl9QUkVGSVhf JChVU0VfU1lTVEVNX0NPTlRFTlRfUEFUSCkpOworU1lTVEVNX1BVQkxJQ19IRUFERVJfUFJFRklY X1lFUyA9ICQoRFNUUk9PVCkkKFBVQkxJQ19IRUFERVJTX0ZPTERFUl9QUkVGSVgpOworSEVBREVS X0ZPTERFUl9MSVNUID0gYWJzbCBsaWJ3ZWJydGMgd2VibSB3ZWJydGM7CisKK1BVQkxJQ19MSUJS QVJZX0ZPTERFUl9QUkVGSVggPSAvdXNyL2xvY2FsL2xpYjsKK0lOU1RBTExfUFVCTElDX0xJQlJB UllfUFJFRklYID0gJChJTlNUQUxMX1BBVEhfUFJFRklYKSQoUFVCTElDX0xJQlJBUllfRk9MREVS X1BSRUZJWCk7CitTWVNURU1fUFVCTElDX0xJQlJBUllfUFJFRklYID0gJChTWVNURU1fUFVCTElD X0xJQlJBUllfUFJFRklYXyQoVVNFX1NZU1RFTV9DT05URU5UX1BBVEgpKTsKK1NZU1RFTV9QVUJM SUNfTElCUkFSWV9QUkVGSVhfWUVTID0gJChEU1RST09UKSQoUFVCTElDX0xJQlJBUllfRk9MREVS X1BSRUZJWCk7CitMSUJSQVJZX0xJU1QgPSBsaWJib3Jpbmdzc2wuYSBsaWJvcHVzLmEgbGlic3J0 cC5hIGxpYnVzcnNjdHAuYSBsaWJ2cHguYSBsaWJ3ZWJtLmEgbGlieXV2LmEKKworQ1JFQVRFX1NZ TUxJTktfT1VUUFVUX0ZJTEVTID0gJHtTWVNURU1fUFVCTElDX0hFQURFUl9QUkVGSVh9ICAke1NZ U1RFTV9QVUJMSUNfTElCUkFSWV9QUkVGSVh9OworCiBVU0VfSEVBREVSTUFQID0gTk87CiBJTlNU QUxMSERSU19TQ1JJUFRfUEhBU0UgPSBZRVM7CiBXQVJOSU5HX0NGTEFHUyA9IC1Xbm8tZGVwcmVj YXRlZC1kZWNsYXJhdGlvbnMgJChpbmhlcml0ZWQpOwpJbmRleDogU291cmNlL1RoaXJkUGFydHkv bGlid2VicnRjL0NvbmZpZ3VyYXRpb25zL2xpYnl1di54Y2NvbmZpZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ29uZmlndXJhdGlvbnMvbGlieXV2LnhjY29uZmln CShyZXZpc2lvbiAyODgzODMpCisrKyBTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ29uZmln dXJhdGlvbnMvbGlieXV2LnhjY29uZmlnCSh3b3JraW5nIGNvcHkpCkBAIC02LDcgKzYsMTEgQEAg Q0xBTkdfV0FSTl9JTlRfQ09OVkVSU0lPTiA9IFlFUzsKIEdDQ19XQVJOXzY0X1RPXzMyX0JJVF9D T05WRVJTSU9OID0gTk87CiBDT01CSU5FX0hJRFBJX0lNQUdFUyA9IE5POwogRU5BQkxFX1NUUklD VF9PQkpDX01TR1NFTkQgPSBZRVM7CisKK0lOU1RBTExfUEFUSF9QUkVGSVggPSAkKElOU1RBTExf UEFUSF9QUkVGSVhfVVNFX1NZU1RFTV9DT05URU5UX1BBVEhfJChVU0VfU1lTVEVNX0NPTlRFTlRf UEFUSCkpOworSU5TVEFMTF9QQVRIX1BSRUZJWF9VU0VfU1lTVEVNX0NPTlRFTlRfUEFUSF9ZRVMg PSAkKFNZU1RFTV9DT05URU5UX1BBVEgpOworCiBIRUFERVJfU0VBUkNIX1BBVEhTID0gU291cmNl L3RoaXJkX3BhcnR5L2xpYnl1di9pbmNsdWRlOwotSU5TVEFMTF9QQVRIID0gL3Vzci9sb2NhbC9s aWI7Ci1QVUJMSUNfSEVBREVSU19GT0xERVJfUEFUSCA9IC91c3IvbG9jYWwvaW5jbHVkZS9saWJ3 ZWJydGM7CitJTlNUQUxMX1BBVEggPSAkKElOU1RBTExfUEFUSF9QUkVGSVgpL3Vzci9sb2NhbC9s aWI7CitQVUJMSUNfSEVBREVSU19GT0xERVJfUEFUSCA9ICQoSU5TVEFMTF9QQVRIX1BSRUZJWCkv dXNyL2xvY2FsL2luY2x1ZGUvbGlid2VicnRjOwogVVNFX0hFQURFUk1BUCA9IE5POwpJbmRleDog U291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NvbmZpZ3VyYXRpb25zL29wdXMueGNjb25maWcK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NvbmZpZ3VyYXRpb25z L29wdXMueGNjb25maWcJKHJldmlzaW9uIDI4ODM4MykKKysrIFNvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9Db25maWd1cmF0aW9ucy9vcHVzLnhjY29uZmlnCSh3b3JraW5nIGNvcHkpCkBAIC04 LDkgKzgsMTMgQEAgQ0xBTkdfV0FSTl9JTlRfQ09OVkVSU0lPTiA9IFlFUzsKIEdDQ19XQVJOXzY0 X1RPXzMyX0JJVF9DT05WRVJTSU9OID0gTk87CiBDT01CSU5FX0hJRFBJX0lNQUdFUyA9IE5POwog RU5BQkxFX1NUUklDVF9PQkpDX01TR1NFTkQgPSBZRVM7CisKK0lOU1RBTExfUEFUSF9QUkVGSVgg PSAkKElOU1RBTExfUEFUSF9QUkVGSVhfVVNFX1NZU1RFTV9DT05URU5UX1BBVEhfJChVU0VfU1lT VEVNX0NPTlRFTlRfUEFUSCkpOworSU5TVEFMTF9QQVRIX1BSRUZJWF9VU0VfU1lTVEVNX0NPTlRF TlRfUEFUSF9ZRVMgPSAkKFNZU1RFTV9DT05URU5UX1BBVEgpOworCiBIRUFERVJfU0VBUkNIX1BB VEhTID0gU291cmNlL3RoaXJkX3BhcnR5L29wdXMvc3JjL2luY2x1ZGUgU291cmNlL3RoaXJkX3Bh cnR5L29wdXMvc3JjL2NlbHQgU291cmNlL3RoaXJkX3BhcnR5L29wdXMvc3JjL3NpbGsgU291cmNl L3RoaXJkX3BhcnR5L29wdXMvc3JjL3NpbGsvZmxvYXQgU291cmNlL3RoaXJkX3BhcnR5L29wdXMv c3JjOwotSU5TVEFMTF9QQVRIID0gL3Vzci9sb2NhbC9saWI7Ci1QVUJMSUNfSEVBREVSU19GT0xE RVJfUEFUSCA9IC91c3IvbG9jYWwvaW5jbHVkZS9saWJ3ZWJydGM7CitJTlNUQUxMX1BBVEggPSAk KElOU1RBTExfUEFUSF9QUkVGSVgpL3Vzci9sb2NhbC9saWI7CitQVUJMSUNfSEVBREVSU19GT0xE RVJfUEFUSCA9ICQoSU5TVEFMTF9QQVRIX1BSRUZJWCkvdXNyL2xvY2FsL2luY2x1ZGUvbGlid2Vi cnRjOwogVVNFX0hFQURFUk1BUCA9IE5POwogV0FSTklOR19DRkxBR1MgPSAtV25vLWluY29tcGF0 aWJsZS1wb2ludGVyLXR5cGVzICQoaW5oZXJpdGVkKQogR0NDX1BSRVBST0NFU1NPUl9ERUZJTklU SU9OUyA9IFZBUl9BUlJBWVMgT1BVU19CVUlMRCBPUFVTX0VYUE9SVD0gSEFWRV9MUklOVCBIQVZF X0xSSU5URiAkKGluaGVyaXRlZCk7CkluZGV4OiBTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMv Q29uZmlndXJhdGlvbnMvdXNyc2N0cC54Y2NvbmZpZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvVGhp cmRQYXJ0eS9saWJ3ZWJydGMvQ29uZmlndXJhdGlvbnMvdXNyc2N0cC54Y2NvbmZpZwkocmV2aXNp b24gMjg4MzgzKQorKysgU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NvbmZpZ3VyYXRpb25z L3VzcnNjdHAueGNjb25maWcJKHdvcmtpbmcgY29weSkKQEAgLTYsOSArNiwxMyBAQCBDTEFOR19X QVJOX0lOVF9DT05WRVJTSU9OID0gWUVTOwogR0NDX1dBUk5fNjRfVE9fMzJfQklUX0NPTlZFUlNJ T04gPSBOTzsKIENPTUJJTkVfSElEUElfSU1BR0VTID0gTk87CiBFTkFCTEVfU1RSSUNUX09CSkNf TVNHU0VORCA9IFlFUzsKKworSU5TVEFMTF9QQVRIX1BSRUZJWCA9ICQoSU5TVEFMTF9QQVRIX1BS RUZJWF9VU0VfU1lTVEVNX0NPTlRFTlRfUEFUSF8kKFVTRV9TWVNURU1fQ09OVEVOVF9QQVRIKSk7 CitJTlNUQUxMX1BBVEhfUFJFRklYX1VTRV9TWVNURU1fQ09OVEVOVF9QQVRIX1lFUyA9ICQoU1lT VEVNX0NPTlRFTlRfUEFUSCk7CisKIEhFQURFUl9TRUFSQ0hfUEFUSFMgPSBTb3VyY2UvIFNvdXJj ZS90aGlyZF9wYXJ0eS91c3JzY3RwL3VzcnNjdHBsaWIvdXNyc2N0cGxpYi9uZXRpbmV0LyBTb3Vy Y2UvdGhpcmRfcGFydHkvdXNyc2N0cC91c3JzY3RwbGliL3VzcnNjdHBsaWIvIFNvdXJjZS90aGly ZF9wYXJ0eS9ib3Jpbmdzc2wvc3JjL2luY2x1ZGUvOwotSU5TVEFMTF9QQVRIID0gL3Vzci9sb2Nh bC9saWI7Ci1QVUJMSUNfSEVBREVSU19GT0xERVJfUEFUSCA9IC91c3IvbG9jYWwvaW5jbHVkZS9s aWJ3ZWJydGM7CitJTlNUQUxMX1BBVEggPSAkKElOU1RBTExfUEFUSF9QUkVGSVgpL3Vzci9sb2Nh bC9saWI7CitQVUJMSUNfSEVBREVSU19GT0xERVJfUEFUSCA9ICQoSU5TVEFMTF9QQVRIX1BSRUZJ WCkvdXNyL2xvY2FsL2luY2x1ZGUvbGlid2VicnRjOwogVVNFX0hFQURFUk1BUCA9IE5POwogV0FS TklOR19DRkxBR1MgPSAtV25vLWRlcHJlY2F0ZWQtZGVjbGFyYXRpb25zICQoaW5oZXJpdGVkKTsK IEdDQ19QUkVQUk9DRVNTT1JfREVGSU5JVElPTlMgPSBTQ1RQX1BST0NFU1NfTEVWRUxfTE9DS1Mg U0NUUF9TSU1QTEVfQUxMT0NBVE9SIFNDVFBfVVNFX09QRU5TU0xfU0hBMSBfX1VzZXJzcGFjZV9f IEhBVkVfU0FfTEVOIEhBVkVfU0NPTk5fTEVOIF9fQVBQTEVfVVNFX1JGQ18yMjkyIF9fVXNlcnNw YWNlX29zX0RhcndpbiAkKGluaGVyaXRlZCk7CkluZGV4OiBTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3 ZWJydGMvU2NyaXB0cy9jcmVhdGUtc3ltbGluay10by1hbHRyb290LnNoCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9TY3JpcHRzL2NyZWF0ZS1zeW1saW5rLXRvLWFs dHJvb3Quc2gJKG5vbmV4aXN0ZW50KQorKysgU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1Nj cmlwdHMvY3JlYXRlLXN5bWxpbmstdG8tYWx0cm9vdC5zaAkod29ya2luZyBjb3B5KQpAQCAtMCww ICsxLDY4IEBACisjIS9iaW4vc2gKKworc2V0IC1lCisKK2lmIFtbICIke0FDVElPTn0iID09ICJp bnN0YWxsaGRycyIgJiYgKCAteiAiJHtTWVNURU1fUFVCTElDX0hFQURFUl9QUkVGSVh9IiB8fCAt eiAiJHtIRUFERVJfRk9MREVSX0xJU1R9IiApIF1dOyB0aGVuCisgICAgZXhpdCAwCitmaQorCitp ZiBbWyAiJHtBQ1RJT059IiA9PSAiaW5zdGFsbCIgJiYgKCAteiAiJHtTWVNURU1fUFVCTElDX0xJ QlJBUllfUFJFRklYfSIgfHwgLXogIiR7TElCUkFSWV9MSVNUfSIgKSBdXTsgdGhlbgorICAgIGV4 aXQgMAorZmkKKworaWYgW1sgIiR7U0tJUF9JTlNUQUxMfSIgPT0gIllFUyIgXV07IHRoZW4KKyAg ICBleGl0IDAKK2ZpCisKK2NyZWF0ZV9zeW1saW5rX2lmX25lZWRlZCgpCit7CisgICAgSU5TVEFM TF9GT0xERVJfUFJFRklYPSQxCisgICAgUFVCTElDX0ZPTERFUl9QUkVGSVg9JDIKKyAgICBTWVNU RU1fRk9MREVSX1BSRUZJWD0kMworICAgIFRBUkdFVD0kNAorCisgICAgU1lTVEVNX0hFQURFUl9Q QVRIPSIke1NZU1RFTV9GT0xERVJfUFJFRklYfS8ke1RBUkdFVH0iCisKKyAgICAjIENvbnZlcnQg ZWcuIGAvU3lzdGVtL0xpYnJhcnkvUHJpdmF0ZUZyYW1ld29ya3NgIHRvIGAuLi8uLi8uLmAKKyAg ICBSRUxBVElWRV9QQVRIX0ZST01fU1lNTElOS19UT19ST09UPSQoZWNobyAiJHtQVUJMSUNfRk9M REVSX1BSRUZJWH0iIHwgc2VkIC1FIC1lICJzL1wvW2EtekEtWjAtOV9dKy8uLlwvL2ciIC1lICJz L1wvJC8vIikKKyAgICBTWU1MSU5LX1ZBTFVFPSIke1JFTEFUSVZFX1BBVEhfRlJPTV9TWU1MSU5L X1RPX1JPT1R9JHtJTlNUQUxMX0ZPTERFUl9QUkVGSVh9LyR7VEFSR0VUfSIKKworICAgIGlmIFtb IC1MICIke1NZU1RFTV9IRUFERVJfUEFUSH0iIF1dOyB0aGVuCisgICAgICAgIEVYSVNUSU5HX1NZ TUxJTktfVkFMVUU9JChyZWFkbGluayAiJHtTWVNURU1fSEVBREVSX1BBVEh9IikKKworICAgICAg ICBpZiBbWyAiJHtFWElTVElOR19TWU1MSU5LX1ZBTFVFfSIgPT0gIiR7U1lNTElOS19WQUxVRX0i IF1dOyB0aGVuCisgICAgICAgICAgICBleGl0IDAKKyAgICAgICAgZmkKKworICAgICAgICBlY2hv ICJ3YXJuaW5nOiBleGlzdGluZyBzeW1saW5rIGlzIGluY29ycmVjdDsgZXhwZWN0ZWQgJHtTWU1M SU5LX1ZBTFVFfSwgZ290ICR7RVhJU1RJTkdfU1lNTElOS19WQUxVRX0iCisgICAgZWxpZiBbWyAt ZSAiJHtTWVNURU1fSEVBREVSX1BBVEh9IiBdXTsgdGhlbgorICAgICAgICBlY2hvICJlcnJvcjog ZXhwZWN0ZWQgYSBzeW1saW5rIGF0ICR7U1lTVEVNX0hFQURFUl9QQVRIfSIKKyAgICAgICAgZXhp dCAxCisgICAgZmkKKworICAgIGxuIC1zZiAiJHtTWU1MSU5LX1ZBTFVFfSIgIiR7U1lTVEVNX0hF QURFUl9QQVRIfSIKK30KKworaWYgW1sgIiR7QUNUSU9OfSIgPT0gImluc3RhbGxoZHJzIiBdXQor dGhlbgorICAgIGZvciBIRUFERVJfRk9MREVSIGluIGBlY2hvICR7SEVBREVSX0ZPTERFUl9MSVNU fSB8IGN1dCAtZCcgJyAtZjEtYAorICAgIGRvCisgICAgICAgIGlmIFtbICEgLWQgJHtTWVNURU1f UFVCTElDX0hFQURFUl9QUkVGSVh9IF1dOyB0aGVuCisgICAgICAgICAgICBta2RpciAtcCAke1NZ U1RFTV9QVUJMSUNfSEVBREVSX1BSRUZJWH0KKyAgICAgICAgZmkKKworICAgICAgICBjcmVhdGVf c3ltbGlua19pZl9uZWVkZWQgJHtJTlNUQUxMX1BVQkxJQ19IRUFERVJfUFJFRklYfSAke1BVQkxJ Q19IRUFERVJTX0ZPTERFUl9QUkVGSVh9ICR7U1lTVEVNX1BVQkxJQ19IRUFERVJfUFJFRklYfSAk e0hFQURFUl9GT0xERVJ9CisgICAgZG9uZQorZmkKKworaWYgW1sgIiR7QUNUSU9OfSIgPT0gImlu c3RhbGwiIF1dCit0aGVuCisgICAgZm9yIExJQlJBUlkgaW4gYGVjaG8gJHtMSUJSQVJZX0xJU1R9 IHwgY3V0IC1kJyAnIC1mMS1gCisgICAgZG8KKyAgICAgICAgaWYgW1sgISAtZCAke1NZU1RFTV9Q VUJMSUNfTElCUkFSWV9QUkVGSVh9IF1dOyB0aGVuCisgICAgICAgICAgICBta2RpciAtcCAke1NZ U1RFTV9QVUJMSUNfTElCUkFSWV9QUkVGSVh9CisgICAgICAgIGZpCisKKyAgICAgICAgY3JlYXRl X3N5bWxpbmtfaWZfbmVlZGVkICR7SU5TVEFMTF9QVUJMSUNfTElCUkFSWV9QUkVGSVh9ICR7UFVC TElDX0xJQlJBUllfRk9MREVSX1BSRUZJWH0gJHtTWVNURU1fUFVCTElDX0xJQlJBUllfUFJFRklY fSAke0xJQlJBUll9CisgICAgZG9uZQorZmkKClByb3BlcnR5IGNoYW5nZXMgb246IFNvdXJjZS9U aGlyZFBhcnR5L2xpYndlYnJ0Yy9TY3JpcHRzL2NyZWF0ZS1zeW1saW5rLXRvLWFsdHJvb3Quc2gK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpBZGRlZDogc3ZuOmV4ZWN1dGFibGUKIyMgLTAsMCArMSAjIworKgpcIE5vIG5l d2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5CkluZGV4OiBTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJy dGMvbGlid2VicnRjLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL2xpYndlYnJ0Yy54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCShyZXZpc2lvbiAyODgzODMpCisrKyBTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvbGli d2VicnRjLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTE3Mzky LDYgKzE3MzkyLDcgQEAKIAkJCQk0MUYyMzU0MTIyRjM5QUMwMDBCNEZDREIgLyogQ2hlY2sgRm9y IEluYXBwcm9wcmlhdGUgT2JqZWN0aXZlLUMgQ2xhc3MgTmFtZXMgKi8sCiAJCQkJMzEyQkRCMEIx NUZFQ0FCMDAwOTdFQkM3IC8qIENvcHlGaWxlcyAqLywKIAkJCQkzMTJCREIwRDE1RkVDQUNFMDA5 N0VCQzcgLyogQ29weUZpbGVzICovLAorCQkJCTY1OUE4NkVBMjc5Nzk2RjgwMEFDMzdCNiAvKiBD cmVhdGUgU3ltbGluayB0byBBbHQgUm9vdCBQYXRoICovLAogCQkJKTsKIAkJCWJ1aWxkUnVsZXMg PSAoCiAJCQkpOwpAQCAtMTc0OTMsNyArMTc0OTQsNyBAQAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JE ZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQkJc2hlbGxQYXRoID0gL2Jpbi9zaDsKLQkJ CXNoZWxsU2NyaXB0ID0gIlBSSVZBVEVfSEVBREVSU19GT0xERVJfUEFUSD11c3IvbG9jYWwvaW5j bHVkZVxuXG5pZiBbWyBcIiR7REVQTE9ZTUVOVF9MT0NBVElPTn1cIiA9PSBcIk5PXCIgXV07IHRo ZW5cbiAgICBQUklWQVRFX0hFQURFUlNfUEFUSD1cIiR7VEFSR0VUX0JVSUxEX0RJUiUvfS8ke1BS SVZBVEVfSEVBREVSU19GT0xERVJfUEFUSH1cIlxuZWxzZVxuICAgIFBSSVZBVEVfSEVBREVSU19Q QVRIPVwiJHtEU1RST09UfSR7SU5TVEFMTF9QQVRIX1BSRUZJWCUvfS8ke1BSSVZBVEVfSEVBREVS U19GT0xERVJfUEFUSH1cIlxuZmk7XG5cbm1rZGlyIC1wIFwiJHtQUklWQVRFX0hFQURFUlNfUEFU SH1cIlxuXG5yc3luYyAtYXYgLS1uby1vd25lciAtLW5vLWdyb3VwIC0tcHJ1bmUtZW1wdHktZGly cyAtLWV4Y2x1ZGUgXCIuc3ZuXCIgLS1leGNsdWRlIFwidXNyXCIgLS1pbmNsdWRlIFwiKi9cIiAt LWluY2x1ZGUgXCIqLmhcIiAtLWV4Y2x1ZGUgXCIqXCIgXCIke1NSQ1JPT1R9L1NvdXJjZS93ZWJy dGNcIiBcIiR7UFJJVkFURV9IRUFERVJTX1BBVEh9XCJcblxucnN5bmMgLWF2IC0tbm8tb3duZXIg LS1uby1ncm91cCAtLXBydW5lLWVtcHR5LWRpcnMgLS1leGNsdWRlIFwiLnN2blwiIC0tZXhjbHVk ZSBcInVzclwiIC0taW5jbHVkZSBcIiovXCIgLS1pbmNsdWRlIFwiKi5oXCIgLS1leGNsdWRlIFwi KlwiIFwiJHtTUkNST09UfS9Tb3VyY2UvdGhpcmRfcGFydHkvYWJzZWlsLWNwcC9hYnNsXCIgXCIk e1BSSVZBVEVfSEVBREVSU19QQVRIfVwiXG4iOworCQkJc2hlbGxTY3JpcHQgPSAiUFJJVkFURV9I RUFERVJTX0ZPTERFUl9QQVRIPXVzci9sb2NhbC9pbmNsdWRlXG5cbmlmIFtbIFwiJHtERVBMT1lN RU5UX0xPQ0FUSU9OfVwiID09IFwiTk9cIiBdXTsgdGhlblxuICAgIFBSSVZBVEVfSEVBREVSU19Q QVRIPVwiJHtUQVJHRVRfQlVJTERfRElSJS99LyR7UFJJVkFURV9IRUFERVJTX0ZPTERFUl9QQVRI fVwiXG5lbHNlXG4gICAgUFJJVkFURV9IRUFERVJTX1BBVEg9XCIke0RTVFJPT1R9JHtJTlNUQUxM X1BBVEhfUFJFRklYJS99LyR7UFJJVkFURV9IRUFERVJTX0ZPTERFUl9QQVRIfVwiXG5maTtcblxu ZWNobyBcIiMjIyMgUFJJVkFURV9IRUFERVJTX1BBVEggPSAke1BSSVZBVEVfSEVBREVSU19QQVRI fVwiXG5lY2hvXG5cbm1rZGlyIC1wIFwiJHtQUklWQVRFX0hFQURFUlNfUEFUSH1cIlxuXG5yc3lu YyAtYXYgLS1uby1vd25lciAtLW5vLWdyb3VwIC0tcHJ1bmUtZW1wdHktZGlycyAtLWV4Y2x1ZGUg XCIuc3ZuXCIgLS1leGNsdWRlIFwidXNyXCIgLS1pbmNsdWRlIFwiKi9cIiAtLWluY2x1ZGUgXCIq LmhcIiAtLWV4Y2x1ZGUgXCIqXCIgXCIke1NSQ1JPT1R9L1NvdXJjZS93ZWJydGNcIiBcIiR7UFJJ VkFURV9IRUFERVJTX1BBVEh9XCJcblxucnN5bmMgLWF2IC0tbm8tb3duZXIgLS1uby1ncm91cCAt LXBydW5lLWVtcHR5LWRpcnMgLS1leGNsdWRlIFwiLnN2blwiIC0tZXhjbHVkZSBcInVzclwiIC0t aW5jbHVkZSBcIiovXCIgLS1pbmNsdWRlIFwiKi5oXCIgLS1leGNsdWRlIFwiKlwiIFwiJHtTUkNS T09UfS9Tb3VyY2UvdGhpcmRfcGFydHkvYWJzZWlsLWNwcC9hYnNsXCIgXCIke1BSSVZBVEVfSEVB REVSU19QQVRIfVwiXG4iOwogCQl9OwogCQk1Q0QyODY0NjFFNkUxNTRFMDA5NEZEQzggLyogQ2hl Y2sgZm9yIFdlYWsgVlRhYmxlcyBhbmQgRXh0ZXJuYWxzICovID0gewogCQkJaXNhID0gUEJYU2hl bGxTY3JpcHRCdWlsZFBoYXNlOwpAQCAtMTc1MTAsNiArMTc1MTEsMjUgQEAKIAkJCXNoZWxsUGF0 aCA9IC9iaW4vc2g7CiAJCQlzaGVsbFNjcmlwdCA9ICJpZiBbIFwiJHtBQ1RJT059XCIgPSBcImlu c3RhbGxoZHJzXCIgXSB8fCBbIFwiJHtBQ1RJT059XCIgPSBcImluc3RhbGxhcGlcIiBdOyB0aGVu XG4gICAgZXhpdCAwO1xuZmlcblxuaWYgWyAtZiAuLi8uLi8uLi9Ub29scy9TY3JpcHRzL2NoZWNr LWZvci13ZWFrLXZ0YWJsZXMtYW5kLWV4dGVybmFscyBdOyB0aGVuXG4gICAgLi4vLi4vLi4vVG9v bHMvU2NyaXB0cy9jaGVjay1mb3Itd2Vhay12dGFibGVzLWFuZC1leHRlcm5hbHMgfHwgZXhpdCAk P1xuZmkiOwogCQl9OworCQk2NTlBODZFQTI3OTc5NkY4MDBBQzM3QjYgLyogQ3JlYXRlIFN5bWxp bmsgdG8gQWx0IFJvb3QgUGF0aCAqLyA9IHsKKwkJCWlzYSA9IFBCWFNoZWxsU2NyaXB0QnVpbGRQ aGFzZTsKKwkJCWJ1aWxkQWN0aW9uTWFzayA9IDg7CisJCQlmaWxlcyA9ICgKKwkJCSk7CisJCQlp bnB1dEZpbGVMaXN0UGF0aHMgPSAoCisJCQkpOworCQkJaW5wdXRQYXRocyA9ICgKKwkJCSk7CisJ CQluYW1lID0gIkNyZWF0ZSBTeW1saW5rIHRvIEFsdCBSb290IFBhdGgiOworCQkJb3V0cHV0Rmls ZUxpc3RQYXRocyA9ICgKKwkJCSk7CisJCQlvdXRwdXRQYXRocyA9ICgKKwkJCQkiJHtDUkVBVEVf U1lNTElOS19PVVRQVVRfRklMRVN9IiwKKwkJCSk7CisJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBv c3Rwcm9jZXNzaW5nID0gMTsKKwkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7CisJCQlzaGVsbFNjcmlw dCA9ICJcIiR7U1JDUk9PVH0vU2NyaXB0cy9jcmVhdGUtc3ltbGluay10by1hbHRyb290LnNoXCJc biI7CisJCX07CiAvKiBFbmQgUEJYU2hlbGxTY3JpcHRCdWlsZFBoYXNlIHNlY3Rpb24gKi8KIAog LyogQmVnaW4gUEJYU291cmNlc0J1aWxkUGhhc2Ugc2VjdGlvbiAqLwo=