From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 24 Apr 2025 23:32:42 +0000 (+0100)
Subject: Merge version 2.2.9-2+rpi1+deb11u6 and 2.2.9-2+deb11u7 to produce 2.2.9-2+rpi1+deb11u7
X-Git-Tag: archive/raspbian/2.2.9-2+rpi1+deb11u7^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7c62425c6b982384b9db0efbad5b25f98a063a4a;p=haproxy.git

Merge version 2.2.9-2+rpi1+deb11u6 and 2.2.9-2+deb11u7 to produce 2.2.9-2+rpi1+deb11u7
---

7c62425c6b982384b9db0efbad5b25f98a063a4a
diff --cc debian/changelog
index 817432d,6d6f15c..9aa49fb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- haproxy (2.2.9-2+rpi1+deb11u6) bullseye-staging; urgency=medium
++haproxy (2.2.9-2+rpi1+deb11u7) 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>  Fri, 05 Jan 2024 18:45:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 24 Apr 2025 23:32:42 +0000
++
+ haproxy (2.2.9-2+deb11u7) bullseye-security; urgency=medium
+ 
+   * Non-maintainer upload by the LTS Team.
+   * CVE-2025-32464: heap buffer overflow in sample_conv_regsub()
+ 
+  -- Adrian Bunk <bunk@debian.org>  Wed, 23 Apr 2025 20:55:00 +0300
  
  haproxy (2.2.9-2+deb11u6) bullseye-security; urgency=high