From dae7c4800280e44b2bb862390ce69587f8211830 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Wed, 1 Jul 2026 09:03:31 -0400 Subject: [PATCH] import Oracle_OSS libreoffice-7.1.8.1-15.0.1.el9_8.1 --- ...-2024-3044-add-notify-for-script-use.patch | 0 ...026-4430-Conform-AlignEngine-parsing.patch | 46 ++++++++++++++++++ SOURCES/0001-disable-script-dump.patch | 0 ...me-script-macro-support-isn-t-needed.patch | 0 SOURCES/libreoffice-multiliblauncher.sh | 0 SPECS/libreoffice.spec | 47 ++++++++++++++----- 6 files changed, 82 insertions(+), 11 deletions(-) mode change 100644 => 100755 SOURCES/0001-CVE-2024-3044-add-notify-for-script-use.patch create mode 100644 SOURCES/0001-CVE-2026-4430-Conform-AlignEngine-parsing.patch mode change 100644 => 100755 SOURCES/0001-disable-script-dump.patch mode change 100644 => 100755 SOURCES/0003-assume-IFrame-script-macro-support-isn-t-needed.patch mode change 100644 => 100755 SOURCES/libreoffice-multiliblauncher.sh diff --git a/SOURCES/0001-CVE-2024-3044-add-notify-for-script-use.patch b/SOURCES/0001-CVE-2024-3044-add-notify-for-script-use.patch old mode 100644 new mode 100755 diff --git a/SOURCES/0001-CVE-2026-4430-Conform-AlignEngine-parsing.patch b/SOURCES/0001-CVE-2026-4430-Conform-AlignEngine-parsing.patch new file mode 100644 index 0000000..2b2d4ab --- /dev/null +++ b/SOURCES/0001-CVE-2026-4430-Conform-AlignEngine-parsing.patch @@ -0,0 +1,46 @@ +From 1ec3db717fa144ddff3e9b0a2338a82355cf365b Mon Sep 17 00:00:00 2001 +From: Caolán McNamara +Date: Mon, 16 Mar 2026 17:22:23 +0000 +Subject: [PATCH] Conform AlignEngine parsing to what section 2.3.4.10 of the spec has + +Change-Id: Ibb9162b1ce7993ef74665ec0329c95b423fa8174 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201874 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +--- + +diff -up libreoffice-7.1.8.1/oox/source/crypto/AgileEngine.cxx.cve-2026-4430 libreoffice-7.1.8.1/oox/source/crypto/AgileEngine.cxx +--- libreoffice-7.1.8.1/oox/source/crypto/AgileEngine.cxx.cve-2026-4430 2021-12-03 22:40:28.000000000 +0100 ++++ libreoffice-7.1.8.1/oox/source/crypto/AgileEngine.cxx 2026-05-18 08:51:46.431152626 +0200 +@@ -8,6 +8,8 @@ + * + */ + ++#include ++#include + #include + + #include +@@ -532,8 +534,21 @@ bool AgileEngine::readEncryptionInfo(uno + if (0 > mInfo.spinCount || mInfo.spinCount > 10000000) + return false; + +- if (1 > mInfo.saltSize|| mInfo.saltSize > 65536) // Check ++ // [MS-OFFCRYPTO] 2.3.4.10: saltSize "MUST be at least 1 and no greater than 65,536" ++ if (1 > mInfo.saltSize || mInfo.saltSize > 65536) ++ { ++ SAL_WARN("oox", "AgileEngine::readEncryptionInfo(): saltSize out of range: " << mInfo.saltSize); ++ return false; ++ } ++ ++ // [MS-OFFCRYPTO] 2.3.4.10: "The number of bytes required to decode the saltValue ++ // attribute MUST be equal to the value of the saltSize attribute" ++ if (mInfo.keyDataSalt.size() != o3tl::make_unsigned(mInfo.saltSize)) ++ { ++ SAL_WARN("oox", "AgileEngine::readEncryptionInfo(): keyDataSalt size " << mInfo.keyDataSalt.size() ++ << " does not match saltSize " << mInfo.saltSize); + return false; ++ } + + // AES 128 CBC with SHA1 + if (mInfo.keyBits == 128 && diff --git a/SOURCES/0001-disable-script-dump.patch b/SOURCES/0001-disable-script-dump.patch old mode 100644 new mode 100755 diff --git a/SOURCES/0003-assume-IFrame-script-macro-support-isn-t-needed.patch b/SOURCES/0003-assume-IFrame-script-macro-support-isn-t-needed.patch old mode 100644 new mode 100755 diff --git a/SOURCES/libreoffice-multiliblauncher.sh b/SOURCES/libreoffice-multiliblauncher.sh old mode 100644 new mode 100755 diff --git a/SPECS/libreoffice.spec b/SPECS/libreoffice.spec index 496a805..d14a19e 100644 --- a/SPECS/libreoffice.spec +++ b/SPECS/libreoffice.spec @@ -1,3 +1,8 @@ +# RHEL-9.* without i686, not shipped and Java mismatches +%if 0%{?rhel} >= 9 +ExcludeArch: %{ix86} +%endif + # download path contains version without the last (fourth) digit %global libo_version 7.1.8 # Should contain .alphaX / .betaX, if this is pre-release (actually @@ -8,7 +13,7 @@ %global libo_buildfix %{nil} # rhbz#715152 state vendor %if 0%{?rhel} -%global vendoroption --with-vendor="Red Hat, Inc." +%global vendoroption --with-vendor="Oracle America, Inc." %endif %if 0%{?fedora} %global vendoroption --with-vendor="The Fedora Project" @@ -57,7 +62,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 15%{?libo_prerelease}%{?dist} +Release: 15%{?libo_prerelease}.0.1%{?dist}.1 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -299,6 +304,8 @@ Patch43: 0006-CVE-2023-6186-backporting.patch Patch44: 0001-CVE-2024-3044-add-notify-for-script-use.patch Patch45: 0001-CVE-2024-6472-remove-ability-to-trust-not-validated-macro-signatur.patch Patch46: 0001-CVE-2025-1080-Filter-out-more-unwanted-command-URIs.patch +# https://gerrit.libreoffice.org/c/core/+/202756 +Patch47: 0001-CVE-2026-4430-Conform-AlignEngine-parsing.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch @@ -1038,16 +1045,24 @@ rm -rf git-hooks */git-hooks %global __scm git_am %__scm_setup_git_am -#Customize Palette to add Red Hat colours +#Customize Palette to add Oracle colours (head -n -1 extras/source/palettes/standard.soc && \ - echo -e ' - - - - ' && \ - tail -n 1 extras/source/palettes/standard.soc) > redhat.soc -mv -f redhat.soc extras/source/palettes/standard.soc -git commit -q -a -m 'add Red Hat colors to palette' +echo -e ' + + + + + + + + + + + +' +tail -n 1 extras/source/palettes/standard.soc) > oracle.soc +mv -f oracle.soc extras/source/palettes/standard.soc +git commit -q -a -m 'add Oracle colors to palette' # apply patches %autopatch -M 99 @@ -1163,6 +1178,7 @@ touch autogen.lastrun --without-export-validation \ --without-fonts \ --without-lxml \ + --with-hamcrest=yes \ --with-gdrive-client-secret="GYWrDtzyZQZ0_g5YoBCC6F0I" \ --with-gdrive-client-id="457862564325.apps.googleusercontent.com" \ --enable-python=system \ @@ -2302,6 +2318,15 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Mon Jun 29 2026 Darren Archibald - 1:7.1.8.1-15.0.1.el9_8.1 +- Added the --with-hamcrest option to configure. +- Replace colors with Oracle colors [Orabug: 32120093] + +* Tue May 19 2026 Tomas Popela - 1:7.1.8.1-15.el9_8.1 +- Fix CVE-2026-4430 Conform AlignEngine parsing to what section 2.3.4.10 of + the spec has +- Resolves: RHEL-176576 + * Mon Mar 10 2025 Eike Rathke - 1:7.1.8.1-15 - Fix CVE-2025-1080 Filter out more unwanted command URIs