From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 27 Sep 2020 21:48:17 +0000 (+0100)
Subject: Merge version 4:4.8.7+dfsg-18+rpi1 and 4:4.8.7+dfsg-18+deb10u1 to produce 4:4.8.7... 
X-Git-Tag: raspbian/4%4.8.7+dfsg-18+rpi1+deb10u1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b8a38cd1e236d2489d54b4d28cb540db1b7fe53c;p=qt4-x11.git

Merge version 4:4.8.7+dfsg-18+rpi1 and 4:4.8.7+dfsg-18+deb10u1 to produce 4:4.8.7+dfsg-18+rpi1+deb10u1
---

1fd0508f7fab821f936510e0baa7db6ac99d4b46
diff --cc debian/changelog
index 1f9b70839,c4d20f629..892083029
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- qt4-x11 (4:4.8.7+dfsg-18+rpi1) buster-staging; urgency=medium
++qt4-x11 (4:4.8.7+dfsg-18+rpi1+deb10u1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 4:4.8.6+git64-g5dc8b2b+dfsg-2+rpi1 by Peter Micheal Green <plugwash@raspbian.org> at Thu, 31 Jul 2014 22:56:54 +0000]
 +  * Disable neon
 +
 +  [changes brought forward from 4:4.8.7+dfsg-17+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 14 Apr 2019 10:25:37 +0000]
 +  * Replace a number of occourances of "asm" with "__asm"
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 15 Apr 2019 12:36:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 27 Sep 2020 21:48:16 +0000
++
+ qt4-x11 (4:4.8.7+dfsg-18+deb10u1) buster; urgency=medium
+ 
+   * Backport upstream patch to fix buffer overflow in XBM parser, CVE-2020-17507
+     (Closes: #970308).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Mon, 14 Sep 2020 10:56:35 -0300
  
  qt4-x11 (4:4.8.7+dfsg-18) unstable; urgency=medium