Merge version 2.6.12-1+rpi1+deb12u1 and 2.6.12-1+deb12u2 to produce 2.6.12-1+rpi1...

diff --cc debian/changelog
index 28c147cc747792aedfe5f7839cf5b958f99c3bcd,912120a62fbb9de08479f121337023726fcde265..b980b51bc1b03256467395f3fc9d75677783a3a1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- haproxy (2.6.12-1+rpi1+deb12u1) bookworm-staging; urgency=medium
++haproxy (2.6.12-1+rpi1+deb12u2) 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>  Sat, 06 Jan 2024 09:27:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 21 May 2025 04:51:37 +0000
++
+ haproxy (2.6.12-1+deb12u2) bookworm; urgency=medium
+ 
+   * Non-maintainer upload.
+   * CVE-2025-32464: heap buffer overflow in sample_conv_regsub()
+     (Closes: #1102673)
+ 
+  -- Adrian Bunk <bunk@debian.org>  Tue, 29 Apr 2025 16:56:20 +0300
  
  haproxy (2.6.12-1+deb12u1) bookworm-security; urgency=high