diff options
| author | Max Rees <maxcrees@me.com> | 2022-05-27 16:20:52 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:34:02 -0500 |
| commit | 0198396fdd4296a886bb39e2b890e592be37f271 (patch) | |
| tree | ad27e05fbb52c5b148f86ce926ab54174ac9c362 /user/php7/getsockopt.patch | |
| parent | 746769adba02cea5665624523811883df7b35100 (diff) | |
| download | packages-0198396fdd4296a886bb39e2b890e592be37f271.tar.gz packages-0198396fdd4296a886bb39e2b890e592be37f271.tar.bz2 packages-0198396fdd4296a886bb39e2b890e592be37f271.tar.xz packages-0198396fdd4296a886bb39e2b890e592be37f271.zip | |
user/php7: bump { 7.4.4 --> 7.4.30 }. disable tests. fixes #266, #267, #617.
* Drop getsockopt.patch [1]
* Parts of no-max-ent-size.patch are obsoleted by [2]
* Drop zip-glob-pathc.patch [3]
* Fix build with libgd-2.3.3
* Update secfixes
[1] https://github.com/php/php-src/commit/f1bf058d7cbb7eaa62c1850c0d931a2c2ee127db
[2] https://github.com/php/php-src/commit/6aff9a50cae40582d2571e7aa6f336d5c6a99547
[3] https://github.com/php/php-src/commit/04920645f14ea117d5248ef3a0e03c6784c2fb49
Failing tests:
ext/curl/tests/curl_basic_007.phpt
ext/gd/tests/bug38212-mb.phpt
ext/gd/tests/bug38212.phpt
ext/gd/tests/bug41442.phpt
ext/gd/tests/bug71912-mb.phpt
ext/gd/tests/bug71912.phpt
ext/gd/tests/bug72339.phpt
ext/gd/tests/bug73155.phpt
ext/gd/tests/bug73157.phpt
ext/gd/tests/bug73159.phpt
ext/gd/tests/bug73161.phpt
ext/gd/tests/bug73868.phpt
ext/gd/tests/bug79676.phpt
ext/gd/tests/crafted_gd2.phpt
ext/gd/tests/createfromgd2.phpt
ext/gd/tests/gif2gd.phpt
ext/gd/tests/imagegd_truecolor.phpt
ext/gd/tests/imagescale_preserve_ratio.phpt
ext/gd/tests/jpg2gd-mb.phpt
ext/gd/tests/jpg2gd.phpt
ext/gd/tests/png2gd.phpt
ext/gettext/tests/gettext_basic-enus.phpt
ext/gettext/tests/gettext_bindtextdomain-cwd.phpt
ext/gettext/tests/gettext_dcgettext.phpt
ext/gettext/tests/gettext_dgettext.phpt
ext/gettext/tests/gettext_dngettext-plural.phpt
ext/gettext/tests/gettext_ngettext.phpt
ext/pcntl/tests/pcntl_unshare_01.phpt
ext/pcre/tests/ctype_back_to_c.phpt
ext/standard/tests/strings/bug79986.phpt
Diffstat (limited to 'user/php7/getsockopt.patch')
| -rw-r--r-- | user/php7/getsockopt.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/user/php7/getsockopt.patch b/user/php7/getsockopt.patch deleted file mode 100644 index 81f2bc232..000000000 --- a/user/php7/getsockopt.patch +++ /dev/null @@ -1,37 +0,0 @@ -Socket options with level IPPROTO_IP and IPPROTO_IPV6 cannot be handled -in the same switch statement as options with level SOL_SOCKET since -there may be collisions in their numerical values. - -For example, on ppc64: - -* IPV6_MULTICAST_HOPS and SO_RCVTIMEO are both 18 -* IPV6_MULTICAST_LOOP and SO_SNDTIMEO are both 19 - -etc. - ---- php-7.4.4/ext/sockets/sockets.c 2020-03-17 06:40:21.000000000 -0400 -+++ php-7.4.4/ext/sockets/sockets.c 2020-03-29 22:39:57.506751737 -0400 -@@ -2008,6 +2008,7 @@ PHP_FUNCTION(socket_get_option) - } - } - } -+ goto handle_default; - } - #if HAVE_IPV6 - else if (level == IPPROTO_IPV6) { -@@ -2017,6 +2018,7 @@ PHP_FUNCTION(socket_get_option) - } else if (ret == FAILURE) { - RETURN_FALSE; - } /* else continue */ -+ goto handle_default; - } - #endif - -@@ -2063,6 +2065,7 @@ PHP_FUNCTION(socket_get_option) - break; - - default: -+ handle_default: - optlen = sizeof(other_val); - - if (getsockopt(php_sock->bsd_socket, level, optname, (char*)&other_val, &optlen) != 0) { |