devel/php-xdebug: update to 3.0.2 3.0.2 (2021-01-04) Fixed bugs: - Fixed issue #1907: Empty exception message when setting the $message property to a stringable object - Fixed issue #1910: Code coverage misses constructor property promotion code - Fixed issue #1914: Compillation failure on OpenBSD - Fixed issue #1915: Debugger should only start with XDEBUG_SESSION and not XDEBUG_PROFILE - Fixed issue #1918: Warn if PHP's Garbage Collection is disabled in gc_stats mode - Fixed issue #1919: Crash when enabling filter without the right mode active - Fixed issue #1921: Xdebug does not start step debugging if start_with_request=trigger - Fixed issue #1922: Code coverage misses array assignment lines - Fixed issue #1924: Deprecated INI settings displayed in phpinfo() - Fixed issue #1925: xdebug.start_with_request and start_upon_error display inconsistent values - Fixed issue #1926: Add Xdebug mode's source to xdebug_info() output - Fixed issue #1927: Crash when calling xdebug_stop_trace without a trace in progress - Fixed issue #1928: xdebug_stop_gcstats() can also return falsediff -r1.34 -r1.35 pkgsrc/devel/php-xdebug/Makefile
(taca)
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.34 2021/01/03 07:28:56 taca Exp $ | 1 | # $NetBSD: Makefile,v 1.35 2021/02/02 15:03:36 taca Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | MODNAME= xdebug | 4 | MODNAME= xdebug | |
5 | PECL_VERSION= 3.0.1 | 5 | PECL_VERSION= 3.0.2 | |
6 | CATEGORIES= devel | 6 | CATEGORIES= devel | |
7 | MASTER_SITES= http://xdebug.org/files/ | 7 | MASTER_SITES= http://xdebug.org/files/ | |
8 | EXTRACT_SUFX= .tgz | 8 | EXTRACT_SUFX= .tgz | |
9 | 9 | |||
10 | MAINTAINER= jdolecek@NetBSD.org | 10 | MAINTAINER= jdolecek@NetBSD.org | |
11 | HOMEPAGE= https://xdebug.org/ | 11 | HOMEPAGE= https://xdebug.org/ | |
12 | COMMENT= PHP extension for debugging | 12 | COMMENT= PHP extension for debugging | |
13 | LICENSE= php | 13 | LICENSE= php | |
14 | 14 | |||
15 | PHP_ZEND_EXTENSION= yes | 15 | PHP_ZEND_EXTENSION= yes | |
16 | 16 | |||
17 | PHP_VERSIONS_INCOMPATIBLE= 56 | 17 | PHP_VERSIONS_INCOMPATIBLE= 56 | |
18 | 18 |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.24 2021/01/03 07:28:56 taca Exp $ | 1 | $NetBSD: distinfo,v 1.25 2021/02/02 15:03:36 taca Exp $ | |
2 | 2 | |||
3 | SHA1 (php-xdebug/xdebug-3.0.1.tgz) = ff71ad260621f657d33d71bec9cc50190528d7b3 | 3 | SHA1 (php-xdebug/xdebug-3.0.2.tgz) = 8dfcc0cf5da7be98ef991076d0687d4812318a45 | |
4 | RMD160 (php-xdebug/xdebug-3.0.1.tgz) = 45707a7e82ce49732fe4acc6b6f9122b64d1ac75 | 4 | RMD160 (php-xdebug/xdebug-3.0.2.tgz) = 5fcbf2c59db8ec15c80a8a9484ac9f4f4b02d5cf | |
5 | SHA512 (php-xdebug/xdebug-3.0.1.tgz) = faa1ed9ad348ec5993ed1883dec2df9b331a158d4b9ae09df0a89be81a5651d51fe67a0a4f7af88d2e20a0e29babf294c98b0dbf289c10f5c0abf0be1c091e8b | 5 | SHA512 (php-xdebug/xdebug-3.0.2.tgz) = c14f13f770016a9fcaaa1fef0f9465521a9f52c17593477e57195c43cdafc3961f51708cfad4f98f0f8bfd84673a63b136c45bbf9d3150309b81d5f5c485db83 | |
6 | Size (php-xdebug/xdebug-3.0.1.tgz) = 214467 bytes | 6 | Size (php-xdebug/xdebug-3.0.2.tgz) = 215816 bytes | |
7 | SHA1 (patch-src_debugger_com.c) = 2adde8e26ab11901241de9da710a07400cdc154a | 7 | SHA1 (patch-src_debugger_com.c) = 51c3ea372dca99ab06490d2dc0611277ea0ba8f0 |
@@ -1,33 +1,33 @@ | @@ -1,33 +1,33 @@ | |||
1 | $NetBSD: patch-src_debugger_com.c,v 1.2 2021/01/03 07:28:56 taca Exp $ | 1 | $NetBSD: patch-src_debugger_com.c,v 1.3 2021/02/02 15:03:36 taca Exp $ | |
2 | 2 | |||
3 | Use standard value for second argument of setsockopt(2). | 3 | Use standard value for second argument of setsockopt(2). | |
4 | 4 | |||
5 | --- src/debugger/com.c.orig 2020-12-04 15:57:15.000000000 +0000 | 5 | --- src/debugger/com.c.orig 2021-01-04 17:17:01.000000000 +0000 | |
6 | +++ src/debugger/com.c | 6 | +++ src/debugger/com.c | |
7 | @@ -109,7 +109,7 @@ void set_keepalive_options(int fd) | 7 | @@ -110,7 +110,7 @@ void set_keepalive_options(int fd) | |
8 | } | |||
9 | 8 | |||
9 | # if defined(TCP_KEEPIDLE) | |||
10 | optval = 600; | 10 | optval = 600; | |
11 | - ret = setsockopt(fd, SOL_TCP, TCP_KEEPIDLE, &optval, optlen); | 11 | - ret = setsockopt(fd, SOL_TCP, TCP_KEEPIDLE, &optval, optlen); | |
12 | + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen); | 12 | + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen); | |
13 | if (ret) { | 13 | if (ret) { | |
14 | xdebug_log_ex(XLOG_CHAN_DEBUG, XLOG_WARN, "KEEPALIVE", "Could not set TCP_KEEPIDLE to %d: %s.", optval, strerror(errno)); | 14 | xdebug_log_ex(XLOG_CHAN_DEBUG, XLOG_WARN, "KEEPALIVE", "Could not set TCP_KEEPIDLE to %d: %s.", optval, strerror(errno)); | |
15 | return; | 15 | return; | |
16 | @@ -117,7 +117,7 @@ void set_keepalive_options(int fd) | 16 | @@ -119,7 +119,7 @@ void set_keepalive_options(int fd) | |
17 | 17 | |||
18 | # if defined(TCP_KEEPCNT) | 18 | # if defined(TCP_KEEPCNT) | |
19 | optval = 20; | 19 | optval = 20; | |
20 | - ret = setsockopt(fd, SOL_TCP, TCP_KEEPCNT, &optval, optlen); | 20 | - ret = setsockopt(fd, SOL_TCP, TCP_KEEPCNT, &optval, optlen); | |
21 | + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen); | 21 | + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen); | |
22 | if (ret) { | 22 | if (ret) { | |
23 | xdebug_log_ex(XLOG_CHAN_DEBUG, XLOG_WARN, "KEEPALIVE", "Could not set TCP_KEEPCNT to %d: %s.", optval, strerror(errno)); | 23 | xdebug_log_ex(XLOG_CHAN_DEBUG, XLOG_WARN, "KEEPALIVE", "Could not set TCP_KEEPCNT to %d: %s.", optval, strerror(errno)); | |
24 | return; | 24 | return; | |
25 | @@ -126,7 +126,7 @@ void set_keepalive_options(int fd) | 25 | @@ -128,7 +128,7 @@ void set_keepalive_options(int fd) | |
26 | 26 | |||
27 | # if defined(TCP_KEEPINTVL) | 27 | # if defined(TCP_KEEPINTVL) | |
28 | optval = 60; | 28 | optval = 60; | |
29 | - ret = setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &optval, optlen); | 29 | - ret = setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &optval, optlen); | |
30 | + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen); | 30 | + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen); | |
31 | if (ret) { | 31 | if (ret) { | |
32 | xdebug_log_ex(XLOG_CHAN_DEBUG, XLOG_WARN, "KEEPALIVE", "Could not set TCP_KEEPINTVL to %d: %s.", optval, strerror(errno)); | 32 | xdebug_log_ex(XLOG_CHAN_DEBUG, XLOG_WARN, "KEEPALIVE", "Could not set TCP_KEEPINTVL to %d: %s.", optval, strerror(errno)); | |
33 | return; | 33 | return; |