svn commit: r470806 - in branches/2018Q2/lang/php56: . files
Florian Smeets
flo at FreeBSD.org
Thu May 24 19:53:44 UTC 2018
Author: flo
Date: Thu May 24 19:53:42 2018
New Revision: 470806
URL: https://svnweb.freebsd.org/changeset/ports/470806
Log:
MFH: r469895
Prevent php 5.6 (opcache) from segfaulting when compiled with clang 6.0
PR: 227723
Submitted by: dim
Reported by: flo, lampa at fit.vutbr.cz
Approved by: maintainer timeout
Approved by: ports-secteam (riggs)
Added:
branches/2018Q2/lang/php56/files/patch-Zend_zend__compile.h
- copied unchanged from r469895, head/lang/php56/files/patch-Zend_zend__compile.h
branches/2018Q2/lang/php56/files/patch-Zend_zend__execute.h
- copied unchanged from r469895, head/lang/php56/files/patch-Zend_zend__execute.h
Modified:
branches/2018Q2/lang/php56/Makefile
Directory Properties:
branches/2018Q2/ (props changed)
Modified: branches/2018Q2/lang/php56/Makefile
==============================================================================
--- branches/2018Q2/lang/php56/Makefile Thu May 24 19:45:55 2018 (r470805)
+++ branches/2018Q2/lang/php56/Makefile Thu May 24 19:53:42 2018 (r470806)
@@ -3,7 +3,7 @@
PORTNAME= php56
PORTVERSION= 5.6.35
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${PORTVERSION}
Copied: branches/2018Q2/lang/php56/files/patch-Zend_zend__compile.h (from r469895, head/lang/php56/files/patch-Zend_zend__compile.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q2/lang/php56/files/patch-Zend_zend__compile.h Thu May 24 19:53:42 2018 (r470806, copy of r469895, head/lang/php56/files/patch-Zend_zend__compile.h)
@@ -0,0 +1,12 @@
+--- Zend/zend_compile.h.orig 2018-02-27 23:15:25 UTC
++++ Zend/zend_compile.h
+@@ -414,9 +414,6 @@ struct _zend_execute_data {
+
+ #define EX(element) execute_data.element
+
+-#define EX_TMP_VAR(ex, n) ((temp_variable*)(((char*)(ex)) + ((int)(n))))
+-#define EX_TMP_VAR_NUM(ex, n) (EX_TMP_VAR(ex, 0) - (1 + (n)))
+-
+ #define EX_CV_NUM(ex, n) (((zval***)(((char*)(ex))+ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data))))+(n))
+
+
Copied: branches/2018Q2/lang/php56/files/patch-Zend_zend__execute.h (from r469895, head/lang/php56/files/patch-Zend_zend__execute.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q2/lang/php56/files/patch-Zend_zend__execute.h Thu May 24 19:53:42 2018 (r470806, copy of r469895, head/lang/php56/files/patch-Zend_zend__execute.h)
@@ -0,0 +1,18 @@
+--- Zend/zend_execute.h.orig 2018-02-27 23:15:25 UTC
++++ Zend/zend_execute.h
+@@ -71,6 +71,15 @@ ZEND_API int zend_eval_stringl_ex(char *str, int str_l
+ ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, ulong fetch_type, const char **class_name, zend_class_entry **pce TSRMLS_DC);
+ ZEND_API int zend_verify_arg_error(int error_type, const zend_function *zf, zend_uint arg_num, const char *need_msg, const char *need_kind, const char *given_msg, const char *given_kind TSRMLS_DC);
+
++static zend_always_inline temp_variable *EX_TMP_VAR(void *ex, int n)
++{
++ return (temp_variable *)((zend_uintptr_t)ex + n);
++}
++static inline temp_variable *EX_TMP_VAR_NUM(void *ex, int n)
++{
++ return (temp_variable *)((zend_uintptr_t)ex - (1 + n) * sizeof(temp_variable));
++}
++
+ static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC TSRMLS_DC)
+ {
+ if (!Z_DELREF_P(zval_ptr)) {
More information about the svn-ports-all
mailing list