From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 13 May 2023 11:21:57 +0000 (+0100)
Subject: Merge version 2.2.9-2+rpi1+deb11u4 and 2.2.9-2+deb11u5 to produce 2.2.9-2+rpi1+deb11u5
X-Git-Tag: archive/raspbian/2.2.9-2+rpi1+deb11u5^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=79310c9503212eca875306959cc0386901f56aae;p=haproxy.git

Merge version 2.2.9-2+rpi1+deb11u4 and 2.2.9-2+deb11u5 to produce 2.2.9-2+rpi1+deb11u5
---

79310c9503212eca875306959cc0386901f56aae
diff --cc debian/changelog
index cd33ab9,7998562..fc0adc6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- haproxy (2.2.9-2+rpi1+deb11u4) bullseye-staging; urgency=medium
++haproxy (2.2.9-2+rpi1+deb11u5) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.8.19-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 14 Mar 2019 20:25:01 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 15 Feb 2023 01:10:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 13 May 2023 11:21:57 +0000
++
+ haproxy (2.2.9-2+deb11u5) bullseye-security; urgency=high
+ 
+   * Non-maintainer upload by the Security Team.
+   * BUG/MAJOR: fcgi: Fix uninitialized reserved bytes (CVE-2023-0836)
+ 
+  -- Salvatore Bonaccorso <carnil@debian.org>  Mon, 10 Apr 2023 16:18:09 +0200
  
  haproxy (2.2.9-2+deb11u4) bullseye-security; urgency=high