From 425b8537e8a46b6e7e32e65103ee87542d6ed3dc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 22:55:23 +0200 Subject: gnu: pcre: Fix CVE-2016-3191. * gnu/packages/patches/pcre-CVE-2016-3191.patch: New file. * gnu/packages/pcre.scm (pcre)[source]: Use it. * gnu-system.am (dist_patch_DATA): Add 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 d2933bbe38..e0cff5a2e0 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -40,7 +40,8 @@ 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 -- cgit v1.2.3 From d46dd72c3289adf762e4d20953153f7fde2ec3e2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 23:08:21 +0200 Subject: gnu: pcre: Add missing #:use-module. This is a followup to 425b853. * gnu/packages/pcre.scm: Add missing #:use-module. --- gnu/packages/pcre.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/pcre.scm') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index e0cff5a2e0..d5c2294a8d 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -22,6 +22,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages compression) #:use-module (gnu packages readline) + #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) -- cgit v1.2.3 From d786d2f891c3257a36e0c0658c618c75d67190cf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 23:09:55 +0200 Subject: gnu: pcre: Disallow references to the "doc" output. * gnu/packages/pcre.scm (pcre)[arguments]: Add #:disallowed-references. --- 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 d5c2294a8d..cb6eddddb7 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -50,7 +50,8 @@ ("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" -- cgit v1.2.3 From 6d49ca3bad613700b539c30272e164207455735b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 May 2016 15:41:23 +0200 Subject: gnu: pcre: Add "bin" output. * gnu/packages/pcre.scm (pcre)[outputs]: Add "bin". --- gnu/packages/pcre.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/pcre.scm') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 248242af4d..42a6a9b0c4 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -45,8 +45,9 @@ "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))) -- cgit v1.2.3 From 2cf0221f0e5d380ca164a2e89f5da6980ea40731 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 23 May 2016 15:02:55 +0200 Subject: gnu: pcre: Remove now-unneeded replacement. * gnu/packages/pcre.scm (pcre)[replacement]: Remove. (pcre-fixed): Remove. --- gnu/packages/pcre.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages/pcre.scm') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 42a6a9b0c4..aea7d6fcb3 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -31,7 +31,6 @@ (package (name "pcre") (version "8.38") - (replacement pcre-fixed) (source (origin (method url-fetch) (uri (list @@ -70,13 +69,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