v3.3.1

.gitignore

@@ -20,3 +20,4 @@
 /xdebug-3.3.0alpha2-9b96425.tar.gz
 /xdebug-3.3.0alpha3-a03bda1.tar.gz
 /xdebug-3.3.0-15d672e.tar.gz
+/xdebug-3.3.1-1943c47.tar.gz

php-pecl-xdebug3.spec

@@ -13,11 +13,11 @@
 
 %global pecl_name  xdebug
 %global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
-%global gh_commit  15d672e84caa6015d1b2b509aa13a0528d6e9a7e
+%global gh_commit  1943c479139008da3f9d26a4e2a6005e75c5ab34
 %global gh_short   %(c=%{gh_commit}; echo ${c:0:7})
 
 # version/release
-%global upstream_version 3.3.0
+%global upstream_version 3.3.1
 #global upstream_prever  alpha3
 #global upstream_lower   %%(echo %%{upstream_prever} | tr '[:upper:]' '[:lower:]')
 %global sources          src
@@ -32,8 +32,6 @@ Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
 Release:        2%{?dist}
 Source0:        https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz
 
-Patch0:         upstream.patch
-
 License:        Xdebug-1.03
 URL:            https://xdebug.org/
 
@@ -89,8 +87,6 @@ mv %{sources}/package.xml .
 sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
 
 cd %{sources}
-%patch -P0 -p1
-
 # Check extension version
 ver=$(sed -n '/XDEBUG_VERSION/{s/.* "//;s/".*$//;p}' php_xdebug.h)
 if test "$ver" != "%{upstream_version}%{?upstream_prever}%{?gh_date:-dev}"; then
@@ -237,6 +233,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Fri Dec 15 2023 Remi Collet <remi@remirepo.net> - 3.3.1-1
+- update to 3.3.1
+
 * Mon Dec 11 2023 Remi Collet <remi@remirepo.net> - 3.3.0-2
 - add upstream patch for test suite
 

sources

@@ -1 +1 @@
-SHA512 (xdebug-3.3.0-15d672e.tar.gz) = e243417570813709953f451648a75fa09848e6dca16114ed40bbbf51ec2c95ddea6cabd153651cc1fa43f2ea6ff3c046a9bbdfee615df7424f35c95ce5094bb5
+SHA512 (xdebug-3.3.1-1943c47.tar.gz) = 98d3e3fba14df2301bf13b27e973e14321074faad38d963e3a6108e6b2b9c727004a93a8986be46e6de4ab86579da963175179266666a5de6119dabe73348c30

upstream.patch

@@ -1,40 +0,0 @@
-From adff1261e4fd3baf6e819e342f08fbe5c84c8d4d Mon Sep 17 00:00:00 2001
-From: Derick Rethans <github@derickrethans.nl>
-Date: Mon, 11 Dec 2023 14:56:50 +0000
-Subject: [PATCH] Fixed test robustness
-
----
- tests/debugger/bug01388-08.phpt  | 4 ++--
- tests/debugger/bug02006-001.phpt | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/debugger/bug01388-08.phpt b/tests/debugger/bug01388-08.phpt
-index e37fa6369..df1fec064 100644
---- a/tests/debugger/bug01388-08.phpt
-+++ b/tests/debugger/bug01388-08.phpt
-@@ -50,10 +50,10 @@ dbgpRunFile( $filename, $commands );
- 
- -> run -i 6
- <?xml version="1.0" encoding="iso-8859-1"?>
--<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-08b.inc" lineno="2" state="enabled" hit_count="0" hit_value="0" id="{{PID}}0001"></breakpoint></notify>
-+<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-08b.inc" lineno="%r(2|9)%r" state="enabled" hit_count="0" hit_value="0" id="{{PID}}000%r(1|2)%r"></breakpoint></notify>
- 
- <?xml version="1.0" encoding="iso-8859-1"?>
--<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-08b.inc" lineno="9" state="enabled" hit_count="0" hit_value="0" id="{{PID}}0002"></breakpoint></notify>
-+<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-08b.inc" lineno="%r(2|9)%r" state="enabled" hit_count="0" hit_value="0" id="{{PID}}000%r(1|2)%r"></breakpoint></notify>
- 
- <?xml version="1.0" encoding="iso-8859-1"?>
- <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="run" transaction_id="6" status="break" reason="ok"><xdebug:message filename="file://bug01388-08b.inc" lineno="2"></xdebug:message></response>
-diff --git a/tests/debugger/bug02006-001.phpt b/tests/debugger/bug02006-001.phpt
-index 908480701..b52218bff 100644
---- a/tests/debugger/bug02006-001.phpt
-+++ b/tests/debugger/bug02006-001.phpt
-@@ -35,7 +35,7 @@ dbgpRunFile( $filename, $commands );
- 
- -> breakpoint_list -i 3
- <?xml version="1.0" encoding="iso-8859-1"?>
--<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="breakpoint_list" transaction_id="3"><breakpoint type="call" function="a" state="enabled" hit_count="0" hit_value="0" id="{{PID}}0001"></breakpoint><breakpoint type="call" function="b" state="enabled" hit_count="0" hit_value="0" id="{{PID}}0002"></breakpoint></response>
-+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="breakpoint_list" transaction_id="3"><breakpoint type="call" function="%r(a|b)%r" state="enabled" hit_count="0" hit_value="0" id="{{PID}}000%r(1|2)%r"></breakpoint><breakpoint type="call" function="%r(a|b)%r" state="enabled" hit_count="0" hit_value="0" id="{{PID}}000%r(1|2)%r"></breakpoint></response>
- 
- -> breakpoint_remove -i 4 -d %d0001
- <?xml version="1.0" encoding="iso-8859-1"?>