[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Revert "gnu: expat: Remove replacement."
From: |
Leo Famulari |
Subject: |
01/02: Revert "gnu: expat: Remove replacement." |
Date: |
Mon, 13 Jun 2016 16:16:14 +0000 (UTC) |
lfam pushed a commit to branch core-updates-next
in repository guix.
commit 5f39448378dad95e3a46b82e90e5ac52ff4ab323
Author: Leo Famulari <address@hidden>
Date: Mon Jun 13 12:15:27 2016 -0400
Revert "gnu: expat: Remove replacement."
This reverts commit b0bbf2491e346a355c1ec5584c16de7fbfa14f5e.
This change has already been made on another branch.
---
gnu/packages/xml.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index e7b0599..5ae14d5 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -45,6 +45,7 @@
(define-public expat
(package
(name "expat")
+ (replacement expat/fixed)
(version "2.1.0")
(source (origin
(method url-fetch)
@@ -53,9 +54,7 @@
(sha256
(base32
"11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2"))
- (patches (search-patches "expat-CVE-2015-1283.patch"
- "expat-CVE-2015-1283-refix.patch"
- "expat-CVE-2016-0718.patch"))))
+ (patches (search-patches "expat-CVE-2015-1283.patch"))))
(build-system gnu-build-system)
(home-page "http://www.libexpat.org/")
(synopsis "Stream-oriented XML parser library written in C")
@@ -65,6 +64,15 @@ 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-2015-1283.patch"
+ "expat-CVE-2015-1283-refix.patch"
+ "expat-CVE-2016-0718.patch"))))))
+
(define-public libxml2
(package
(name "libxml2")