ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libxml2: Incorporate grafted patches.

Browse source 
* 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.
This commit is contained in:
Leo Famulari 2017-01-25 12:45:24 -05:00
parent d123f2f991
commit e9f62e527e
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/xml.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015 Raimon Grau <raimonster@gmail.com> ;;; Copyright © 2015 Raimon Grau <raimonster@gmail.com>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
@ -74,12 +74,13 @@ (define-public expat
(define-public libxml2 (define-public libxml2
(package (package
(name "libxml2") (name "libxml2")
(replacement libxml2/fixed)
(version "2.9.4") (version "2.9.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://xmlsoft.org/libxml2/libxml2-" (uri (string-append "ftp://xmlsoft.org/libxml2/libxml2-"
version ".tar.gz")) version ".tar.gz"))
(patches (search-patches "libxml2-CVE-2016-4658.patch"
"libxml2-CVE-2016-5131.patch"))
(sha256 (sha256
(base32 (base32
"0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz")))) "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz"))))
@ -102,19 +103,9 @@ (define-public libxml2
project (but it is usable outside of the Gnome platform).") project (but it is usable outside of the Gnome platform).")
(license license:x11))) (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 (define-public python-libxml2
(package (inherit libxml2) (package (inherit libxml2)
(name "python-libxml2") (name "python-libxml2")
(replacement #f)
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'. `(;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'.