;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;;
;;; This file is part of GNU Guix.
;;;
(define-module (gnu packages icu4c)
#:use-module (gnu packages)
- #:use-module (gnu packages elf)
#:use-module (gnu packages perl)
#:use-module (guix licenses)
#:use-module (guix packages)
(define-public icu4c
(package
(name "icu4c")
- (version "53.1")
+ (version "55.1")
(source (origin
(method url-fetch)
(uri (string-append "http://download.icu-project.org/files/icu4c/"
(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
"-src.tgz"))
(sha256
- (base32 "0a4sg9w054640zncb13lhrcjqn7yg1qilwd1mczc4w60maslz9vg"))
- (patches (list (search-patch "icu4c-test-date-format.patch")))))
+ (base32 "0ys5f5spizg45qlaa31j2lhgry0jka2gfha527n4ndfxxz5j4sz1"))
+ (patches (map search-patch '("icu4c-CVE-2014-6585.patch"
+ "icu4c-CVE-2015-1270.patch"
+ "icu4c-CVE-2015-4760.patch")))))
(build-system gnu-build-system)
(inputs
- `(("patchelf" ,patchelf)
- ("perl" ,perl)))
+ `(("perl" ,perl)))
(arguments
- `(#:modules ((guix build gnu-build-system)
- (guix build utils)
- (guix build rpath)
- (srfi srfi-26))
- #:imported-modules ((guix build gnu-build-system)
- (guix build utils)
- (guix build rpath))
+ `(#:configure-flags
+ '("--enable-rpath"
+ ,@(if (string-prefix? "arm" (or (%current-target-system)
+ (%current-system)))
+ '("--with-data-packaging=archive")
+ '()))
#:phases
(alist-cons-after
'unpack 'chdir-to-source
'configure 'patch-configure
(lambda _
;; patch out two occurrences of /bin/sh from configure script
- ;; that might have disappeared in a release later than 52.1
+ ;; that might have disappeared in a release later than 54.1
(substitute* "configure"
(("`/bin/sh")
(string-append "`" (which "bash")))))
- (alist-cons-after
- 'strip 'add-lib-to-runpath
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (lib (string-append out "/lib")))
- ;; Add LIB to the RUNPATH of all the libraries.
- (with-directory-excursion out
- (for-each (cut augment-rpath <> lib)
- (find-files "lib" ".*")))))
- %standard-phases)))))
- (synopsis "ICU, International Components for Unicode")
+ %standard-phases))))
+ (synopsis "International Components for Unicode")
(description
"ICU is a set of C/C++ and Java libraries providing Unicode and
-globalisation support for software applications. This package contains the
+globalisation support for software applications. This package contains the
C/C++ part.")
(license x11)
(home-page "http://site.icu-project.org/")))