Update to 7.1.24

Changelog: http://www.php.net/ChangeLog-7.php#7.1.24

Approved by:	tz (implicit)
MFH:		2018Q4
Sponsored by:	Netzkommune GmbH
This commit is contained in:
Jochen Neumeister 2018-11-15 16:40:59 +00:00
parent 0f3d47b3c6
commit 693053fd0c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=485015
6 changed files with 37 additions and 39 deletions

View file

@ -1,9 +1,10 @@
--- config.m4.orig 2009-11-25 02:30:06.000000000 +0100
+++ config.m4 2010-04-12 09:59:54.000000000 +0200
@@ -43,6 +43,30 @@
--- config.m4.orig 2018-11-10 15:21:47.103604000 +0100
+++ config.m4 2018-11-10 15:24:23.615118000 +0100
@@ -42,6 +42,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
PHP_ADD_INCLUDE([$ext_srcdir/$dir])
PHP_ADD_INCLUDE([$ext_builddir/$dir])
done
+
+ dnl This is PECL build, check if bundled PCRE library is used
+ old_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS=$INCLUDES
@ -27,11 +28,10 @@
+ PHP_PCRE_REGEX=no
+ ])
+ ])
+
if test "$ext_shared" = "no"; then
PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES)
out="php_config.h"
@@ -80,7 +104,6 @@
@@ -85,7 +109,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
int foo(int x, ...) {
va_list va;
va_start(va, x);
@ -39,13 +39,13 @@
va_arg(va, char *);
va_arg(va, double);
return 0;
@@ -347,6 +370,9 @@
@@ -367,6 +390,9 @@ PHP_ARG_WITH(onig, [for external oniguru
[ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
If DIR is not set, the bundled oniguruma will be used], no, no)
If DIR is not set, the bundled oniguruma will be used], no, no)
+PHP_ARG_WITH(pcre-dir, pcre install prefix,
+[ --with-pcre-dir MBSTRING: pcre install prefix], no, no)
+
if test "$PHP_MBSTRING" != "no"; then
if test "$PHP_MBSTRING" != "no"; then
AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])

View file

@ -1,12 +1,11 @@
--- config.m4.orig 2016-10-25 15:23:21 UTC
+++ config.m4
@@ -100,13 +100,17 @@ dnl
--- config.m4.orig 2018-11-10 15:32:27.031531000 +0100
+++ config.m4 2018-11-10 15:37:40.815007000 +0100
@@ -100,13 +100,16 @@ dnl
dnl configure options
dnl
+PHP_ARG_ENABLE(odbc,,
+[ --enable-odbc Enable ODBC support with selected driver])
+
+
PHP_ARG_WITH(odbcver,,
[ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0350.
@ -19,7 +18,7 @@
AC_MSG_CHECKING([for Adabas support])
if test "$PHP_ADABAS" != "no"; then
@@ -135,7 +139,7 @@ fi
@@ -135,7 +138,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(sapdb,,
@ -28,7 +27,7 @@
AC_MSG_CHECKING([for SAP DB support])
if test "$PHP_SAPDB" != "no"; then
@@ -155,7 +159,7 @@ fi
@@ -155,7 +158,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(solid,,
@ -37,7 +36,7 @@
AC_MSG_CHECKING(for Solid support)
if test "$PHP_SOLID" != "no"; then
@@ -182,7 +186,7 @@ fi
@@ -182,7 +185,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(ibm-db2,,
@ -46,7 +45,7 @@
AC_MSG_CHECKING(for IBM DB2 support)
if test "$PHP_IBM_DB2" != "no"; then
@@ -221,7 +225,7 @@ fi
@@ -221,7 +224,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(ODBCRouter,,
@ -55,7 +54,7 @@
AC_MSG_CHECKING(for ODBCRouter.com support)
if test "$PHP_ODBCROUTER" != "no"; then
@@ -244,7 +248,7 @@ fi
@@ -244,7 +247,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(empress,,
[ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH]
@ -64,7 +63,7 @@
AC_MSG_CHECKING(for Empress support)
if test "$PHP_EMPRESS" != "no"; then
@@ -270,7 +274,7 @@ if test -z "$ODBC_TYPE"; then
@@ -270,7 +273,7 @@ if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(empress-bcs,,
[ --with-empress-bcs[=DIR]
Include Empress Local Access support [\$EMPRESSPATH]
@ -73,16 +72,16 @@
AC_MSG_CHECKING(for Empress local access support)
if test "$PHP_EMPRESS_BCS" != "no"; then
@@ -310,7 +314,7 @@ fi
@@ -310,7 +313,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(birdstep,,
-[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]])
+[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]], no, no)
AC_MSG_CHECKING(for Birdstep support)
if test "$PHP_BIRDSTEP" != "no"; then
@@ -366,7 +370,7 @@ PHP_ARG_WITH(custom-odbc,,
@@ -366,7 +369,7 @@ PHP_ARG_WITH(custom-odbc,,
running this configure script:
CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
LDFLAGS=-lunix
@ -91,7 +90,7 @@
AC_MSG_CHECKING(for a custom ODBC support)
if test "$PHP_CUSTOM_ODBC" != "no"; then
@@ -388,7 +392,7 @@ fi
@@ -388,7 +391,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(iodbc,,
@ -100,7 +99,7 @@
AC_MSG_CHECKING(for iODBC support)
if test "$PHP_IODBC" != "no"; then
@@ -426,7 +430,7 @@ fi
@@ -426,7 +429,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(esoob,,
@ -109,7 +108,7 @@
AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
if test "$PHP_ESOOB" != "no"; then
@@ -448,7 +452,7 @@ fi
@@ -448,7 +451,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(unixODBC,,
@ -118,7 +117,7 @@
AC_MSG_CHECKING(for unixODBC support)
if test "$PHP_UNIXODBC" != "no"; then
@@ -471,7 +475,7 @@ fi
@@ -471,7 +474,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(dbmaker,,

View file

@ -1,6 +1,5 @@
# $FreeBSD$
PORTREVISION= 1
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php71

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= php71
PORTVERSION= 7.1.23
PORTVERSION= 7.1.24
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions

View file

@ -1,5 +1,5 @@
TIMESTAMP = 1539363025
SHA256 (php-7.1.23.tar.xz) = 227a3c76133c3dc1cec937989456cbd89ed00e68e7260c651900dbe1f5b798bc
SIZE (php-7.1.23.tar.xz) = 12227528
TIMESTAMP = 1542299453
SHA256 (php-7.1.24.tar.xz) = e70dcec0ae28b6bc308b78972ec15aa850808819cc765f505aa51e5a7e2fa5d7
SIZE (php-7.1.24.tar.xz) = 12205112
SHA256 (php-7.1.x-mail-header.patch) = 8f173d89672f7ebfabfcc3c5d7f8dec1c4243aba665db4b4046e67c34d9d4dc7
SIZE (php-7.1.x-mail-header.patch) = 4504

View file

@ -1,6 +1,6 @@
--- config.m4.orig 2014-05-14 10:14:22.929420181 +0000
+++ config.m4 2014-05-14 10:15:36.967414693 +0000
@@ -4,6 +4,9 @@
--- config.m4.orig 2018-11-09 21:17:02.404698000 +0100
+++ config.m4 2018-11-09 21:18:57.799985000 +0100
@@ -4,6 +4,9 @@ dnl config.m4 for extension simplexml
PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support,
[ --disable-simplexml Disable SimpleXML support], yes)
@ -9,8 +9,8 @@
+
if test -z "$PHP_LIBXML_DIR"; then
PHP_ARG_WITH(libxml-dir, libxml2 install dir,
[ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no)
@@ -11,6 +14,30 @@
[ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no)
@@ -11,6 +14,30 @@ fi
if test "$PHP_SIMPLEXML" != "no"; then
@ -38,6 +38,6 @@
+ ])
+ ])
+
if test "$PHP_LIBXML" = "no"; then
AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml])
if test "$PHP_LIBXML" = "no"; then
AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml])
fi