aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2016-03-25 17:20:57 -0400
committerMark H Weaver <mhw@netris.org>2016-03-25 17:20:57 -0400
commitc7762233fbca476225efd2295eb88860815b8633 (patch)
tree7ba3e79d533c9832b73c727cd781d6a3ca0d861d
parent15bdd91cc456725b3f4aff6ab769e4c379fdcc80 (diff)
downloadguix-c7762233fbca476225efd2295eb88860815b8633.tar
guix-c7762233fbca476225efd2295eb88860815b8633.tar.gz
Revert "gnu: expat: Replace with 2.1.1 [fixes CVE-2015-1283]."
This reverts commit 6458876597d292ea06f0d41048948fd801cedb8a.
-rw-r--r--gnu/packages/xml.scm17
1 files changed, 1 insertions, 16 deletions
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 6d3ffe8ea5..7419c61d3a 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015 Raimon Grau <raimonster@gmail.com>
;;;
@@ -43,7 +43,6 @@
(define-public expat
(package
- (replacement expat-2.1.1)
(name "expat")
(version "2.1.0")
(source (origin
@@ -63,20 +62,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-2.1.1
- (package
- (inherit expat)
- (replacement #f)
- (source
- (let ((version "2.1.1"))
- (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/expat/expat/"
- version "/expat-" version ".tar.bz2"))
- (sha256
- (base32
- "0ryyjgvy7jq0qb7a9mhc1giy3bzn56aiwrs8dpydqngplbjq9xdg")))))))
-
(define-public libxml2
(package
(name "libxml2")