summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--916.patch23
-rw-r--r--PHPINFO3
-rw-r--r--REFLECTION5
-rw-r--r--php-pecl-xdebug3.spec40
4 files changed, 37 insertions, 34 deletions
diff --git a/916.patch b/916.patch
deleted file mode 100644
index ef61153..0000000
--- a/916.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d9a61214ca40418dba961858029dc00e79977056 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Sun, 22 Oct 2023 08:55:38 +0200
-Subject: [PATCH] Update xdebug.ini
-
----
- xdebug.ini | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/xdebug.ini b/xdebug.ini
-index c983bef23..9d091b4c7 100644
---- a/xdebug.ini
-+++ b/xdebug.ini
-@@ -1,9 +1,5 @@
- ; This file is generated by the 'xdebug.org:html/docs/convert.php' robot
--<<<<<<< Updated upstream
--; for Xdebug 3.3.0alpha2 — do not modify by hand
--=======
- ; for Xdebug 3.3.0alpha3 — do not modify by hand
-->>>>>>> Stashed changes
-
- ; -----------------------------------------------------------------------------
- ; xdebug.cli_color
diff --git a/PHPINFO b/PHPINFO
index e587352..f392fb3 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -10,7 +10,7 @@ xdebug
 __/ |
 |___/
-Version => 3.3.0alpha3
+Version => 3.3.0
Support Xdebug on Patreon, GitHub, or as a business: https://xdebug.org/support
Enabled Features (through 'xdebug.mode' setting)
@@ -38,6 +38,7 @@ xdebug.use_compression => 1 => 1
xdebug.trigger_value => no value => no value
xdebug.file_link_format => no value => no value
xdebug.filename_format => no value => no value
+xdebug.control_socket => time: 25ms => time: 25ms
xdebug.log => no value => no value
xdebug.log_level => 7 => 7
xdebug.var_display_max_children => 128 => 128
diff --git a/REFLECTION b/REFLECTION
index 2790b69..0579f6c 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #16 xdebug version 3.3.0alpha3 ] {
+Extension [ <persistent> extension #17 xdebug version 3.3.0 ] {
- INI {
Entry [ xdebug.mode <SYSTEM> ]
@@ -25,6 +25,9 @@ Extension [ <persistent> extension #16 xdebug version 3.3.0alpha3 ] {
Entry [ xdebug.filename_format <ALL> ]
Current = ''
}
+ Entry [ xdebug.control_socket <ALL> ]
+ Current = 'time'
+ }
Entry [ xdebug.log <ALL> ]
Current = ''
}
diff --git a/php-pecl-xdebug3.spec b/php-pecl-xdebug3.spec
index eca64fb..46d5397 100644
--- a/php-pecl-xdebug3.spec
+++ b/php-pecl-xdebug3.spec
@@ -16,16 +16,22 @@
%bcond_without tests
+%if 0%{?rhel} == 7
+%bcond_with zlib
+%else
+%bcond_without zlib
+%endif
+
%global pecl_name xdebug
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
-%global gh_commit a03bda14ba866a34e7f90399078c73eadb1ecbfe
+%global gh_commit 15d672e84caa6015d1b2b509aa13a0528d6e9a7e
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20201011
# version/release
%global upstream_version 3.3.0
-%global upstream_prever alpha3
-%global upstream_lower %(echo %{upstream_prever} | tr '[:upper:]' '[:lower:]')
+#global upstream_prever alpha3
+#global upstream_lower %%(echo %%{upstream_prever} | tr '[:upper:]' '[:lower:]')
%global sources src
%global _configure ../%{sources}/configure
@@ -38,15 +44,13 @@ Version: %{upstream_version}%{?upstream_lower:~%{upstream_lower}}
%if 0%{?gh_date:1}
Release: 1.%{gh_date}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
%else
-Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
%endif
License: Xdebug-1.03
URL: https://xdebug.org/
Source0: https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz
-Patch0: https://patch-diff.githubusercontent.com/raw/xdebug/xdebug/pull/916.patch
-
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 8.0
@@ -55,6 +59,9 @@ BuildRequires: %{?scl_prefix}php-pear
BuildRequires: %{?scl_prefix}php-simplexml
BuildRequires: libtool
BuildRequires: %{?scl_prefix}php-soap
+%if %{with zlib}
+BuildRequires: pkgconfig(zlib) >= 1.2.9
+%endif
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
@@ -132,8 +139,6 @@ mv %{sources}/package.xml .
%{?_licensedir: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
@@ -154,7 +159,6 @@ zend_extension=%{pecl_name}.so
; Configuration
; See https://xdebug.org/docs/all_settings
-
EOF
sed -e '1,2d' %{sources}/%{pecl_name}.ini >>%{ini_name}
@@ -170,6 +174,11 @@ cd %{sources}
cd ../NTS
%configure \
--enable-xdebug \
+%if %{with zlib}
+ --with-xdebug-compression \
+%else
+ --without-xdebug-compression \
+%endif
--with-php-config=%{__phpconfig}
make %{?_smp_mflags}
@@ -177,6 +186,11 @@ make %{?_smp_mflags}
cd ../ZTS
%configure \
--enable-xdebug \
+%if %{with zlib}
+ --with-xdebug-compression \
+%else
+ --without-xdebug-compression \
+%endif
--with-php-config=%{__ztsphpconfig}
make %{?_smp_mflags}
%endif
@@ -230,6 +244,7 @@ done
--no-php-ini \
-d extension_dir=%{buildroot}%{php_extdir} \
-c %{buildroot}%{php_inidir}/%{ini_name} -v
+
%{__php} \
--no-php-ini \
-d extension_dir=%{buildroot}%{php_extdir} \
@@ -250,6 +265,10 @@ fi
%if %{with tests}
cd %{sources}
+%if %{without zlib}
+rm tests/profiler/bug02001-no-zlib-compression.phpt
+rm tests/tracing/start_no_zlib_compression.phpt
+%endif
: Upstream test suite NTS extension
# bug00886 is marked as slow as it uses a lot of disk space
@@ -298,6 +317,9 @@ fi
%changelog
+* Fri Dec 1 2023 Remi Collet <remi@remirepo.net> - 3.3.0-1
+- update to 3.3.0
+
* Sun Oct 22 2023 Remi Collet <remi@remirepo.net> - 3.3.0~alpha3-2
- fix configuration file using patch from
https://github.com/xdebug/xdebug/pull/916