From 455859a50f88f625d13fc2f304111f02369b366b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Aug 2016 23:30:52 +0200 Subject: Merge branch 'core-updates' --- gnu/packages/pcre.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'gnu/packages/pcre.scm') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index e954492554..fe9157af12 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -32,7 +32,6 @@ (package (name "pcre") (version "8.38") - (replacement pcre-fixed) (source (origin (method url-fetch) (uri (list @@ -43,15 +42,18 @@ version "/pcre-" version ".tar.bz2"))) (sha256 (base32 - "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r")))) + "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r")) + (patches (list (search-patch "pcre-CVE-2016-3191.patch"))))) (build-system gnu-build-system) - (outputs '("out" - "doc")) ;1.8 MiB of HTML + (outputs '("out" ;library & headers + "bin" ;depends on Readline (adds 20MiB to the closure) + "doc")) ;1.8 MiB of HTML (inputs `(("bzip2" ,bzip2) ("readline" ,readline) ("zlib" ,zlib))) (arguments - `(#:configure-flags '("--enable-utf" + '(#:disallowed-references ("doc") + #:configure-flags '("--enable-utf" "--enable-pcregrep-libz" "--enable-pcregrep-libbz2" "--enable-pcretest-libreadline" @@ -68,13 +70,6 @@ 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") -- cgit v1.2.3