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] - 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