From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 2 Apr 2025 07:36:59 +0000 (+0100)
Subject: Merge version 5.6.1-4+rpi1 and 5.6.1-4+deb11u1 to produce 5.6.1-4+rpi1+deb11u1
X-Git-Tag: raspbian/5.6.1-4+rpi1+deb11u1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=73c59cad135f627b93b4d32fdf709633ad474967;p=mercurial.git

Merge version 5.6.1-4+rpi1 and 5.6.1-4+deb11u1 to produce 5.6.1-4+rpi1+deb11u1
---

ab5650f333e92f6eb35d231f0f2e17c0fc4e52d6
diff --cc debian/changelog
index 3df403b,4b41dc1..f14b39d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,24 @@@
- mercurial (5.6.1-4+rpi1) bullseye-staging; urgency=medium
++mercurial (5.6.1-4+rpi1+deb11u1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 5.5.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 13 Dec 2020 10:30:51 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Jun 2021 03:23:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 02 Apr 2025 07:36:59 +0000
++
+ mercurial (5.6.1-4+deb11u1) bullseye-security; urgency=medium
+ 
+   * Non-maintainer upload by the Debian LTS Security Team.
+ 
+   [ Andreas Henriksson ]
+   * Cherry-pick and massage bookworm (stable) patches by jcristau to apply
+     on bullseye version of the package.
+ 
+   [ Julien Cristau ]
+   * 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).
+ 
+  -- Andreas Henriksson <andreas@fatal.se>  Thu, 27 Mar 2025 19:23:02 +0100
  
  mercurial (5.6.1-4) unstable; urgency=medium