diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-09-10 01:37:32 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-09-10 01:37:32 +0200 |
commit | fe79ce3b1f34300ff3bb94238462323f887c93be (patch) | |
tree | 050b264f8866b754ac3db918e02a870a746e58c8 /gnu/packages/php.scm | |
parent | fb94354a69cacbeed1a24d30c46ba7f056186b65 (diff) | |
parent | d4bd2453ec6c2342d071cb9a9708280cf45b23ca (diff) | |
download | patches-fe79ce3b1f34300ff3bb94238462323f887c93be.tar patches-fe79ce3b1f34300ff3bb94238462323f887c93be.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/php.scm')
-rw-r--r-- | gnu/packages/php.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 121ffab767..4981c60554 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -57,7 +57,8 @@ (inherit (package-source gd)) (patches (search-patches "gd-fix-tests-on-i686.patch" "gd-freetype-test-failure.patch" - "gd-CVE-2018-5711.patch")))))) + "gd-CVE-2018-5711.patch" + "gd-CVE-2018-1000222.patch")))))) (define-public php (package |