From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 19 Aug 2021 13:24:55 +0000 (+0100)
Subject: Merge version 2.2.9-2+rpi1 and 2.2.9-2+deb11u1 to produce 2.2.9-2+rpi1+deb11u1
X-Git-Tag: archive/raspbian/2.2.9-2+rpi1+deb11u1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5b63b9a7b516474be37c3dffb1988b9c90d7b178;p=haproxy.git

Merge version 2.2.9-2+rpi1 and 2.2.9-2+deb11u1 to produce 2.2.9-2+rpi1+deb11u1
---

5b63b9a7b516474be37c3dffb1988b9c90d7b178
diff --cc debian/changelog
index 28afc8c,7520e9a..cb1d069
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- haproxy (2.2.9-2+rpi1) bullseye-staging; urgency=medium
++haproxy (2.2.9-2+rpi1+deb11u1) 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>  Thu, 17 Jun 2021 15:23:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Aug 2021 13:24:55 +0000
++
+ haproxy (2.2.9-2+deb11u1) bullseye-security; urgency=high
+ 
+   * Fix HTTP request smuggling via HTTP/2 desync attacks.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Sun, 15 Aug 2021 22:42:57 +0200
  
  haproxy (2.2.9-2) unstable; urgency=medium