From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 9 Sep 2019 13:56:36 +0000 (+0100)
Subject: Merge version 1:6.1.5-3+rpi1+deb10u2 and 1:6.1.5-3+deb10u4 to produce 1:6.1.5-3+rpi1... 
X-Git-Tag: archive/raspbian/1%6.1.5-3+rpi1+deb10u4^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e481b7d0cd761407ab6bff6a742f65e260ecd560;p=libreoffice.git

Merge version 1:6.1.5-3+rpi1+deb10u2 and 1:6.1.5-3+deb10u4 to produce 1:6.1.5-3+rpi1+deb10u4
---

e481b7d0cd761407ab6bff6a742f65e260ecd560
diff --cc debian/changelog
index 38f6be4a7f6,d5983949857..a272bba352b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,28 +1,38 @@@
- libreoffice (1:6.1.5-3+rpi1+deb10u2) buster-staging; urgency=medium
++libreoffice (1:6.1.5-3+rpi1+deb10u4) buster-staging; urgency=medium
 +
 +  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
 +  * Disable pdfium, it fails to build for armv6
 +
 +  [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Fri, 27 Apr 2018 02:14:18 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 17 Jul 2019 15:09:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Sep 2019 13:56:32 +0000
++
+ libreoffice (1:6.1.5-3+deb10u4) buster-security; urgency=medium
+ 
+   * debian/patches/expand-pyuno-path-separators.diff.
+     debian/patches/construct-final-url-from-parsed-output.diff,
+     debian/patches/an-absolute-uri-is-invalid-input.diff,
+     debian/patches/Improve-check-for-absolute-URI.diff,
+     debian/patches/Improve-check.diff: add from
+     libreoffice-6-3(-0,-1) branch - more fixes...
+     (CVE-2019-9854/CVE-2019-9855)
+   * debian/patches/allow-link-updates-in-an-intermediate-linked-document.diff:
+     add from libreoffice-6-2 branch - fix regression from CVE-2018-6871
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 06 Sep 2019 11:52:03 +0200
+ 
+ libreoffice (1:6.1.5-3+deb10u3) buster-security; urgency=high
+ 
+   * debian/patches/expand-LibreLogo-checks-to-global-events.diff,
+     debian/patches/decode-url-escape-codes-and-check-each-path-segment.diff:
+     debian/patches/keep-name-percent-encoded.diff
+     debian/patches/Properly-obtain-location.diff:
+     backport from libreoffice-6-3-0 branch - more fixes for CVE-2019-9848 and
+     CVE-2018-16858
+     (CVE-2019-9850/CVE-2019-9851/CVE-2019-9852/CVE-2019-9853)
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 06 Aug 2019 19:47:48 +0200
  
  libreoffice (1:6.1.5-3+deb10u2) buster-security; urgency=high