diff --git a/.chromium.metadata b/.chromium.metadata index 965d6115..8abb8b19 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -1,4 +1,4 @@ -2b2119611c4daa377b94bf004ffbd6b7de75a8b8 SOURCES/chromium-118.0.5993.70.tar.xz +a22dba3571e389079625bff67618e732e054ba9b SOURCES/chromium-118.0.5993.88.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 diff --git a/.gitignore b/.gitignore index fcacd966..87e6419e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -SOURCES/chromium-118.0.5993.70.tar.xz +SOURCES/chromium-118.0.5993.88.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 diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index 58c8c986..820dd339 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -43,6 +43,12 @@ # set nodejs_version %global nodejs_version v20.6.1 +%global system_nodejs 1 +# RHEL 8 needs newer nodejs +%if 0%{?rhel} == 8 +%global system_nodejs 0 +%endif + # set esbuild_version %global esbuild_version 0.19.2 @@ -248,7 +254,7 @@ %endif Name: chromium%{chromium_channel} -Version: 118.0.5993.70 +Version: 118.0.5993.88 Release: 1%{?dist}.inferit Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home @@ -419,8 +425,7 @@ Source9: chromium-browser.xml Source10: chrome-remote-desktop@.service Source11: master_preferences -# RHEL 8 needs newer nodejs -%if 0%{?rhel} == 8 +%if ! %{system_nodejs} Source12: https://nodejs.org/dist/latest-v20.x/node-%{nodejs_version}-linux-x64.tar.xz Source13: https://nodejs.org/dist/latest-v20.x/node-%{nodejs_version}-linux-arm64.tar.xz %endif @@ -524,19 +529,17 @@ BuildRequires: mesa-libgbm-devel # Old Fedora (before 30) uses the 1.2 minizip by default. # Newer Fedora needs to use the compat package -%if 0%{?fedora} >= 30 -BuildRequires: minizip-compat-devel +# Fedora > 39 uses minizip-ng +%if ! %{bundleminizip} +%if 0%{?fedora} > 39 || 0%{?rhel} > 9 +# BuildRequires: minizip-ng-devel +BuildRequires: minizip-compat-devel %else -# RHEL 8 needs to use the compat-minizip (provided by minizip1.2) -%if 0%{?rhel} >= 8 -BuildRequires: minizip-compat-devel +BuildRequires: minizip-compat-devel %endif %endif -# RHEL 8 needs newer nodejs -%if 0%{?rhel} == 8 -# nothing -%else +%if %{system_nodejs} BuildRequires: nodejs %endif @@ -856,21 +859,7 @@ Chromium is an open-source web browser, powered by WebKit (Blink). %package common Summary: Files needed for both the headless_shell and full Chromium -# Chromium needs an explicit Requires: minizip-compat -# We put it here to cover headless too. -%if 0%{?fedora} >= 30 -Requires: minizip-compat%{_isa} -%else -%if 0%{?rhel} == 7 -# Do nothing -%else -%if 0%{?rhel} == 9 -Requires: minizip1.2%{_isa} -%else -Requires: minizip%{_isa} -%endif -%endif -%endif + # -common doesn't have chrome-remote-desktop bits # but we need to clean it up if it gets disabled again # NOTE: Check obsoletes version to be sure it matches @@ -1037,8 +1026,8 @@ install -m0644 %{SOURCE50} ./chrome/browser/resources/new_tab_page/icons/google_ # See `man find` for how the `-exec command {} +` syntax works find -type f \( -iname "*.py" \) -exec sed -i '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' {} + -# install nodejs -%if 0%{?rhel} == 8 +# Add correct path for nodejs binary +%if ! %{system_nodejs} pushd third_party/node/linux %ifarch x86_64 tar xf %{SOURCE12} @@ -1719,6 +1708,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{chromium_path}/chromedriver %changelog +* Sat Oct 21 2023 Arkady L. Shane - 118.0.5993.88-1.inferit +- Update to 118.0.5993.88 +- Cleanup the package dependencies + * Thu Oct 12 2023 Arkady L. Shane - 118.0.5993.70-1.inferit - Update to 118.0.5993.70 - CVE-2023-5218: Use after free in Site Isolation.