From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 18 Apr 2025 06:45:53 +0000 (+0100)
Subject: Merge version 1.4+really1.3.40-4+rpi1 and 1.4+really1.3.40-4+deb12u1 to produce 1... 
X-Git-Tag: archive/raspbian/1.4+really1.3.40-4+rpi1+deb12u1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d18e9b0bcef66c5942911723d10617b25d2fce60;p=graphicsmagick.git

Merge version 1.4+really1.3.40-4+rpi1 and 1.4+really1.3.40-4+deb12u1 to produce 1.4+really1.3.40-4+rpi1+deb12u1
---

d18e9b0bcef66c5942911723d10617b25d2fce60
diff --cc debian/changelog
index 00b8341,28844b4..1a51d95
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,16 +1,26 @@@
- graphicsmagick (1.4+really1.3.40-4+rpi1) bookworm-staging; urgency=medium
++graphicsmagick (1.4+really1.3.40-4+rpi1+deb12u1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.4+really1.3.36-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 30 Dec 2020 03:11:26 +0000]
 +  * Ignore test failures, the tests fail on 64-bit kernels.
 +
 +  [changes brought forward from 1.4+really1.3.40-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 19 Jan 2023 18:12:16 +0000]
 +  * Remove hardcoded dependency on libtiff5 (Closes: #1029212)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 14 May 2023 20:52:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Apr 2025 06:45:53 +0000
++
+ graphicsmagick (1.4+really1.3.40-4+deb12u1) bookworm-security; urgency=high
+ 
+   * Non-maintainer upload by the Security Team.
+ 
+   [ Carlos Henrique Lima Melara ]
+   * d/p/CVE-2025-27795.patch: fix CVE-2025-27795 by adding image dimension
+     resource limits. (Closes: #1099955)
+ 
+   [ Salvatore Bonaccorso ]
+   * ReadJXLImage(): pixel_format.num_channels needs to be 2 for grayscale
+     matte (CVE-2025-32460)
+ 
+  -- Salvatore Bonaccorso <carnil@debian.org>  Fri, 11 Apr 2025 22:49:23 +0200
  
  graphicsmagick (1.4+really1.3.40-4) unstable; urgency=medium