From a0286041d93215c85dd770e5b41ac5f1a294dfc4 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sun, 6 Jun 2021 22:13:51 +0200
Subject: [PATCH] gnu: expat: Remove replacement.

* gnu/packages/xml.scm (expat): Update to 2.4.1.
[replacement]: Remove.
(expat-2.4.1): Remove variable.
---
 gnu/packages/xml.scm | 41 +++++++++++------------------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index c01d9f4dce..78daa6c10c 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -120,35 +120,6 @@ the entire document.")
 (define-public expat
   (package
     (name "expat")
-    (replacement expat-2.4.1)
-    (version "2.3.0")
-    (source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c))))
-              (origin
-                (method url-fetch)
-                (uri (list (string-append "mirror://sourceforge/expat/expat/"
-                                          version "/expat-" version ".tar.xz")
-                           (string-append
-                            "https://github.com/libexpat/libexpat/releases/download/R_"
-                            (string-map dot->underscore version)
-                            "/expat-" version ".tar.xz")))
-                (sha256
-                 (base32
-                  "1ab7fkab4wbj53xqsx2a4h5m310ak9abczjh0a2ymg73nsclz8ya")))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags '("--disable-static")))
-    (home-page "https://libexpat.github.io/")
-    (synopsis "Stream-oriented XML parser library written in C")
-    (description
-     "Expat is an XML parser library written in C.  It is a
-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)))
-
-;; Replacement package to fix CVE-2013-0340.
-(define expat-2.4.1
-  (package
-    (inherit expat)
     (version "2.4.1")
     (source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c))))
               (origin
@@ -161,7 +132,17 @@ things the parser might find in the XML document (like start tags).")
                             "/expat-" version ".tar.xz")))
                 (sha256
                  (base32
-                  "0spvyb9d3hijs4ys3x64cfmilsynl8kv6clfahv8d4lvp86js0yg")))))))
+                  "0spvyb9d3hijs4ys3x64cfmilsynl8kv6clfahv8d4lvp86js0yg")))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags '("--disable-static")))
+    (home-page "https://libexpat.github.io/")
+    (synopsis "Stream-oriented XML parser library written in C")
+    (description
+     "Expat is an XML parser library written in C.  It is a
+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-public libebml
   (package