Bug#890189: stretch-pu: package libreoffice/1:5.2.7-1+deb9u3
Control: tags -1 + pending On Sun, 2018-03-04 at 12:52 +0100, Rene Engelhard wrote: > Hi, > > On Sat, Mar 03, 2018 at 02:04:59PM +, Adam D. Barratt wrote: > > OK, please go ahead then. > > Uploaded. > Flagged for acceptance. Regards, Adam
Bug#890189: stretch-pu: package libreoffice/1:5.2.7-1+deb9u3
Hi, On Sat, Mar 03, 2018 at 02:04:59PM +, Adam D. Barratt wrote: > OK, please go ahead then. Uploaded. Regards, Rene
Bug#890189: stretch-pu: package libreoffice/1:5.2.7-1+deb9u3
Control: tags -1 -moreinfo +confirmed On Sat, 2018-03-03 at 14:09 +0100, Rene Engelhard wrote: > Hi, > > On Sat, Mar 03, 2018 at 12:50:11PM +, Adam D. Barratt wrote: > > > Upstream came up with another fix to allow WEBSERVICE() usage in > > > cases where > > > the original patch didn't allow it. I think we should add it... > > > > Is that fix applicable to (and if so, applied in) the package in > > unstable? > > https://cgit.freedesktop.org/libreoffice/core/log/?h=libreoffice-6.0. > 2.1&qt=grep&q=WEBSERVICE. > > It's upstream in 6.0.2, which is in sid since Thursday. OK, please go ahead then. Regards, Adam
Bug#890189: stretch-pu: package libreoffice/1:5.2.7-1+deb9u3
Hi, On Sat, Mar 03, 2018 at 12:50:11PM +, Adam D. Barratt wrote: > > Upstream came up with another fix to allow WEBSERVICE() usage in > > cases where > > the original patch didn't allow it. I think we should add it... > > Is that fix applicable to (and if so, applied in) the package in > unstable? https://cgit.freedesktop.org/libreoffice/core/log/?h=libreoffice-6.0.2.1&qt=grep&q=WEBSERVICE. It's upstream in 6.0.2, which is in sid since Thursday. Regards, Adam
Bug#890189: stretch-pu: package libreoffice/1:5.2.7-1+deb9u3
Control: tags -1 + moreinfo On Thu, 2018-03-01 at 12:09 +0100, Rene Engelhard wrote: > Hi again, > > On Mon, Feb 12, 2018 at 02:03:20PM +0100, Rene Engelhard wrote: > > On Mon, Feb 12, 2018 at 01:56:42PM +0100, Rene Engelhard wrote: > > > > > Probably needs (<< 1:5.2.7-1+deb9u3~) instead. > > > > > > > > Good catch. Wasn't updated after the security updates. Will > > > > change that to > > > > (<< 1:5.2.7-1+deb9u3) > > > > > > ^ ~ > > > > > > with the ~ for eventual jessie-backports of course. > > > > > > https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/c > > ommit/3fb213221e46b804f8878d08a63b19e5c43d10f1 > > Upstream came up with another fix to allow WEBSERVICE() usage in > cases where > the original patch didn't allow it. I think we should add it... Is that fix applicable to (and if so, applied in) the package in unstable? Regards, Adam
Bug#890189: stretch-pu: package libreoffice/1:5.2.7-1+deb9u3
Hi again,
On Mon, Feb 12, 2018 at 02:03:20PM +0100, Rene Engelhard wrote:
> On Mon, Feb 12, 2018 at 01:56:42PM +0100, Rene Engelhard wrote:
> > > > Probably needs (<< 1:5.2.7-1+deb9u3~) instead.
> > >
> > > Good catch. Wasn't updated after the security updates. Will change that to
> > > (<< 1:5.2.7-1+deb9u3)
> > ^ ~
> >
> > with the ~ for eventual jessie-backports of course.
>
>
> https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/3fb213221e46b804f8878d08a63b19e5c43d10f1
Upstream came up with another fix to allow WEBSERVICE() usage in cases where
the original patch didn't allow it. I think we should add it...
So here's the new debdiffs (compared to deb9u2, so with the noise in the
diff, and a clean stable->deb9u3).
Didn't yet testbuild but can do.
Regards,
Rene
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.0 +0100
+++ libreoffice-5.2.7/debian/changelog 2018-02-22 11:14:18.0 +0100
@@ -1,3 +1,19 @@
+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/ for clarity
+- backport 4a412bdf0387cc2cb59d656d0738a63a286ec497 from 5.4 branch
+ to let FunctionAccess execute WEBSERVICE
+
+ * 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 Thu, 22 Feb 2018 11:14:18 +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.0 +0100
+++ libreoffice-5.2.7/debian/control 2018-02-22 11:14:18.0 +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-1+deb9u3~)
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-1+deb9u3~)
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.0 +0100
+++ libreoffice-5.2.7/debian/control.sdk.in 2018-02-12 19:04:03.0 +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-1+deb9u3~)
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-1+deb9u3~)
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.0 +0200
+++ libreoffice-5.2.7/debian/libreoffice-dbg.postinst.debhelper 1970-01-01 01:00:00.0 +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.0 +0200
+++ libreoffice-5.2.7/debian/libreoffice-dbg.postrm.debhelper 1970-01-01 01:00:00.0 +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.prein
Bug#890189: stretch-pu: package libreoffice/1:5.2.7-1+deb9u3
Hi, On Mon, Feb 12, 2018 at 01:56:42PM +0100, Rene Engelhard wrote: > > > Probably needs (<< 1:5.2.7-1+deb9u3~) instead. > > > > Good catch. Wasn't updated after the security updates. Will change that to > > (<< 1:5.2.7-1+deb9u3) > ^ ~ > > with the ~ for eventual jessie-backports of course. https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/3fb213221e46b804f8878d08a63b19e5c43d10f1 Regards, Rene
Bug#890189: stretch-pu: package libreoffice/1:5.2.7-1+deb9u3
On Mon, Feb 12, 2018 at 01:45:11PM +0100, Rene Engelhard wrote: > Hi, > > On Mon, Feb 12, 2018 at 01:31:54PM +0100, Andreas Beckmann wrote: > > > 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) > > > > This sounds like something will be uninstallable in stretch. > > There are more of these Breaks+Replaces. > > ?? Obviously it is installable in stretch right now and only this is > new. > > > Probably needs (<< 1:5.2.7-1+deb9u3~) instead. > > Good catch. Wasn't updated after the security updates. Will change that to > (<< 1:5.2.7-1+deb9u3) ^ ~ with the ~ for eventual jessie-backports of course. Regards, Rene
Bug#890189: stretch-pu: package libreoffice/1:5.2.7-1+deb9u3
Hi, On Mon, Feb 12, 2018 at 01:31:54PM +0100, Andreas Beckmann wrote: > > 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) > > This sounds like something will be uninstallable in stretch. > There are more of these Breaks+Replaces. ?? Obviously it is installable in stretch right now and only this is new. > Probably needs (<< 1:5.2.7-1+deb9u3~) instead. Good catch. Wasn't updated after the security updates. Will change that to (<< 1:5.2.7-1+deb9u3) Regards, Rene
Bug#890189: stretch-pu: package libreoffice/1:5.2.7-1+deb9u3
> --- libreoffice-5.2.7/debian/changelog2018-02-09 07:22:22.0 > +0100 > +++ libreoffice-5.2.7/debian/changelog2018-02-09 16:24:58.0 > +0100 > @@ -1,3 +1,16 @@ > +libreoffice (1:5.2.7-1+deb9u3) stretch; urgency=medium > --- libreoffice-5.2.7/debian/control 2018-02-09 07:21:38.0 +0100 > +++ libreoffice-5.2.7/debian/control 2018-02-09 16:24:58.0 +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) This sounds like something will be uninstallable in stretch. There are more of these Breaks+Replaces. Probably needs (<< 1:5.2.7-1+deb9u3~) instead. Andreas
Bug#890189: stretch-pu: package libreoffice/1:5.2.7-1+deb9u3
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian@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.0 +0100
+++ libreoffice-5.2.7/debian/changelog 2018-02-09 16:24:58.0 +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 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/control2018-02-09 07:21:38.0 +0100
+++ libreoffice-5.2.7/debian/control2018-02-09 16:24:58.0 +0100
@@ -4376,9 +4376,9 @@
Suggests: libmythes-dev, libreoffice-dev-doc, libreofficekit-dev
