TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: pcre@2: Fix run-time crash [security fix].

Browse source 
* gnu/packages/pcre.scm (pcre2)[replacement]: New field.
(pcre2/fixed): New public variable.
* packages/patches/pcre2-fix-jit_match-crash.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
This commit is contained in:
Tobias Geerinckx-Rice 2019-08-01 21:57:45 +02:00
parent 9b76aa1031
commit 951fd8572a
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1165,6 +1165,7 @@ dist_patch_DATA = \
%D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchelf-rework-for-arm.patch \
%D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patchutils-test-perms.patch \
%D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/patch-hurd-path-max.patch \
%D%/packages/patches/pcre2-fix-jit_match-crash.patch \
%D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \
%D%/packages/patches/perl-deterministic-ordering.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \
%D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \

12
gnu/packages/pcre.scm
View file

@ -89,6 +89,7 @@ (define-public pcre
(define-public pcre2 (define-public pcre2
(package (package
(name "pcre2") (name "pcre2")
(replacement pcre2/fixed)
(version "10.33") (version "10.33")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -125,3 +126,14 @@ (define-public pcre2
POSIX regular expression API.") POSIX regular expression API.")
(license license:bsd-3) (license license:bsd-3)
(home-page "https://www.pcre.org/"))) (home-page "https://www.pcre.org/")))
(define-public pcre2/fixed
;; PHP >= 7.3.8 requires a fixed version at build time, so make it public
;; and hide it in the UI.
(package
(inherit pcre2)
(source
(origin
(inherit (package-source pcre2))
(patches (search-patches "pcre2-fix-jit_match-crash.patch"))))
(properties '((hidden? . #t)))))