From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 27 Mar 2025 10:44:03 +0000 (+0000)
Subject: Merge version 6.3.2-1+rpi1 and 6.3.2-1+deb12u1 to produce 6.3.2-1+rpi1+deb12u1
X-Git-Tag: archive/raspbian/6.3.2-1+rpi1+deb12u1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9e131bf5894cd77280f5c7e81659598248f37d7b;p=mercurial.git

Merge version 6.3.2-1+rpi1 and 6.3.2-1+deb12u1 to produce 6.3.2-1+rpi1+deb12u1
---

56462553224ca6dc3b65569f711048955a0e4ea6
diff --cc debian/changelog
index e6e7a69,1cf6590..d263e79
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- mercurial (6.3.2-1+rpi1) bookworm-staging; urgency=medium
++mercurial (6.3.2-1+rpi1+deb12u1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 6.1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 21 Apr 2022 22:42:37 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Feb 2023 19:47:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 27 Mar 2025 10:44:02 +0000
++
+ mercurial (6.3.2-1+deb12u1) bookworm-security; urgency=high
+ 
+   * CVE-2025-2361: reflected XSS in hgweb (closes: #1100899)
+   * patchbomb: don't test ambiguous address (fixes FTBFS after python's
+     fix for CVE-2023-27043).
+ 
+  -- Julien Cristau <jcristau@debian.org>  Thu, 20 Mar 2025 13:56:44 +0100
  
  mercurial (6.3.2-1) sid; urgency=medium