From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 22 Sep 2021 19:16:13 +0000 (+0100)
Subject: Merge version 2.2.16-2+rpi1 and 2.2.17-1 to produce 2.2.17-1+rpi1
X-Git-Tag: archive/raspbian/2.2.17-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d9342f8344d2d1607029188d7f00eca2e1624569;p=haproxy.git

Merge version 2.2.16-2+rpi1 and 2.2.17-1 to produce 2.2.17-1+rpi1
---

d9342f8344d2d1607029188d7f00eca2e1624569
diff --cc debian/changelog
index dc25562,193451f..ac764fd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- haproxy (2.2.16-2+rpi1) bookworm-staging; urgency=medium
++haproxy (2.2.17-1+rpi1) bookworm-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, 26 Aug 2021 20:37:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Sep 2021 19:16:13 +0000
++
+ haproxy (2.2.17-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * d/patches: remove upstream-applied patch.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Thu, 09 Sep 2021 19:42:08 +0200
+ 
+ haproxy (2.2.16-3) unstable; urgency=high
+ 
+   * d/patches: fix missing header name length check in HTX (CVE-2021-40346).
+ 
+  -- Vincent Bernat <bernat@debian.org>  Sat, 04 Sep 2021 16:14:51 +0200
  
  haproxy (2.2.16-2) unstable; urgency=medium