Merge version 2021.01+dfsg-5+rpi1+deb11u2 and 2021.01+dfsg-5+deb11u3 to produce 2021...

diff --cc debian/changelog
index 266521b0c24d48f886700c0fadb0ab0f2cb7417f,c674a9cc28e3d8356ab944f0652373cb65efe84b..4412fe7e82145858af3e751878158781e1acb66a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,14 +1,25 @@@
- u-boot (2021.01+dfsg-5+rpi1+deb11u2) bullseye-staging; urgency=medium
++u-boot (2021.01+dfsg-5+rpi1+deb11u3) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2014.10+dfsg1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 06:00:07 +0000]
 +  * Don't build versions for various armv7 devices, build rpi version instead.
 +
 +  [changes introduced in 2021.01+dfsg-4+rpi1 by Peter Michael Green]
 +  * Don't build powerpc targets for qemu, my attempts to build the nessacery
 +    cross-compiler in raspbian failed.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 18 May 2026 02:33:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 03 Jul 2026 03:33:47 +0000
++
+ u-boot (2021.01+dfsg-5+deb11u3) bullseye-security; urgency=high
+ 
+   * Non-maintainer upload by the LTS Team.
+   * CVE-2024-42040: buffer overread vulnerability in the DHCP implementation.
+     (Closes: #1081557)
+   * CVE-2026-46728: mishandles use of unit addresses in a FIT.
+     (Closes: #1136954)
+   * Remove avr32 arch support removed in dpkg 1.22.0 (Closes: #1056750)
+     - now also leads to DAK rejecting the upload even for older suites.
+ 
+  -- Andreas Henriksson <andreas@fatal.se>  Tue, 23 Jun 2026 21:07:40 +0200
  
  u-boot (2021.01+dfsg-5+deb11u2) bullseye-security; urgency=medium
  

diff --cc debian/control
index cd0ecd2d2aa1a67cb9d532f9f36230c27c44258c,67cbf46fd82dd8aa12df8936dcdfa425e68d363a..7cd352987e88b9f8ede131ead045fdb0c67f6ad2
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -36,9 -37,10 +36,9 @@@ Vcs-Browser: https://salsa.debian.org/d
  Vcs-Git: https://salsa.debian.org/debian/u-boot.git
  
  Package: u-boot
- Architecture: armel armhf avr32 mips sh4
+ Architecture: armel armhf mips sh4
  Multi-Arch: same
 -Depends: ${misc:Depends},
 - u-boot-imx [armhf], u-boot-omap [armhf], u-boot-sunxi [armhf], u-boot-exynos [armhf], u-boot-qemu [mips]
 +Depends: ${misc:Depends}, u-boot-qemu [mips]
  Description: A boot loader for embedded systems
   Das U-Boot is a cross-platform bootloader for embedded systems,
   used as the default boot loader by several board vendors.  It is

diff --cc debian/targets
Simple merge