From 7cc2d988b33e5903000e01e1c6d70b3319f4fd8213e007a54d1f05b77a0f04b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 9 Feb 2018 12:56:20 +0000 Subject: [PATCH 1/5] - Version update to 6.0.1.1: * various fixes all around * Fixes data exposure bsc#1080249 CVE-2018-1055 - Bump the version of libgpg-error - Drop the libreoffice-poppler-0.62.patch merged upstream OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=597 --- libgpg-error-1.26.tar.bz2 | 3 --- libgpg-error-1.27.tar.bz2 | 3 +++ libreoffice-6.0.0.3.tar.xz | 3 --- libreoffice-6.0.1.1.tar.xz | 3 +++ libreoffice-help-6.0.0.3.tar.xz | 3 --- libreoffice-help-6.0.1.1.tar.xz | 3 +++ libreoffice-poppler-0.62.patch | 31 ------------------------- libreoffice-translations-6.0.0.3.tar.xz | 3 --- libreoffice-translations-6.0.1.1.tar.xz | 3 +++ libreoffice.changes | 9 +++++++ libreoffice.spec | 10 ++++---- 11 files changed, 25 insertions(+), 49 deletions(-) delete mode 100644 libgpg-error-1.26.tar.bz2 create mode 100644 libgpg-error-1.27.tar.bz2 delete mode 100644 libreoffice-6.0.0.3.tar.xz create mode 100644 libreoffice-6.0.1.1.tar.xz delete mode 100644 libreoffice-help-6.0.0.3.tar.xz create mode 100644 libreoffice-help-6.0.1.1.tar.xz delete mode 100644 libreoffice-poppler-0.62.patch delete mode 100644 libreoffice-translations-6.0.0.3.tar.xz create mode 100644 libreoffice-translations-6.0.1.1.tar.xz diff --git a/libgpg-error-1.26.tar.bz2 b/libgpg-error-1.26.tar.bz2 deleted file mode 100644 index b80a576..0000000 --- a/libgpg-error-1.26.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69 -size 798096 diff --git a/libgpg-error-1.27.tar.bz2 b/libgpg-error-1.27.tar.bz2 new file mode 100644 index 0000000..19c3ccd --- /dev/null +++ b/libgpg-error-1.27.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2 +size 813060 diff --git a/libreoffice-6.0.0.3.tar.xz b/libreoffice-6.0.0.3.tar.xz deleted file mode 100644 index 0a33279..0000000 --- a/libreoffice-6.0.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc2171845ec19d5a0cece2c0052172011b2ec435cac80cb47637f2af94e19e3d -size 203284136 diff --git a/libreoffice-6.0.1.1.tar.xz b/libreoffice-6.0.1.1.tar.xz new file mode 100644 index 0000000..373e0cd --- /dev/null +++ b/libreoffice-6.0.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f802a9c6ed645218a07b34530113f357b694f2653d734fe8a9003068b5670a9 +size 203420780 diff --git a/libreoffice-help-6.0.0.3.tar.xz b/libreoffice-help-6.0.0.3.tar.xz deleted file mode 100644 index 052926e..0000000 --- a/libreoffice-help-6.0.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f4750a5dc087c1b700dc200ffe614932e4f854c185084207b79f5a8e2968442 -size 2972556 diff --git a/libreoffice-help-6.0.1.1.tar.xz b/libreoffice-help-6.0.1.1.tar.xz new file mode 100644 index 0000000..2ce4a27 --- /dev/null +++ b/libreoffice-help-6.0.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4466ffc014f5dd3bc7b2676c18e25687c95b00f0379b61c8db988091a4a5d647 +size 2972872 diff --git a/libreoffice-poppler-0.62.patch b/libreoffice-poppler-0.62.patch deleted file mode 100644 index 5416752..0000000 --- a/libreoffice-poppler-0.62.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: libreoffice-6.0.0.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -=================================================================== ---- libreoffice-6.0.0.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ libreoffice-6.0.0.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -32,10 +32,12 @@ - #pragma warning(push, 1) - #endif - --// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 -+// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1, then renamed to UnicodeMapFuncs.h in 0.62.0 - // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) - // because the internal poppler does not provide poppler-version.h and the macro always returns 0 --#if POPPLER_CHECK_VERSION(0, 21, 1) -+#if POPPLER_CHECK_VERSION(0, 62, 0) -+#include -+#elif POPPLER_CHECK_VERSION(0, 21, 1) - #include - #elif POPPLER_CHECK_VERSION(0, 21, 0) - #include "UTF.h" -@@ -913,7 +915,11 @@ void PDFOutDev::drawChar(GfxState *state - ); - - // silence spurious warning -+#if POPPLER_CHECK_VERSION(0, 62, 0) -+ (void)&mapUTF16; -+#else - (void)&mapUCS2; -+#endif - - char buf[9]; - for( int i=0; i Date: Mon, 12 Feb 2018 08:50:25 +0000 Subject: [PATCH 2/5] * Fixes data exposure bsc#1080249 CVE-2018-1055 CVE-2018-6871 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=598 --- libreoffice.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index a71ded9..033bb7f 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -3,7 +3,7 @@ Fri Feb 9 11:59:11 UTC 2018 - tchvatal@suse.com - Version update to 6.0.1.1: * various fixes all around - * Fixes data exposure bsc#1080249 CVE-2018-1055 + * Fixes data exposure bsc#1080249 CVE-2018-1055 CVE-2018-6871 - Bump the version of libgpg-error - Drop the libreoffice-poppler-0.62.patch merged upstream From a177f50cb3da0788aa8d0b8bdca17dd6ee24ce6478081c0d7369aec7b4962c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 12 Feb 2018 09:25:13 +0000 Subject: [PATCH 3/5] - Make sure we execute everything with python3 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=599 --- libreoffice.changes | 5 +++++ libreoffice.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 033bb7f..0e749a7 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 12 09:24:51 UTC 2018 - tchvatal@suse.com + +- Make sure we execute everything with python3 + ------------------------------------------------------------------- Fri Feb 9 11:59:11 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index cb9cfc3..1cc0c7f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -946,6 +946,8 @@ google_api_key="AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q" google_default_client_id="4139804441.apps.googleusercontent.com" google_default_client_secret="KDTRKEZk2jwT_7CDpcmMA--P" +# make sure we execute everything with python3 +export PYTHON=%{_bindir}/python3 # do not run configure in autogen but use macro later export NOCONFIGURE=yes ./autogen.sh From dab7527eec6e49358fbe0b6e561dfea656007136bf330277f7ca075e3ef9fdd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 12 Feb 2018 12:21:38 +0000 Subject: [PATCH 4/5] - Bump version of bundled gpgme to 1.9.0 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=600 --- gpgme-1.8.0.tar.bz2 | 3 --- gpgme-1.9.0.tar.bz2 | 3 +++ libreoffice.changes | 1 + libreoffice.spec | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 gpgme-1.8.0.tar.bz2 create mode 100644 gpgme-1.9.0.tar.bz2 diff --git a/gpgme-1.8.0.tar.bz2 b/gpgme-1.8.0.tar.bz2 deleted file mode 100644 index 432def9..0000000 --- a/gpgme-1.8.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33 -size 1298407 diff --git a/gpgme-1.9.0.tar.bz2 b/gpgme-1.9.0.tar.bz2 new file mode 100644 index 0000000..8fe4c80 --- /dev/null +++ b/gpgme-1.9.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb +size 1344222 diff --git a/libreoffice.changes b/libreoffice.changes index 0e749a7..5686921 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -2,6 +2,7 @@ Mon Feb 12 09:24:51 UTC 2018 - tchvatal@suse.com - Make sure we execute everything with python3 +- Bump version of bundled gpgme to 1.9.0 ------------------------------------------------------------------- Fri Feb 9 11:59:11 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 1cc0c7f..d3423dc 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -64,7 +64,7 @@ Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{nu Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 # GPGME bundle list -Source1000: %{external_url}/gpgme-1.8.0.tar.bz2 +Source1000: %{external_url}/gpgme-1.9.0.tar.bz2 Source1001: %{external_url}/libgpg-error-1.27.tar.bz2 Source1002: %{external_url}/libassuan-2.4.3.tar.bz2 # Internal bundled stuff we can't remove From ea000d08bd42d23be9b5e95d8e755b76bb2edff3df2f0c397f45a94fd2603365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 13 Feb 2018 11:29:58 +0000 Subject: [PATCH 5/5] * 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=601 --- ...UILD-instead-of-calling-python-direc.patch | 40 +++++++++++++++++++ libreoffice.changes | 1 + libreoffice.spec | 16 ++++---- 3 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch diff --git a/0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch b/0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch new file mode 100644 index 0000000..b606d3e --- /dev/null +++ b/0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch @@ -0,0 +1,40 @@ +From 5c4c83dd7ee9145408d80dbac606547c8006ad2a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Tue, 13 Feb 2018 10:57:54 +0100 +Subject: [PATCH] Use PYTHON_FOR_BUILD instead of calling python directly + +Change-Id: I85ff669c3cfd6d9b3284972cfa1d8a805ea3b6d4 +--- + postprocess/CustomTarget_images.mk | 2 +- + testtools/source/bridgetest/pyuno/makefile.mk | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk +index 603c73d522d4..871c7bd6470c 100644 +--- a/postprocess/CustomTarget_images.mk ++++ b/postprocess/CustomTarget_images.mk +@@ -33,7 +33,7 @@ $(packimages_DIR)/%.zip : \ + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) + $(call gb_Helper_abbreviate_dirs, \ + ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \ +- $(PYTHON) $(SRCDIR)/solenv/bin/pack_images.py \ ++ $(PYTHON_FOR_BUILD) $(SRCDIR)/solenv/bin/pack_images.py \ + $(if $(DEFAULT_THEME),\ + -g $(packimages_DIR) -m $(packimages_DIR) -c $(packimages_DIR),\ + -g $(SRCDIR)/icon-themes/$(subst images_,,$*) -m $(SRCDIR)/icon-themes/$(subst images_,,$*) -c $(SRCDIR)/icon-themes/$(subst images_,,$*) \ +diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk +index 5dbd0038f009..112be23c9ce8 100644 +--- a/testtools/source/bridgetest/pyuno/makefile.mk ++++ b/testtools/source/bridgetest/pyuno/makefile.mk +@@ -46,7 +46,7 @@ REGEXC=$(DLLDEST)$/regcomp$(EXECPOST) + .IF "$(SYSTEM_PYTHON)"!="YES" + PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python + .ELSE # "$(SYSTEM_PYTHON)"!="YES" +-PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) python ++PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(PYTHON_FOR_BUILD) + .ENDIF # "$(SYSTEM_PYTHON)"!="YES" + .IF "$(OS)"=="WNT" + PYTHONPATH:=$(SOLARLIBDIR)$/pyuno;$(PWD);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload +-- +2.16.1 + diff --git a/libreoffice.changes b/libreoffice.changes index 5686921..56918fb 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -2,6 +2,7 @@ Mon Feb 12 09:24:51 UTC 2018 - tchvatal@suse.com - Make sure we execute everything with python3 + * 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch - Bump version of bundled gpgme to 1.9.0 ------------------------------------------------------------------- diff --git a/libreoffice.spec b/libreoffice.spec index d3423dc..78a6127 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -87,9 +87,10 @@ Source2008: %{external_url}/pdfium-3235.tar.bz2 Patch1: scp2-user-config-suse.diff # do not use the broken help; unopkg complained about it when registering extensions # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files -Patch4: nlpsolver-no-broken-help.diff -Patch5: mediawiki-no-broken-help.diff -Patch6: kde5-configure-checks.patch +Patch2: nlpsolver-no-broken-help.diff +Patch3: mediawiki-no-broken-help.diff +Patch4: kde5-configure-checks.patch +Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -876,9 +877,10 @@ Provides additional %{langname} translations and resources for %{project}. \ %if 0%{?suse_version} < 1330 %patch1 %endif -%patch4 -%patch5 -%patch6 -p1 +%patch2 +%patch3 +%patch4 -p1 +%patch5 -p1 %patch990 -p1 # Disable some of the failing tests (some are random) @@ -946,8 +948,6 @@ google_api_key="AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q" google_default_client_id="4139804441.apps.googleusercontent.com" google_default_client_secret="KDTRKEZk2jwT_7CDpcmMA--P" -# make sure we execute everything with python3 -export PYTHON=%{_bindir}/python3 # do not run configure in autogen but use macro later export NOCONFIGURE=yes ./autogen.sh