From 8e4128874fcf841e8db8fc7e7c21554280172bd5 Mon Sep 17 00:00:00 2001 From: Alexander Frick Date: Thu, 3 Oct 2024 09:09:50 -0500 Subject: [PATCH] M128 stage 1 --- .../installer/linux/common/installer.include | 48 +- .../installer/linux/rpm/thorium.spec.template | 2 +- infra/THORIUM_DEV_BOOKMARKS.html | 8 +- infra/portable/C/THORIUM-PORTABLE.sh.x.c | 789 +++++++++--------- infra/portable/THORIUM-PORTABLE | Bin 20328 -> 20184 bytes infra/portable/THORIUM-PORTABLE.sh | 4 +- infra/thor_ver_linux/wrapper-avx2 | 4 +- infra/thor_ver_linux/wrapper-avx512 | 4 +- infra/thor_ver_linux/wrapper-sse2 | 4 +- infra/thor_ver_linux/wrapper-sse3 | 4 +- infra/thor_ver_linux/wrapper-sse4 | 4 +- src/build/config/mac/BUILD.gn | 4 +- .../background/background_mode_manager.cc | 2 +- .../net/stub_resolver_config_reader.cc | 45 +- src/chrome/browser/ui/browser_ui_prefs.cc | 5 + .../browser/ui/startup/bad_flags_prompt.cc | 4 +- src/chrome/installer/linux/BUILD.gn | 39 +- .../installer/linux/common/installer.include | 42 +- src/chrome/installer/linux/common/wrapper | 4 +- .../installer/mini_installer/chrome.release | 7 + .../public/common/download_features.cc | 4 + .../privacy_sandbox_settings_impl.cc | 3 +- .../tracking_protection_prefs.cc | 32 +- .../search_engines/prepopulated_engines.json | 16 +- src/third_party/ffmpeg/ffmpeg_options.gni | 21 +- 25 files changed, 573 insertions(+), 526 deletions(-) diff --git a/arm/raspi/chrome/installer/linux/common/installer.include b/arm/raspi/chrome/installer/linux/common/installer.include index 9d3a4aa6..e762a37f 100644 --- a/arm/raspi/chrome/installer/linux/common/installer.include +++ b/arm/raspi/chrome/installer/linux/common/installer.include @@ -171,6 +171,7 @@ stage_install_common() { install -m 644 "${OUTPUTDIR}/resources/inspector_overlay/main.js" "${STAGEDIR}/${INSTALLDIR}/resources/inspector_overlay/" install -m 755 "${OUTPUTDIR}/thorium_shell" "${STAGEDIR}/${INSTALLDIR}/" install -m ${SHLIB_PERMS} "${OUTPUTDIR}/libffmpeg.so" "${STAGEDIR}/${INSTALLDIR}/" + install -m ${SHLIB_PERMS} "${OUTPUTDIR}/libffmpeg.so" "${STAGEDIR}/${INSTALLDIR}/lib" # install -m ${SHLIB_PERMS} "${OUTPUTDIR}/libblink_test_plugin.so" "${STAGEDIR}/${INSTALLDIR}/lib" install -m ${SHLIB_PERMS} "${OUTPUTDIR}/ClearKeyCdm/_platform_specific/linux_arm64/libclearkeycdm.so" "${STAGEDIR}/${INSTALLDIR}/lib" install -m 644 "${OUTPUTDIR}/thorium_shell.png" "${STAGEDIR}/${INSTALLDIR}/" @@ -192,7 +193,7 @@ stage_install_common() { # V8 snapshot files; Necessary when the GN v8_use_external_startup_data flag # is true. # Use v8_context_snapshot.bin instead of snapshot_blob.bin if it is available. - # TODO(crbug.com/764576): Unship snapshot_blob.bin on ChromeOS and drop this branch + # TODO(crbug.com/40539769): Unship snapshot_blob.bin on ChromeOS and drop this branch if [ -f "${OUTPUTDIR}/v8_context_snapshot.bin" ]; then install -m 644 "${OUTPUTDIR}/v8_context_snapshot.bin" "${STAGEDIR}/${INSTALLDIR}/" else @@ -214,12 +215,19 @@ stage_install_common() { cp -a '{}' "${STAGEDIR}/${INSTALLDIR}/locales/" \; find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -exec chmod 644 '{}' \; - # TODO(https://crbug.com/1077934): The below conditions check for the + # TODO(crbug.com/40688962): The below conditions check for the # existence of files to determine if they should be copied to the staging # directory. However, these may be stale if the build config no longer # builds these files. The build config should be obtained from gn rather than # guessed based on the presence of files. + # Privacy Sandbox Attestation + if [ -f "${OUTPUTDIR}/PrivacySandboxAttestationsPreloaded/manifest.json" ]; then + install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/PrivacySandboxAttestationsPreloaded/" + install -m 644 "${OUTPUTDIR}/PrivacySandboxAttestationsPreloaded/manifest.json" "${STAGEDIR}/${INSTALLDIR}/PrivacySandboxAttestationsPreloaded/" + install -m 644 "${OUTPUTDIR}/PrivacySandboxAttestationsPreloaded/privacy-sandbox-attestations.dat" "${STAGEDIR}/${INSTALLDIR}/PrivacySandboxAttestationsPreloaded/" + fi + # MEI Preload if [ -f "${OUTPUTDIR}/MEIPreload/manifest.json" ]; then install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/MEIPreload/" @@ -334,6 +342,8 @@ stage_install_common() { icon_regex=".*product_logo_[0-9]\+_beta\." elif [ "$CHANNEL" = "unstable" ]; then icon_regex=".*product_logo_[0-9]\+_dev\." + elif [ "$CHANNEL" = "canary" ]; then + icon_regex=".*product_logo_[0-9]\+_canary\." fi fi LOGO_RESOURCES_PNG=$(find "${OUTPUTDIR}/installer/theme/" \ @@ -417,6 +427,18 @@ stage_install_common() { "outside of ${INSTALLDIR}" 1>&2 fi + # official build should not relax permission check. + on_cog= + if [ "$IS_OFFICIAL_BUILD" -eq 0 ]; then + # on Cog, permission is always 0664 or 0775 + case "$(pwd)" in + /google/cog/cloud/*) + on_cog=1 + echo "INFO: build on Cog. relax permission for group writable" 1>&2 + ;; + esac + fi + # Verify file permissions. for file in $(find "${STAGEDIR}" -mindepth 1); do local actual_perms=$(stat -c "%a" "${file}") @@ -454,9 +476,25 @@ stage_install_common() { local expected_perms=644 fi if [ ${expected_perms} -ne ${actual_perms} ]; then - echo Expected permissions on ${base_name} to be \ - ${expected_perms}, but they were ${actual_perms} 1>&2 - exit 1 + if [ -z "$on_cog" ]; then + echo Expected permissions on ${base_name} to be \ + ${expected_perms}, but they were ${actual_perms} 1>&2 + exit 1 + fi + local relaxed_expected_perms=${expected_perms} + + case ${expected_perms} in + 4755) relaxed_expected_perms=775 ;; + 644) relaxed_expected_perms=664 ;; + 755) relaxed_expected_perms=775 ;; + esac + + if [ ${relaxed_expected_perms} -ne ${actual_perms} ]; then + echo Expected permissions on ${base_name} to be \ + ${expected_perms} or ${relaxed_expected_perms}, \ + but they were ${actual_perms} 1>&2 + exit 1 + fi fi done } diff --git a/arm/raspi/chrome/installer/linux/rpm/thorium.spec.template b/arm/raspi/chrome/installer/linux/rpm/thorium.spec.template index 40cad2fc..f1b82d4a 100644 --- a/arm/raspi/chrome/installer/linux/rpm/thorium.spec.template +++ b/arm/raspi/chrome/installer/linux/rpm/thorium.spec.template @@ -178,7 +178,7 @@ case $CHANNEL in ;; esac -ln -sf /opt/chromium.org/thorium/thorium-browser /usr/bin/thorium-browser +ln -sf /opt/chromium.org/thorium/thorium-browser /usr/bin/@@USR_BIN_SYMLINK_NAME@@ exit 0 diff --git a/infra/THORIUM_DEV_BOOKMARKS.html b/infra/THORIUM_DEV_BOOKMARKS.html index d91114b2..4eea6482 100644 --- a/infra/THORIUM_DEV_BOOKMARKS.html +++ b/infra/THORIUM_DEV_BOOKMARKS.html @@ -25,9 +25,12 @@
generated_resources.grd - Chromium Code Search
app_management_strings.grdp - Chromium Code Search
ffmpeg_options.gni - Chromium Code Search +
stats_reporting_controller.cc - Chromium Code Search
background_mode_manager.cc - Chromium Code Search
privacy_sandbox_settings_impl.cc - Chromium Code Search +
tracking_protection_prefs.cc - Chromium Code Search
floc_id_provider_factory.cc - Chromium Code Search +
profile_network_context_service.cc - Chromium Code Search
stub_resolver_config_reader.cc - Chromium Code Search
browser_ui_prefs.cc - Chromium Code Search
google_api_keys_infobar_delegate.cc - Chromium Code Search @@ -38,8 +41,6 @@
chrome.release - Chromium Code Search
mini_installer_exe_main.cc - Chromium Code Search
download_features.cc - Chromium Code Search -
privacy_sandbox_settings.cc - Chromium Code Search -
tracking_protection_prefs.cc - Chromium Code Search
prepopulated_engines.json - Chromium Code Search
search_engine_countries-inc.cc - Chromium Code Search

@@ -199,7 +200,7 @@

media_options.gni - Chromium Code Search
ignores.txt - Chromium Code Search

-

Th23

+

Th24

tab.cc - Chromium Code Search
tab_strip.cc - Chromium Code Search @@ -221,7 +222,6 @@
gpu_pre_sandbox_hook_linux.cc - Chromium Code Search
download_bubble_prefs.cc - Chromium Code Search
accelerators.cc - Chromium Code Search -
profile_network_context_service.cc - Chromium Code Search
whats_new_util.cc - Chromium Code Search
chrome_download_manager_delegate.cc - Chromium Code Search
libaom - Chromium Code Search diff --git a/infra/portable/C/THORIUM-PORTABLE.sh.x.c b/infra/portable/C/THORIUM-PORTABLE.sh.x.c index 4df60dcd..23c69735 100644 --- a/infra/portable/C/THORIUM-PORTABLE.sh.x.c +++ b/infra/portable/C/THORIUM-PORTABLE.sh.x.c @@ -6,411 +6,402 @@ #endif static char data [] = -#define lsto_z 1 -#define lsto ((&data[0])) - "\311" #define chk2_z 19 -#define chk2 ((&data[5])) - "\014\324\100\315\110\155\030\233\317\114\254\035\261\354\274\210" - "\006\176\001\124\072\251\263" -#define tst1_z 22 -#define tst1 ((&data[24])) - "\101\164\212\150\317\133\145\274\236\361\160\312\033\142\021\073" - "\075\144\102\270\362\214\263\273" -#define text_z 4165 -#define text ((&data[723])) - "\324\330\252\334\107\231\022\273\243\033\077\213\375\253\004\010" - "\240\363\052\254\310\153\172\112\160\322\375\054\242\243\222\167" - "\173\074\123\303\326\145\176\171\201\276\005\176\152\012\207\012" - "\375\261\267\306\034\061\020\215\004\016\271\247\261\113\036\055" - "\210\162\361\136\330\157\330\131\056\335\330\230\347\137\242\345" - "\021\132\254\055\214\274\273\220\312\164\070\174\300\127\252\110" - "\311\233\247\242\012\177\373\071\135\323\321\105\063\164\052\104" - "\316\327\162\132\223\055\353\136\242\043\333\142\173\205\253\105" - "\040\122\347\053\322\342\144\057\266\066\164\351\252\237\056\170" - "\166\240\322\012\315\276\151\157\342\105\322\135\312\175\243\353" - "\317\212\027\241\155\174\321\043\262\106\015\134\345\073\324\134" - "\334\247\147\251\146\321\031\110\026\353\246\341\151\111\314\071" - "\323\344\332\100\140\254\144\022\362\162\156\327\256\103\064\212" - "\353\233\064\121\155\116\232\203\071\100\144\243\211\061\334\134" - "\026\266\235\166\143\002\210\125\164\367\055\043\073\141\255\047" - "\375\342\170\152\060\022\356\152\122\122\015\333\204\351\070\232" - "\240\325\021\003\330\232\130\114\222\205\160\315\347\035\364\345" - "\377\155\117\060\200\075\232\323\220\247\256\025\220\347\260\060" - "\275\301\063\225\133\214\342\355\021\122\273\371\160\260\336\160" - "\035\056\240\235\154\072\160\375\341\037\022\162\007\303\242\304" - "\204\326\131\340\142\074\316\164\216\211\155\376\072\114\156\127" - "\172\017\365\347\111\146\344\053\205\367\235\215\272\100\121\077" - "\026\253\040\171\350\356\355\166\170\133\165\262\247\344\012\042" - "\363\377\011\075\146\356\151\354\345\007\171\240\107\313\340\136" - "\166\000\327\136\357\305\325\150\040\112\033\310\057\045\353\043" - "\045\365\140\213\343\312\167\311\321\361\152\030\274\112\167\062" - "\112\117\221\072\024\147\242\064\262\276\375\341\344\350\004\011" - "\335\145\225\301\057\015\212\000\376\364\031\272\077\220\355\212" - "\340\177\304\364\346\147\051\230\045\047\172\011\017\176\023\355" - "\343\251\256\023\266\071\023\265\056\055\157\155\276\135\367\236" - "\335\274\223\303\043\274\134\111\343\326\123\363\125\146\340\071" - "\017\217\114\306\311\140\173\367\215\353\144\114\111\134\352\046" - "\030\175\352\074\072\106\205\036\035\330\021\162\077\362\253\117" - "\201\367\025\113\127\220\102\345\174\247\061\305\003\034\353\034" - "\231\325\130\324\034\336\362\071\267\004\253\366\366\126\106\170" - "\116\133\303\246\354\006\213\150\255\275\056\261\331\031\316\163" - "\357\046\107\013\005\072\105\274\076\360\263\065\107\371\256\225" - "\125\162\073\101\170\307\252\046\204\330\327\135\362\246\320\341" - "\315\030\355\322\122\062\216\220\042\102\306\151\073\164\377\220" - "\346\072\322\137\001\174\205\205\125\135\343\107\003\263\050\320" - "\313\026\242\036\110\061\257\153\163\165\324\256\351\323\077\320" - "\016\021\057\017\215\265\225\342\022\170\052\025\054\122\345\367" - "\151\207\026\227\277\074\174\212\121\141\162\032\247\366\062\046" - "\311\347\213\220\244\356\044\305\111\020\054\233\210\354\031\272" - "\245\137\126\303\010\115\146\233\072\073\317\210\147\310\323\322" - "\335\247\240\214\223\301\003\224\203\213\140\276\120\340\145\167" - "\367\304\240\122\150\024\171\043\106\311\346\371\143\136\365\343" - "\212\105\222\371\014\162\052\221\365\237\177\315\136\146\157\003" - "\320\052\143\160\172\232\300\102\065\360\055\143\123\240\302\132" - "\261\201\316\205\363\023\114\365\025\236\010\267\132\343\015\124" - "\311\376\070\032\034\306\116\175\250\236\177\207\001\224\067\373" - "\104\275\307\303\254\305\113\137\227\344\126\166\362\172\127\174" - "\314\163\141\256\372\310\013\306\126\104\107\362\304\117\352\335" - "\316\344\160\271\005\142\056\221\000\162\200\323\270\070\205\301" - "\257\300\067\370\247\221\236\217\235\223\076\057\222\072\316\335" - "\101\333\076\051\041\340\107\227\327\060\012\064\211\264\353\166" - "\351\167\361\306\261\174\256\313\153\303\015\037\315\113\265\320" - "\032\247\232\244\306\246\316\315\167\302\341\036\017\171\121\147" - "\135\275\031\126\001\227\252\114\245\334\325\301\154\251\356\171" - "\352\257\074\250\132\376\032\301\342\362\352\375\270\207\325\033" - "\332\274\020\011\260\257\106\176\331\346\206\174\367\265\260\046" - "\020\242\324\005\375\044\063\004\170\252\054\355\142\305\232\226" - "\343\203\104\205\043\011\034\230\321\350\270\216\056\004\252\054" - "\046\242\272\176\061\065\132\010\005\114\251\133\236\312\274\321" - "\063\244\072\022\046\102\303\310\076\207\314\204\007\323\203\114" - "\021\155\241\042\163\111\233\243\031\071\334\205\032\137\147\013" - "\006\377\074\015\220\007\153\322\376\217\223\075\021\254\244\347" - "\114\212\373\110\373\065\264\156\356\223\275\362\253\001\036\342" - "\321\056\234\264\371\246\220\057\260\024\216\235\226\225\174\006" - "\116\147\356\117\056\352\322\330\274\247\276\157\200\063\273\371" - "\120\170\172\164\106\305\005\055\000\027\244\260\231\011\075\114" - "\100\235\314\072\053\002\222\013\214\154\317\200\057\362\300\216" - "\021\312\211\151\350\211\306\011\302\376\252\276\067\336\034\145" - "\062\031\337\337\126\276\145\242\232\274\227\071\203\032\236\124" - "\025\026\120\166\223\201\010\374\100\063\010\110\233\076\107\174" - "\262\037\026\354\023\126\243\221\024\120\162\235\300\107\344\300" - "\004\344\324\015\244\034\204\274\110\303\325\205\234\161\155\272" - "\205\250\316\052\047\307\244\207\130\232\136\173\054\041\373\277" - "\265\047\172\135\067\046\326\331\143\137\017\116\172\054\234\367" - "\276\005\346\000\154\224\231\061\357\325\201\144\071\252\313\120" - "\134\050\371\000\054\055\130\122\261\201\116\121\213\057\157\022" - "\154\106\244\143\100\171\067\041\202\325\037\376\052\255\261\314" - "\030\104\373\133\072\204\212\015\130\373\110\103\357\000\077\363" - "\244\257\061\104\114\304\256\130\104\144\011\023\373\075\342\160" - "\103\205\310\100\167\172\357\176\122\275\365\360\367\230\242\134" - "\363\310\114\272\362\266\275\367\006\026\200\115\020\000\221\015" - "\030\146\212\306\366\133\327\006\124\363\011\040\140\105\257\117" - "\337\346\042\315\371\155\004\017\263\265\002\151\161\126\245\256" - "\037\061\144\071\233\151\127\017\101\353\200\141\047\165\362\224" - "\253\215\065\154\033\102\226\355\104\324\305\144\246\301\141\317" - "\211\262\246\050\072\031\236\303\307\351\177\116\051\136\226\361" - "\262\035\312\315\245\074\302\255\042\053\377\330\015\061\052\234" - "\125\342\274\260\323\155\006\141\053\153\275\112\324\160\066\302" - "\306\172\123\042\017\104\160\045\324\046\144\031\306\027\173\271" - "\206\034\163\112\206\315\051\333\211\033\235\160\075\145\316\247" - "\275\350\233\317\314\132\063\215\043\012\223\046\165\121\275\021" - "\321\271\277\342\112\322\072\007\036\244\074\377\321\022\340\115" - "\314\074\264\345\330\032\117\131\044\214\155\216\060\134\270\233" - "\306\305\262\216\363\266\111\252\055\275\344\254\347\347\202\336" - "\145\027\364\364\127\361\150\151\351\273\216\201\160\014\215\135" - "\052\317\302\165\334\344\204\130\376\124\322\022\006\173\235\343" - "\274\016\151\021\071\122\163\047\135\166\367\221\053\035\235\056" - "\334\343\002\242\103\217\325\045\204\011\013\171\352\372\035\227" - "\120\001\004\002\341\307\162\025\373\327\302\060\043\336\047\260" - "\030\047\212\340\116\360\235\316\246\125\201\147\105\157\013\240" - "\010\353\144\025\125\023\340\222\353\354\256\012\253\126\267\314" - "\021\351\345\302\363\214\050\374\063\311\015\162\235\176\053\216" - "\357\015\254\076\330\134\022\335\003\170\207\150\040\155\066\207" - "\061\316\301\253\206\055\057\206\161\067\002\357\305\374\051\326" - "\163\001\307\065\354\264\064\124\317\354\110\003\073\021\236\012" - "\263\047\013\205\060\050\330\260\065\017\270\321\065\143\060\111" - "\157\363\227\222\033\104\271\063\326\231\123\261\114\004\135\170" - "\030\224\070\202\114\331\333\237\223\114\127\224\275\252\027\007" - "\366\326\011\247\273\344\256\010\077\106\236\121\162\150\212\025" - "\035\077\340\176\225\264\037\213\375\241\344\123\111\256\376\171" - "\134\360\276\133\222\320\210\306\202\242\172\144\267\343\125\216" - "\100\362\250\155\366\001\011\131\035\164\336\367\302\325\375\041" - "\376\342\323\240\244\141\263\342\064\031\256\131\043\274\206\173" - "\104\250\000\075\126\046\205\213\225\316\244\207\352\351\212\010" - "\101\272\342\347\043\345\304\024\251\111\070\336\136\220\343\210" - "\254\132\047\104\332\036\243\332\042\144\071\273\353\000\163\227" - "\326\056\163\116\176\002\177\203\264\336\070\132\211\145\357\245" - "\261\205\277\056\314\113\372\257\170\042\200\251\102\240\322\231" - "\062\125\256\244\214\144\273\174\275\153\350\377\266\026\021\213" - "\130\242\164\040\040\015\027\074\163\202\133\041\222\022\206\373" - "\367\251\011\163\370\263\144\100\122\241\055\111\072\166\117\115" - "\271\031\174\203\147\301\157\160\005\002\300\027\150\220\106\042" - "\257\032\304\065\304\100\246\030\105\246\155\006\117\113\264\066" - "\111\127\370\055\102\360\304\104\200\377\051\135\201\074\327\054" - "\050\030\020\320\071\241\230\007\016\266\264\265\267\341\372\257" - "\131\241\262\110\037\265\101\043\132\337\245\173\151\127\036\035" - "\266\167\000\130\265\126\157\167\170\364\323\372\233\256\001\134" - "\076\027\271\321\135\367\372\066\124\020\115\300\274\275\342\057" - "\337\000\134\207\212\140\334\241\377\201\216\262\001\131\176\147" - "\143\334\127\262\032\134\272\355\115\145\274\322\042\337\332\274" - "\262\151\155\310\145\034\236\247\153\255\376\251\044\131\016\212" - "\235\267\061\255\075\156\024\321\271\326\145\130\247\332\074\231" - "\266\172\035\274\002\321\256\322\173\106\011\376\370\300\316\136" - "\117\176\166\245\302\157\055\222\206\264\272\163\040\003\127\345" - "\122\256\146\227\201\256\227\330\225\323\210\010\026\214\136\075" - "\204\377\173\332\032\200\314\076\066\213\272\313\201\163\304\172" - "\045\240\266\125\166\214\131\354\110\377\174\120\374\020\115\254" - "\205\015\273\354\225\111\164\250\002\026\004\344\222\104\127\243" - "\122\051\227\167\176\334\124\311\253\103\107\234\055\024\244\346" - "\102\076\260\043\143\167\343\023\341\155\120\057\105\315\263\210" - "\223\133\033\005\341\313\247\352\252\264\330\235\267\025\337\245" - "\122\021\134\171\102\062\361\160\304\370\215\140\232\102\255\215" - "\045\145\341\344\342\251\133\074\211\366\124\264\213\316\062\252" - "\345\146\144\364\034\067\054\001\146\373\064\322\361\101\007\202" - "\335\074\271\170\102\005\360\226\162\303\203\062\143\326\266\263" - "\301\367\265\140\342\114\307\111\110\054\316\142\210\271\201\174" - "\057\177\375\113\266\326\127\001\014\103\137\072\116\232\324\037" - "\363\024\074\076\152\271\137\217\107\034\376\067\074\143\201\243" - "\253\206\271\241\116\226\251\070\177\000\124\334\001\333\266\216" - "\103\171\165\242\023\345\203\072\373\150\270\034\005\374\021\101" - "\304\076\027\247\026\160\136\316\015\231\351\360\132\163\275\251" - "\022\047\116\236\105\212\320\035\363\007\000\332\057\265\121\340" - "\175\135\236\051\054\013\335\055\024\176\002\156\000\203\334\120" - "\320\007\031\225\145\211\177\107\223\246\350\237\364\361\174\241" - "\024\340\126\303\233\076\211\323\311\352\123\017\325\276\367\133" - "\140\350\237\374\252\330\146\271\300\160\146\221\006\010\312\254" - "\270\141\151\173\272\006\136\235\015\367\007\027\024\104\120\331" - "\057\156\041\306\360\045\144\225\111\132\024\205\332\022\322\106" - "\136\331\120\346\102\307\300\221\157\215\023\167\261\176\136\107" - "\217\177\245\264\201\101\234\014\173\261\365\230\370\233\202\054" - "\246\150\067\313\326\173\316\027\341\047\166\072\326\252\002\205" - "\133\110\230\316\234\072\250\173\351\252\062\312\253\203\052\243" - "\133\144\044\012\142\132\222\201\117\033\275\220\277\305\215\264" - "\231\272\323\160\146\112\052\125\264\072\115\057\054\071\305\227" - "\132\132\215\256\160\136\263\331\175\072\031\363\366\241\275\307" - "\332\155\114\200\135\041\300\074\027\073\372\065\343\113\206\262" - "\075\346\116\144\233\321\307\042\247\044\027\247\026\361\075\153" - "\141\165\344\211\225\216\113\066\117\362\127\231\361\051\060\262" - "\040\053\210\204\243\160\115\046\022\303\145\237\207\127\065\047" - "\174\324\131\355\265\044\301\200\232\234\163\072\266\020\311\232" - "\342\212\003\172\046\051\003\216\055\101\255\151\321\212\335\036" - "\353\055\232\354\034\206\225\124\072\305\133\143\175\103\070\024" - "\140\145\066\171\167\130\206\070\244\350\261\107\000\063\003\050" - "\045\342\325\007\247\341\373\074\041\352\173\126\304\157\166\050" - "\121\302\061\370\261\026\064\241\113\032\336\342\322\360\364\166" - "\310\314\215\067\335\125\162\056\351\153\131\135\014\367\127\132" - "\152\347\325\352\004\011\244\330\310\322\144\361\161\013\115\346" - "\031\211\053\173\301\340\131\272\135\106\355\121\256\113\220\065" - "\107\124\005\261\162\242\061\210\351\063\276\227\313\022\265\263" - "\260\073\234\130\011\226\222\071\210\315\073\326\215\115\065\175" - "\207\323\351\144\071\030\266\015\032\273\125\211\344\117\111\241" - "\140\361\272\367\071\363\377\111\105\215\001\343\322\033\200\142" - "\160\225\204\047\006\154\160\014\232\005\170\150\037\074\262\336" - "\324\077\015\151\221\365\024\273\322\130\013\063\203\217\220\226" - "\121\172\354\310\006\274\054\165\033\345\357\123\375\377\107\116" - "\201\102\243\322\230\246\377\041\116\175\347\147\014\116\231\176" - "\366\121\103\165\174\324\050\271\201\373\254\252\063\240\127\212" - "\216\357\252\272\266\210\324\046\316\252\357\021\144\145\130\057" - "\377\324\232\105\345\335\134\266\276\227\155\304\226\304\274\040" - "\130\246\164\171\200\340\200\172\375\273\020\104\213\204\230\273" - "\123\215\221\201\340\122\054\201\303\033\134\227\131\277\375\164" - "\106\272\035\071\136\246\065\226\376\162\257\030\123\250\354\045" - "\020\151\125\172\076\162\034\363\125\253\152\015\024\005\051\225" - "\366\360\303\044\314\356\176\256\015\141\317\306\101\021\054\135" - "\145\102\063\235\204\223\121\153\266\100\374\011\070\066\001\372" - "\221\135\314\233\254\247\216\275\047\347\260\073\172\254\036\323" - "\173\217\011\074\070\261\070\155\241\343\063\363\355\237\322\135" - "\317\114\001\354\156\252\056\252\350\246\344\334\147\036\057\024" - "\114\270\003\014\014\035\325\077\144\206\226\166\354\222\057\214" - "\015\132\130\052\257\251\020\236\077\360\322\004\166\177\005\204" - "\021\315\170\144\246\341\272\222\126\331\242\120\240\206\163\100" - "\075\153\340\233\072\336\344\063\333\232\200\222\232\174\322\350" - "\072\074\076\256\316\237\121\003\253\324\043\064\007\343\113\151" - "\023\126\130\323\124\123\147\256\212\363\207\031\013\331\342\052" - "\067\055\130\250\275\114\123\025\241\333\005\041\104\056\201\240" - "\344\325\207\004\157\223\136\024\310\374\336\377\132\351\341\343" - "\054\335\326\325\113\263\267\307\111\120\006\042\056\073\071\270" - "\225\041\374\001\125\376\217\104\056\127\051\374\234\331\111\274" - "\307\046\045\027\250\104\013\315\275\200\106\154\362\323\213\126" - "\264\003\144\110\156\373\343\223\317\221\037\172\133\360\160\261" - "\145\075\331\227\343\014\375\353\342\213\012\353\272\235\123\074" - "\210\124\202\151\006\315\212\157\167\214\235\014\311\061\206\120" - "\326\106\254\355\052\244\056\171\152\223\114\146\345\041\162\341" - "\127\361\273\357\120\106\202\003\041\076\354\354\113\201\040\116" - "\120\132\221\111\355\202\343\245\102\323\024\104\370\145\347\223" - "\071\365\131\377\025\324\204\055\117\070\214\272\371\227\026\120" - "\031\171\326\050\311\326\035\353\003\006\055\150\210\147\224\247" - "\154\011\042\266\264\127\200\057\060\254\252\111\011\331\003\162" - "\101\234\071\264\255\376\322\346\267\103\254\270\301\205\306\163" - "\330\375\003\366\123\345\375\046\170\247\120\153\150\235\373\115" - "\305\214\166\017\064\066\346\373\035\051\331\220\205\135\003\306" - "\237\304\254\360\032\176\364\154\243\247\114\126\121\055\320\207" - "\337\213\252\162\144\201\017\250\214\115\216\106\070\355\030\340" - "\241\324\016\067\324\021\130\103\242\342\060\277\200\317\074\171" - "\313\311\170\023\100\301\067\335\312\110\101\061\151\061\131\045" - "\101\117\106\045\177\145\254\065\052\002\316\206\063\057\353\334" - "\345\211\170\222\064\140\051\132\300\315\375\130\067\340\034\016" - "\016\162\220\041\341\252\303\111\221\353\122\205\334\332\141\277" - "\030\235\224\021\234\365\225\375\347\002\112\074\116\015\313\041" - "\046\146\070\350\247\123\201\372\334\146\366\154\125\364\023\376" - "\231\152\107\225\314\333\370\006\136\235\011\263\302\017\206\324" - "\005\260\102\277\022\341\334\167\122\370\126\157\236\121\370\133" - "\311\024\205\010\361\100\015\174\247\254\335\205\366\226\100\157" - "\003\040\103\232\142\266\276\227\314\330\012\026\042\054\060\204" - "\320\142\374\320\370\261\004\001\130\166\307\125\041\337\211\074" - "\315\075\345\235\053\261\074\344\157\133\276\136\111\254\213\363" - "\174\157\173\341\010\260\335\347\234\110\345\252\254\265\140\344" - "\266\007\073\330\103\146\377\150\252\376\031\107\143\276\053\177" - "\307\171\246\353\134\123\352\324\322\262\350\154\157\200\260\271" - "\126\212\112\012\174\077\311\305\255\314\245\276\300\123\255\215" - "\031\365\330\372\155\312\026\235\106\153\331\000\366\051\220\322" - "\104\254\353\146\301\077\046\261\152\337\305\324\015\364\207\342" - "\245\347\045\240\263\362\214\170\171\310\351\230\126\271\167\330" - "\115\372\341\170\356\357\005\306\063\015\021\002\365\220\250\321" - "\057\277\057\312\265\275\321\243\066\317\265\337\363\055\244\336" - "\146\241\003\035\177\105\212\302\103\024\301\301\156\332\256\011" - "\036\024\324\142\036\325\010\157\174\221\213\030\074\316\256\152" - "\351\310\066\151\115\244\133\240\044\176\313\333\365\172\001\325" - "\115\034\035\350\223\342\006\161\137\160\355\370\350\116\165\235" - "\060\145\017\216\120\256\372\305\257\127\347\300\237\234\163\231" - "\173\351\005\150\266\347\240\166\232\042\254\032\316\251\050\035" - "\211\307\350\067\043\363\250\052\363\124\212\035\056\106\214\206" - "\010\370\053\207\013\203\002\170\110\170\356\313\303\143\017\013" - "\352\173\257\232\245\177\225\130\007\026\263\003\042\275\144\145" - "\124\070\151\171\065\122\076\065\327\303\166\356\276\367\272\261" - "\121\023\304\106\146\362\343\230\214\212\041\041\101\230\015\047" - "\357\036\206\051\307\213\275\216\076\356\376\217\331\363\174\260" - "\140\252\046\005\270\023\237\233\001\123\144\234\071\160\270\072" - "\273\130\047\052\007\363\255\135\142\047\106\325\124\035\260\132" - "\030\361\327\204\357\127\131\140\071\020\172\353\077\155\160\362" - "\200\152\234\234\246\312\017\262\230\061\125\113\252\323\131\074" - "\361\245\020\153\035\024\216\232\373\201\055\013\166\027\353\200" - "\154\075\206\174\111\045\302\225\317\114\265\055\376\141\167\257" - "\355\136\037\172\305\065\247\152\220\376\136\067\334\076\264\243" - "\017\070\160\014\321\025\267\301\277\221\320\235\167\354\042\014" - "\002\232\302\236\013\023\266\325\357\253\112\276\317\327\126\370" - "\066\350\337\170\377\144\202\273\243\214\174\316\026\156\021\346" - "\133\070\175\053\133\364\320\063\331\267\061\231\125\040\170\261" - "\202\053\117\043\350\362\175\136\326\040\362\055\250\017\255\244" - "\041\257\224\067\145\041\307\015\356\246\155\066\237\103\360\272" - "\144\015\254\313\253\067\365\126\224\034\267\020\043\213\034\100" - "\227\235\202\013\227\324\167\373\036\360\001\010\267\265\257\165" - "\073\272\213\352\062\115\147\075\061\130\054\114\123\104\310\305" - "\375\061\210\054\150\026\323\075\325\020\315\342\322\311\004\236" - "\360\004\102\033\257\316\165\327\354\215\021\046\022\261\065\040" - "\027\265\170\004\136\210\375\231\073\323\377\217\132\234\204\114" - "\036\161\357\176\151\061\172\156\236\031\315\067\132\065\162\023" - "\240\333\210\347\264\220\227\162\275\011\250\156\311\101\330\231" - "\352\215\104\007\370\217\276\216\324\352\303\035\202\151\045\302" - "\271\376\261\041\023\076\102\341\077\041\054\321\251\346\111\323" - "\336\307\233\023\342\331\037\366\273\342\147\071\355\210\060\023" - "\250\354\357\310\044\111\150\257\303\377\235\153\275\325\001\267" - "\100\351\040\001\265\256\206\005\336\146\033\033\256\073\144\036" - "\111\266\326\376\143\371\224\340\051\250\130\366\345\145\310\351" - "\235\371\071\171\354\046\177\100\033\136\047\077\124\126\343\215" - "\120\377\162\312\371\361\352\105\167\040\144\051\066\302\224\233" - "\235\354\161\212\122\071\215\037\275\363\264\305\233\344\120\354" - "\355\003\306\074\104\075\002\133\231\344\250\243\006\277\336\014" - "\214\074\042\374\312\121\142\100\355\330\153\343\163\363\336\306" - "\102\072\140\325\156\312\126\354\070\267\272\347\354\052\240\274" - "\167\310\260\174\077\117\033\202\304\117\167\075\342\217\340\121" - "\355\113\141\157\250\262\227\130\322\007\370\116\323\317\376\125" - "\014\026\343\116\100\267\133\106\274\313\120\141\015\173\017\344" - "\364\150\140\060\256\060\340\145\334\370\043\063\223\067\250\021" - "\203\323\200\011\370\377\015\132\357\373\327\043\074\162\176\210" - "\201\242\324\273\057\143\041\272\340\325\275\073\250\274\260\267" - "\266\034\102\173\164\054\205\317\274\276\031\104\364\060\030\315" - "\006\337\112\075\050\262\216\244\261\271\305\034\054\072\361\332" - "\044\305\032\365\323\053\045\343\270\332\170\233\354\360\305\001" - "\034\030\347\024\201\156\052\063\050\360\117\124\052\101\057\117" - "\006\111\104\332\164\151\275\055\103\065\311\057\046\217\061\103" - "\250\030\130\052\207\203\135\257\163\255\003\235\356\063\354\365" - "\174\061\317\361\232\215\036\335\303\350\015\351\167\076\055\037" - "\126\205\111\335\010\247\215\174\124\221\032\103\304\006\071\101" - "\070\011\062\322\226\121\260\131\071\275\103\261\373\160\320\122" - "\366\032\060\377\301\275\173\026\116\225\132\022\234\223\124\324" - "\234\206\247\063\327\127\214\021\024\320\302\020\101\223\142\067" - "\255\223\067\157\120\262\206\237\110\340\262\345\163\006\272\020" - "\214\141\103\144\271\317\166\315\240\071\336\341\314\101\030\172" - "\324\120\352\044\002\160\304\113\120\166\061\304\174\353\324\011" - "\115\027\156\006\347\344\324\207\036\262\151\353\363\202\145\307" - "\322\120\354\325\300\260\040\021\047\121\325\243\075\252\255\213" - "\302\033\222\251\000\146\061\036\031\233\011\015\035\157\325\357" - "\277\301\304\200\162\345\222\231\067\150\075\164\022\352\000\324" - "\006\222\176\006\370\260\045\022\113\056\037\150\236\364\130\135" - "\266\034\336\051\001\160\303\071\330\000\255\353\352\256\300\360" - "\100\076\367\071\357\034\113\073\113\153\244\351\137\374\107\026" - "\031\045\100\033\226\003\124\157\003\002\132\356\260\032\337\360" - "\131\326\051\111\363\164\204\076\337\050\050\077\045\157\126\076" - "\225\226\131\053\231\255\233\235\257\365\213\137\020\153\120\152" - "\102\171\264\065\356\070\164\316\141\234\016\206\014\144\304\241" - "\372\036\315\224\314\150\061\173\136\275\333\157\050\053\332\152" - "\245\216\240\223\306\024\141\050\261\160\256\275\324\163\137\317" - "\221\054\144\135\225\225" -#define tst2_z 19 -#define tst2 ((&data[5306])) - "\265\144\173\340\047\341\122\320\110\115\200\076\137\325\341\252" - "\325\037\315\036\254\145\001\076" +#define chk2 ((&data[1])) + "\342\005\373\111\335\073\141\006\201\311\051\040\334\334\023\267" + "\255\120\040\225\213" #define pswd_z 256 -#define pswd ((&data[5359])) - "\207\031\223\234\173\273\115\353\152\013\300\335\152\217\157\227" - "\364\315\055\212\247\041\335\134\205\131\074\303\100\302\220\307" - "\333\253\021\164\240\271\210\314\327\076\265\020\347\054\237\241" - "\122\003\342\153\271\347\320\014\066\230\235\031\343\067\023\173" - "\342\045\357\202\337\170\117\266\266\005\307\236\061\147\077\203" - "\152\042\357\043\011\277\057\100\130\315\132\073\004\156\267\347" - "\223\246\152\163\036\271\052\324\276\361\162\357\130\262\163\303" - "\324\142\346\336\042\026\036\172\344\171\266\350\347\155\317\173" - "\023\071\357\061\363\031\006\261\013\171\241\144\053\024\047\377" - "\167\016\336\231\044\375\023\010\166\312\361\136\067\301\331\113" - "\372\311\175\356\342\204\240\355\375\101\122\050\126\171\050\316" - "\207\006\147\254\004\173\265\172\105\246\330\175\147\262\311\142" - "\173\106\120\136\312\360\114\307\062\236\360\211\027\031\127\237" - "\040\277\113\044\072\001\236\177\247\167\375\017\052\306\161\245" - "\015\302\004\327\263\120\237\345\356\220\157\006\251\306\246\311" - "\205\362\355\300\363\214\077\232\003\075\251\055\003\033\323\020" - "\335\330\350\220\050\207\166\027\027\345\036\301\254\304\212\062" - "\266\170\362\251\004\062\104\007\157\356\065\163\012\011\204\350" - "\341\044\143\127\337\261\102\112\274\002\050\047\222\227\276\206" - "\144\354\020\013\015\356\150\223\107\244\127\207\147\347\117\103" - "\013\262\232\353\144\334\065\040\337\135\110\162\365\007\370\132" - "\363\011\146\000" -#define msg1_z 65 -#define msg1 ((&data[5679])) - "\077\163\352\307\332\322\026\035\336\311\270\312\055\270\037\230" - "\015\345\026\203\105\104\340\373\107\153\076\255\231\017\343\060" - "\277\215\275\115\260\062\045\246\101\261\234\350\004\076\375\103" - "\372\037\145\324\272\362\154\016\075\314\135\122\107\331\260\254" - "\356\150\373\311\211\214\226\362\015\272\243\335\023\330\225\000" - "\116\164\136\226\346\123\235" -#define date_z 1 -#define date ((&data[5753])) - "\005" -#define shll_z 10 -#define shll ((&data[5754])) - "\301\277\330\153\314\203\276\143\224\247\341" -#define inlo_z 3 -#define inlo ((&data[5765])) - "\304\147\226" -#define xecc_z 15 -#define xecc ((&data[5768])) - "\114\033\061\316\215\271\217\321\047\047\044\264\376\150\320\061" - "\343\377" +#define pswd ((&data[83])) + "\316\051\347\240\015\337\062\046\173\330\300\262\273\020\237\377" + "\337\020\212\172\216\340\152\205\034\265\150\247\261\136\177\200" + "\210\146\040\225\106\123\274\301\053\175\164\347\216\024\347\155" + "\044\162\350\262\122\122\070\157\007\241\026\271\377\225\314\221" + "\004\312\167\334\020\007\157\070\266\137\243\254\177\374\066\265" + "\371\162\126\232\221\210\327\161\015\204\345\234\206\262\055\213" + "\174\245\147\214\254\327\304\143\067\147\020\266\144\106\154\136" + "\270\303\370\111\113\320\272\130\124\240\365\333\122\043\146\316" + "\310\316\133\165\246\037\330\335\207\351\224\354\057\000\112\347" + "\303\102\061\017\022\353\147\147\214\135\102\336\200\251\255\111" + "\170\010\277\036\050\230\373\260\201\217\234\260\220\346\230\123" + "\051\311\142\074\265\312\243\101\047\346\040\250\220\315\362\010" + "\326\261\046\377\112\042\257\313\261\113\174\101\062\025\225\133" + "\337\370\230\224\303\074\326\353\042\367\223\263\305\205\273\233" + "\067\342\232\201\004\111\115\266\225\312\370\307\337\216\043\277" + "\207\273\124\112\367\052\065\032\041\310\315\346\116\211\202\206" + "\154\035\010\161\147\125\050\374\040\040\304\000\257\350\277\066" + "\243\023\200\233\076\265\265\140\176\203\107\315\015\311\123\171" + "\347\133\353\116\261\023\113\321\063\020\322\343\370\221\031\233" + "\245\232\067\343\117\354\103\316\160\213\233\175\125\357\071\210" + "\374\132\036\102\255\332\004\331\130\171\301\346\215\250\123\261" + "\033\073\144\155\216\234\334\226\075\363\117\075\211\210\305\206" + "\342\344\310\220\276\315\152\027\106\053\375\323\323\121\205\357" + "\215\351\134\033" +#define tst1_z 22 +#define tst1 ((&data[394])) + "\304\310\116\110\107\170\260\276\276\226\077\272\345\350\110\333" + "\144\234\375\111\166\161\111\055\000\001\266" #define chk1_z 22 -#define chk1 ((&data[5790])) - "\007\213\365\234\122\307\307\224\367\036\361\235\133\265\055\163" - "\264\264\335\201\031\237\221\217\261\002\213\104\021\351" +#define chk1 ((&data[424])) + "\154\253\005\374\051\123\122\300\352\313\342\102\130\264\336\206" + "\031\346\160\230\245\173\321\311\123\011\152" +#define text_z 4153 +#define text ((&data[863])) + "\031\221\177\354\145\320\162\124\135\134\261\171\342\353\052\246" + "\030\053\250\316\265\157\013\041\033\021\035\205\344\204\007\375" + "\026\206\352\173\126\134\320\264\270\202\055\233\155\130\102\205" + "\204\352\124\071\132\140\132\165\161\170\373\125\374\002\122\023" + "\210\074\217\337\231\137\224\122\342\302\356\117\032\060\325\237" + "\033\052\330\165\212\063\352\373\253\345\121\250\350\243\273\160" + "\340\112\120\172\252\345\314\214\247\272\334\301\353\262\140\006" + "\334\071\174\146\154\146\142\030\114\263\300\064\127\174\245\070" + "\307\366\262\161\333\177\376\202\072\333\104\046\215\245\054\152" + "\336\251\321\113\020\064\143\134\350\044\221\077\241\067\170\150" + "\055\053\332\011\252\330\214\345\264\320\013\102\166\070\254\124" + "\341\176\237\361\262\003\116\232\047\337\332\310\027\123\061\105" + "\176\013\116\051\343\332\016\227\253\032\332\041\123\206\166\064" + "\004\026\046\267\031\164\121\101\124\054\011\154\177\072\261\375" + "\105\377\046\051\332\065\301\206\120\233\247\243\042\036\330\047" + "\064\377\336\115\164\060\216\310\134\230\064\333\323\346\331\031" + "\346\000\103\300\066\004\107\206\240\357\052\302\015\003\351\101" + "\002\307\216\166\370\035\077\124\266\164\060\211\132\011\243\100" + "\011\346\001\077\352\110\306\212\067\360\115\104\364\066\206\366" + "\376\025\154\366\062\254\113\350\040\173\162\173\204\025\273\215" + "\373\275\315\346\006\223\161\076\204\276\203\170\364\011\156\363" + "\036\333\352\121\210\065\072\250\260\254\043\064\302\337\302\275" + "\235\217\244\243\043\025\342\247\323\145\040\310\156\217\274\215" + "\153\246\336\363\333\030\234\213\305\300\300\207\240\202\105\075" + "\021\352\341\065\377\303\334\323\050\375\234\227\214\130\045\367" + "\376\003\353\332\034\207\145\342\107\045\151\347\250\257\044\272" + "\200\341\142\227\105\363\261\371\230\133\102\045\273\265\027\300" + "\072\144\016\013\052\053\145\245\034\046\275\030\260\315\000\300" + "\137\076\364\244\065\346\240\245\116\341\254\264\375\335\210\252" + "\052\241\234\077\172\360\350\124\047\306\022\334\000\344\125\272" + "\370\337\145\344\157\147\370\373\143\167\204\300\211\300\313\230" + "\023\173\121\370\227\166\362\110\064\101\334\317\133\207\147\204" + "\351\243\136\074\215\175\306\067\266\226\251\025\254\337\117\023" + "\135\145\310\357\063\250\353\047\114\355\156\051\155\245\173\304" + "\353\011\030\045\322\043\213\131\064\341\210\213\065\140\002\332" + "\253\003\366\060\037\143\310\375\233\121\153\137\230\326\122\045" + "\102\205\374\300\370\003\232\215\355\054\041\075\274\174\147\134" + "\171\107\374\263\333\166\223\326\367\017\112\067\075\375\112\313" + "\010\141\227\362\201\363\023\010\231\217\072\245\056\315\170\271" + "\363\151\155\320\257\031\131\160\133\151\030\365\315\121\072\325" + "\073\064\201\320\211\370\214\150\042\017\356\360\342\123\352\040" + "\100\071\373\000\031\362\262\324\112\035\004\250\167\357\021\374" + "\316\354\127\240\071\315\150\113\326\355\234\266\227\247\266\274" + "\360\037\367\053\171\011\236\262\077\345\220\207\016\003\211\351" + "\177\071\221\334\157\153\324\074\352\024\357\244\053\255\215\112" + "\245\205\315\230\204\360\054\244\207\106\067\012\315\207\104\321" + "\151\324\204\206\206\000\364\326\262\373\064\321\200\207\036\334" + "\270\100\272\323\114\031\031\271\173\051\273\216\032\344\033\100" + "\134\251\314\360\345\352\122\042\251\374\135\301\325\350\265\057" + "\272\020\222\325\213\101\346\370\030\055\311\030\353\315\123\024" + "\334\341\265\113\100\002\347\112\277\221\142\110\150\177\066\210" + "\104\076\335\231\304\001\246\326\333\174\272\343\004\152\265\076" + "\304\201\150\360\222\212\160\135\364\065\322\023\012\057\355\161" + "\324\371\312\317\137\301\036\025\021\140\336\257\012\120\121\250" + "\103\073\362\327\373\154\223\377\104\121\243\146\130\054\260\370" + "\170\033\203\072\125\227\116\357\337\255\146\324\173\255\124\370" + "\333\171\017\301\176\105\006\351\032\006\102\162\040\350\026\215" + "\367\370\267\214\045\126\024\063\173\202\127\350\050\103\013\321" + "\302\264\341\132\011\074\213\263\155\020\017\300\325\333\060\327" + "\065\170\267\334\273\361\323\307\175\315\164\316\002\136\140\114" + "\247\204\352\300\063\302\033\301\217\176\022\217\154\042\054\100" + "\052\223\272\232\227\037\306\352\041\070\352\136\303\054\145\234" + "\215\232\376\116\251\071\101\011\165\256\324\134\110\030\216\140" + "\020\245\112\247\073\204\002\216\375\056\316\030\017\034\011\351" + "\265\334\173\213\253\347\222\056\356\371\342\014\170\147\134\002" + "\077\202\142\011\107\076\300\072\175\134\355\100\040\137\101\063" + "\041\160\150\201\311\064\375\154\313\340\174\113\101\215\306\375" + "\063\122\351\244\121\311\232\351\066\376\323\033\027\125\032\060" + "\140\254\316\245\116\177\347\145\261\117\303\366\147\051\167\005" + "\317\000\122\227\164\037\256\377\204\042\263\262\147\301\017\325" + "\165\034\072\126\111\106\251\304\224\056\156\137\160\264\274\345" + "\174\215\217\241\113\235\136\324\206\131\111\374\327\010\345\310" + "\171\110\134\303\220\162\040\305\160\375\036\176\225\203\175\177" + "\133\205\042\324\104\126\127\375\101\222\027\220\220\370\305\172" + "\003\073\056\160\362\255\134\062\016\245\272\122\264\020\106\203" + "\232\363\136\365\243\150\352\161\277\112\101\155\110\103\345\316" + "\333\172\026\307\255\164\240\111\041\155\263\017\353\160\245\057" + "\217\002\211\316\216\240\174\103\246\157\302\032\027\257\154\151" + "\370\364\107\271\371\173\246\052\016\353\110\307\001\355\274\363" + "\330\132\202\154\142\146\231\255\215\211\335\320\247\332\363\317" + "\207\151\116\245\313\052\054\050\214\270\110\350\144\227\301\262" + "\217\006\331\320\242\356\124\114\270\033\213\034\003\241\154\256" + "\063\060\326\130\312\333\271\262\107\315\372\113\247\313\202\306" + "\331\255\145\045\330\244\316\037\105\300\137\347\004\043\247\025" + "\057\230\266\033\260\067\172\302\311\142\201\265\013\151\125\274" + "\240\375\347\121\241\101\100\021\321\355\114\025\113\200\143\217" + "\232\363\036\320\263\325\361\046\217\114\243\153\062\011\253\005" + "\151\217\310\310\236\022\352\200\271\255\221\014\075\170\011\244" + "\002\272\017\126\054\030\223\161\371\274\275\203\052\276\074\367" + "\162\121\331\156\167\223\164\144\302\306\221\256\251\071\256\264" + "\331\007\231\177\241\032\202\347\021\210\036\277\043\237\366\257" + "\226\354\002\335\303\355\161\027\256\346\234\263\303\212\215\141" + "\271\041\204\124\055\133\104\103\177\265\373\177\010\122\251\067" + "\310\223\375\076\352\041\246\150\155\362\373\300\377\157\005\244" + "\256\147\002\207\012\372\054\072\027\177\235\270\273\302\157\356" + "\264\071\316\371\251\256\026\303\232\223\054\306\352\346\121\170" + "\243\046\076\137\116\037\320\272\274\377\366\013\371\204\011\164" + "\364\200\240\356\272\250\157\122\265\120\327\105\022\265\127\226" + "\233\006\040\134\307\006\051\163\333\006\322\215\146\306\014\210" + "\145\241\137\001\270\256\374\256\002\152\277\345\053\362\034\131" + "\117\344\354\213\172\072\206\303\137\235\042\045\224\335\126\357" + "\220\260\334\103\130\300\167\251\214\374\173\270\066\260\350\056" + "\070\357\045\145\324\105\074\246\123\350\241\105\224\004\132\244" + "\231\166\031\004\077\256\242\110\242\311\232\161\235\114\351\006" + "\102\030\063\101\304\360\175\003\165\025\071\237\234\300\357\234" + "\033\220\250\051\326\132\313\065\301\301\255\001\213\173\002\371" + "\372\110\017\106\165\070\203\032\140\311\156\332\376\065\070\002" + "\052\254\362\167\277\172\114\310\116\314\067\374\222\137\307\060" + "\200\076\204\055\270\165\306\342\030\024\055\161\337\372\230\377" + "\047\105\272\246\240\302\123\022\317\067\000\120\002\120\264\054" + "\215\032\374\316\110\362\354\313\302\322\146\121\123\037\157\316" + "\350\105\363\271\307\241\067\137\254\032\031\227\375\143\240\341" + "\314\053\142\074\222\131\370\115\063\227\305\327\204\130\036\064" + "\024\345\102\156\376\110\252\146\117\100\016\147\141\270\124\305" + "\035\371\372\064\213\013\053\370\126\272\213\263\223\146\274\351" + "\330\120\057\140\003\241\226\061\137\213\175\152\123\372\027\013" + "\061\244\162\154\155\210\051\032\200\201\135\224\331\070\243\060" + "\377\142\262\045\174\076\120\302\223\177\252\350\256\260\160\062" + "\005\204\207\142\075\276\212\330\216\372\055\305\367\345\300\175" + "\227\111\230\066\033\324\377\014\164\360\062\226\234\070\323\113" + "\132\352\212\332\250\336\215\174\260\137\327\275\250\004\151\266" + "\044\355\112\053\162\160\055\077\010\110\352\166\222\260\157\115" + "\153\153\057\234\373\343\034\352\203\234\166\206\075\345\042\277" + "\322\034\061\135\026\345\357\216\010\202\043\125\014\024\306\330" + "\217\021\321\310\251\313\114\321\106\026\067\337\022\303\260\075" + "\133\155\136\374\323\304\313\076\200\003\326\332\250\337\316\250" + "\030\323\104\134\353\344\106\155\157\052\244\056\364\231\222\065" + "\075\350\044\232\131\023\342\377\013\305\205\266\112\160\117\170" + "\130\364\001\165\021\054\350\247\243\315\170\147\126\262\227\041" + "\323\225\102\215\131\043\332\260\122\012\226\107\142\177\041\147" + "\012\136\307\116\333\034\365\202\234\152\213\130\215\333\376\125" + "\114\206\021\330\013\064\035\264\042\040\100\334\310\160\062\307" + "\343\200\062\333\362\100\036\205\346\260\177\046\005\305\037\200" + "\100\163\315\136\114\252\013\025\024\013\040\172\106\325\311\155" + "\374\214\012\142\314\245\253\222\040\346\103\030\064\304\307\253" + "\021\022\261\301\015\213\320\263\170\277\322\236\276\160\066\062" + "\343\030\060\115\302\056\242\303\063\220\276\026\024\136\076\216" + "\355\036\144\305\241\217\023\355\044\162\347\001\123\206\171\202" + "\301\167\071\337\350\356\145\367\340\106\141\376\250\013\336\222" + "\064\220\177\120\234\344\004\357\177\142\045\372\332\015\077\040" + "\030\262\357\004\372\104\312\053\250\221\171\251\231\334\004\076" + "\013\374\176\065\070\124\046\347\204\025\231\341\370\031\160\064" + "\167\137\057\114\106\213\116\132\153\376\051\321\051\340\106\056" + "\273\072\260\230\266\135\032\120\046\327\061\137\122\344\001\144" + "\265\141\377\145\261\114\200\044\336\313\145\110\032\135\313\364" + "\012\233\345\256\073\247\050\276\242\163\143\132\173\207\352\035" + "\032\360\236\307\060\227\145\052\167\314\047\335\316\074\377\047" + "\127\034\040\220\066\055\014\323\134\216\006\006\226\356\174\236" + "\342\106\072\003\102\352\237\015\312\042\234\112\214\372\267\344" + "\205\007\223\220\075\147\307\050\226\202\215\362\032\210\375\110" + "\137\133\211\001\365\335\346\027\375\115\131\064\053\007\062\244" + "\145\322\006\344\360\323\027\074\203\352\245\163\333\004\066\041" + "\371\364\230\242\010\065\373\057\175\065\102\241\354\220\160\056" + "\061\005\147\000\254\253\301\015\220\143\324\205\342\136\277\015" + "\007\006\030\057\235\070\053\167\271\347\314\252\261\240\035\074" + "\225\333\261\025\351\347\161\270\164\353\156\153\042\234\211\206" + "\376\325\157\167\112\302\360\262\200\170\350\335\105\150\213\032" + "\121\376\104\055\176\045\123\111\335\156\131\010\245\227\062\353" + "\033\163\133\052\307\146\244\064\240\024\016\357\017\246\146\022" + "\115\314\132\017\264\144\015\350\315\273\132\222\111\016\100\223" + "\370\327\300\131\357\076\075\124\327\326\213\165\025\225\076\242" + "\050\211\023\302\207\262\361\325\004\210\131\337\104\006\321\154" + "\111\103\006\104\046\255\011\327\376\047\147\052\074\146\244\353" + "\101\100\050\136\233\127\314\336\133\056\327\375\337\365\353\174" + "\330\160\326\073\242\051\223\351\252\063\344\124\164\176\376\033" + "\310\006\161\166\010\141\132\360\133\153\220\272\351\264\371\157" + "\346\340\030\203\043\240\222\050\255\165\226\160\241\104\020\240" + "\326\227\265\207\301\157\200\240\004\136\150\024\357\201\344\025" + "\214\031\324\170\111\330\023\126\260\101\022\364\244\145\101\137" + "\130\170\361\344\255\063\001\336\021\226\026\326\164\117\035\051" + "\276\312\077\075\240\242\126\376\157\352\136\003\326\221\263\011" + "\256\145\016\014\115\340\157\133\067\274\224\103\241\351\066\110" + "\306\120\121\173\015\202\130\155\204\366\025\173\043\132\104\037" + "\361\333\064\255\026\237\067\224\034\053\217\232\325\056\174\074" + "\157\033\317\231\126\167\055\264\170\334\307\354\163\241\253\014" + "\023\050\077\033\311\366\123\142\045\213\227\047\150\006\253\056" + "\006\031\125\012\110\001\301\314\102\034\076\224\233\374\060\153" + "\141\327\336\327\160\365\002\057\342\304\237\173\170\057\315\332" + "\102\345\157\063\001\140\171\065\333\214\142\025\154\173\115\134" + "\313\104\241\020\247\013\024\042\244\334\234\205\220\133\331\113" + "\331\016\170\000\271\132\064\170\355\060\311\041\150\250\207\236" + "\223\166\021\230\362\141\027\131\261\203\266\003\013\116\365\062" + "\176\076\310\006\300\233\306\234\244\264\230\243\135\045\160\260" + "\062\021\072\045\036\055\240\300\307\202\253\172\314\306\061\363" + "\243\265\136\377\342\050\175\374\123\016\134\153\006\030\076\001" + "\170\063\373\274\360\237\101\174\077\303\317\331\070\027\260\234" + "\272\270\326\112\141\303\020\353\075\254\130\073\345\146\277\034" + "\031\372\344\336\171\025\127\056\332\242\222\156\133\013\370\247" + "\252\015\240\336\125\155\044\301\107\307\041\221\110\234\077\213" + "\336\154\225\053\241\306\325\312\264\252\212\024\072\320\026\262" + "\247\104\131\145\060\347\311\205\117\117\041\117\012\044\137\166" + "\037\324\017\367\312\206\143\145\065\123\175\167\042\232\161\263" + "\370\005\110\043\161\265\220\323\133\253\305\261\266\227\357\345" + "\242\210\320\175\343\371\132\032\376\113\135\062\331\345\301\121" + "\061\216\235\072\015\145\340\041\345\332\266\031\041\325\021\332" + "\113\357\004\271\211\164\126\370\105\212\021\220\066\113\257\104" + "\307\345\250\230\035\315\376\000\341\107\314\372\273\172\306\317" + "\353\171\314\265\224\215\257\021\373\107\243\256\222\307\366\164" + "\322\071\376\211\124\002\235\127\363\313\150\316\322\231\141\032" + "\252\153\205\143\325\124\215\062\117\103\233\001\117\023\041\170" + "\305\034\163\232\035\111\341\134\246\103\222\000\121\225\164\043" + "\034\260\111\110\132\325\356\370\007\245\262\174\066\141\135\062" + "\327\353\271\114\370\045\372\333\124\101\062\074\057\046\315\152" + "\052\342\170\073\334\105\121\367\334\312\117\156\312\071\327\223" + "\331\130\000\171\317\112\045\310\136\062\021\224\146\332\234\133" + "\334\233\255\342\037\010\076\050\313\165\046\143\361\216\001\050" + "\071\122\270\070\351\164\301\132\204\036\002\013\244\344\011\237" + "\331\374\106\354\165\101\025\221\147\322\114\220\306\126\121\104" + "\276\316\375\007\053\212\342\143\136\352\256\150\223\303\311\214" + "\166\302\316\165\000\273\145\371\275\052\310\053\200\375\064\144" + "\203\374\374\023\211\020\260\314\161\142\026\014\321\154\320\265" + "\004\210\216\336\237\307\365\350\276\274\364\250\062\154\065\116" + "\010\213\146\325\267\253\311\221\201\234\353\340\012\230\145\377" + "\346\317\277\016\335\103\332\342\127\345\133\362\237\055\227\130" + "\041\321\156\275\354\034\231\055\316\363\015\223\171\162\167\023" + "\175\140\323\051\141\140\115\156\111\040\217\344\061\070\241\167" + "\232\051\324\362\147\171\362\255\032\377\304\164\007\127\011\055" + "\103\041\033\372\250\161\227\130\056\332\264\021\327\056\021\005" + "\315\132\034\332\105\323\277\040\250\057\175\324\162\021\107\046" + "\330\156\370\246\023\233\267\040\341\142\075\060\370\302\131\011" + "\042\062\112\207\336\056\006\121\310\153\277\277\013\365\336\100" + "\304\157\255\376\145\247\205\034\134\247\120\305\012\267\007\220" + "\050\136\336\015\207\372\274\040\315\053\167\305\173\252\271\154" + "\036\310\207\043\066\014\256\065\221\211\361\245\002\341\163\030" + "\166\116\350\272\152\341\022\141\327\346\072\001\153\364\311\162" + "\323\111\303\316\063\156\121\270\321\226\374\202\322\013\071\144" + "\035\007\227\214\132\222\040\270\342\140\374\325\034\206\356\220" + "\215\205\156\300\074\134\042\372\146\021\137\256\154\046\377\167" + "\063\100\042\133\331\101\071\326\355\044\005\151\214\130\242\342" + "\213\267\361\176\350\310\054\357\266\072\036\344\200\357\063\173" + "\216\015\131\221\222\237\310\207\333\213\131\162\363\133\154\027" + "\170\127\212\304\121\177\112\150\302\252\143\104\342\076\131\165" + "\300\337\265\215\073\143\160\325\104\146\203\154\327\353\242\343" + "\330\132\255\350\107\051\311\061\011\167\124\037\366\365\214\363" + "\072\030\121\366\324\002\067\336\201\353\071\051\065\112\263\162" + "\353\240\017\117\306\020\047\076\205\050\274\342\032\133\304\205" + "\113\347\050\240\261\337\210\050\202\140\157\240\007\360\367\165" + "\132\311\145\113\345\342\300\140\024\167\162\351\035\316\260\005" + "\230\023\337\073\222\100\012\166\142\340\357\160\322\047\140\353" + "\041\124\103\353\037\147\256\275\044\172\302\143\247\207\123\156" + "\272\027\234\070\153\164\207\260\223\041\164\363\321\317\200\007" + "\204\230\324\114\204\324\036\324\017\174\106\030\237\175\072\274" + "\213\205\002\220\073\303\062\033\153\175\154\112\116\373\111\012" + "\265\363\327\334\155\103\227\173\216\056\025\023\212\135\041\306" + "\004\322\254\056\246\113\172\063\357\305\104\125\302\201\113\353" + "\265\206\301\143\114\340\163\114\145\241\262\354\201\013\100\071" + "\246\364\226\336\275\025\010\002\151\321\375\263\023\135\357\211" + "\375\057\216\054\023\271\213\376\372\227\246\203\117\266\325\061" + "\027\324\367\272\200\210\002\343\232\222\227\046\300\201\207\300" + "\226\337\265\361\212\251\106\062\020\342\014\020\311\206\326\006" + "\255\117\227\340\001\263\145\377\241\070\126\144\214\141\213\060" + "\376\256\247\032\040\042\352\317\277\144\302\046\114\057\035\267" + "\356\175\234\061\044\110\251\347\003\172\002\123\361\113\173\023" + "\236\103\376\012\010\236\112\122\161\334\261\331\221\155\234\313" + "\110\162\216\171\052\005\174\322\311\306\146\320\177\205\024\133" + "\373\162\133\121\234\313\202\172\220\304\333\062\357\315\040\253" + "\247\277\254\306\361\173\240\311\116\317\217\124\217\221\000\200" + "\205\046\272\044\346\353\131\305\214\077\356\155\317\017\311\106" + "\024\220\214\244\331\224\200\116\136\066\344\354\134\320\030\122" + "\333\056\300\227\301\262\153\040\125\024\266\333\274\075\157\217" + "\145\047\244\072\042\074\202\007\243\310\336\101\144\371\140\305" + "\171\060\332\126\057\301\021\364\346\330\103\214\230\217\014\353" + "\054\167\111\230\335\343\215\271\363\065\114\224\272\316\245\156" + "\124\016\333\234\017\056\025\230\150\100\112\374\006\267\010\152" + "\236\202\204\245\217\310\063\061\205\230\256\315\050\151\077\020" + "\236\316\177\101\065\357\310\102\170\171\055\367\042\104\316\102" + "\042\334\371\252\041\312\065\036\164\113\120\273\075\020\340\271" + "\171\034\001\122\336\302\355\230\220\167\122\264\304\023\156\273" + "\140\134\104\341\220\304\132\354\017\362\054\302\274\156\154\024" + "\207\263\350\012\120\112\223\124\236\303\041\250\343\136\070\351" + "\074\013\240\050\244\222\103\130\102\337\274\172\370\102\025\164" + "\115\131\105\117\157\326\167\033\356\320\245\247\317\060\154\102" + "\135\342\233\316\173\220\171\107\166\320\032\345\361\040\361\152" + "\025\246\257\224\353\332\116\217\163\243\125\245\143\030\240\151" + "\224\074\326\372\022\053\146\336\176\246\124\174\246\150\350\060" + "\302\065\330\322\065\374\030\015\256\114\005\256\136\360\110\267" + "\061\313\223\321\174\175\305\007\015\347\036\153\306\335\373\344" + "\373\042\055\074\142\206\324\214\016\145\316\314\075\331\136\015" + "\031\324\171\047\226\320\202\356\136\346\232\237\227\361\135\002" + "\233\251\272\223\205\164\361\045\232\000\367\363\137\033\360\034" + "\206\031\147\152\330\134\016\123\305\230\166\247\332\051\144\212" + "\132\032\273\042\173\210\140\130\027\344\247\160\265\333\135\244" + "\340\033\062\272\134\072\367\064\336\216\240\367\070\041\034\304" + "\126\264\165\324\100\132\034\317\073\272\054\261\226\372\026\326" + "\116\041\000\060\137\356\272\122\002\136\163\353\160\006\060\105" + "\255\063\276\126\277\140\177\362\116\231\006\357\231\312\314\154" + "\363\311\011\212\126\141\257\115\140\263\070\072\320\300\240\262" + "\007\306\034\356\157\313\023\051\145\032\030\376\344\345\153\327" + "\256\164\142\005\326\022\122\067\306\213\162\226\113\022\110\123" + "\331\145\101\110\061\125\161\226\157\212\225\124\157\001\053\036" + "\165\215\043\114\240\166\203\146\002\365\374\116\010\105\241\342" + "\252\343\052\334\071\234\162\251\047\010\375\226\011\050\265\177" + "\266\331\313\126\117\117\275\122\105\272\240\115\377\102\057\252" + "\046\132\206\137\366\371\010\035\001\005\264\012\056\152\212\344" + "\103\125\073\223\245\370\346\352\262\206\070\262\311\150\135\357" + "\302\343\117\271\335\127\327\336\135\214\351\213\366\163\160\072" + "\311\254\315\157\244\263\131\127\072\221\012\004\372\147\363\274" + "\113\102\165\050\232\115\006\367\331\360\203\317\143\363\011\055" + "\237\327\234\104\213\365\234\306\207\247\312\201\016\275\076\131" + "\000\264\202\233\001\211\223\332\171\026\251\335\012\263\012\252" + "\213\246\357\027\234\214\335\044\063\247\246\101\145\345\233\146" + "\231\035\001\232\246\225\164\040\254\036\375\267\322\007\142\136" + "\256\121\165\113\336\122\157\021\371\026\123\137\373\357\305\225" + "\014\307\057\263\134\244\324\011\303\321\300\225\331\042\363\207" + "\164\151\323\122\273\103\143\265\131\266\024\125\245\332\352\262" + "\242\032\146\377\276\073\010\201\014\311\027\346\353\013\155\140" + "\164\101\262\057\204\026\345\336\315\371\063\163\324\036\046\166" + "\070\214\165\366\307\176\170\324\107\217\272\063\232\050\223\016" + "\151\105\076\355\134\043\313\051\035\377\234\361\035\302\150\126" + "\117\336\114\027\134\304\353\244\124\246\327\356\317\153\375\070" + "\261\073\046\015\137\362\066\174\361\322\156\017\224\326\145\344" + "\265\262\373\022\167\347\266\313\216\216\272\135\371\267\225\253" + "\363\274\270\122\256\356\316\240\301\075\260\126\023\025\072\311" + "\310\065\333\077\035\222\013\253\040\305\010\032\175\236\305\160" + "\132\176\303\011\154\222\252\056\317\132\204\342\160\276\254\070" + "\364\207\167\022\031\202\275\072\110\306\125\305\144\033\066\277" + "\231\371\311\006\213\163\064\132\315\270\075\075\167\351\166\154" + "\161\355\176\212\160\073\305\270\001\033\175\146\066\263\045\320" + "\254\356\327\070\141\013\222" +#define date_z 1 +#define date ((&data[5542])) + "\264" +#define lsto_z 1 +#define lsto ((&data[5543])) + "\104" +#define tst2_z 19 +#define tst2 ((&data[5547])) + "\321\046\265\347\074\006\150\320\275\214\162\144\310\065\200\235" + "\215\266\033\016\220\301" +#define shll_z 10 +#define shll ((&data[5567])) + "\371\146\176\130\231\250\221\376\160\140\133\144" #define msg2_z 19 -#define msg2 ((&data[5820])) - "\167\330\353\010\014\155\370\010\166\042\131\264\126\212\203\337" - "\254\165\330\025\327\143\154\301" +#define msg2 ((&data[5580])) + "\314\053\104\364\252\357\000\370\264\114\071\260\324\260\344\113" + "\175\206\274\356\226\360\235\330" +#define msg1_z 65 +#define msg1 ((&data[5609])) + "\100\200\243\160\104\163\336\045\150\073\101\006\203\053\043\162" + "\076\355\303\164\057\261\064\026\141\277\232\145\030\023\042\075" + "\222\321\246\343\116\210\343\307\237\376\306\255\135\000\150\147" + "\173\143\132\123\253\104\330\365\033\032\230\262\063\153\060\265" + "\365\115\371\132\163\167\267\242\201" +#define inlo_z 3 +#define inlo ((&data[5675])) + "\077\176\251" +#define xecc_z 15 +#define xecc ((&data[5680])) + "\014\324\267\005\140\213\231\031\330\216\273\361\230\144\201\027" + "\115\262" #define rlax_z 1 -#define rlax ((&data[5840])) - "\227" +#define rlax ((&data[5696])) + "\240" #define opts_z 1 -#define opts ((&data[5841])) - "\201"/* End of data[] */; +#define opts ((&data[5697])) + "\044"/* End of data[] */; #define hide_z 4096 #define SETUID 0 /* Define as 1 to call setuid(0) at start of script */ #define DEBUGEXEC 0 /* Define as 1 to debug execvp calls */ diff --git a/infra/portable/THORIUM-PORTABLE b/infra/portable/THORIUM-PORTABLE index 36c0014f88c1e0f69c64a98a2281ffa59fdf275b..2996e9d128dedd75ba7a0d705e6eb3c08c098d6f 100755 GIT binary patch delta 7071 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

@>~t;e>d1?^-}ti!SF*0Lak)S%#XC+c^kcsip+ z^svh&ia|!tPM_i*cH})_)I871xf3D|@?ihC5_+g?G`#!s+;noP9iKE&yu zRzI3_9XN)@Z$SniB}eNeQq(V-Tu+jQ?#9Q2I6#C9s4lIrjmzz5?>srhsPt#W`KNYX zBD{^(`MMnS{oun!57S46Bl&;H>z8!(ro5&6|K*6T1*j#E^ zMAsd%R2w5`?ldW76=XNP{q^sRUfG5$eJ?wTr{;^(ljtKrfKcsp0+x3%V4I(wTcO%z zI}1~_3+t6g2wl@Mv3^I0;yPVcN3Ox*VAQ_Y^VYu1!qYx zQ4H0??DwA2*ejE5N=?b_7uMxJU%qcMF9_3cXduYovvmur08_dhjSl-G1*c3X1y7Jq zVEW1sX8H*LO;I7R@q+CfB({Eb3MyCfsI^Da3-*%9KCvu#IFW{wUGQV2EcuG>IrloH zwAum`w`)UN&6R$;Dp_V%{R==7!a)a_+*evoS2 zBs;;xS%ZH#?BBG+WLii-7$j+__8_uIh68K)8CGv7FojsAn*1A7ZF!f?r)?2!8pU>7 zUO-GiwKd#g(MGGpO7?x%FN6K1T+uq*dsvMFMIW3mlDDYHUli1x7b<5H>@)i1Tw=W$ z5PZjayR1fl5M2E$7k#yi{=oO~9rGM}gA^qNEu~!tK3Tmg!*QB%2{8U4v<)xUwskwB zMR)Co0nA<*-1z9+*^mAzMm#J33`Pjm=UE`oAJ4WFTDW!dO~Q_GmalRJsDuKMa(WiU zEiOztz1ilpSzED>*JdQ6Q{tX&GkMCV{Q4X7 zg47q=c2eR!)oVI%92!jwr2fQr=>5YyWNK@2u)__j-avh=0M`7{PFeWZh;LH}EsHKU zQBp@@sp1fH9+uC%J-lqbpVNM6A(o1KK=a{7=@ytk~!2=VFx#lbtg{BIw(=Tzcc zbF_dwbHc2*ABCnapEFu5e#qDK&9~WLYvZ07$V2<7*QjfTi$|u}JhhPOLaH^d*%>7Nm(O@8O#CSAtatleS)9IB)u?xpq(*d6tvL~5IU zQ#PsQ6BvPHRUvhe?mG74&|4A{-ma|LPM5oxAxu42=k1DeNm6_+r!i|OF2}Croa6{Z ze$sRVF_OE-P%CA51X;nJT&o~UXD=83Wmw?Pa4C9)e3OJiR}0k5_G_!E{#2K4$Wp$O zU@fNA3pGByKqdnr)S$Awi(HY^5(MX+uWeO@@>TWP81A+GRsHen&Ge#S^k&qltCK)) z>7Zk7weA~%1XTD->!T(`33s|QWyCXJc0Xv?{0N0Pb2>vR>LjBpte`Idbd87U4LwBgW<*ZPbEi9 z_3GujLs_lD71}s>0=+%l^P*&l09pw}Co-|$mrf_W5A7&+iN!3#dcn(1&82+DVV=*4 z0)Gm~b!l~4knpsmUi2bHxpL_Z)(Z=JZhF``?|g`K66~x8k@#8hRMU)+W$Nw=AYvv<+?~?BPfm-#7ONTveWLyTFHfP+LC5Th(jfuIGX=gCH!x9=51G* zA&iZ+kGY;kiPX#q32{mlr!8CUiSmV>tLOKx0iqv@o=tp5Fo{Yfnu%>ZNU;bYP_D{) z2_q{hDL_G|W#;bS=1#%R&Qc908-fHf2S=!|qWtGCG;?sPiYSzUR7Fu^WuSinKp#{P JI8u)M{{eD8_#*%S delta 7198 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 gwEumBcM9QF5reT0Dq`pqaFgxss#!A46~=JOBUy diff --git a/infra/portable/THORIUM-PORTABLE.sh b/infra/portable/THORIUM-PORTABLE.sh index e6e1b23c..d46a57bc 100755 --- a/infra/portable/THORIUM-PORTABLE.sh +++ b/infra/portable/THORIUM-PORTABLE.sh @@ -28,9 +28,9 @@ fi # Always use our versions of ffmpeg libs. # This also makes RPMs find the compatibly-named library symlinks. if [[ -n "$LD_LIBRARY_PATH" ]]; then - LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$HERE/lib:$LD_LIBRARY_PATH" else - LD_LIBRARY_PATH="$HERE:$HERE/lib" + LD_LIBRARY_PATH="$HERE/lib" fi export LD_LIBRARY_PATH diff --git a/infra/thor_ver_linux/wrapper-avx2 b/infra/thor_ver_linux/wrapper-avx2 index b0d737d4..0dc8684e 100644 --- a/infra/thor_ver_linux/wrapper-avx2 +++ b/infra/thor_ver_linux/wrapper-avx2 @@ -28,9 +28,9 @@ fi # Always use our versions of ffmpeg libs. # This also makes RPMs find the compatibly-named library symlinks. if [[ -n "$LD_LIBRARY_PATH" ]]; then - LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$HERE/lib:$LD_LIBRARY_PATH" else - LD_LIBRARY_PATH="$HERE:$HERE/lib" + LD_LIBRARY_PATH="$HERE/lib" fi export LD_LIBRARY_PATH diff --git a/infra/thor_ver_linux/wrapper-avx512 b/infra/thor_ver_linux/wrapper-avx512 index 162cf4c9..8b894f7e 100644 --- a/infra/thor_ver_linux/wrapper-avx512 +++ b/infra/thor_ver_linux/wrapper-avx512 @@ -28,9 +28,9 @@ fi # Always use our versions of ffmpeg libs. # This also makes RPMs find the compatibly-named library symlinks. if [[ -n "$LD_LIBRARY_PATH" ]]; then - LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$HERE/lib:$LD_LIBRARY_PATH" else - LD_LIBRARY_PATH="$HERE:$HERE/lib" + LD_LIBRARY_PATH="$HERE/lib" fi export LD_LIBRARY_PATH diff --git a/infra/thor_ver_linux/wrapper-sse2 b/infra/thor_ver_linux/wrapper-sse2 index 62f7afd9..70d9f66c 100644 --- a/infra/thor_ver_linux/wrapper-sse2 +++ b/infra/thor_ver_linux/wrapper-sse2 @@ -28,9 +28,9 @@ fi # Always use our versions of ffmpeg libs. # This also makes RPMs find the compatibly-named library symlinks. if [[ -n "$LD_LIBRARY_PATH" ]]; then - LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$HERE/lib:$LD_LIBRARY_PATH" else - LD_LIBRARY_PATH="$HERE:$HERE/lib" + LD_LIBRARY_PATH="$HERE/lib" fi export LD_LIBRARY_PATH diff --git a/infra/thor_ver_linux/wrapper-sse3 b/infra/thor_ver_linux/wrapper-sse3 index 4d6581a5..c1158257 100644 --- a/infra/thor_ver_linux/wrapper-sse3 +++ b/infra/thor_ver_linux/wrapper-sse3 @@ -28,9 +28,9 @@ fi # Always use our versions of ffmpeg libs. # This also makes RPMs find the compatibly-named library symlinks. if [[ -n "$LD_LIBRARY_PATH" ]]; then - LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$HERE/lib:$LD_LIBRARY_PATH" else - LD_LIBRARY_PATH="$HERE:$HERE/lib" + LD_LIBRARY_PATH="$HERE/lib" fi export LD_LIBRARY_PATH diff --git a/infra/thor_ver_linux/wrapper-sse4 b/infra/thor_ver_linux/wrapper-sse4 index 503df3bf..cfe5ea2e 100644 --- a/infra/thor_ver_linux/wrapper-sse4 +++ b/infra/thor_ver_linux/wrapper-sse4 @@ -28,9 +28,9 @@ fi # Always use our versions of ffmpeg libs. # This also makes RPMs find the compatibly-named library symlinks. if [[ -n "$LD_LIBRARY_PATH" ]]; then - LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$HERE/lib:$LD_LIBRARY_PATH" else - LD_LIBRARY_PATH="$HERE:$HERE/lib" + LD_LIBRARY_PATH="$HERE/lib" fi export LD_LIBRARY_PATH diff --git a/src/build/config/mac/BUILD.gn b/src/build/config/mac/BUILD.gn index b6d5ecc2..f9c13f27 100644 --- a/src/build/config/mac/BUILD.gn +++ b/src/build/config/mac/BUILD.gn @@ -38,8 +38,8 @@ config("compiler") { ldflags = [ "-Wl,-O3", ] + common_mac_flags if (current_cpu == "arm64") { - cflags += [ "-march=armv8.3-a+simd", ] - ldflags += [ "-march=armv8.3-a+simd", ] + cflags += [ "-march=armv8.3-a+simd", "-mtune=apple-m1" ] + ldflags += [ "-march=armv8.3-a+simd", "-mtune=apple-m1" ] } if (current_cpu == "x64") { diff --git a/src/chrome/browser/background/background_mode_manager.cc b/src/chrome/browser/background/background_mode_manager.cc index 09077378..9871511e 100644 --- a/src/chrome/browser/background/background_mode_manager.cc +++ b/src/chrome/browser/background/background_mode_manager.cc @@ -879,7 +879,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( IDR_STATUS_TRAY_ICON); #else - NOTREACHED(); + NOTREACHED_IN_MIGRATION(); return gfx::ImageSkia(); #endif } diff --git a/src/chrome/browser/net/stub_resolver_config_reader.cc b/src/chrome/browser/net/stub_resolver_config_reader.cc index 374eb24f..a38044aa 100644 --- a/src/chrome/browser/net/stub_resolver_config_reader.cc +++ b/src/chrome/browser/net/stub_resolver_config_reader.cc @@ -17,7 +17,6 @@ #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" -#include "base/strings/string_piece.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" @@ -124,43 +123,9 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state, if (set_up_pref_defaults) { local_state_->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled, base::Value(ShouldEnableAsyncDns())); - net::SecureDnsMode default_secure_dns_mode = net::SecureDnsMode::kOff; - std::string default_doh_templates; - if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) { - if (features::kDnsOverHttpsFallbackParam.Get()) { - default_secure_dns_mode = net::SecureDnsMode::kAutomatic; - } else { - default_secure_dns_mode = net::SecureDnsMode::kSecure; - } - default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get(); - } - local_state_->SetDefaultPrefValue( - prefs::kDnsOverHttpsMode, - base::Value(SecureDnsConfig::ModeToString(default_secure_dns_mode))); - local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsTemplates, - base::Value(default_doh_templates)); - - // If the user has explicitly enabled or disabled the DoH experiment in - // chrome://flags and the DoH UI setting is not visible, store that choice - // in the user prefs so that it can be persisted after the experiment ends. - // Also make sure to remove the stored prefs value if the user has changed - // their chrome://flags selection to the default. - if (!features::kDnsOverHttpsShowUiParam.Get()) { - flags_ui::PrefServiceFlagsStorage flags_storage(local_state_); - std::set entries = flags_storage.GetFlags(); - if (entries.count("dns-over-https@1")) { - // The user has "Enabled" selected. - local_state_->SetString(prefs::kDnsOverHttpsMode, - SecureDnsConfig::kModeSecure); - } else if (entries.count("dns-over-https@2")) { - // The user has "Disabled" selected. - local_state_->SetString(prefs::kDnsOverHttpsMode, - SecureDnsConfig::kModeOff); - } else { - // The user has "Default" selected. - local_state_->ClearPref(prefs::kDnsOverHttpsMode); - } - } + local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsMode, + base::Value(SecureDnsConfig::ModeToString( + net::SecureDnsMode::kSecure))); } pref_change_registrar_.Add(prefs::kBuiltInDnsClientEnabled, pref_callback); @@ -338,10 +303,10 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration( SecureDnsModeDetailsForHistogram::kOffByDetectedManagedEnvironment; break; case SecureDnsConfig::ManagementMode::kDisabledParentalControls: - NOTREACHED(); + NOTREACHED_IN_MIGRATION(); break; default: - NOTREACHED(); + NOTREACHED_IN_MIGRATION(); } // No need to check for parental controls if DoH is already disabled. diff --git a/src/chrome/browser/ui/browser_ui_prefs.cc b/src/chrome/browser/ui/browser_ui_prefs.cc index 56ecb7fa..3a299187 100644 --- a/src/chrome/browser/ui/browser_ui_prefs.cc +++ b/src/chrome/browser/ui/browser_ui_prefs.cc @@ -72,6 +72,10 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry) { registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0); registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime, base::Time()); +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + registry->RegisterStringPref(prefs::kEnterpriseCustomLabel, std::string()); + registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string()); +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) } void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { @@ -177,5 +181,6 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string()); + registry->RegisterStringPref(prefs::kEnterpriseCustomLabel, std::string()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) } diff --git a/src/chrome/browser/ui/startup/bad_flags_prompt.cc b/src/chrome/browser/ui/startup/bad_flags_prompt.cc index 0e524589..5fe2578a 100644 --- a/src/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/src/chrome/browser/ui/startup/bad_flags_prompt.cc @@ -184,9 +184,7 @@ const char* const kBadFlags[] = { // Dangerous feature flags in about:flags for which to display a warning that // "stability and security will suffer". static const base::Feature* kBadFeatureFlagsInAboutFlags[] = { - // These features enables experimental support for isolated web apps, which - // unlock capabilities with a high potential for security / privacy abuse. - &features::kIsolatedWebApps, + // This feature enables developer mode support for Isolated Web Apps. &features::kIsolatedWebAppDevMode, #if BUILDFLAG(IS_ANDROID) diff --git a/src/chrome/installer/linux/BUILD.gn b/src/chrome/installer/linux/BUILD.gn index 6259c30e..82f5ed27 100644 --- a/src/chrome/installer/linux/BUILD.gn +++ b/src/chrome/installer/linux/BUILD.gn @@ -36,21 +36,19 @@ packaging_files_executables = [ "$root_out_dir/chrome_management_service", "$root_out_dir/chrome_sandbox", ] -packaging_files_shlibs = [] + +packaging_files_shlibs = [ + "$root_out_dir/libEGL.so", + "$root_out_dir/libGLESv2.so", +] if (bundle_widevine_cdm) { packaging_files_shlibs += [ "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so" ] } -if (use_egl) { - packaging_files_shlibs += [ - "$root_out_dir/libEGL.so", - "$root_out_dir/libGLESv2.so", - ] - if (angle_shared_libvulkan && !is_chromeos) { - packaging_files_shlibs += [ "$root_out_dir/libvulkan.so.1" ] - } +if (angle_shared_libvulkan && !is_chromeos) { + packaging_files_shlibs += [ "$root_out_dir/libvulkan.so.1" ] } if (enable_swiftshader) { @@ -72,6 +70,8 @@ packaging_files = packaging_files_binaries + [ "$root_out_dir/locales/en-US.pak", "$root_out_dir/MEIPreload/manifest.json", "$root_out_dir/MEIPreload/preloaded_data.pb", + "$root_out_dir/PrivacySandboxAttestationsPreloaded/manifest.json", + "$root_out_dir/PrivacySandboxAttestationsPreloaded/privacy-sandbox-attestations.dat", ] if (enable_swiftshader) { packaging_files += [ "$root_out_dir/vk_swiftshader_icd.json" ] @@ -191,7 +191,7 @@ strip_binary("strip_libGLESv2_shlib") { strip_binary("strip_libvulkan_shlib") { binary_input = "$root_out_dir/libvulkan.so.1" - deps = [ "//third_party/vulkan-deps/vulkan-loader/src:libvulkan" ] + deps = [ "//third_party/vulkan-loader/src:libvulkan" ] } strip_binary("strip_libvk_swiftshader.shlib") { @@ -366,30 +366,27 @@ group("installer_deps") { ":strip_chrome_crashpad_handler", ":strip_chrome_management_service", ":strip_chrome_sandbox", + ":strip_libEGL_shlib", + ":strip_libGLESv2_shlib", ":theme_files", "//chrome", "//chrome:packed_resources", "//chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service:chrome_management_service", "//chrome/browser/resources/media/mei_preload:component", "//components/crash/core/app:chrome_crashpad_handler", + "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component", "//sandbox/linux:chrome_sandbox", + "//third_party/angle:libEGL", + "//third_party/angle:libGLESv2", ] if (bundle_widevine_cdm) { public_deps += [ "//third_party/widevine/cdm" ] } - if (use_egl) { + if (angle_shared_libvulkan && !is_chromeos) { public_deps += [ - ":strip_libEGL_shlib", - ":strip_libGLESv2_shlib", - "//third_party/angle:libEGL", - "//third_party/angle:libGLESv2", + ":strip_libvulkan_shlib", + "//third_party/vulkan-loader/src:libvulkan", ] - if (angle_shared_libvulkan && !is_chromeos) { - public_deps += [ - ":strip_libvulkan_shlib", - "//third_party/vulkan-deps/vulkan-loader/src:libvulkan", - ] - } } if (enable_swiftshader) { public_deps += [ diff --git a/src/chrome/installer/linux/common/installer.include b/src/chrome/installer/linux/common/installer.include index 92495110..4fac0a22 100644 --- a/src/chrome/installer/linux/common/installer.include +++ b/src/chrome/installer/linux/common/installer.include @@ -171,6 +171,7 @@ stage_install_common() { install -m 644 "${OUTPUTDIR}/resources/inspector_overlay/main.js" "${STAGEDIR}/${INSTALLDIR}/resources/inspector_overlay/" install -m 755 "${OUTPUTDIR}/thorium_shell" "${STAGEDIR}/${INSTALLDIR}/" install -m ${SHLIB_PERMS} "${OUTPUTDIR}/libffmpeg.so" "${STAGEDIR}/${INSTALLDIR}/" + install -m ${SHLIB_PERMS} "${OUTPUTDIR}/libffmpeg.so" "${STAGEDIR}/${INSTALLDIR}/lib" # install -m ${SHLIB_PERMS} "${OUTPUTDIR}/libblink_test_plugin.so" "${STAGEDIR}/${INSTALLDIR}/lib" install -m ${SHLIB_PERMS} "${OUTPUTDIR}/ClearKeyCdm/_platform_specific/linux_x64/libclearkeycdm.so" "${STAGEDIR}/${INSTALLDIR}/lib" install -m 644 "${OUTPUTDIR}/thorium_shell.png" "${STAGEDIR}/${INSTALLDIR}/" @@ -220,6 +221,13 @@ stage_install_common() { # builds these files. The build config should be obtained from gn rather than # guessed based on the presence of files. + # Privacy Sandbox Attestation + if [ -f "${OUTPUTDIR}/PrivacySandboxAttestationsPreloaded/manifest.json" ]; then + install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/PrivacySandboxAttestationsPreloaded/" + install -m 644 "${OUTPUTDIR}/PrivacySandboxAttestationsPreloaded/manifest.json" "${STAGEDIR}/${INSTALLDIR}/PrivacySandboxAttestationsPreloaded/" + install -m 644 "${OUTPUTDIR}/PrivacySandboxAttestationsPreloaded/privacy-sandbox-attestations.dat" "${STAGEDIR}/${INSTALLDIR}/PrivacySandboxAttestationsPreloaded/" + fi + # MEI Preload if [ -f "${OUTPUTDIR}/MEIPreload/manifest.json" ]; then install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/MEIPreload/" @@ -417,6 +425,18 @@ stage_install_common() { "outside of ${INSTALLDIR}" 1>&2 fi + # official build should not relax permission check. + on_cog= + if [ "$IS_OFFICIAL_BUILD" -eq 0 ]; then + # on Cog, permission is always 0664 or 0775 + case "$(pwd)" in + /google/cog/cloud/*) + on_cog=1 + echo "INFO: build on Cog. relax permission for group writable" 1>&2 + ;; + esac + fi + # Verify file permissions. for file in $(find "${STAGEDIR}" -mindepth 1); do local actual_perms=$(stat -c "%a" "${file}") @@ -454,9 +474,25 @@ stage_install_common() { local expected_perms=644 fi if [ ${expected_perms} -ne ${actual_perms} ]; then - echo Expected permissions on ${base_name} to be \ - ${expected_perms}, but they were ${actual_perms} 1>&2 - exit 1 + if [ -z "$on_cog" ]; then + echo Expected permissions on ${base_name} to be \ + ${expected_perms}, but they were ${actual_perms} 1>&2 + exit 1 + fi + local relaxed_expected_perms=${expected_perms} + + case ${expected_perms} in + 4755) relaxed_expected_perms=775 ;; + 644) relaxed_expected_perms=664 ;; + 755) relaxed_expected_perms=775 ;; + esac + + if [ ${relaxed_expected_perms} -ne ${actual_perms} ]; then + echo Expected permissions on ${base_name} to be \ + ${expected_perms} or ${relaxed_expected_perms}, \ + but they were ${actual_perms} 1>&2 + exit 1 + fi fi done } diff --git a/src/chrome/installer/linux/common/wrapper b/src/chrome/installer/linux/common/wrapper index a92ce668..9995c6d0 100644 --- a/src/chrome/installer/linux/common/wrapper +++ b/src/chrome/installer/linux/common/wrapper @@ -28,9 +28,9 @@ fi # Always use our versions of ffmpeg libs. # This also makes RPMs find the compatibly-named library symlinks. if [[ -n "$LD_LIBRARY_PATH" ]]; then - LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$HERE/lib:$LD_LIBRARY_PATH" else - LD_LIBRARY_PATH="$HERE:$HERE/lib" + LD_LIBRARY_PATH="$HERE/lib" fi export LD_LIBRARY_PATH diff --git a/src/chrome/installer/mini_installer/chrome.release b/src/chrome/installer/mini_installer/chrome.release index 10a286bd..6626be8b 100644 --- a/src/chrome/installer/mini_installer/chrome.release +++ b/src/chrome/installer/mini_installer/chrome.release @@ -93,6 +93,12 @@ WidevineCdm\_platform_specific\win_arm64\widevinecdm.dll.sig: %(VersionDir)s\Wid Logo.png: %(VersionDir)s\VisualElements\ SmallLogo.png: %(VersionDir)s\VisualElements\ +# +# Privacy Sandbox Attestation +# +PrivacySandboxAttestationsPreloaded\manifest.json: %(VersionDir)s\PrivacySandboxAttestationsPreloaded\ +PrivacySandboxAttestationsPreloaded\privacy-sandbox-attestations.dat: %(VersionDir)s\PrivacySandboxAttestationsPreloaded\ + # # MEI Preload sub dir # @@ -113,6 +119,7 @@ ffmpeg.dll: %(VersionDir)s\ [GOOGLE_CHROME] # The elevation service is only installed for Google Chrome builds. elevation_service.exe: %(VersionDir)s\ +os_update_handler.exe: %(VersionDir)s\ # # Sub directories living in the version dir diff --git a/src/components/download/public/common/download_features.cc b/src/components/download/public/common/download_features.cc index 3657c3ff..64be4549 100644 --- a/src/components/download/public/common/download_features.cc +++ b/src/components/download/public/common/download_features.cc @@ -73,6 +73,10 @@ BASE_FEATURE(kDeleteOverwrittenDownloads, BASE_FEATURE(kAllowFileBufferSizeControl, "AllowFileBufferSizeControl", base::FEATURE_ENABLED_BY_DEFAULT); + +BASE_FEATURE(kAllowedMixedContentInlinePdf, + "AllowedMixedContentInlinePdf", + base::FEATURE_ENABLED_BY_DEFAULT); } // namespace features } // namespace download diff --git a/src/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/src/components/privacy_sandbox/privacy_sandbox_settings_impl.cc index 28b9bb5b..f7b54e3d 100644 --- a/src/components/privacy_sandbox/privacy_sandbox_settings_impl.cc +++ b/src/components/privacy_sandbox/privacy_sandbox_settings_impl.cc @@ -503,7 +503,8 @@ void PrivacySandboxSettingsImpl::SetFledgeJoiningAllowed( // case where the eTLD+1 was not even a host, as GURL will have canonicalised // it to empty. if (effective_top_frame_etld_plus1.length() == 0) { - NOTREACHED() << "Cannot control FLEDGE joining for empty eTLD+1"; + NOTREACHED_IN_MIGRATION() + << "Cannot control FLEDGE joining for empty eTLD+1"; return; } diff --git a/src/components/privacy_sandbox/tracking_protection_prefs.cc b/src/components/privacy_sandbox/tracking_protection_prefs.cc index 93a3f868..6f66c0bc 100644 --- a/src/components/privacy_sandbox/tracking_protection_prefs.cc +++ b/src/components/privacy_sandbox/tracking_protection_prefs.cc @@ -35,22 +35,6 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { prefs::kTrackingProtectionOnboardingAckAction, static_cast(TrackingProtectionOnboardingAckAction::kNotSet)); - registry->RegisterTimePref( - prefs::kTrackingProtectionOnboardingNoticeFirstRequested, base::Time()); - - registry->RegisterTimePref( - prefs::kTrackingProtectionOnboardingNoticeLastRequested, base::Time()); - - // Offboarding - registry->RegisterBooleanPref(prefs::kTrackingProtectionOffboarded, false); - - registry->RegisterTimePref(prefs::kTrackingProtectionOffboardedSince, - base::Time()); - - registry->RegisterIntegerPref( - prefs::kTrackingProtectionOffboardingAckAction, - static_cast(TrackingProtectionOnboardingAckAction::kNotSet)); - // Silent onboarding registry->RegisterIntegerPref( prefs::kTrackingProtectionSilentOnboardingStatus, @@ -62,6 +46,19 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterTimePref(prefs::kTrackingProtectionSilentOnboardedSince, base::Time()); + // Full 3PCD prefs. + registry->RegisterTimePref(prefs::kTrackingProtectionFull3PCDOnboarded, + base::Time()); + + // Tracking Protection Reminder Prefs + registry->RegisterIntegerPref( + prefs::kTrackingProtectionReminderStatus, + static_cast(TrackingProtectionReminderStatus::kUnset)); + + // Tracking Protection Survey Prefs + registry->RegisterTimePref(prefs::kTrackingProtectionSurveyWindowStartTime, + base::Time()); + // Tracking Protection Settings Prefs registry->RegisterBooleanPref( prefs::kBlockAll3pcToggleEnabled, false, @@ -75,12 +72,15 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref( prefs::kIpProtectionEnabled, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); + registry->RegisterBooleanPref(prefs::kIpProtectionInitializedByDogfood, + false); registry->RegisterBooleanPref( prefs::kFingerprintingProtectionEnabled, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref( prefs::kEnableDoNotTrack, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); + registry->RegisterBooleanPref(prefs::kUserBypass3pcExceptionsMigrated, false); } } // namespace privacy_sandbox::tracking_protection diff --git a/src/components/search_engines/prepopulated_engines.json b/src/components/search_engines/prepopulated_engines.json index ce56e151..11bba151 100644 --- a/src/components/search_engines/prepopulated_engines.json +++ b/src/components/search_engines/prepopulated_engines.json @@ -23,13 +23,13 @@ // When adding new engines, increment this number and use it as the new // max ID. This is used by UMA stats and must be updated to include the full // range or else not all engines will be counted in stats. - "kMaxPrepopulatedEngineID": 113, + "kMaxPrepopulatedEngineID": 112, // Increment this if you change the data in ways that mean users with // existing data should get a new version. Otherwise, existing data may // continue to be used and updates made here will not always appear. // Also then run tools/search_engine_choice/generate_search_engine_icons.py. - "kCurrentDataVersion": 163 + "kCurrentDataVersion": 165 }, // The following engines are included in country lists and are added to the @@ -124,6 +124,14 @@ "id": 101 }, + // *** *** *** *** WARNING *** *** *** *** + // The Google Search Engine definitions below are not the only source of + // truth for Android devices. + // Please read http://go/chrome-templateurl-definitions-for-google for more + // information. + // *** *** *** *** WARNING *** *** *** *** + // TODO(b/343792225): Identify a way to resolve this problem and implement + // necessary changes. "google": { "name": "Google", "keyword": "google.com", @@ -272,7 +280,7 @@ "favicon_url": "https://search.seznam.cz/favicon.ico", "search_url": "https://search.seznam.cz/?q={searchTerms}", "suggest_url": "https://suggest.seznam.cz/fulltext_ff?phrase={searchTerms}", - "new_tab_url": "https://search.seznam.cz/?sourceid=chromechoice", + "new_tab_url": "https://search.seznam.cz/newtab", "type": "SEARCH_ENGINE_SEZNAM", "id": 25 }, @@ -284,7 +292,7 @@ "favicon_url": "https://search.seznam.cz/favicon.ico", "search_url": "https://search.seznam.cz/?q={searchTerms}", "suggest_url": "https://suggest.seznam.cz/fulltext_ff?phrase={searchTerms}", - "new_tab_url": "https://search.seznam.cz/?sourceid=chromechoice", + "new_tab_url": "https://search.seznam.cz/newtab", "type": "SEARCH_ENGINE_SEZNAM", "id": 25 }, diff --git a/src/third_party/ffmpeg/ffmpeg_options.gni b/src/third_party/ffmpeg/ffmpeg_options.gni index a7940194..d06366c8 100644 --- a/src/third_party/ffmpeg/ffmpeg_options.gni +++ b/src/third_party/ffmpeg/ffmpeg_options.gni @@ -10,7 +10,7 @@ import("//build/config/sanitizers/sanitizers.gni") if (is_chrome_branded || is_chrome_for_testing_branded) { _default_ffmpeg_branding = "Chrome" } else { - _default_ffmpeg_branding = "Chrome" + _default_ffmpeg_branding = "Chromium" } # Initialize declaration of Chancie Wancie build argument. @@ -23,16 +23,8 @@ if (is_chancie_wancie_build && !is_mac) { _default_ffmpeg_branding = "ChromeOS" } -if (is_chromeos && is_chrome_branded) { - _default_ffmpeg_branding = "ChromeOS" -} - -if (is_cast_android) { +if (is_cast_android || is_castos) { _default_ffmpeg_branding = "Chrome" -} else if (is_castos) { - # TODO(crbug.com/570754): What audio codecs does Chromecast want here? Sort - # out and add configs if necessary. - _default_ffmpeg_branding = "ChromeOS" } declare_args() { @@ -60,8 +52,13 @@ declare_args() { ffmpeg_use_unsafe_atomics = false } -assert(ffmpeg_branding == "Chromium" || ffmpeg_branding == "Chrome" || - ffmpeg_branding == "ChromeOS") +# We no longer have a separate ChromeOS configuration, but don't break existing +# workflows which explicitly specified ChromeOS. +if (ffmpeg_branding == "ChromeOS") { + ffmpeg_branding = "Chrome" +} + +assert(ffmpeg_branding == "Chromium" || ffmpeg_branding == "Chrome") if (current_cpu == "x86") { ffmpeg_arch = "ia32"