From 37f46a4bc51886c0d0df797bfbb13a50fe647567 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 May 2017 17:13:38 -0400 Subject: gnu: pcre2: Fix CVE-2017-8786. * gnu/packages/patches/pcre2-CVE-2017-8786.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/pcre.scm (pcre2)[source]: Use it. --- gnu/packages/pcre.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/pcre.scm') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 1946f5229c..b632b9f488 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -92,7 +92,8 @@ 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) -- cgit 1.4.1 From af6e2385b3125924f34188d81370dd71cdbe9ddc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 May 2017 17:19:40 -0400 Subject: gnu: pcre2: Fix build configuration for pcre2. * gnu/packages/pcre.scm (pcre2)[arguments]: Remove unknown configure flag '--enable-unicode-properties' and adapt other flags for pcre2. --- gnu/packages/pcre.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/pcre.scm') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index b632b9f488..58beab0a96 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -100,10 +100,9 @@ POSIX regular expression API.") ("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") -- cgit 1.4.1