diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-05-14 17:21:46 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-14 17:21:46 +0200 |
| commit | 61b1df6f2791a2afa291b56708d73a5264ca70eb (patch) | |
| tree | 314ddb96391b25e83e9a31637be0f1a7f52cc249 /gnu/packages/pcre.scm | |
| parent | bdb8267680f14ee5d3df9d029f23279c1457c211 (diff) | |
| parent | 4be014128e1c422f37b56f9a6b3420b4e85c4302 (diff) | |
| download | guix-61b1df6f2791a2afa291b56708d73a5264ca70eb.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/pcre.scm')
| -rw-r--r-- | gnu/packages/pcre.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 1946f5229c..58beab0a96 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -92,17 +92,17 @@ POSIX regular expression API.") (sha256 (base32 "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz")) - (patches (search-patches "pcre2-CVE-2017-7186.patch")))) + (patches (search-patches "pcre2-CVE-2017-7186.patch" + "pcre2-CVE-2017-8786.patch")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) ("readline" ,readline) ("zlib" ,zlib))) (arguments `(#:configure-flags '("--enable-unicode" - "--enable-pcregrep-libz" - "--enable-pcregrep-libbz2" - "--enable-pcretest-libreadline" - "--enable-unicode-properties" + "--enable-pcre2grep-libz" + "--enable-pcre2grep-libbz2" + "--enable-pcre2test-libreadline" "--enable-pcre2-16" "--enable-pcre2-32" "--enable-jit") |