diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-05-27 13:08:56 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-05-27 13:08:56 +0200 |
| commit | 34b94266a02351392a4a8371098de9c3f9313a4a (patch) | |
| tree | d559b1dff0033e5cef0ddfd57622d07687d7d5f8 | |
| parent | 10d4f4df1c2608a6d9366d65f5ddd77578ee1dad (diff) | |
php-pecl-xdebug: add patch for efree/str_efree with php 5.6
| -rw-r--r-- | php-pecl-xdebug.spec | 13 | ||||
| -rw-r--r-- | xdebug-pr176.patch | 22 |
2 files changed, 33 insertions, 2 deletions
diff --git a/php-pecl-xdebug.spec b/php-pecl-xdebug.spec index 2ac72cf..bdb3821 100644 --- a/php-pecl-xdebug.spec +++ b/php-pecl-xdebug.spec @@ -1,4 +1,7 @@ -# spec file for php-pecl-xdebug +# remirepo spec file for php-pecl-xdebug +# with SCL compatibility, from: +# +# Fedora spec file for php-pecl-xdebug # # Copyright (c) 2010-2015 Remi Collet # Copyright (c) 2006-2009 Christopher Stone @@ -30,7 +33,7 @@ Name: %{?scl_prefix}php-pecl-xdebug Summary: PECL package for debugging PHP scripts Version: 2.3.2 -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 3%{?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 @@ -40,6 +43,8 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz # https://github.com/xdebug/xdebug/pull/172 # https://bugzilla.redhat.com/1214111 Patch0: %{pecl_name}-pr172.patch +# https://github.com/xdebug/xdebug/pull/176 +Patch1: %{pecl_name}-pr176.patch # The Xdebug License, version 1.01 # (Based on "The PHP License", version 3.0) @@ -118,6 +123,7 @@ mv %{pecl_name}-%{version}%{?prever} NTS cd NTS %patch0 -p1 -b .pr172 +%patch1 -p1 -b .pr176 # Check extension version ver=$(sed -n '/XDEBUG_VERSION/{s/.* "//;s/".*$//;p}' php_xdebug.h) @@ -265,6 +271,9 @@ rm -rf %{buildroot} %changelog +* Wed May 27 2015 Remi Collet <remi@fedoraproject.org> - 2.3.2-3 +- add patch for efree/str_efree in php 5.6 + * Wed Apr 22 2015 Remi Collet <remi@fedoraproject.org> - 2.3.2-2 - add patch for virtual_file_ex in 5.6 #1214111 diff --git a/xdebug-pr176.patch b/xdebug-pr176.patch new file mode 100644 index 0000000..ea8eef7 --- /dev/null +++ b/xdebug-pr176.patch @@ -0,0 +1,22 @@ +From 2358ad26cd4db2806180aca61a7ccaceb19fa526 Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Wed, 27 May 2015 11:34:09 +0200 +Subject: [PATCH] switch from efree to STR_FREE + +--- + xdebug_stack.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xdebug_stack.c b/xdebug_stack.c +index 56304bf..82707f1 100644 +--- a/xdebug_stack.c ++++ b/xdebug_stack.c +@@ -247,7 +247,7 @@ void xdebug_append_error_description(xdebug_str *str, int html, const char *erro + xdebug_str_add(str, xdebug_sprintf(formats[1], error_type_str, escaped, error_filename, error_lineno), 1); + } + +- efree(escaped); ++ STR_FREE(escaped); + } + + void xdebug_append_printable_stack(xdebug_str *str, int html TSRMLS_DC) |