From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 1 Jun 2023 15:49:27 +0000 (+0100)
Subject: Merge version 1.0.1+dfsg1-4+rpi1+deb11u1 and 1.0.1+dfsg1-4+deb11u2 to produce 1.0... 
X-Git-Tag: raspbian/1.0.1+dfsg1-4+rpi1+deb11u2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=767b62ec0635cf836cdcd9d91d68440b391cc23f;p=gpac.git

Merge version 1.0.1+dfsg1-4+rpi1+deb11u1 and 1.0.1+dfsg1-4+deb11u2 to produce 1.0.1+dfsg1-4+rpi1+deb11u2
---

2a6f67368daceb748ce77051ffab26c24a3c9628
diff --cc debian/changelog
index 88961b9,e8d2390..2c1da52
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,18 @@@
- gpac (1.0.1+dfsg1-4+rpi1+deb11u1) bullseye-staging; urgency=medium
++gpac (1.0.1+dfsg1-4+rpi1+deb11u2) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.0.1+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 12:28:54 +0000]
 +  * Link with libatomic on armhf too.
 +
 +  [changes introduced in 1.0.1+dfsg1-4+rpi1+deb11u1 by Peter Michael Green]
 +  * Remove .gitattributes, it causes problems for dgit.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Sep 2021 14:37:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Jun 2023 15:49:27 +0000
++
+ gpac (1.0.1+dfsg1-4+deb11u2) bullseye-security; urgency=medium
+ 
+   * Fix multiple security issues
+ 
+  -- Aron Xu <aron@debian.org>  Tue, 23 May 2023 19:53:25 +0800
  
  gpac (1.0.1+dfsg1-4+deb11u1) bullseye-security; urgency=medium
  
diff --cc debian/patches/series
index a4dcbff,8a88116..faf4f90
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -19,4 -20,95 +20,96 @@@ CVE-2021-31262.patc
  talos-2021-1297.patch
  talos-2021-1298.patch
  talos-2021-1299.patch
+ talos-2021-1297-2.patch
+ CVE-2021-4043.patch
+ CVE-2021-36412.patch
+ CVE-2021-36414.patch
+ CVE-2021-36417.patch
+ CVE-2021-40559.patch
+ CVE-2021-40562.patch
+ CVE-2021-40563.patch
+ CVE-2021-40564.patch
+ CVE-2021-40565.patch
+ CVE-2021-40566.patch
+ CVE-2021-40567.patch
+ CVE-2021-40568.patch
+ CVE-2022-47659.patch
+ CVE-2021-40569.patch
+ CVE-2021-40570.patch
+ CVE-2021-40571.patch
+ CVE-2021-40572.patch
+ CVE-2021-40574.patch
+ CVE-2021-40575.patch
+ CVE-2021-40576_40606_40609.patch
+ CVE-2021-40592.patch
+ CVE-2021-40607.patch
+ CVE-2021-40608.patch
+ CVE-2021-40944.patch
+ CVE-2021-41456.patch
+ CVE-2021-41457.patch
+ CVE-2021-41459.patch
+ CVE-2021-33361.patch
+ CVE-2021-33363.patch
+ CVE-2021-33364.patch
+ CVE-2021-33365.patch
+ CVE-2021-33366.patch
+ CVE-2021-45262.patch
+ CVE-2021-45263.patch
+ CVE-2021-45267.patch
+ CVE-2021-45291.patch
+ CVE-2021-45292.patch
+ CVE-2021-45297.patch
+ CVE-2021-45760.patch
+ CVE-2021-45762.patch
+ CVE-2021-45763.patch
+ CVE-2021-45764.patch
+ CVE-2021-45767.patch
+ CVE-2021-45831.patch
+ CVE-2021-46038to46046_46049_46051.patch
+ CVE-2021-46047.patch
+ CVE-2022-45202.patch
+ CVE-2022-1035.patch
+ CVE-2022-1222.patch
+ CVE-2022-1441.patch
+ CVE-2022-1795.patch
+ CVE-2022-2454.patch
+ CVE-2022-3222.patch
+ CVE-2022-3957.patch
+ CVE-2022-4202.patch
+ CVE-2022-24574.patch
+ CVE-2022-24577.patch
+ CVE-2022-24578.patch
+ CVE-2022-26967_partial.patch
+ CVE-2022-27145.patch
+ CVE-2022-27147.patch
+ CVE-2022-29537.patch
+ CVE-2022-36190_36191.patch
+ CVE-2022-38530.patch
+ CVE-2022-43255.patch
+ CVE-2022-45283.patch
+ CVE-2022-45343.patch
+ CVE-2022-47086.patch
+ CVE-2022-47091.patch
+ CVE-2022-47094.patch
+ CVE-2022-47095.patch
+ CVE-2022-47657.patch
+ CVE-2022-47660.patch
+ CVE-2022-47661.patch
+ CVE-2022-47662.patch
+ CVE-2022-47663.patch
+ CVE-2023-0770.patch
+ CVE-2023-0818.patch
+ CVE-2023-0819.patch
+ CVE-2023-0866.patch
+ CVE-2023-1448.patch
+ CVE-2023-1449.patch
+ CVE-2023-1452.patch
+ CVE-2023-1654.patch
+ CVE-2023-2837.patch
+ CVE-2023-2838.patch
+ CVE-2023-2839.patch
+ CVE-2023-2840.patch
+ CVE-2023-23143.patch
+ CVE-2023-23144.patch
+ CVE-2023-23145.patch
 +remove-.gitattributes-it-causes-problems.patch