From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 28 Jun 2020 16:33:35 +0000 (+0100)
Subject: Merge version 8.0.2+ds-1+rpi1+deb10u2 and 8.0.2+ds-1+deb10u3 to produce 8.0.2+ds... 
X-Git-Tag: archive/raspbian/8.0.2+ds-1+rpi1+deb10u3^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4bebeac0490ea300e3a79bf9c26411be6fb5b72d;p=trafficserver.git

Merge version 8.0.2+ds-1+rpi1+deb10u2 and 8.0.2+ds-1+deb10u3 to produce 8.0.2+ds-1+rpi1+deb10u3
---

4bebeac0490ea300e3a79bf9c26411be6fb5b72d
diff --cc debian/changelog
index 7e7cae23,102e2f9c..341aaf39
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- trafficserver (8.0.2+ds-1+rpi1+deb10u2) buster-staging; urgency=medium
++trafficserver (8.0.2+ds-1+rpi1+deb10u3) buster-staging; urgency=medium
 +
 +  [changes brought forward from 8.0.1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 19 Jan 2019 12:42:48 +0000]
 +  * Use -latomic on raspbian too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 07 May 2020 16:24:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 28 Jun 2020 16:33:35 +0000
++
+ trafficserver (8.0.2+ds-1+deb10u3) buster-security; urgency=high
+ 
+   * Add fix from upstream for CVE-2020-9494 (Closes: #963629)
+ 
+  -- Jean Baptiste Favre <debian@jbfavre.org>  Thu, 25 Jun 2020 19:58:34 +0200
  
  trafficserver (8.0.2+ds-1+deb10u2) buster-security; urgency=medium