03/07: gnu: libtiff: Ungraft.

[Mark H. Weaver]

mhw pushed a commit to branch core-updates
in repository guix.

commit 4e1435be0bcb44afd3bebc5334444ca32a30c0db
Author: Mark H Weaver <address@hidden>
Date:   Sat Mar 17 03:23:00 2018 -0400

    gnu: libtiff: Ungraft.
    
    * gnu/packages/image.scm (libtiff)[replacement]: Remove field.
    [source]: Add patches from former replacement.
    (libtiff/fixed): Remove variable.
---
 gnu/packages/image.scm | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index caafb2e..f817c24 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -392,7 +392,6 @@ extracting icontainer icon files.")
   (package
    (name "libtiff")
    (version "4.0.9")
-   (replacement libtiff/fixed)
    (source
      (origin
        (method url-fetch)
@@ -400,7 +399,9 @@ extracting icontainer icon files.")
                            version ".tar.gz"))
        (sha256
         (base32
-         "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf"))))
+         "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf"))
+       (patches (search-patches "libtiff-CVE-2017-9935.patch"
+                                "libtiff-CVE-2017-18013.patch"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"))                           ;1.3 MiB of HTML documentation
@@ -422,17 +423,6 @@ collection of tools for doing simple manipulations of TIFF 
images.")
                                   "See COPYRIGHT in the distribution."))
    (home-page "http://www.simplesystems.org/libtiff/";)))
 
-(define libtiff/fixed
-  (package
-    (inherit libtiff)
-    (source
-      (origin
-        (inherit (package-source libtiff))
-        (patches
-          (append (origin-patches (package-source libtiff))
-                  (search-patches "libtiff-CVE-2017-9935.patch"
-                                  "libtiff-CVE-2017-18013.patch")))))))
-
 (define-public leptonica
   (package
     (name "leptonica")