From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 24 Dec 2023 08:58:13 +0000 (+0000)
Subject: Merge version 7.88.1-10+rpi1+deb12u4 and 7.88.1-10+deb12u5 to produce 7.88.1-10+rpi1... 
X-Git-Tag: archive/raspbian/7.88.1-10+rpi1+deb12u5^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2ff0c8a2c303cfa9ee0cb400141d466dc573d474;p=curl.git

Merge version 7.88.1-10+rpi1+deb12u4 and 7.88.1-10+deb12u5 to produce 7.88.1-10+rpi1+deb12u5
---

2ff0c8a2c303cfa9ee0cb400141d466dc573d474
diff --cc debian/changelog
index 0d188d65,279af066..aae31a32
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- curl (7.88.1-10+rpi1+deb12u4) bookworm-staging; urgency=medium
++curl (7.88.1-10+rpi1+deb12u5) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 7.88.1-9+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 20 May 2023 09:55:44 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Oct 2023 01:36:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 24 Dec 2023 08:58:12 +0000
++
+ curl (7.88.1-10+deb12u5) bookworm-security; urgency=high
+ 
+   * Add patches to fix CVE-2023-46218 and CVE-2023-46219
+   * d/rules: set CURL_PATCHSTAMP to package's version, so it shows up in
+     "--version" output
+ 
+  -- Samuel Henrique <samueloph@debian.org>  Sun, 10 Dec 2023 06:07:30 +0000
  
  curl (7.88.1-10+deb12u4) bookworm-security; urgency=high