From patchwork Mon Aug 19 05:18:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 67126 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 648B927BBEA; Mon, 19 Aug 2024 06:20:37 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 7C9BB27BBE2 for ; Mon, 19 Aug 2024 06:20:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sfuoY-0000Py-Op; Mon, 19 Aug 2024 01:20:22 -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 1sfuoX-0000Pq-99 for guix-patches@gnu.org; Mon, 19 Aug 2024 01:20:21 -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 1sfuoW-0003dc-W8 for guix-patches@gnu.org; Mon, 19 Aug 2024 01:20:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=/hNEAnRsXD5iC3C8/9VdBI0Y+9uWV6TmXTRmLQPN8z0=; b=Uo/9Z3J92F8vIAVop4vZ8fDUCNoYpQa/NH7VFa8la46IeFt9sCw9i0hB5DjfT4fm2rswF+rkhr3FkCAXAZ1rAU3Fm63/8zHBPQRKCCzdbv+lgVbKqlb15JAVilrJ9cHKaOan+A0LqquuUNTeos9RZ5lVZWuxMDy0h845v3dD+xVWAKJGJv2jBvmW8qp8PCshHSm6f22J3rj/qkOaRLPhdgQ9t0R6Ufs3xvatj/+Ll3wbZvY7+XlvS+T5P81BnavsCym4HTsD88+yzi2fSK0BHhXfrqGFR7Ak9LbiHc3nU6Vzl/W2wMVZN8QThBJPJ+Nj8ZdpZte5URkgQ/9Z2qPX1A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sfupC-0007he-5E for guix-patches@gnu.org; Mon, 19 Aug 2024 01:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71667] [PATCH v2] gnu: imagemagick: Update to 7.1.1-36. References: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@atai.org> In-Reply-To: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Aug 2024 05:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71667 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71667@debbugs.gnu.org Cc: Andy Tai Received: via spool by 71667-submit@debbugs.gnu.org id=B71667.172404482229547 (code B ref 71667); Mon, 19 Aug 2024 05:21:02 +0000 Received: (at 71667) by debbugs.gnu.org; 19 Aug 2024 05:20:22 +0000 Received: from localhost ([127.0.0.1]:57365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfuoX-0007gU-7s for submit@debbugs.gnu.org; Mon, 19 Aug 2024 01:20:21 -0400 Received: from mail-pf1-f179.google.com ([209.85.210.179]:42077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfuoU-0007gG-Cy for 71667@debbugs.gnu.org; Mon, 19 Aug 2024 01:20:19 -0400 Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-710dc3015bfso2602442b3a.0 for <71667@debbugs.gnu.org>; Sun, 18 Aug 2024 22:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724044711; x=1724649511; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=/hNEAnRsXD5iC3C8/9VdBI0Y+9uWV6TmXTRmLQPN8z0=; b=m2j5jIpTRju8h/Sj6mlqvVtnj1XH0C3W6MA5gSiiZZD0eaKNY/168+Kj0eQkI3S0x6 O6z//ghm643+uwusoiRf8McbBqeW40+DGzfItbgnDFkRsFKYZbfkEOrKSIb1UCDY/tA7 KyvOEnwjW6gi0ACWgDaV9I/aKlqNoDh2+HQfHGMJsMMtvuMvkJbDRi5Mtdi2aR+i356A yMrm9CaG8Jz8tCOCGIHbsRfbB9qOoJKBxPU21Ucins3yaPKib+HeMnmQXQVyM2M4eXA1 dTZUSXZku87dM1Aq9kiMQPlUdCPvfUPXndyKByKQhRkNKs1YOCdM7+ValvAeox+TTGXp PBRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724044711; x=1724649511; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/hNEAnRsXD5iC3C8/9VdBI0Y+9uWV6TmXTRmLQPN8z0=; b=N+udUVhq7ZwDiA9xPO38WYlz7lD4OCABKbCpqIQMXXGN0yS0B/GcBQcq5siFBPk8iX 2b2cOXnvebpT0HitgZ/BYbcukqm2pEpBzuW8bsf5ggW6ZTd9heUJrW+WQ43wbdH+lQR2 isKwPW5CCak8IZhGZ6ZXXcnBDiZ9KpDuaDYo9grTc+AxEzneoS8IpBTAqPOmA0RS/tBp y5/IJt74PpI4eoAxJDl4Y7iDyUJUK6tPIPUfg+Y/e82amRyFct3StGz2Vm39h5kn2Asy G4kgiuGRdZYmptOUVCeNTiSZFDIH0AFsRqWJhxDAqQ7i3kFs/LhZ5Brt+CDv7t79ZqLI CgUg== X-Gm-Message-State: AOJu0Yzc9qdrt8sj5qLqr04bC9BFFRORFETERZ4T4RO3OI9ongdpRa37 qO5ED5OvWMHOrv8NDwlOXukEFhlMkZhfajuNnB0aynIlGa/r3YmlAYPkdw== X-Google-Smtp-Source: AGHT+IEeV77oDWrRjEvxCmVSyHtpRWl13X6FDf/HZoIBJno81+Yautp1l5NLHeyrgw8Ptb122yWrOw== X-Received: by 2002:a05:6a00:9446:b0:710:d294:a2b with SMTP id d2e1a72fcca58-71276f56a39mr22502122b3a.8.1724044710986; Sun, 18 Aug 2024 22:18:30 -0700 (PDT) Received: from DEskMiniX300.. ([209.237.158.138]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7127aef68ecsm5922764b3a.116.2024.08.18.22.18.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2024 22:18:30 -0700 (PDT) From: Andy Tai Date: Sun, 18 Aug 2024 22:18:28 -0700 Message-Id: <25e9c864523beb6b8e70ae4d0b18d57611e59e25.1724044693.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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: , 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 7.1.1-36. * gnu/packages/patches/imagemagick-CVE-2020-27829.patch: Removed. * gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch: Removed. * gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch: Removed. * gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch: Removed. * gnu/local.mk (dist_patch_DATA): Update accordingly. Change-Id: Iabab606cc94f6db522f5ce3822f631bce93207d0 --- gnu/local.mk | 4 --- gnu/packages/imagemagick.scm | 9 ++--- .../patches/imagemagick-CVE-2020-27829.patch | 27 -------------- .../imagemagick-ReadDCMImage-fix.patch | 26 -------------- .../imagemagick-ReadDCMPixels-fix.patch | 35 ------------------- .../imagemagick-WriteTHUMBNAILImage-fix.patch | 25 ------------- 6 files changed, 2 insertions(+), 124 deletions(-) delete mode 100644 gnu/packages/patches/imagemagick-CVE-2020-27829.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 base-commit: 58a839273d1e4fac2b3a0ec456aabdf82deaa124 diff --git a/gnu/local.mk b/gnu/local.mk index 3b0a3858f7..9808930840 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1518,10 +1518,6 @@ dist_patch_DATA = \ %D%/packages/patches/idris-test-ffi008.patch \ %D%/packages/patches/igraph-fix-varargs-integer-size.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/inkscape-poppler-compat.patch \ %D%/packages/patches/instead-use-games-path.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index b407af3588..bb0615be80 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -149,19 +149,14 @@ (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 "7.1.1-36") (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")))))) + "03w763wapi3xysg17l1cgs7s44dqnczc765097n90nx78h0lqaya")))))) (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-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 -