diff --git a/.chromium.metadata b/.chromium.metadata index 6cfa46f0..3f76120c 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -1,8 +1,8 @@ -3870b23900d2a7d3f1f4a9dad012bf6ba30df8d2 SOURCES/chromium-126.0.6478.55-clean.tar.xz +dfec3343a075075c430395630f7c37825a74217e SOURCES/chromium-126.0.6478.55.tar.xz dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz 7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz 769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz 3e94bb4f999c636293bc745b02d98e7925da5616 SOURCES/node-v20.6.1-linux-arm64.tar.xz 8e9bc55cce3899627b2810ecfe87116c5a9147b5 SOURCES/chromium-browser-gost-icons.tar.xz -155cfe0e2b2e5ef5143fb8fabf25c615ec3bc482 SOURCES/msspi-192d2662e058453313e6f824099ace60ca6fd242.tar.xz -9b21b7938069ea17e6a2e7808e7468973caeeb27 SOURCES/Chromium-Gost-6f2a300e93ba8fe663b120b5d17367c95d157e79.tar.xz +a2a9663fa5c46439dafbc1b0f23825b2a8c68acf SOURCES/msspi-2e626e5a5605cc4c03fa4bfc0145e459864e897a.tar.xz +331c50296edef889e444e8af0810a18584e418c6 SOURCES/Chromium-Gost-838d51c142d25de55457444e36eb6d14a2b2ac50.tar.xz diff --git a/.gitignore b/.gitignore index 2fd285b2..8860d5ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ -SOURCES/chromium-126.0.6478.55-clean.tar.xz +SOURCES/chromium-126.0.6478.55.tar.xz SOURCES/linux-x64-0.19.2.tgz SOURCES/linux-arm64-0.19.2.tgz SOURCES/node-v20.6.1-linux-x64.tar.xz SOURCES/node-v20.6.1-linux-arm64.tar.xz SOURCES/chromium-browser-gost-icons.tar.xz -SOURCES/msspi-192d2662e058453313e6f824099ace60ca6fd242.tar.xz -SOURCES/Chromium-Gost-6f2a300e93ba8fe663b120b5d17367c95d157e79.tar.xz +SOURCES/msspi-2e626e5a5605cc4c03fa4bfc0145e459864e897a.tar.xz +SOURCES/Chromium-Gost-838d51c142d25de55457444e36eb6d14a2b2ac50.tar.xz diff --git a/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch b/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch index de5ccdc5..f471471a 100644 --- a/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch +++ b/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch @@ -1,32 +1,32 @@ -From 68d8154734023ebc37fb4b87ab7a7fd6d2815bd2 Mon Sep 17 00:00:00 2001 -From: Sergey Cherevko -Date: Fri, 14 Jun 2024 18:36:08 +0300 +From f823aa91e0a714774a2ca18ccb402078c7336929 Mon Sep 17 00:00:00 2001 +From: tigro +Date: Sun, 16 Jun 2024 15:49:58 +0300 Subject: [PATCH] Added Yandex search bar as default on newtab and new-tab-page --- chrome/app/generated_resources.grd | 2 -- - .../app/resources/generated_resources_be.xtb | 4 ++-- - .../resources/generated_resources_en-GB.xtb | 4 ++-- - .../app/resources/generated_resources_ru.xtb | 4 ++-- - .../app/resources/generated_resources_uk.xtb | 4 ++-- + .../app/resources/generated_resources_be.xtb | 2 +- + .../resources/generated_resources_en-GB.xtb | 2 +- + .../app/resources/generated_resources_ru.xtb | 2 +- + .../app/resources/generated_resources_uk.xtb | 2 +- chrome/browser/history/top_sites_factory.cc | 4 ++-- .../resources/new_tab_page/lens_form.html | 1 + - .../resources/new_tab_page/lens_form.ts | 20 ++++++++++++++++++- + .../resources/new_tab_page/lens_form.ts | 19 ++++++++++++++++++- .../new_tab_page/lens_upload_dialog.html | 10 +++++----- .../browser/resources/new_tab_page/logo.html | 5 +---- chrome/browser/resources/new_tab_page/logo.ts | 2 +- chrome/browser/search/search.cc | 7 +++++++ chrome/browser/search/search.h | 2 ++ .../ui/webui/new_tab_page/new_tab_page_ui.cc | 5 +++++ - components/search/search.cc | 14 +++++++++++++ + components/search/search.cc | 14 ++++++++++++++ components/search/search.h | 7 +++++++ components/search_engines/keyword_table.cc | 4 ++++ - .../search_engines/prepopulated_engines.json | 11 +++++----- - .../search_engine_countries-inc.cc | 11 +++++----- + .../search_engines/prepopulated_engines.json | 11 ++++++----- + .../search_engine_countries-inc.cc | 9 +++++---- .../search_engines/template_url_data_util.cc | 6 +++++- - .../template_url_prepopulate_data.cc | 15 ++++++++------ + .../template_url_prepopulate_data.cc | 15 +++++++++------ .../cr_components/searchbox/realbox.html | 7 +++++++ - 22 files changed, 109 insertions(+), 40 deletions(-) + 22 files changed, 103 insertions(+), 35 deletions(-) diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index b54ec8a465..4043570c4b 100644 @@ -44,7 +44,7 @@ index b54ec8a465..4043570c4b 100644 Add to your search diff --git a/chrome/app/resources/generated_resources_be.xtb b/chrome/app/resources/generated_resources_be.xtb -index e6f66c5fdd..15e1e75fdf 100644 +index e6f66c5fdd..f1d9597fef 100644 --- a/chrome/app/resources/generated_resources_be.xtb +++ b/chrome/app/resources/generated_resources_be.xtb @@ -9407,7 +9407,7 @@ @@ -56,15 +56,8 @@ index e6f66c5fdd..15e1e75fdf 100644 У Google пашырэнне "" абазначана як шкоднае. Яго ўсталяванне было прадухілена Адваротная прагортка сэнсарнай панэллю Камерцыйнае падпісванне кода ў Microsoft -@@ -11112,4 +11112,4 @@ - Пры наведванні сайтаў яны будуць аўтаматычна ўлічваць гэту наладу. Звычайна сайты адпраўляюць апавяшчэнні, каб паведаміць вам пра экстранныя навіны або новыя паведамленні ў чаце. - Каб выкарыстоўваць функцыю сінхранізацыі параметраў Wi-Fi, уключыце Сінхранізацыю Chrome. Даведацца больш - Пра&верыць -- -\ No newline at end of file -+ diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb -index 16706b18e5..f1393a6bf8 100644 +index 16706b18e5..bae533b582 100644 --- a/chrome/app/resources/generated_resources_en-GB.xtb +++ b/chrome/app/resources/generated_resources_en-GB.xtb @@ -9421,7 +9421,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -76,15 +69,8 @@ index 16706b18e5..f1393a6bf8 100644 Google has flagged '' as malicious, and installation has been prevented Touchpad reverse scrolling Microsoft Commercial Code Signing -@@ -11126,4 +11126,4 @@ Permissions that you've already given to websites and apps may apply to this acc - Sites automatically follow this setting when you visit them. Sites usually send notifications to let you know about breaking news or chat messages. - Turn on Chrome Sync to use Wi-Fi Sync. Learn more - I&nspect -- -\ No newline at end of file -+ diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb -index a048aeac98..9363e6bc96 100644 +index a048aeac98..561eb8746d 100644 --- a/chrome/app/resources/generated_resources_ru.xtb +++ b/chrome/app/resources/generated_resources_ru.xtb @@ -9412,7 +9412,7 @@ @@ -96,15 +82,8 @@ index a048aeac98..9363e6bc96 100644 Google заблокировал установку потенциально опасной программы (). Обратное направление прокрутки с помощью сенсорной панели Подписывание коммерческого кода Microsoft -@@ -11120,4 +11120,4 @@ - Когда вы посещаете сайты, эти настройки используются автоматически. Обычно сайты показывают уведомления, чтобы оповестить вас о сообщениях в чате или срочных новостях. - Чтобы использовать функцию "Синхронизация Wi-Fi", включите синхронизацию Chrome. Подробнее… - П&росмотреть код -- -\ No newline at end of file -+ diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb -index fa169a612c..751be07c7c 100644 +index fa169a612c..90305e3675 100644 --- a/chrome/app/resources/generated_resources_uk.xtb +++ b/chrome/app/resources/generated_resources_uk.xtb @@ -9426,7 +9426,7 @@ @@ -116,13 +95,6 @@ index fa169a612c..751be07c7c 100644 Система Google позначила розширення як шкідливе та заборонила встановлення Зворотне прокручування на сенсорній панелі Підписування комерційного коду Microsoft -@@ -11134,4 +11134,4 @@ - Коли ви відвідуєте сайти, вони автоматично дотримуються цього налаштування. Зазвичай сайти надсилають сповіщення, щоб інформувати про важливі новини або повідомлення в чаті. - Щоб користуватися синхронізацією Wi-Fi, потрібно ввімкнути Синхронізацію Chrome. Докладніше - Перевірити -- -\ No newline at end of file -+ diff --git a/chrome/browser/history/top_sites_factory.cc b/chrome/browser/history/top_sites_factory.cc index 8f20a76a66..d1a13e7046 100644 --- a/chrome/browser/history/top_sites_factory.cc @@ -158,16 +130,15 @@ index 57c6387c7e..0f31a59767 100644 diff --git a/chrome/browser/resources/new_tab_page/lens_form.ts b/chrome/browser/resources/new_tab_page/lens_form.ts -index bf24f4c495..53fd771d7d 100644 +index bf24f4c495..167b57bc5e 100644 --- a/chrome/browser/resources/new_tab_page/lens_form.ts +++ b/chrome/browser/resources/new_tab_page/lens_form.ts -@@ -12,11 +12,15 @@ import {getTemplate} from './lens_form.html.js'; +@@ -12,11 +12,14 @@ import {getTemplate} from './lens_form.html.js'; /** Lens service endpoint for the Upload by File action. */ const SCOTTY_UPLOAD_FILE_ACTION: string = 'https://lens.google.com/upload'; const DIRECT_UPLOAD_FILE_ACTION: string = 'https://lens.google.com/v3/upload'; +const SCOTTY_UPLOAD_FILE_ACTION_YA: string = 'https://yandex.ru/images/search'; +const DIRECT_UPLOAD_FILE_ACTION_YA: string = 'https://yandex.ru/images/search'; -+ /** Entrypoint for the upload by file action. */ const UPLOAD_FILE_ENTRYPOINT: string = 'cntpubb'; @@ -177,7 +148,7 @@ index bf24f4c495..53fd771d7d 100644 const UPLOAD_BY_URL_ACTION: string = 'https://lens.google.com/uploadbyurl'; /** Entrypoint for the upload by url action. */ -@@ -74,6 +78,7 @@ export class LensFormElement extends PolymerElement { +@@ -74,6 +77,7 @@ export class LensFormElement extends PolymerElement { } static get properties() { @@ -185,7 +156,7 @@ index bf24f4c495..53fd771d7d 100644 return { supportedFileTypes_: { type: String, -@@ -99,7 +104,7 @@ export class LensFormElement extends PolymerElement { +@@ -99,7 +103,7 @@ export class LensFormElement extends PolymerElement { uploadUrlAction_: { type: String, readOnly: true, @@ -194,7 +165,7 @@ index bf24f4c495..53fd771d7d 100644 }, uploadUrl_: String, uploadUrlEntrypoint_: { -@@ -117,6 +122,11 @@ export class LensFormElement extends PolymerElement { +@@ -117,6 +121,11 @@ export class LensFormElement extends PolymerElement { readOnly: true, value: loadTimeData.getString('realboxLensVariations'), }, @@ -206,7 +177,7 @@ index bf24f4c495..53fd771d7d 100644 }; } -@@ -126,6 +136,7 @@ export class LensFormElement extends PolymerElement { +@@ -126,6 +135,7 @@ export class LensFormElement extends PolymerElement { private startTime_: string|null = null; private clientData_: string; private useDirectUpload_: boolean; @@ -214,7 +185,7 @@ index bf24f4c495..53fd771d7d 100644 openSystemFilePicker() { this.$.fileInput.click(); -@@ -153,6 +164,11 @@ export class LensFormElement extends PolymerElement { +@@ -153,6 +163,11 @@ export class LensFormElement extends PolymerElement { } private async submitFile_(file: File) { @@ -226,7 +197,7 @@ index bf24f4c495..53fd771d7d 100644 if (!SUPPORTED_FILE_TYPES.includes(file.type)) { this.dispatchError_(LensErrorType.FILE_TYPE); return; -@@ -194,8 +210,10 @@ export class LensFormElement extends PolymerElement { +@@ -194,8 +209,10 @@ export class LensFormElement extends PolymerElement { processedFile.imageWidth ? processedFile.imageWidth.toString() : ''); this.uploadFileAction_ = action.toString(); @@ -238,7 +209,7 @@ index bf24f4c495..53fd771d7d 100644 submitUrl(urlString: string) { diff --git a/chrome/browser/resources/new_tab_page/lens_upload_dialog.html b/chrome/browser/resources/new_tab_page/lens_upload_dialog.html -index a6eb910711..45ad51baa7 100644 +index a6eb910711..703311b280 100644 --- a/chrome/browser/resources/new_tab_page/lens_upload_dialog.html +++ b/chrome/browser/resources/new_tab_page/lens_upload_dialog.html @@ -99,7 +99,7 @@ @@ -264,7 +235,7 @@ index a6eb910711..45ad51baa7 100644 - -+ --> ++ //-->
-
+ ++
//-->
AddBoolean( + "googleLensForYandex", + search::DefaultSearchProviderIsYandex(profile)); + - source->AddBoolean( - "showCartInQuestModuleSetting", - IsCartModuleEnabled() && + SearchboxHandler::SetupWebUIDataSource( + source, profile, + /*enable_voice_search=*/true, diff --git a/components/search/search.cc b/components/search/search.cc index a7167fae92..67d36156c5 100644 --- a/components/search/search.cc @@ -489,7 +460,7 @@ index 91539be7a0..63b30e6c92 100644 "id": 15 }, diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc -index 6c8ffb9e7d..4c99be8769 100644 +index 6c8ffb9e7d..417cb0009c 100644 --- a/components/search_engines/search_engine_countries-inc.cc +++ b/components/search_engines/search_engine_countries-inc.cc @@ -33,6 +33,7 @@ struct EngineAndTier { @@ -541,16 +512,6 @@ index 6c8ffb9e7d..4c99be8769 100644 {SearchEngineTier::kTopEngines, &yahoo_tr}, {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &duckduckgo}, -@@ -1043,8 +1044,8 @@ constexpr EngineAndTier engines_TZ[] = { - - // Ukraine - constexpr EngineAndTier engines_UA[] = { -- {SearchEngineTier::kTopEngines, &google}, - {SearchEngineTier::kTopEngines, &yandex_ru}, -+ {SearchEngineTier::kTopEngines, &google}, - {SearchEngineTier::kTopEngines, &bing}, - {SearchEngineTier::kTopEngines, &duckduckgo}, - {SearchEngineTier::kTopEngines, &yahoo}, diff --git a/components/search_engines/template_url_data_util.cc b/components/search_engines/template_url_data_util.cc index 6f85515188..7791bf8113 100644 --- a/components/search_engines/template_url_data_util.cc @@ -633,5 +594,5 @@ index 007ba1fafa..5fd20d191c 100644 /* Embedders should define --cr-realbox-min-width. */ --cr-realbox-shadow: 0 1px 6px 0 var(--color-realbox-shadow); -- -2.39.3 +2.45.1 diff --git a/SOURCES/chromium-126-ifunc-header.patch b/SOURCES/chromium-126-ifunc-header.patch new file mode 100644 index 00000000..72368df0 --- /dev/null +++ b/SOURCES/chromium-126-ifunc-header.patch @@ -0,0 +1,15 @@ +diff -up chromium-126.0.6478.55/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h.me chromium-126.0.6478.55/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h +--- chromium-126.0.6478.55/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h.me 2024-06-12 13:09:47.539620293 -0400 ++++ chromium-126.0.6478.55/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h 2024-06-12 13:12:10.570739701 -0400 +@@ -10,9 +10,11 @@ + #include "partition_alloc/build_config.h" + #include "partition_alloc/partition_alloc_buildflags.h" + ++#if 0 + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) + #define HAS_HW_CAPS + #endif ++#endif + + #if defined(ARCH_CPU_ARM64) && defined(HAS_HW_CAPS) + #include diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index 74011e96..e119e5f1 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -33,9 +33,6 @@ export NINJA_STATUS="[%2:%f/%t] " ; \ ninja -j %{numjobs} -C '%1' '%2' -# enable|disable chromedriver -%global build_chromedriver 1 - # enable|disable headless client build %if %{with gost} %global build_headless 0 @@ -314,8 +311,8 @@ # Build with GOST patches # https://github.com/deemru/chromium-gost/ %global gost_build 1 -%define chromium_gost_commit 6f2a300e93ba8fe663b120b5d17367c95d157e79 -%define msspi_commit 192d2662e058453313e6f824099ace60ca6fd242 +%define chromium_gost_commit 838d51c142d25de55457444e36eb6d14a2b2ac50 +%define msspi_commit 2e626e5a5605cc4c03fa4bfc0145e459864e897a %define chromium_path_gost %{_builddir}/chromium-gost %endif @@ -497,6 +494,7 @@ Patch150: chromium-124-qt6.patch # disable memory tagging in epel7 and epel8 on aarch64 due to new feature IFUNC-Resolver # not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found Patch305: chromium-124-arm64-memory_tagging.patch +Patch306: chromium-126-ifunc-header.patch # compiler errors on el7/el8 and f38 (clang <17) Patch307: chromium-125-el-NativeValueTraits-p1.patch @@ -622,7 +620,7 @@ Patch602: 0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch # For Chromium Fedora use chromium-latest.py --stable --ffmpegclean --ffmpegarm # If you want to include the ffmpeg arm sources append the --ffmpegarm switch # https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%%{version}.tar.xz -Source0: chromium-%{version}-clean.tar.xz +Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz Source1: README.fedora Source2: chromium.conf Source3: chromium-browser.sh @@ -995,7 +993,7 @@ Requires: libcanberra-gtk3%{_isa} Requires: u2f-hidraw-policy %endif -Requires: chromium-common%{_isa} = %{version}-%{release} +Requires: %{name}-common%{_isa} = %{version}-%{release} # rhel 7: x86_64 # rhel 8 or newer: x86_64, aarch64 @@ -1178,7 +1176,7 @@ Requires(preun): systemd Requires(postun): systemd Requires: xorg-x11-server-Xvfb Requires: python3-psutil -Requires: chromium-common%{_isa} = %{version}-%{release} +Requires: %{name}-common%{_isa} = %{version}-%{release} Summary: Remote desktop support for google-chrome & chromium %description -n chrome-remote-desktop @@ -1187,7 +1185,7 @@ Remote desktop support for google-chrome & chromium. %package -n chromedriver Summary: WebDriver for Google Chrome/Chromium -Requires: chromium-common%{_isa} = %{version}-%{release} +Requires: %{name}-common%{_isa} = %{version}-%{release} %description -n chromedriver WebDriver is an open source tool for automated testing of webapps across many @@ -1198,7 +1196,7 @@ members of the Chromium and WebDriver teams. %package headless Summary: A minimal headless shell built from Chromium -Requires: chromium-common%{_isa} = %{version}-%{release} +Requires: %{name}-common%{_isa} = %{version}-%{release} %description headless A minimal headless client built from Chromium. headless_shell is built @@ -1350,6 +1348,7 @@ cp /opt/rh/%{toolset}-%{dts_version}/root/usr/include/c++/%{dts_version}/optiona %if 0%{?rhel} && 0%{?rhel} <= 8 %ifarch aarch64 %patch -P305 -p1 -b .memory_tagging +%patch -P306 -p1 -b .ifunc-header %patch -P317 -p1 -b .libdav1d-aarch64 %endif %endif @@ -2070,8 +2069,8 @@ popd %endif # Add directories for policy management -mkdir -p %{buildroot}%{_sysconfdir}/chromium/policies/managed -mkdir -p %{buildroot}%{_sysconfdir}/chromium/policies/recommended +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/policies/managed +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/policies/recommended cp -a out/Release/gen/chrome/app/policy/common/html/en-US/*.html . cp -a out/Release/gen/chrome/app/policy/linux/examples/chrome.json . @@ -2145,7 +2144,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %doc AUTHORS README.fedora %doc chrome_policy_list.html *.json %license LICENSE -%config(noreplace) %{_sysconfdir}/%{name}/chromium.conf +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config %{_sysconfdir}/%{name}/master_preferences %config %{_sysconfdir}/%{name}/policies/ %if %{build_remoting} @@ -2306,6 +2305,8 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt * Medium CVE-2024-5845: Use after free in Audio * Medium CVE-2024-5846: Use after free in PDFium * Medium CVE-2024-5847: Use after free in PDFium +- Update Chromium Gost patches +- fix build error on el7 and el8 - fatal error: sys/ifunc.h file not found * Sun Jun 2 2024 Arkady L. Shane - 125.0.6422.141-1.inferit - update to 125.0.6422.141