[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/09: gnu: imagemagick: Remove graft.
From: |
guix-commits |
Subject: |
01/09: gnu: imagemagick: Remove graft. |
Date: |
Sat, 27 Mar 2021 19:50:44 -0400 (EDT) |
mhw pushed a commit to branch master
in repository guix.
commit 7c2b840d6c586f80fe22a862ce4e362c997559a5
Author: Mark H Weaver <mhw@netris.org>
AuthorDate: Sat Mar 27 07:07:59 2021 -0400
gnu: imagemagick: Remove graft.
Note that this commit does *not* integrate the fixes that were previously
applied via the graft. This commit simply discards those fixes. We will
address those security flaws, without grafting, in subsequent commits.
* gnu/packages/imagemagick.scm (imagemagick)[replacement]: Remove field.
(imagemagick/fixed): Remove variable.
---
gnu/packages/imagemagick.scm | 40 ----------------------------------------
1 file changed, 40 deletions(-)
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index a3562f2..cc5f1de 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -51,7 +51,6 @@
;; 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.11-48")
- (replacement imagemagick/fixed)
(source (origin
(method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-"
@@ -128,45 +127,6 @@ transform images, adjust image colors, apply various
special effects, or draw
text, lines, polygons, ellipses and Bézier curves.")
(license (license:fsf-free
"http://www.imagemagick.org/script/license.php"))))
-(define-public imagemagick/fixed
- (package
- (inherit imagemagick)
- (name "imagemagick")
- ;; 'g' for 'guix', appended character to retain version length so grafting
- ;; works properly.
- (version "6.9.12-2g")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://imagemagick/ImageMagick-"
- ;; Hardcode the version here since we had to
- ;; change it above.
- "6.9.12-2.tar.xz"))
- (sha256
- (base32
- "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa"))))
- (arguments
- (substitute-keyword-arguments (package-arguments imagemagick)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-after 'install 'fix-compat-cheat-rename-so
- (lambda* (#:key outputs #:allow-other-keys)
- (with-directory-excursion
- (string-append (assoc-ref outputs "out")
- "/lib")
- (symlink "libMagick++-6.Q16.so.9.0.0"
- "libMagick++-6.Q16.so.8.0.0")
- (symlink "libMagick++-6.Q16.so.9"
- "libMagick++-6.Q16.so.8")
- (symlink "libMagickCore-6.Q16.so.7.0.0"
- "libMagickCore-6.Q16.so.6.0.0")
- (symlink "libMagickCore-6.Q16.so.7"
- "libMagickCore-6.Q16.so.6")
- (symlink "libMagickWand-6.Q16.so.7.0.0"
- "libMagickWand-6.Q16.so.6.0.0")
- (symlink "libMagickWand-6.Q16.so.7"
- "libMagickWand-6.Q16.so.6"))
- #t))))))))
-
(define-public perl-image-magick
(package
(name "perl-image-magick")
- branch master updated (3b0ead1 -> 2d3d7fa), guix-commits, 2021/03/27
- 01/09: gnu: imagemagick: Remove graft.,
guix-commits <=
- 02/09: gnu: imagemagick: Add 'imagemagick/stable' variant., guix-commits, 2021/03/27
- 05/09: gnu: Use 'gtk-doc/stable' in native-inputs of selected packages., guix-commits, 2021/03/27
- 07/09: gnu: imagemagick: Hide 'imagemagick/stable' variant., guix-commits, 2021/03/27
- 06/09: gnu: imagemagick: Update to 6.9.12-4., guix-commits, 2021/03/27
- 09/09: gnu: imagemagick: Add more upstream fixes., guix-commits, 2021/03/27
- 03/09: gnu: dblatex: Add 'dblatex/stable' variant., guix-commits, 2021/03/27
- 04/09: gnu: gtk-doc: Add 'gtk-doc/stable' variant., guix-commits, 2021/03/27
- 08/09: gnu: imagemagick: Fix CVE-2020-27829., guix-commits, 2021/03/27