From 1898956d4fb51404a527e909230781848a9d3118 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Wed, 25 Mar 2020 07:26:01 +0000 Subject: user/php7: bump to 7.4.4 * Use system libgd * Use system oniguruma * Upstream has migrated from pcre to pcre2 * Drop comments about extensions that aren't being built (imap, recode, sodium, tidy) * Drop php7-wddx (has been removed from core upstream) * Drop php7-litespeed (I don't think anyone uses this) * Pin subpackage versions to main package * Fix _extensions_by_load_order so all extensions are tested * This increases the test suite size from ~ 9000 to ~ 15000 * Add additional API/ABI checks from Fedora --- user/php7/zip-glob-pathc.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 user/php7/zip-glob-pathc.patch (limited to 'user/php7/zip-glob-pathc.patch') diff --git a/user/php7/zip-glob-pathc.patch b/user/php7/zip-glob-pathc.patch new file mode 100644 index 000000000..74b81754a --- /dev/null +++ b/user/php7/zip-glob-pathc.patch @@ -0,0 +1,15 @@ +Upstream: https://github.com/php/php-src/pull/5311 + +--- php-7.4.4/ext/zip/php_zip.c 2020-03-17 10:40:30.000000000 +0000 ++++ php-7.4.4/ext/zip/php_zip.c 2020-03-27 15:28:13.259857804 -0500 +@@ -606,8 +606,9 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v + add_next_index_string(return_value, globbuf.gl_pathv[n]+cwd_skip); + } + ++ ret = globbuf.gl_pathc; + globfree(&globbuf); +- return globbuf.gl_pathc; ++ return ret; + #else + zend_throw_error(NULL, "Glob support is not available"); + return 0; -- cgit v1.2.3-70-g09d2