openkylin
/
imagemagick
mirror of https://gitee.com/openkylin/imagemagick.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

SECURITY UPDATE 

* SECURITY UPDATE: heap-based buffer overflow issue
    - CVE-2021-3610
    - CVE-2023-3428
    - CVE-2023-1289
    - CVE-2023-1906
    - CVE-2023-3195
    - CVE-2023-34151
This commit is contained in:
rtlhq 2023-07-17 15:10:02 +00:00 committed by cckylin-cibot
parent fcde5a9947
commit 875b6b5daa
50 changed files with 719 additions and 656 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -8,7 +8,7 @@ imagemagick (8:6.9.11.60+dfsg-ok1.2) yangtze; urgency=medium
- CVE-2023-3195
- CVE-2023-34151
-- rtlhq <nobelxyz@163.com> Mon, 17 Jul 2023 20:40:36 +0800
-- rtlhq <nobelxyz@163.com> Thu, 16 Feb 2023 16:06:07 +0800
imagemagick (8:6.9.11.60+dfsg-ok1.1) yangtze; urgency=medium

7
debian/patches/0001-Fix-br-tag.patch vendored
View File

@ -1,5 +1,4 @@
From 15346579514de52b30b4006571b3dabdb73b0ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Fri, 2 Feb 2018 22:14:03 +0100
Subject: Fix br tag
@ -7,11 +6,11 @@ find . -path './.git' -prune -o -type 'f' -name '*.html' -exec sed -i 's,<br>,<b
Forwarded: Yes, https://github.com/ImageMagick/ImageMagick/issues/304
---
www/api/Image++.html | 268 +++++++++++++++++++++----------------------
www/api/Image++.html | 268 +++++++++++++++++++++++++--------------------------
1 file changed, 134 insertions(+), 134 deletions(-)
diff --git a/www/api/Image++.html b/www/api/Image++.html
index 569843ce0d..031a1a3ef4 100644
index 569843c..031a1a3 100644
--- a/www/api/Image++.html
+++ b/www/api/Image++.html
@@ -235,7 +235,7 @@ has been placed within a Blob, it may be read into a Magick++ Image via

6
debian/patches/0001-https-github.com-ImageMagick-ImageMagick6-issues-145.patch vendored
View File

@ -1,4 +1,3 @@
From 650f0f7ecfaee42b3da89a04b92b05f27fe786e9 Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Sat, 10 Apr 2021 12:15:54 -0400
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick6/issues/145
@ -8,7 +7,7 @@ Subject: [PATCH] https://github.com/ImageMagick/ImageMagick6/issues/145
1 file changed, 9 insertions(+)
diff --git a/magick/annotate.c b/magick/annotate.c
index 29c8bbe74..20fbf7bb1 100644
index 29c8bbe..20fbf7b 100644
--- a/magick/annotate.c
+++ b/magick/annotate.c
@@ -1484,6 +1484,15 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
@ -27,6 +26,3 @@ index 29c8bbe74..20fbf7bb1 100644
metrics->width=0;
metrics->origin.x=0;
metrics->origin.y=0;
--
2.31.0

5
debian/patches/0002-Fix-api-Image-.html.patch vendored
View File

@ -1,5 +1,4 @@
From 992187e26057185e70e21aa77eda645697dfebae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Wed, 14 Dec 2016 15:18:12 +0100
Subject: Fix api/Image++.html
@ -9,7 +8,7 @@ Forwarded: Yes, https://github.com/ImageMagick/ImageMagick/issues/304
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/www/api/Image++.html b/www/api/Image++.html
index 031a1a3ef4..c0cba474c9 100644
index 031a1a3..c0cba47 100644
--- a/www/api/Image++.html
+++ b/www/api/Image++.html
@@ -147,7 +147,7 @@ int main(int argc,char **argv)

5
debian/patches/0003-Fix-www-api-mophologie.html.patch vendored
View File

@ -1,5 +1,4 @@
From 239f4d987de41a153050e4f695cbeb36ddbdda1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Wed, 14 Dec 2016 15:23:11 +0100
Subject: Fix www/api/mophologie.html
@ -9,7 +8,7 @@ Forwarded: Yes, https://github.com/ImageMagick/ImageMagick/issues/304
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/www/api/morphology.html b/www/api/morphology.html
index 734665c274..184fe8ddeb 100644
index 734665c..184fe8d 100644
--- a/www/api/morphology.html
+++ b/www/api/morphology.html
@@ -321,7 +321,7 @@ void ScaleGeometryKernelInfo(KernelInfo *kernel,

7
debian/patches/0004-Fix-www-command-line-options.html.patch vendored
View File

@ -1,15 +1,14 @@
From 801e2ff28a4292868da219979ae197c14d46d6d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Wed, 14 Dec 2016 15:26:15 +0100
Subject: Fix www/command-line-options.html
Forwarded: Yes, https://github.com/ImageMagick/ImageMagick/issues/304
---
www/command-line-options.html | 721 +++++++++++++++++++++++++++++++++-
www/command-line-options.html | 721 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 720 insertions(+), 1 deletion(-)
diff --git a/www/command-line-options.html b/www/command-line-options.html
index 3280c00f3c..f347420207 100644
index 3280c00..f347420 100644
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -1856,7 +1856,725 @@ is case-dependent.</p>

5
debian/patches/0005-Use-modern-idiom-for-autoconf.patch vendored
View File

@ -1,5 +1,4 @@
From 1012523f76edd9c46ea5a9dff6062fefffb51a40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Tue, 15 Sep 2015 22:01:13 +0200
Subject: Use modern idiom for autoconf
@ -9,7 +8,7 @@ Forwarded: yes, https://github.com/ImageMagick/ImageMagick/issues/305
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7963576e31..37ed00c988 100644
index 7963576..37ed00c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,9 +208,9 @@ AC_SUBST([SBIN_DIR])

21
debian/patches/0006-Allow-distribution-to-custumize-the-html-pointer-to-.patch vendored
View File

@ -1,5 +1,4 @@
From dfc70e98fbbcb4ce393deeaec86729469be6fc23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Fri, 2 Feb 2018 22:17:26 +0100
Subject: Allow distribution to custumize the html pointer to documentation
@ -20,7 +19,7 @@ Bug-debian: https://bugs.debian.org/727739
9 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
index 37ed00c988..ea0bb94f1b 100644
index 37ed00c..ea0bb94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3058,6 +3058,18 @@ esac
@ -43,7 +42,7 @@ index 37ed00c988..ea0bb94f1b 100644
# Enable/Disable documentation
AC_ARG_ENABLE([docs],
diff --git a/utilities/conjure.1.in b/utilities/conjure.1.in
index 93a503451c..a10c077c86 100644
index 93a5034..a10c077 100644
--- a/utilities/conjure.1.in
+++ b/utilities/conjure.1.in
@@ -7,7 +7,7 @@ conjure \- interprets and executes scripts written in the Magick Scripting Langu
@ -62,7 +61,7 @@ index 93a503451c..a10c077c86 100644
-\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or http://imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/convert.1.in b/utilities/convert.1.in
index 19b73fecd8..e588c02a47 100644
index 19b73fe..e588c02 100644
--- a/utilities/convert.1.in
+++ b/utilities/convert.1.in
@@ -7,7 +7,7 @@ convert \- convert between image formats as well as resize an image, blur, crop,
@ -82,7 +81,7 @@ index 19b73fecd8..e588c02a47 100644
+
+\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/display.1.in b/utilities/display.1.in
index c8a9cf04a7..a9bdfa3fbc 100644
index c8a9cf0..a9bdfa3 100644
--- a/utilities/display.1.in
+++ b/utilities/display.1.in
@@ -7,7 +7,7 @@ display \- displays an image or image sequence on any X server.
@ -101,7 +100,7 @@ index c8a9cf04a7..a9bdfa3fbc 100644
-\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or http://imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/identify.1.in b/utilities/identify.1.in
index b553cc42be..6ba20ef736 100644
index b553cc4..6ba20ef 100644
--- a/utilities/identify.1.in
+++ b/utilities/identify.1.in
@@ -7,7 +7,7 @@ identify \- describes the format and characteristics of one or more image files.
@ -120,7 +119,7 @@ index b553cc42be..6ba20ef736 100644
-\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or http://imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/import.1.in b/utilities/import.1.in
index 3f726f96d4..e12586f83d 100644
index 3f726f9..e12586f 100644
--- a/utilities/import.1.in
+++ b/utilities/import.1.in
@@ -7,7 +7,7 @@ import \- saves any visible window on an X server and outputs it as an image fil
@ -139,7 +138,7 @@ index 3f726f96d4..e12586f83d 100644
-\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or http://imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/mogrify.1.in b/utilities/mogrify.1.in
index c76d312bb8..084765fe20 100644
index c76d312..084765f 100644
--- a/utilities/mogrify.1.in
+++ b/utilities/mogrify.1.in
@@ -7,7 +7,7 @@ mogrify \- resize an image, blur, crop, despeckle, dither, draw on, flip, join,
@ -158,7 +157,7 @@ index c76d312bb8..084765fe20 100644
-\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or http://imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/montage.1.in b/utilities/montage.1.in
index 5ea9a35b6c..d3664c5391 100644
index 5ea9a35..d3664c5 100644
--- a/utilities/montage.1.in
+++ b/utilities/montage.1.in
@@ -7,7 +7,8 @@ montage \- create a composite image by combining several separate images. The im
@ -178,7 +177,7 @@ index 5ea9a35b6c..d3664c5391 100644
-\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or http://imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/stream.1.in b/utilities/stream.1.in
index d0b6b8960a..d3002d95bb 100644
index d0b6b89..d3002d9 100644
--- a/utilities/stream.1.in
+++ b/utilities/stream.1.in
@@ -7,7 +7,7 @@ stream \- a lightweight tool to stream one or more pixel components of the image

5
debian/patches/0007-Improve-policy-in-order-to-be-safer.patch vendored
View File

@ -1,5 +1,4 @@
From 6d99f963f4817a07e9a7f9ad65711693814f4ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Tue, 22 Nov 2016 12:59:01 +0100
Subject: Improve policy in order to be safer
@ -13,7 +12,7 @@ Forwarded: No
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/config/policy.xml b/config/policy.xml
index 2ed14de8a6..54e64782b3 100644
index 2ed14de..54e6478 100644
--- a/config/policy.xml
+++ b/config/policy.xml
@@ -57,26 +57,36 @@

9
debian/patches/0008-Fix-remaining-error-in-html-files.patch vendored
View File

@ -1,5 +1,4 @@
From 644457efe4a513b60d0f3085315426c5b4737a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sat, 18 Mar 2017 15:47:28 +0100
Subject: Fix remaining error in html files
@ -10,7 +9,7 @@ Subject: Fix remaining error in html files
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/www/changelog.html b/www/changelog.html
index 284960b90f..5d9c77bd4f 100644
index 284960b..5d9c77b 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -67,8 +67,8 @@
@ -57,7 +56,7 @@ index 284960b90f..5d9c77bd4f 100644
</html>
+
diff --git a/www/download.html b/www/download.html
index bfd4fa0ffa..d467cd9242 100644
index bfd4fa0..d467cd9 100644
--- a/www/download.html
+++ b/www/download.html
@@ -67,8 +67,8 @@
@ -77,7 +76,7 @@ index bfd4fa0ffa..d467cd9242 100644
</html>
+
diff --git a/www/index.html b/www/index.html
index 24709fc4f7..5bff3905e8 100644
index 24709fc..5bff390 100644
--- a/www/index.html
+++ b/www/index.html
@@ -263,7 +263,6 @@ Use ImageMagick<sup><a href="http://tarr.uspto.gov/servlet/tarr?regser=serial&am

29
debian/patches/0009-Improve-man-page-to-use-version-information-and-quan.patch vendored
View File

@ -1,5 +1,4 @@
From 516cfd4725b3b6851d410d47fb7168a0151e7b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Tue, 21 Mar 2017 12:15:08 +0100
Subject: Improve man page to use version information and quantum
@ -24,7 +23,7 @@ Forwarded: no
13 files changed, 52 insertions(+), 49 deletions(-)
diff --git a/configure.ac b/configure.ac
index ea0bb94f1b..570d04fe69 100644
index ea0bb94..570d04f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -805,7 +805,10 @@ MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}"
@ -40,7 +39,7 @@ index ea0bb94f1b..570d04fe69 100644
# Set pixel cache threshold
AC_ARG_WITH([cache],
diff --git a/utilities/ImageMagick.1.in b/utilities/ImageMagick.1.in
index 20c23b3396..a29ab7bd9d 100644
index 20c23b3..a29ab7b 100644
--- a/utilities/ImageMagick.1.in
+++ b/utilities/ImageMagick.1.in
@@ -1,8 +1,8 @@
@ -64,7 +63,7 @@ index 20c23b3396..a29ab7bd9d 100644
.SH COPYRIGHT
\fBCopyright (C) 1999-2020 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or http://imagemagick.org/script/license.php\fP
diff --git a/utilities/animate.1.in b/utilities/animate.1.in
index 61abca3f56..eaf7609979 100644
index 61abca3..eaf7609 100644
--- a/utilities/animate.1.in
+++ b/utilities/animate.1.in
@@ -1,11 +1,11 @@
@ -92,7 +91,7 @@ index 61abca3f56..eaf7609979 100644
.SH COPYRIGHT
diff --git a/utilities/compare.1.in b/utilities/compare.1.in
index fd8714d965..286dac302e 100644
index fd8714d..286dac3 100644
--- a/utilities/compare.1.in
+++ b/utilities/compare.1.in
@@ -1,11 +1,11 @@
@ -120,7 +119,7 @@ index fd8714d965..286dac302e 100644
.SH COPYRIGHT
diff --git a/utilities/composite.1.in b/utilities/composite.1.in
index 7361f616f2..4212b23b0b 100644
index 7361f61..4212b23 100644
--- a/utilities/composite.1.in
+++ b/utilities/composite.1.in
@@ -1,11 +1,11 @@
@ -148,7 +147,7 @@ index 7361f616f2..4212b23b0b 100644
.SH COPYRIGHT
diff --git a/utilities/conjure.1.in b/utilities/conjure.1.in
index a10c077c86..1416f5545d 100644
index a10c077..1416f55 100644
--- a/utilities/conjure.1.in
+++ b/utilities/conjure.1.in
@@ -1,11 +1,11 @@
@ -176,7 +175,7 @@ index a10c077c86..1416f5545d 100644
.SH COPYRIGHT
diff --git a/utilities/convert.1.in b/utilities/convert.1.in
index e588c02a47..1eb437ea01 100644
index e588c02..1eb437e 100644
--- a/utilities/convert.1.in
+++ b/utilities/convert.1.in
@@ -1,11 +1,11 @@
@ -204,7 +203,7 @@ index e588c02a47..1eb437ea01 100644
.SH COPYRIGHT
diff --git a/utilities/display.1.in b/utilities/display.1.in
index a9bdfa3fbc..8a5aaad708 100644
index a9bdfa3..8a5aaad 100644
--- a/utilities/display.1.in
+++ b/utilities/display.1.in
@@ -1,11 +1,11 @@
@ -232,7 +231,7 @@ index a9bdfa3fbc..8a5aaad708 100644
.SH COPYRIGHT
diff --git a/utilities/identify.1.in b/utilities/identify.1.in
index 6ba20ef736..392806fc93 100644
index 6ba20ef..392806f 100644
--- a/utilities/identify.1.in
+++ b/utilities/identify.1.in
@@ -1,11 +1,11 @@
@ -260,7 +259,7 @@ index 6ba20ef736..392806fc93 100644
.SH COPYRIGHT
diff --git a/utilities/import.1.in b/utilities/import.1.in
index e12586f83d..395db5cb38 100644
index e12586f..395db5c 100644
--- a/utilities/import.1.in
+++ b/utilities/import.1.in
@@ -1,11 +1,11 @@
@ -288,7 +287,7 @@ index e12586f83d..395db5cb38 100644
.SH COPYRIGHT
diff --git a/utilities/mogrify.1.in b/utilities/mogrify.1.in
index 084765fe20..30c09e328f 100644
index 084765f..30c09e3 100644
--- a/utilities/mogrify.1.in
+++ b/utilities/mogrify.1.in
@@ -1,11 +1,11 @@
@ -317,7 +316,7 @@ index 084765fe20..30c09e328f 100644
.SH COPYRIGHT
diff --git a/utilities/montage.1.in b/utilities/montage.1.in
index d3664c5391..0f49b01931 100644
index d3664c5..0f49b01 100644
--- a/utilities/montage.1.in
+++ b/utilities/montage.1.in
@@ -1,11 +1,11 @@
@ -345,7 +344,7 @@ index d3664c5391..0f49b01931 100644
.SH COPYRIGHT
diff --git a/utilities/stream.1.in b/utilities/stream.1.in
index d3002d95bb..6cba1d3009 100644
index d3002d9..6cba1d3 100644
--- a/utilities/stream.1.in
+++ b/utilities/stream.1.in
@@ -1,11 +1,11 @@

5
debian/patches/0010-Fix-changelog-tag-mismatch.patch vendored
View File

@ -1,5 +1,4 @@
From 8cb7b4c562949b5f9ac0c037d99874ff768482b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sun, 4 Jun 2017 13:40:37 +0200
Subject: Fix changelog tag mismatch
@ -9,7 +8,7 @@ Forwarded: no
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/changelog.html b/www/changelog.html
index 5d9c77bd4f..a80e49c0d9 100644
index 5d9c77b..a80e49c 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -1064,7 +1064,7 @@

5
debian/patches/0011-Fix-html-error-in-api-Image-.html.patch vendored
View File

@ -1,5 +1,4 @@
From 4cd51ab65b1348fcc3371c0ff3a2d0257b775a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Fri, 11 Aug 2017 10:13:21 +0200
Subject: Fix html error in api/Image++.html
@ -9,7 +8,7 @@ Forwarded: Yes
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/www/api/Image++.html b/www/api/Image++.html
index c0cba474c9..2932882212 100644
index c0cba47..2932882 100644
--- a/www/api/Image++.html
+++ b/www/api/Image++.html
@@ -66,8 +66,8 @@

5
debian/patches/0012-Fix-www-escape.html.patch vendored
View File

@ -1,5 +1,4 @@
From c3975d396ed061894f4f8ecc3a136f181fcaff8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Fri, 11 Aug 2017 10:14:36 +0200
Subject: Fix www/escape.html
@ -9,7 +8,7 @@ Forwarded: Yes
1 file changed, 1 insertion(+)
diff --git a/www/escape.html b/www/escape.html
index 5e6c04139e..9e27c44401 100644
index 5e6c041..9e27c44 100644
--- a/www/escape.html
+++ b/www/escape.html
@@ -832,6 +832,7 @@ information contained in the file:</p>

5
debian/patches/0013-Fix-www-magick-script.html.patch vendored
View File

@ -1,5 +1,4 @@
From 0696eea1ce57371b52a4b4151bc3de399a19041d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Fri, 11 Aug 2017 10:15:37 +0200
Subject: Fix www/magick-script.html
@ -9,7 +8,7 @@ Forwarded: Yes
1 file changed, 1 insertion(+)
diff --git a/www/magick-script.html b/www/magick-script.html
index e82fbe3cb4..2aa6484258 100644
index e82fbe3..2aa6484 100644
--- a/www/magick-script.html
+++ b/www/magick-script.html
@@ -91,6 +91,7 @@

5
debian/patches/0014-Fix-www-support.html.patch vendored
View File

@ -1,5 +1,4 @@
From 4390760a6cd693b36588e322ad51ff88a3bfdab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Fri, 11 Aug 2017 10:20:20 +0200
Subject: Fix www/support.html
@ -9,7 +8,7 @@ Forwarded: Yes
1 file changed, 1 insertion(+)
diff --git a/www/support.html b/www/support.html
index 5de42edc9a..3688010f92 100644
index 5de42ed..3688010 100644
--- a/www/support.html
+++ b/www/support.html
@@ -179,3 +179,4 @@

249
debian/patches/0015-Fix-instead-of-lt-and-input-form.patch vendored
View File

@ -1,5 +1,4 @@
From 08775bc3b1c7796574bc30565e26c3c2ef89686c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sat, 3 Feb 2018 23:38:58 +0100
Subject: Fix < instead of &lt; and input form
@ -131,7 +130,7 @@ Forwarded: Yes
123 files changed, 488 insertions(+), 498 deletions(-)
diff --git a/index.html b/index.html
index ca08420fe0..7e3e1413ba 100644
index ca08420..7e3e141 100644
--- a/index.html
+++ b/index.html
@@ -67,8 +67,8 @@
@ -157,7 +156,7 @@ index ca08420fe0..7e3e1413ba 100644
\ No newline at end of file
+<!-- Magick Cache 1st January 2021 17:21 -->
diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html
index 9c434e4649..9be497fb18 100644
index 9c434e4..9be497f 100644
--- a/www/ImageMagickObject.html
+++ b/www/ImageMagickObject.html
@@ -67,8 +67,8 @@
@ -181,7 +180,7 @@ index 9c434e4649..9be497fb18 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html
index f58c739132..8f1b24d2c5 100644
index f58c739..8f1b24d 100644
--- a/www/advanced-unix-installation.html
+++ b/www/advanced-unix-installation.html
@@ -67,8 +67,8 @@
@ -206,7 +205,7 @@ index f58c739132..8f1b24d2c5 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
index a785190426..f976ea0c38 100644
index a785190..f976ea0 100644
--- a/www/advanced-windows-installation.html
+++ b/www/advanced-windows-installation.html
@@ -67,8 +67,8 @@
@ -230,7 +229,7 @@ index a785190426..f976ea0c38 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/animate.html b/www/animate.html
index 90fb2a59df..89993ec118 100644
index 90fb2a5..89993ec 100644
--- a/www/animate.html
+++ b/www/animate.html
@@ -67,8 +67,8 @@
@ -254,7 +253,7 @@ index 90fb2a59df..89993ec118 100644
</html>
+<!-- Magick Cache 19th March 2020 16:55 -->
diff --git a/www/api/animate.html b/www/api/animate.html
index 0c819d217f..4d936f3980 100644
index 0c819d2..4d936f3 100644
--- a/www/api/animate.html
+++ b/www/api/animate.html
@@ -66,8 +66,8 @@
@ -281,7 +280,7 @@ index 0c819d217f..4d936f3980 100644
\ No newline at end of file
+<!-- Magick Cache 25th July 2020 16:09 -->
diff --git a/www/api/annotate.html b/www/api/annotate.html
index cecdb580e7..36bef3f574 100644
index cecdb58..36bef3f 100644
--- a/www/api/annotate.html
+++ b/www/api/annotate.html
@@ -66,8 +66,8 @@
@ -308,7 +307,7 @@ index cecdb580e7..36bef3f574 100644
\ No newline at end of file
+<!-- Magick Cache 27th July 2020 21:55 -->
diff --git a/www/api/attribute.html b/www/api/attribute.html
index 25f629f457..b9ff5b9540 100644
index 25f629f..b9ff5b9 100644
--- a/www/api/attribute.html
+++ b/www/api/attribute.html
@@ -66,8 +66,8 @@
@ -335,7 +334,7 @@ index 25f629f457..b9ff5b9540 100644
\ No newline at end of file
+<!-- Magick Cache 25th July 2020 22:43 -->
diff --git a/www/api/blob.html b/www/api/blob.html
index 5d224355a1..ff2efb13ac 100644
index 5d22435..ff2efb1 100644
--- a/www/api/blob.html
+++ b/www/api/blob.html
@@ -66,8 +66,8 @@
@ -362,7 +361,7 @@ index 5d224355a1..ff2efb13ac 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 13:51 -->
diff --git a/www/api/cache-view.html b/www/api/cache-view.html
index a35f1b7fab..a1ab00234a 100644
index a35f1b7..a1ab002 100644
--- a/www/api/cache-view.html
+++ b/www/api/cache-view.html
@@ -66,8 +66,8 @@
@ -389,7 +388,7 @@ index a35f1b7fab..a1ab00234a 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:34 -->
diff --git a/www/api/cache.html b/www/api/cache.html
index 7881cf519a..e6e8ea9ad8 100644
index 7881cf5..e6e8ea9 100644
--- a/www/api/cache.html
+++ b/www/api/cache.html
@@ -66,8 +66,8 @@
@ -416,7 +415,7 @@ index 7881cf519a..e6e8ea9ad8 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:34 -->
diff --git a/www/api/channel.html b/www/api/channel.html
index e996eb5c63..af948fc9db 100644
index e996eb5..af948fc 100644
--- a/www/api/channel.html
+++ b/www/api/channel.html
@@ -66,8 +66,8 @@
@ -443,7 +442,7 @@ index e996eb5c63..af948fc9db 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 09:13 -->
diff --git a/www/api/cipher.html b/www/api/cipher.html
index 02d54dd389..ed64fe9688 100644
index 02d54dd..ed64fe9 100644
--- a/www/api/cipher.html
+++ b/www/api/cipher.html
@@ -66,8 +66,8 @@
@ -470,7 +469,7 @@ index 02d54dd389..ed64fe9688 100644
\ No newline at end of file
+<!-- Magick Cache 28th July 2020 07:22 -->
diff --git a/www/api/color.html b/www/api/color.html
index 78e2d55682..3be5252a64 100644
index 78e2d55..3be5252 100644
--- a/www/api/color.html
+++ b/www/api/color.html
@@ -66,8 +66,8 @@
@ -497,7 +496,7 @@ index 78e2d55682..3be5252a64 100644
\ No newline at end of file
+<!-- Magick Cache 27th July 2020 05:19 -->
diff --git a/www/api/colormap.html b/www/api/colormap.html
index 4cb41b25d5..73b10c33c0 100644
index 4cb41b2..73b10c3 100644
--- a/www/api/colormap.html
+++ b/www/api/colormap.html
@@ -66,8 +66,8 @@
@ -524,7 +523,7 @@ index 4cb41b25d5..73b10c33c0 100644
\ No newline at end of file
+<!-- Magick Cache 27th July 2020 20:07 -->
diff --git a/www/api/colorspace.html b/www/api/colorspace.html
index f57f34c6f2..252439a433 100644
index f57f34c..252439a 100644
--- a/www/api/colorspace.html
+++ b/www/api/colorspace.html
@@ -66,8 +66,8 @@
@ -551,7 +550,7 @@ index f57f34c6f2..252439a433 100644
\ No newline at end of file
+<!-- Magick Cache 26th July 2020 22:29 -->
diff --git a/www/api/compare.html b/www/api/compare.html
index e2bded3012..ad5d4e0bfe 100644
index e2bded3..ad5d4e0 100644
--- a/www/api/compare.html
+++ b/www/api/compare.html
@@ -66,8 +66,8 @@
@ -578,7 +577,7 @@ index e2bded3012..ad5d4e0bfe 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:15 -->
diff --git a/www/api/composite.html b/www/api/composite.html
index 87796fecae..2b4a199816 100644
index 87796fe..2b4a199 100644
--- a/www/api/composite.html
+++ b/www/api/composite.html
@@ -66,8 +66,8 @@
@ -605,7 +604,7 @@ index 87796fecae..2b4a199816 100644
\ No newline at end of file
+<!-- Magick Cache 31st July 2020 19:53 -->
diff --git a/www/api/constitute.html b/www/api/constitute.html
index 980674b01e..804d47119b 100644
index 980674b..804d471 100644
--- a/www/api/constitute.html
+++ b/www/api/constitute.html
@@ -66,8 +66,8 @@
@ -632,7 +631,7 @@ index 980674b01e..804d47119b 100644
\ No newline at end of file
+<!-- Magick Cache 28th July 2020 08:11 -->
diff --git a/www/api/decorate.html b/www/api/decorate.html
index 2e684ed3a4..61d01300dd 100644
index 2e684ed..61d0130 100644
--- a/www/api/decorate.html
+++ b/www/api/decorate.html
@@ -66,8 +66,8 @@
@ -659,7 +658,7 @@ index 2e684ed3a4..61d01300dd 100644
\ No newline at end of file
+<!-- Magick Cache 27th July 2020 08:47 -->
diff --git a/www/api/deprecate.html b/www/api/deprecate.html
index 25ea36e780..bd0350bd6e 100644
index 25ea36e..bd0350b 100644
--- a/www/api/deprecate.html
+++ b/www/api/deprecate.html
@@ -66,8 +66,8 @@
@ -686,7 +685,7 @@ index 25ea36e780..bd0350bd6e 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:15 -->
diff --git a/www/api/display.html b/www/api/display.html
index 121e67a865..30e238c88d 100644
index 121e67a..30e238c 100644
--- a/www/api/display.html
+++ b/www/api/display.html
@@ -66,8 +66,8 @@
@ -713,7 +712,7 @@ index 121e67a865..30e238c88d 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:15 -->
diff --git a/www/api/distort.html b/www/api/distort.html
index 495c56ea8b..efa9557490 100644
index 495c56e..efa9557 100644
--- a/www/api/distort.html
+++ b/www/api/distort.html
@@ -66,8 +66,8 @@
@ -740,7 +739,7 @@ index 495c56ea8b..efa9557490 100644
\ No newline at end of file
+<!-- Magick Cache 27th July 2020 07:39 -->
diff --git a/www/api/draw.html b/www/api/draw.html
index 51add2a4b1..b46853141b 100644
index 51add2a..b468531 100644
--- a/www/api/draw.html
+++ b/www/api/draw.html
@@ -66,8 +66,8 @@
@ -767,7 +766,7 @@ index 51add2a4b1..b46853141b 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 05:35 -->
diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html
index c6fa50666d..b1e792892c 100644
index c6fa506..b1e7928 100644
--- a/www/api/drawing-wand.html
+++ b/www/api/drawing-wand.html
@@ -66,8 +66,8 @@
@ -794,7 +793,7 @@ index c6fa50666d..b1e792892c 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:15 -->
diff --git a/www/api/effect.html b/www/api/effect.html
index 0d0a823512..d6b3250cf9 100644
index 0d0a823..d6b3250 100644
--- a/www/api/effect.html
+++ b/www/api/effect.html
@@ -66,8 +66,8 @@
@ -821,7 +820,7 @@ index 0d0a823512..d6b3250cf9 100644
\ No newline at end of file
+<!-- Magick Cache 27th July 2020 05:47 -->
diff --git a/www/api/enhance.html b/www/api/enhance.html
index 789ec08fd8..d616d43e52 100644
index 789ec08..d616d43 100644
--- a/www/api/enhance.html
+++ b/www/api/enhance.html
@@ -66,8 +66,8 @@
@ -848,7 +847,7 @@ index 789ec08fd8..d616d43e52 100644
\ No newline at end of file
+<!-- Magick Cache 31st July 2020 03:29 -->
diff --git a/www/api/exception.html b/www/api/exception.html
index e86d91e169..7ef2042ef7 100644
index e86d91e..7ef2042 100644
--- a/www/api/exception.html
+++ b/www/api/exception.html
@@ -66,8 +66,8 @@
@ -875,7 +874,7 @@ index e86d91e169..7ef2042ef7 100644
\ No newline at end of file
+<!-- Magick Cache 25th July 2020 22:44 -->
diff --git a/www/api/feature.html b/www/api/feature.html
index b12352f77f..9e925e4dcc 100644
index b12352f..9e925e4 100644
--- a/www/api/feature.html
+++ b/www/api/feature.html
@@ -66,8 +66,8 @@
@ -902,7 +901,7 @@ index b12352f77f..9e925e4dcc 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:15 -->
diff --git a/www/api/fourier.html b/www/api/fourier.html
index 2b6aa04e7f..b63988e067 100644
index 2b6aa04..b63988e 100644
--- a/www/api/fourier.html
+++ b/www/api/fourier.html
@@ -66,8 +66,8 @@
@ -929,7 +928,7 @@ index 2b6aa04e7f..b63988e067 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:15 -->
diff --git a/www/api/fx.html b/www/api/fx.html
index 728a162081..e28525edb3 100644
index 728a162..e28525e 100644
--- a/www/api/fx.html
+++ b/www/api/fx.html
@@ -66,8 +66,8 @@
@ -956,7 +955,7 @@ index 728a162081..e28525edb3 100644
\ No newline at end of file
+<!-- Magick Cache 25th July 2020 03:18 -->
diff --git a/www/api/histogram.html b/www/api/histogram.html
index c11236ba65..3264313488 100644
index c11236b..3264313 100644
--- a/www/api/histogram.html
+++ b/www/api/histogram.html
@@ -66,8 +66,8 @@
@ -983,7 +982,7 @@ index c11236ba65..3264313488 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:15 -->
diff --git a/www/api/image-view.html b/www/api/image-view.html
index b362065e87..dd09c66b90 100644
index b362065..dd09c66 100644
--- a/www/api/image-view.html
+++ b/www/api/image-view.html
@@ -66,8 +66,8 @@
@ -1010,7 +1009,7 @@ index b362065e87..dd09c66b90 100644
\ No newline at end of file
+<!-- Magick Cache 26th July 2020 18:43 -->
diff --git a/www/api/image.html b/www/api/image.html
index 247b78b3ea..595356dcd2 100644
index 247b78b..595356d 100644
--- a/www/api/image.html
+++ b/www/api/image.html
@@ -66,8 +66,8 @@
@ -1037,7 +1036,7 @@ index 247b78b3ea..595356dcd2 100644
\ No newline at end of file
+<!-- Magick Cache 27th July 2020 22:12 -->
diff --git a/www/api/layer.html b/www/api/layer.html
index 7a591ae7a6..cfe37f2b26 100644
index 7a591ae..cfe37f2 100644
--- a/www/api/layer.html
+++ b/www/api/layer.html
@@ -66,8 +66,8 @@
@ -1064,7 +1063,7 @@ index 7a591ae7a6..cfe37f2b26 100644
\ No newline at end of file
+<!-- Magick Cache 27th July 2020 18:09 -->
diff --git a/www/api/list.html b/www/api/list.html
index 9ac46e302a..365edfd21c 100644
index 9ac46e3..365edfd 100644
--- a/www/api/list.html
+++ b/www/api/list.html
@@ -66,8 +66,8 @@
@ -1091,7 +1090,7 @@ index 9ac46e302a..365edfd21c 100644
\ No newline at end of file
+<!-- Magick Cache 25th July 2020 16:08 -->
diff --git a/www/api/magick++-classes.html b/www/api/magick++-classes.html
index 2ee2f37735..77704f0cb6 100644
index 2ee2f37..77704f0 100644
--- a/www/api/magick++-classes.html
+++ b/www/api/magick++-classes.html
@@ -167,8 +167,7 @@ containers of image frames.</td>
@ -1107,7 +1106,7 @@ index 2ee2f37735..77704f0cb6 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:15 -->
diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html
index 714ff039c2..2dbf084315 100644
index 714ff03..2dbf084 100644
--- a/www/api/magick-deprecate.html
+++ b/www/api/magick-deprecate.html
@@ -66,8 +66,8 @@
@ -1134,7 +1133,7 @@ index 714ff039c2..2dbf084315 100644
\ No newline at end of file
+<!-- Magick Cache 25th July 2020 22:56 -->
diff --git a/www/api/magick-image.html b/www/api/magick-image.html
index 4a7ba4fef5..495665c407 100644
index 4a7ba4f..495665c 100644
--- a/www/api/magick-image.html
+++ b/www/api/magick-image.html
@@ -66,8 +66,8 @@
@ -1161,7 +1160,7 @@ index 4a7ba4fef5..495665c407 100644
\ No newline at end of file
+<!-- Magick Cache 25th July 2020 06:34 -->
diff --git a/www/api/magick-property.html b/www/api/magick-property.html
index 9262a75d8d..902a0b4900 100644
index 9262a75..902a0b4 100644
--- a/www/api/magick-property.html
+++ b/www/api/magick-property.html
@@ -66,8 +66,8 @@
@ -1188,7 +1187,7 @@ index 9262a75d8d..902a0b4900 100644
\ No newline at end of file
+<!-- Magick Cache 29th July 2020 20:01 -->
diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html
index e90183585b..76f6f9c82e 100644
index e901835..76f6f9c 100644
--- a/www/api/magick-wand.html
+++ b/www/api/magick-wand.html
@@ -66,8 +66,8 @@
@ -1215,7 +1214,7 @@ index e90183585b..76f6f9c82e 100644
\ No newline at end of file
+<!-- Magick Cache 25th July 2020 22:55 -->
diff --git a/www/api/magick.html b/www/api/magick.html
index 74ba75cbb5..52ed77ba09 100644
index 74ba75c..52ed77b 100644
--- a/www/api/magick.html
+++ b/www/api/magick.html
@@ -66,8 +66,8 @@
@ -1242,7 +1241,7 @@ index 74ba75cbb5..52ed77ba09 100644
\ No newline at end of file
+<!-- Magick Cache 28th July 2020 09:24 -->
diff --git a/www/api/memory.html b/www/api/memory.html
index f6b1c49ec6..808b94cea9 100644
index f6b1c49..808b94c 100644
--- a/www/api/memory.html
+++ b/www/api/memory.html
@@ -66,8 +66,8 @@
@ -1269,7 +1268,7 @@ index f6b1c49ec6..808b94cea9 100644
\ No newline at end of file
+<!-- Magick Cache 24th July 2020 19:59 -->
diff --git a/www/api/mime.html b/www/api/mime.html
index 33e489327e..2d469ecdd4 100644
index 33e4893..2d469ec 100644
--- a/www/api/mime.html
+++ b/www/api/mime.html
@@ -66,8 +66,8 @@
@ -1296,7 +1295,7 @@ index 33e489327e..2d469ecdd4 100644
\ No newline at end of file
+<!-- Magick Cache 24th July 2020 23:26 -->
diff --git a/www/api/module.html b/www/api/module.html
index 1cd7da8608..e3352bf1ff 100644
index 1cd7da8..e3352bf 100644
--- a/www/api/module.html
+++ b/www/api/module.html
@@ -66,8 +66,8 @@
@ -1323,7 +1322,7 @@ index 1cd7da8608..e3352bf1ff 100644
\ No newline at end of file
+<!-- Magick Cache 29th July 2020 18:21 -->
diff --git a/www/api/mogrify.html b/www/api/mogrify.html
index f9a4b43ce4..d20f787612 100644
index f9a4b43..d20f787 100644
--- a/www/api/mogrify.html
+++ b/www/api/mogrify.html
@@ -66,8 +66,8 @@
@ -1350,7 +1349,7 @@ index f9a4b43ce4..d20f787612 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:15 -->
diff --git a/www/api/monitor.html b/www/api/monitor.html
index d051e4e4f0..dabab5cf3e 100644
index d051e4e..dabab5c 100644
--- a/www/api/monitor.html
+++ b/www/api/monitor.html
@@ -66,8 +66,8 @@
@ -1377,7 +1376,7 @@ index d051e4e4f0..dabab5cf3e 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:15 -->
diff --git a/www/api/montage.html b/www/api/montage.html
index 45b8d34930..ba1b9b22d4 100644
index 45b8d34..ba1b9b2 100644
--- a/www/api/montage.html
+++ b/www/api/montage.html
@@ -66,8 +66,8 @@
@ -1404,7 +1403,7 @@ index 45b8d34930..ba1b9b22d4 100644
\ No newline at end of file
+<!-- Magick Cache 27th July 2020 06:29 -->
diff --git a/www/api/morphology.html b/www/api/morphology.html
index 184fe8ddeb..f2fc919120 100644
index 184fe8d..f2fc919 100644
--- a/www/api/morphology.html
+++ b/www/api/morphology.html
@@ -66,8 +66,8 @@
@ -1431,7 +1430,7 @@ index 184fe8ddeb..f2fc919120 100644
\ No newline at end of file
+<!-- Magick Cache 31st July 2020 19:28 -->
diff --git a/www/api/paint.html b/www/api/paint.html
index 72eecc9e31..c150221997 100644
index 72eecc9..c150221 100644
--- a/www/api/paint.html
+++ b/www/api/paint.html
@@ -66,8 +66,8 @@
@ -1458,7 +1457,7 @@ index 72eecc9e31..c150221997 100644
\ No newline at end of file
+<!-- Magick Cache 28th July 2020 09:32 -->
diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html
index ac7bc1088a..245f701baf 100644
index ac7bc10..245f701 100644
--- a/www/api/pixel-iterator.html
+++ b/www/api/pixel-iterator.html
@@ -66,8 +66,8 @@
@ -1485,7 +1484,7 @@ index ac7bc1088a..245f701baf 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 17:15 -->
diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html
index 875c3e2eba..e2bb446d08 100644
index 875c3e2..e2bb446 100644
--- a/www/api/pixel-wand.html
+++ b/www/api/pixel-wand.html
@@ -66,8 +66,8 @@
@ -1512,7 +1511,7 @@ index 875c3e2eba..e2bb446d08 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 09:18 -->
diff --git a/www/api/profile.html b/www/api/profile.html
index 89dd943b64..f4e268af12 100644
index 89dd943..f4e268a 100644
--- a/www/api/profile.html
+++ b/www/api/profile.html
@@ -66,8 +66,8 @@
@ -1539,7 +1538,7 @@ index 89dd943b64..f4e268af12 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 16:05 -->
diff --git a/www/api/property.html b/www/api/property.html
index e0cdde0bcb..7fd481f6f3 100644
index e0cdde0..7fd481f 100644
--- a/www/api/property.html
+++ b/www/api/property.html
@@ -66,8 +66,8 @@
@ -1566,7 +1565,7 @@ index e0cdde0bcb..7fd481f6f3 100644
\ No newline at end of file
+<!-- Magick Cache 30th July 2020 12:24 -->
diff --git a/www/api/quantize.html b/www/api/quantize.html
index ec170256ef..d3e23e7abf 100644
index ec17025..d3e23e7 100644
--- a/www/api/quantize.html
+++ b/www/api/quantize.html
@@ -66,8 +66,8 @@
@ -1593,7 +1592,7 @@ index ec170256ef..d3e23e7abf 100644
\ No newline at end of file
+<!-- Magick Cache 27th July 2020 13:51 -->
diff --git a/www/api/registry.html b/www/api/registry.html
index 8bdae028e4..fec9845f86 100644
index 8bdae02..fec9845 100644
--- a/www/api/registry.html
+++ b/www/api/registry.html
@@ -66,8 +66,8 @@
@ -1620,7 +1619,7 @@ index 8bdae028e4..fec9845f86 100644
\ No newline at end of file
+<!-- Magick Cache 28th July 2020 20:53 -->
diff --git a/www/api/resize.html b/www/api/resize.html
index ae0db0aa4d..027a464293 100644
index ae0db0a..027a464 100644
--- a/www/api/resize.html
+++ b/www/api/resize.html
@@ -66,8 +66,8 @@
@ -1647,7 +1646,7 @@ index ae0db0aa4d..027a464293 100644
\ No newline at end of file
+<!-- Magick Cache 25th July 2020 16:09 -->
diff --git a/www/api/resource.html b/www/api/resource.html
index db902065d3..07ccdc2cdd 100644
index db90206..07ccdc2 100644
--- a/www/api/resource.html
+++ b/www/api/resource.html
@@ -66,8 +66,8 @@
@ -1674,7 +1673,7 @@ index db902065d3..07ccdc2cdd 100644
\ No newline at end of file
+<!-- Magick Cache 29th July 2020 18:24 -->
diff --git a/www/api/segment.html b/www/api/segment.html
index c92e8d8fc7..76c7be50dd 100644
index c92e8d8..76c7be5 100644
--- a/www/api/segment.html
+++ b/www/api/segment.html
@@ -66,8 +66,8 @@
@ -1701,7 +1700,7 @@ index c92e8d8fc7..76c7be50dd 100644
\ No newline at end of file
+<!-- Magick Cache 25th July 2020 22:43 -->
diff --git a/www/api/shear.html b/www/api/shear.html
index ab8fe9fac8..e9dd82496b 100644
index ab8fe9f..e9dd824 100644
--- a/www/api/shear.html
+++ b/www/api/shear.html
@@ -66,8 +66,8 @@
@ -1728,7 +1727,7 @@ index ab8fe9fac8..e9dd82496b 100644
\ No newline at end of file
+<!-- Magick Cache 31st July 2020 00:00 -->
diff --git a/www/api/signature.html b/www/api/signature.html
index e3d7e1a7fc..b3d07a0252 100644
index e3d7e1a..b3d07a0 100644
--- a/www/api/signature.html
+++ b/www/api/signature.html
@@ -66,8 +66,8 @@
@ -1755,7 +1754,7 @@ index e3d7e1a7fc..b3d07a0252 100644
\ No newline at end of file
+<!-- Magick Cache 27th July 2020 21:04 -->
diff --git a/www/api/statistic.html b/www/api/statistic.html
index 8125dc1aec..3555fe780c 100644
index 8125dc1..3555fe7 100644
--- a/www/api/statistic.html
+++ b/www/api/statistic.html
@@ -66,8 +66,8 @@
@ -1782,7 +1781,7 @@ index 8125dc1aec..3555fe780c 100644
\ No newline at end of file
+<!-- Magick Cache 28th July 2020 06:11 -->
diff --git a/www/api/stream.html b/www/api/stream.html
index 8e0053fd04..736ce725f0 100644
index 8e0053f..736ce72 100644
--- a/www/api/stream.html
+++ b/www/api/stream.html
@@ -66,8 +66,8 @@
@ -1809,7 +1808,7 @@ index 8e0053fd04..736ce725f0 100644
\ No newline at end of file
+<!-- Magick Cache 25th July 2020 17:16 -->
diff --git a/www/api/transform.html b/www/api/transform.html
index efbf9d2821..497b9238b7 100644
index efbf9d2..497b923 100644
--- a/www/api/transform.html
+++ b/www/api/transform.html
@@ -66,8 +66,8 @@
@ -1836,7 +1835,7 @@ index efbf9d2821..497b9238b7 100644
\ No newline at end of file
+<!-- Magick Cache 29th July 2020 23:04 -->
diff --git a/www/api/version.html b/www/api/version.html
index 0a59115d8f..5eec8db2fa 100644
index 0a59115..5eec8db 100644
--- a/www/api/version.html
+++ b/www/api/version.html
@@ -66,8 +66,8 @@
@ -1863,7 +1862,7 @@ index 0a59115d8f..5eec8db2fa 100644
\ No newline at end of file
+<!-- Magick Cache 27th July 2020 20:41 -->
diff --git a/www/api/wand-view.html b/www/api/wand-view.html
index f44b674f1f..c877d6e3bb 100644
index f44b674..c877d6e 100644
--- a/www/api/wand-view.html
+++ b/www/api/wand-view.html
@@ -66,8 +66,8 @@
@ -1890,7 +1889,7 @@ index f44b674f1f..c877d6e3bb 100644
\ No newline at end of file
+<!-- Magick Cache 25th July 2020 17:18 -->
diff --git a/www/architecture.html b/www/architecture.html
index f3d9a6353a..7fe2eb9b86 100644
index f3d9a63..7fe2eb9 100644
--- a/www/architecture.html
+++ b/www/architecture.html
@@ -67,8 +67,8 @@
@ -1915,7 +1914,7 @@ index f3d9a6353a..7fe2eb9b86 100644
+<!-- Magick Cache 12th June 2020 18:55 -->
+
diff --git a/www/changelog.html b/www/changelog.html
index a80e49c0d9..fe5bca9fec 100644
index a80e49c..fe5bca9 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -5113,7 +5113,7 @@
@ -1928,7 +1927,7 @@ index a80e49c0d9..fe5bca9fec 100644
<footer class="magick-footer">
<div class="container">
diff --git a/www/cipher.html b/www/cipher.html
index 2fe98736c0..149ac43dce 100644
index 2fe9873..149ac43 100644
--- a/www/cipher.html
+++ b/www/cipher.html
@@ -67,8 +67,8 @@
@ -1952,7 +1951,7 @@ index 2fe98736c0..149ac43dce 100644
</html>
+<!-- Magick Cache 1st January 2021 18:34 -->
diff --git a/www/color-management.html b/www/color-management.html
index f56d370de7..e4d34bfc73 100644
index f56d370..e4d34bf 100644
--- a/www/color-management.html
+++ b/www/color-management.html
@@ -67,8 +67,8 @@
@ -1986,7 +1985,7 @@ index f56d370de7..e4d34bfc73 100644
+<!-- Magick Cache 1st January 2021 18:20 -->
+
diff --git a/www/color.html b/www/color.html
index 0669937471..68ee376f8c 100644
index 0669937..68ee376 100644
--- a/www/color.html
+++ b/www/color.html
@@ -67,8 +67,8 @@
@ -2010,7 +2009,7 @@ index 0669937471..68ee376f8c 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/command-line-options.html b/www/command-line-options.html
index f347420207..ed0859153f 100644
index f347420..ed08591 100644
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -67,8 +67,8 @@
@ -2035,7 +2034,7 @@ index f347420207..ed0859153f 100644
<!-- Magick Cache 1st January 2021 18:36 -->
+
diff --git a/www/command-line-processing.html b/www/command-line-processing.html
index a9acc4c73b..0fb06d818e 100644
index a9acc4c..0fb06d8 100644
--- a/www/command-line-processing.html
+++ b/www/command-line-processing.html
@@ -67,8 +67,8 @@
@ -2059,7 +2058,7 @@ index a9acc4c73b..0fb06d818e 100644
</html>
+<!-- Magick Cache 1st January 2021 16:55 -->
diff --git a/www/command-line-tools.html b/www/command-line-tools.html
index eadf195b81..ec0cd937fb 100644
index eadf195..ec0cd93 100644
--- a/www/command-line-tools.html
+++ b/www/command-line-tools.html
@@ -67,8 +67,8 @@
@ -2083,7 +2082,7 @@ index eadf195b81..ec0cd937fb 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/compare.html b/www/compare.html
index 54b768ad24..dc4b47ec32 100644
index 54b768a..dc4b47e 100644
--- a/www/compare.html
+++ b/www/compare.html
@@ -67,8 +67,8 @@
@ -2116,7 +2115,7 @@ index 54b768ad24..dc4b47ec32 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/compose.html b/www/compose.html
index 361c1cfba4..9740ba6292 100644
index 361c1cf..9740ba6 100644
--- a/www/compose.html
+++ b/www/compose.html
@@ -67,8 +67,8 @@
@ -2140,7 +2139,7 @@ index 361c1cfba4..9740ba6292 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/composite.html b/www/composite.html
index 7a9d9dc03a..eb4d7319bf 100644
index 7a9d9dc..eb4d731 100644
--- a/www/composite.html
+++ b/www/composite.html
@@ -67,8 +67,8 @@
@ -2164,7 +2163,7 @@ index 7a9d9dc03a..eb4d7319bf 100644
</html>
+<!-- Magick Cache 1st January 2021 18:22 -->
diff --git a/www/conjure.html b/www/conjure.html
index dfa7a45800..cc67874952 100644
index dfa7a45..cc67874 100644
--- a/www/conjure.html
+++ b/www/conjure.html
@@ -67,8 +67,8 @@
@ -2188,7 +2187,7 @@ index dfa7a45800..cc67874952 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/connected-components.html b/www/connected-components.html
index 761f67b636..93ce606175 100644
index 761f67b..93ce606 100644
--- a/www/connected-components.html
+++ b/www/connected-components.html
@@ -67,8 +67,8 @@
@ -2212,7 +2211,7 @@ index 761f67b636..93ce606175 100644
</html>
+<!-- Magick Cache 1st January 2021 18:17 -->
diff --git a/www/contact.html b/www/contact.html
index bacf1d3187..960e889247 100644
index bacf1d3..960e889 100644
--- a/www/contact.html
+++ b/www/contact.html
@@ -67,8 +67,8 @@
@ -2235,7 +2234,7 @@ index bacf1d3187..960e889247 100644
</body>
</html>
diff --git a/www/convert.html b/www/convert.html
index aa813add45..f67750baa3 100644
index aa813ad..f67750b 100644
--- a/www/convert.html
+++ b/www/convert.html
@@ -67,8 +67,8 @@
@ -2259,7 +2258,7 @@ index aa813add45..f67750baa3 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/develop.html b/www/develop.html
index dfcba8eb50..011f4f1ec5 100644
index dfcba8e..011f4f1 100644
--- a/www/develop.html
+++ b/www/develop.html
@@ -67,8 +67,8 @@
@ -2284,7 +2283,7 @@ index dfcba8eb50..011f4f1ec5 100644
+<!-- Magick Cache 1st January 2021 17:36 -->
+
diff --git a/www/display.html b/www/display.html
index 738d081688..08081496ad 100644
index 738d081..0808149 100644
--- a/www/display.html
+++ b/www/display.html
@@ -67,8 +67,8 @@
@ -2308,7 +2307,7 @@ index 738d081688..08081496ad 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/distribute-pixel-cache.html b/www/distribute-pixel-cache.html
index 96f6c561d3..5a1e37ddec 100644
index 96f6c56..5a1e37d 100644
--- a/www/distribute-pixel-cache.html
+++ b/www/distribute-pixel-cache.html
@@ -67,8 +67,8 @@
@ -2332,7 +2331,7 @@ index 96f6c561d3..5a1e37ddec 100644
</html>
+<!-- Magick Cache 1st January 2021 18:19 -->
diff --git a/www/download.html b/www/download.html
index d467cd9242..468a708ed5 100644
index d467cd9..468a708 100644
--- a/www/download.html
+++ b/www/download.html
@@ -475,7 +475,7 @@ objShell.Exec("convert ""e:/myimages/image.png"" ""e:/myimages/image.jpg""")</co
@ -2345,7 +2344,7 @@ index d467cd9242..468a708ed5 100644
</html>
diff --git a/www/escape.html b/www/escape.html
index 9e27c44401..2519ee1d40 100644
index 9e27c44..2519ee1 100644
--- a/www/escape.html
+++ b/www/escape.html
@@ -67,8 +67,8 @@
@ -2369,7 +2368,7 @@ index 9e27c44401..2519ee1d40 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/examples.html b/www/examples.html
index abfbd0db4c..921284d3b1 100644
index abfbd0d..921284d 100644
--- a/www/examples.html
+++ b/www/examples.html
@@ -67,8 +67,8 @@
@ -2393,7 +2392,7 @@ index abfbd0db4c..921284d3b1 100644
</html>
+<!-- Magick Cache 1st January 2021 18:37 -->
diff --git a/www/exception.html b/www/exception.html
index 90c2beb007..ac466258dd 100644
index 90c2beb..ac46625 100644
--- a/www/exception.html
+++ b/www/exception.html
@@ -67,8 +67,8 @@
@ -2417,7 +2416,7 @@ index 90c2beb007..ac466258dd 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/export.html b/www/export.html
index 562f40f188..86dd25bae1 100644
index 562f40f..86dd25b 100644
--- a/www/export.html
+++ b/www/export.html
@@ -67,8 +67,8 @@
@ -2441,7 +2440,7 @@ index 562f40f188..86dd25bae1 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/formats.html b/www/formats.html
index fe4aa6854a..261250db93 100644
index fe4aa68..261250d 100644
--- a/www/formats.html
+++ b/www/formats.html
@@ -67,8 +67,8 @@
@ -2465,7 +2464,7 @@ index fe4aa6854a..261250db93 100644
</html>
+<!-- Magick Cache 1st January 2021 18:45 -->
diff --git a/www/fx.html b/www/fx.html
index a9d7fb5dbf..c2428d17e9 100644
index a9d7fb5..c2428d1 100644
--- a/www/fx.html
+++ b/www/fx.html
@@ -67,8 +67,8 @@
@ -2489,7 +2488,7 @@ index a9d7fb5dbf..c2428d17e9 100644
</html>
+<!-- Magick Cache 1st January 2021 18:20 -->
diff --git a/www/gradient.html b/www/gradient.html
index 094cfc3f54..d18f5b8c60 100644
index 094cfc3..d18f5b8 100644
--- a/www/gradient.html
+++ b/www/gradient.html
@@ -67,8 +67,8 @@
@ -2530,7 +2529,7 @@ index 094cfc3f54..d18f5b8c60 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html
index 1d0598fe3c..c0971b93de 100644
index 1d0598f..c0971b9 100644
--- a/www/high-dynamic-range.html
+++ b/www/high-dynamic-range.html
@@ -67,8 +67,8 @@
@ -2554,7 +2553,7 @@ index 1d0598fe3c..c0971b93de 100644
</html>
+<!-- Magick Cache 1st January 2021 18:37 -->
diff --git a/www/history.html b/www/history.html
index 92604aa914..ef0ddbb1b7 100644
index 92604aa..ef0ddbb 100644
--- a/www/history.html
+++ b/www/history.html
@@ -67,8 +67,8 @@
@ -2578,7 +2577,7 @@ index 92604aa914..ef0ddbb1b7 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/identify.html b/www/identify.html
index 5d985bbd6f..b5cb2d312f 100644
index 5d985bb..b5cb2d3 100644
--- a/www/identify.html
+++ b/www/identify.html
@@ -67,8 +67,8 @@
@ -2602,7 +2601,7 @@ index 5d985bbd6f..b5cb2d312f 100644
</html>
+<!-- Magick Cache 1st January 2021 17:39 -->
diff --git a/www/import.html b/www/import.html
index fd4bd178f8..ab095f2554 100644
index fd4bd17..ab095f2 100644
--- a/www/import.html
+++ b/www/import.html
@@ -67,8 +67,8 @@
@ -2626,7 +2625,7 @@ index fd4bd178f8..ab095f2554 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/install-source.html b/www/install-source.html
index c74afa8303..881a331c0a 100644
index c74afa8..881a331 100644
--- a/www/install-source.html
+++ b/www/install-source.html
@@ -67,8 +67,8 @@
@ -2650,7 +2649,7 @@ index c74afa8303..881a331c0a 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/jp2.html b/www/jp2.html
index ca1b7b8594..e67180e082 100644
index ca1b7b8..e67180e 100644
--- a/www/jp2.html
+++ b/www/jp2.html
@@ -67,8 +67,8 @@
@ -2674,7 +2673,7 @@ index ca1b7b8594..e67180e082 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/license.html b/www/license.html
index fadb687801..d9b6122b26 100644
index fadb687..d9b6122 100644
--- a/www/license.html
+++ b/www/license.html
@@ -67,8 +67,8 @@
@ -2706,7 +2705,7 @@ index fadb687801..d9b6122b26 100644
</html>
+<!-- Magick Cache 1st January 2021 17:58 -->
diff --git a/www/links.html b/www/links.html
index fb2f917140..2c03dc6b1f 100644
index fb2f917..2c03dc6 100644
--- a/www/links.html
+++ b/www/links.html
@@ -67,8 +67,8 @@
@ -2730,7 +2729,7 @@ index fb2f917140..2c03dc6b1f 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/magick++.html b/www/magick++.html
index ba4bce78cc..24d4aa5b71 100644
index ba4bce7..24d4aa5 100644
--- a/www/magick++.html
+++ b/www/magick++.html
@@ -67,8 +67,8 @@
@ -2754,7 +2753,7 @@ index ba4bce78cc..24d4aa5b71 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/magick-core.html b/www/magick-core.html
index f195fad121..312dcf1ff9 100644
index f195fad..312dcf1 100644
--- a/www/magick-core.html
+++ b/www/magick-core.html
@@ -67,8 +67,8 @@
@ -2778,7 +2777,7 @@ index f195fad121..312dcf1ff9 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/magick-script.html b/www/magick-script.html
index 2aa6484258..5af89f326a 100644
index 2aa6484..5af89f3 100644
--- a/www/magick-script.html
+++ b/www/magick-script.html
@@ -66,8 +66,8 @@
@ -2802,7 +2801,7 @@ index 2aa6484258..5af89f326a 100644
</body>
</html>
diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html
index 95c5f61dbc..c82736bd39 100644
index 95c5f61..c82736b 100644
--- a/www/magick-vector-graphics.html
+++ b/www/magick-vector-graphics.html
@@ -67,8 +67,8 @@
@ -2826,7 +2825,7 @@ index 95c5f61dbc..c82736bd39 100644
</html>
+<!-- Magick Cache 1st January 2021 17:30 -->
diff --git a/www/magick-wand.html b/www/magick-wand.html
index 68e5690610..b922b334b2 100644
index 68e5690..b922b33 100644
--- a/www/magick-wand.html
+++ b/www/magick-wand.html
@@ -67,8 +67,8 @@
@ -2850,7 +2849,7 @@ index 68e5690610..b922b334b2 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/magick.html b/www/magick.html
index f48186d25b..ae4855adc7 100644
index f48186d..ae4855a 100644
--- a/www/magick.html
+++ b/www/magick.html
@@ -66,8 +66,8 @@
@ -2877,7 +2876,7 @@ index f48186d25b..ae4855adc7 100644
\ No newline at end of file
+<!-- Magick Cache 25th August 2020 18:58 -->
diff --git a/www/miff.html b/www/miff.html
index 7c09a778b6..201dc4ed96 100644
index 7c09a77..201dc4e 100644
--- a/www/miff.html
+++ b/www/miff.html
@@ -67,8 +67,8 @@
@ -2901,7 +2900,7 @@ index 7c09a778b6..201dc4ed96 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/mirror.html b/www/mirror.html
index 388a545da2..2c84a6d840 100644
index 388a545..2c84a6d 100644
--- a/www/mirror.html
+++ b/www/mirror.html
@@ -67,8 +67,8 @@
@ -2925,7 +2924,7 @@ index 388a545da2..2c84a6d840 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/mogrify.html b/www/mogrify.html
index c182693b7f..2fbe9e9706 100644
index c182693..2fbe9e9 100644
--- a/www/mogrify.html
+++ b/www/mogrify.html
@@ -67,8 +67,8 @@
@ -2949,7 +2948,7 @@ index c182693b7f..2fbe9e9706 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/montage.html b/www/montage.html
index 97542fe6bc..310e73611b 100644
index 97542fe..310e736 100644
--- a/www/montage.html
+++ b/www/montage.html
@@ -67,8 +67,8 @@
@ -2973,7 +2972,7 @@ index 97542fe6bc..310e73611b 100644
</html>
+<!-- Magick Cache 1st January 2021 18:14 -->
diff --git a/www/motion-picture.html b/www/motion-picture.html
index 6c84c378fb..fb145daa21 100644
index 6c84c37..fb145da 100644
--- a/www/motion-picture.html
+++ b/www/motion-picture.html
@@ -67,8 +67,8 @@
@ -2997,7 +2996,7 @@ index 6c84c378fb..fb145daa21 100644
</html>
+<!-- Magick Cache 1st January 2021 18:11 -->
diff --git a/www/opencl.html b/www/opencl.html
index 89002faebf..f6b026e7a1 100644
index 89002fa..f6b026e 100644
--- a/www/opencl.html
+++ b/www/opencl.html
@@ -67,8 +67,8 @@
@ -3021,7 +3020,7 @@ index 89002faebf..f6b026e7a1 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/openmp.html b/www/openmp.html
index 2e9c1d2ad1..233cd452a7 100644
index 2e9c1d2..233cd45 100644
--- a/www/openmp.html
+++ b/www/openmp.html
@@ -67,8 +67,8 @@
@ -3045,7 +3044,7 @@ index 2e9c1d2ad1..233cd452a7 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/perl-magick.html b/www/perl-magick.html
index 4bdbc6adb0..a84edd5f93 100644
index 4bdbc6a..a84edd5 100644
--- a/www/perl-magick.html
+++ b/www/perl-magick.html
@@ -67,8 +67,8 @@
@ -3069,7 +3068,7 @@ index 4bdbc6adb0..a84edd5f93 100644
</html>
+<!-- Magick Cache 1st January 2021 17:29 -->
diff --git a/www/porting.html b/www/porting.html
index dddbc258c8..9a1759d27b 100644
index dddbc25..9a1759d 100644
--- a/www/porting.html
+++ b/www/porting.html
@@ -67,8 +67,8 @@
@ -3093,7 +3092,7 @@ index dddbc258c8..9a1759d27b 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/quantize.html b/www/quantize.html
index 09bf3cba7e..a36f78f44d 100644
index 09bf3cb..a36f78f 100644
--- a/www/quantize.html
+++ b/www/quantize.html
@@ -67,8 +67,8 @@
@ -3117,7 +3116,7 @@ index 09bf3cba7e..a36f78f44d 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/resources.html b/www/resources.html
index fe3bd8af4e..9166022c1d 100644
index fe3bd8a..9166022 100644
--- a/www/resources.html
+++ b/www/resources.html
@@ -67,8 +67,8 @@
@ -3141,7 +3140,7 @@ index fe3bd8af4e..9166022c1d 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/search.html b/www/search.html
index da63a05003..fd224dd29d 100644
index da63a05..fd224dd 100644
--- a/www/search.html
+++ b/www/search.html
@@ -66,9 +66,8 @@
@ -3173,7 +3172,7 @@ index da63a05003..fd224dd29d 100644
</body>
</html>
diff --git a/www/security-policy.html b/www/security-policy.html
index 030bd1bbed..9ccc4b496a 100644
index 030bd1b..9ccc4b4 100644
--- a/www/security-policy.html
+++ b/www/security-policy.html
@@ -66,9 +66,8 @@
@ -3207,7 +3206,7 @@ index 030bd1bbed..9ccc4b496a 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/sitemap.html b/www/sitemap.html
index 7a0ae8d295..9b18ef989b 100644
index 7a0ae8d..9b18ef9 100644
--- a/www/sitemap.html
+++ b/www/sitemap.html
@@ -67,8 +67,8 @@
@ -3231,7 +3230,7 @@ index 7a0ae8d295..9b18ef989b 100644
</html>
+<!-- Magick Cache 1st January 2021 17:50 -->
diff --git a/www/stream.html b/www/stream.html
index 96ae7e4b60..df1f528982 100644
index 96ae7e4..df1f528 100644
--- a/www/stream.html
+++ b/www/stream.html
@@ -67,8 +67,8 @@
@ -3255,7 +3254,7 @@ index 96ae7e4b60..df1f528982 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/support.html b/www/support.html
index 3688010f92..7d1388f761 100644
index 3688010..7d1388f 100644
--- a/www/support.html
+++ b/www/support.html
@@ -67,8 +67,8 @@
@ -3279,7 +3278,7 @@ index 3688010f92..7d1388f761 100644
</html>
<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/webp.html b/www/webp.html
index 6dc6077ae1..fe6489575f 100644
index 6dc6077..fe64895 100644
--- a/www/webp.html
+++ b/www/webp.html
@@ -67,8 +67,8 @@

11
debian/patches/0016-Fix-another-errors-in-html-files.patch vendored
View File

@ -1,19 +1,18 @@
From fa352d2950591ebc6104de7e64e1442355c4f0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Mon, 19 Mar 2018 22:08:25 +0100
Subject: Fix another errors in html files
Forwarded: yes
---
www/api.html | 224 ++++++++++++++++++
www/binary-releases.html | 495 +++++++++++++++++++++++++++++++++++++++
www/api.html | 224 +++++++++++++++++++++
www/binary-releases.html | 495 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 719 insertions(+)
create mode 100644 www/api.html
create mode 100644 www/binary-releases.html
diff --git a/www/api.html b/www/api.html
new file mode 100644
index 0000000000..6542f550f9
index 0000000..6542f55
--- /dev/null
+++ b/www/api.html
@@ -0,0 +1,224 @@
@ -243,7 +242,7 @@ index 0000000000..6542f550f9
+</html>
diff --git a/www/binary-releases.html b/www/binary-releases.html
new file mode 100644
index 0000000000..b6e959a7ea
index 0000000..b6e959a
--- /dev/null
+++ b/www/binary-releases.html
@@ -0,0 +1,495 @@

5
debian/patches/0017-Fix-index.html.patch vendored
View File

@ -1,5 +1,4 @@
From 53318cf3701792dfbb1e7d460f9d2cae7484d591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Roucari=C3=A8s?= <rouca@debian.org>
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org>
Date: Mon, 30 Jul 2018 14:49:54 +0200
Subject: Fix index.html
@ -9,7 +8,7 @@ Forwarded: yes
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/www/index.html b/www/index.html
index 5bff3905e8..51355732f9 100644
index 5bff390..5135573 100644
--- a/www/index.html
+++ b/www/index.html
@@ -67,8 +67,8 @@

5
debian/patches/0018-Fix-end-tags.patch vendored
View File

@ -1,5 +1,4 @@
From df76b8f6d8230390e7c8ecf5dbe6dab132b79fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Roucari=C3=A8s?= <rouca@debian.org>
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org>
Date: Mon, 30 Jul 2018 14:50:23 +0200
Subject: Fix end tags
@ -9,7 +8,7 @@ Forwarded: yes
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
index f976ea0c38..50571726e1 100644
index f976ea0..5057172 100644
--- a/www/advanced-windows-installation.html
+++ b/www/advanced-windows-installation.html
@@ -98,7 +98,7 @@

19
debian/patches/0019-Fix-a-few-html-error.patch vendored
View File

@ -1,20 +1,19 @@
From 55e03da869a70f9bf07a34d9adb8270e0693f914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Roucari=C3=A8s?= <rouca@debian.org>
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org>
Date: Sun, 26 Jul 2020 22:26:36 +0200
Subject: Fix a few html error
Forwarded: yes
---
www/binary-releases.html | 1 -
www/changelog.html | 12 ++---
www/defines.html | 96 ++++++++++++++++++++++++++++++++++++++--
www/changelog.html | 12 +++---
www/defines.html | 96 ++++++++++++++++++++++++++++++++++++++++++++++--
www/index.html | 10 +++++
www/search.html | 1 +
www/security-policy.html | 1 +
6 files changed, 112 insertions(+), 9 deletions(-)
diff --git a/www/binary-releases.html b/www/binary-releases.html
index b6e959a7ea..49a8f2aac9 100644
index b6e959a..49a8f2a 100644
--- a/www/binary-releases.html
+++ b/www/binary-releases.html
@@ -65,7 +65,6 @@
@ -26,7 +25,7 @@ index b6e959a7ea..49a8f2aac9 100644
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
diff --git a/www/changelog.html b/www/changelog.html
index fe5bca9fec..5887ee8d3a 100644
index fe5bca9..5887ee8 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -418,13 +418,14 @@
@ -67,7 +66,7 @@ index fe5bca9fec..5887ee8d3a 100644
<li> Release ImageMagick version 6.9.10-0, GIT revision 13585:82d7dbe0b:20180612.</li>
<dt>2018-06-11 6.9.10-0 Cristy &lt;quetzlzacatenango@image...&gt;</dt>
diff --git a/www/defines.html b/www/defines.html
index bfd619f4b4..405196a69a 100644
index bfd619f..405196a 100644
--- a/www/defines.html
+++ b/www/defines.html
@@ -67,8 +67,8 @@
@ -185,7 +184,7 @@ index bfd619f4b4..405196a69a 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/index.html b/www/index.html
index 51355732f9..abff1f327b 100644
index 5135573..abff1f3 100644
--- a/www/index.html
+++ b/www/index.html
@@ -237,7 +237,17 @@ Use ImageMagick<sup><a href="http://tarr.uspto.gov/servlet/tarr?regser=serial&am
@ -207,7 +206,7 @@ index 51355732f9..abff1f327b 100644
</div>
</div>
diff --git a/www/search.html b/www/search.html
index fd224dd29d..985d9c1dcf 100644
index fd224dd..985d9c1 100644
--- a/www/search.html
+++ b/www/search.html
@@ -66,6 +66,7 @@
@ -219,7 +218,7 @@ index fd224dd29d..985d9c1dcf 100644
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search" />
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
diff --git a/www/security-policy.html b/www/security-policy.html
index 9ccc4b496a..593d71af45 100644
index 9ccc4b4..593d71a 100644
--- a/www/security-policy.html
+++ b/www/security-policy.html
@@ -66,6 +66,7 @@

25
debian/patches/0020-Fix-a-typo-in-manpage.patch vendored
View File

@ -1,5 +1,4 @@
From 2cb9cd8373ef81071c7963bb3f65c093fc3e400e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Roucari=C3=A8s?= <rouca@debian.org>
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org>
Date: Mon, 27 Jul 2020 10:44:26 +0200
Subject: Fix a typo in manpage
@ -19,7 +18,7 @@ debian-bug: 953279
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/utilities/animate.1.in b/utilities/animate.1.in
index eaf7609979..5e5b683584 100644
index eaf7609..5e5b683 100644
--- a/utilities/animate.1.in
+++ b/utilities/animate.1.in
@@ -94,7 +94,7 @@ By default, the image format of `file' is determined by its magic number. To sp
@ -32,7 +31,7 @@ index eaf7609979..5e5b683584 100644
.SH COPYRIGHT
diff --git a/utilities/compare.1.in b/utilities/compare.1.in
index 286dac302e..a5073a0e8e 100644
index 286dac3..a5073a0 100644
--- a/utilities/compare.1.in
+++ b/utilities/compare.1.in
@@ -96,7 +96,7 @@ Two images are considered similar if their difference according to the specified
@ -45,7 +44,7 @@ index 286dac302e..a5073a0e8e 100644
.SH COPYRIGHT
diff --git a/utilities/composite.1.in b/utilities/composite.1.in
index 4212b23b0b..b9b1ce3fbb 100644
index 4212b23..b9b1ce3 100644
--- a/utilities/composite.1.in
+++ b/utilities/composite.1.in
@@ -109,7 +109,7 @@ Miscellaneous Options:
@ -58,7 +57,7 @@ index 4212b23b0b..b9b1ce3fbb 100644
.SH COPYRIGHT
diff --git a/utilities/conjure.1.in b/utilities/conjure.1.in
index 1416f5545d..65e4e0adf6 100644
index 1416f55..65e4e0a 100644
--- a/utilities/conjure.1.in
+++ b/utilities/conjure.1.in
@@ -27,7 +27,7 @@ In additiion, define any key value pairs required by your script. For example,
@ -71,7 +70,7 @@ index 1416f5545d..65e4e0adf6 100644
.SH COPYRIGHT
diff --git a/utilities/convert.1.in b/utilities/convert.1.in
index 1eb437ea01..c36255dd8a 100644
index 1eb437e..c36255d 100644
--- a/utilities/convert.1.in
+++ b/utilities/convert.1.in
@@ -317,7 +317,7 @@ Use any setting or operator as an \fIoutput-option\fP. Only a limited number of
@ -84,7 +83,7 @@ index 1eb437ea01..c36255dd8a 100644
.SH COPYRIGHT
diff --git a/utilities/display.1.in b/utilities/display.1.in
index 8a5aaad708..4b625e7e3f 100644
index 8a5aaad..4b625e7 100644
--- a/utilities/display.1.in
+++ b/utilities/display.1.in
@@ -132,7 +132,7 @@ The display program defaults to the X screen resolution. To display vector form
@ -97,7 +96,7 @@ index 8a5aaad708..4b625e7e3f 100644
.SH COPYRIGHT
diff --git a/utilities/identify.1.in b/utilities/identify.1.in
index 392806fc93..300a840321 100644
index 392806f..300a840 100644
--- a/utilities/identify.1.in
+++ b/utilities/identify.1.in
@@ -73,7 +73,7 @@ By default, the image format of `file' is determined by its magic number. To sp
@ -110,7 +109,7 @@ index 392806fc93..300a840321 100644
.SH COPYRIGHT
diff --git a/utilities/import.1.in b/utilities/import.1.in
index 395db5cb38..936817c637 100644
index 395db5c..936817c 100644
--- a/utilities/import.1.in
+++ b/utilities/import.1.in
@@ -92,7 +92,7 @@ Miscellaneous Options:
@ -123,7 +122,7 @@ index 395db5cb38..936817c637 100644
.SH COPYRIGHT
diff --git a/utilities/mogrify.1.in b/utilities/mogrify.1.in
index 30c09e328f..551235e9de 100644
index 30c09e3..551235e 100644
--- a/utilities/mogrify.1.in
+++ b/utilities/mogrify.1.in
@@ -320,7 +320,7 @@ Miscellaneous Options:
@ -136,7 +135,7 @@ index 30c09e328f..551235e9de 100644
.SH COPYRIGHT
diff --git a/utilities/montage.1.in b/utilities/montage.1.in
index 0f49b01931..4591096569 100644
index 0f49b01..4591096 100644
--- a/utilities/montage.1.in
+++ b/utilities/montage.1.in
@@ -142,7 +142,7 @@ In addition to those listed above, you can specify these standard X resources as
@ -149,7 +148,7 @@ index 0f49b01931..4591096569 100644
.SH COPYRIGHT
diff --git a/utilities/stream.1.in b/utilities/stream.1.in
index 6cba1d3009..ef00a7a369 100644
index 6cba1d3..ef00a7a 100644
--- a/utilities/stream.1.in
+++ b/utilities/stream.1.in
@@ -52,7 +52,7 @@ Miscellaneous Options:

281
debian/patches/0021-Finalize-fixing-error-in-html.patch vendored
View File

File diff suppressed because it is too large Load Diff

9
debian/patches/0022-FIx-error-in-new-upstream-html.patch vendored
View File

@ -1,5 +1,4 @@
From 94f036b9bb87a0862bd5a2524645475309634cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Roucari=C3=A8s?= <rouca@debian.org>
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org>
Date: Mon, 1 Feb 2021 16:19:56 +0000
Subject: FIx error in new upstream html
@ -11,7 +10,7 @@ Forwarded: yes
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/www/api/magick++-classes.html b/www/api/magick++-classes.html
index e8db9d3489..201018d892 100644
index e8db9d3..201018d 100644
--- a/www/api/magick++-classes.html
+++ b/www/api/magick++-classes.html
@@ -67,7 +67,7 @@
@ -24,7 +23,7 @@ index e8db9d3489..201018d892 100644
</form>
</nav>
diff --git a/www/defines.html b/www/defines.html
index f68e79f9bd..5dd0a79121 100644
index f68e79f..5dd0a79 100644
--- a/www/defines.html
+++ b/www/defines.html
@@ -1530,6 +1530,7 @@ Post ObjectData Descriptor Record
@ -36,7 +35,7 @@ index f68e79f9bd..5dd0a79121 100644
<footer class="magick-footer">
<div class="container">
diff --git a/www/links.html b/www/links.html
index 3ecf3cd88a..c9a27855f8 100644
index 3ecf3cd..c9a2785 100644
--- a/www/links.html
+++ b/www/links.html
@@ -167,7 +167,7 @@

12
debian/patches/0023-disable-ghostscript-formats.patch vendored
View File

@ -1,16 +1,18 @@
Author: Steve Beattie <steve.beattie@canonical.com>
From: Steve Beattie <steve.beattie@canonical.com>
Date: Mon, 17 Jul 2023 15:10:16 +0000
Subject: disable ghostscript handled formats based on -SAFER insecurity
Based on Tavis Ormandy's Recommendations
updated: 2019-11-11
---
config/policy.xml | 5 +++++
1 file changed, 5 insertions(+)
config/policy.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/config/policy.xml b/config/policy.xml
index 54e6478..808fcf6 100644
--- a/config/policy.xml
+++ b/config/policy.xml
@@ -86,4 +86,11 @@
@@ -89,4 +89,11 @@
<policy domain="delegate" rights="none" pattern="HTTP" />
<!-- in order to avoid to get image with password text -->
<policy domain="path" rights="none" pattern="@*"/>

9
debian/patches/CVE-2021-20241.patch vendored
View File

@ -1,4 +1,3 @@
From 1e59e000ecae2523e707242621738da27d0d6296 Mon Sep 17 00:00:00 2001
From: Zhang Xiaohui <ruc_zhangxiaohui@163.com>
Date: Tue, 2 Feb 2021 16:10:05 +0800
Subject: [PATCH] fix division by zero in WriteJP2Image() in coders/jp2.c
@ -7,9 +6,11 @@ Subject: [PATCH] fix division by zero in WriteJP2Image() in coders/jp2.c
coders/jp2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/coders/jp2.c
+++ imagemagick-6.9.11.60+dfsg/coders/jp2.c
@@ -1064,8 +1064,8 @@ static MagickBooleanType WriteJP2Image(c
diff --git a/coders/jp2.c b/coders/jp2.c
index 0354f82..b50783a 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -1064,8 +1064,8 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image)
scale=(double) (((size_t) 1UL << jp2_image->comps[i].prec)-1)/
QuantumRange;

21
debian/patches/CVE-2021-20243.patch vendored
View File

@ -1,21 +1,24 @@
From: openKylin KDE SIG <kde@lists.openkylin.top>
Date: Mon, 17 Jul 2023 15:10:17 +0000
Subject: CVE-2021-20243
Backport of:
Backport of:
From 53cb91b3e7bf95d0e372cbc745e0055ac6054745 Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Wed, 3 Feb 2021 15:30:39 -0500
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/pull/3177
---
coders/dcm.c | 12 ++++++------
coders/jp2.c | 6 ++++--
magick/resize.c | 2 +-
magick/thread-private.h | 6 +++---
magick/visual-effects.c | 6 ++++--
5 files changed, 18 insertions(+), 14 deletions(-)
1 file changed, 1 insertion(+), 1 deletion(-)
--- imagemagick-6.9.11.60+dfsg.orig/magick/resize.c
+++ imagemagick-6.9.11.60+dfsg/magick/resize.c
@@ -1611,7 +1611,7 @@ MagickExport MagickRealType GetResizeFil
diff --git a/magick/resize.c b/magick/resize.c
index fe662c1..56e945e 100644
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -1611,7 +1611,7 @@ MagickExport MagickRealType GetResizeFilterWeight(
*/
assert(resize_filter != (ResizeFilter *) NULL);
assert(resize_filter->signature == MagickCoreSignature);

9
debian/patches/CVE-2021-20244.patch vendored
View File

@ -1,4 +1,3 @@
From c8d674946a687f40a126166edf470733fc8ede02 Mon Sep 17 00:00:00 2001
From: ruc_zhangxiaohui <553441439@qq.com>
Date: Thu, 4 Feb 2021 04:19:08 +0800
Subject: [PATCH] uses the PerceptibleReciprocal() to prevent the
@ -12,9 +11,11 @@ This backports the fix for CVE-2021-20244 to IM6.
magick/visual-effects.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/magick/visual-effects.c
+++ imagemagick-6.9.11.60+dfsg/magick/visual-effects.c
@@ -1101,11 +1101,11 @@ MagickExport Image *ImplodeImage(const I
diff --git a/magick/visual-effects.c b/magick/visual-effects.c
index 11dcecf..46f1d15 100644
--- a/magick/visual-effects.c
+++ b/magick/visual-effects.c
@@ -1101,11 +1101,11 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
*/
factor=1.0;
if (distance > 0.0)

9
debian/patches/CVE-2021-20245.patch vendored
View File

@ -1,4 +1,3 @@
From a78d92dc0f468e79c3d761aae9707042952cdaca Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Wed, 3 Feb 2021 16:04:25 -0500
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/3176
@ -7,9 +6,11 @@ Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/3176
coders/webp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- imagemagick-6.9.11.60+dfsg.orig/coders/webp.c
+++ imagemagick-6.9.11.60+dfsg/coders/webp.c
@@ -881,7 +881,8 @@ static MagickBooleanType WriteAnimatedWE
diff --git a/coders/webp.c b/coders/webp.c
index 3c7d9b1..2bad2b3 100644
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -881,7 +881,8 @@ static MagickBooleanType WriteAnimatedWEBPImage(const ImageInfo *image_info,
WriteSingleWEBPImage(image_info, image, &picture, current, exception);

9
debian/patches/CVE-2021-20246.patch vendored
View File

@ -1,4 +1,3 @@
From f3190d4a6e6e8556575c84b5d976f77d111caa74 Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Wed, 3 Feb 2021 15:50:29 -0500
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/3195
@ -7,9 +6,11 @@ Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/3195
magick/resample.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/magick/resample.c
+++ imagemagick-6.9.11.60+dfsg/magick/resample.c
@@ -1212,10 +1212,10 @@ MagickExport void ScaleResampleFilter(Re
diff --git a/magick/resample.c b/magick/resample.c
index 593af2a..d5c7225 100644
--- a/magick/resample.c
+++ b/magick/resample.c
@@ -1212,10 +1212,10 @@ MagickExport void ScaleResampleFilter(ResampleFilter *resample_filter,
{ double scale;
#if FILTER_LUT
/* scale so that F = WLUT_WIDTH; -- hardcoded */

9
debian/patches/CVE-2021-20309.patch vendored
View File

@ -1,4 +1,3 @@
From f1e68d22d1b35459421710587a0dcbab6900b51f Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Thu, 25 Feb 2021 19:34:36 -0500
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/3296
@ -7,9 +6,11 @@ Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/3296
magick/visual-effects.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- imagemagick-6.9.11.60+dfsg.orig/magick/visual-effects.c
+++ imagemagick-6.9.11.60+dfsg/magick/visual-effects.c
@@ -3328,7 +3328,7 @@ MagickExport Image *WaveImage(const Imag
diff --git a/magick/visual-effects.c b/magick/visual-effects.c
index 46f1d15..87fd0b0 100644
--- a/magick/visual-effects.c
+++ b/magick/visual-effects.c
@@ -3328,7 +3328,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
}
for (i=0; i < (ssize_t) wave_image->columns; i++)
sine_map[i]=(float) fabs(amplitude)+amplitude*sin((double)

48
debian/patches/CVE-2021-20312_20313.patch vendored
View File

@ -1,20 +1,20 @@
From e53e24b078f7fa586f9cc910491b8910f5bdad2e Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Thu, 25 Feb 2021 17:03:18 -0500
Subject: [PATCH] possible divide by zero + clear buffers
---
coders/thumbnail.c | 3 ++-
configure | 4 ++--
magick/cipher.c | 12 ++++++------
magick/colorspace.c | 16 ++++++++--------
magick/memory.c | 21 ++++++++++++++++-----
magick/signature.c | 2 +-
6 files changed, 35 insertions(+), 23 deletions(-)
5 files changed, 33 insertions(+), 21 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/coders/thumbnail.c
+++ imagemagick-6.9.11.60+dfsg/coders/thumbnail.c
@@ -198,7 +198,8 @@ static MagickBooleanType WriteTHUMBNAILI
diff --git a/coders/thumbnail.c b/coders/thumbnail.c
index f456faa..3833341 100644
--- a/coders/thumbnail.c
+++ b/coders/thumbnail.c
@@ -198,7 +198,8 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info,
break;
q++;
}
@ -24,9 +24,11 @@ Subject: [PATCH] possible divide by zero + clear buffers
ThrowWriterException(CoderError,"ImageDoesNotHaveAThumbnail");
thumbnail_image=BlobToImage(image_info,q,length,&image->exception);
if (thumbnail_image == (Image *) NULL)
--- imagemagick-6.9.11.60+dfsg.orig/magick/cipher.c
+++ imagemagick-6.9.11.60+dfsg/magick/cipher.c
@@ -485,8 +485,8 @@ static void EncipherAESBlock(AESInfo *ae
diff --git a/magick/cipher.c b/magick/cipher.c
index a6d90fc..e7b5a81 100644
--- a/magick/cipher.c
+++ b/magick/cipher.c
@@ -485,8 +485,8 @@ static void EncipherAESBlock(AESInfo *aes_info,const unsigned char *plaintext,
Reset registers.
*/
alpha=0;
@ -37,7 +39,7 @@ Subject: [PATCH] possible divide by zero + clear buffers
}
/*
@@ -708,8 +708,8 @@ MagickExport MagickBooleanType PasskeyDe
@@ -708,8 +708,8 @@ MagickExport MagickBooleanType PasskeyDecipherImage(Image *image,
*/
quantum_info=DestroyQuantumInfo(quantum_info);
aes_info=DestroyAESInfo(aes_info);
@ -48,7 +50,7 @@ Subject: [PATCH] possible divide by zero + clear buffers
return(y == (ssize_t) image->rows ? MagickTrue : MagickFalse);
}
@@ -925,8 +925,8 @@ MagickExport MagickBooleanType PasskeyEn
@@ -925,8 +925,8 @@ MagickExport MagickBooleanType PasskeyEncipherImage(Image *image,
*/
quantum_info=DestroyQuantumInfo(quantum_info);
aes_info=DestroyAESInfo(aes_info);
@ -59,9 +61,11 @@ Subject: [PATCH] possible divide by zero + clear buffers
return(y == (ssize_t) image->rows ? MagickTrue : MagickFalse);
}
--- imagemagick-6.9.11.60+dfsg.orig/magick/colorspace.c
+++ imagemagick-6.9.11.60+dfsg/magick/colorspace.c
@@ -737,15 +737,15 @@ MagickExport MagickBooleanType RGBTransf
diff --git a/magick/colorspace.c b/magick/colorspace.c
index 5f56ef5..104bc15 100644
--- a/magick/colorspace.c
+++ b/magick/colorspace.c
@@ -737,15 +737,15 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
if (logmap == (Quantum *) NULL)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
@ -81,7 +85,7 @@ Subject: [PATCH] possible divide by zero + clear buffers
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
@@ -2396,14 +2396,14 @@ MagickExport MagickBooleanType Transform
@@ -2396,14 +2396,14 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
if (logmap == (Quantum *) NULL)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
@ -100,9 +104,11 @@ Subject: [PATCH] possible divide by zero + clear buffers
for ( ; i <= (ssize_t) MaxMap; i++)
logmap[i]=QuantumRange;
if (image->storage_class == PseudoClass)
--- imagemagick-6.9.11.60+dfsg.orig/magick/memory.c
+++ imagemagick-6.9.11.60+dfsg/magick/memory.c
@@ -1270,25 +1270,36 @@ MagickExport MemoryInfo *RelinquishVirtu
diff --git a/magick/memory.c b/magick/memory.c
index 28d4238..1a3aed9 100644
--- a/magick/memory.c
+++ b/magick/memory.c
@@ -1270,25 +1270,36 @@ MagickExport MemoryInfo *RelinquishVirtualMemory(MemoryInfo *memory_info)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% ResetMagickMemory() fills the first size bytes of the memory area pointed to
@ -144,8 +150,10 @@ Subject: [PATCH] possible divide by zero + clear buffers
}
/*
--- imagemagick-6.9.11.60+dfsg.orig/magick/signature.c
+++ imagemagick-6.9.11.60+dfsg/magick/signature.c
diff --git a/magick/signature.c b/magick/signature.c
index 7a16050..7ead087 100644
--- a/magick/signature.c
+++ b/magick/signature.c
@@ -720,7 +720,7 @@ RestoreMSCWarning
T=0;
T1=0;

11
debian/patches/CVE-2021-3574.patch vendored
View File

@ -1,4 +1,3 @@
From cd7f9fb7751b0d59d5a74b12d971155caad5a792 Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Tue, 13 Apr 2021 21:41:34 -0400
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/3540
@ -7,9 +6,11 @@ Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/3540
coders/tiff.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/coders/tiff.c
+++ imagemagick-6.9.11.60+dfsg/coders/tiff.c
@@ -1332,6 +1332,11 @@ static Image *ReadTIFFImage(const ImageI
diff --git a/coders/tiff.c b/coders/tiff.c
index a3caac6..8e89ec1 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1332,6 +1332,11 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
TIFFClose(tiff);
ThrowReaderException(CorruptImageError,"UnsupportedBitsPerPixel");
}
@ -21,7 +22,7 @@ Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/3540
if (sample_format == SAMPLEFORMAT_IEEEFP)
(void) SetImageProperty(image,"quantum:format","floating-point");
switch (photometric)
@@ -1700,11 +1705,6 @@ static Image *ReadTIFFImage(const ImageI
@@ -1700,11 +1705,6 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
}
if (image->matte != MagickFalse)
(void) SetImageAlphaChannel(image,OpaqueAlphaChannel);

14
debian/patches/CVE-2021-3610.patch vendored
View File

@ -1,16 +1,18 @@
From 930ff0d1a9bc42925a7856e9ea53f5fc9f318bf3 Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Thu, 27 May 2021 10:30:17 -0400
Subject: [PATCH] eliminate heap buffer overflow vulnerability, thanks to
ZhangJiaxing (@r0fm1a) from Codesafe Team of Legendsec at Qi'anxin Group
Subject: [PATCH] eliminate heap buffer overflow vulnerability,
thanks to ZhangJiaxing (@r0fm1a) from Codesafe Team of Legendsec at Qi'anxin
Group
---
coders/tiff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- imagemagick-6.9.11.60+dfsg.orig/coders/tiff.c
+++ imagemagick-6.9.11.60+dfsg/coders/tiff.c
@@ -1872,7 +1872,7 @@ static Image *ReadTIFFImage(const ImageI
diff --git a/coders/tiff.c b/coders/tiff.c
index 8e89ec1..3927224 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1872,7 +1872,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
/*
Convert stripped TIFF image.
*/

42
debian/patches/CVE-2021-39212.patch vendored
View File

@ -1,3 +1,7 @@
From: openKylin KDE SIG <kde@lists.openkylin.top>
Date: Mon, 17 Jul 2023 15:10:17 +0000
Subject: CVE-2021-39212
Merge of two patches 69ea5587de17ef89476be47a3cb7f855c0355a74 and 428e68597fa904d0bdc133d878e12acd7dc60fa3 is here.
From 69ea5587de17ef89476be47a3cb7f855c0355a74 Mon Sep 17 00:00:00 2001
@ -9,10 +13,29 @@ From 428e68597fa904d0bdc133d878e12acd7dc60fa3 Mon Sep 17 00:00:00 2001
From: Dirk Lemstra <dirk@lemstra.org>
Date: Sat, 11 Sep 2021 17:01:23 +0200
Subject: [PATCH] Use the correct rights.
---
magick/module.c | 2 +-
magick/static.c | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/magick/static.c
+++ imagemagick-6.9.11.60+dfsg/magick/static.c
@@ -395,7 +395,7 @@ MagickExport MagickBooleanType RegisterS
diff --git a/magick/module.c b/magick/module.c
index 9f16022..e760395 100644
--- a/magick/module.c
+++ b/magick/module.c
@@ -1279,7 +1279,7 @@ MagickExport MagickBooleanType OpenModule(const char *module,
module_info=(ModuleInfo *) GetModuleInfo(module,exception);
if (module_info != (ModuleInfo *) NULL)
return(MagickTrue);
- rights=ReadPolicyRights;
+ rights=ReadPolicyRights|WritePolicyRights;
if (IsRightsAuthorized(ModulePolicyDomain,rights,module) == MagickFalse)
{
errno=EPERM;
diff --git a/magick/static.c b/magick/static.c
index 8c68fd7..f6b2c2e 100644
--- a/magick/static.c
+++ b/magick/static.c
@@ -395,7 +395,7 @@ MagickExport MagickBooleanType RegisterStaticModule(const char *module,
*/
assert(module != (const char *) NULL);
(void) CopyMagickString(module_name,module,MagickPathExtent);
@ -21,7 +44,7 @@ Subject: [PATCH] Use the correct rights.
if (IsRightsAuthorized(ModulePolicyDomain,rights,module) == MagickFalse)
{
errno=EPERM;
@@ -441,17 +441,24 @@ MagickExport MagickBooleanType RegisterS
@@ -441,17 +441,24 @@ MagickExport MagickBooleanType RegisterStaticModule(const char *module,
*/
MagickExport void RegisterStaticModules(void)
{
@ -46,14 +69,3 @@ Subject: [PATCH] Use the correct rights.
(void) (MagickModules[i].register_module)();
MagickModules[i].registered=MagickTrue;
}
--- imagemagick-6.9.11.60+dfsg.orig/magick/module.c
+++ imagemagick-6.9.11.60+dfsg/magick/module.c
@@ -1279,7 +1279,7 @@ MagickExport MagickBooleanType OpenModul
module_info=(ModuleInfo *) GetModuleInfo(module,exception);
if (module_info != (ModuleInfo *) NULL)
return(MagickTrue);
- rights=ReadPolicyRights;
+ rights=ReadPolicyRights|WritePolicyRights;
if (IsRightsAuthorized(ModulePolicyDomain,rights,module) == MagickFalse)
{
errno=EPERM;

12
debian/patches/CVE-2021-4219.patch vendored
View File

@ -1,16 +1,16 @@
From c10351c16b8d2cabd11d2627a02de522570f6ceb Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Wed, 22 Dec 2021 16:00:28 -0500
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/4626
---
ChangeLog | 7 ++++---
magick/draw.c | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
1 file changed, 1 insertion(+), 1 deletion(-)
--- imagemagick-6.9.11.60+dfsg.orig/magick/draw.c
+++ imagemagick-6.9.11.60+dfsg/magick/draw.c
@@ -5452,7 +5452,7 @@ MagickExport MagickBooleanType DrawPrimi
diff --git a/magick/draw.c b/magick/draw.c
index 75b3d3d..e0bbc24 100644
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -5452,7 +5452,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
{
(void) CopyMagickString(clone_info->filename,primitive_info->text,
MagickPathExtent);

13
debian/patches/CVE-2022-1114.patch vendored
View File

@ -1,16 +1,17 @@
From 78f03b619d08d7c2e0fcaccab407e3ac93c2ee8f Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Tue, 15 Mar 2022 21:59:36 -0400
Subject: [PATCH] Coders:
https://github.com/ImageMagick/ImageMagick/issues/4947
---
coders/dcm.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
coders/dcm.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/coders/dcm.c
+++ imagemagick-6.9.11.60+dfsg/coders/dcm.c
@@ -3242,15 +3242,15 @@ static Image *ReadDCMImage(const ImageIn
diff --git a/coders/dcm.c b/coders/dcm.c
index d274ad5..439aa1a 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3242,15 +3242,15 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
RelinquishMagickMemory(info_copy);
}

9
debian/patches/CVE-2022-28463.patch vendored
View File

@ -1,4 +1,3 @@
From e6ea5876e0228165ee3abc6e959aa174cee06680 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 26 Mar 2022 09:27:36 -0400
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/4988
@ -7,9 +6,11 @@ Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/4988
coders/cin.c | 2 ++
1 file changed, 2 insertions(+)
--- imagemagick-6.9.11.60+dfsg.orig/coders/cin.c
+++ imagemagick-6.9.11.60+dfsg/coders/cin.c
@@ -450,6 +450,8 @@ static Image *ReadCINImage(const ImageIn
diff --git a/coders/cin.c b/coders/cin.c
index 2f814e6..67c565d 100644
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -450,6 +450,8 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception)
image->endian=(magick[0] == 0x80) && (magick[1] == 0x2a) &&
(magick[2] == 0x5f) && (magick[3] == 0xd7) ? MSBEndian : LSBEndian;
cin.file.image_offset=ReadBlobLong(image);

45
debian/patches/CVE-2022-32545.patch vendored
View File

@ -1,4 +1,3 @@
From 450949ed017f009b399c937cf362f0058eacc5fa Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 19 Mar 2022 07:01:57 -0400
Subject: [PATCH] Pull request:
@ -12,9 +11,11 @@ Subject: [PATCH] Pull request:
wand/display.c | 5 ++++-
5 files changed, 19 insertions(+), 5 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/coders/emf.c
+++ imagemagick-6.9.11.60+dfsg/coders/emf.c
@@ -411,7 +411,8 @@ static HENHMETAFILE ReadEnhMetaFile(cons
diff --git a/coders/emf.c b/coders/emf.c
index 6a9db63..fd93c74 100644
--- a/coders/emf.c
+++ b/coders/emf.c
@@ -411,7 +411,8 @@ static HENHMETAFILE ReadEnhMetaFile(const char *path,ssize_t *width,
}
ReadFile(hFile,pBits,dwSize,&dwSize,NULL);
CloseHandle(hFile);
@ -24,9 +25,11 @@ Subject: [PATCH] Pull request:
{
pBits=(BYTE *) DestroyString((char *) pBits);
return((HENHMETAFILE) NULL);
--- imagemagick-6.9.11.60+dfsg.orig/coders/psd.c
+++ imagemagick-6.9.11.60+dfsg/coders/psd.c
@@ -1045,8 +1045,9 @@ static MagickBooleanType ReadPSDChannelP
diff --git a/coders/psd.c b/coders/psd.c
index 3dc25b9..5c70c11 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1045,8 +1045,9 @@ static MagickBooleanType ReadPSDChannelPixels(Image *image,
number_bits=8;
for (bit=0; bit < number_bits; bit++)
{
@ -38,9 +41,11 @@ Subject: [PATCH] Pull request:
}
if (x != (ssize_t) image->columns)
x--;
--- imagemagick-6.9.11.60+dfsg.orig/magick/widget.c
+++ imagemagick-6.9.11.60+dfsg/magick/widget.c
@@ -7858,6 +7858,8 @@ MagickExport int XMenuWidget(Display *di
diff --git a/magick/widget.c b/magick/widget.c
index e93a3de..605558b 100644
--- a/magick/widget.c
+++ b/magick/widget.c
@@ -7858,6 +7858,8 @@ MagickExport int XMenuWidget(Display *display,XWindows *windows,
break;
}
state&=(~InactiveWidgetState);
@ -49,7 +54,7 @@ Subject: [PATCH] Pull request:
id=(event.xbutton.y-top_offset)/(int) selection_info.height;
selection_info.id=id;
if ((id < 0) || (id >= (int) number_selections))
@@ -7911,6 +7913,8 @@ MagickExport int XMenuWidget(Display *di
@@ -7911,6 +7913,8 @@ MagickExport int XMenuWidget(Display *display,XWindows *windows,
if (event.xcrossing.state == 0)
break;
state&=(~InactiveWidgetState);
@ -58,7 +63,7 @@ Subject: [PATCH] Pull request:
id=((event.xcrossing.y-top_offset)/(int) selection_info.height);
if ((selection_info.id >= 0) &&
(selection_info.id < (int) number_selections))
@@ -7997,6 +8001,8 @@ MagickExport int XMenuWidget(Display *di
@@ -7997,6 +8001,8 @@ MagickExport int XMenuWidget(Display *display,XWindows *windows,
break;
if (state & InactiveWidgetState)
break;
@ -67,9 +72,11 @@ Subject: [PATCH] Pull request:
id=(event.xmotion.y-top_offset)/(int) selection_info.height;
if ((selection_info.id >= 0) &&
(selection_info.id < (int) number_selections))
--- imagemagick-6.9.11.60+dfsg.orig/wand/animate.c
+++ imagemagick-6.9.11.60+dfsg/wand/animate.c
@@ -1143,7 +1143,10 @@ WandExport MagickBooleanType AnimateImag
diff --git a/wand/animate.c b/wand/animate.c
index 0f70436..adc84d8 100644
--- a/wand/animate.c
+++ b/wand/animate.c
@@ -1143,7 +1143,10 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
if (i == (ssize_t) argc)
ThrowAnimateException(OptionError,"MissingArgument",option);
if (XRemoteCommand(display,resource_info.window_id,argv[i]) != 0)
@ -81,9 +88,11 @@ Subject: [PATCH] Pull request:
i--;
break;
}
--- imagemagick-6.9.11.60+dfsg.orig/wand/display.c
+++ imagemagick-6.9.11.60+dfsg/wand/display.c
@@ -1491,7 +1491,10 @@ WandExport MagickBooleanType DisplayImag
diff --git a/wand/display.c b/wand/display.c
index b7b9ed9..27abafa 100644
--- a/wand/display.c
+++ b/wand/display.c
@@ -1491,7 +1491,10 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
if (i == (ssize_t) argc)
ThrowDisplayException(OptionError,"MissingArgument",option);
if (XRemoteCommand(display,resource_info.window_id,argv[i]) != 0)

9
debian/patches/CVE-2022-32546.patch vendored
View File

@ -1,4 +1,3 @@
From 29c8abce0da56b536542f76a9ddfebdaab5b2943 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 24 Mar 2022 11:38:59 -0400
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/pull/4986
@ -7,9 +6,11 @@ Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/pull/4986
coders/pcl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/coders/pcl.c
+++ imagemagick-6.9.11.60+dfsg/coders/pcl.c
@@ -294,8 +294,8 @@ static Image *ReadPCLImage(const ImageIn
diff --git a/coders/pcl.c b/coders/pcl.c
index a6bd6a1..f1d9a7d 100644
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -294,8 +294,8 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception)
/*
Set PCL render geometry.
*/

9
debian/patches/CVE-2022-32547.patch vendored
View File

@ -1,4 +1,3 @@
From dc070da861a015d3c97488fdcca6063b44d47a7b Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 9 Apr 2022 08:40:54 -0400
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/pull/5034
@ -7,9 +6,11 @@ Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/pull/5034
magick/property.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/magick/property.c
+++ imagemagick-6.9.11.60+dfsg/magick/property.c
@@ -1513,12 +1513,14 @@ static MagickBooleanType GetEXIFProperty
diff --git a/magick/property.c b/magick/property.c
index 0381b4a..f839545 100644
--- a/magick/property.c
+++ b/magick/property.c
@@ -1513,12 +1513,14 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
}
case EXIF_FMT_SINGLE:
{

49
debian/patches/CVE-2023-1289-prepatch.patch vendored
View File

@ -1,18 +1,19 @@
From e8c0090c6d2df7b1553053dca2008e96724204bf Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 6 Mar 2023 14:46:21 -0500
Subject: [PATCH] recursion detection framework
---
magick/constitute.c | 12 +++++++++
magick/draw.c | 64 ++++++++++++++++++---------------------------
magick/constitute.c | 12 ++++++++++++
magick/draw.c | 55 +++++++++++++++++++++++++----------------------------
magick/draw.h | 3 +++
magick/image.c | 1 +
magick/image.h | 3 +++
5 files changed, 45 insertions(+), 38 deletions(-)
5 files changed, 45 insertions(+), 29 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/magick/constitute.c
+++ imagemagick-6.9.11.60+dfsg/magick/constitute.c
diff --git a/magick/constitute.c b/magick/constitute.c
index e05c538..49e8f82 100644
--- a/magick/constitute.c
+++ b/magick/constitute.c
@@ -77,6 +77,11 @@
#include "magick/transform.h"
#include "magick/utility.h"
@ -25,7 +26,7 @@ Subject: [PATCH] recursion detection framework
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -558,9 +563,16 @@ MagickExport Image *ReadImage(const Imag
@@ -558,9 +563,16 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
if ((thread_support & DecoderThreadSupport) == 0)
LockSemaphoreInfo(magick_info->semaphore);
status=IsCoderAuthorized(read_info->magick,ReadPolicyRights,exception);
@ -42,9 +43,11 @@ Subject: [PATCH] recursion detection framework
if ((thread_support & DecoderThreadSupport) == 0)
UnlockSemaphoreInfo(magick_info->semaphore);
}
--- imagemagick-6.9.11.60+dfsg.orig/magick/draw.c
+++ imagemagick-6.9.11.60+dfsg/magick/draw.c
@@ -381,6 +381,7 @@ MagickExport DrawInfo *CloneDrawInfo(con
diff --git a/magick/draw.c b/magick/draw.c
index e0bbc24..962a42f 100644
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -381,6 +381,7 @@ MagickExport DrawInfo *CloneDrawInfo(const ImageInfo *image_info,
clone_info->composite_mask=CloneImage(draw_info->composite_mask,0,0,
MagickTrue,&draw_info->composite_mask->exception);
clone_info->render=draw_info->render;
@ -52,7 +55,7 @@ Subject: [PATCH] recursion detection framework
clone_info->debug=IsEventLogging();
return(clone_info);
}
@@ -5820,21 +5821,18 @@ MagickExport void GetDrawInfo(const Imag
@@ -5820,21 +5821,18 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
ExceptionInfo
*exception;
@ -76,7 +79,7 @@ Subject: [PATCH] recursion detection framework
draw_info->stroke_width=1.0;
draw_info->fill_rule=EvenOddRule;
draw_info->opacity=OpaqueOpacity;
@@ -5844,64 +5842,64 @@ MagickExport void GetDrawInfo(const Imag
@@ -5844,64 +5842,64 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
draw_info->linejoin=MiterJoin;
draw_info->miterlimit=10;
draw_info->decorate=NoDecoration;
@ -164,7 +167,7 @@ Subject: [PATCH] recursion detection framework
if (option != (const char *) NULL)
{
ssize_t
@@ -5914,7 +5912,6 @@ MagickExport void GetDrawInfo(const Imag
@@ -5914,7 +5912,6 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
}
exception=DestroyExceptionInfo(exception);
draw_info->signature=MagickCoreSignature;
@ -172,8 +175,10 @@ Subject: [PATCH] recursion detection framework
}
/*
--- imagemagick-6.9.11.60+dfsg.orig/magick/draw.h
+++ imagemagick-6.9.11.60+dfsg/magick/draw.h
diff --git a/magick/draw.h b/magick/draw.h
index a44ef3a..46e622d 100644
--- a/magick/draw.h
+++ b/magick/draw.h
@@ -354,6 +354,9 @@ typedef struct _DrawInfo
char
@ -184,9 +189,11 @@ Subject: [PATCH] recursion detection framework
} DrawInfo;
typedef struct _PrimitiveInfo
--- imagemagick-6.9.11.60+dfsg.orig/magick/image.c
+++ imagemagick-6.9.11.60+dfsg/magick/image.c
@@ -1008,6 +1008,7 @@ MagickExport ImageInfo *CloneImageInfo(c
diff --git a/magick/image.c b/magick/image.c
index 1fc3617..9ee22d8 100644
--- a/magick/image.c
+++ b/magick/image.c
@@ -1008,6 +1008,7 @@ MagickExport ImageInfo *CloneImageInfo(const ImageInfo *image_info)
clone_info->subimage=image_info->scene; /* deprecated */
clone_info->subrange=image_info->number_scenes; /* deprecated */
clone_info->channel=image_info->channel;
@ -194,8 +201,10 @@ Subject: [PATCH] recursion detection framework
clone_info->debug=IsEventLogging();
clone_info->signature=image_info->signature;
return(clone_info);
--- imagemagick-6.9.11.60+dfsg.orig/magick/image.h
+++ imagemagick-6.9.11.60+dfsg/magick/image.h
diff --git a/magick/image.h b/magick/image.h
index ac69bef..e71df13 100644
--- a/magick/image.h
+++ b/magick/image.h
@@ -499,6 +499,9 @@ struct _ImageInfo
MagickBooleanType

21
debian/patches/CVE-2023-1289.patch vendored
View File

@ -1,17 +1,26 @@
From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 6 Mar 2023 15:26:32 -0500
Subject: [PATCH] erecursion detection
[Ubuntu note: darw.c file exist in "magick" folder instead of "MagickCore" for
this release]
From c5b23cbf2119540725e6dc81f4deb25798ead6a4 Mon Sep 17 00:00:00 2001
[Ubuntu note: darw.c file exist in "magick" folder instead of "MagickCore" for
this release]
From c5b23cbf2119540725e6dc81f4deb25798ead6a4 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 6 Mar 2023 15:26:32 -0500
Subject: [PATCH] erecursion detection
---
MagickCore/draw.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
magick/draw.c | 1 +
1 file changed, 1 insertion(+)
--- imagemagick-6.9.11.60+dfsg.orig/magick/draw.c
+++ imagemagick-6.9.11.60+dfsg/magick/draw.c
@@ -5444,6 +5444,7 @@ MagickExport MagickBooleanType DrawPrimi
diff --git a/magick/draw.c b/magick/draw.c
index 962a42f..918d27f 100644
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -5444,6 +5444,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
if (primitive_info->text == (char *) NULL)
break;
clone_info=AcquireImageInfo();

23
debian/patches/CVE-2023-1906.patch vendored
View File

@ -1,3 +1,9 @@
From: openKylin KDE SIG <kde@lists.openkylin.top>
Date: Mon, 17 Jul 2023 15:10:18 +0000
Subject: CVE-2023-1906
[Ubuntu note: this is backport of the original patch having multiple pre-patch
[Ubuntu note: this is backport of the original patch having multiple pre-patch
changes]
From e30c693b37c3b41723f1469d1226a2c814ca443d Mon Sep 17 00:00:00 2001
@ -5,14 +11,15 @@ From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 1 Apr 2023 07:32:01 -0400
Subject: [PATCH] possible heap buffer overflow
(https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-35q2-86c7-9247)
---
coders/tiff.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
coders/tiff.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/coders/tiff.c
+++ imagemagick-6.9.11.60+dfsg/coders/tiff.c
@@ -1872,12 +1872,8 @@ static Image *ReadTIFFImage(const ImageI
diff --git a/coders/tiff.c b/coders/tiff.c
index 3927224..174a3eb 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1872,12 +1872,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
/*
Convert stripped TIFF image.
*/
@ -27,7 +34,7 @@ Subject: [PATCH] possible heap buffer overflow
strip_pixels=(unsigned char *) AcquireQuantumMemory(extent,
sizeof(*strip_pixels));
if (strip_pixels == (unsigned char *) NULL)
@@ -1972,12 +1968,8 @@ static Image *ReadTIFFImage(const ImageI
@@ -1972,12 +1968,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
number_pixels=(MagickSizeType) columns*rows;
if (HeapOverflowSanityCheck(rows,sizeof(*tile_pixels)) != MagickFalse)
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
@ -42,7 +49,7 @@ Subject: [PATCH] possible heap buffer overflow
tile_pixels=(unsigned char *) AcquireQuantumMemory(extent,
sizeof(*tile_pixels));
if (tile_pixels == (unsigned char *) NULL)
@@ -2071,11 +2063,6 @@ static Image *ReadTIFFImage(const ImageI
@@ -2071,11 +2063,6 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
if (HeapOverflowSanityCheck(image->rows,sizeof(*pixels)) != MagickFalse)
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
number_pixels=(MagickSizeType) image->columns*image->rows;

19
debian/patches/CVE-2023-3195.patch vendored
View File

@ -1,17 +1,24 @@
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Tue, 19 Oct 2021 14:53:41 -0400
Subject: [PATCH] fix stack overflow when parsing malicious tiff image
[Ubuntu note: Backport for this release]
From 85a370c79afeb45a97842b0959366af5236e9023 Mon Sep 17 00:00:00 2001
[Ubuntu note: Backport for this release]
From 85a370c79afeb45a97842b0959366af5236e9023 Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Tue, 19 Oct 2021 14:53:41 -0400
Subject: [PATCH] fix stack overflow when parsing malicious tiff image
---
ChangeLog | 2 ++
coders/tiff.c | 5 +++++
2 files changed, 7 insertions(+)
1 file changed, 5 insertions(+)
--- imagemagick-6.9.11.60+dfsg.orig/coders/tiff.c
+++ imagemagick-6.9.11.60+dfsg/coders/tiff.c
@@ -1970,6 +1970,11 @@ static Image *ReadTIFFImage(const ImageI
diff --git a/coders/tiff.c b/coders/tiff.c
index 174a3eb..cc71698 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1970,6 +1970,11 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
extent=4*(samples_per_pixel+1)*MagickMax(rows*TIFFTileRowSize(tiff),
TIFFTileSize(tiff));

40
debian/patches/CVE-2023-34151-prepatch-2.patch vendored
View File

@ -1,37 +1,23 @@
From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 13 Apr 2023 11:42:11 -0400
Subject: [PATCH] add additional checks for casting double to size_t
[Ubuntu note: just adding the required changes for image-private header file]
From ca4b4c6d3471ad2d19ccdf12a7380f0628e3ce77 Mon Sep 17 00:00:00 2001
[Ubuntu note: just adding the required changes for image-private header file]
From ca4b4c6d3471ad2d19ccdf12a7380f0628e3ce77 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 13 Apr 2023 11:42:11 -0400
Subject: [PATCH] add additional checks for casting double to size_t
---
coders/histogram.c | 6 ++--
coders/jpeg.c | 3 +-
coders/pcl.c | 4 +--
coders/png.c | 16 +++++-----
coders/tiff.c | 4 +--
coders/txt.c | 4 +--
magick/annotate.c | 8 ++---
magick/constitute.c | 2 +-
magick/draw.c | 66 ++++++++++++++++++++---------------------
magick/effect.c | 8 ++---
magick/gem.c | 2 +-
magick/geometry.c | 32 ++++++++++----------
magick/image-private.h | 38 ++++++++++++++++--------
magick/image.c | 20 ++++++-------
magick/pixel.c | 12 ++++----
magick/profile.c | 8 ++---
magick/property.c | 4 +--
magick/shear.c | 18 +++++------
magick/studio.h | 2 --
magick/transform.c | 4 +--
magick/visual-effects.c | 40 ++++++++++++-------------
wand/drawing-wand.c | 8 ++---
wand/studio.h | 2 --
23 files changed, 161 insertions(+), 150 deletions(-)
magick/image-private.h | 3 +++
1 file changed, 3 insertions(+)
--- imagemagick-6.9.11.60+dfsg.orig/magick/image-private.h
+++ imagemagick-6.9.11.60+dfsg/magick/image-private.h
diff --git a/magick/image-private.h b/magick/image-private.h
index 09d718b..b269f33 100644
--- a/magick/image-private.h
+++ b/magick/image-private.h
@@ -41,6 +41,9 @@ extern "C" {
#define MagickSQ1_2 0.70710678118654752440084436210484903928483593768847
#define MagickSQ2 1.41421356237309504880168872420969807856967187537695

43
debian/patches/CVE-2023-34151-prepatch.patch vendored
View File

@ -1,39 +1,26 @@
From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 15 Apr 2023 09:44:37 -0400
Subject: [PATCH] improved range checking
[Ubuntu note: Just add the required changes from this patch which is to
introduce new method called CastDoubleToUnsigned() for this release]
From 0b8553cd2042438dde215c7e8cd21e1d7307f813 Mon Sep 17 00:00:00 2001
[Ubuntu note: Just add the required changes from this patch which is to
introduce new method called CastDoubleToUnsigned() for this release]
From 0b8553cd2042438dde215c7e8cd21e1d7307f813 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 15 Apr 2023 09:44:37 -0400
Subject: [PATCH] improved range checking
---
coders/histogram.c | 6 ++--
coders/icon.c | 3 +-
coders/pcd.c | 1 +
coders/pcl.c | 4 +--
coders/png.c | 17 +++++-----
coders/tiff.c | 4 +--
coders/txt.c | 4 +--
configure | 4 +--
magick/annotate.c | 8 ++---
magick/constitute.c | 2 +-
magick/draw.c | 66 +++++++++++++++++++--------------------
magick/effect.c | 8 ++---
magick/gem.c | 2 +-
magick/geometry.c | 24 +++++++-------
magick/image-private.h | 69 ++++++++++++++++++++++++++++-------------
magick/image.c | 20 ++++++------
magick/pixel.c | 12 +++----
magick/profile.c | 8 ++---
magick/property.c | 4 +--
magick/shear.c | 18 +++++------
magick/transform.c | 4 +--
magick/visual-effects.c | 40 ++++++++++++------------
wand/drawing-wand.c | 8 ++---
23 files changed, 181 insertions(+), 155 deletions(-)
magick/image-private.h | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
--- imagemagick-6.9.11.60+dfsg.orig/magick/image-private.h
+++ imagemagick-6.9.11.60+dfsg/magick/image-private.h
@@ -61,6 +61,26 @@ static inline ssize_t CastDoubleToLong(c
diff --git a/magick/image-private.h b/magick/image-private.h
index e0d616d..09d718b 100644
--- a/magick/image-private.h
+++ b/magick/image-private.h
@@ -61,6 +61,26 @@ static inline ssize_t CastDoubleToLong(const double value)
return((ssize_t) value);
}

119
debian/patches/CVE-2023-34151.patch vendored
View File

@ -1,4 +1,3 @@
From 133089f716f23ce0b80d89ccc1fd680960235512 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Wed, 17 May 2023 21:06:18 -0400
Subject: [PATCH] properly cast double to size_t
@ -20,9 +19,11 @@ Subject: [PATCH] properly cast double to size_t
magick/visual-effects.c | 4 ++--
13 files changed, 37 insertions(+), 37 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/coders/caption.c
+++ imagemagick-6.9.11.60+dfsg/coders/caption.c
@@ -154,7 +154,7 @@ static Image *ReadCAPTIONImage(const Ima
diff --git a/coders/caption.c b/coders/caption.c
index 73568fd..37a56f3 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -154,7 +154,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
return(DestroyImageList(image));
(void) SetImageProperty(image,"caption",caption);
draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
@ -31,7 +32,7 @@ Subject: [PATCH] properly cast double to size_t
if (AcquireMagickResource(WidthResource,width) == MagickFalse)
{
caption=DestroyString(caption);
@@ -239,8 +239,8 @@ static Image *ReadCAPTIONImage(const Ima
@@ -239,8 +239,8 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
status=GetMultilineTypeMetrics(image,draw_info,&metrics);
if (status == MagickFalse)
break;
@ -42,7 +43,7 @@ Subject: [PATCH] properly cast double to size_t
draw_info->stroke_width+0.5);
if ((image->columns != 0) && (image->rows != 0))
{
@@ -267,8 +267,8 @@ static Image *ReadCAPTIONImage(const Ima
@@ -267,8 +267,8 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
status=GetMultilineTypeMetrics(image,draw_info,&metrics);
if (status == MagickFalse)
break;
@ -53,9 +54,11 @@ Subject: [PATCH] properly cast double to size_t
draw_info->stroke_width+0.5);
if ((image->columns != 0) && (image->rows != 0))
{
--- imagemagick-6.9.11.60+dfsg.orig/coders/label.c
+++ imagemagick-6.9.11.60+dfsg/coders/label.c
@@ -135,7 +135,7 @@ static Image *ReadLABELImage(const Image
diff --git a/coders/label.c b/coders/label.c
index 81cba24..4ee719b 100644
--- a/coders/label.c
+++ b/coders/label.c
@@ -135,7 +135,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
return(DestroyImageList(image));
(void) SetImageProperty(image,"label",label);
draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
@ -64,7 +67,7 @@ Subject: [PATCH] properly cast double to size_t
if (AcquireMagickResource(WidthResource,width) == MagickFalse)
{
label=DestroyString(label);
@@ -174,8 +174,8 @@ static Image *ReadLABELImage(const Image
@@ -174,8 +174,8 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
status=GetMultilineTypeMetrics(image,draw_info,&metrics);
if (status == MagickFalse)
break;
@ -75,7 +78,7 @@ Subject: [PATCH] properly cast double to size_t
if ((image->columns != 0) && (image->rows != 0))
{
if ((width >= image->columns) && (height >= image->rows))
@@ -204,8 +204,8 @@ static Image *ReadLABELImage(const Image
@@ -204,8 +204,8 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
status=GetMultilineTypeMetrics(image,draw_info,&metrics);
if (status == MagickFalse)
break;
@ -86,9 +89,11 @@ Subject: [PATCH] properly cast double to size_t
if ((image->columns != 0) && (image->rows != 0))
{
if ((width < image->columns) && (height < image->rows))
--- imagemagick-6.9.11.60+dfsg.orig/coders/pcl.c
+++ imagemagick-6.9.11.60+dfsg/coders/pcl.c
@@ -333,9 +333,9 @@ static Image *ReadPCLImage(const ImageIn
diff --git a/coders/pcl.c b/coders/pcl.c
index f1d9a7d..b109526 100644
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -333,9 +333,9 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception)
image->x_resolution,image->y_resolution);
if (image_info->ping != MagickFalse)
(void) FormatLocaleString(density,MagickPathExtent,"2.0x2.0");
@ -100,9 +105,11 @@ Subject: [PATCH] properly cast double to size_t
0.5);
(void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double)
page.width,(double) page.height);
--- imagemagick-6.9.11.60+dfsg.orig/coders/pdf.c
+++ imagemagick-6.9.11.60+dfsg/coders/pdf.c
@@ -1587,9 +1587,9 @@ static MagickBooleanType WritePDFImage(c
diff --git a/coders/pdf.c b/coders/pdf.c
index 4fd7fe3..25077d8 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -1587,9 +1587,9 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
(void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y,
&geometry.width,&geometry.height);
scale.x=(double) (geometry.width*delta.x)/resolution.x;
@ -114,9 +121,11 @@ Subject: [PATCH] properly cast double to size_t
(void) ParseAbsoluteGeometry(page_geometry,&media_info);
(void) ParseGravityGeometry(image,page_geometry,&page_info,
&image->exception);
--- imagemagick-6.9.11.60+dfsg.orig/coders/ps.c
+++ imagemagick-6.9.11.60+dfsg/coders/ps.c
@@ -1502,9 +1502,9 @@ static MagickBooleanType WritePSImage(co
diff --git a/coders/ps.c b/coders/ps.c
index b351eae..af81bbb 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -1502,9 +1502,9 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
(void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y,
&geometry.width,&geometry.height);
scale.x=PerceptibleReciprocal(resolution.x)*geometry.width*delta.x;
@ -128,9 +137,11 @@ Subject: [PATCH] properly cast double to size_t
(void) ParseAbsoluteGeometry(page_geometry,&media_info);
(void) ParseGravityGeometry(image,page_geometry,&page_info,
&image->exception);
--- imagemagick-6.9.11.60+dfsg.orig/coders/ps2.c
+++ imagemagick-6.9.11.60+dfsg/coders/ps2.c
@@ -533,9 +533,9 @@ static MagickBooleanType WritePS2Image(c
diff --git a/coders/ps2.c b/coders/ps2.c
index afc60ab..3e102dc 100644
--- a/coders/ps2.c
+++ b/coders/ps2.c
@@ -533,9 +533,9 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
(void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y,
&geometry.width,&geometry.height);
scale.x=PerceptibleReciprocal(resolution.x)*geometry.width*delta.x;
@ -142,9 +153,11 @@ Subject: [PATCH] properly cast double to size_t
(void) ParseAbsoluteGeometry(page_geometry,&media_info);
(void) ParseGravityGeometry(image,page_geometry,&page_info,
&image->exception);
--- imagemagick-6.9.11.60+dfsg.orig/coders/ps3.c
+++ imagemagick-6.9.11.60+dfsg/coders/ps3.c
@@ -980,9 +980,9 @@ static MagickBooleanType WritePS3Image(c
diff --git a/coders/ps3.c b/coders/ps3.c
index 9a795ff..192a19d 100644
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -980,9 +980,9 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image)
(void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y,
&geometry.width,&geometry.height);
scale.x=PerceptibleReciprocal(resolution.x)*geometry.width*delta.x;
@ -156,9 +169,11 @@ Subject: [PATCH] properly cast double to size_t
(void) ParseAbsoluteGeometry(page_geometry,&media_info);
(void) ParseGravityGeometry(image,page_geometry,&page_info,
&image->exception);
--- imagemagick-6.9.11.60+dfsg.orig/coders/svg.c
+++ imagemagick-6.9.11.60+dfsg/coders/svg.c
@@ -2519,10 +2519,10 @@ static void SVGStartElement(void *contex
diff --git a/coders/svg.c b/coders/svg.c
index 0b3364b..912c714 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2519,10 +2519,10 @@ static void SVGStartElement(void *context,const xmlChar *name,
svg_info->view_box=svg_info->bounds;
svg_info->width=0;
if (svg_info->bounds.width > 0.0)
@ -171,9 +186,11 @@ Subject: [PATCH] properly cast double to size_t
(void) FormatLocaleFile(svg_info->file,"viewbox 0 0 %.20g %.20g\n",
(double) svg_info->width,(double) svg_info->height);
sx=PerceptibleReciprocal(svg_info->view_box.width)*svg_info->width;
--- imagemagick-6.9.11.60+dfsg.orig/magick/annotate.c
+++ imagemagick-6.9.11.60+dfsg/magick/annotate.c
@@ -325,7 +325,7 @@ MagickExport MagickBooleanType AnnotateI
diff --git a/magick/annotate.c b/magick/annotate.c
index 20fbf7b..874fb8b 100644
--- a/magick/annotate.c
+++ b/magick/annotate.c
@@ -325,7 +325,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
(void) CloneString(&annotate->text,textlist[i]);
if ((metrics.width == 0) || (annotate->gravity != NorthWestGravity))
(void) GetTypeMetrics(image,annotate,&metrics);
@ -182,7 +199,7 @@ Subject: [PATCH] properly cast double to size_t
if (height == 0)
height=draw_info->pointsize;
height+=(size_t) floor(draw_info->interline_spacing+0.5);
@@ -610,7 +610,7 @@ MagickExport ssize_t FormatMagickCaption
@@ -610,7 +610,7 @@ MagickExport ssize_t FormatMagickCaption(Image *image,DrawInfo *draw_info,
status=GetTypeMetrics(image,draw_info,metrics);
if (status == MagickFalse)
break;
@ -191,9 +208,11 @@ Subject: [PATCH] properly cast double to size_t
if (width <= image->columns)
continue;
if (s != (char *) NULL)
--- imagemagick-6.9.11.60+dfsg.orig/magick/draw.c
+++ imagemagick-6.9.11.60+dfsg/magick/draw.c
@@ -3447,14 +3447,14 @@ static MagickBooleanType RenderMVGConten
diff --git a/magick/draw.c b/magick/draw.c
index 918d27f..50ed8e0 100644
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -3447,14 +3447,14 @@ static MagickBooleanType RenderMVGContent(Image *image,
(void) GetNextToken(q,&q,extent,token);
if (*token == ',')
(void) GetNextToken(q,&q,extent,token);
@ -210,7 +229,7 @@ Subject: [PATCH] properly cast double to size_t
0.5);
if (token == next_token)
ThrowPointExpectedException(image,token);
@@ -3859,14 +3859,14 @@ static MagickBooleanType RenderMVGConten
@@ -3859,14 +3859,14 @@ static MagickBooleanType RenderMVGContent(Image *image,
(void) GetNextToken(q,&q,extent,token);
if (*token == ',')
(void) GetNextToken(q,&q,extent,token);
@ -227,9 +246,11 @@ Subject: [PATCH] properly cast double to size_t
token,&next_token)+0.5);
if (token == next_token)
ThrowPointExpectedException(image,token);
--- imagemagick-6.9.11.60+dfsg.orig/magick/geometry.c
+++ imagemagick-6.9.11.60+dfsg/magick/geometry.c
@@ -1411,8 +1411,8 @@ MagickExport MagickStatusType ParseMetaG
diff --git a/magick/geometry.c b/magick/geometry.c
index 5290abe..1d6ef77 100644
--- a/magick/geometry.c
+++ b/magick/geometry.c
@@ -1411,8 +1411,8 @@ MagickExport MagickStatusType ParseMetaGeometry(const char *geometry,ssize_t *x,
scale.y=geometry_info.sigma;
if ((flags & SigmaValue) == 0)
scale.y=scale.x;
@ -240,9 +261,11 @@ Subject: [PATCH] properly cast double to size_t
former_width=(*width);
former_height=(*height);
}
--- imagemagick-6.9.11.60+dfsg.orig/magick/shear.c
+++ imagemagick-6.9.11.60+dfsg/magick/shear.c
@@ -166,8 +166,8 @@ static MagickBooleanType CropToFitImage(
diff --git a/magick/shear.c b/magick/shear.c
index 731db09..26b0405 100644
--- a/magick/shear.c
+++ b/magick/shear.c
@@ -166,8 +166,8 @@ static MagickBooleanType CropToFitImage(Image **image,
}
geometry.x=CastDoubleToLong(ceil(min.x-0.5));
geometry.y=CastDoubleToLong(ceil(min.y-0.5));
@ -253,7 +276,7 @@ Subject: [PATCH] properly cast double to size_t
page=(*image)->page;
(void) ParseAbsoluteGeometry("0x0+0+0",&(*image)->page);
crop_image=CropImage(*image,&geometry,exception);
@@ -1787,9 +1787,9 @@ MagickExport Image *ShearRotateImage(con
@@ -1787,9 +1787,9 @@ MagickExport Image *ShearRotateImage(const Image *image,const double degrees,
*/
width=integral_image->columns;
height=integral_image->rows;
@ -266,9 +289,11 @@ Subject: [PATCH] properly cast double to size_t
bounds.width+0.5);
bounds.x=CastDoubleToLong(floor((double) ((shear_width > bounds.width) ?
width : bounds.width-shear_width+2)/2.0+0.5));
--- imagemagick-6.9.11.60+dfsg.orig/magick/visual-effects.c
+++ imagemagick-6.9.11.60+dfsg/magick/visual-effects.c
@@ -2052,8 +2052,8 @@ MagickExport Image *ShadowImage(const Im
diff --git a/magick/visual-effects.c b/magick/visual-effects.c
index 87fd0b0..b263978 100644
--- a/magick/visual-effects.c
+++ b/magick/visual-effects.c
@@ -2052,8 +2052,8 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity,
(void) SetImageColorspace(clone_image,sRGBColorspace);
(void) SetImageVirtualPixelMethod(clone_image,EdgeVirtualPixelMethod);
clone_image->compose=OverCompositeOp;

13
debian/patches/CVE-2023-3428.patch vendored
View File

@ -1,16 +1,17 @@
From 0d00400727170b0540a355a1bc52787bc7bcdea5 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 26 Jun 2023 19:39:43 -0400
Subject: [PATCH] heap-buffer-overflow in ImageMagick <= 7.1.1-12, contributed
by Hardik shah of Vehere (Dawn Treaders team)
Subject: [PATCH] heap-buffer-overflow in ImageMagick <= 7.1.1-12,
contributed by Hardik shah of Vehere (Dawn Treaders team)
---
coders/tiff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- imagemagick-6.9.11.60+dfsg.orig/coders/tiff.c
+++ imagemagick-6.9.11.60+dfsg/coders/tiff.c
@@ -1968,7 +1968,7 @@ static Image *ReadTIFFImage(const ImageI
diff --git a/coders/tiff.c b/coders/tiff.c
index cc71698..b90dc96 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1968,7 +1968,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
number_pixels=(MagickSizeType) columns*rows;
if (HeapOverflowSanityCheck(rows,sizeof(*tile_pixels)) != MagickFalse)
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");

24
debian/patches/move-profile-property-to-cli-option.patch vendored
View File

@ -1,13 +1,23 @@
From: openKylin KDE SIG <kde@lists.openkylin.top>
Date: Mon, 17 Jul 2023 15:10:16 +0000
Subject: move-profile-property-to-cli-option
Backport of
From d77c01e560e973177feed4915ffd7dd1a45fd763 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Fri, 3 Feb 2023 09:33:01 -0500
Subject: [PATCH] move `-set profile` handler to CLI
---
magick/property.c | 20 --------------------
wand/mogrify.c | 18 +++++++++++++++++-
2 files changed, 17 insertions(+), 21 deletions(-)
--- imagemagick-6.9.11.60+dfsg.orig/magick/property.c
+++ imagemagick-6.9.11.60+dfsg/magick/property.c
@@ -4399,26 +4399,6 @@ MagickExport MagickBooleanType SetImageP
diff --git a/magick/property.c b/magick/property.c
index a567178..0381b4a 100644
--- a/magick/property.c
+++ b/magick/property.c
@@ -4399,26 +4399,6 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
geometry=DestroyString(geometry);
break;
}
@ -34,9 +44,11 @@ Subject: [PATCH] move `-set profile` handler to CLI
status=AddValueToSplayTree((SplayTreeInfo *) image->properties,
ConstantString(property),ConstantString(value));
break;
--- imagemagick-6.9.11.60+dfsg.orig/wand/mogrify.c
+++ imagemagick-6.9.11.60+dfsg/wand/mogrify.c
@@ -2840,7 +2840,23 @@ WandExport MagickBooleanType MogrifyImag
diff --git a/wand/mogrify.c b/wand/mogrify.c
index c1b41df..f336bfa 100644
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -2840,7 +2840,23 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
(void) SetImageArtifact(*image,argv[i+1]+7,value);
}
else