GNU logs - #71667, boring messages

Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#71667] [PATCH] gnu: imagemagick: Update to 7.1.1-33.
Resent-From: Andy Tai <atai@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 20 Jun 2024 05:09:01 +0000
Resent-Message-ID: <handler.71667.B.17188601003420 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 71667
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 71667 <at> debbugs.gnu.org
Cc: Andy Tai <atai@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sKA1z-0000t5-5K
	for submit <at> 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 <lichengtai@HIDDEN>) id 1sKA1w-0000sw-Vh
 for submit <at> 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 <lichengtai@HIDDEN>)
 id 1sKA1t-00068A-0g
 for guix-patches@HIDDEN; 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 <lichengtai@HIDDEN>)
 id 1sKA1p-0003tp-2q
 for guix-patches@HIDDEN; Thu, 20 Jun 2024 01:08:12 -0400
Received: by mail-pg1-x52a.google.com with SMTP id
 41be03b00d2f7-6e41550ae5bso363484a12.3
 for <guix-patches@HIDDEN>; 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 <atai@HIDDEN>
Date: Wed, 19 Jun 2024 22:08:00 -0700
Message-Id: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@HIDDEN>
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@HIDDEN; 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-Spam-Score: -1.1 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.1 (--)

* 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 <urban-warrior@HIDDEN>
-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 <dirk@HIDDEN>
-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 <mikayla-grace@HIDDEN>
-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 <mikayla-grace@HIDDEN>
-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

Message sent:


Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Andy Tai <atai@HIDDEN>
Subject: bug#71667: Acknowledgement ([PATCH] gnu: imagemagick: Update to
 7.1.1-33.)
Message-ID: <handler.71667.B.17188601003420.ack <at> debbugs.gnu.org>
References: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@HIDDEN>
X-Gnu-PR-Message: ack 71667
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 71667 <at> debbugs.gnu.org
Date: Thu, 20 Jun 2024 05:09:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 71667 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
71667: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D71667
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#71667] [PATCH v2] gnu: imagemagick: Update to 7.1.1-36.
References: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@HIDDEN>
In-Reply-To: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@HIDDEN>
Resent-From: Andy Tai <atai@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 19 Aug 2024 05:21:02 +0000
Resent-Message-ID: <handler.71667.B71667.172404482229547 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71667
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 71667 <at> debbugs.gnu.org
Cc: Andy Tai <atai@HIDDEN>
Received: via spool by 71667-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sfuoX-0007gU-7s
	for submit <at> 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 <lichengtai@HIDDEN>) id 1sfuoU-0007gG-Cy
 for 71667 <at> 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 <at> 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 <atai@HIDDEN>
Date: Sun, 18 Aug 2024 22:18:28 -0700
Message-Id: <25e9c864523beb6b8e70ae4d0b18d57611e59e25.1724044693.git.atai@HIDDEN>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* 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

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 <urban-warrior@HIDDEN>
-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 <dirk@HIDDEN>
-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 <mikayla-grace@HIDDEN>
-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 <mikayla-grace@HIDDEN>
-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: 58a839273d1e4fac2b3a0ec456aabdf82deaa124
-- 
2.34.1

Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#71667] [PATCH v3] gnu: imagemagick: Update to 7.1.1-36.
References: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@HIDDEN>
In-Reply-To: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@HIDDEN>
Resent-From: Andy Tai <atai@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 03 Sep 2024 02:06:02 +0000
Resent-Message-ID: <handler.71667.B71667.172532911830533 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71667
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 71667 <at> debbugs.gnu.org
Cc: Andy Tai <atai@HIDDEN>
Received: via spool by 71667-submit <at> debbugs.gnu.org id=B71667.172532911830533
          (code B ref 71667); Tue, 03 Sep 2024 02:06:02 +0000
Received: (at 71667) by debbugs.gnu.org; 3 Sep 2024 02:05:18 +0000
Received: from localhost ([127.0.0.1]:55862 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slIv0-0007wP-7G
	for submit <at> debbugs.gnu.org; Mon, 02 Sep 2024 22:05:18 -0400
Received: from mail-pf1-f177.google.com ([209.85.210.177]:49160)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <lichengtai@HIDDEN>) id 1slIux-0007w7-KG
 for 71667 <at> debbugs.gnu.org; Mon, 02 Sep 2024 22:05:16 -0400
Received: by mail-pf1-f177.google.com with SMTP id
 d2e1a72fcca58-714302e7285so4389972b3a.2
 for <71667 <at> debbugs.gnu.org>; Mon, 02 Sep 2024 19:04:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1725328987; x=1725933787; 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=4jdstqi3HliB7sRATDn+Po11YXYqOeN8X489+7VKPPo=;
 b=BPPIwgmmhC8noyylvQgy13Jime1xZ6ofU3ZQupPJhf+Z+79P7R4Jhf1qOpLipRYGVM
 rP87ScM9WPOyWnn57HigHVZMneKv9flP2s9dz32z2GevszRQ83a1YzePTt9of4WuWoap
 X9/XooIO9cfFMIX2ncLmqTe/Qrr2luWUr4Up1jvEpkRRW5v8y93nQ0CruBgh2t7NZaQr
 mQmlA7TvC8BXuSuF2Oi4EMP+vHrj6DPI7JEQqV/rJPSbGZsjdOSu8QdSXYwO0T+ZSgqN
 rAn+06vyBJTfN6eTThxpVXRAUlraUAirgLSTXS092ETojX0xmzzZzFCtzJB0l4x2ES8J
 93jg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1725328987; x=1725933787;
 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=4jdstqi3HliB7sRATDn+Po11YXYqOeN8X489+7VKPPo=;
 b=dMlQ7c/aUsFPPgTd1wbH7vrm5CHGGj1N6lyrs6GbU7h+VccnQ5l+yNwbur9yq01Dgd
 +RQRt9o9xZFbwIyl5g2BeYrX5CSSsEMcFFnRo0vISZdm7vzJ/AQfiouD2vXt70UqaTS8
 afC75g+PLysn1NEqC1ETIeXj4oxxNDsaQC2jHmQ6Vatt3du2TG4+EkDqbyBCEAI14BW/
 XQ+sG9VTHWby2RRuh3/kq42ASAUdkdAQ7OplHUfZsrjVYh89637DLQ1kof4k0ATsBOk4
 B1SJpjZjc25v4Vf7ShVv28JnlGmUsTQu39WkRxWVibCkpkrdU9LieX9iGeB1A+IYuJuT
 83xQ==
X-Gm-Message-State: AOJu0YwgTyFe26Xi8rVGEdhRmzjgR/VrTfTOarPxoCkujfiqTUbs/Rv1
 KVss6AT3Q5U9wlN/FyLc/PkfEQ7HuN2W+eRTT7vY5RRn+9c+Cr55gvIbJw==
X-Google-Smtp-Source: AGHT+IH5ae+baOYEp0HLSa7W9zbQ+y+DmW9FVdCC7Db2PVcbalR8AGIcHm8zLi+BOGwE0sja9qi2iQ==
X-Received: by 2002:a05:6a00:10d5:b0:710:bd4b:8b96 with SMTP id
 d2e1a72fcca58-715dfcf24dcmr18910703b3a.28.1725328987265; 
 Mon, 02 Sep 2024 19:03:07 -0700 (PDT)
Received: from DEskMiniX300.. ([38.84.157.61])
 by smtp.gmail.com with ESMTPSA id
 d2e1a72fcca58-715e5576c90sm7478409b3a.2.2024.09.02.19.03.06
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 02 Sep 2024 19:03:06 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
Date: Mon,  2 Sep 2024 19:03:03 -0700
Message-Id: <24547c956447ed1c0c1e451eac5a88fb2cad5c45.1725328969.git.atai@HIDDEN>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/imagemagick.scm (imagemagick): Update to 7.1.1-36.

Change-Id: Iabab606cc94f6db522f5ce3822f631bce93207d0
---
 gnu/packages/imagemagick.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index e7734125ad..207e17381e 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -143,14 +143,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.13-5")
+    (version "7.1.1-36")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://imagemagick/ImageMagick-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1j1chkw33vjc37509vdwss28qywfvckvs73pvscldj8d0wnwypa8"))))
+                "03w763wapi3xysg17l1cgs7s44dqnczc765097n90nx78h0lqaya"))))
     (arguments
      (substitute-keyword-arguments (package-arguments imagemagick/stable)
        ((#:configure-flags flags #~'())

base-commit: 61a7930cb03f5eb9e8003bade21d61262c3db8df
prerequisite-patch-id: c46cc240fed9cfc3513d85220162ee0191169a2a
-- 
2.34.1

Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#71667] [PATCH v4] gnu: imagemagick: Update to 7.1.1-38.
References: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@HIDDEN>
In-Reply-To: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@HIDDEN>
Resent-From: Andy Tai <atai@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 03 Sep 2024 02:09:02 +0000
Resent-Message-ID: <handler.71667.B71667.172532932230931 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71667
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 71667 <at> debbugs.gnu.org
Cc: Andy Tai <atai@HIDDEN>
Received: via spool by 71667-submit <at> debbugs.gnu.org id=B71667.172532932230931
          (code B ref 71667); Tue, 03 Sep 2024 02:09:02 +0000
Received: (at 71667) by debbugs.gnu.org; 3 Sep 2024 02:08:42 +0000
Received: from localhost ([127.0.0.1]:55903 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slIyH-00082p-Rd
	for submit <at> debbugs.gnu.org; Mon, 02 Sep 2024 22:08:42 -0400
Received: from mail-pf1-f178.google.com ([209.85.210.178]:60478)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <lichengtai@HIDDEN>) id 1slIyF-00082U-Uj
 for 71667 <at> debbugs.gnu.org; Mon, 02 Sep 2024 22:08:40 -0400
Received: by mail-pf1-f178.google.com with SMTP id
 d2e1a72fcca58-7176212de5cso790678b3a.0
 for <71667 <at> debbugs.gnu.org>; Mon, 02 Sep 2024 19:07:38 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1725329192; x=1725933992; 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=B8q3dinTXaFOcIttVmmVeb81/GsKerA8hMlCd4Wr304=;
 b=RRLiQUl2q84Sdnp16LDJwL0otqOAyKJ+n2FhEGBOIMhXDDzI1BW2fWgiqr+LU88K8x
 B22SWSILe26QnHE2uFX0imvZ2G8gcbYtbDnFuLSU+zxnCrdvwo8f81KmnbK1u24gcsvc
 yATZ2EJ0O5UQIKv4GLmQUmFl0rxM5/x+qGBazyM59ybO7gIQG/PIBPUCiIEjODj2vQWZ
 MCi8lliNKOPXN5HvIYngWb3Tc1/hgTNUtaaU5MPYoei1VPNn0ZXr/+6jZM2CFmsbSOgI
 cFrT2DTa7DnXaxaNO41p1ZdL+7X6gTw53n9S3xC7v++0+7uckatLfls0bv3crpCHnR+j
 8lpA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1725329192; x=1725933992;
 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=B8q3dinTXaFOcIttVmmVeb81/GsKerA8hMlCd4Wr304=;
 b=J81KUgliG36JyJNfbIEvl8uTU1rqtxgYyxhuQA4xSY1C9pTakB7vLOfw+Lj7bjyJ7D
 jxa3Fbdlgc/l4aQ0ybKsxh9hCK3ZvTZ7j6qhc68Ae2LveuJgm9bFdRI3s7Wv9Vt7fhGe
 H8qyWUfLJdp+1NyIMoOSs90kNEUb/nTO74EhdeG/rwp6fmKCqjgoM7zHk+V1YF6mtuWz
 0GNqQBL6SHVnV4x0PYpcDvDXsyvmaKDEJ39LZgFm8eMMP+uAYlgSAVJKSWLkaLrTVCOF
 JV6aKxr831oBLNWbjNmVLFWRE1LI23u+uhmsYo3jUS5/iS9d+jj4FKHyjzsZZQ+xunwY
 niwQ==
X-Gm-Message-State: AOJu0YysRTWJE8ygxyQ9bVUvM4tF7usy3ouBhxE7cLezPKwTd5t3L/w9
 B+AG63RvZHZWsCG95lKSR+Jmu2HDqJO/R70HOfJEFlVAbX6X407ziQUX9g==
X-Google-Smtp-Source: AGHT+IG5M2MZdh0vpleBp4EKV13yCluFEVOBOdP22oP6xxyUpazS/1m48OiU5RlYlHTBEcZ3QrWWoQ==
X-Received: by 2002:a05:6a00:22ca:b0:70d:2e7e:1853 with SMTP id
 d2e1a72fcca58-7173c5923ddmr10543991b3a.19.1725329192247; 
 Mon, 02 Sep 2024 19:06:32 -0700 (PDT)
Received: from DEskMiniX300.. ([38.84.157.61])
 by smtp.gmail.com with ESMTPSA id
 d2e1a72fcca58-715e5576c30sm7482622b3a.28.2024.09.02.19.06.31
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 02 Sep 2024 19:06:31 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
Date: Mon,  2 Sep 2024 19:06:28 -0700
Message-Id: <3695e4e965d50307bf1027b922e429b912e8a905.1725329062.git.atai@HIDDEN>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/imagemagick.scm (imagemagick): Update to 7.1.1-38.

Change-Id: Iabab606cc94f6db522f5ce3822f631bce93207d0
---
 gnu/packages/imagemagick.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index e7734125ad..8ca24fe905 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -143,14 +143,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.13-5")
+    (version "7.1.1-38")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://imagemagick/ImageMagick-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1j1chkw33vjc37509vdwss28qywfvckvs73pvscldj8d0wnwypa8"))))
+                "10mdqhxk6sfazm4jn56wv13in06qdafkp81ck1n25z3p966m9pj8"))))
     (arguments
      (substitute-keyword-arguments (package-arguments imagemagick/stable)
        ((#:configure-flags flags #~'())

base-commit: 61a7930cb03f5eb9e8003bade21d61262c3db8df
prerequisite-patch-id: c46cc240fed9cfc3513d85220162ee0191169a2a
-- 
2.34.1

Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#71667] Change of major version
References: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@HIDDEN>
In-Reply-To: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@HIDDEN>
Resent-From: Andreas Enge <andreas@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 11 Sep 2024 08:47:02 +0000
Resent-Message-ID: <handler.71667.B71667.172604438217969 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71667
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 71667 <at> debbugs.gnu.org
Received: via spool by 71667-submit <at> debbugs.gnu.org id=B71667.172604438217969
          (code B ref 71667); Wed, 11 Sep 2024 08:47:02 +0000
Received: (at 71667) by debbugs.gnu.org; 11 Sep 2024 08:46:22 +0000
Received: from localhost ([127.0.0.1]:37767 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1soIzV-0004fi-QL
	for submit <at> debbugs.gnu.org; Wed, 11 Sep 2024 04:46:22 -0400
Received: from hera.aquilenet.fr ([185.233.100.1]:40896)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <andreas@HIDDEN>) id 1soIzU-0004fV-3T
 for 71667 <at> debbugs.gnu.org; Wed, 11 Sep 2024 04:46:20 -0400
Received: from localhost (localhost [127.0.0.1])
 by hera.aquilenet.fr (Postfix) with ESMTP id A713B885;
 Wed, 11 Sep 2024 10:46:07 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr
Received: from hera.aquilenet.fr ([127.0.0.1])
 by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id FQhBDA1Ejhtr; Wed, 11 Sep 2024 10:46:04 +0200 (CEST)
Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64])
 by hera.aquilenet.fr (Postfix) with ESMTPSA id AD46F32A;
 Wed, 11 Sep 2024 10:46:03 +0200 (CEST)
Date: Wed, 11 Sep 2024 10:46:01 +0200
From: Andreas Enge <andreas@HIDDEN>
Message-ID: <ZuFYyV6pE0rGy1Rd@jurong>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello Andy,

your version update from 6 to 7 comes immediately after these comments:
    ;; 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.

Since there is also a variable imagemagick/stable, it might be possible to
advance the publicly visible version, but this would require further
discussion.

Maybe switching to 6.9.13-16 would be the safest option for the moment.

Andreas

Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#71667] Change of major version
Resent-From: Richard Sent <richard@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 21 Nov 2024 02:21:01 +0000
Resent-Message-ID: <handler.71667.B71667.173215561322264 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71667
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Andreas Enge <andreas@HIDDEN>
Cc: 71667 <at> debbugs.gnu.org, atai@HIDDEN
Received: via spool by 71667-submit <at> debbugs.gnu.org id=B71667.173215561322264
          (code B ref 71667); Thu, 21 Nov 2024 02:21:01 +0000
Received: (at 71667) by debbugs.gnu.org; 21 Nov 2024 02:20:13 +0000
Received: from localhost ([127.0.0.1]:48527 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tDwnl-0005mn-I6
	for submit <at> debbugs.gnu.org; Wed, 20 Nov 2024 21:20:13 -0500
Received: from mail-108-mta224.mxroute.com ([136.175.108.224]:34073)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <richard@HIDDEN>) id 1tDwnj-0005kl-DK
 for 71667 <at> debbugs.gnu.org; Wed, 20 Nov 2024 21:20:12 -0500
Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com)
 (Authenticated sender: mN4UYu2MZsgR)
 by mail-108-mta224.mxroute.com (ZoneMTA) with ESMTPSA id
 1934c85054c0003e01.002 for <71667 <at> debbugs.gnu.org>
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Thu, 21 Nov 2024 02:20:06 +0000
X-Zone-Loop: d10c75f53fc1760b053a9138c8e1777c1a452185b687
X-Originating-IP: [136.175.111.3]
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=freakingpenguin.com; s=x; h=Content-Type:MIME-Version:Message-ID:Date:
 References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:
 Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:
 Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:
 List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive;
 bh=p2pONCwBqX3Cpto5YuKLpgVv93ZzJYJRcDXi/+AvNtg=; b=BdlF5qCCyj9a3N0gzVT8G1dgu8
 bidBmiV5zWuw3Im5FnhYcW+VmW9xt8TG6tcw7NKbfjZJ6FlKLB1i8eFmHhgM1TfUNbqbwqerseDqr
 +xZSWIKwGYd/O5BV9A51i/LuNzaRmUjRbUmRxbVW/T34dpq4rRqfFieaHFZos+gbmWS7iXx/gJx68
 8Uoajo6KJUqTBYwxRrkLB7RFLzyn6WOv9hLOWFr3ulAeA4uHXY9SJzNAAIsKkLvyCgb2wUY6llZhP
 KRl6sA1phx30bsqX6uaZ4E7JJVtCDht6Y/3zLTlnfMj+g9BIfUivo22wfSo/GtLJ1I+3+5PtlIiZo
 sDEPOhEw==;
From: Richard Sent <richard@HIDDEN>
In-Reply-To: <ZuFYyV6pE0rGy1Rd@jurong> (Andreas Enge's message of "Wed, 11 Sep
 2024 10:46:01 +0200")
References: <33d29d243eb4cd848726790b86d14a51937cdaa4.1718860028.git.atai@HIDDEN>
 <ZuFYyV6pE0rGy1Rd@jurong>
Date: Wed, 20 Nov 2024 21:19:55 -0500
Message-ID: <87ttc1ib04.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Authenticated-Id: richard@HIDDEN
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

I've had instances where version 7 would be useful. Perhaps v7 can be
added as imagemagick-next so it is available while the 6->7 transition
is worked out.

-- 
Take it easy,
Richard Sent
Making my computer weirder one commit at a time.
Last modified: Sun, 12 Jan 2025 05:45:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.