From e3241de136fe2ee923234107bae20db87d7ab489 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 16 May 2023 06:09:56 +0000 Subject: [PATCH] import libreoffice-6.4.7.2-13.el8 --- .gitignore | 7 ++++ .libreoffice.metadata | 7 ++++ ...ow-convert-to-csv-to-write-each-shee.patch | 37 ++++++++++++++----- SOURCES/libreoffice-base-symbolic.svg | 27 -------------- SOURCES/libreoffice-calc-symbolic.svg | 27 -------------- SOURCES/libreoffice-draw-symbolic.svg | 26 ------------- SOURCES/libreoffice-impress-symbolic.svg | 25 ------------- SOURCES/libreoffice-main-symbolic.svg | 24 ------------ SOURCES/libreoffice-math-symbolic.svg | 25 ------------- SOURCES/libreoffice-writer-symbolic.svg | 28 -------------- SPECS/libreoffice.spec | 13 ++++--- 11 files changed, 50 insertions(+), 196 deletions(-) delete mode 100644 SOURCES/libreoffice-base-symbolic.svg delete mode 100644 SOURCES/libreoffice-calc-symbolic.svg delete mode 100644 SOURCES/libreoffice-draw-symbolic.svg delete mode 100644 SOURCES/libreoffice-impress-symbolic.svg delete mode 100644 SOURCES/libreoffice-main-symbolic.svg delete mode 100644 SOURCES/libreoffice-math-symbolic.svg delete mode 100644 SOURCES/libreoffice-writer-symbolic.svg diff --git a/.gitignore b/.gitignore index 7fcd746..07521f7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,12 @@ SOURCES/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens__ SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip SOURCES/gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc SOURCES/libreoffice-6.4.7.2.tar.xz +SOURCES/libreoffice-base-symbolic.svg +SOURCES/libreoffice-calc-symbolic.svg +SOURCES/libreoffice-draw-symbolic.svg SOURCES/libreoffice-help-6.4.7.2.tar.xz +SOURCES/libreoffice-impress-symbolic.svg +SOURCES/libreoffice-main-symbolic.svg +SOURCES/libreoffice-math-symbolic.svg SOURCES/libreoffice-translations-6.4.7.2.tar.xz +SOURCES/libreoffice-writer-symbolic.svg diff --git a/.libreoffice.metadata b/.libreoffice.metadata index 9790d2c..21d524c 100644 --- a/.libreoffice.metadata +++ b/.libreoffice.metadata @@ -4,5 +4,12 @@ d336802a36ed2c87dd243e7c2f1d0542dace5cca SOURCES/884ed41809687c3e168fc7c19b16585 2d49e11b0b711970f494294dc3698f05eb294853 SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 7b5fd93d787fbc6d9c2d4025d543730ee8dc4559 SOURCES/gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc b29d8cdb3db8d6b317e1cb9117b020d7e676e601 SOURCES/libreoffice-6.4.7.2.tar.xz +54fc749ba924f9ca4e0391caaf579ab344302038 SOURCES/libreoffice-base-symbolic.svg +9de544172d736d59589767000c1f657034a5d53d SOURCES/libreoffice-calc-symbolic.svg +0f6dc4726da0920869354fbe4b2924f9ac569b4a SOURCES/libreoffice-draw-symbolic.svg ca7e087ef62f30c033db84ceb0f6a4021f53653e SOURCES/libreoffice-help-6.4.7.2.tar.xz +8c74dd667c660cc643c4d715dd50491ba92146d5 SOURCES/libreoffice-impress-symbolic.svg +c77acd04a7647b09745f9424ab0f65d52dfcd397 SOURCES/libreoffice-main-symbolic.svg +3857a55644148eb25ed1a594bd00d1262761fb39 SOURCES/libreoffice-math-symbolic.svg 0f74fd6286e71ff2b7c7bc01f41c8972e354d81c SOURCES/libreoffice-translations-6.4.7.2.tar.xz +d4f0674ad46a832120db956cc01a27fdc2060458 SOURCES/libreoffice-writer-symbolic.svg diff --git a/SOURCES/0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch b/SOURCES/0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch index 4bd0205..ea60a92 100644 --- a/SOURCES/0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch +++ b/SOURCES/0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch @@ -1,4 +1,4 @@ -From c5a9fb7f00fe4d701d98c4058ad0f506c8dd146f Mon Sep 17 00:00:00 2001 +From b49380bd288e642352cb7ddc1c050e2fb34b5b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 13 Jul 2021 12:38:07 +0100 Subject: [PATCH] rhbz#1980800 allow --convert-to csv to write each sheet to a @@ -45,15 +45,24 @@ Tested-by: Jenkins Change-Id: Ib99a120f1a2c8d1008a7a3c59a6b39f572fb346e b9248c9561e4e340c88458ac5dfd159e443a4cfd 9431221aadf97739bb197871f25fa151ef4c391c + +Plus follow-up fix + +"tdf#129829 sfx2: fix handling of password to open vs modify" (which happens to +also fix saving to smb shares, in addition to the Windows-specific issue it was +originally meant to fix), plus the relevant parts of its preceding + +"sw reqif-xhtml export: add a new RTFOLEMimeType parameter" introducing +SfxMedium::SetArgs. --- desktop/source/app/dispatchwatcher.cxx | 50 +++++++-- - include/sfx2/docfile.hxx | 1 + + include/sfx2/docfile.hxx | 2 + sc/source/ui/dbgui/imoptdlg.cxx | 16 ++- sc/source/ui/docshell/docsh.cxx | 141 +++++++++++++++++++++---- sc/source/ui/inc/docsh.hxx | 2 +- sc/source/ui/inc/imoptdlg.hxx | 6 +- - sfx2/source/doc/docfile.cxx | 4 + - 7 files changed, 184 insertions(+), 36 deletions(-) + sfx2/source/doc/docfile.cxx | 13 +++ + 7 files changed, 194 insertions(+), 36 deletions(-) diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 04140173c6d1..a5365da618e8 100644 @@ -154,13 +163,14 @@ index 04140173c6d1..a5365da618e8 100644 } try diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx -index 2019b5738c01..09aae02b1976 100644 +index 2019b5738c01..2886348 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx -@@ -108,6 +108,7 @@ public: +@@ -108,6 +108,8 @@ public: const OUString& GetOrigURL() const; SfxItemSet * GetItemSet() const; ++ void SetArgs(const css::uno::Sequence& rArgs); + css::uno::Sequence GetArgs() const; void Close(bool bInDestruction = false); void CloseAndRelease(); @@ -439,7 +449,7 @@ index bac941c2a377..382067d67813 100644 #endif // INCLUDED_SC_SOURCE_UI_INC_IMOPTDLG_HXX diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx -index 5d00d39bd837..ccdd3632e6e5 100644 +index 5d00d39bd837..4e4e74a 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -328,6 +328,8 @@ public: @@ -455,14 +465,23 @@ index 5d00d39bd837..ccdd3632e6e5 100644 SfxAllItemSet *pParams = new SfxAllItemSet( SfxGetpApp()->GetPool() ); pImpl->m_pSet.reset( pParams ); TransformParameters( SID_OPENDOC, aArgs, *pParams ); -+ pImpl->m_aArgs = aArgs; ++ SetArgs(aArgs); OUString aFilterProvider, aFilterName; { -@@ -3301,6 +3304,7 @@ SfxMedium::SfxMedium( const uno::Sequence& aArgs ) : +@@ -3301,6 +3304,16 @@ SfxMedium::SfxMedium( const uno::Sequence& aArgs ) : Init_Impl(); } ++void SfxMedium::SetArgs(const uno::Sequence& rArgs) ++{ ++ pImpl->m_aArgs = rArgs; ++ comphelper::SequenceAsHashMap aArgsMap(rArgs); ++ aArgsMap.erase("Stream"); ++ aArgsMap.erase("InputStream"); ++ pImpl->m_aArgs = aArgsMap.getAsConstPropertyValueList(); ++} ++ +uno::Sequence SfxMedium::GetArgs() const { return pImpl->m_aArgs; } SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const std::shared_ptr& p ) : diff --git a/SOURCES/libreoffice-base-symbolic.svg b/SOURCES/libreoffice-base-symbolic.svg deleted file mode 100644 index 16f3cef..0000000 --- a/SOURCES/libreoffice-base-symbolic.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - diff --git a/SOURCES/libreoffice-calc-symbolic.svg b/SOURCES/libreoffice-calc-symbolic.svg deleted file mode 100644 index bf56588..0000000 --- a/SOURCES/libreoffice-calc-symbolic.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - diff --git a/SOURCES/libreoffice-draw-symbolic.svg b/SOURCES/libreoffice-draw-symbolic.svg deleted file mode 100644 index 7ca94ee..0000000 --- a/SOURCES/libreoffice-draw-symbolic.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - diff --git a/SOURCES/libreoffice-impress-symbolic.svg b/SOURCES/libreoffice-impress-symbolic.svg deleted file mode 100644 index 9a16f76..0000000 --- a/SOURCES/libreoffice-impress-symbolic.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - diff --git a/SOURCES/libreoffice-main-symbolic.svg b/SOURCES/libreoffice-main-symbolic.svg deleted file mode 100644 index 6bd3103..0000000 --- a/SOURCES/libreoffice-main-symbolic.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - diff --git a/SOURCES/libreoffice-math-symbolic.svg b/SOURCES/libreoffice-math-symbolic.svg deleted file mode 100644 index 66cd9e7..0000000 --- a/SOURCES/libreoffice-math-symbolic.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - diff --git a/SOURCES/libreoffice-writer-symbolic.svg b/SOURCES/libreoffice-writer-symbolic.svg deleted file mode 100644 index e97b545..0000000 --- a/SOURCES/libreoffice-writer-symbolic.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - diff --git a/SPECS/libreoffice.spec b/SPECS/libreoffice.spec index 0b65bf6..36ba2f7 100644 --- a/SPECS/libreoffice.spec +++ b/SPECS/libreoffice.spec @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 12%{?libo_prerelease}%{?dist} +Release: 13%{?libo_prerelease}%{?dist} 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/ @@ -2287,11 +2287,14 @@ done %{_includedir}/LibreOfficeKit %changelog +* Mon Nov 21 2022 Stephan Bergmann - 1:6.4.7.2-13 +- Resolves: rhbz#2031681 Failure saving to smb share + * Fri Oct 14 2022 Caolán McNamara - 1:6.4.7.2-12 -- Resolves: rhbz#2134752 CVE-2022-26305 Untrusted Macros -- Resolves: rhbz#2134751 CVE-2022-26307 Weak Master Keys -- Resolves: rhbz#2134750 CVE-2022-26306 Static Initialization Vector -- Resolves: rhbz#2134753 CVE-2022-3140 Macro URL arbitrary script execution +- Resolves: rhbz#2118928 CVE-2022-26305 Untrusted Macros +- Resolves: rhbz#2118924 CVE-2022-26307 Weak Master Keys +- Resolves: rhbz#2118920 CVE-2022-26306 Static Initialization Vector +- Resolves: rhbz#2134702 CVE-2022-3140 Macro URL arbitrary script execution * Mon Mar 07 2022 Caolán McNamara - 1:6.4.7.2-11 - Resolves: rhbz#2060559 CVE-2021-25636