From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 15 Dec 2022 22:08:55 +0000 (+0000)
Subject: Merge version 1.0.3-1+rpi1 and 1.0.3-1+deb10u1 to produce 1.0.3-1+rpi1+deb10u1
X-Git-Tag: archive/raspbian/1.0.3-1+rpi1+deb10u1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bdb9311a0a1bbdcb227ecd20fc954ecd76dbbc9a;p=libde265.git

Merge version 1.0.3-1+rpi1 and 1.0.3-1+deb10u1 to produce 1.0.3-1+rpi1+deb10u1
---

bdb9311a0a1bbdcb227ecd20fc954ecd76dbbc9a
diff --cc debian/changelog
index b48cf81,80b9867..b7ec952
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- libde265 (1.0.3-1+rpi1) buster-staging; urgency=medium
++libde265 (1.0.3-1+rpi1+deb10u1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.0.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 04 Oct 2015 21:44:10 +0000]
 +  * Disable neon.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Apr 2018 05:53:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 15 Dec 2022 22:08:54 +0000
++
+ libde265 (1.0.3-1+deb10u1) buster-security; urgency=medium
+ 
+   * Non-maintainer upload by the LTS Security Team.
+   * Cherry-pick upstream patches for:
+     - CVE-2020-21599 (See #1014999)
+     - CVE-2021-35452, CVE-2021-36408, CVE-2021-36409, CVE-2021-36410 and
+       CVE-2021-36411 (Closes: 1014977)
+ 
+  -- Tobias Frost <tobi@debian.org>  Thu, 15 Dec 2022 17:40:12 +0100
  
  libde265 (1.0.3-1) unstable; urgency=medium
  
diff --cc debian/patches/series
index 86a210b,e4bde82..f2c6168
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,9 +1,10 @@@
  only_export_decoder_api.patch
  disable_tools.patch
  ffmpeg_2.9.patch
+ CVE-2020-21599.patch
+ CVE-2021-35452.patch
+ CVE-2021-36408.patch
+ CVE-2021-36409.patch
+ CVE-2021-36410.patch
+ CVE-2021-36411.patch
 +disable-neon.patch