CVS commit: pkgsrc/devel/php-xdebug

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Jan  3 07:28:56 UTC 2021

Modified Files:
        pkgsrc/devel/php-xdebug: Makefile distinfo
        pkgsrc/devel/php-xdebug/patches: patch-src_debugger_com.c

Log Message:
devel/php-xdebug: update to 3.0.1

pkgsrc change: Switch to use PHP_VERSIONS_INCOMPATIBLE.

3.0.1 (2020-12-04)

= Fixed bugs:

- Fixed issue #1893: Crash with ext-fiber and xdebug.mode=coverage
- Fixed issue #1896: Segfault with closures that are not created from user
  code
- Fixed issue #1897: Crash when removing a breakpoint
- Fixed issue #1900: Update README and add run-xdebug-tests.php to package
- Fixed issue #1901: Stack traces are shown (with a broken time) when
  Xdebug's mode includes 'debug' but not 'develop' or 'trace'
- Fixed issue #1902: Compillation failure on AIX
- Fixed issue #1903: Constants should always be available, regardless of
  which mode Xdebug is in
- Fixed issue #1904: Profile and trace files using %t or %u do not get the
  right names
- Fixed issue #1905: Debugger does not disable request timeouts

3.0.0 (2020-11-25)

Xdebug 3 includes major changes in functionality compared to Xdebug 2. The
primary way how you turn on functionality is through the new xdebug.mode PHP
configuration setting. This made it possible to massively increase performance
in many of Xdebug's sub systems as Xdebug is now much more conservative in
which hooks are enabled.

Configuration changes, massive performance improvements, and PHP 8 support are
the primary features in Xdebug 3, but there is much more. The upgrade guide
lists the changes in great detail, please read it:

        https://xdebug.org/docs/upgrade_guide


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/php-xdebug/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/php-xdebug/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/php-xdebug/patches/patch-src_debugger_com.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/php-xdebug/Makefile
diff -u pkgsrc/devel/php-xdebug/Makefile:1.33 pkgsrc/devel/php-xdebug/Makefile:1.34
--- pkgsrc/devel/php-xdebug/Makefile:1.33       Sun Oct  4 06:19:18 2020
+++ pkgsrc/devel/php-xdebug/Makefile    Sun Jan  3 07:28:56 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2020/10/04 06:19:18 taca Exp $
+# $NetBSD: Makefile,v 1.34 2021/01/03 07:28:56 taca Exp $
 #
 
 MODNAME=               xdebug
-PECL_VERSION=          2.9.8
+PECL_VERSION=          3.0.1
 CATEGORIES=            devel
 MASTER_SITES=          http://xdebug.org/files/
 EXTRACT_SUFX=          .tgz
@@ -14,7 +14,7 @@ LICENSE=              php
 
 PHP_ZEND_EXTENSION=    yes
 
-PHP_VERSIONS_ACCEPTED= 72 73 74
+PHP_VERSIONS_INCOMPATIBLE=     56
 
 .include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/php-xdebug/distinfo
diff -u pkgsrc/devel/php-xdebug/distinfo:1.23 pkgsrc/devel/php-xdebug/distinfo:1.24
--- pkgsrc/devel/php-xdebug/distinfo:1.23       Sun Oct  4 06:19:18 2020
+++ pkgsrc/devel/php-xdebug/distinfo    Sun Jan  3 07:28:56 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.23 2020/10/04 06:19:18 taca Exp $
+$NetBSD: distinfo,v 1.24 2021/01/03 07:28:56 taca Exp $
 
-SHA1 (php-xdebug/xdebug-2.9.8.tgz) = fee72f12088b5c6f000c50468e1772e52203b6c6
-RMD160 (php-xdebug/xdebug-2.9.8.tgz) = 27ffd5c15d9e4945f3c988029f985dbdcce2b93e
-SHA512 (php-xdebug/xdebug-2.9.8.tgz) = 5655ba46f8ff312a6ea71737537e3bc230fb4a737162e02e3703d907c90f0508bd31584e640c1e0ae443f7672bce566d6125c01bd5a44585d021a899b3b2b19e
-Size (php-xdebug/xdebug-2.9.8.tgz) = 245293 bytes
-SHA1 (patch-src_debugger_com.c) = e73f65e9987099030efeb152a3f69854ad928160
+SHA1 (php-xdebug/xdebug-3.0.1.tgz) = ff71ad260621f657d33d71bec9cc50190528d7b3
+RMD160 (php-xdebug/xdebug-3.0.1.tgz) = 45707a7e82ce49732fe4acc6b6f9122b64d1ac75
+SHA512 (php-xdebug/xdebug-3.0.1.tgz) = faa1ed9ad348ec5993ed1883dec2df9b331a158d4b9ae09df0a89be81a5651d51fe67a0a4f7af88d2e20a0e29babf294c98b0dbf289c10f5c0abf0be1c091e8b
+Size (php-xdebug/xdebug-3.0.1.tgz) = 214467 bytes
+SHA1 (patch-src_debugger_com.c) = 2adde8e26ab11901241de9da710a07400cdc154a

Index: pkgsrc/devel/php-xdebug/patches/patch-src_debugger_com.c
diff -u pkgsrc/devel/php-xdebug/patches/patch-src_debugger_com.c:1.1 pkgsrc/devel/php-xdebug/patches/patch-src_debugger_com.c:1.2
--- pkgsrc/devel/php-xdebug/patches/patch-src_debugger_com.c:1.1        Sat Sep 19 13:35:16 2020
+++ pkgsrc/devel/php-xdebug/patches/patch-src_debugger_com.c    Sun Jan  3 07:28:56 2021
@@ -1,29 +1,33 @@
-$NetBSD: patch-src_debugger_com.c,v 1.1 2020/09/19 13:35:16 taca Exp $
+$NetBSD: patch-src_debugger_com.c,v 1.2 2021/01/03 07:28:56 taca Exp $
 
 Use standard value for second argument of setsockopt(2).
 
---- src/debugger/com.c.orig    2020-09-16 14:14:16.000000000 +0000
+--- src/debugger/com.c.orig    2020-12-04 15:57:15.000000000 +0000
 +++ src/debugger/com.c
-@@ -106,19 +106,19 @@ void set_keepalive_options(int fd)
+@@ -109,7 +109,7 @@ void set_keepalive_options(int fd)
        }
  
        optval = 600;
 -      ret = setsockopt(fd, SOL_TCP, TCP_KEEPIDLE, &optval, optlen);
 +      ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen);
        if (ret) {
+               xdebug_log_ex(XLOG_CHAN_DEBUG, XLOG_WARN, "KEEPALIVE", "Could not set TCP_KEEPIDLE to %d: %s.", optval, strerror(errno));
                return;
-       }
+@@ -117,7 +117,7 @@ void set_keepalive_options(int fd)
  
+ # if defined(TCP_KEEPCNT)
        optval = 20;
 -      ret = setsockopt(fd, SOL_TCP, TCP_KEEPCNT, &optval, optlen);
 +      ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen);
        if (ret) {
+               xdebug_log_ex(XLOG_CHAN_DEBUG, XLOG_WARN, "KEEPALIVE", "Could not set TCP_KEEPCNT to %d: %s.", optval, strerror(errno));
                return;
-       }
+@@ -126,7 +126,7 @@ void set_keepalive_options(int fd)
  
+ # if defined(TCP_KEEPINTVL)
        optval = 60;
 -      ret = setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &optval, optlen);
 +      ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen);
        if (ret) {
+               xdebug_log_ex(XLOG_CHAN_DEBUG, XLOG_WARN, "KEEPALIVE", "Could not set TCP_KEEPINTVL to %d: %s.", optval, strerror(errno));
                return;
-       }