From 0d6193981df68d1ecbdc53036417809972f40767 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Thu, 16 May 2024 14:43:07 +0800 Subject: [PATCH 1/6] update to libreoffice-7.1.8.1-12.1.src.rpm Signed-off-by: Zhao Hang --- 0001-neon-fit-with-older-gnutls.patch | 70 ------------------------ 1000-skip-failed-tests-for-anolis.patch | 56 ------------------- dist | 2 +- download | 2 - libreoffice.spec | 72 ++++++++++--------------- 5 files changed, 29 insertions(+), 173 deletions(-) delete mode 100644 0001-neon-fit-with-older-gnutls.patch delete mode 100644 1000-skip-failed-tests-for-anolis.patch diff --git a/0001-neon-fit-with-older-gnutls.patch b/0001-neon-fit-with-older-gnutls.patch deleted file mode 100644 index 56d6e58..0000000 --- a/0001-neon-fit-with-older-gnutls.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d6fb4e010e18309373f4ba581f9fd74fd8212762 Mon Sep 17 00:00:00 2001 -From: Liwei Ge -Date: Mon, 18 Jul 2022 20:34:06 +0800 -Subject: [PATCH] neon: fit with older gnutls - ---- - external/neon/configs/config.h | 2 ++ - external/neon/neon_fit_with_older_gnutls.patch | 15 +++++++++++++++ - 2 files changed, 17 insertions(+) - create mode 100644 external/neon/neon_fit_with_older_gnutls.patch - -diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h -index af8408ad9..662afc516 100644 ---- a/external/neon/configs/config.h -+++ b/external/neon/configs/config.h -@@ -83,6 +83,8 @@ - /* Define if GnuTLS support is enabled */ - #define HAVE_GNUTLS - -+#define HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION2 -+ - /* Define to 1 if you have the `gnutls_certificate_get_x509_cas' function. */ - /* #undef HAVE_GNUTLS_CERTIFICATE_GET_X509_CAS */ - -diff --git a/external/neon/neon_fit_with_older_gnutls.patch b/external/neon/neon_fit_with_older_gnutls.patch -new file mode 100644 -index 000000000..4eda62a5b ---- /dev/null -+++ b/external/neon/neon_fit_with_older_gnutls.patch -@@ -0,0 +1,26 @@ -+diff -Nur src/ne_gnutls.h src/ne_gnutls.h -+--- src/ne_gnutls.c 2020-06-20 15:09:24.000000000 +0800 -++++ src/ne_gnutls.c 2022-07-18 11:22:00.000000000 +0800 -+@@ -32,6 +32,7 @@ -+ #include -+ -+ #include -++#include -+ #include -+ -+ #ifdef NE_HAVE_TS_SSL -+diff -Nur src/ne_privssl.h src/ne_privssl.h -+--- src/ne_privssl.h 2020-06-20 15:09:24.000000000 +0800 -++++ src/ne_privssl.h 2022-07-18 11:22:00.000000000 +0800 -+@@ -86,9 +86,11 @@ -+ -+ typedef gnutls_session_t ne_ssl_socket; -+ -++#ifdef HAVE_GNUTLS_PRIVKEY_IMPORT_EXT -+ NE_PRIVATE ne_ssl_client_cert * -+ ne__ssl_clicert_exkey_import(const unsigned char *der, size_t der_len, -+ gnutls_privkey_sign_func sign_func, void *userdata); -++#endif -+ -+ #endif /* HAVE_GNUTLS */ -+ -diff --git a/external/neon/UnpackedTarball_neon.mk b/external/neon/UnpackedTarball_neon.mk -index 73cdd81f2..bb15e3f48 100644 ---- a/external/neon/UnpackedTarball_neon.mk -+++ b/external/neon/UnpackedTarball_neon.mk -@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,neon,\ - external/neon/neon.patch \ - external/neon/neon_with_gnutls.patch \ - external/neon/neon_fix_lock_token_on_if.patch \ -+ external/neon/neon_fit_with_older_gnutls.patch \ - $(if $(filter WNT,$(OS)),external/neon/neon_fix_no_OPENSSL_Applink.patch) \ - )) - --- -2.27.0 diff --git a/1000-skip-failed-tests-for-anolis.patch b/1000-skip-failed-tests-for-anolis.patch deleted file mode 100644 index 2dcdfdb..0000000 --- a/1000-skip-failed-tests-for-anolis.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c872a58e9bd929cbbb036b4656cd0b81e0d67980 Mon Sep 17 00:00:00 2001 -From: Bo Ren -Date: Mon, 15 Jan 2024 10:58:44 +0800 -Subject: [PATCH] skip failed tests for anolis - -Signed-off-by: Bo Ren ---- - desktop/qa/desktop_lib/test_desktop_lib.cxx | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx -index 701f624038..07a3de2cdd 100644 ---- a/desktop/qa/desktop_lib/test_desktop_lib.cxx -+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx -@@ -183,8 +183,8 @@ public: - void testGetSignatureState_NonSigned(); - void testGetSignatureState_Signed(); - void testInsertCertificate_DER_ODT(); -- void testInsertCertificate_PEM_ODT(); -- void testInsertCertificate_PEM_DOCX(); -+ // void testInsertCertificate_PEM_ODT(); -+ // void testInsertCertificate_PEM_DOCX(); - void testSignDocument_PEM_PDF(); - void testTextSelectionHandles(); - void testComplexSelection(); -@@ -245,8 +245,8 @@ public: - CPPUNIT_TEST(testGetSignatureState_NonSigned); - #if !MPL_HAVE_SUBSET - CPPUNIT_TEST(testInsertCertificate_DER_ODT); -- CPPUNIT_TEST(testInsertCertificate_PEM_ODT); -- CPPUNIT_TEST(testInsertCertificate_PEM_DOCX); -+ // CPPUNIT_TEST(testInsertCertificate_PEM_ODT); -+ // CPPUNIT_TEST(testInsertCertificate_PEM_DOCX); - CPPUNIT_TEST(testSignDocument_PEM_PDF); - #endif - CPPUNIT_TEST(testTextSelectionHandles); -@@ -2544,7 +2544,7 @@ void DesktopLOKTest::testInsertCertificate_DER_ODT() - CPPUNIT_ASSERT_EQUAL(int(1), nState); - } - -- -+/* - void DesktopLOKTest::testInsertCertificate_PEM_ODT() - { - // Load the document, save it into a temp file and load that file again -@@ -2658,6 +2658,7 @@ void DesktopLOKTest::testInsertCertificate_PEM_DOCX() - int nState = pDocument->m_pDocumentClass->getSignatureState(pDocument); - CPPUNIT_ASSERT_EQUAL(int(5), nState); - } -+*/ - - void DesktopLOKTest::testSignDocument_PEM_PDF() - { --- -2.31.1 - diff --git a/dist b/dist index 89c1faf..0b1f29d 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an9 +an9_3 diff --git a/download b/download index 9557ca9..cfe5c0a 100644 --- a/download +++ b/download @@ -4,5 +4,3 @@ d66ae64561a9bccc27c8d0b9b3c691fd libreoffice-help-7.1.8.1.tar.xz ce3404913b8f0f93a1cb9dfdc4f30bf3 libreoffice-help-7.1.8.1.tar.xz.asc 566cabebe62d53a2a62e73a413b3daeb libreoffice-translations-7.1.8.1.tar.xz 92a1ff79401bb8be34de192bb409364e libreoffice-translations-7.1.8.1.tar.xz.asc -c871268f0ba365b71f1ec1bf068d6ab3 neon-0.31.2.tar.gz -b66ec21e0a0ac331afb4b1bc5c9ef966 xmlsec1-1.2.30.tar.gz diff --git a/libreoffice.spec b/libreoffice.spec index 30269c3..40dc890 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 # 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,11 +7,11 @@ # Should contain any suffix of release tarball name, e.g., -buildfix1. %global libo_buildfix %{nil} # rhbz#715152 state vendor -%if 0%{?anolis} -%global vendoroption --with-vendor="OpenAnolis Community" +%if 0%{?rhel} +%global vendoroption --with-vendor="Red Hat, Inc." %endif %if 0%{?fedora} -%global vendoroption --with-vendor="OpenAnolis Community" +%global vendoroption --with-vendor="The Fedora Project" %endif %global libo_python python3 %global libo_python_executable %{__python3} @@ -58,10 +57,9 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 12%{?libo_prerelease}%{anolis_release}%{?dist} +Release: 12%{?libo_prerelease}%{?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/ -Excludearch: loongarch64 Source0: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz Source1: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc @@ -85,9 +83,6 @@ Source13: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zi Source14: %{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf %global bundling_options %{?bundling_options} --without-system-hsqldb -Source20: http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.30.tar.gz -Source21: https://notroj.github.io/neon/neon-0.31.2.tar.gz - Provides: bundled(hsqldb) = 1.8.0 %if 0%{?fedora} Provides: bundled(rhino) = 1.5 @@ -220,7 +215,7 @@ BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libepubgen-0.1) BuildRequires: pkgconfig(libqxp-0.0) -%if 0%{?fedora} > 33 || 0%{?rhel} > 8 || 0%{?anolis} >= 8 +%if 0%{?fedora} > 33 || 0%{?rhel} > 8 BuildRequires: pkgconfig(liborcus-0.16) %else BuildRequires: pkgconfig(liborcus-0.15) @@ -233,7 +228,7 @@ BuildRequires: ant %if 0%{?fedora} BuildRequires: bsh %endif -BuildRequires: java-11-devel +BuildRequires: java-devel BuildRequires: junit BuildRequires: pentaho-reporting-flow-engine @@ -304,8 +299,6 @@ Patch43: 0006-CVE-2023-6186-backporting.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch -Patch1000: 0001-neon-fit-with-older-gnutls.patch -Patch1001: 1000-skip-failed-tests-for-anolis.patch %global instdir %{_libdir} %global baseinstdir %{instdir}/libreoffice @@ -601,7 +594,7 @@ Arch-independent part of %{name}-ure. Summary: Software Development Kit for LibreOffice Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release} -Requires: unzip%{?_isa}, java-11-devel +Requires: unzip%{?_isa}, java-devel %description sdk The LibreOffice SDK is an add-on for the LibreOffice office suite. It provides @@ -876,6 +869,7 @@ Rules for auto-correcting common %{langname} typing errors. \ %langpack -l de -n German -F -H -Y -M -A -T -X %langpack -l dz -n Dzongkha -F -s ctl -T -X %langpack -l el -n Greek -F -H -Y -M -A -T -X +%langpack -l eo -n Esperanto -F -H -M -T -X %langpack -l es -n Spanish -F -H -Y -M -A -T -X %langpack -l et -n Estonian -F -H -Y -T -X %langpack -l eu -n Basque -F -H -Y -T -X @@ -1041,26 +1035,26 @@ rm -rf git-hooks */git-hooks %global __scm git_am %__scm_setup_git_am -#Customize Palette to add Anolis colours +#Customize Palette to add Red Hat colours (head -n -1 extras/source/palettes/standard.soc && \ - echo -e ' - - - - ' && \ - tail -n 1 extras/source/palettes/standard.soc) > anolis.soc -mv -f anolis.soc extras/source/palettes/standard.soc -git commit -q -a -m 'add Anolis colors to palette' + 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' # apply patches %autopatch -M 99 %if 0%{?rhel} +# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1954999 +# From https://src.fedoraproject.org/rpms/python3.9/pull-request/60 +# Make at least a local rhpkg prep on Fedora work.. +%{?!apply_patch:%define apply_patch(qp:m:) {%__apply_patch %**}} %apply_patch -q %{PATCH500} %endif -%if 0%{?anolis} -%apply_patch -q %{PATCH1000} -%apply_patch -q %{PATCH1001} -%endif sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk # ppc64le sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk # aarch64/ppc64*/s390x @@ -1077,6 +1071,9 @@ sed -i -e /CppunitTest_dbaccess_hsqlbinary_import/d dbaccess/Module_dbaccess.mk sed -i -e /CppunitTest_vcl_svm_test/d vcl/Module_vcl.mk sed -i -e /CustomTarget_uno_test/d testtools/Module_testtools.mk %endif +# Broken with system nss. See also upstream commit ac519af951541b7313a4c98e1bee463bf47356be +sed -i -e '/^\s*CPPUNIT_TEST(testInsertCertificate_PEM_ODT);/d' desktop/qa/desktop_lib/test_desktop_lib.cxx +sed -i -e '/^\s*CPPUNIT_TEST(testInsertCertificate_PEM_DOCX);/d' desktop/qa/desktop_lib/test_desktop_lib.cxx git commit -q -a -m 'temporarily disable failing tests' @@ -1170,11 +1167,7 @@ touch autogen.lastrun %{distrooptions} \ %{?bundling_options} \ %{?archoptions} \ - %{?flatpakoptions} \ - --with-jdk-home=/usr/lib/jvm/java-11-openjdk \ - --with-system-neon=no \ - --with-system-xmlsec=no - + %{?flatpakoptions} make verbose=true build-nocheck @@ -1587,9 +1580,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/help/main_transform.xsl %{baseinstdir}/presets %dir %{baseinstdir}/program -%if 0%{?anolis} -%{baseinstdir}/program/libneon.so -%endif %if 0%{?fedora} %{baseinstdir}/program/core.abignore %endif @@ -2309,15 +2299,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog -* Tue Mar 26 2024 Kaiqiang Wang - 1:7.18.1-12.0.1 -- fix CVE-2023-6185 CVE-2023-6186 - -* Wed Dec 06 2023 yangxiaoxuan 1:7.1.8.1-11.0.1 -- Add configuration file and vemdor for Anolis OS -- Fit build on Anolis OS 8 -- Remove loongarch64 arch -- skip failed tests for anolis -- remove Esperanto +* Fri Mar 08 2024 Eike Rathke - 1:7.1.8.1-12.1 +- Fix CVE-2023-6185 escape url passed to gstreamer +- Fix CVE-2023-6186 check link target protocols * Tue Jun 20 2023 Stephan Bergmann - 1:7.1.8.1-11 - Resolves: rhbz#2210193 CVE-2023-0950 Array Index UnderFlow in Calc Formula -- Gitee From a54af9e7df0c7a00eac8ac127394bd3f36f4850f Mon Sep 17 00:00:00 2001 From: yangxiaoxuan Date: Tue, 2 Feb 2021 01:12:37 +0800 Subject: [PATCH 2/6] spec: add configuration file and vemdor for anolis Signed-off-by: yangxiaoxuan Change-Id: I7ab913f7f76a0f10d896c0902d2093dca662fb7d --- libreoffice.spec | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 40dc890..ad6418b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # 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 @@ -7,11 +8,11 @@ # Should contain any suffix of release tarball name, e.g., -buildfix1. %global libo_buildfix %{nil} # rhbz#715152 state vendor -%if 0%{?rhel} -%global vendoroption --with-vendor="Red Hat, Inc." +%if 0%{?anolis} +%global vendoroption --with-vendor="OpenAnolis Community" %endif %if 0%{?fedora} -%global vendoroption --with-vendor="The Fedora Project" +%global vendoroption --with-vendor="OpenAnolis Community" %endif %global libo_python python3 %global libo_python_executable %{__python3} @@ -57,7 +58,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 12%{?libo_prerelease}%{?dist}.1 +Release: 12%{?libo_prerelease}%{anolis_release}%{?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/ @@ -1035,16 +1036,16 @@ 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 Anolis 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) > anolis.soc +mv -f anolis.soc extras/source/palettes/standard.soc +git commit -q -a -m 'add Anolis colors to palette' # apply patches %autopatch -M 99 @@ -2299,6 +2300,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Thu May 16 2024 yangxiaoxuan 1:7.1.8.1-12.0.1.1 +- Add configuration file and vemdor for Anolis OS + * Fri Mar 08 2024 Eike Rathke - 1:7.1.8.1-12.1 - Fix CVE-2023-6185 escape url passed to gstreamer - Fix CVE-2023-6186 check link target protocols -- Gitee From 3d424d86e9bf08a8a24acc569fa5e6d211111f91 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Mon, 18 Jul 2022 20:44:51 +0800 Subject: [PATCH 3/6] build: bundle with neon-0.31.2 and xmlsec1-1.2.30 --- 0001-neon-fit-with-older-gnutls.patch | 70 +++++++++++++++++++++++++++ download | 2 + libreoffice.spec | 23 +++++++-- 3 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 0001-neon-fit-with-older-gnutls.patch diff --git a/0001-neon-fit-with-older-gnutls.patch b/0001-neon-fit-with-older-gnutls.patch new file mode 100644 index 0000000..56d6e58 --- /dev/null +++ b/0001-neon-fit-with-older-gnutls.patch @@ -0,0 +1,70 @@ +From d6fb4e010e18309373f4ba581f9fd74fd8212762 Mon Sep 17 00:00:00 2001 +From: Liwei Ge +Date: Mon, 18 Jul 2022 20:34:06 +0800 +Subject: [PATCH] neon: fit with older gnutls + +--- + external/neon/configs/config.h | 2 ++ + external/neon/neon_fit_with_older_gnutls.patch | 15 +++++++++++++++ + 2 files changed, 17 insertions(+) + create mode 100644 external/neon/neon_fit_with_older_gnutls.patch + +diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h +index af8408ad9..662afc516 100644 +--- a/external/neon/configs/config.h ++++ b/external/neon/configs/config.h +@@ -83,6 +83,8 @@ + /* Define if GnuTLS support is enabled */ + #define HAVE_GNUTLS + ++#define HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION2 ++ + /* Define to 1 if you have the `gnutls_certificate_get_x509_cas' function. */ + /* #undef HAVE_GNUTLS_CERTIFICATE_GET_X509_CAS */ + +diff --git a/external/neon/neon_fit_with_older_gnutls.patch b/external/neon/neon_fit_with_older_gnutls.patch +new file mode 100644 +index 000000000..4eda62a5b +--- /dev/null ++++ b/external/neon/neon_fit_with_older_gnutls.patch +@@ -0,0 +1,26 @@ ++diff -Nur src/ne_gnutls.h src/ne_gnutls.h ++--- src/ne_gnutls.c 2020-06-20 15:09:24.000000000 +0800 +++++ src/ne_gnutls.c 2022-07-18 11:22:00.000000000 +0800 ++@@ -32,6 +32,7 @@ ++ #include ++ ++ #include +++#include ++ #include ++ ++ #ifdef NE_HAVE_TS_SSL ++diff -Nur src/ne_privssl.h src/ne_privssl.h ++--- src/ne_privssl.h 2020-06-20 15:09:24.000000000 +0800 +++++ src/ne_privssl.h 2022-07-18 11:22:00.000000000 +0800 ++@@ -86,9 +86,11 @@ ++ ++ typedef gnutls_session_t ne_ssl_socket; ++ +++#ifdef HAVE_GNUTLS_PRIVKEY_IMPORT_EXT ++ NE_PRIVATE ne_ssl_client_cert * ++ ne__ssl_clicert_exkey_import(const unsigned char *der, size_t der_len, ++ gnutls_privkey_sign_func sign_func, void *userdata); +++#endif ++ ++ #endif /* HAVE_GNUTLS */ ++ +diff --git a/external/neon/UnpackedTarball_neon.mk b/external/neon/UnpackedTarball_neon.mk +index 73cdd81f2..bb15e3f48 100644 +--- a/external/neon/UnpackedTarball_neon.mk ++++ b/external/neon/UnpackedTarball_neon.mk +@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,neon,\ + external/neon/neon.patch \ + external/neon/neon_with_gnutls.patch \ + external/neon/neon_fix_lock_token_on_if.patch \ ++ external/neon/neon_fit_with_older_gnutls.patch \ + $(if $(filter WNT,$(OS)),external/neon/neon_fix_no_OPENSSL_Applink.patch) \ + )) + +-- +2.27.0 diff --git a/download b/download index cfe5c0a..9557ca9 100644 --- a/download +++ b/download @@ -4,3 +4,5 @@ d66ae64561a9bccc27c8d0b9b3c691fd libreoffice-help-7.1.8.1.tar.xz ce3404913b8f0f93a1cb9dfdc4f30bf3 libreoffice-help-7.1.8.1.tar.xz.asc 566cabebe62d53a2a62e73a413b3daeb libreoffice-translations-7.1.8.1.tar.xz 92a1ff79401bb8be34de192bb409364e libreoffice-translations-7.1.8.1.tar.xz.asc +c871268f0ba365b71f1ec1bf068d6ab3 neon-0.31.2.tar.gz +b66ec21e0a0ac331afb4b1bc5c9ef966 xmlsec1-1.2.30.tar.gz diff --git a/libreoffice.spec b/libreoffice.spec index ad6418b..01b0c2d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -84,6 +84,9 @@ Source13: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zi Source14: %{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf %global bundling_options %{?bundling_options} --without-system-hsqldb +Source20: http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.30.tar.gz +Source21: https://notroj.github.io/neon/neon-0.31.2.tar.gz + Provides: bundled(hsqldb) = 1.8.0 %if 0%{?fedora} Provides: bundled(rhino) = 1.5 @@ -216,7 +219,7 @@ BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libepubgen-0.1) BuildRequires: pkgconfig(libqxp-0.0) -%if 0%{?fedora} > 33 || 0%{?rhel} > 8 +%if 0%{?fedora} > 33 || 0%{?rhel} > 8 || 0%{?anolis} >= 8 BuildRequires: pkgconfig(liborcus-0.16) %else BuildRequires: pkgconfig(liborcus-0.15) @@ -229,7 +232,7 @@ BuildRequires: ant %if 0%{?fedora} BuildRequires: bsh %endif -BuildRequires: java-devel +BuildRequires: java-11-devel BuildRequires: junit BuildRequires: pentaho-reporting-flow-engine @@ -300,6 +303,7 @@ Patch43: 0006-CVE-2023-6186-backporting.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch +Patch1000: 0001-neon-fit-with-older-gnutls.patch %global instdir %{_libdir} %global baseinstdir %{instdir}/libreoffice @@ -595,7 +599,7 @@ Arch-independent part of %{name}-ure. Summary: Software Development Kit for LibreOffice Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release} -Requires: unzip%{?_isa}, java-devel +Requires: unzip%{?_isa}, java-11-devel %description sdk The LibreOffice SDK is an add-on for the LibreOffice office suite. It provides @@ -1056,6 +1060,9 @@ git commit -q -a -m 'add Anolis colors to palette' %{?!apply_patch:%define apply_patch(qp:m:) {%__apply_patch %**}} %apply_patch -q %{PATCH500} %endif +%if 0%{?anolis} +%apply_patch -q %{PATCH1000} +%endif sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk # ppc64le sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk # aarch64/ppc64*/s390x @@ -1168,7 +1175,11 @@ touch autogen.lastrun %{distrooptions} \ %{?bundling_options} \ %{?archoptions} \ - %{?flatpakoptions} + %{?flatpakoptions} \ + --with-jdk-home=/usr/lib/jvm/java-11-openjdk \ + --with-system-neon=no \ + --with-system-xmlsec=no + make verbose=true build-nocheck @@ -1581,6 +1592,9 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/help/main_transform.xsl %{baseinstdir}/presets %dir %{baseinstdir}/program +%if 0%{?anolis} +%{baseinstdir}/program/libneon.so +%endif %if 0%{?fedora} %{baseinstdir}/program/core.abignore %endif @@ -2302,6 +2316,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Thu May 16 2024 yangxiaoxuan 1:7.1.8.1-12.0.1.1 - Add configuration file and vemdor for Anolis OS +- Fit build on Anolis OS 8 * Fri Mar 08 2024 Eike Rathke - 1:7.1.8.1-12.1 - Fix CVE-2023-6185 escape url passed to gstreamer -- Gitee From 32f77d7614b51160e37fcaf2eca99ff6ec9ade5d Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Thu, 18 May 2023 16:28:59 +0800 Subject: [PATCH 4/6] spec: remove loongarch64 arch Signed-off-by: Zhao Hang --- libreoffice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index 01b0c2d..87f7821 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -61,6 +61,7 @@ Version: %{libo_version}.1 Release: 12%{?libo_prerelease}%{anolis_release}%{?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/ +Excludearch: loongarch64 Source0: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz Source1: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc @@ -2317,6 +2318,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : * Thu May 16 2024 yangxiaoxuan 1:7.1.8.1-12.0.1.1 - Add configuration file and vemdor for Anolis OS - Fit build on Anolis OS 8 +- Remove loongarch64 arch * Fri Mar 08 2024 Eike Rathke - 1:7.1.8.1-12.1 - Fix CVE-2023-6185 escape url passed to gstreamer -- Gitee From 64bca05a17777c54a9df50c6ddd0076e09400d6c Mon Sep 17 00:00:00 2001 From: Renbo Date: Mon, 15 Jan 2024 11:03:59 +0800 Subject: [PATCH 5/6] skip failed tests for anolis and remove Esperanto Signed-off-by: Renbo --- 1000-skip-failed-tests-for-anolis.patch | 56 +++++++++++++++++++++++++ libreoffice.spec | 5 ++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 1000-skip-failed-tests-for-anolis.patch diff --git a/1000-skip-failed-tests-for-anolis.patch b/1000-skip-failed-tests-for-anolis.patch new file mode 100644 index 0000000..2dcdfdb --- /dev/null +++ b/1000-skip-failed-tests-for-anolis.patch @@ -0,0 +1,56 @@ +From c872a58e9bd929cbbb036b4656cd0b81e0d67980 Mon Sep 17 00:00:00 2001 +From: Bo Ren +Date: Mon, 15 Jan 2024 10:58:44 +0800 +Subject: [PATCH] skip failed tests for anolis + +Signed-off-by: Bo Ren +--- + desktop/qa/desktop_lib/test_desktop_lib.cxx | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx +index 701f624038..07a3de2cdd 100644 +--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx ++++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx +@@ -183,8 +183,8 @@ public: + void testGetSignatureState_NonSigned(); + void testGetSignatureState_Signed(); + void testInsertCertificate_DER_ODT(); +- void testInsertCertificate_PEM_ODT(); +- void testInsertCertificate_PEM_DOCX(); ++ // void testInsertCertificate_PEM_ODT(); ++ // void testInsertCertificate_PEM_DOCX(); + void testSignDocument_PEM_PDF(); + void testTextSelectionHandles(); + void testComplexSelection(); +@@ -245,8 +245,8 @@ public: + CPPUNIT_TEST(testGetSignatureState_NonSigned); + #if !MPL_HAVE_SUBSET + CPPUNIT_TEST(testInsertCertificate_DER_ODT); +- CPPUNIT_TEST(testInsertCertificate_PEM_ODT); +- CPPUNIT_TEST(testInsertCertificate_PEM_DOCX); ++ // CPPUNIT_TEST(testInsertCertificate_PEM_ODT); ++ // CPPUNIT_TEST(testInsertCertificate_PEM_DOCX); + CPPUNIT_TEST(testSignDocument_PEM_PDF); + #endif + CPPUNIT_TEST(testTextSelectionHandles); +@@ -2544,7 +2544,7 @@ void DesktopLOKTest::testInsertCertificate_DER_ODT() + CPPUNIT_ASSERT_EQUAL(int(1), nState); + } + +- ++/* + void DesktopLOKTest::testInsertCertificate_PEM_ODT() + { + // Load the document, save it into a temp file and load that file again +@@ -2658,6 +2658,7 @@ void DesktopLOKTest::testInsertCertificate_PEM_DOCX() + int nState = pDocument->m_pDocumentClass->getSignatureState(pDocument); + CPPUNIT_ASSERT_EQUAL(int(5), nState); + } ++*/ + + void DesktopLOKTest::testSignDocument_PEM_PDF() + { +-- +2.31.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 87f7821..96ed884 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -305,6 +305,7 @@ Patch43: 0006-CVE-2023-6186-backporting.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch Patch1000: 0001-neon-fit-with-older-gnutls.patch +Patch1001: 1000-skip-failed-tests-for-anolis.patch %global instdir %{_libdir} %global baseinstdir %{instdir}/libreoffice @@ -875,7 +876,6 @@ Rules for auto-correcting common %{langname} typing errors. \ %langpack -l de -n German -F -H -Y -M -A -T -X %langpack -l dz -n Dzongkha -F -s ctl -T -X %langpack -l el -n Greek -F -H -Y -M -A -T -X -%langpack -l eo -n Esperanto -F -H -M -T -X %langpack -l es -n Spanish -F -H -Y -M -A -T -X %langpack -l et -n Estonian -F -H -Y -T -X %langpack -l eu -n Basque -F -H -Y -T -X @@ -1063,6 +1063,7 @@ git commit -q -a -m 'add Anolis colors to palette' %endif %if 0%{?anolis} %apply_patch -q %{PATCH1000} +%apply_patch -q %{PATCH1001} %endif sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk # ppc64le @@ -2319,6 +2320,8 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : - Add configuration file and vemdor for Anolis OS - Fit build on Anolis OS 8 - Remove loongarch64 arch +- skip failed tests for anolis +- remove Esperanto * Fri Mar 08 2024 Eike Rathke - 1:7.1.8.1-12.1 - Fix CVE-2023-6185 escape url passed to gstreamer -- Gitee From 9ebc1f33da5fe29daeb44c89794975a8b68de1a7 Mon Sep 17 00:00:00 2001 From: wangkaiqiang Date: Tue, 26 Mar 2024 20:27:16 +0800 Subject: [PATCH 6/6] fix CVE-2023-6185 CVE-2023-6186 --- libreoffice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.spec b/libreoffice.spec index 96ed884..16bd3a2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2322,6 +2322,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : - Remove loongarch64 arch - skip failed tests for anolis - remove Esperanto +- fix CVE-2023-6185 CVE-2023-6186 (wangkaiqiang@inspur.com) * Fri Mar 08 2024 Eike Rathke - 1:7.1.8.1-12.1 - Fix CVE-2023-6185 escape url passed to gstreamer -- Gitee