From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 25 Feb 2023 18:01:54 +0000 (+0000)
Subject: Merge version 2.6.8-1+rpi1 and 2.6.9-1 to produce 2.6.9-1+rpi1
X-Git-Tag: archive/raspbian/2.6.9-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=769bdc980e38731ce575769aadac2ffca2e02cb1;p=haproxy.git

Merge version 2.6.8-1+rpi1 and 2.6.9-1 to produce 2.6.9-1+rpi1
---

769bdc980e38731ce575769aadac2ffca2e02cb1
diff --cc debian/changelog
index a3b1e6c,0d78715..9466a42
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,24 @@@
- haproxy (2.6.8-1+rpi1) bookworm-staging; urgency=medium
++haproxy (2.6.9-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 Jan 2023 03:54:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Feb 2023 18:01:54 +0000
++
+ haproxy (2.6.9-1) unstable; urgency=medium
+ 
+   * New upstream version.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Wed, 15 Feb 2023 21:45:50 +0100
+ 
+ haproxy (2.6.8-2) unstable; urgency=medium
+ 
+   * Add a NEWS entry for incompatibilities introduced in HAProxy 2.6.
+     Closes: #1030173.
+   * BUG/CRITICAL: http: properly reject empty http header field names
+     (CVE-2023-25725)
+ 
+  -- Vincent Bernat <bernat@debian.org>  Mon, 13 Feb 2023 20:16:13 +0100
  
  haproxy (2.6.8-1) unstable; urgency=medium