Merge branch 'master' into core-updates

This commit is contained in:
Leo Famulari 2017-07-23 03:42:12 -04:00
commit 6c1a317e29
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
132 changed files with 5502 additions and 1723 deletions

View file

@ -56,6 +56,7 @@
(package
(name "expat")
(version "2.2.1")
(replacement expat-2.2.2)
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/expat/expat/"
@ -72,6 +73,18 @@ stream-oriented parser in which an application registers handlers for
things the parser might find in the XML document (like start tags).")
(license license:expat)))
(define expat-2.2.2 ; Fixes CVE-2017-9233, CVE-2016-9063 and other issues.
(package
(inherit expat)
(version "2.2.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/expat/expat/"
version "/expat-" version ".tar.bz2"))
(sha256
(base32
"0ik0r39ala9c6hj4kxrk933klgwkzlkbrfhvhaykx8l1rwgr2xj3"))))))
(define-public libebml
(package
(name "libebml")