Bug#890189: stretch-pu: package libreoffice/1:5.2.7-1+deb9u3
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu
This is a follow-up to the 1:5.2.7-1+deb9u2 security update.
- As was correctly pointed out on IRC the debdiff contains cruft from the
1:5.2.7-1 backport to jessie:
--- snip ---
Base version: libreoffice_5.2.7-1
Target version: libreoffice_5.2.7-1+deb9u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/libr/libreoffice/libreoffice_5.2.7-1.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/libr/libreoffice/libreoffice_5.2.7-1+deb9u1.dsc
[...]
libreoffice-dbg.postinst.debhelper | 3
libreoffice-dbg.postrm.debhelper | 3
libreoffice-dbg.preinst.debhelper | 3
libreoffice-dbg.prerm.debhelper | 3
libreoffice-dbg.substvars | 4
[...]
uno-libs3-dbg.substvars | 3
ure-dbg.substvars | 3
--- snip ---
They have been removed.
- Upstream pointed out that my backport of the 5.4 patches contain a
minor bug flagging more stuff as an error than needed. If we are not
mistaken this isn't as critical to warrant a new security round again,
so... Fix:
@@ -445,7 +445,7 @@ index 0d55e87..b475b1c 100644
- sal_Int32 nRead = 0;
- while ( ( nRead = xStream->readBytes( buffer, BUF_LEN ) ) == BUF_LEN )
-+ bool bWasError = (pMyFormulaCell && pMyFormulaCell->GetRawError() != formula::errNoCode);
++ bool bWasError = (pMyFormulaCell && pMyFormulaCell->GetRawError() != formula::errNONE);
+
+ if (!pLink)
{
@@ -484,8 +484,8 @@ index 0d55e87..b475b1c 100644
- xStream->closeInput();
+ // If an new Error from Reschedule appears when the link is executed then reset the errorflag
-+ if (pMyFormulaCell && pMyFormulaCell->GetRawError() != formula::errNoCode && !bWasError)
-+ pMyFormulaCell->SetErrCode(formula::errNoCode);
++ if (pMyFormulaCell && pMyFormulaCell->GetRawError() != formula::errNONE && !bWasError)
++ pMyFormulaCell->SetErrCode(formula::errNONE);
+
+ // check the value
+ if (pLink->HasResult())
@@ -1104,3 +1104,15 @@ index 9de5851..586511d 100644
--
1.9.1
+diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
+index 173c744..5a5a8fd 100644
+--- a/include/formula/errorcodes.hxx
++++ b/include/formula/errorcodes.hxx
+@@ -24,6 +24,7 @@
+
+ namespace formula {
+
++const sal_uInt16 errNONE = 0;
+ const sal_uInt16 errIllegalChar = 501;
+ const sal_uInt16 errIllegalArgument = 502;
+ const sal_uInt16 errIllegalFPOperation = 503; // #NUM!
and changing two FormulaError::NoValue to the correct formula::errNoValue.
(just for clarity, these are incremental patches, so this one not
actually used)
- dk.mk is in -dev-common but is actually arch-specific. So it's moved
to -dev. This file is needed for libreoffice-dev usage via the SDKs
own mechanism.
- disabling tests on !amd64/!i386 (where it's notfatal) because the
the jpeg filter (and thus vcl_filters_test) leaks memory and the test
tries to use 100g on arm64/ppc64el builds and thus it got killed by
jcristau. Fixed upstream but too big and intrusive to backport imho.
-security doesn't want that fix in -security, so here it is.
Full debdiff to deb9u2 attached.
Regards,
Rene
-- System Information:
Debian Release: buster/sid
APT prefers testing
APT policy: (990, 'testing')
Architecture: arm64 (aarch64)
Kernel: Linux 4.14.0-3-arm64 (SMP w/4 CPU cores)
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 /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru libreoffice-5.2.7/debian/changelog libreoffice-5.2.7/debian/changelog
--- libreoffice-5.2.7/debian/changelog 2018-02-09 07:22:22.000000000 +0100
+++ libreoffice-5.2.7/debian/changelog 2018-02-09 16:24:58.000000000 +0100
@@ -1,3 +1,16 @@
+libreoffice (1:5.2.7-1+deb9u3) stretch; urgency=medium
+
+ * debian/patches/WEBSERVICE-DDE.diff: improve to not throw more errors than
+ neccessary (use the right error code) on WEBSERVICE() failures, thanks
+ Jan-Marek Glogowski; do another s/FormulaError::NoValue/formula::errNoValue/
+
+ * debian/rules:
+ - do not run the tests except on i386 (notfatal) and amd64
+ - move dk.mk from -dev-common to -dev as it's not arch-indep, thanks
+ Rico Tzschichholz
+
+ -- Rene Engelhard <rene@debian.org> Fri, 09 Feb 2018 16:24:58 +0100
+
libreoffice (1:5.2.7-1+deb9u2) stretch-security; urgency=high
* fix control
diff -Nru libreoffice-5.2.7/debian/control libreoffice-5.2.7/debian/control
--- libreoffice-5.2.7/debian/control 2018-02-09 07:21:38.000000000 +0100
+++ libreoffice-5.2.7/debian/control 2018-02-09 16:24:58.000000000 +0100
@@ -4376,9 +4376,9 @@
Suggests: libmythes-dev, libreoffice-dev-doc, libreofficekit-dev
Replaces: libreoffice-common (<< 1:4.1.0~beta1),
libreoffice-core (<< 1:4.1.0~beta1),
- libreoffice-dev-common (<< 1:5.2.6-2)
+ libreoffice-dev-common (<< 1:5.2.7-2)
Conflicts: libreoffice (<< 1:5.2.5-2~), libreoffice-dev-doc (<< 1:5.2.5-2~)
-Breaks: libreoffice-dev-common (<< 1:5.2.6-2)
+Breaks: libreoffice-dev-common (<< 1:5.2.7-2)
Description: office productivity suite -- SDK -- architecture-dependent parts
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff -Nru libreoffice-5.2.7/debian/control.sdk.in libreoffice-5.2.7/debian/control.sdk.in
--- libreoffice-5.2.7/debian/control.sdk.in 2018-02-07 20:08:04.000000000 +0100
+++ libreoffice-5.2.7/debian/control.sdk.in 2018-02-09 16:24:58.000000000 +0100
@@ -9,9 +9,9 @@
${shlibs:Depends}
Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
Suggests: libmythes-dev, libreofficekit-dev, libreoffice-dev-doc
-Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1), libreoffice-dev-common (<< 1:5.2.6-2)
+Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1), libreoffice-dev-common (<< 1:5.2.7-2)
Conflicts: libreoffice-dev-doc (<< 1:5.2.5-2~), libreoffice (<< 1:5.2.5-2~)
-Breaks: libreoffice-dev-common (<< 1:5.2.6-2)
+Breaks: libreoffice-dev-common (<< 1:5.2.7-2)
Description: office productivity suite -- SDK -- architecture-dependent parts
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff -Nru libreoffice-5.2.7/debian/libreoffice-dbg.postinst.debhelper libreoffice-5.2.7/debian/libreoffice-dbg.postinst.debhelper
--- libreoffice-5.2.7/debian/libreoffice-dbg.postinst.debhelper 2017-06-01 19:10:02.000000000 +0200
+++ libreoffice-5.2.7/debian/libreoffice-dbg.postinst.debhelper 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-# Automatically added by dh_installdeb
-dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libreoffice-dbg /usr/share/doc/libreoffice-core 1:5.0.3~rc1-2 $DPKG_MAINTSCRIPT_PACKAGE -- "$@"
-# End automatically added section
diff -Nru libreoffice-5.2.7/debian/libreoffice-dbg.postrm.debhelper libreoffice-5.2.7/debian/libreoffice-dbg.postrm.debhelper
--- libreoffice-5.2.7/debian/libreoffice-dbg.postrm.debhelper 2017-06-01 19:10:02.000000000 +0200
+++ libreoffice-5.2.7/debian/libreoffice-dbg.postrm.debhelper 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-# Automatically added by dh_installdeb
-dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libreoffice-dbg /usr/share/doc/libreoffice-core 1:5.0.3~rc1-2 $DPKG_MAINTSCRIPT_PACKAGE -- "$@"
-# End automatically added section
diff -Nru libreoffice-5.2.7/debian/libreoffice-dbg.preinst.debhelper libreoffice-5.2.7/debian/libreoffice-dbg.preinst.debhelper
--- libreoffice-5.2.7/debian/libreoffice-dbg.preinst.debhelper 2017-06-01 19:10:02.000000000 +0200
+++ libreoffice-5.2.7/debian/libreoffice-dbg.preinst.debhelper 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-# Automatically added by dh_installdeb
-dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libreoffice-dbg /usr/share/doc/libreoffice-core 1:5.0.3~rc1-2 $DPKG_MAINTSCRIPT_PACKAGE -- "$@"
-# End automatically added section
diff -Nru libreoffice-5.2.7/debian/libreoffice-dbg.prerm.debhelper libreoffice-5.2.7/debian/libreoffice-dbg.prerm.debhelper
--- libreoffice-5.2.7/debian/libreoffice-dbg.prerm.debhelper 2017-06-01 19:10:02.000000000 +0200
+++ libreoffice-5.2.7/debian/libreoffice-dbg.prerm.debhelper 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-# Automatically added by dh_installdeb
-dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libreoffice-dbg /usr/share/doc/libreoffice-core 1:5.0.3~rc1-2 $DPKG_MAINTSCRIPT_PACKAGE -- "$@"
-# End automatically added section
diff -Nru libreoffice-5.2.7/debian/libreoffice-dbg.substvars libreoffice-5.2.7/debian/libreoffice-dbg.substvars
--- libreoffice-5.2.7/debian/libreoffice-dbg.substvars 2017-06-01 19:12:02.000000000 +0200
+++ libreoffice-5.2.7/debian/libreoffice-dbg.substvars 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-misc:Depends=libreoffice-core (= 1:5.2.7-1~bpo8+1)
-misc:Pre-Depends=dpkg (>= 1.17.13)
-java:Depends=
-java:Recommends=
diff -Nru libreoffice-5.2.7/debian/patches/WEBSERVICE-DDE.diff libreoffice-5.2.7/debian/patches/WEBSERVICE-DDE.diff
--- libreoffice-5.2.7/debian/patches/WEBSERVICE-DDE.diff 2018-02-08 18:57:40.000000000 +0100
+++ libreoffice-5.2.7/debian/patches/WEBSERVICE-DDE.diff 2018-02-09 16:24:58.000000000 +0100
@@ -40,7 +40,7 @@
+ INetProtocol eProtocol = aObj.GetProtocol();
+ if (eProtocol != INetProtocol::Http && eProtocol != INetProtocol::Https)
+ {
-+ PushError( FormulaError::NoValue );
++ PushError( formula::errNoValue );
+ return;
+ }
+
@@ -401,7 +401,7 @@
INetProtocol eProtocol = aObj.GetProtocol();
if (eProtocol != INetProtocol::Http && eProtocol != INetProtocol::Https)
{
-- PushError( FormulaError::NoValue );
+- PushError( formula::errNoValue );
- return;
- }
-
@@ -445,7 +445,7 @@
- sal_Int32 nRead = 0;
- while ( ( nRead = xStream->readBytes( buffer, BUF_LEN ) ) == BUF_LEN )
-+ bool bWasError = (pMyFormulaCell && pMyFormulaCell->GetRawError() != formula::errNoCode);
++ bool bWasError = (pMyFormulaCell && pMyFormulaCell->GetRawError() != formula::errNONE);
+
+ if (!pLink)
{
@@ -484,8 +484,8 @@
- xStream->closeInput();
+ // If an new Error from Reschedule appears when the link is executed then reset the errorflag
-+ if (pMyFormulaCell && pMyFormulaCell->GetRawError() != formula::errNoCode && !bWasError)
-+ pMyFormulaCell->SetErrCode(formula::errNoCode);
++ if (pMyFormulaCell && pMyFormulaCell->GetRawError() != formula::errNONE && !bWasError)
++ pMyFormulaCell->SetErrCode(formula::errNONE);
+
+ // check the value
+ if (pLink->HasResult())
@@ -1104,3 +1104,15 @@
--
1.9.1
+diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
+index 173c744..5a5a8fd 100644
+--- a/include/formula/errorcodes.hxx
++++ b/include/formula/errorcodes.hxx
+@@ -24,6 +24,7 @@
+
+ namespace formula {
+
++const sal_uInt16 errNONE = 0;
+ const sal_uInt16 errIllegalChar = 501;
+ const sal_uInt16 errIllegalArgument = 502;
+ const sal_uInt16 errIllegalFPOperation = 503; // #NUM!
diff -Nru libreoffice-5.2.7/debian/rules libreoffice-5.2.7/debian/rules
--- libreoffice-5.2.7/debian/rules 2018-02-07 20:08:04.000000000 +0100
+++ libreoffice-5.2.7/debian/rules 2018-02-09 16:24:58.000000000 +0100
@@ -272,11 +272,12 @@
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "default"
ifeq "$(shell LANG=C /usr/lib/jvm/default-java/bin/java -version 2>&1 | tail -n 1 | awk '{ print $$1 }')" "OpenJDK"
- RUN_MAKE_CHECK=y
ifeq "$(DEB_HOST_ARCH)" "i386"
+ RUN_MAKE_CHECK=y
ENABLE_JUNIT4=y
endif
ifeq "$(DEB_HOST_ARCH)" "amd64"
+ RUN_MAKE_CHECK=y
ENABLE_JUNIT4=y
endif
RUN_PYTESTS=y
@@ -285,9 +286,11 @@
ifeq "$(JDK)" "openjdk"
RUN_MAKE_CHECK=y
ifeq "$(DEB_HOST_ARCH)" "i386"
+ RUN_MAKE_CHECK=y
ENABLE_JUNIT4=y
endif
ifeq "$(DEB_HOST_ARCH)" "amd64"
+ RUN_MAKE_CHECK=y
ENABLE_JUNIT4=y
endif
RUN_PYTESTS=y
@@ -576,6 +579,7 @@
IGNORE_MAKE_CHECK_FAILURES=-
ifneq "$(JDK)" "gcj-jdk"
+# disabled due to the Linux/Java Stack Clash fix regression...
# ifeq (i386,$(DEB_HOST_ARCH))
#IGNORE_MAKE_CHECK_FAILURES:=
# endif
@@ -2329,6 +2333,10 @@
$(PKGDIR)-dev-common/$(OOSDKDIR)
mv $(PKGDIR)-dev/$(OOSDKDIR)/set* \
$(PKGDIR)-dev-common/$(OOSDKDIR)
+ # settings/dk.mk is not arch-indep
+ mkdir -p $(PKGDIR)-dev/$(OOSDKDIR)/settings
+ mv $(PKGDIR)-dev-common/$(OOSDKDIR)/settings/dk.mk \
+ $(PKGDIR)-dev/$(OOSDKDIR)/settings
mv $(PKGDIR)-dev/$(OOSDKDIR)/config* \
$(PKGDIR)-dev-common/$(OOSDKDIR)
mv $(PKGDIR)-dev/$(OOSDKDIR)/index.html* \
diff -Nru libreoffice-5.2.7/debian/uno-libs3-dbg.substvars libreoffice-5.2.7/debian/uno-libs3-dbg.substvars
--- libreoffice-5.2.7/debian/uno-libs3-dbg.substvars 2017-06-01 19:12:09.000000000 +0200
+++ libreoffice-5.2.7/debian/uno-libs3-dbg.substvars 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-java:Depends=
-java:Recommends=
-misc:Depends=
diff -Nru libreoffice-5.2.7/debian/ure-dbg.substvars libreoffice-5.2.7/debian/ure-dbg.substvars
--- libreoffice-5.2.7/debian/ure-dbg.substvars 2017-06-01 19:12:09.000000000 +0200
+++ libreoffice-5.2.7/debian/ure-dbg.substvars 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-java:Depends=
-java:Recommends=
-misc:Depends=
Reply to: