ports/182532: [PATCH] devel/pecl-xhprof: update to 0.9.3
Gasol Wu
gasol.wu at gmail.com
Tue Oct 1 03:50:01 UTC 2013
>Number: 182532
>Category: ports
>Synopsis: [PATCH] devel/pecl-xhprof: update to 0.9.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 01 03:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Gasol Wu
>Release: FreeBSD 9.1-RELEASE-p6 amd64
>Organization:
>Environment:
System: FreeBSD goingmarry 9.1-RELEASE-p6 FreeBSD 9.1-RELEASE-p6 #0: Wed Aug 21 20:40:52 UTC 2013
>Description:
- Update to 0.9.3
- The patch has merged to upstream, See https://github.com/facebook/xhprof/pull/15
Port maintainer (ports at mcdermottroe.com) is cc'd.
Generated with FreeBSD Port Tools 0.99_8 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:
--- pecl-xhprof-0.9.3.patch begins here ---
diff -ruN /usr/ports/devel/pecl-xhprof/Makefile ./Makefile
--- /usr/ports/devel/pecl-xhprof/Makefile 2013-09-21 01:13:42.000000000 +0800
+++ ./Makefile 2013-10-01 11:05:23.000000000 +0800
@@ -2,8 +2,7 @@
# $FreeBSD: devel/pecl-xhprof/Makefile 327724 2013-09-20 17:13:42Z bapt $
PORTNAME= xhprof
-PORTVERSION= 0.9.2
-PORTREVISION= 1
+PORTVERSION= 0.9.3
CATEGORIES= devel pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
diff -ruN /usr/ports/devel/pecl-xhprof/distinfo ./distinfo
--- /usr/ports/devel/pecl-xhprof/distinfo 2012-07-14 21:54:48.000000000 +0800
+++ ./distinfo 2013-10-01 11:05:58.000000000 +0800
@@ -1,2 +1,2 @@
-SHA256 (xhprof-0.9.2.tgz) = 5359ea0a1e16ec6c100dd7adb7285bdcc0f931e0b61631ea364f8b06925ea729
-SIZE (xhprof-0.9.2.tgz) = 931660
+SHA256 (xhprof-0.9.3.tgz) = 422c5269de3e3ff281f010584768b7753ceec6a9f4f858a8e171ec43358dbbf3
+SIZE (xhprof-0.9.3.tgz) = 841836
diff -ruN /usr/ports/devel/pecl-xhprof/files/patch-xhprof.c ./files/patch-xhprof.c
--- /usr/ports/devel/pecl-xhprof/files/patch-xhprof.c 2012-07-14 21:54:48.000000000 +0800
+++ ./files/patch-xhprof.c 1970-01-01 08:00:00.000000000 +0800
@@ -1,56 +0,0 @@
---- xhprof.c
-+++ xhprof.c
-@@ -28,6 +28,7 @@
- #include "php_ini.h"
- #include "ext/standard/info.h"
- #include "php_xhprof.h"
-+#include "Zend/zend_extensions.h"
- #include <sys/time.h>
- #include <sys/resource.h>
- #include <stdlib.h>
-@@ -898,7 +899,7 @@ static char *hp_get_base_filename(char *filename) {
- static char *hp_get_function_name(zend_op_array *ops TSRMLS_DC) {
- zend_execute_data *data;
- char *func = NULL;
-- char *cls = NULL;
-+ const char *cls = NULL;
- char *ret = NULL;
- int len;
- zend_function *curr_func;
-@@ -942,7 +943,12 @@ static char *hp_get_function_name(zend_op_array *ops TSRMLS_DC) {
- /* we are dealing with a special directive/function like
- * include, eval, etc.
- */
-+#if ZEND_EXTENSION_API_NO >= 220100525
-+ curr_op = data->opline->extended_value;
-+#else
- curr_op = data->opline->op2.u.constant.value.lval;
-+#endif
-+
- switch (curr_op) {
- case ZEND_EVAL:
- func = "eval";
-@@ -1660,13 +1666,22 @@ ZEND_DLEXPORT void hp_execute_internal(zend_execute_data *execute_data,
- if (!_zend_execute_internal) {
- /* no old override to begin with. so invoke the builtin's implementation */
- zend_op *opline = EX(opline);
-+#if ZEND_EXTENSION_API_NO >= 220100525
-+ temp_variable *retvar = &EX_T(opline->result.var);
-+ ((zend_internal_function *) EX(function_state).function)->handler(
-+ opline->extended_value,
-+ retvar->var.ptr,
-+ (EX(function_state).function->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) ?
-+ &retvar->var.ptr:NULL,
-+ EX(object), ret TSRMLS_CC);
-+#else
- ((zend_internal_function *) EX(function_state).function)->handler(
- opline->extended_value,
- EX_T(opline->result.u.var).var.ptr,
- EX(function_state).function->common.return_reference ?
- &EX_T(opline->result.u.var).var.ptr:NULL,
- EX(object), ret TSRMLS_CC);
--
-+#endif
- } else {
- /* call the old override */
- _zend_execute_internal(execute_data, ret TSRMLS_CC);
--- pecl-xhprof-0.9.3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list