[php-pecl-xdebug/el6] - raise dependency on php 5.3.3-38 which fix #1053301 - fix always returns '200 OK' status despite P
Remi Collet
remi at fedoraproject.org
Thu Nov 13 10:19:57 UTC 2014
commit 6fd844aa8e0f3e744fb634547d2b6bccdaa0c336
Author: Remi Collet <remi at fedoraproject.org>
Date: Thu Nov 13 11:19:47 2014 +0100
- raise dependency on php 5.3.3-38 which fix #1053301
- fix always returns '200 OK' status despite PHP syntax error
php-pecl-xdebug.spec | 13 +++++++++++--
xdebug-retcode.patch | 12 ++++++++++++
2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/php-pecl-xdebug.spec b/php-pecl-xdebug.spec
index 0f783aa..bf3cd12 100644
--- a/php-pecl-xdebug.spec
+++ b/php-pecl-xdebug.spec
@@ -6,7 +6,7 @@
Name: php-pecl-xdebug
Version: 2.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: PECL package for debugging PHP scripts
# The Xdebug License, version 1.01
@@ -16,9 +16,12 @@ Group: Development/Languages
URL: http://pecl.php.net/package/xdebug
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+# See https://bugzilla.redhat.com/1053301
+Patch0: %{pecl_name}-retcode.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-pear >= 1:1.4.9-1.2
-BuildRequires: php-devel >= 5.1.0
+BuildRequires: php-devel >= 5.3.3-38
BuildRequires: php-devel < 5.4.0
BuildRequires: libedit-devel
@@ -37,6 +40,7 @@ Requires: php(api) = %{php_core_api}
%else
Requires: php-api = %{php_apiver}
%endif
+Requires: php-common >= 5.3.3-38
# RPM 4.8
@@ -70,6 +74,7 @@ Xdebug also provides:
cd %{pecl_name}-%{version}
# package.xml is V1, package2.xml is V2
mv ../package2.xml %{pecl_name}.xml
+%patch0 -p1 -b .retcode
# fix rpmlint warnings
iconv -f iso8859-1 -t utf-8 Changelog > Changelog.conv && mv -f Changelog.conv Changelog
@@ -153,6 +158,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Nov 13 2014 Remi Collet <remi at fedoraproject.org> - 2.1.4-2
+- raise dependency on php 5.3.3-38 which fix #1053301
+- fix always returns '200 OK' status despite PHP syntax error
+
* Sat Mar 17 2012 Remi Collet <remi at fedoraproject.org> - 2.1.4-1
- update to 2.1.4
- fix License which is PHP, with some renaming
diff --git a/xdebug-retcode.patch b/xdebug-retcode.patch
new file mode 100644
index 0000000..00d3323
--- /dev/null
+++ b/xdebug-retcode.patch
@@ -0,0 +1,12 @@
+diff -up xdebug-2.1.4/xdebug_stack.c.old xdebug-2.1.4/xdebug_stack.c
+--- xdebug-2.1.4/xdebug_stack.c.old 2014-11-13 11:05:09.832149940 +0100
++++ xdebug-2.1.4/xdebug_stack.c 2014-11-13 11:08:44.437961456 +0100
+@@ -600,7 +600,7 @@ void xdebug_error_cb(int type, const cha
+ }
+ xdfree(error_type_str);
+
+-#if PHP_VERSION_ID < 50400
++#if 0
+
+ /* Bail out if we can't recover */
+ switch (type) {
More information about the scm-commits
mailing list