diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2016-05-02 17:53:40 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2016-05-02 17:53:40 +0200 |
| commit | c3052d6bcd2193b258fb92b99291a4918931fe36 (patch) | |
| tree | 0e0cbbc019e68f4f1c865b4d2f5e341eb45d96ee /gnu/packages/pcre.scm | |
| parent | 0bfb9b439953b755a510974e51e651f79526a5a4 (diff) | |
| parent | b74f64a960542b0679ab13de0dd28adc496cf084 (diff) | |
| download | guix-c3052d6bcd2193b258fb92b99291a4918931fe36.tar guix-c3052d6bcd2193b258fb92b99291a4918931fe36.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/pcre.scm')
| -rw-r--r-- | gnu/packages/pcre.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index cb6eddddb7..248242af4d 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -31,6 +31,7 @@ (package (name "pcre") (version "8.38") + (replacement pcre-fixed) (source (origin (method url-fetch) (uri (list @@ -68,10 +69,17 @@ POSIX regular expression API.") (license license:bsd-3) (home-page "http://www.pcre.org/"))) +(define pcre-fixed ;for CVE-2016-3191 + (package + (inherit pcre) + (source (origin + (inherit (package-source pcre)) + (patches (search-patches "pcre-CVE-2016-3191.patch")))))) + (define-public pcre2 (package (name "pcre2") - (version "10.20") + (version "10.21") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcre/pcre2/" @@ -79,7 +87,7 @@ POSIX regular expression API.") (sha256 (base32 - "0yj8mm9ll9zj3v47rvmmqmr1ybxk72rr2lym3rymdsf905qjhbik")))) + "1q6lrj9b08l1q39vxipb0fi88x6ybvkr6439h8bjb9r8jd81fsn6")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) ("readline" ,readline) |