From e9f62e527e3fdf953ff4884ed1973eec6900c8ee Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 25 Jan 2017 12:45:24 -0500 Subject: 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(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 32b658489..d16821f22 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2015 Raimon Grau ;;; Copyright © 2016 Mathieu Lirzin -;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 ng0 @@ -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'. -- cgit v1.3 From 2663c38826cd6c2ef0c5119f8072fac8e89b2e9b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 25 Jan 2017 12:47:43 -0500 Subject: gnu: libxslt: Incorporate grafted patch. * gnu/packages/xml.scm (libxslt)[replacement]: Remove field. [source]: Add patch 'libxslt-CVE-2016-4738.patch'. (libxslt/fixed): Remove variable. --- gnu/packages/xml.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index d16821f22..b759b3342 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -135,12 +135,12 @@ project (but it is usable outside of the Gnome platform).") (define-public libxslt (package (name "libxslt") - (replacement libxslt/fixed) (version "1.1.29") (source (origin (method url-fetch) (uri (string-append "ftp://xmlsoft.org/libxslt/libxslt-" version ".tar.gz")) + (patches (search-patches "libxslt-CVE-2016-4738.patch")) (sha256 (base32 "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm")) @@ -157,14 +157,6 @@ project (but it is usable outside of the Gnome platform).") based on libxml for XML parsing, tree manipulation and XPath support.") (license license:x11))) -(define libxslt/fixed - (package - (inherit libxslt) - (name "libxslt") - (source (origin - (inherit (package-source libxslt)) - (patches (search-patches "libxslt-CVE-2016-4738.patch")))))) - (define-public perl-graph-readwrite (package (name "perl-graph-readwrite") -- cgit v1.3