aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2017-07-19 22:14:07 -0400
committerLeo Famulari <leo@famulari.name>2017-07-20 08:26:40 -0400
commit426b0b898f70a58133d80779980f163a5761686e (patch)
treefe58640b04237997154a0eb20f4f53650eeefd07
parentda036496406f60e591786f89e8a51ad75cb0e5c7 (diff)
downloadguix-426b0b898f70a58133d80779980f163a5761686e.tar
guix-426b0b898f70a58133d80779980f163a5761686e.tar.gz
gnu: pcre: Update replacement to 8.41 [fixes CVE-2017-{7244,7245,7246}].
* gnu/packages/pcre.scm (pcre)[replacement]: Update to pcre-8.41. (pcre/fixed): Replace with ... (pcre-8.41): ... new variable.
-rw-r--r--gnu/packages/pcre.scm16
1 files changed, 12 insertions, 4 deletions
diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm
index 67a8db1c73..8dd5099314 100644
--- a/gnu/packages/pcre.scm
+++ b/gnu/packages/pcre.scm
@@ -34,7 +34,7 @@
(package
(name "pcre")
(version "8.40")
- (replacement pcre/fixed)
+ (replacement pcre-8.41)
(source (origin
(method url-fetch)
(uri (list
@@ -72,12 +72,20 @@ POSIX regular expression API.")
(license license:bsd-3)
(home-page "http://www.pcre.org/")))
-(define pcre/fixed
+(define pcre-8.41
(package
(inherit pcre)
+ (version "8.41")
(source (origin
- (inherit (package-source pcre))
- (patches (search-patches "pcre-CVE-2017-7186.patch"))))))
+ (method url-fetch)
+ (uri (list (string-append "mirror://sourceforge/pcre/pcre/"
+ version "/pcre-" version ".tar.bz2")
+ (string-append "ftp://ftp.csx.cam.ac.uk"
+ "/pub/software/programming/pcre/"
+ "pcre-" version ".tar.bz2")))
+ (sha256
+ (base32
+ "0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76"))))))
(define-public pcre2
(package