ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: php: Update to 7.4.16 [security fixes].

Browse source 
* gnu/packages/php.scm (php): Update to 7.4.16.
[arguments]: Patch failing new test.
This commit is contained in:
Tobias Geerinckx-Rice 2021-03-04 21:31:50 +01:00
parent 297531ef58
commit 81aa2fa4ae
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/php.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016-2020 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2016-2020 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -60,7 +60,7 @@ (define-module (gnu packages php)
(define-public php (define-public php
(package (package
(name "php") (name "php")
(version "7.4.15") (version "7.4.16")
(home-page "https://secure.php.net/") (home-page "https://secure.php.net/")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -68,7 +68,7 @@ (define-public php
"php-" version ".tar.xz")) "php-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1f1wsi2frdbr9a3hvhmk3mmd7cwzf6mwya2akpzkwyygy1jrr1cv")) "12xr7w2mk8ab3igvbpi94ks2xfw2nqga9a6nxs94rvcdz3xcw5hw"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(with-directory-excursion "ext" '(with-directory-excursion "ext"
@ -327,6 +327,14 @@ (define-public php
;; Expects an empty Array; gets one with " " in it. ;; Expects an empty Array; gets one with " " in it.
"ext/pcre/tests/bug80118.phpt")) "ext/pcre/tests/bug80118.phpt"))
;; Accomodate two extra openssl errors flanking the expected one:
;; random number generator:RAND_{load,write}_file:Cannot open file
;; This is due to an invalid $HOME, but changing it in the test
;; still prints the first one & changing it globally is overkill.
(substitute* "ext/openssl/tests/bug80747.phpt"
((".*error:%s:key size too small.*" match)
(string-append "%s\n" match "%s\n")))
;; Skip tests requiring network access. ;; Skip tests requiring network access.
(setenv "SKIP_ONLINE_TESTS" "1") (setenv "SKIP_ONLINE_TESTS" "1")
;; Without this variable, 'make test' passes regardless of failures. ;; Without this variable, 'make test' passes regardless of failures.