gnu: icu4c: Incorporate grafted changes.
* gnu/packages/icu4c.scm (icu4c)[source]: Add patch. [replacement]: Remove field. (icu4c/fixed): Remove variable.
This commit is contained in:
parent
19b7bba1b5
commit
e2ffdd83b9
|
@ -32,7 +32,6 @@
|
||||||
(define-public icu4c
|
(define-public icu4c
|
||||||
(package
|
(package
|
||||||
(name "icu4c")
|
(name "icu4c")
|
||||||
(replacement icu4c-fixed)
|
|
||||||
(version "58.2")
|
(version "58.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -44,6 +43,7 @@
|
||||||
"-src.tgz"))
|
"-src.tgz"))
|
||||||
(patches
|
(patches
|
||||||
(search-patches "icu4c-CVE-2017-7867-CVE-2017-7868.patch"
|
(search-patches "icu4c-CVE-2017-7867-CVE-2017-7868.patch"
|
||||||
|
"icu4c-CVE-2017-14952.patch"
|
||||||
"icu4c-reset-keyword-list-iterator.patch"))
|
"icu4c-reset-keyword-list-iterator.patch"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"))))
|
(base32 "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"))))
|
||||||
|
@ -71,15 +71,6 @@ C/C++ part.")
|
||||||
(license x11)
|
(license x11)
|
||||||
(home-page "http://site.icu-project.org/")))
|
(home-page "http://site.icu-project.org/")))
|
||||||
|
|
||||||
(define icu4c-fixed
|
|
||||||
(package
|
|
||||||
(inherit icu4c)
|
|
||||||
(source (origin
|
|
||||||
(inherit (package-source icu4c))
|
|
||||||
(patches (append
|
|
||||||
(origin-patches (package-source icu4c))
|
|
||||||
(search-patches "icu4c-CVE-2017-14952.patch")))))))
|
|
||||||
|
|
||||||
(define-public java-icu4j
|
(define-public java-icu4j
|
||||||
(package
|
(package
|
||||||
(name "java-icu4j")
|
(name "java-icu4j")
|
||||||
|
|
Loading…
Reference in New Issue