Package: release.debian.org Severity: normal Tags: stretch User: release.debian....@packages.debian.org Usertags: pu
Hi, now that https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925 is finally fixed in stretch-p-u I think it's time to fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913641 in the sense that we conflict against the "broken" OpenJDK (and build-conflict against it. So we can remove the "build hack" needed to be introduced in the +deb9u5 security update). I also included a simple documentation fix I noticed when seeing https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=926009 Diff is diff -Nru libreoffice-5.2.7/debian/changelog libreoffice-5.2.7/debian/changelog --- libreoffice-5.2.7/debian/changelog 2019-01-23 18:51:09.000000000 +0100 +++ libreoffice-5.2.7/debian/changelog 2019-01-23 18:51:09.000000000 +0100 @@ -1,3 +1,15 @@ +libreoffice (1:5.2.7-1+deb9u6) stretch; urgency=medium + + * debian/patches/mention-java-common-package.diff: update message to + reflect current config dir... + * debian/patches/disableClassPathURLCheck.diff: revert openjdk is fixed + + * debian/control.in: + - make -core conflict against openjdk-8-jre-headless (= 8u181-b13-2~deb9u1) + (closes: 913641#) and build-conflict against it + + -- Rene Engelhard <r...@debian.org> Wed, 23 Jan 2019 18:51:09 +0100 + libreoffice (1:5.2.7-1+deb9u5) stretch-security; urgency=high * debian/patches/disableClassPathURLCheck.diff: add workaround to diff -Nru libreoffice-5.2.7/debian/control libreoffice-5.2.7/debian/control --- libreoffice-5.2.7/debian/control 2019-01-23 18:51:09.000000000 +0100 +++ libreoffice-5.2.7/debian/control 2019-01-23 18:51:09.000000000 +0100 @@ -183,6 +183,7 @@ nvidia-glx-dev, nvidia-glx-legacy-dev, nvidia-libopencl1, + openjdk-8-jre-headless (= 8u181-b13-2~deb9u1), qt3-dev-tools Standards-Version: 3.9.4 Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git @@ -430,7 +431,10 @@ myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), myspell-tl (<< 0.4-0-5) -Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled +Conflicts: cacao-oj6-jre, + libreoffice-filter-binfilter, + libreoffice-unbundled, + openjdk-8-jre-headless (= 8u181-b13-2~deb9u1) Provides: libreoffice-bundled Replaces: libreoffice-calc (<< 1:3.3.2-5), libreoffice-common (<< 1:4.4.0~rc3-1), diff -Nru libreoffice-5.2.7/debian/control.in libreoffice-5.2.7/debian/control.in --- libreoffice-5.2.7/debian/control.in 2018-11-23 07:50:05.000000000 +0100 +++ libreoffice-5.2.7/debian/control.in 2019-01-23 18:51:09.000000000 +0100 @@ -20,6 +20,7 @@ libc6-dev (= 2.6.1-4) [i386 amd64], libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), + openjdk-8-jre-headless (= 8u181-b13-2~deb9u1), nvidia-glx-dev, nvidia-glx-legacy-dev, qt3-dev-tools, @@ -269,7 +270,7 @@ myspell-th (<< 1:3.1.0-3), myspell-tl (<< 0.4-0-5), browser-plugin-libreoffice -Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled +Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled, openjdk-8-jre-headless (= 8u181-b13-2~deb9u1) Provides: libreoffice-bundled Replaces: libreoffice-calc (<< 1:3.3.2-5), libreoffice-common (<< 1:4.4.0~rc3-1), diff -Nru libreoffice-5.2.7/debian/patches/disableClassPathURLCheck.diff libreoffice-5.2.7/debian/patches/disableClassPathURLCheck.diff --- libreoffice-5.2.7/debian/patches/disableClassPathURLCheck.diff 2018-12-28 11:20:29.000000000 +0100 +++ libreoffice-5.2.7/debian/patches/disableClassPathURLCheck.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- a/configure.ac-old 2018-12-28 11:10:35.953066686 +0100 -+++ b/configure.ac 2018-12-28 11:11:06.049403639 +0100 -@@ -6976,6 +6976,7 @@ - - # set to limit VM usage for JunitTests - JAVAIFLAGS=-Xmx64M -+ JAVAIFLAGS="$JAVAIFLAGS -Djdk.net.URLClassPath.disableClassPathURLCheck=true" - # set to limit VM usage for javac - JAVAFLAGS=-J-Xmx128M - fi diff -Nru libreoffice-5.2.7/debian/patches/mention-java-common-package.diff libreoffice-5.2.7/debian/patches/mention-java-common-package.diff --- libreoffice-5.2.7/debian/patches/mention-java-common-package.diff 2017-09-17 15:36:00.000000000 +0200 +++ libreoffice-5.2.7/debian/patches/mention-java-common-package.diff 2019-01-23 18:51:09.000000000 +0100 @@ -8,7 +8,7 @@ fprintf(stderr,"javaldx: Could not find a Java Runtime Environment! \n"); + fprintf(stderr,"Please ensure that a JVM and the package libreoffice-java-common\n"); + fprintf(stderr,"is installed.\n"); -+ fprintf(stderr,"If it is already installed then try removing ~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n"); ++ fprintf(stderr,"If it is already installed then try removing ~/.config/libreoffice/4/user/config/javasettings_Linux_*.xml\n"); return false; } else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE) diff -Nru libreoffice-5.2.7/debian/patches/series libreoffice-5.2.7/debian/patches/series --- libreoffice-5.2.7/debian/patches/series 2018-12-28 11:20:43.000000000 +0100 +++ libreoffice-5.2.7/debian/patches/series 2019-01-23 18:51:09.000000000 +0100 @@ -39,6 +39,5 @@ layout-footnote-use-after-free.diff CVE-2018-10119.diff CVE-2018-10120.diff -disableClassPathURLCheck.diff keep-pyuno-script-processing-below-base-uri.diff show-partial-signatures-even-if-cert-validation-fails.diff May I upload? Regards, Rene -- System Information: Debian Release: buster/sid APT prefers testing APT policy: (990, 'testing') Architecture: arm64 (aarch64) Kernel: Linux 4.19.0-4-arm64 (SMP w/4 CPU cores) Kernel taint flags: TAINT_CRAP Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
