diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2018-03-01 20:34:51 +0100 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2018-03-01 22:25:28 +0100 |
| commit | 8147d7c675e663c45d5e1ccbeebb72daeaba0b91 (patch) | |
| tree | 588402c7f346b57e3161b64aab79c34cc78855f4 /gnu/packages/php.scm | |
| parent | 738aa0ca1d1b86286cf8f57620a50c4b093031b8 (diff) | |
| download | gnu-guix-8147d7c675e663c45d5e1ccbeebb72daeaba0b91.tar gnu-guix-8147d7c675e663c45d5e1ccbeebb72daeaba0b91.tar.gz | |
gnu: php: Fix test failure.
* gnu/packages/php.scm (php)[inputs]: Use gd-for-php.
(gd-for-php): New private variable.
* gnu/packages/patches/gd-CVE-2018-5711.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/php.scm')
| -rw-r--r-- | gnu/packages/php.scm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 1ed3dc7ce0..f3f279a533 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -50,6 +50,15 @@ #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:)) +(define gd-for-php + (package + (inherit gd) + (source (origin + (inherit (package-source gd)) + (patches (search-patches "gd-fix-tests-on-i686.patch" + "gd-freetype-test-failure.patch" + "gd-CVE-2018-5711.patch")))))) + (define-public php (package (name "php") @@ -278,11 +287,7 @@ "ext/mbstring/tests/mb_ereg_variation3.phpt" "ext/mbstring/tests/mb_ereg_replace_variation1.phpt" "ext/mbstring/tests/bug72994.phpt" - "ext/ldap/tests/ldap_set_option_error.phpt" - - ;; XXX: This is CVE-2018-5711. There is no fix yet in libgd. - ;; See https://github.com/libgd/libgd/issues/420 - "ext/gd/tests/bug75571.phpt")) + "ext/ldap/tests/ldap_set_option_error.phpt")) ;; Skip tests requiring network access. (setenv "SKIP_ONLINE_TESTS" "1") @@ -299,7 +304,7 @@ ("curl" ,curl) ("cyrus-sasl" ,cyrus-sasl) ("freetype" ,freetype) - ("gd" ,gd) + ("gd" ,gd-for-php) ("gdbm" ,gdbm) ("glibc" ,glibc) ("gmp" ,gmp) |