From f4300cc374acb5890ce9bb2ce40bcf7a979e0f88 Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Tue, 5 Jun 2018 15:04:42 +0000 Subject: [PATCH 1/4] Update NEWS for PHP 7.2.7RC1 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index b9f6635825b1d..1528f989f84ed 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2018, PHP 7.2.7 +07 Jun 2018, PHP 7.2.7RC1 - Core: . Fixed bug #76337 (segfault when opcache enabled + extension use From c5b295d8ec432b14fde80a2b82b1faa0fb52c52c Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Tue, 5 Jun 2018 15:31:09 +0000 Subject: [PATCH 2/4] Update NEWS for 7.2.7 --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 1528f989f84ed..eaeb19178c083 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ??? ????, PHP 7.2.7 + + 07 Jun 2018, PHP 7.2.7RC1 - Core: From 4fbbcc8cc32503e5d8aecf88cc4a92979deaec0b Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Tue, 19 Jun 2018 10:10:03 -0400 Subject: [PATCH 3/4] Nothing between 7.2.7 RC1 and GA --- NEWS | 3 --- 1 file changed, 3 deletions(-) diff --git a/NEWS b/NEWS index eaeb19178c083..ec05a6caecda9 100644 --- a/NEWS +++ b/NEWS @@ -2,9 +2,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.2.7 - -07 Jun 2018, PHP 7.2.7RC1 - - Core: . Fixed bug #76337 (segfault when opcache enabled + extension use zend_register_class_alias). (xKhorasan) From e4f488a52ca67366db98fe58643197aef3211055 Mon Sep 17 00:00:00 2001 From: Yordan Gigov Date: Wed, 27 Jun 2018 12:52:50 +0300 Subject: [PATCH 4/4] Fix building of gd extension under Ubuntu --- ext/gd/config.m4 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 1edd91f4ad61f..c92578c060f69 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -42,6 +42,8 @@ dnl dnl Checks for the configure options dnl +MACHINE_INCLUDES=$($CC -dumpmachine) + AC_DEFUN([PHP_GD_ZLIB],[ if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then @@ -50,6 +52,12 @@ AC_DEFUN([PHP_GD_ZLIB],[ elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then PHP_ZLIB_DIR="$PHP_ZLIB_DIR" PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" + elif test -f "$PHP_ZLIB_DIR/include/$MACHINE_INCLUDES/zlib/zlib.h"; then + PHP_ZLIB_DIR="$PHP_ZLIB_DIR" + PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/$MACHINE_INCLUDES/zlib" + elif test -f "$PHP_ZLIB_DIR/include/$MACHINE_INCLUDES/zlib.h"; then + PHP_ZLIB_DIR="$PHP_ZLIB_DIR" + PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/$MACHINE_INCLUDES" else AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"]) fi @@ -61,6 +69,12 @@ AC_DEFUN([PHP_GD_ZLIB],[ elif test -f "$i/include/zlib.h"; then PHP_ZLIB_DIR="$i" PHP_ZLIB_INCDIR="$i/include" + elif test -f "$i/include/$MACHINE_INCLUDES/zlib/zlib.h"; then + PHP_ZLIB_DIR="$i" + PHP_ZLIB_INCDIR="$i/include/$MACHINE_INCLUDES/zlib" + elif test -f "$i/include/$MACHINE_INCLUDES/zlib.h"; then + PHP_ZLIB_DIR="$i" + PHP_ZLIB_INCDIR="$i/include/$MACHINE_INCLUDES" fi done fi @@ -71,6 +85,7 @@ AC_DEFUN([PHP_GD_WEBP],[ for i in $PHP_WEBP_DIR /usr/local /usr; do test -f $i/include/webp/decode.h && GD_WEBP_DIR=$i && break + test -f $i/include/$MACHINE_INCLUDES/webp/decode.h && GD_WEBP_DIR=$i && break done if test -z "$GD_WEBP_DIR"; then @@ -79,6 +94,7 @@ AC_DEFUN([PHP_GD_WEBP],[ for i in $PHP_WEBP_DIR /usr/local /usr; do test -f $i/include/webp/encode.h && GD_WEBP_DIR=$i && break + test -f $i/include/$MACHINE_INCLUDES/webp/encode.h && GD_WEBP_DIR=$i && break done if test -z "$GD_WEBP_DIR"; then @@ -105,6 +121,7 @@ AC_DEFUN([PHP_GD_JPEG],[ for i in $PHP_JPEG_DIR /usr/local /usr; do test -f $i/include/jpeglib.h && GD_JPEG_DIR=$i && break + test -f $i/include/$MACHINE_INCLUDES/jpeglib.h && GD_JPEG_DIR=$i && break done if test -z "$GD_JPEG_DIR"; then @@ -130,6 +147,7 @@ AC_DEFUN([PHP_GD_PNG],[ for i in $PHP_PNG_DIR /usr/local /usr; do test -f $i/include/png.h && GD_PNG_DIR=$i && break + test -f $i/include/$MACHINE_INCLUDES/png.h && GD_PNG_DIR=$i && break done if test -z "$GD_PNG_DIR"; then @@ -162,6 +180,8 @@ AC_DEFUN([PHP_GD_XPM],[ for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do test -f $i/include/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i && break test -f $i/include/X11/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i/X11 && break + test -f $i/include/$MACHINE_INCLUDES/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i && break + test -f $i/include/$MACHINE_INCLUDES/X11/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i/X11 && break done if test -z "$GD_XPM_DIR"; then