From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 17 Jul 2019 15:09:25 +0000 (+0100)
Subject: Merge version 1:6.1.5-3+rpi1 and 1:6.1.5-3+deb10u2 to produce 1:6.1.5-3+rpi1+deb10u2
X-Git-Tag: archive/raspbian/1%6.1.5-3+rpi1+deb10u2^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9e96c62d9c89748fc5c3a166ee912fc2f47a2016;p=libreoffice.git

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

9e96c62d9c89748fc5c3a166ee912fc2f47a2016
diff --cc debian/changelog
index 9a6583c12ca,568c470def6..38f6be4a7f6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,17 +1,27 @@@
- libreoffice (1:6.1.5-3+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.1.5-3+rpi1+deb10u2) 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>  Mon, 15 Apr 2019 14:05:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 17 Jul 2019 15:09:21 +0000
++
+ libreoffice (1:6.1.5-3+deb10u2) buster-security; urgency=high
+ 
+   * debian/patches/More-uses-of-referer-URL-with-SvxBrushItem.diff:
+     add patch from libreoffice-6-2 branch to fix CVE-2019-9849
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 18 Jun 2019 20:36:04 +0200
+ 
+ libreoffice (1:6.1.5-3+deb10u1) buster-security; urgency=high
+ 
+   * debian/patches/sanitize-LibreLogo-calls.diff,
+     debian/patches/explictly-exclude-LibreLogo-from-XScript-usage.diff:
+     add from git; fixing CVE-2019-9848 
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 09 Jun 2019 10:27:49 +0200
  
  libreoffice (1:6.1.5-3) unstable; urgency=medium