import CS php-pecl-xdebug3-3.3.1-1.module_el9+1148+4d3da9e4

.gitignore

@@ -1 +1 @@
-SOURCES/xdebug-3.1.2-52911af.tar.gz
+SOURCES/xdebug-3.3.1-1943c47.tar.gz

.php-pecl-xdebug3.metadata

@@ -1 +1 @@
-0d487e5ba43ac5bcb4f659a54c700e5887012ecc SOURCES/xdebug-3.1.2-52911af.tar.gz
+e194df0a362daf71fa90d9cb7a91817270385120 SOURCES/xdebug-3.3.1-1943c47.tar.gz

SPECS/php-pecl-xdebug3.spec

@@ -1,6 +1,6 @@
 # Fedora spec file for php-pecl-xdebug3
 #
-# Copyright (c) 2010-2021 Remi Collet
+# Copyright (c) 2010-2023 Remi Collet
 # Copyright (c) 2006-2009 Christopher Stone
 #
 # License: MIT
@@ -9,20 +9,15 @@
 # Please, preserve the changelog entries
 #
 
-%bcond_without      tests
+%bcond_without     tests
-
-# we don't want -z defs linker flag
-%undefine _strict_symbol_defs_build
 
 %global pecl_name  xdebug
 %global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
-%global gh_commit  52911afee0d66f4569d71d25bb9532c8fab9d5f5
+%global gh_commit  1943c479139008da3f9d26a4e2a6005e75c5ab34
 %global gh_short   %(c=%{gh_commit}; echo ${c:0:7})
 
 # version/release
-%global upstream_version 3.1.2
+%global upstream_version 3.3.1
-#global upstream_prever  RC1
-#global upstream_lower   rc1
 
 # XDebug should be loaded after opcache
 %global ini_name  15-%{pecl_name}.ini
@@ -33,18 +28,17 @@ Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
 Release:        1%{?dist}
 Source0:        https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz
 
-# The Xdebug License, version 1.01
+License:        Xdebug-1.03
-# (Based on "The PHP License", version 3.0)
-License:        BSD
 URL:            https://xdebug.org/
 
 BuildRequires:  gcc
 BuildRequires:  make
-BuildRequires:  php-devel >= 7.2
+BuildRequires:  php-devel >= 8.0
 BuildRequires:  php-pear
 BuildRequires:  php-simplexml
 BuildRequires:  libtool
 BuildRequires:  php-soap
+BuildRequires:  pkgconfig(zlib) >= 1.2.9
 
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
@@ -54,14 +48,10 @@ Provides:       php-%{pecl_name}%{?_isa}      = %{version}
 Provides:       php-pecl(Xdebug)              = %{version}
 Provides:       php-pecl(Xdebug)%{?_isa}      = %{version}
 
-%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9 || "%{php_version}" > "8.0"
+# package was renamed on new major version
-Obsoletes:     php-pecl-%{pecl_name}          < 3
+Obsoletes:      php-pecl-%{pecl_name}         < 3
-Provides:      php-pecl-%{pecl_name}          = %{version}-%{release}
+Provides:       php-pecl-%{pecl_name}         = %{version}-%{release}
-Provides:      php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
+Provides:       php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
-%else
-# A single version can be installed
-Conflicts:     php-pecl-%{pecl_name}          < 3
-%endif
 
 %description
 The Xdebug extension helps you debugging your script by providing a lot of
@@ -92,11 +82,6 @@ mv NTS/package.xml .
 sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
 
 cd NTS
-# ignore tests relying on DNS
-find tests -type f -exec grep -q 'xdebug.client_host=' {} \; -delete -print
-# ignore test with erratic result
-rm tests/debugger/start_with_request_default_no_env.phpt
-
 # 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
@@ -110,15 +95,16 @@ cd ..
 cp -pr NTS ZTS
 %endif
 
-cat << 'EOF' | tee %{ini_name}
+cat << 'EOF' >%{ini_name}
 ; Enable xdebug extension module
 zend_extension=%{pecl_name}.so
 
 ; Configuration
 ; See https://xdebug.org/docs/all_settings
-
 EOF
-sed -e '1d' NTS/%{pecl_name}.ini >>%{ini_name}
+sed -e '1,2d' NTS/%{pecl_name}.ini >>%{ini_name}
+
+head -n15 <%{ini_name}
 
 
 %build
@@ -126,6 +112,7 @@ cd NTS
 %{_bindir}/phpize
 %configure \
     --enable-xdebug  \
+    --with-xdebug-compression \
     --with-php-config=%{_bindir}/php-config
 make %{?_smp_mflags}
 
@@ -134,6 +121,7 @@ cd ../ZTS
 %{_bindir}/zts-phpize
 %configure \
     --enable-xdebug  \
+    --with-xdebug-compression \
     --with-php-config=%{_bindir}/zts-php-config
 make %{?_smp_mflags}
 %endif
@@ -173,11 +161,26 @@ for mod in simplexml; do
   fi
 done
 
-# only check if build extension can be loaded
+: check if NTS extension can be loaded
-%{_bindir}/php \
+%{__php} \
     --no-php-ini \
     --define zend_extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
-    --modules | grep Xdebug
+    --modules | grep '^Xdebug$'
+
+: check if provided config file is usable
+%{__php} \
+    --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} \
+    -c %{buildroot}%{php_inidir}/%{ini_name} -v 2>err.log \
+        | grep 'with Xdebug v%{upstream_version}%{?upstream_prever}'
+if [ -s err.log ]; then
+    cat err.log
+    exit 1
+fi
 
 %if %{with_zts}
 %{_bindir}/zts-php \
@@ -190,10 +193,14 @@ done
 cd NTS
 : Upstream test suite NTS extension
 
-%ifarch %{ix86}
+# ignore tests relying on DNS
+find tests -type f -exec grep -q 'xdebug.client_host=' {} \; -delete -print
+# ignore test with erratic result
+rm tests/debugger/start_with_request_default_no_env.phpt
 # see https://bugs.xdebug.org/view.php?id=2048
 rm tests/base/bug02036.phpt
-%endif
+# Erratic result
+rm tests/debugger/bug00998-ipv6.phpt
 
 # bug00886 is marked as slow as it uses a lot of disk space
 TEST_OPTS="-q -x --show-diff"
@@ -222,6 +229,18 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Tue Dec  3 2024 Remi Collet <rcollet@redhat.com> - 3.3.1-1
+- update to 3.3.1 for PHP 8.3
+
+* Wed Nov 29 2023 Remi Collet <rcollet@redhat.com> - 3.2.2-2
+- drop inet_ntoa usage using upstream patch
+
+* Fri Nov 24 2023 Remi Collet <rcollet@redhat.com> - 3.2.2-1
+- update to 3.2.2 for PHP 8.2 RHEL-14699
+
+* Mon May 16 2022 Remi Collet <rcollet@redhat.com> - 3.1.4-1
+- update to 3.1.4 for PHP 8.1 #2070040
+
 * Fri Dec 10 2021 Remi Collet <rcollet@redhat.com> - 3.1.2-1
 - update to 3.1.2 rhbz#2030322