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-disable-tests-that-don-t-work-without-pdfium.patch b/0001-disable-tests-that-don-t-work-without-pdfium.patch new file mode 100644 index 0000000..6783881 --- /dev/null +++ b/0001-disable-tests-that-don-t-work-without-pdfium.patch @@ -0,0 +1,61 @@ +From 5597567fbecbb62cdc9e64e68b9fe9bf23e032a6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 4 Dec 2020 12:58:20 +0000 +Subject: [PATCH] disable tests that don't work without pdfium + +we're probably past the end of the road on --disable-pdfium + +Change-Id: Id91ea6c77bbdb3ecf609a7ffd16a278eb3b17e91 +--- + xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx +index 7659fe9485c5..68738134cc36 100644 +--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx ++++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx +@@ -7,6 +7,8 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + ++#include ++ + #include + #include + +@@ -414,6 +416,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testBadCertP1) + = verify(m_directories.getURLFromSrc(DATA_DIRECTORY) + "bad-cert-p1.pdf", 1, + /*rExpectedSubFilter=*/OString()); + CPPUNIT_ASSERT(!aInfos.empty()); ++#if HAVE_FEATURE_PDFIUM + SignatureInformation& rInformation = aInfos[0]; + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 0 (SecurityOperationStatus_UNKNOWN) +@@ -421,6 +424,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testBadCertP1) + // i.e. annotation after a P1 signature was not considered as a bad modification. + CPPUNIT_ASSERT_EQUAL(xml::crypto::SecurityOperationStatus::SecurityOperationStatus_UNKNOWN, + rInformation.nStatus); ++#endif + } + + CPPUNIT_TEST_FIXTURE(PDFSigningTest, testBadCertP3Stamp) +@@ -429,14 +433,15 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testBadCertP3Stamp) + = verify(m_directories.getURLFromSrc(DATA_DIRECTORY) + "bad-cert-p3-stamp.pdf", 1, + /*rExpectedSubFilter=*/OString()); + CPPUNIT_ASSERT(!aInfos.empty()); ++#if HAVE_FEATURE_PDFIUM + SignatureInformation& rInformation = aInfos[0]; +- + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 0 (SecurityOperationStatus_UNKNOWN) + // - Actual : 1 (SecurityOperationStatus_OPERATION_SUCCEEDED) + // i.e. adding a stamp annotation was not considered as a bad modification. + CPPUNIT_ASSERT_EQUAL(xml::crypto::SecurityOperationStatus::SecurityOperationStatus_UNKNOWN, + rInformation.nStatus); ++#endif + } + + /// Test writing a PAdES signature. +-- +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-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 33 || 0%{?rhel} > 8 -Patch5: 0001-Upgrade-liborcus-to-0.16.0.patch -%endif Patch6: 0001-rhbz-1882616-move-cursor-one-step-at-a-time-in-the-d.patch Patch7: 0001-export-HYPERLINK-target-in-html-clipboard-export.patch -Patch8: 0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch -Patch9: 0001-fix-disable-pdfium-build.patch Patch10: 0001-gcc11.patch +Patch11: 0001-disable-tests-that-don-t-work-without-pdfium.patch -%if 0%{?rhel} +# Patches with numbers above 100 are applied conditionally +Patch101: 0001-Upgrade-liborcus-to-0.16.0.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch -%endif %global instdir %{_libdir} %global baseinstdir %{instdir}/libreoffice @@ -336,7 +334,9 @@ to be written in python. %package base Summary: Database front-end for LibreOffice +%if 0%{?fedora} Requires: firebird +%endif Requires: pentaho-reporting-flow-engine Requires: postgresql-jdbc Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} @@ -984,13 +984,10 @@ gpgv2 --keyring ./keyring.gpg %{SOURCE5} %{SOURCE4} %setup -q -n %{name}-%{version}%{?libo_prerelease} -b 2 -b 4 rm -rf git-hooks */git-hooks -# set up git repo -git init -git config user.name rpmbuild -git config user.email rpmbuild@fedoraproject.org -git config gc.auto 0 # disable auto packing -git add -A -git commit -q -a -m %{name}-%{version} +# This is normally done by %%autosetup -S git_am, +# but that does not work with multiple -b options, so we use plain %%setup above +%global __scm git_am +%__scm_setup_git_am #Customize Palette to add Red Hat colours (head -n -1 extras/source/palettes/standard.soc && \ @@ -1004,7 +1001,14 @@ mv -f redhat.soc extras/source/palettes/standard.soc git commit -q -a -m 'add Red Hat colors to palette' # apply patches -git am %{patches} +%autopatch -M 99 +%if 0%{?fedora} > 33 || 0%{?rhel} > 8 +%apply_patch -q %{PATCH101} +%endif +%if 0%{?rhel} +%apply_patch -q %{PATCH500} +%endif + sed -i -e /CppunitTest_sw_ooxmlexport7/d sw/Module_sw.mk # i686 sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk # ppc64le @@ -1062,7 +1066,7 @@ export CFLAGS=$ARCH_FLAGS export CXXFLAGS=$ARCH_FLAGS %if 0%{?rhel} -%define distrooptions --disable-eot --disable-scripting-beanshell --disable-scripting-javascript +%define distrooptions --disable-eot --disable-scripting-beanshell --disable-scripting-javascript --disable-firebird-sdbc %else # fedora %define distrooptions --enable-eot --enable-kf5 @@ -1863,7 +1867,9 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %endif %{baseinstdir}/program/libabplo.so %{baseinstdir}/program/libdbplo.so +%if 0%{?fedora} %{baseinstdir}/program/libfirebird_sdbclo.so +%endif %{baseinstdir}/program/libhsqldb.so %{baseinstdir}/program/librptlo.so %{baseinstdir}/program/librptuilo.so @@ -2263,10 +2269,19 @@ done %{_includedir}/LibreOfficeKit %changelog -* Tue Nov 02 2020 Jeff Law - 1:7.0.3.2-2 +* Wed Dec 02 2020 Thierry Vignaud 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 + +* Mon Nov 23 2020 Caolán McNamara - 1:7.0.3.1-3 +- Resolves: rhbz#1900428 don't crash on invalid index used in StarBasic macro + +* Tue Nov 03 2020 Jeff Law - 1:7.0.3.1-2 - Fix missing #include for gcc-11 -* Thu Oct 29 2020 Caolán McNamara - 1:7.0.3.2-1 +* Thu Oct 29 2020 Caolán McNamara - 1:7.0.3.1-1 - latest version * Sun Oct 25 2020 Caolán McNamara - 1:7.0.2.2-3 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