amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'core-updates'

Browse source
This commit is contained in:
Ludovic Courtès 2016-11-13 00:34:16 +01:00
commit 2cab1dd58b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
158 changed files with 4800 additions and 5085 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/xml.scm
View file

@ -52,18 +52,16 @@
(define-public expat
(package
(name "expat")
(replacement expat/fixed)
(version "2.1.1")
(version "2.2.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/expat/expat/"
version "/expat-" version ".tar.bz2"))
(patches (search-patches "expat-CVE-2012-6702-and-CVE-2016-5300.patch"
"expat-CVE-2015-1283-refix.patch"
"expat-CVE-2016-0718.patch"))
(patches
(search-patches "expat-CVE-2016-0718-fix-regression.patch"))
(sha256
(base32
"0ryyjgvy7jq0qb7a9mhc1giy3bzn56aiwrs8dpydqngplbjq9xdg"))))
"1zq4lnwjlw8s9mmachwfvfjf2x3lk24jm41746ykhdcvs7r0zrfr"))))
(build-system gnu-build-system)
(home-page "http://www.libexpat.org/")
(synopsis "Stream-oriented XML parser library written in C")
@ -73,17 +71,6 @@ 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/fixed
(package
(inherit expat)
(source (origin
(inherit (package-source expat))
(patches (search-patches
"expat-CVE-2012-6702-and-CVE-2016-5300.patch"
"expat-CVE-2015-1283-refix.patch"
"expat-CVE-2016-0718.patch"
"expat-CVE-2016-0718-fix-regression.patch"))))))
(define-public libxml2
(package
(name "libxml2")