01/01: Revert "gnu: expat: Replace with 2.1.1 [fixes CVE-2015-1283]."

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit c7762233fbca476225efd2295eb88860815b8633
Author: Mark H Weaver <address@hidden>
Date:   Fri Mar 25 17:20:57 2016 -0400

    Revert "gnu: expat: Replace with 2.1.1 [fixes CVE-2015-1283]."
    
    This reverts commit 6458876597d292ea06f0d41048948fd801cedb8a.
---
 gnu/packages/xml.scm |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 6d3ffe8..7419c61 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2015 Eric Bavier <address@hidden>
 ;;; Copyright © 2015 Sou Bunnbu <address@hidden>
 ;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
-;;; Copyright © 2015, 2016 Mark H Weaver <address@hidden>
+;;; Copyright © 2015 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015 Efraim Flashner <address@hidden>
 ;;; Copyright © 2015 Raimon Grau <address@hidden>
 ;;;
@@ -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")