diff options
| author | Leo Famulari <leo@famulari.name> | 2017-04-14 13:07:16 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-04-14 13:07:16 -0400 |
| commit | c57ce31a896f659a2e311c2ee90b9027f4a405bc (patch) | |
| tree | 17d0d0238ca1db65cce1f2ac68273af0483c9e7d /gnu/packages/pcre.scm | |
| parent | f575efa12c5df9f9879b7be0fe3593a3106a346d (diff) | |
| parent | 8439c9c05eab5c98d889fb1de56bc78f62a8058f (diff) | |
| download | guix-c57ce31a896f659a2e311c2ee90b9027f4a405bc.tar guix-c57ce31a896f659a2e311c2ee90b9027f4a405bc.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/pcre.scm')
| -rw-r--r-- | gnu/packages/pcre.scm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 011a30dd38..1946f5229c 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ (package (name "pcre") (version "8.40") + (replacement pcre/fixed) (source (origin (method url-fetch) (uri (list @@ -70,6 +72,14 @@ POSIX regular expression API.") (license license:bsd-3) (home-page "http://www.pcre.org/"))) +(define pcre/fixed + (package + (inherit pcre) + (replacement #f) + (source (origin + (inherit (package-source pcre)) + (patches (search-patches "pcre-CVE-2017-7186.patch")))))) + (define-public pcre2 (package (name "pcre2") @@ -81,7 +91,8 @@ POSIX regular expression API.") (sha256 (base32 - "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz")))) + "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz")) + (patches (search-patches "pcre2-CVE-2017-7186.patch")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) ("readline" ,readline) |