02/09: gnu: libxml2: Incorporate grafted patches.

[Leo Famulari]

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

commit e9f62e527e3fdf953ff4884ed1973eec6900c8ee
Author: Leo Famulari <address@hidden>
Date:   Wed Jan 25 12:45:24 2017 -0500

    gnu: libxml2: Incorporate grafted patches.
    
    * gnu/packages/xml.scm (libxml2)[replacement]: Remove field.
    [source]: Add patches 'libxml2-CVE-2016-4658.patch' and
    'libxml2-CVE-2016-5131.patch'.
    (python-libxml2)[replacement]: Remove field.
    (libxml2/fixed): Remove variable.
---
 gnu/packages/xml.scm |   15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 32b6584..d16821f 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2015 Raimon Grau <address@hidden>
 ;;; Copyright © 2016 Mathieu Lirzin <address@hidden>
-;;; Copyright © 2016 Leo Famulari <address@hidden>
+;;; Copyright © 2016, 2017 Leo Famulari <address@hidden>
 ;;; Copyright © 2016 Ben Woodcroft <address@hidden>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
 ;;; Copyright © 2016 ng0 <address@hidden>
@@ -74,12 +74,13 @@ things the parser might find in the XML document (like 
start tags).")
 (define-public libxml2
   (package
     (name "libxml2")
-    (replacement libxml2/fixed)
     (version "2.9.4")
     (source (origin
              (method url-fetch)
              (uri (string-append "ftp://xmlsoft.org/libxml2/libxml2-";
                                  version ".tar.gz"))
+             (patches (search-patches "libxml2-CVE-2016-4658.patch"
+                                      "libxml2-CVE-2016-5131.patch"))
              (sha256
               (base32
                "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz"))))
@@ -102,19 +103,9 @@ things the parser might find in the XML document (like 
start tags).")
 project (but it is usable outside of the Gnome platform).")
     (license license:x11)))
 
-(define libxml2/fixed
-  (package
-    (inherit libxml2)
-    (source
-      (origin
-        (inherit (package-source libxml2))
-        (patches (search-patches "libxml2-CVE-2016-4658.patch"
-                                 "libxml2-CVE-2016-5131.patch"))))))
-
 (define-public python-libxml2
   (package (inherit libxml2)
     (name "python-libxml2")
-    (replacement #f)
     (build-system python-build-system)
     (arguments
      `(;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'.