php-pecl-xdebug: upstream patch for pecl/couchbase

2 files changed, 58 insertions, 1 deletions

diff --git a/php-pecl-xdebug.spec b/php-pecl-xdebug.spec
index ccd0e29..2d314ae 100644
--- a/php-pecl-xdebug.spec
+++ b/php-pecl-xdebug.spec
@@ -30,13 +30,17 @@
 Name:           %{?scl_prefix}php-pecl-xdebug
 Summary:        PECL package for debugging PHP scripts
 Version:        2.2.6
-Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 %if 0%{?gitver:1}
 Source0:        https://github.com/%{pecl_name}/%{pecl_name}/archive/%{commit}/%{pecl_name}-%{version}-%{gitver}.tar.gz
 %else
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 %endif
 
+# http://bugs.xdebug.org/view.php?id=1087
+# https://www.couchbase.com/issues/browse/PCBC-294
+Patch0:         %{pecl_name}-upstream.patch
+
 # The Xdebug License, version 1.01
 # (Based on "The PHP License", version 3.0)
 License:        PHP
@@ -115,6 +119,7 @@ mv %{pecl_name}-%{version}%{?prever} NTS
 %endif
 
 cd NTS
+%patch0 -p1 -b .upstream
 
 # Check extension version
 ver=$(sed -n '/XDEBUG_VERSION/{s/.* "//;s/".*$//;p}' php_xdebug.h)
@@ -254,6 +259,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec  3 2014 Remi Collet <remi@fedoraproject.org> - 2.2.6-2
+- add upstream patch for couchbase compatibility
+  see http://bugs.xdebug.org/view.php?id=1087
+
 * Sun Nov 16 2014 Remi Collet <remi@fedoraproject.org> - 2.2.6-1
 - Update to 2.2.6 (stable)
 
diff --git a/xdebug-upstream.patch b/xdebug-upstream.patch
new file mode 100644
index 0000000..aa26c76
--- /dev/null
+++ b/xdebug-upstream.patch
@@ -0,0 +1,48 @@
+From a55460a63144ba32d3817c1e70a091a579c44478 Mon Sep 17 00:00:00 2001
+From: Derick Rethans <github@derickrethans.nl>
+Date: Sun, 23 Nov 2014 17:53:30 +0000
+Subject: [PATCH] Fixed bug #1087: zend_execute_script or zend_eval_string in
+ RINIT segfaults.
+
+---
+ xdebug.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/xdebug.c b/xdebug.c
+index 8bd4f61..1b3517c 100644
+--- a/xdebug.c
++++ b/xdebug.c
+@@ -1588,7 +1588,9 @@ void xdebug_execute_internal(zend_execute_data *current_execute_data, struct _ze
+ 		}
+ 	}
+ 
+-	xdebug_llist_remove(XG(stack), XDEBUG_LLIST_TAIL(XG(stack)), xdebug_stack_element_dtor);
++	if (XG(stack)) {
++		xdebug_llist_remove(XG(stack), XDEBUG_LLIST_TAIL(XG(stack)), xdebug_stack_element_dtor);
++	}
+ 	XG(level)--;
+ }
+ 
+From dcb38d5053e9df32506aeabc8eb09d8370e5641f Mon Sep 17 00:00:00 2001
+From: Derick Rethans <github@derickrethans.nl>
+Date: Sun, 23 Nov 2014 22:51:43 +0000
+Subject: [PATCH] Fixed segfaults with ZTS on PHP 5.6
+
+Find through Travis, it's already being useful!
+---
+ xdebug.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/xdebug.c b/xdebug.c
+index 1b3517c..b8c9d5a 100644
+--- a/xdebug.c
++++ b/xdebug.c
+@@ -314,6 +314,8 @@ static void php_xdebug_init_globals (zend_xdebug_globals *xg TSRMLS_DC)
+ 	xg->output_is_tty        = OUTPUT_NOT_CHECKED;
+ 	xg->stdout_mode          = 0;
+ 	xg->in_at                = 0;
++	xg->active_execute_data  = NULL;
++	xg->active_op_array      = NULL;
+ 
+ 	xdebug_llist_init(&xg->server, xdebug_superglobals_dump_dtor);
+ 	xdebug_llist_init(&xg->get, xdebug_superglobals_dump_dtor);