From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 0OfOD4G5c2YQdAAAqHPOHw:P1 (envelope-from ) for ; Thu, 20 Jun 2024 05:09:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 0OfOD4G5c2YQdAAAqHPOHw (envelope-from ) for ; Thu, 20 Jun 2024 07:09:21 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=MxqlVKRA; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1718860161; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=CXx+A7Oq/cw5wIWMCmpTnPyFVT+BeapO2jzLvPpi+es=; b=NyDCwC28uK45YkhQLs7GD/eGA1pYTFSs18116XZLAproSzaoKHt48n+tnxvEKRXfWoEdUY 7vVsCUyt0giVTrAT20V3hNOIbU9uoEL4zL2DWYyHjfBw3WnA0vKhLENF3z2cZt65bIh7Sc 0//mZiJ/2pMJALj15e27ZGUH0vfpAlg0ACQ5bTPNCjQ7x1TYqMNfy7G5g/qZRp/ZIFqIO/ 073ASt9DC7P4cReumq3pm73fiJP8DcVY+Ef4Yp7E1NBJeDuO+8nqjxSL91plHlHXnS9BNc k6p0S8dGW92iMdnVMEaIqrIf06Q53lR0PpxkjtMOF548jymefgvSZFJtwLzCqQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=MxqlVKRA; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718860161; a=rsa-sha256; cv=none; b=rPSyOmswCiT8u3se1XxESSnNZ7k2RZdpuA84qQf58Wu85lddhyHVxMatiOB/C9RsIgaXvT iBiAK3jJviAwdbc+h5BMAxmvyzg5gSVlM889q1W26BK7RA7FpabiG856HjG/ad8rjTC3h9 kPyu+cG1wLkMkJQfOx6YC+mEITnnx2rSv3GO9B4OX4B7CelhKQixcxfksQJtGrhYYUVCCI ZMumGnqAo3V353MCqhI0xlwhupJodmUKL/OlxUDk6UpU4A29xc974ofMj96Vg0KL9klhKl 1J5WenDsfifsZmJmgva6aQYAp302b1T8Qrn/g9X1zFjGe2MQDRMuh9ncgBEnDQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6E5B5547AD for ; Thu, 20 Jun 2024 07:09:19 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKA2i-0006CB-Hc; Thu, 20 Jun 2024 01:09:04 -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 1sKA2d-0006BZ-4h for guix-patches@gnu.org; Thu, 20 Jun 2024 01:08:59 -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 1sKA2c-0003wd-St for guix-patches@gnu.org; Thu, 20 Jun 2024 01:08:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sKA2g-0000uJ-4K for guix-patches@gnu.org; Thu, 20 Jun 2024 01:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71667] [PATCH] gnu: imagemagick: Update to 7.1.1-33. Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jun 2024 05:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71667 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71667@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17188601003420 (code B ref -1); Thu, 20 Jun 2024 05:09:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jun 2024 05:08:20 +0000 Received: from localhost ([127.0.0.1]:43643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKA1z-0000t5-5K for submit@debbugs.gnu.org; Thu, 20 Jun 2024 01:08:19 -0400 Received: from lists.gnu.org ([209.51.188.17]:38346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKA1w-0000sw-Vh for submit@debbugs.gnu.org; Thu, 20 Jun 2024 01:08:18 -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 1sKA1t-00068A-0g for guix-patches@gnu.org; Thu, 20 Jun 2024 01:08:13 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sKA1p-0003tp-2q for guix-patches@gnu.org; Thu, 20 Jun 2024 01:08:12 -0400 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-6e41550ae5bso363484a12.3 for ; Wed, 19 Jun 2024 22:08:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718860086; x=1719464886; darn=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=CXx+A7Oq/cw5wIWMCmpTnPyFVT+BeapO2jzLvPpi+es=; b=MxqlVKRAJ3BEhtfpqzBioA3eoXfn5y2ltcYR16gTkfsW7smNFrkms7CNKP3nKKOL2N sDCvfoWwNk2N/vVGEHwxpXaJGyYzeWUfFf3zsJuLMiiMgoGRufs63VraSmR4LmQjdJG4 NRbgTmH28J9yOpiadqLq9FZenTYFFR1/oI/ZrK0prhDMPaFUo2t4gnM/YAqwzBGKAKul GKVUMn7ig1Li+hyyRUedLMJS2jwp5SlL834w6caPSpw8QzrMHS1nLrKBUScDG+HDovqQ jBzEiV/bDFFo1nIYpGFaw64cXVx5+dmQYB+KleZSCrFc4VuK1NFa14XPue8+FDWL5NaK 2avg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718860086; x=1719464886; 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=CXx+A7Oq/cw5wIWMCmpTnPyFVT+BeapO2jzLvPpi+es=; b=SrpGYGlwszoiw/2No8V1yXR8qxEm/B0Q0Gy41Wx+ycfW8+7HEV13GwQhMGzTWFQ42J xZf/bH3H78HIxqZhkUv06QPXGmCrf4kmnG+f5fVZt/9aUhnj0IapWrB3/Ulzcmn5ojKk +05EzpNJMqi7zCBEEsDX+Y9qPjcNdMXPDZNVq1I+JRBgKdtujYn4WwlJjhw8+KYCzyGv KVrTuzwBgXDLP7SauRlVfEjp90XHnPueB4OBIwqVxXhako9qsAkLhU6VqKnrcqW3634c O9jMcOGpclV3wohZIlHF9fRwexpv9pCcTO9oFcunn93lfCWN5h5uL8pzKN6EVmfSwDql DnPQ== X-Gm-Message-State: AOJu0YyeQsDOKUmafQ9P9plpoSOutIecdYqasT5e30X+dLCQTcPkxyjm zPwYIxlBFGJSTL6YUV1bmfeoMzDQ+/3JUDHYhKjoWPi6FqBQUk4JZpNIAA== X-Google-Smtp-Source: AGHT+IHeYI0cw6an/jMp9SII+3a7e9vmOaisnq1SuEWCS0YoNJ+wNTj83JHqG7E6AjY1ClzE65WA9A== X-Received: by 2002:a05:6a20:2e9e:b0:1b6:dc83:8717 with SMTP id adf61e73a8af0-1bcbb6e198dmr3728544637.54.1718860085539; Wed, 19 Jun 2024 22:08:05 -0700 (PDT) Received: from DEskMiniX300.. (c-98-37-226-154.hsd1.ca.comcast.net. [98.37.226.154]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855f150c8sm126953875ad.217.2024.06.19.22.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 22:08:05 -0700 (PDT) From: Andy Tai Date: Wed, 19 Jun 2024 22:08:00 -0700 Message-Id: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=lichengtai@gmail.com; helo=mail-pg1-x52a.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 6E5B5547AD X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -4.06 X-Spam-Score: -4.06 X-TUID: lhf9Ude4FIax * gnu/packages/imagemagick.scm (imagemagick): Update to 7.1.1-33. * 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 diff --git a/gnu/local.mk b/gnu/local.mk index cdf203777f..3d93cb13a5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1504,10 +1504,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..4792b6d644 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-33") (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")))))) + "18fy1ld4fvz1x3bhhfqld4c6qdlm1fqnigpvalpdy61dq3zfy8f0")))))) (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 - base-commit: 9a09ab433f6f5dfb3ce85266d8fb2286f79b5080 -- 2.34.1