[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/14: gnu: expat: Remove replacement.
From: |
guix-commits |
Subject: |
04/14: gnu: expat: Remove replacement. |
Date: |
Sat, 12 Jun 2021 19:05:07 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit a0286041d93215c85dd770e5b41ac5f1a294dfc4
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Jun 6 22:13:51 2021 +0200
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 | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index c01d9f4..78daa6c 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -120,8 +120,7 @@ the entire document.")
(define-public expat
(package
(name "expat")
- (replacement expat-2.4.1)
- (version "2.3.0")
+ (version "2.4.1")
(source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c))))
(origin
(method url-fetch)
@@ -133,7 +132,7 @@ the entire document.")
"/expat-" version ".tar.xz")))
(sha256
(base32
- "1ab7fkab4wbj53xqsx2a4h5m310ak9abczjh0a2ymg73nsclz8ya")))))
+ "0spvyb9d3hijs4ys3x64cfmilsynl8kv6clfahv8d4lvp86js0yg")))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")))
@@ -145,24 +144,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)))
-;; 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
- (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
- "0spvyb9d3hijs4ys3x64cfmilsynl8kv6clfahv8d4lvp86js0yg")))))))
-
(define-public libebml
(package
(name "libebml")
- branch core-updates updated (8ceff70 -> a6c292a), guix-commits, 2021/06/12
- 02/14: gnu: postgresql: Remove replacement., guix-commits, 2021/06/12
- 01/14: gnu: OpenSSL: Remove replacement., guix-commits, 2021/06/12
- 03/14: gnu: libx11: Update to 1.7.1., guix-commits, 2021/06/12
- 04/14: gnu: expat: Remove replacement.,
guix-commits <=
- 06/14: gnu: GCC: Switch to GCC 10., guix-commits, 2021/06/12
- 08/14: gnu: graphviz: Update to 2.47.1., guix-commits, 2021/06/12
- 05/14: gnu: curl: Absorb replacement., guix-commits, 2021/06/12
- 10/14: gnu: pango: Update to 1.48.4., guix-commits, 2021/06/12
- 11/14: gnu: poppler: Update to 21.05.0., guix-commits, 2021/06/12
- 07/14: gnu: python-attrs: Update to 21.2.0., guix-commits, 2021/06/12
- 09/14: gnu: harfbuzz: Update to 2.8.1., guix-commits, 2021/06/12
- 13/14: gnu: glib: Add "static" output., guix-commits, 2021/06/12
- 12/14: gnu: python-magic: Update to 0.4.22., guix-commits, 2021/06/12
- 14/14: gnu: expat: Install the static library., guix-commits, 2021/06/12