From dd559c7efd66fed6c8d977930b90c73f77d01cbf Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 2 Dec 2020 17:07:15 +0100 Subject: [PATCH] Update to 7.0.4 RC1 --- .gitignore | 12 +-- ...00428-don-t-crash-on-invalid-index-u.patch | 38 ---------- 0001-fix-disable-pdfium-build.patch | 74 ------------------- ...-fix-unit-test-with-non-pdfium-build.patch | 36 --------- ...gest-package-install-of-the-most-app.patch | 37 ---------- libreoffice.spec | 11 ++- sources | 12 +-- 7 files changed, 17 insertions(+), 203 deletions(-) delete mode 100644 0001-Resolves-rhbz-1900428-don-t-crash-on-invalid-index-u.patch delete mode 100644 0001-fix-disable-pdfium-build.patch delete mode 100644 0001-fix-unit-test-with-non-pdfium-build.patch delete mode 100644 0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch diff --git a/.gitignore b/.gitignore index 301027f..41becd4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,9 @@ /884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf /libreoffice-multiliblauncher.sh /dtoa-20180411.tgz -/libreoffice-7.0.3.1.tar.xz -/libreoffice-7.0.3.1.tar.xz.asc -/libreoffice-help-7.0.3.1.tar.xz -/libreoffice-help-7.0.3.1.tar.xz.asc -/libreoffice-translations-7.0.3.1.tar.xz -/libreoffice-translations-7.0.3.1.tar.xz.asc +/libreoffice-7.0.4.1.tar.xz +/libreoffice-7.0.4.1.tar.xz.asc +/libreoffice-help-7.0.4.1.tar.xz +/libreoffice-help-7.0.4.1.tar.xz.asc +/libreoffice-translations-7.0.4.1.tar.xz +/libreoffice-translations-7.0.4.1.tar.xz.asc diff --git a/0001-Resolves-rhbz-1900428-don-t-crash-on-invalid-index-u.patch b/0001-Resolves-rhbz-1900428-don-t-crash-on-invalid-index-u.patch deleted file mode 100644 index 19c4be7..0000000 --- a/0001-Resolves-rhbz-1900428-don-t-crash-on-invalid-index-u.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 800731dd5910e5af928f05a77a921abe13ec8346 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Mon, 23 Nov 2020 10:04:38 +0000 -Subject: [PATCH] Resolves: rhbz#1900428 don't crash on invalid index used in - StarBasic macro - -Change-Id: I05064f7e9216c9c43b49950b309afe72466857a6 ---- - dbaccess/source/core/api/RowSetBase.cxx | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx -index 0bbe5e80ae0a..df8c46a72554 100644 ---- a/dbaccess/source/core/api/RowSetBase.cxx -+++ b/dbaccess/source/core/api/RowSetBase.cxx -@@ -230,11 +230,16 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) - OSL_ENSURE( pTemp != reinterpret_cast(0xfeeefeee),"HALT!" ); - } - OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow < m_pCache->getEnd() && aCacheIter != m_pCache->m_aCacheIterators.end(),"Invalid iterator set for currentrow!"); -- ORowSetRow rRow = *m_aCurrentRow; -- OSL_ENSURE(rRow.is() && o3tl::make_unsigned(columnIndex) < rRow->size(),"Invalid size of vector!"); - #endif -+ ORowSetRow rRow = *m_aCurrentRow; -+ bool bValidPosition = rRow.is() && o3tl::make_unsigned(columnIndex) < rRow->size(); -+ if (!bValidPosition) -+ { -+ SAL_WARN("dbaccess", "ORowSetBase::getValue: Invalid size of vector!"); -+ ::dbtools::throwSQLException( DBA_RES( RID_STR_CURSOR_BEFORE_OR_AFTER ), StandardSQLState::INVALID_CURSOR_POSITION, *m_pMySelf ); -+ } - m_nLastColumnIndex = columnIndex; -- return (**m_aCurrentRow)[m_nLastColumnIndex]; -+ return (*rRow)[m_nLastColumnIndex]; - } - - // we should normally never reach this --- -2.28.0 - diff --git a/0001-fix-disable-pdfium-build.patch b/0001-fix-disable-pdfium-build.patch deleted file mode 100644 index 5f114a6..0000000 --- a/0001-fix-disable-pdfium-build.patch +++ /dev/null @@ -1,74 +0,0 @@ -From e835e268f3140f26987041222c7ed0cdd4bc51a1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 29 Oct 2020 15:45:01 +0000 -Subject: [PATCH] fix --disable-pdfium build - -Change-Id: I580972220bc39abe16288fa62c717e4ab25833d9 ---- - vcl/source/filter/ipdf/pdfread.cxx | 2 +- - xmlsecurity/source/pdfio/pdfdocument.cxx | 11 +++++++---- - 2 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx -index 3066c4deba4a..bf11578089e0 100644 ---- a/vcl/source/filter/ipdf/pdfread.cxx -+++ b/vcl/source/filter/ipdf/pdfread.cxx -@@ -218,7 +218,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vector& rBi - (void)rBitmaps; - (void)nFirstPage; - (void)nPages; -- (void)fResolutionDPI; -+ (void)pSizeHint; - return 0; - #endif // HAVE_FEATURE_PDFIUM - } -diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx -index c132d02cc2b0..b229206391f2 100644 ---- a/xmlsecurity/source/pdfio/pdfdocument.cxx -+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx -@@ -138,10 +138,10 @@ bool IsCompleteSignature(SvStream& rStream, vcl::filter::PDFDocument& rDocument, - return std::find(rAllEOFs.begin(), rAllEOFs.end(), nFileEnd) != rAllEOFs.end(); - } - -+#if HAVE_FEATURE_PDFIUM - /// Collects the checksum of each page of one version of the PDF. - void AnalyizeSignatureStream(SvMemoryStream& rStream, std::vector& rPageChecksums) - { --#if HAVE_FEATURE_PDFIUM - auto pPdfium = vcl::pdf::PDFiumLibrary::get(); - vcl::pdf::PDFiumDocument aPdfDocument( - FPDF_LoadMemDocument(rStream.GetData(), rStream.GetSize(), /*password=*/nullptr)); -@@ -158,10 +158,8 @@ void AnalyizeSignatureStream(SvMemoryStream& rStream, std::vectorgetChecksum(); - rPageChecksums.push_back(nPageChecksum); - } --#else -- (void)rStream; --#endif - } -+#endif - - /** - * Checks if incremental updates after singing performed valid modifications only. -@@ -175,6 +173,7 @@ bool IsValidSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignatu - return false; - } - -+#if HAVE_FEATURE_PDFIUM - SvMemoryStream aSignatureStream; - sal_uInt64 nPos = rStream.Tell(); - rStream.Seek(0); -@@ -196,6 +195,10 @@ bool IsValidSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignatu - // Fail if any page looks different after signing and at the end. Annotations/commenting doesn't - // count, though. - return aSignedPages == aAllPages; -+#else -+ (void)rStream; -+ return true; -+#endif - } - } - --- -2.26.2 - diff --git a/0001-fix-unit-test-with-non-pdfium-build.patch b/0001-fix-unit-test-with-non-pdfium-build.patch deleted file mode 100644 index 4fd6fe2..0000000 --- a/0001-fix-unit-test-with-non-pdfium-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3c19d5bd51673d3ec776ac7b3a4e43137b98b789 Mon Sep 17 00:00:00 2001 -From: Noel Grandin -Date: Thu, 20 Aug 2020 21:54:25 +0200 -Subject: [PATCH] fix unit-test with non-pdfium build - -otherwise testSwappingPageNumber will crash accessing out of -bounds element in vector. - -Change-Id: I07499e79d523931e1f3cc02a5150f033e1ea9578 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101094 -Tested-by: Jenkins -Reviewed-by: Noel Grandin -(cherry picked from commit 17798a503bc67f2a38f4b558e37447d1ea8f4623) ---- - filter/source/pdf/pdfdecomposer.cxx | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/filter/source/pdf/pdfdecomposer.cxx b/filter/source/pdf/pdfdecomposer.cxx -index e053fd215369..e54206e4c175 100644 ---- a/filter/source/pdf/pdfdecomposer.cxx -+++ b/filter/source/pdf/pdfdecomposer.cxx -@@ -70,7 +70,10 @@ uno::Sequence> SAL_CALL XPdfDecomposer::ge - nPageIndex = 0; - - std::vector aBitmaps; -- vcl::RenderPDFBitmaps(xPdfData.getConstArray(), xPdfData.getLength(), aBitmaps, nPageIndex, 1); -+ int rv = vcl::RenderPDFBitmaps(xPdfData.getConstArray(), xPdfData.getLength(), aBitmaps, -+ nPageIndex, 1); -+ if (rv == 0) -+ return {}; // happens if we do not have PDFium - - BitmapEx aReplacement(aBitmaps[0]); - --- -2.28.0 - diff --git a/0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch b/0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch deleted file mode 100644 index 0741f41..0000000 --- a/0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 42c62def5f94ae070ac98bd75e3da1381982ebe7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Sun, 25 Oct 2020 20:39:50 +0000 -Subject: [PATCH] rhbz#1891326 suggest package install of the most appropiate - pt langpack - -Change-Id: I87ff1a941a3a5dc0c321440a9c286ae73c9d0384 ---- - svtools/source/misc/langhelp.cxx | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx -index e64a3b869076..9f1e84ba4580 100644 ---- a/svtools/source/misc/langhelp.cxx -+++ b/svtools/source/misc/langhelp.cxx -@@ -139,6 +139,18 @@ OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence 1:7.0.4.1-1 +- Update to 7.0.4 RC1 + * Tue Nov 24 2020 Caolán McNamara - 1:7.0.3.1-4 - Resolves: rhbz#1900937 fix null deref in non-pdfium build diff --git a/sources b/sources index e3f659f..f6e60fe 100644 --- a/sources +++ b/sources @@ -7,9 +7,9 @@ SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838d SHA512 (884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = ce7e23e750f2c6f7ff2e590cc8941caa18eaae2727c9ca31313ab72ab19278055bd9393d38b0b5b685594e2f04ee15cb83b3bbb25d09665fe7383d7f26bf2ae8 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 -SHA512 (libreoffice-7.0.3.1.tar.xz) = 1680b5166ead7ca521130f7d23cb2bd73d3d4f801f94c9a3ab0066fb7763ced3c01d89fbe1b7a79a1826bcfd6ebcd3ce5fb3014ab6583034f08ed25969ab5f36 -SHA512 (libreoffice-7.0.3.1.tar.xz.asc) = 70b3199448a75132b4f5293f69204a8c79fb5ce38a8020a1e3abec53af7703c9de788bbe47523a54974fdc705796fc2bc92ec6e12d7d36dbfb65948b0e01fc5d -SHA512 (libreoffice-help-7.0.3.1.tar.xz) = 1acbc7575da99ce0a09a3092a8612f47c432ffd8d4b6029c885c782a857c6b0812bb2eee3873b0cdfa41ee42f84a0843c3d06109ccb651b5bba5ade1a6725a78 -SHA512 (libreoffice-help-7.0.3.1.tar.xz.asc) = dce1a06bdd857722e0b722377ae287435b9fa38df0acb83ebca8fd7bcd71d9ead057604fafec1e6aa4cb8cd25a2d78866a26eab6c3be6dacac276acfbb8187ce -SHA512 (libreoffice-translations-7.0.3.1.tar.xz) = ad9e081a233f9dc53028b4ac913d503bd88ba4c0a3e8325008b6c64cf845dc1724e77ad04d37b5c4b594548f2429cd9a554cdcbbdf454d1797d1c41271a52192 -SHA512 (libreoffice-translations-7.0.3.1.tar.xz.asc) = ab260da507cc8396884d6ec7084a765a82b25f427ce82a569a701e3706462fed13680c3eb1fb8285e2253061ad61829954710ce60d3cda0d05eb23f87a1d540b +SHA512 (libreoffice-7.0.4.1.tar.xz) = 0ed133b25862e216f59ae69dd977e7501f41e1d1a0d2bb012447982ce5b4b68a7413b1a6f610f1c4f2aea3d19609a7a3fac23870f0b8162edf7c65b8fe5bcc54 +SHA512 (libreoffice-7.0.4.1.tar.xz.asc) = 77cad553e5dbccf6bf82c9942c79d8f3e9e091aa3cd8348a0114faaa5ec08fa38f857e095132a9e31f87a7f7729d295caa46c1057ca565179dd1c69e945f6d38 +SHA512 (libreoffice-help-7.0.4.1.tar.xz) = 258db0291bcf4b082546b1705a40a8aa8dba6e27a52939163d449d95d8b358be074fd541aefbb60b9f718c67f448809def7d62f3198f3e40258621153b8a6723 +SHA512 (libreoffice-help-7.0.4.1.tar.xz.asc) = acfcff7e4b74d4e54faaea74a0d6dd63c52914ab3b551cc594bfbe1e04095cdd706bf3a1d255c444f70b6177063bba7bdd8db8dd3654439f20e971d91f53bc90 +SHA512 (libreoffice-translations-7.0.4.1.tar.xz) = f61acfbe50cefbcf2edeb564df9bc05eeb4e52601052ff3cae7295d1e2c0da6f29072b05cbfca92e60829f4fd92bac8f8a7353399c38c8fc068acd78e56fec6a +SHA512 (libreoffice-translations-7.0.4.1.tar.xz.asc) = 424e91977933d05c3fcef9399e0413dec21d07956832b2f9c5c2542b828d080221e2dce3d16d1a62855292801ec9f8f6b465f97fb64cdc265935a35d09ebbe7e