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

SECURITY UPDATE

This commit is contained in:
rtlhq 2023-07-17 22:39:22 +08:00
parent 32cf3d577c
commit 1bc188585f
42 changed files with 1103 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
debian/changelog vendored
View File

@ -1,3 +1,25 @@
imagemagick (8:6.9.11.60+dfsg-ok1.1) yangtze; urgency=medium
* SECURITY UPDATE: heap-based buffer overflow issue
- CVE-2021-20241
- CVE-2021-20243
- CVE-2021-20244
- CVE-2021-20245
- CVE-2021-20246
- CVE-2021-20309
- CVE-2021-20312
- CVE-2021-20313
- CVE-2021-3574
- CVE-2021-39212
- CVE-2021-4219
- CVE-2022-1114
- CVE-2022-28463
- CVE-2022-32545
- CVE-2022-32546
- CVE-2022-32547
-- rtlhq <nobelxyz@163.com> Thu, 16 Feb 2023 16:06:07 +0800
imagemagick (8:6.9.11.60+dfsg-ok1) yangtze; urgency=medium
* Build for openKylin.

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

@ -1,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 15346579514de52b30b4006571b3dabdb73b0ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Fri, 2 Feb 2018 22:14:03 +0100
Subject: Fix br tag
@ -6,11 +7,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 569843c..031a1a3 100644
index 569843ce0d..031a1a3ef4 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,3 +1,4 @@
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
@ -7,7 +8,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 29c8bbe..20fbf7b 100644
index 29c8bbe74..20fbf7bb1 100644
--- a/magick/annotate.c
+++ b/magick/annotate.c
@@ -1484,6 +1484,15 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
@ -26,3 +27,6 @@ index 29c8bbe..20fbf7b 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 992187e26057185e70e21aa77eda645697dfebae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Wed, 14 Dec 2016 15:18:12 +0100
Subject: Fix api/Image++.html
@ -8,7 +9,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 031a1a3..c0cba47 100644
index 031a1a3ef4..c0cba474c9 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 239f4d987de41a153050e4f695cbeb36ddbdda1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Wed, 14 Dec 2016 15:23:11 +0100
Subject: Fix www/api/mophologie.html
@ -8,7 +9,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 734665c..184fe8d 100644
index 734665c274..184fe8ddeb 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,14 +1,15 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 801e2ff28a4292868da219979ae197c14d46d6d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=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 3280c00..f347420 100644
index 3280c00f3c..f347420207 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 1012523f76edd9c46ea5a9dff6062fefffb51a40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Tue, 15 Sep 2015 22:01:13 +0200
Subject: Use modern idiom for autoconf
@ -8,7 +9,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 7963576..37ed00c 100644
index 7963576e31..37ed00c988 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From dfc70e98fbbcb4ce393deeaec86729469be6fc23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=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
@ -19,7 +20,7 @@ Bug-debian: https://bugs.debian.org/727739
9 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
index 37ed00c..ea0bb94 100644
index 37ed00c988..ea0bb94f1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3058,6 +3058,18 @@ esac
@ -42,7 +43,7 @@ index 37ed00c..ea0bb94 100644
# Enable/Disable documentation
AC_ARG_ENABLE([docs],
diff --git a/utilities/conjure.1.in b/utilities/conjure.1.in
index 93a5034..a10c077 100644
index 93a503451c..a10c077c86 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
@ -61,7 +62,7 @@ index 93a5034..a10c077 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 19b73fe..e588c02 100644
index 19b73fecd8..e588c02a47 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,
@ -81,7 +82,7 @@ index 19b73fe..e588c02 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 c8a9cf0..a9bdfa3 100644
index c8a9cf04a7..a9bdfa3fbc 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.
@ -100,7 +101,7 @@ index c8a9cf0..a9bdfa3 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 b553cc4..6ba20ef 100644
index b553cc42be..6ba20ef736 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.
@ -119,7 +120,7 @@ index b553cc4..6ba20ef 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 3f726f9..e12586f 100644
index 3f726f96d4..e12586f83d 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
@ -138,7 +139,7 @@ index 3f726f9..e12586f 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 c76d312..084765f 100644
index c76d312bb8..084765fe20 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,
@ -157,7 +158,7 @@ index c76d312..084765f 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 5ea9a35..d3664c5 100644
index 5ea9a35b6c..d3664c5391 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
@ -177,7 +178,7 @@ index 5ea9a35..d3664c5 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 d0b6b89..d3002d9 100644
index d0b6b8960a..d3002d95bb 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 6d99f963f4817a07e9a7f9ad65711693814f4ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Tue, 22 Nov 2016 12:59:01 +0100
Subject: Improve policy in order to be safer
@ -12,7 +13,7 @@ Forwarded: No
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/config/policy.xml b/config/policy.xml
index 2ed14de..54e6478 100644
index 2ed14de8a6..54e64782b3 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 644457efe4a513b60d0f3085315426c5b4737a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sat, 18 Mar 2017 15:47:28 +0100
Subject: Fix remaining error in html files
@ -9,7 +10,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 284960b..5d9c77b 100644
index 284960b90f..5d9c77bd4f 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -67,8 +67,8 @@
@ -56,7 +57,7 @@ index 284960b..5d9c77b 100644
</html>
+
diff --git a/www/download.html b/www/download.html
index bfd4fa0..d467cd9 100644
index bfd4fa0ffa..d467cd9242 100644
--- a/www/download.html
+++ b/www/download.html
@@ -67,8 +67,8 @@
@ -76,7 +77,7 @@ index bfd4fa0..d467cd9 100644
</html>
+
diff --git a/www/index.html b/www/index.html
index 24709fc..5bff390 100644
index 24709fc4f7..5bff3905e8 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 516cfd4725b3b6851d410d47fb7168a0151e7b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=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
@ -23,7 +24,7 @@ Forwarded: no
13 files changed, 52 insertions(+), 49 deletions(-)
diff --git a/configure.ac b/configure.ac
index ea0bb94..570d04f 100644
index ea0bb94f1b..570d04fe69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -805,7 +805,10 @@ MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}"
@ -39,7 +40,7 @@ index ea0bb94..570d04f 100644
# Set pixel cache threshold
AC_ARG_WITH([cache],
diff --git a/utilities/ImageMagick.1.in b/utilities/ImageMagick.1.in
index 20c23b3..a29ab7b 100644
index 20c23b3396..a29ab7bd9d 100644
--- a/utilities/ImageMagick.1.in
+++ b/utilities/ImageMagick.1.in
@@ -1,8 +1,8 @@
@ -63,7 +64,7 @@ index 20c23b3..a29ab7b 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 61abca3..eaf7609 100644
index 61abca3f56..eaf7609979 100644
--- a/utilities/animate.1.in
+++ b/utilities/animate.1.in
@@ -1,11 +1,11 @@
@ -91,7 +92,7 @@ index 61abca3..eaf7609 100644
.SH COPYRIGHT
diff --git a/utilities/compare.1.in b/utilities/compare.1.in
index fd8714d..286dac3 100644
index fd8714d965..286dac302e 100644
--- a/utilities/compare.1.in
+++ b/utilities/compare.1.in
@@ -1,11 +1,11 @@
@ -119,7 +120,7 @@ index fd8714d..286dac3 100644
.SH COPYRIGHT
diff --git a/utilities/composite.1.in b/utilities/composite.1.in
index 7361f61..4212b23 100644
index 7361f616f2..4212b23b0b 100644
--- a/utilities/composite.1.in
+++ b/utilities/composite.1.in
@@ -1,11 +1,11 @@
@ -147,7 +148,7 @@ index 7361f61..4212b23 100644
.SH COPYRIGHT
diff --git a/utilities/conjure.1.in b/utilities/conjure.1.in
index a10c077..1416f55 100644
index a10c077c86..1416f5545d 100644
--- a/utilities/conjure.1.in
+++ b/utilities/conjure.1.in
@@ -1,11 +1,11 @@
@ -175,7 +176,7 @@ index a10c077..1416f55 100644
.SH COPYRIGHT
diff --git a/utilities/convert.1.in b/utilities/convert.1.in
index e588c02..1eb437e 100644
index e588c02a47..1eb437ea01 100644
--- a/utilities/convert.1.in
+++ b/utilities/convert.1.in
@@ -1,11 +1,11 @@
@ -203,7 +204,7 @@ index e588c02..1eb437e 100644
.SH COPYRIGHT
diff --git a/utilities/display.1.in b/utilities/display.1.in
index a9bdfa3..8a5aaad 100644
index a9bdfa3fbc..8a5aaad708 100644
--- a/utilities/display.1.in
+++ b/utilities/display.1.in
@@ -1,11 +1,11 @@
@ -231,7 +232,7 @@ index a9bdfa3..8a5aaad 100644
.SH COPYRIGHT
diff --git a/utilities/identify.1.in b/utilities/identify.1.in
index 6ba20ef..392806f 100644
index 6ba20ef736..392806fc93 100644
--- a/utilities/identify.1.in
+++ b/utilities/identify.1.in
@@ -1,11 +1,11 @@
@ -259,7 +260,7 @@ index 6ba20ef..392806f 100644
.SH COPYRIGHT
diff --git a/utilities/import.1.in b/utilities/import.1.in
index e12586f..395db5c 100644
index e12586f83d..395db5cb38 100644
--- a/utilities/import.1.in
+++ b/utilities/import.1.in
@@ -1,11 +1,11 @@
@ -287,7 +288,7 @@ index e12586f..395db5c 100644
.SH COPYRIGHT
diff --git a/utilities/mogrify.1.in b/utilities/mogrify.1.in
index 084765f..30c09e3 100644
index 084765fe20..30c09e328f 100644
--- a/utilities/mogrify.1.in
+++ b/utilities/mogrify.1.in
@@ -1,11 +1,11 @@
@ -316,7 +317,7 @@ index 084765f..30c09e3 100644
.SH COPYRIGHT
diff --git a/utilities/montage.1.in b/utilities/montage.1.in
index d3664c5..0f49b01 100644
index d3664c5391..0f49b01931 100644
--- a/utilities/montage.1.in
+++ b/utilities/montage.1.in
@@ -1,11 +1,11 @@
@ -344,7 +345,7 @@ index d3664c5..0f49b01 100644
.SH COPYRIGHT
diff --git a/utilities/stream.1.in b/utilities/stream.1.in
index d3002d9..6cba1d3 100644
index d3002d95bb..6cba1d3009 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 8cb7b4c562949b5f9ac0c037d99874ff768482b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sun, 4 Jun 2017 13:40:37 +0200
Subject: Fix changelog tag mismatch
@ -8,7 +9,7 @@ Forwarded: no
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/changelog.html b/www/changelog.html
index 5d9c77b..a80e49c 100644
index 5d9c77bd4f..a80e49c0d9 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 4cd51ab65b1348fcc3371c0ff3a2d0257b775a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Fri, 11 Aug 2017 10:13:21 +0200
Subject: Fix html error in api/Image++.html
@ -8,7 +9,7 @@ Forwarded: Yes
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/www/api/Image++.html b/www/api/Image++.html
index c0cba47..2932882 100644
index c0cba474c9..2932882212 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From c3975d396ed061894f4f8ecc3a136f181fcaff8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Fri, 11 Aug 2017 10:14:36 +0200
Subject: Fix www/escape.html
@ -8,7 +9,7 @@ Forwarded: Yes
1 file changed, 1 insertion(+)
diff --git a/www/escape.html b/www/escape.html
index 5e6c041..9e27c44 100644
index 5e6c04139e..9e27c44401 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 0696eea1ce57371b52a4b4151bc3de399a19041d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Fri, 11 Aug 2017 10:15:37 +0200
Subject: Fix www/magick-script.html
@ -8,7 +9,7 @@ Forwarded: Yes
1 file changed, 1 insertion(+)
diff --git a/www/magick-script.html b/www/magick-script.html
index e82fbe3..2aa6484 100644
index e82fbe3cb4..2aa6484258 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 4390760a6cd693b36588e322ad51ff88a3bfdab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Fri, 11 Aug 2017 10:20:20 +0200
Subject: Fix www/support.html
@ -8,7 +9,7 @@ Forwarded: Yes
1 file changed, 1 insertion(+)
diff --git a/www/support.html b/www/support.html
index 5de42ed..3688010 100644
index 5de42edc9a..3688010f92 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,4 +1,5 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From 08775bc3b1c7796574bc30565e26c3c2ef89686c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sat, 3 Feb 2018 23:38:58 +0100
Subject: Fix < instead of &lt; and input form
@ -130,7 +131,7 @@ Forwarded: Yes
123 files changed, 488 insertions(+), 498 deletions(-)
diff --git a/index.html b/index.html
index ca08420..7e3e141 100644
index ca08420fe0..7e3e1413ba 100644
--- a/index.html
+++ b/index.html
@@ -67,8 +67,8 @@
@ -156,7 +157,7 @@ index ca08420..7e3e141 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 9c434e4..9be497f 100644
index 9c434e4649..9be497fb18 100644
--- a/www/ImageMagickObject.html
+++ b/www/ImageMagickObject.html
@@ -67,8 +67,8 @@
@ -180,7 +181,7 @@ index 9c434e4..9be497f 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html
index f58c739..8f1b24d 100644
index f58c739132..8f1b24d2c5 100644
--- a/www/advanced-unix-installation.html
+++ b/www/advanced-unix-installation.html
@@ -67,8 +67,8 @@
@ -205,7 +206,7 @@ index f58c739..8f1b24d 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
index a785190..f976ea0 100644
index a785190426..f976ea0c38 100644
--- a/www/advanced-windows-installation.html
+++ b/www/advanced-windows-installation.html
@@ -67,8 +67,8 @@
@ -229,7 +230,7 @@ index a785190..f976ea0 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/animate.html b/www/animate.html
index 90fb2a5..89993ec 100644
index 90fb2a59df..89993ec118 100644
--- a/www/animate.html
+++ b/www/animate.html
@@ -67,8 +67,8 @@
@ -253,7 +254,7 @@ index 90fb2a5..89993ec 100644
</html>
+<!-- Magick Cache 19th March 2020 16:55 -->
diff --git a/www/api/animate.html b/www/api/animate.html
index 0c819d2..4d936f3 100644
index 0c819d217f..4d936f3980 100644
--- a/www/api/animate.html
+++ b/www/api/animate.html
@@ -66,8 +66,8 @@
@ -280,7 +281,7 @@ index 0c819d2..4d936f3 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 cecdb58..36bef3f 100644
index cecdb580e7..36bef3f574 100644
--- a/www/api/annotate.html
+++ b/www/api/annotate.html
@@ -66,8 +66,8 @@
@ -307,7 +308,7 @@ index cecdb58..36bef3f 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 25f629f..b9ff5b9 100644
index 25f629f457..b9ff5b9540 100644
--- a/www/api/attribute.html
+++ b/www/api/attribute.html
@@ -66,8 +66,8 @@
@ -334,7 +335,7 @@ index 25f629f..b9ff5b9 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 5d22435..ff2efb1 100644
index 5d224355a1..ff2efb13ac 100644
--- a/www/api/blob.html
+++ b/www/api/blob.html
@@ -66,8 +66,8 @@
@ -361,7 +362,7 @@ index 5d22435..ff2efb1 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 a35f1b7..a1ab002 100644
index a35f1b7fab..a1ab00234a 100644
--- a/www/api/cache-view.html
+++ b/www/api/cache-view.html
@@ -66,8 +66,8 @@
@ -388,7 +389,7 @@ index a35f1b7..a1ab002 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 7881cf5..e6e8ea9 100644
index 7881cf519a..e6e8ea9ad8 100644
--- a/www/api/cache.html
+++ b/www/api/cache.html
@@ -66,8 +66,8 @@
@ -415,7 +416,7 @@ index 7881cf5..e6e8ea9 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 e996eb5..af948fc 100644
index e996eb5c63..af948fc9db 100644
--- a/www/api/channel.html
+++ b/www/api/channel.html
@@ -66,8 +66,8 @@
@ -442,7 +443,7 @@ index e996eb5..af948fc 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 02d54dd..ed64fe9 100644
index 02d54dd389..ed64fe9688 100644
--- a/www/api/cipher.html
+++ b/www/api/cipher.html
@@ -66,8 +66,8 @@
@ -469,7 +470,7 @@ index 02d54dd..ed64fe9 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 78e2d55..3be5252 100644
index 78e2d55682..3be5252a64 100644
--- a/www/api/color.html
+++ b/www/api/color.html
@@ -66,8 +66,8 @@
@ -496,7 +497,7 @@ index 78e2d55..3be5252 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 4cb41b2..73b10c3 100644
index 4cb41b25d5..73b10c33c0 100644
--- a/www/api/colormap.html
+++ b/www/api/colormap.html
@@ -66,8 +66,8 @@
@ -523,7 +524,7 @@ index 4cb41b2..73b10c3 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 f57f34c..252439a 100644
index f57f34c6f2..252439a433 100644
--- a/www/api/colorspace.html
+++ b/www/api/colorspace.html
@@ -66,8 +66,8 @@
@ -550,7 +551,7 @@ index f57f34c..252439a 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 e2bded3..ad5d4e0 100644
index e2bded3012..ad5d4e0bfe 100644
--- a/www/api/compare.html
+++ b/www/api/compare.html
@@ -66,8 +66,8 @@
@ -577,7 +578,7 @@ index e2bded3..ad5d4e0 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 87796fe..2b4a199 100644
index 87796fecae..2b4a199816 100644
--- a/www/api/composite.html
+++ b/www/api/composite.html
@@ -66,8 +66,8 @@
@ -604,7 +605,7 @@ index 87796fe..2b4a199 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 980674b..804d471 100644
index 980674b01e..804d47119b 100644
--- a/www/api/constitute.html
+++ b/www/api/constitute.html
@@ -66,8 +66,8 @@
@ -631,7 +632,7 @@ index 980674b..804d471 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 2e684ed..61d0130 100644
index 2e684ed3a4..61d01300dd 100644
--- a/www/api/decorate.html
+++ b/www/api/decorate.html
@@ -66,8 +66,8 @@
@ -658,7 +659,7 @@ index 2e684ed..61d0130 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 25ea36e..bd0350b 100644
index 25ea36e780..bd0350bd6e 100644
--- a/www/api/deprecate.html
+++ b/www/api/deprecate.html
@@ -66,8 +66,8 @@
@ -685,7 +686,7 @@ index 25ea36e..bd0350b 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 121e67a..30e238c 100644
index 121e67a865..30e238c88d 100644
--- a/www/api/display.html
+++ b/www/api/display.html
@@ -66,8 +66,8 @@
@ -712,7 +713,7 @@ index 121e67a..30e238c 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 495c56e..efa9557 100644
index 495c56ea8b..efa9557490 100644
--- a/www/api/distort.html
+++ b/www/api/distort.html
@@ -66,8 +66,8 @@
@ -739,7 +740,7 @@ index 495c56e..efa9557 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 51add2a..b468531 100644
index 51add2a4b1..b46853141b 100644
--- a/www/api/draw.html
+++ b/www/api/draw.html
@@ -66,8 +66,8 @@
@ -766,7 +767,7 @@ index 51add2a..b468531 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 c6fa506..b1e7928 100644
index c6fa50666d..b1e792892c 100644
--- a/www/api/drawing-wand.html
+++ b/www/api/drawing-wand.html
@@ -66,8 +66,8 @@
@ -793,7 +794,7 @@ index c6fa506..b1e7928 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 0d0a823..d6b3250 100644
index 0d0a823512..d6b3250cf9 100644
--- a/www/api/effect.html
+++ b/www/api/effect.html
@@ -66,8 +66,8 @@
@ -820,7 +821,7 @@ index 0d0a823..d6b3250 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 789ec08..d616d43 100644
index 789ec08fd8..d616d43e52 100644
--- a/www/api/enhance.html
+++ b/www/api/enhance.html
@@ -66,8 +66,8 @@
@ -847,7 +848,7 @@ index 789ec08..d616d43 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 e86d91e..7ef2042 100644
index e86d91e169..7ef2042ef7 100644
--- a/www/api/exception.html
+++ b/www/api/exception.html
@@ -66,8 +66,8 @@
@ -874,7 +875,7 @@ index e86d91e..7ef2042 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 b12352f..9e925e4 100644
index b12352f77f..9e925e4dcc 100644
--- a/www/api/feature.html
+++ b/www/api/feature.html
@@ -66,8 +66,8 @@
@ -901,7 +902,7 @@ index b12352f..9e925e4 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 2b6aa04..b63988e 100644
index 2b6aa04e7f..b63988e067 100644
--- a/www/api/fourier.html
+++ b/www/api/fourier.html
@@ -66,8 +66,8 @@
@ -928,7 +929,7 @@ index 2b6aa04..b63988e 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 728a162..e28525e 100644
index 728a162081..e28525edb3 100644
--- a/www/api/fx.html
+++ b/www/api/fx.html
@@ -66,8 +66,8 @@
@ -955,7 +956,7 @@ index 728a162..e28525e 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 c11236b..3264313 100644
index c11236ba65..3264313488 100644
--- a/www/api/histogram.html
+++ b/www/api/histogram.html
@@ -66,8 +66,8 @@
@ -982,7 +983,7 @@ index c11236b..3264313 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 b362065..dd09c66 100644
index b362065e87..dd09c66b90 100644
--- a/www/api/image-view.html
+++ b/www/api/image-view.html
@@ -66,8 +66,8 @@
@ -1009,7 +1010,7 @@ index b362065..dd09c66 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 247b78b..595356d 100644
index 247b78b3ea..595356dcd2 100644
--- a/www/api/image.html
+++ b/www/api/image.html
@@ -66,8 +66,8 @@
@ -1036,7 +1037,7 @@ index 247b78b..595356d 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 7a591ae..cfe37f2 100644
index 7a591ae7a6..cfe37f2b26 100644
--- a/www/api/layer.html
+++ b/www/api/layer.html
@@ -66,8 +66,8 @@
@ -1063,7 +1064,7 @@ index 7a591ae..cfe37f2 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 9ac46e3..365edfd 100644
index 9ac46e302a..365edfd21c 100644
--- a/www/api/list.html
+++ b/www/api/list.html
@@ -66,8 +66,8 @@
@ -1090,7 +1091,7 @@ index 9ac46e3..365edfd 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 2ee2f37..77704f0 100644
index 2ee2f37735..77704f0cb6 100644
--- a/www/api/magick++-classes.html
+++ b/www/api/magick++-classes.html
@@ -167,8 +167,7 @@ containers of image frames.</td>
@ -1106,7 +1107,7 @@ index 2ee2f37..77704f0 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 714ff03..2dbf084 100644
index 714ff039c2..2dbf084315 100644
--- a/www/api/magick-deprecate.html
+++ b/www/api/magick-deprecate.html
@@ -66,8 +66,8 @@
@ -1133,7 +1134,7 @@ index 714ff03..2dbf084 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 4a7ba4f..495665c 100644
index 4a7ba4fef5..495665c407 100644
--- a/www/api/magick-image.html
+++ b/www/api/magick-image.html
@@ -66,8 +66,8 @@
@ -1160,7 +1161,7 @@ index 4a7ba4f..495665c 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 9262a75..902a0b4 100644
index 9262a75d8d..902a0b4900 100644
--- a/www/api/magick-property.html
+++ b/www/api/magick-property.html
@@ -66,8 +66,8 @@
@ -1187,7 +1188,7 @@ index 9262a75..902a0b4 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 e901835..76f6f9c 100644
index e90183585b..76f6f9c82e 100644
--- a/www/api/magick-wand.html
+++ b/www/api/magick-wand.html
@@ -66,8 +66,8 @@
@ -1214,7 +1215,7 @@ index e901835..76f6f9c 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 74ba75c..52ed77b 100644
index 74ba75cbb5..52ed77ba09 100644
--- a/www/api/magick.html
+++ b/www/api/magick.html
@@ -66,8 +66,8 @@
@ -1241,7 +1242,7 @@ index 74ba75c..52ed77b 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 f6b1c49..808b94c 100644
index f6b1c49ec6..808b94cea9 100644
--- a/www/api/memory.html
+++ b/www/api/memory.html
@@ -66,8 +66,8 @@
@ -1268,7 +1269,7 @@ index f6b1c49..808b94c 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 33e4893..2d469ec 100644
index 33e489327e..2d469ecdd4 100644
--- a/www/api/mime.html
+++ b/www/api/mime.html
@@ -66,8 +66,8 @@
@ -1295,7 +1296,7 @@ index 33e4893..2d469ec 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 1cd7da8..e3352bf 100644
index 1cd7da8608..e3352bf1ff 100644
--- a/www/api/module.html
+++ b/www/api/module.html
@@ -66,8 +66,8 @@
@ -1322,7 +1323,7 @@ index 1cd7da8..e3352bf 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 f9a4b43..d20f787 100644
index f9a4b43ce4..d20f787612 100644
--- a/www/api/mogrify.html
+++ b/www/api/mogrify.html
@@ -66,8 +66,8 @@
@ -1349,7 +1350,7 @@ index f9a4b43..d20f787 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 d051e4e..dabab5c 100644
index d051e4e4f0..dabab5cf3e 100644
--- a/www/api/monitor.html
+++ b/www/api/monitor.html
@@ -66,8 +66,8 @@
@ -1376,7 +1377,7 @@ index d051e4e..dabab5c 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 45b8d34..ba1b9b2 100644
index 45b8d34930..ba1b9b22d4 100644
--- a/www/api/montage.html
+++ b/www/api/montage.html
@@ -66,8 +66,8 @@
@ -1403,7 +1404,7 @@ index 45b8d34..ba1b9b2 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 184fe8d..f2fc919 100644
index 184fe8ddeb..f2fc919120 100644
--- a/www/api/morphology.html
+++ b/www/api/morphology.html
@@ -66,8 +66,8 @@
@ -1430,7 +1431,7 @@ index 184fe8d..f2fc919 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 72eecc9..c150221 100644
index 72eecc9e31..c150221997 100644
--- a/www/api/paint.html
+++ b/www/api/paint.html
@@ -66,8 +66,8 @@
@ -1457,7 +1458,7 @@ index 72eecc9..c150221 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 ac7bc10..245f701 100644
index ac7bc1088a..245f701baf 100644
--- a/www/api/pixel-iterator.html
+++ b/www/api/pixel-iterator.html
@@ -66,8 +66,8 @@
@ -1484,7 +1485,7 @@ index ac7bc10..245f701 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 875c3e2..e2bb446 100644
index 875c3e2eba..e2bb446d08 100644
--- a/www/api/pixel-wand.html
+++ b/www/api/pixel-wand.html
@@ -66,8 +66,8 @@
@ -1511,7 +1512,7 @@ index 875c3e2..e2bb446 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 89dd943..f4e268a 100644
index 89dd943b64..f4e268af12 100644
--- a/www/api/profile.html
+++ b/www/api/profile.html
@@ -66,8 +66,8 @@
@ -1538,7 +1539,7 @@ index 89dd943..f4e268a 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 e0cdde0..7fd481f 100644
index e0cdde0bcb..7fd481f6f3 100644
--- a/www/api/property.html
+++ b/www/api/property.html
@@ -66,8 +66,8 @@
@ -1565,7 +1566,7 @@ index e0cdde0..7fd481f 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 ec17025..d3e23e7 100644
index ec170256ef..d3e23e7abf 100644
--- a/www/api/quantize.html
+++ b/www/api/quantize.html
@@ -66,8 +66,8 @@
@ -1592,7 +1593,7 @@ index ec17025..d3e23e7 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 8bdae02..fec9845 100644
index 8bdae028e4..fec9845f86 100644
--- a/www/api/registry.html
+++ b/www/api/registry.html
@@ -66,8 +66,8 @@
@ -1619,7 +1620,7 @@ index 8bdae02..fec9845 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 ae0db0a..027a464 100644
index ae0db0aa4d..027a464293 100644
--- a/www/api/resize.html
+++ b/www/api/resize.html
@@ -66,8 +66,8 @@
@ -1646,7 +1647,7 @@ index ae0db0a..027a464 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 db90206..07ccdc2 100644
index db902065d3..07ccdc2cdd 100644
--- a/www/api/resource.html
+++ b/www/api/resource.html
@@ -66,8 +66,8 @@
@ -1673,7 +1674,7 @@ index db90206..07ccdc2 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 c92e8d8..76c7be5 100644
index c92e8d8fc7..76c7be50dd 100644
--- a/www/api/segment.html
+++ b/www/api/segment.html
@@ -66,8 +66,8 @@
@ -1700,7 +1701,7 @@ index c92e8d8..76c7be5 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 ab8fe9f..e9dd824 100644
index ab8fe9fac8..e9dd82496b 100644
--- a/www/api/shear.html
+++ b/www/api/shear.html
@@ -66,8 +66,8 @@
@ -1727,7 +1728,7 @@ index ab8fe9f..e9dd824 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 e3d7e1a..b3d07a0 100644
index e3d7e1a7fc..b3d07a0252 100644
--- a/www/api/signature.html
+++ b/www/api/signature.html
@@ -66,8 +66,8 @@
@ -1754,7 +1755,7 @@ index e3d7e1a..b3d07a0 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 8125dc1..3555fe7 100644
index 8125dc1aec..3555fe780c 100644
--- a/www/api/statistic.html
+++ b/www/api/statistic.html
@@ -66,8 +66,8 @@
@ -1781,7 +1782,7 @@ index 8125dc1..3555fe7 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 8e0053f..736ce72 100644
index 8e0053fd04..736ce725f0 100644
--- a/www/api/stream.html
+++ b/www/api/stream.html
@@ -66,8 +66,8 @@
@ -1808,7 +1809,7 @@ index 8e0053f..736ce72 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 efbf9d2..497b923 100644
index efbf9d2821..497b9238b7 100644
--- a/www/api/transform.html
+++ b/www/api/transform.html
@@ -66,8 +66,8 @@
@ -1835,7 +1836,7 @@ index efbf9d2..497b923 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 0a59115..5eec8db 100644
index 0a59115d8f..5eec8db2fa 100644
--- a/www/api/version.html
+++ b/www/api/version.html
@@ -66,8 +66,8 @@
@ -1862,7 +1863,7 @@ index 0a59115..5eec8db 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 f44b674..c877d6e 100644
index f44b674f1f..c877d6e3bb 100644
--- a/www/api/wand-view.html
+++ b/www/api/wand-view.html
@@ -66,8 +66,8 @@
@ -1889,7 +1890,7 @@ index f44b674..c877d6e 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 f3d9a63..7fe2eb9 100644
index f3d9a6353a..7fe2eb9b86 100644
--- a/www/architecture.html
+++ b/www/architecture.html
@@ -67,8 +67,8 @@
@ -1914,7 +1915,7 @@ index f3d9a63..7fe2eb9 100644
+<!-- Magick Cache 12th June 2020 18:55 -->
+
diff --git a/www/changelog.html b/www/changelog.html
index a80e49c..fe5bca9 100644
index a80e49c0d9..fe5bca9fec 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -5113,7 +5113,7 @@
@ -1927,7 +1928,7 @@ index a80e49c..fe5bca9 100644
<footer class="magick-footer">
<div class="container">
diff --git a/www/cipher.html b/www/cipher.html
index 2fe9873..149ac43 100644
index 2fe98736c0..149ac43dce 100644
--- a/www/cipher.html
+++ b/www/cipher.html
@@ -67,8 +67,8 @@
@ -1951,7 +1952,7 @@ index 2fe9873..149ac43 100644
</html>
+<!-- Magick Cache 1st January 2021 18:34 -->
diff --git a/www/color-management.html b/www/color-management.html
index f56d370..e4d34bf 100644
index f56d370de7..e4d34bfc73 100644
--- a/www/color-management.html
+++ b/www/color-management.html
@@ -67,8 +67,8 @@
@ -1985,7 +1986,7 @@ index f56d370..e4d34bf 100644
+<!-- Magick Cache 1st January 2021 18:20 -->
+
diff --git a/www/color.html b/www/color.html
index 0669937..68ee376 100644
index 0669937471..68ee376f8c 100644
--- a/www/color.html
+++ b/www/color.html
@@ -67,8 +67,8 @@
@ -2009,7 +2010,7 @@ index 0669937..68ee376 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/command-line-options.html b/www/command-line-options.html
index f347420..ed08591 100644
index f347420207..ed0859153f 100644
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -67,8 +67,8 @@
@ -2034,7 +2035,7 @@ index f347420..ed08591 100644
<!-- Magick Cache 1st January 2021 18:36 -->
+
diff --git a/www/command-line-processing.html b/www/command-line-processing.html
index a9acc4c..0fb06d8 100644
index a9acc4c73b..0fb06d818e 100644
--- a/www/command-line-processing.html
+++ b/www/command-line-processing.html
@@ -67,8 +67,8 @@
@ -2058,7 +2059,7 @@ index a9acc4c..0fb06d8 100644
</html>
+<!-- Magick Cache 1st January 2021 16:55 -->
diff --git a/www/command-line-tools.html b/www/command-line-tools.html
index eadf195..ec0cd93 100644
index eadf195b81..ec0cd937fb 100644
--- a/www/command-line-tools.html
+++ b/www/command-line-tools.html
@@ -67,8 +67,8 @@
@ -2082,7 +2083,7 @@ index eadf195..ec0cd93 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/compare.html b/www/compare.html
index 54b768a..dc4b47e 100644
index 54b768ad24..dc4b47ec32 100644
--- a/www/compare.html
+++ b/www/compare.html
@@ -67,8 +67,8 @@
@ -2115,7 +2116,7 @@ index 54b768a..dc4b47e 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/compose.html b/www/compose.html
index 361c1cf..9740ba6 100644
index 361c1cfba4..9740ba6292 100644
--- a/www/compose.html
+++ b/www/compose.html
@@ -67,8 +67,8 @@
@ -2139,7 +2140,7 @@ index 361c1cf..9740ba6 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/composite.html b/www/composite.html
index 7a9d9dc..eb4d731 100644
index 7a9d9dc03a..eb4d7319bf 100644
--- a/www/composite.html
+++ b/www/composite.html
@@ -67,8 +67,8 @@
@ -2163,7 +2164,7 @@ index 7a9d9dc..eb4d731 100644
</html>
+<!-- Magick Cache 1st January 2021 18:22 -->
diff --git a/www/conjure.html b/www/conjure.html
index dfa7a45..cc67874 100644
index dfa7a45800..cc67874952 100644
--- a/www/conjure.html
+++ b/www/conjure.html
@@ -67,8 +67,8 @@
@ -2187,7 +2188,7 @@ index dfa7a45..cc67874 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/connected-components.html b/www/connected-components.html
index 761f67b..93ce606 100644
index 761f67b636..93ce606175 100644
--- a/www/connected-components.html
+++ b/www/connected-components.html
@@ -67,8 +67,8 @@
@ -2211,7 +2212,7 @@ index 761f67b..93ce606 100644
</html>
+<!-- Magick Cache 1st January 2021 18:17 -->
diff --git a/www/contact.html b/www/contact.html
index bacf1d3..960e889 100644
index bacf1d3187..960e889247 100644
--- a/www/contact.html
+++ b/www/contact.html
@@ -67,8 +67,8 @@
@ -2234,7 +2235,7 @@ index bacf1d3..960e889 100644
</body>
</html>
diff --git a/www/convert.html b/www/convert.html
index aa813ad..f67750b 100644
index aa813add45..f67750baa3 100644
--- a/www/convert.html
+++ b/www/convert.html
@@ -67,8 +67,8 @@
@ -2258,7 +2259,7 @@ index aa813ad..f67750b 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/develop.html b/www/develop.html
index dfcba8e..011f4f1 100644
index dfcba8eb50..011f4f1ec5 100644
--- a/www/develop.html
+++ b/www/develop.html
@@ -67,8 +67,8 @@
@ -2283,7 +2284,7 @@ index dfcba8e..011f4f1 100644
+<!-- Magick Cache 1st January 2021 17:36 -->
+
diff --git a/www/display.html b/www/display.html
index 738d081..0808149 100644
index 738d081688..08081496ad 100644
--- a/www/display.html
+++ b/www/display.html
@@ -67,8 +67,8 @@
@ -2307,7 +2308,7 @@ index 738d081..0808149 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/distribute-pixel-cache.html b/www/distribute-pixel-cache.html
index 96f6c56..5a1e37d 100644
index 96f6c561d3..5a1e37ddec 100644
--- a/www/distribute-pixel-cache.html
+++ b/www/distribute-pixel-cache.html
@@ -67,8 +67,8 @@
@ -2331,7 +2332,7 @@ index 96f6c56..5a1e37d 100644
</html>
+<!-- Magick Cache 1st January 2021 18:19 -->
diff --git a/www/download.html b/www/download.html
index d467cd9..468a708 100644
index d467cd9242..468a708ed5 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
@ -2344,7 +2345,7 @@ index d467cd9..468a708 100644
</html>
diff --git a/www/escape.html b/www/escape.html
index 9e27c44..2519ee1 100644
index 9e27c44401..2519ee1d40 100644
--- a/www/escape.html
+++ b/www/escape.html
@@ -67,8 +67,8 @@
@ -2368,7 +2369,7 @@ index 9e27c44..2519ee1 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/examples.html b/www/examples.html
index abfbd0d..921284d 100644
index abfbd0db4c..921284d3b1 100644
--- a/www/examples.html
+++ b/www/examples.html
@@ -67,8 +67,8 @@
@ -2392,7 +2393,7 @@ index abfbd0d..921284d 100644
</html>
+<!-- Magick Cache 1st January 2021 18:37 -->
diff --git a/www/exception.html b/www/exception.html
index 90c2beb..ac46625 100644
index 90c2beb007..ac466258dd 100644
--- a/www/exception.html
+++ b/www/exception.html
@@ -67,8 +67,8 @@
@ -2416,7 +2417,7 @@ index 90c2beb..ac46625 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/export.html b/www/export.html
index 562f40f..86dd25b 100644
index 562f40f188..86dd25bae1 100644
--- a/www/export.html
+++ b/www/export.html
@@ -67,8 +67,8 @@
@ -2440,7 +2441,7 @@ index 562f40f..86dd25b 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/formats.html b/www/formats.html
index fe4aa68..261250d 100644
index fe4aa6854a..261250db93 100644
--- a/www/formats.html
+++ b/www/formats.html
@@ -67,8 +67,8 @@
@ -2464,7 +2465,7 @@ index fe4aa68..261250d 100644
</html>
+<!-- Magick Cache 1st January 2021 18:45 -->
diff --git a/www/fx.html b/www/fx.html
index a9d7fb5..c2428d1 100644
index a9d7fb5dbf..c2428d17e9 100644
--- a/www/fx.html
+++ b/www/fx.html
@@ -67,8 +67,8 @@
@ -2488,7 +2489,7 @@ index a9d7fb5..c2428d1 100644
</html>
+<!-- Magick Cache 1st January 2021 18:20 -->
diff --git a/www/gradient.html b/www/gradient.html
index 094cfc3..d18f5b8 100644
index 094cfc3f54..d18f5b8c60 100644
--- a/www/gradient.html
+++ b/www/gradient.html
@@ -67,8 +67,8 @@
@ -2529,7 +2530,7 @@ index 094cfc3..d18f5b8 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html
index 1d0598f..c0971b9 100644
index 1d0598fe3c..c0971b93de 100644
--- a/www/high-dynamic-range.html
+++ b/www/high-dynamic-range.html
@@ -67,8 +67,8 @@
@ -2553,7 +2554,7 @@ index 1d0598f..c0971b9 100644
</html>
+<!-- Magick Cache 1st January 2021 18:37 -->
diff --git a/www/history.html b/www/history.html
index 92604aa..ef0ddbb 100644
index 92604aa914..ef0ddbb1b7 100644
--- a/www/history.html
+++ b/www/history.html
@@ -67,8 +67,8 @@
@ -2577,7 +2578,7 @@ index 92604aa..ef0ddbb 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/identify.html b/www/identify.html
index 5d985bb..b5cb2d3 100644
index 5d985bbd6f..b5cb2d312f 100644
--- a/www/identify.html
+++ b/www/identify.html
@@ -67,8 +67,8 @@
@ -2601,7 +2602,7 @@ index 5d985bb..b5cb2d3 100644
</html>
+<!-- Magick Cache 1st January 2021 17:39 -->
diff --git a/www/import.html b/www/import.html
index fd4bd17..ab095f2 100644
index fd4bd178f8..ab095f2554 100644
--- a/www/import.html
+++ b/www/import.html
@@ -67,8 +67,8 @@
@ -2625,7 +2626,7 @@ index fd4bd17..ab095f2 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/install-source.html b/www/install-source.html
index c74afa8..881a331 100644
index c74afa8303..881a331c0a 100644
--- a/www/install-source.html
+++ b/www/install-source.html
@@ -67,8 +67,8 @@
@ -2649,7 +2650,7 @@ index c74afa8..881a331 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/jp2.html b/www/jp2.html
index ca1b7b8..e67180e 100644
index ca1b7b8594..e67180e082 100644
--- a/www/jp2.html
+++ b/www/jp2.html
@@ -67,8 +67,8 @@
@ -2673,7 +2674,7 @@ index ca1b7b8..e67180e 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/license.html b/www/license.html
index fadb687..d9b6122 100644
index fadb687801..d9b6122b26 100644
--- a/www/license.html
+++ b/www/license.html
@@ -67,8 +67,8 @@
@ -2705,7 +2706,7 @@ index fadb687..d9b6122 100644
</html>
+<!-- Magick Cache 1st January 2021 17:58 -->
diff --git a/www/links.html b/www/links.html
index fb2f917..2c03dc6 100644
index fb2f917140..2c03dc6b1f 100644
--- a/www/links.html
+++ b/www/links.html
@@ -67,8 +67,8 @@
@ -2729,7 +2730,7 @@ index fb2f917..2c03dc6 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/magick++.html b/www/magick++.html
index ba4bce7..24d4aa5 100644
index ba4bce78cc..24d4aa5b71 100644
--- a/www/magick++.html
+++ b/www/magick++.html
@@ -67,8 +67,8 @@
@ -2753,7 +2754,7 @@ index ba4bce7..24d4aa5 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/magick-core.html b/www/magick-core.html
index f195fad..312dcf1 100644
index f195fad121..312dcf1ff9 100644
--- a/www/magick-core.html
+++ b/www/magick-core.html
@@ -67,8 +67,8 @@
@ -2777,7 +2778,7 @@ index f195fad..312dcf1 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/magick-script.html b/www/magick-script.html
index 2aa6484..5af89f3 100644
index 2aa6484258..5af89f326a 100644
--- a/www/magick-script.html
+++ b/www/magick-script.html
@@ -66,8 +66,8 @@
@ -2801,7 +2802,7 @@ index 2aa6484..5af89f3 100644
</body>
</html>
diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html
index 95c5f61..c82736b 100644
index 95c5f61dbc..c82736bd39 100644
--- a/www/magick-vector-graphics.html
+++ b/www/magick-vector-graphics.html
@@ -67,8 +67,8 @@
@ -2825,7 +2826,7 @@ index 95c5f61..c82736b 100644
</html>
+<!-- Magick Cache 1st January 2021 17:30 -->
diff --git a/www/magick-wand.html b/www/magick-wand.html
index 68e5690..b922b33 100644
index 68e5690610..b922b334b2 100644
--- a/www/magick-wand.html
+++ b/www/magick-wand.html
@@ -67,8 +67,8 @@
@ -2849,7 +2850,7 @@ index 68e5690..b922b33 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/magick.html b/www/magick.html
index f48186d..ae4855a 100644
index f48186d25b..ae4855adc7 100644
--- a/www/magick.html
+++ b/www/magick.html
@@ -66,8 +66,8 @@
@ -2876,7 +2877,7 @@ index f48186d..ae4855a 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 7c09a77..201dc4e 100644
index 7c09a778b6..201dc4ed96 100644
--- a/www/miff.html
+++ b/www/miff.html
@@ -67,8 +67,8 @@
@ -2900,7 +2901,7 @@ index 7c09a77..201dc4e 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/mirror.html b/www/mirror.html
index 388a545..2c84a6d 100644
index 388a545da2..2c84a6d840 100644
--- a/www/mirror.html
+++ b/www/mirror.html
@@ -67,8 +67,8 @@
@ -2924,7 +2925,7 @@ index 388a545..2c84a6d 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/mogrify.html b/www/mogrify.html
index c182693..2fbe9e9 100644
index c182693b7f..2fbe9e9706 100644
--- a/www/mogrify.html
+++ b/www/mogrify.html
@@ -67,8 +67,8 @@
@ -2948,7 +2949,7 @@ index c182693..2fbe9e9 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/montage.html b/www/montage.html
index 97542fe..310e736 100644
index 97542fe6bc..310e73611b 100644
--- a/www/montage.html
+++ b/www/montage.html
@@ -67,8 +67,8 @@
@ -2972,7 +2973,7 @@ index 97542fe..310e736 100644
</html>
+<!-- Magick Cache 1st January 2021 18:14 -->
diff --git a/www/motion-picture.html b/www/motion-picture.html
index 6c84c37..fb145da 100644
index 6c84c378fb..fb145daa21 100644
--- a/www/motion-picture.html
+++ b/www/motion-picture.html
@@ -67,8 +67,8 @@
@ -2996,7 +2997,7 @@ index 6c84c37..fb145da 100644
</html>
+<!-- Magick Cache 1st January 2021 18:11 -->
diff --git a/www/opencl.html b/www/opencl.html
index 89002fa..f6b026e 100644
index 89002faebf..f6b026e7a1 100644
--- a/www/opencl.html
+++ b/www/opencl.html
@@ -67,8 +67,8 @@
@ -3020,7 +3021,7 @@ index 89002fa..f6b026e 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/openmp.html b/www/openmp.html
index 2e9c1d2..233cd45 100644
index 2e9c1d2ad1..233cd452a7 100644
--- a/www/openmp.html
+++ b/www/openmp.html
@@ -67,8 +67,8 @@
@ -3044,7 +3045,7 @@ index 2e9c1d2..233cd45 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/perl-magick.html b/www/perl-magick.html
index 4bdbc6a..a84edd5 100644
index 4bdbc6adb0..a84edd5f93 100644
--- a/www/perl-magick.html
+++ b/www/perl-magick.html
@@ -67,8 +67,8 @@
@ -3068,7 +3069,7 @@ index 4bdbc6a..a84edd5 100644
</html>
+<!-- Magick Cache 1st January 2021 17:29 -->
diff --git a/www/porting.html b/www/porting.html
index dddbc25..9a1759d 100644
index dddbc258c8..9a1759d27b 100644
--- a/www/porting.html
+++ b/www/porting.html
@@ -67,8 +67,8 @@
@ -3092,7 +3093,7 @@ index dddbc25..9a1759d 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/quantize.html b/www/quantize.html
index 09bf3cb..a36f78f 100644
index 09bf3cba7e..a36f78f44d 100644
--- a/www/quantize.html
+++ b/www/quantize.html
@@ -67,8 +67,8 @@
@ -3116,7 +3117,7 @@ index 09bf3cb..a36f78f 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/resources.html b/www/resources.html
index fe3bd8a..9166022 100644
index fe3bd8af4e..9166022c1d 100644
--- a/www/resources.html
+++ b/www/resources.html
@@ -67,8 +67,8 @@
@ -3140,7 +3141,7 @@ index fe3bd8a..9166022 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/search.html b/www/search.html
index da63a05..fd224dd 100644
index da63a05003..fd224dd29d 100644
--- a/www/search.html
+++ b/www/search.html
@@ -66,9 +66,8 @@
@ -3172,7 +3173,7 @@ index da63a05..fd224dd 100644
</body>
</html>
diff --git a/www/security-policy.html b/www/security-policy.html
index 030bd1b..9ccc4b4 100644
index 030bd1bbed..9ccc4b496a 100644
--- a/www/security-policy.html
+++ b/www/security-policy.html
@@ -66,9 +66,8 @@
@ -3206,7 +3207,7 @@ index 030bd1b..9ccc4b4 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/sitemap.html b/www/sitemap.html
index 7a0ae8d..9b18ef9 100644
index 7a0ae8d295..9b18ef989b 100644
--- a/www/sitemap.html
+++ b/www/sitemap.html
@@ -67,8 +67,8 @@
@ -3230,7 +3231,7 @@ index 7a0ae8d..9b18ef9 100644
</html>
+<!-- Magick Cache 1st January 2021 17:50 -->
diff --git a/www/stream.html b/www/stream.html
index 96ae7e4..df1f528 100644
index 96ae7e4b60..df1f528982 100644
--- a/www/stream.html
+++ b/www/stream.html
@@ -67,8 +67,8 @@
@ -3254,7 +3255,7 @@ index 96ae7e4..df1f528 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/support.html b/www/support.html
index 3688010..7d1388f 100644
index 3688010f92..7d1388f761 100644
--- a/www/support.html
+++ b/www/support.html
@@ -67,8 +67,8 @@
@ -3278,7 +3279,7 @@ index 3688010..7d1388f 100644
</html>
<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/webp.html b/www/webp.html
index 6dc6077..fe64895 100644
index 6dc6077ae1..fe6489575f 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,18 +1,19 @@
From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
From fa352d2950591ebc6104de7e64e1442355c4f0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=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 0000000..6542f55
index 0000000000..6542f550f9
--- /dev/null
+++ b/www/api.html
@@ -0,0 +1,224 @@
@ -242,7 +243,7 @@ index 0000000..6542f55
+</html>
diff --git a/www/binary-releases.html b/www/binary-releases.html
new file mode 100644
index 0000000..b6e959a
index 0000000000..b6e959a7ea
--- /dev/null
+++ b/www/binary-releases.html
@@ -0,0 +1,495 @@

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

@ -1,4 +1,5 @@
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org>
From 53318cf3701792dfbb1e7d460f9d2cae7484d591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Roucari=C3=A8s?= <rouca@debian.org>
Date: Mon, 30 Jul 2018 14:49:54 +0200
Subject: Fix index.html
@ -8,7 +9,7 @@ Forwarded: yes
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/www/index.html b/www/index.html
index 5bff390..5135573 100644
index 5bff3905e8..51355732f9 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,4 +1,5 @@
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org>
From df76b8f6d8230390e7c8ecf5dbe6dab132b79fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Roucari=C3=A8s?= <rouca@debian.org>
Date: Mon, 30 Jul 2018 14:50:23 +0200
Subject: Fix end tags
@ -8,7 +9,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 f976ea0..5057172 100644
index f976ea0c38..50571726e1 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,19 +1,20 @@
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org>
From 55e03da869a70f9bf07a34d9adb8270e0693f914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Roucari=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 b6e959a..49a8f2a 100644
index b6e959a7ea..49a8f2aac9 100644
--- a/www/binary-releases.html
+++ b/www/binary-releases.html
@@ -65,7 +65,6 @@
@ -25,7 +26,7 @@ index b6e959a..49a8f2a 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 fe5bca9..5887ee8 100644
index fe5bca9fec..5887ee8d3a 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -418,13 +418,14 @@
@ -66,7 +67,7 @@ index fe5bca9..5887ee8 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 bfd619f..405196a 100644
index bfd619f4b4..405196a69a 100644
--- a/www/defines.html
+++ b/www/defines.html
@@ -67,8 +67,8 @@
@ -184,7 +185,7 @@ index bfd619f..405196a 100644
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/index.html b/www/index.html
index 5135573..abff1f3 100644
index 51355732f9..abff1f327b 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
@ -206,7 +207,7 @@ index 5135573..abff1f3 100644
</div>
</div>
diff --git a/www/search.html b/www/search.html
index fd224dd..985d9c1 100644
index fd224dd29d..985d9c1dcf 100644
--- a/www/search.html
+++ b/www/search.html
@@ -66,6 +66,7 @@
@ -218,7 +219,7 @@ index fd224dd..985d9c1 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 9ccc4b4..593d71a 100644
index 9ccc4b496a..593d71af45 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,4 +1,5 @@
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org>
From 2cb9cd8373ef81071c7963bb3f65c093fc3e400e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Roucari=C3=A8s?= <rouca@debian.org>
Date: Mon, 27 Jul 2020 10:44:26 +0200
Subject: Fix a typo in manpage
@ -18,7 +19,7 @@ debian-bug: 953279
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/utilities/animate.1.in b/utilities/animate.1.in
index eaf7609..5e5b683 100644
index eaf7609979..5e5b683584 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
@ -31,7 +32,7 @@ index eaf7609..5e5b683 100644
.SH COPYRIGHT
diff --git a/utilities/compare.1.in b/utilities/compare.1.in
index 286dac3..a5073a0 100644
index 286dac302e..a5073a0e8e 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
@ -44,7 +45,7 @@ index 286dac3..a5073a0 100644
.SH COPYRIGHT
diff --git a/utilities/composite.1.in b/utilities/composite.1.in
index 4212b23..b9b1ce3 100644
index 4212b23b0b..b9b1ce3fbb 100644
--- a/utilities/composite.1.in
+++ b/utilities/composite.1.in
@@ -109,7 +109,7 @@ Miscellaneous Options:
@ -57,7 +58,7 @@ index 4212b23..b9b1ce3 100644
.SH COPYRIGHT
diff --git a/utilities/conjure.1.in b/utilities/conjure.1.in
index 1416f55..65e4e0a 100644
index 1416f5545d..65e4e0adf6 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,
@ -70,7 +71,7 @@ index 1416f55..65e4e0a 100644
.SH COPYRIGHT
diff --git a/utilities/convert.1.in b/utilities/convert.1.in
index 1eb437e..c36255d 100644
index 1eb437ea01..c36255dd8a 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
@ -83,7 +84,7 @@ index 1eb437e..c36255d 100644
.SH COPYRIGHT
diff --git a/utilities/display.1.in b/utilities/display.1.in
index 8a5aaad..4b625e7 100644
index 8a5aaad708..4b625e7e3f 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
@ -96,7 +97,7 @@ index 8a5aaad..4b625e7 100644
.SH COPYRIGHT
diff --git a/utilities/identify.1.in b/utilities/identify.1.in
index 392806f..300a840 100644
index 392806fc93..300a840321 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
@ -109,7 +110,7 @@ index 392806f..300a840 100644
.SH COPYRIGHT
diff --git a/utilities/import.1.in b/utilities/import.1.in
index 395db5c..936817c 100644
index 395db5cb38..936817c637 100644
--- a/utilities/import.1.in
+++ b/utilities/import.1.in
@@ -92,7 +92,7 @@ Miscellaneous Options:
@ -122,7 +123,7 @@ index 395db5c..936817c 100644
.SH COPYRIGHT
diff --git a/utilities/mogrify.1.in b/utilities/mogrify.1.in
index 30c09e3..551235e 100644
index 30c09e328f..551235e9de 100644
--- a/utilities/mogrify.1.in
+++ b/utilities/mogrify.1.in
@@ -320,7 +320,7 @@ Miscellaneous Options:
@ -135,7 +136,7 @@ index 30c09e3..551235e 100644
.SH COPYRIGHT
diff --git a/utilities/montage.1.in b/utilities/montage.1.in
index 0f49b01..4591096 100644
index 0f49b01931..4591096569 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
@ -148,7 +149,7 @@ index 0f49b01..4591096 100644
.SH COPYRIGHT
diff --git a/utilities/stream.1.in b/utilities/stream.1.in
index 6cba1d3..ef00a7a 100644
index 6cba1d3009..ef00a7a369 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,4 +1,5 @@
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org>
From 94f036b9bb87a0862bd5a2524645475309634cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Roucari=C3=A8s?= <rouca@debian.org>
Date: Mon, 1 Feb 2021 16:19:56 +0000
Subject: FIx error in new upstream html
@ -10,7 +11,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 e8db9d3..201018d 100644
index e8db9d3489..201018d892 100644
--- a/www/api/magick++-classes.html
+++ b/www/api/magick++-classes.html
@@ -67,7 +67,7 @@
@ -23,7 +24,7 @@ index e8db9d3..201018d 100644
</form>
</nav>
diff --git a/www/defines.html b/www/defines.html
index f68e79f..5dd0a79 100644
index f68e79f9bd..5dd0a79121 100644
--- a/www/defines.html
+++ b/www/defines.html
@@ -1530,6 +1530,7 @@ Post ObjectData Descriptor Record
@ -35,7 +36,7 @@ index f68e79f..5dd0a79 100644
<footer class="magick-footer">
<div class="container">
diff --git a/www/links.html b/www/links.html
index 3ecf3cd..c9a2785 100644
index 3ecf3cd88a..c9a27855f8 100644
--- a/www/links.html
+++ b/www/links.html
@@ -167,7 +167,7 @@

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

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

22
debian/patches/CVE-2021-20241.patch vendored Normal file
View File

@ -0,0 +1,22 @@
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
---
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
scale=(double) (((size_t) 1UL << jp2_image->comps[i].prec)-1)/
QuantumRange;
- q=jp2_image->comps[i].data+(y/jp2_image->comps[i].dy*
- image->columns/jp2_image->comps[i].dx+x/jp2_image->comps[i].dx);
+ q=jp2_image->comps[i].data+(ssize_t) (y*PerceptibleReciprocal(jp2_image->comps[i].dy)*
+ image->columns*PerceptibleReciprocal(jp2_image->comps[i].dx)+x*PerceptibleReciprocal(jp2_image->comps[i].dx));
switch (i)
{
case 0:

26
debian/patches/CVE-2021-20243.patch vendored Normal file
View File

@ -0,0 +1,26 @@
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(-)
--- 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
*/
assert(resize_filter != (ResizeFilter *) NULL);
assert(resize_filter->signature == MagickCoreSignature);
- x_blur=fabs((double) x)/resize_filter->blur; /* X offset with blur scaling */
+ x_blur=fabs((double) x)*PerceptibleReciprocal(resize_filter->blur); /* X offset with blur scaling */
if ((resize_filter->window_support < MagickEpsilon) ||
(resize_filter->window == Box))
scale=1.0; /* Point or Box Filter -- avoid division by zero */

32
debian/patches/CVE-2021-20244.patch vendored Normal file
View File

@ -0,0 +1,32 @@
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
divide-by-zero from occurring (#3194)
Co-authored-by: Zhang Xiaohui <ruc_zhangxiaohui@163.com>
(cherry picked from commit 329dd528ab79531d884c0ba131e97d43f872ab5d)
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
*/
factor=1.0;
if (distance > 0.0)
- factor=pow(sin((double) (MagickPI*sqrt((double) distance)/
- radius/2)),-amount);
+ factor=pow(sin((double) (MagickPI*sqrt((double) distance)*
+ PerceptibleReciprocal(radius)/2)),-amount);
status=InterpolateMagickPixelPacket(image,image_view,
- UndefinedInterpolatePixel,(double) (factor*delta.x/scale.x+
- center.x),(double) (factor*delta.y/scale.y+center.y),&pixel,
+ UndefinedInterpolatePixel,(double) (factor*delta.x*PerceptibleReciprocal(scale.x)+
+ center.x),(double) (factor*delta.y*PerceptibleReciprocal(scale.y)+center.y),&pixel,
exception);
if (status == MagickFalse)
break;

21
debian/patches/CVE-2021-20245.patch vendored Normal file
View File

@ -0,0 +1,21 @@
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
---
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
WriteSingleWEBPImage(image_info, image, &picture, current, exception);
- effective_delta = image->delay*1000/image->ticks_per_second;
+ effective_delta = image->delay*1000*PerceptibleReciprocal(
+ image->ticks_per_second);
if (effective_delta < 10)
effective_delta = 100; /* Consistent with gif2webp */
frame_timestamp+=effective_delta;

24
debian/patches/CVE-2021-20246.patch vendored Normal file
View File

@ -0,0 +1,24 @@
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
---
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
{ double scale;
#if FILTER_LUT
/* scale so that F = WLUT_WIDTH; -- hardcoded */
- scale = (double)WLUT_WIDTH/F;
+ scale=(double) WLUT_WIDTH*PerceptibleReciprocal(F);
#else
/* scale so that F = resample_filter->F (support^2) */
- scale = resample_filter->F/F;
+ scale=resample_filter->F*PerceptibleReciprocal(F);
#endif
resample_filter->A = A*scale;
resample_filter->B = B*scale;

20
debian/patches/CVE-2021-20309.patch vendored Normal file
View File

@ -0,0 +1,20 @@
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
---
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
}
for (i=0; i < (ssize_t) wave_image->columns; i++)
sine_map[i]=(float) fabs(amplitude)+amplitude*sin((double)
- ((2.0*MagickPI*i)/wave_length));
+ ((2.0*MagickPI*i)*PerceptibleReciprocal(wave_length)));
/*
Wave image.
*/

157
debian/patches/CVE-2021-20312_20313.patch vendored Normal file
View File

@ -0,0 +1,157 @@
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(-)
--- 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
break;
q++;
}
- if ((q+length) > (GetStringInfoDatum(profile)+GetStringInfoLength(profile)))
+ if ((q > (GetStringInfoDatum(profile)+GetStringInfoLength(profile))) ||
+ (length > (GetStringInfoDatum(profile)+GetStringInfoLength(profile)-q)))
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
Reset registers.
*/
alpha=0;
- (void) memset(key,0,sizeof(key));
- (void) memset(text,0,sizeof(text));
+ (void) ResetMagickMemory(key,0,sizeof(key));
+ (void) ResetMagickMemory(text,0,sizeof(text));
}
/*
@@ -708,8 +708,8 @@ MagickExport MagickBooleanType PasskeyDe
*/
quantum_info=DestroyQuantumInfo(quantum_info);
aes_info=DestroyAESInfo(aes_info);
- (void) memset(input_block,0,sizeof(input_block));
- (void) memset(output_block,0,sizeof(output_block));
+ (void) ResetMagickMemory(input_block,0,sizeof(input_block));
+ (void) ResetMagickMemory(output_block,0,sizeof(output_block));
return(y == (ssize_t) image->rows ? MagickTrue : MagickFalse);
}
@@ -925,8 +925,8 @@ MagickExport MagickBooleanType PasskeyEn
*/
quantum_info=DestroyQuantumInfo(quantum_info);
aes_info=DestroyAESInfo(aes_info);
- (void) memset(input_block,0,sizeof(input_block));
- (void) memset(output_block,0,sizeof(output_block));
+ (void) ResetMagickMemory(input_block,0,sizeof(input_block));
+ (void) ResetMagickMemory(output_block,0,sizeof(output_block));
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
if (logmap == (Quantum *) NULL)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
- black=pow(10.0,(reference_black-reference_white)*(gamma/density)*0.002/
- film_gamma);
+ black=pow(10.0,(reference_black-reference_white)*(gamma/density)*0.002*
+ PerceptibleReciprocal(film_gamma));
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
logmap[i]=ScaleMapToQuantum((MagickRealType) (MaxMap*(reference_white+
- log10(black+(1.0*i/MaxMap)*(1.0-black))/((gamma/density)*0.002/
- film_gamma))/1024.0));
+ log10(black+(1.0*i/MaxMap)*(1.0-black))/((gamma/density)*0.002*
+ PerceptibleReciprocal(film_gamma)))/1024.0));
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
if (logmap == (Quantum *) NULL)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
- black=pow(10.0,(reference_black-reference_white)*(gamma/density)*0.002/
- film_gamma);
+ black=pow(10.0,(reference_black-reference_white)*(gamma/density)*0.002*
+ PerceptibleReciprocal(film_gamma));
for (i=0; i <= (ssize_t) (reference_black*MaxMap/1024.0); i++)
logmap[i]=(Quantum) 0;
for ( ; i < (ssize_t) (reference_white*MaxMap/1024.0); i++)
logmap[i]=ClampToQuantum((MagickRealType) QuantumRange/(1.0-black)*
- (pow(10.0,(1024.0*i/MaxMap-reference_white)*(gamma/density)*0.002/
- film_gamma)-black));
+ (pow(10.0,(1024.0*i/MaxMap-reference_white)*(gamma/density)*0.002*
+ PerceptibleReciprocal(film_gamma))-black));
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
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% ResetMagickMemory() fills the first size bytes of the memory area pointed to
-% by memory with the constant byte c.
+% by memory with the constant byte c. We use a volatile pointer when
+% updating the byte string. Most compilers will avoid optimizing away access
+% to a volatile pointer, even if the pointer appears to be unused after the
+% call.
%
% The format of the ResetMagickMemory method is:
%
-% void *ResetMagickMemory(void *memory,int byte,const size_t size)
+% void *ResetMagickMemory(void *memory,int c,const size_t size)
%
% A description of each parameter follows:
%
% o memory: a pointer to a memory allocation.
%
-% o byte: set the memory to this value.
+% o c: set the memory to this value.
%
% o size: size of the memory to reset.
%
*/
-MagickExport void *ResetMagickMemory(void *memory,int byte,const size_t size)
+MagickExport void *ResetMagickMemory(void *memory,int c,const size_t size)
{
+ volatile unsigned char
+ *p = memory;
+
+ size_t
+ n = size;
+
assert(memory != (void *) NULL);
- return(memset(memory,byte,size));
+ while (n-- != 0)
+ *p++=(unsigned char) c;
+ return(memory);
}
/*
--- imagemagick-6.9.11.60+dfsg.orig/magick/signature.c
+++ imagemagick-6.9.11.60+dfsg/magick/signature.c
@@ -720,7 +720,7 @@ RestoreMSCWarning
T=0;
T1=0;
T2=0;
- (void) memset(W,0,sizeof(W));
+ (void) ResetMagickMemory(W,0,sizeof(W));
}
/*

35
debian/patches/CVE-2021-3574.patch vendored Normal file
View File

@ -0,0 +1,35 @@
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
---
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
TIFFClose(tiff);
ThrowReaderException(CorruptImageError,"UnsupportedBitsPerPixel");
}
+ if (samples_per_pixel > MaxPixelChannels)
+ {
+ TIFFClose(tiff);
+ ThrowReaderException(CorruptImageError,"MaximumChannelsExceeded");
+ }
if (sample_format == SAMPLEFORMAT_IEEEFP)
(void) SetImageProperty(image,"quantum:format","floating-point");
switch (photometric)
@@ -1700,11 +1705,6 @@ static Image *ReadTIFFImage(const ImageI
}
if (image->matte != MagickFalse)
(void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
- if (samples_per_pixel > MaxPixelChannels)
- {
- TIFFClose(tiff);
- ThrowReaderException(CorruptImageError,"MaximumChannelsExceeded");
- }
method=ReadGenericMethod;
rows_per_strip=(uint32) image->rows;
if (TIFFGetField(tiff,TIFFTAG_ROWSPERSTRIP,&rows_per_strip) == 1)

59
debian/patches/CVE-2021-39212.patch vendored Normal file
View File

@ -0,0 +1,59 @@
Merge of two patches 69ea5587de17ef89476be47a3cb7f855c0355a74 and 428e68597fa904d0bdc133d878e12acd7dc60fa3 is here.
From 69ea5587de17ef89476be47a3cb7f855c0355a74 Mon Sep 17 00:00:00 2001
From: Dirk Lemstra <dirk@lemstra.org>
Date: Sat, 11 Sep 2021 12:30:44 +0200
Subject: [PATCH] Added missing policy checks in RegisterStaticModules.
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.
--- 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
*/
assert(module != (const char *) NULL);
(void) CopyMagickString(module_name,module,MagickPathExtent);
- rights=ReadPolicyRights;
+ rights=ReadPolicyRights|WritePolicyRights;
if (IsRightsAuthorized(ModulePolicyDomain,rights,module) == MagickFalse)
{
errno=EPERM;
@@ -441,17 +441,24 @@ MagickExport MagickBooleanType RegisterS
*/
MagickExport void RegisterStaticModules(void)
{
+ PolicyRights
+ rights;
+
size_t
extent;
ssize_t
i;
+ rights=ReadPolicyRights|WritePolicyRights;
extent=sizeof(MagickModules)/sizeof(MagickModules[0]);
for (i=0; i < (ssize_t) extent; i++)
{
if (MagickModules[i].registered == MagickFalse)
{
+ if (IsRightsAuthorized(ModulePolicyDomain,rights,
+ MagickModules[i].module) == MagickFalse)
+ continue;
(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;

21
debian/patches/CVE-2021-4219.patch vendored Normal file
View File

@ -0,0 +1,21 @@
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(-)
--- 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
{
(void) CopyMagickString(clone_info->filename,primitive_info->text,
MagickPathExtent);
- status&=SetImageInfo(clone_info,0,exception);
+ status&=SetImageInfo(clone_info,1,exception);
if (clone_info->size != (char *) NULL)
clone_info->size=DestroyString(clone_info->size);
if (clone_info->extract != (char *) NULL)

35
debian/patches/CVE-2022-1114.patch vendored Normal file
View File

@ -0,0 +1,35 @@
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(-)
--- 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
RelinquishMagickMemory(info_copy);
}
- /*
- If we're entering a sequence, push the current image parameters onto
- the stack, so we can restore them at the end of the sequence.
- */
if (strcmp(explicit_vr,"SQ") == 0)
{
- DCMInfo *info_copy = (DCMInfo *) AcquireMagickMemory(sizeof(info));
- memcpy(info_copy,&info,sizeof(info));
- AppendValueToLinkedList(stack,info_copy);
+ /*
+ If we're entering a sequence, push the current image parameters
+ onto the stack, so we can restore them at the end of the sequence.
+ */
+ DCMInfo *clone_info = (DCMInfo *) AcquireMagickMemory(sizeof(info));
+ (void) memcpy(clone_info,&info,sizeof(info));
+ AppendValueToLinkedList(stack,clone_info);
sequence_depth++;
}

20
debian/patches/CVE-2022-28463.patch vendored Normal file
View File

@ -0,0 +1,20 @@
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
---
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
image->endian=(magick[0] == 0x80) && (magick[1] == 0x2a) &&
(magick[2] == 0x5f) && (magick[3] == 0xd7) ? MSBEndian : LSBEndian;
cin.file.image_offset=ReadBlobLong(image);
+ if (cin.file.image_offset < 712)
+ ThrowReaderException(CorruptImageError,"ImproperImageHeader");
offset+=4;
cin.file.generic_length=ReadBlobLong(image);
offset+=4;

97
debian/patches/CVE-2022-32545.patch vendored Normal file
View File

@ -0,0 +1,97 @@
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:
https://github.com/ImageMagick/ImageMagick/pull/4963
---
coders/emf.c | 3 ++-
coders/psd.c | 5 +++--
magick/widget.c | 6 ++++++
wand/animate.c | 5 ++++-
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
}
ReadFile(hFile,pBits,dwSize,&dwSize,NULL);
CloseHandle(hFile);
- if (((PAPMHEADER) pBits)->dwKey != 0x9ac6cdd7l)
+ if (((PAPMHEADER) pBits)->dwKey != 0x9ac6cdd7l ||
+ (((PAPMHEADER) pBits)->wInch == 0))
{
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
number_bits=8;
for (bit=0; bit < number_bits; bit++)
{
- SetPSDPixel(image,channels,type,packet_size,(((unsigned char) pixel)
- & (0x01 << (7-bit))) != 0 ? 0 : QuantumRange,q++,indexes,x++);
+ SetPSDPixel(image,channels,type,packet_size,
+ (((unsigned char) ((ssize_t) pixel)) & (0x01 << (7-bit))) != 0 ? 0 :
+ QuantumRange,q++,indexes,x++);
}
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
break;
}
state&=(~InactiveWidgetState);
+ if (selection_info.height == 0)
+ break;
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
if (event.xcrossing.state == 0)
break;
state&=(~InactiveWidgetState);
+ if (selection_info.height == 0)
+ break;
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
break;
if (state & InactiveWidgetState)
break;
+ if (selection_info.height == 0)
+ break;
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
if (i == (ssize_t) argc)
ThrowAnimateException(OptionError,"MissingArgument",option);
if (XRemoteCommand(display,resource_info.window_id,argv[i]) != 0)
- return(MagickFalse);
+ {
+ DestroyAnimate();
+ return(MagickFalse);
+ }
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
if (i == (ssize_t) argc)
ThrowDisplayException(OptionError,"MissingArgument",option);
if (XRemoteCommand(display,resource_info.window_id,argv[i]) != 0)
- return(MagickFalse);
+ {
+ DestroyDisplay();
+ return(MagickFalse);
+ }
i--;
break;
}

22
debian/patches/CVE-2022-32546.patch vendored Normal file
View File

@ -0,0 +1,22 @@
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
---
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
/*
Set PCL render geometry.
*/
- width=(size_t) floor(bounds.x2-bounds.x1+0.5);
- height=(size_t) floor(bounds.y2-bounds.y1+0.5);
+ width=(size_t) CastDoubleToLong(floor(bounds.x2-bounds.x1+0.5));
+ height=(size_t) CastDoubleToLong(floor(bounds.y2-bounds.y1+0.5));
if (width > page.width)
page.width=width;
if (height > page.height)

28
debian/patches/CVE-2022-32547.patch vendored Normal file
View File

@ -0,0 +1,28 @@
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
---
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
}
case EXIF_FMT_SINGLE:
{
- EXIFMultipleValues(4,"%f",(double) *(float *) p1);
+ EXIFMultipleValues(4,"%.20g",(double)
+ ReadPropertySignedLong(endian,p1));
break;
}
case EXIF_FMT_DOUBLE:
{
- EXIFMultipleValues(8,"%f",*(double *) p1);
+ EXIFMultipleValues(8,"%.20g",(double)
+ ReadPropertySignedLong(endian,p1));
break;
}
case EXIF_FMT_STRING:

63
debian/patches/move-profile-property-to-cli-option.patch vendored Normal file
View File

@ -0,0 +1,63 @@
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
--- 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
geometry=DestroyString(geometry);
break;
}
- if (LocaleCompare("profile",property) == 0)
- {
- ImageInfo
- *image_info;
-
- StringInfo
- *profile;
-
- image_info=AcquireImageInfo();
- (void) CopyMagickString(image_info->filename,value,MaxTextExtent);
- (void) SetImageInfo(image_info,1,exception);
- profile=FileToStringInfo(image_info->filename,~0UL,exception);
- if (profile != (StringInfo *) NULL)
- {
- status=SetImageProfile(image,image_info->magick,profile);
- profile=DestroyStringInfo(profile);
- }
- image_info=DestroyImageInfo(image_info);
- break;
- }
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
(void) SetImageArtifact(*image,argv[i+1]+7,value);
}
else
- (void) SetImageProperty(*image,argv[i+1],value);
+ if (LocaleCompare(argv[i+1],"profile") == 0)
+ {
+ StringInfo
+ *profile = (StringInfo *) NULL;
+
+ (void) CopyMagickString(image_info->filename,value,MaxTextExtent);
+ (void) SetImageInfo(image_info,1,exception);
+ if (LocaleCompare(image_info->filename,"-") != 0)
+ profile=FileToStringInfo(image_info->filename,~0UL,exception);
+ if (profile != (StringInfo *) NULL)
+ {
+ status=SetImageProfile(image,image_info->magick,profile);
+ profile=DestroyStringInfo(profile);
+ }
+ }
+ else
+ (void) SetImageProperty(*image,argv[i+1],value);
value=DestroyString(value);
break;
}

16
debian/patches/series vendored
View File

@ -22,3 +22,19 @@
0022-FIx-error-in-new-upstream-html.patch
0001-https-github.com-ImageMagick-ImageMagick6-issues-145.patch
0023-disable-ghostscript-formats.patch
move-profile-property-to-cli-option.patch
CVE-2021-20241.patch
CVE-2021-20243.patch
CVE-2021-20244.patch
CVE-2021-20245.patch
CVE-2021-20246.patch
CVE-2021-20309.patch
CVE-2021-20312_20313.patch
CVE-2021-3574.patch
CVE-2021-39212.patch
CVE-2021-4219.patch
CVE-2022-1114.patch
CVE-2022-28463.patch
CVE-2022-32545.patch
CVE-2022-32546.patch
CVE-2022-32547.patch