From patchwork Thu Jul 20 18:37:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 51867 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4FD3927BBEA; Thu, 20 Jul 2023 19:38:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5ED9D27BBE2 for ; Thu, 20 Jul 2023 19:38:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qMYXO-00008s-II; Thu, 20 Jul 2023 14:38:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qMYXK-000069-E9 for guix-patches@gnu.org; Thu, 20 Jul 2023 14:38:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qMYXK-0000zR-6K for guix-patches@gnu.org; Thu, 20 Jul 2023 14:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qMYXK-0002Nb-1n for guix-patches@gnu.org; Thu, 20 Jul 2023 14:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64751] [PATCH core-updates 1/4] gnu: imagemagick: Update to 6.9.12-91 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jul 2023 18:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64751 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64751@debbugs.gnu.org Cc: Saku Laesvuori X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16898782739125 (code B ref -1); Thu, 20 Jul 2023 18:38:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jul 2023 18:37:53 +0000 Received: from localhost ([127.0.0.1]:59865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMYXA-0002N6-Qy for submit@debbugs.gnu.org; Thu, 20 Jul 2023 14:37:53 -0400 Received: from lists.gnu.org ([2001:470:142::17]:53832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMYX6-0002Mn-Jq for submit@debbugs.gnu.org; Thu, 20 Jul 2023 14:37:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qMYX1-0008Ms-5J for guix-patches@gnu.org; Thu, 20 Jul 2023 14:37:43 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101] helo=mail.laesvuori.fi) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qMYWy-0000x2-MZ for guix-patches@gnu.org; Thu, 20 Jul 2023 14:37:42 -0400 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 3F00F34012E; Thu, 20 Jul 2023 20:37:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1689878259; bh=WdqPPERs3IAPfU1TVHju3dnB/hEAR99Z/1q8QsH9WaE=; h=From:To:Cc:Subject:Date; b=eev4cTLmNzTjP4QnvolBWdYMMv/gvIJt9npBUcIP0dxUtgzXB4TrSjPGFAQsUuK++ DSFGtvaqHDJk3/qeBO3jj8SVw/IiihfZ2kv0+kClRzBUxuBrfEQzpcKZcnl42zg7k+ SGX1V7q73nwCc7hP9jOonrbeJQLjHrd4gQWyq58M= Date: Thu, 20 Jul 2023 21:37:15 +0300 Message-ID: <20230720183731.7296-1-saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=75.119.130.101; envelope-from=saku@laesvuori.fi; helo=mail.laesvuori.fi X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.12-91 [patches]: Remove upstreamed patches. Add patch for fixing tests. [arguments]: Enable tests. * gnu/packages/patches/imagemagick-Fix-tests.patch: New file. * gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch, gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch, gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch, gnu/packages/patches/imagemagick-CVE-2020-27829.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove old patches. Add patch for fixing imagemagick tests. --- The comments in the code imply that this could be applied to master but `guix refresh` claimed it to have over 3 000 dependents. Go figure. gnu/local.mk | 5 +-- gnu/packages/imagemagick.scm | 13 ++++--- .../patches/imagemagick-CVE-2020-27829.patch | 27 -------------- .../patches/imagemagick-Fix-tests.patch | 24 +++++++++++++ .../imagemagick-ReadDCMImage-fix.patch | 26 -------------- .../imagemagick-ReadDCMPixels-fix.patch | 35 ------------------- .../imagemagick-WriteTHUMBNAILImage-fix.patch | 25 ------------- 7 files changed, 31 insertions(+), 124 deletions(-) delete mode 100644 gnu/packages/patches/imagemagick-CVE-2020-27829.patch create mode 100644 gnu/packages/patches/imagemagick-Fix-tests.patch delete mode 100644 gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch delete mode 100644 gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch delete mode 100644 gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index f2ef72c10a..a6a6c32a06 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1385,10 +1385,7 @@ dist_patch_DATA = \ %D%/packages/patches/idris-test-ffi008.patch \ %D%/packages/patches/igt-gpu-tools-Use-libproc2.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ - %D%/packages/patches/imagemagick-CVE-2020-27829.patch \ - %D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \ - %D%/packages/patches/imagemagick-ReadDCMPixels-fix.patch \ - %D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \ + %D%/packages/patches/imagemagick-Fix-tests.patch \ %D%/packages/patches/inkscape-poppler-compat.patch \ %D%/packages/patches/instead-use-games-path.patch \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 6f6fa63c64..169dc12f35 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -149,19 +149,18 @@ (define-public imagemagick ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.12-4") + (version "6.9.12-91") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "1pkwij76yz7vd5grl6520pgpa912qb6kh34qamx4zfndwcx6cf6b")) - (patches - (search-patches "imagemagick-ReadDCMImage-fix.patch" - "imagemagick-ReadDCMPixels-fix.patch" - "imagemagick-WriteTHUMBNAILImage-fix.patch" - "imagemagick-CVE-2020-27829.patch")))))) + "0didbs10i9zb4dgripa851j7fivxb9jar7l3vvxz6i4kn6xvdv7r")) + (patches (search-patches "imagemagick-Fix-tests.patch")))) + (arguments + (append (package-arguments imagemagick/stable) + '(#:tests? #t))))) (define-public perl-image-magick (package diff --git a/gnu/packages/patches/imagemagick-CVE-2020-27829.patch b/gnu/packages/patches/imagemagick-CVE-2020-27829.patch deleted file mode 100644 index b15c1d0879..0000000000 --- a/gnu/packages/patches/imagemagick-CVE-2020-27829.patch +++ /dev/null @@ -1,27 +0,0 @@ -We omit the ChangeLog changes below, since they do not apply cleanly. - - -From 6ee5059cd3ac8d82714a1ab1321399b88539abf0 Mon Sep 17 00:00:00 2001 -From: Cristy -Date: Mon, 30 Nov 2020 16:26:59 +0000 -Subject: [PATCH] possible TIFF related-heap buffer overflow (alert & POC by - Hardik Shah) - ---- - ChangeLog | 6 ++++++ - coders/tiff.c | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/coders/tiff.c b/coders/tiff.c -index e98f927ab..1eecf17ae 100644 ---- a/coders/tiff.c -+++ b/coders/tiff.c -@@ -1975,7 +1975,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, - extent+=image->columns*sizeof(uint32); - #endif - strip_pixels=(unsigned char *) AcquireQuantumMemory(extent, -- sizeof(*strip_pixels)); -+ 2*sizeof(*strip_pixels)); - if (strip_pixels == (unsigned char *) NULL) - ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed"); - (void) memset(strip_pixels,0,extent*sizeof(*strip_pixels)); diff --git a/gnu/packages/patches/imagemagick-Fix-tests.patch b/gnu/packages/patches/imagemagick-Fix-tests.patch new file mode 100644 index 0000000000..cee105c61d --- /dev/null +++ b/gnu/packages/patches/imagemagick-Fix-tests.patch @@ -0,0 +1,24 @@ +From 696d8735e05688d0162b769f37b0d75205ab2a97 Mon Sep 17 00:00:00 2001 +From: Saku Laesvuori +Date: Thu, 20 Jul 2023 19:14:43 +0300 +Subject: [PATCH] Fix tests + +--- + Magick++/demo/demo.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Magick++/demo/demo.cpp b/Magick++/demo/demo.cpp +index 14721dbcd..12cc3b10c 100644 +--- a/Magick++/demo/demo.cpp ++++ b/Magick++/demo/demo.cpp +@@ -477,6 +477,7 @@ int main( int /*argc*/, char ** argv) + montageOpts.compose( OverCompositeOp ); + montageOpts.backgroundColor( "#ffffff" ); + montageOpts.pointSize( 18 ); ++ montageOpts.font(MAGICK_FONT); + montageOpts.fillColor( "#600" ); + montageOpts.strokeColor( Color() ); + montageOpts.compose(OverCompositeOp); +-- +2.41.0 + diff --git a/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch b/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch deleted file mode 100644 index 42ece43682..0000000000 --- a/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 512668dfd92b20d0d08b91d62b422d8262573281 Mon Sep 17 00:00:00 2001 -From: Dirk Lemstra -Date: Wed, 24 Mar 2021 20:37:15 +0100 -Subject: [PATCH] Throw exception when no exception was raised but status was - false (#3432). - ---- - coders/dcm.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/coders/dcm.c b/coders/dcm.c -index 7a68ed6e8..ed17c9567 100644 ---- a/coders/dcm.c -+++ b/coders/dcm.c -@@ -3989,6 +3989,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) - if (redmap != (int *) NULL) - redmap=(int *) RelinquishMagickMemory(redmap); - image=DestroyImageList(image); -+ if ((status == MagickFalse) && (exception->severity < ErrorException)) -+ ThrowReaderException(CorruptImageError,"CorruptImage"); - return(GetFirstImageInList(images)); - } - if (info.depth != (1UL*MAGICKCORE_QUANTUM_DEPTH)) --- -2.31.0 - diff --git a/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch b/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch deleted file mode 100644 index a91999186b..0000000000 --- a/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c8f25953ad1dd38a8b2d92738f0f742ad7e0bce7 Mon Sep 17 00:00:00 2001 -From: Cristy -Date: Sun, 21 Mar 2021 21:21:15 -0400 -Subject: [PATCH] https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=32322 - ---- - coders/dcm.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/coders/dcm.c b/coders/dcm.c -index 29eed9618..7a68ed6e8 100644 ---- a/coders/dcm.c -+++ b/coders/dcm.c -@@ -2984,12 +2984,12 @@ static MagickBooleanType ReadDCMPixels(Image *image,DCMInfo *info, - } - else - { -- SetPixelRed(q,(Quantum) (((ssize_t) pixel.red) | -- (((ssize_t) GetPixelRed(q)) << 8))); -- SetPixelGreen(q,(Quantum) (((ssize_t) pixel.green) | -- (((ssize_t) GetPixelGreen(q)) << 8))); -- SetPixelBlue(q,(Quantum) (((ssize_t) pixel.blue) | -- (((ssize_t) GetPixelBlue(q)) << 8))); -+ SetPixelRed(q,(Quantum) (((size_t) pixel.red) | -+ (((size_t) GetPixelRed(q)) << 8))); -+ SetPixelGreen(q,(Quantum) (((size_t) pixel.green) | -+ (((size_t) GetPixelGreen(q)) << 8))); -+ SetPixelBlue(q,(Quantum) (((size_t) pixel.blue) | -+ (((size_t) GetPixelBlue(q)) << 8))); - } - q++; - } --- -2.31.0 - diff --git a/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch b/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch deleted file mode 100644 index f38a45b800..0000000000 --- a/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a5d3575487487f2703383338bd17c8c25068f19 Mon Sep 17 00:00:00 2001 -From: Cristy -Date: Thu, 25 Mar 2021 08:58:18 -0400 -Subject: [PATCH] eliminate compiler warning - ---- - coders/thumbnail.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/coders/thumbnail.c b/coders/thumbnail.c -index 3833341b0..1e2bfe8c2 100644 ---- a/coders/thumbnail.c -+++ b/coders/thumbnail.c -@@ -199,7 +199,7 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info, - q++; - } - if ((q > (GetStringInfoDatum(profile)+GetStringInfoLength(profile))) || -- (length > (GetStringInfoDatum(profile)+GetStringInfoLength(profile)-q))) -+ ((ssize_t) length > (GetStringInfoDatum(profile)+GetStringInfoLength(profile)-q))) - ThrowWriterException(CoderError,"ImageDoesNotHaveAThumbnail"); - thumbnail_image=BlobToImage(image_info,q,length,&image->exception); - if (thumbnail_image == (Image *) NULL) --- -2.31.0 -