Add PHP 7.2 RC6

Notable changes:
- mcrypt module was removed
- sodium module was added
- sybase_ct artifacts removed

Also many PECL ports will not work with this version
since some files got renamed.

Reviewed by:           mat, ale, Rainer Duffner <rainer@ultra-secure.de>
Differential Revision: https://reviews.freebsd.org/D12980

19 files changed, 342 insertions, 0 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 355b9bdb0044..85548a431072 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -651,6 +651,20 @@
     SUBDIR += php71-pdo_sqlite
     SUBDIR += php71-pgsql
     SUBDIR += php71-sqlite3
+    SUBDIR += php72-pdo
+    SUBDIR += php72-dba
+    SUBDIR += php72-interbase
+    SUBDIR += php72-mysqli
+    SUBDIR += php72-odbc
+    SUBDIR += php72-pdo
+    SUBDIR += php72-pdo_dblib
+    SUBDIR += php72-pdo_firebird
+    SUBDIR += php72-pdo_mysql
+    SUBDIR += php72-pdo_odbc
+    SUBDIR += php72-pdo_pgsql
+    SUBDIR += php72-pdo_sqlite
+    SUBDIR += php72-pgsql
+    SUBDIR += php72-sqlite3
     SUBDIR += phpliteadmin
     SUBDIR += phpminiadmin
     SUBDIR += phpmyadmin
diff --git a/databases/php72-dba/Makefile b/databases/php72-dba/Makefile
new file mode 100644
index 000000000000..b352d80e52d6
--- /dev/null
+++ b/databases/php72-dba/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-dba
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php72-dba/files/patch-config.m4 b/databases/php72-dba/files/patch-config.m4
new file mode 100644
index 000000000000..30f662138374
--- /dev/null
+++ b/databases/php72-dba/files/patch-config.m4
@@ -0,0 +1,50 @@
+--- config.m4.orig	2016-01-06 15:14:47 UTC
++++ config.m4
+@@ -324,6 +324,38 @@ if test "$PHP_DB4" != "no"; then
+       THIS_PREFIX=$i
+       THIS_INCLUDE=$i/include/db5.3/db.h
+       break
++    elif test -f "$i/include/db5/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db5/db.h
++      break
++    elif test -f "$i/include/db48/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db48/db.h
++      break
++    elif test -f "$i/include/db47/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db47/db.h
++      break
++    elif test -f "$i/include/db46/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db46/db.h
++      break
++    elif test -f "$i/include/db44/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db44/db.h
++      break
++    elif test -f "$i/include/db43/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db43/db.h
++      break
++    elif test -f "$i/include/db42/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db42/db.h
++      break
++    elif test -f "$i/include/db41/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db41/db.h
++      break
+     elif test -f "$i/include/db5.1/db.h"; then
+       THIS_PREFIX=$i
+       THIS_INCLUDE=$i/include/db5.1/db.h
+@@ -366,7 +398,7 @@ if test "$PHP_DB4" != "no"; then
+       break
+     fi
+   done
+-  PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
++  PHP_DBA_DB_CHECK(4, db-5 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ fi
+ PHP_DBA_STD_RESULT(db4,Berkeley DB4)
+ 
diff --git a/databases/php72-interbase/Makefile b/databases/php72-interbase/Makefile
new file mode 100644
index 000000000000..7ed88ca3ade3
--- /dev/null
+++ b/databases/php72-interbase/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-interbase
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php72-interbase/files/patch-interbase.c b/databases/php72-interbase/files/patch-interbase.c
new file mode 100644
index 000000000000..0f8791beb793
--- /dev/null
+++ b/databases/php72-interbase/files/patch-interbase.c
@@ -0,0 +1,11 @@
+--- interbase.c.orig	2016-12-16 10:59:02 UTC
++++ interbase.c
+@@ -940,7 +940,7 @@ static void _php_ibase_connect(INTERNAL_
+ 		xlink = (zend_resource*) le->ptr;
+ 		if ((!persistent && xlink->type == le_link) || xlink->type == le_plink) {
+ 			if (IBG(default_link)) {
+-				zend_list_close(IBG(default_link));
++				zend_list_delete(IBG(default_link));
+ 			}
+ 			xlink->gc.refcount++;
+ 			xlink->gc.refcount++;
diff --git a/databases/php72-mysqli/Makefile b/databases/php72-mysqli/Makefile
new file mode 100644
index 000000000000..6dc65aca9008
--- /dev/null
+++ b/databases/php72-mysqli/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-mysqli
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php72-mysqli/files/patch-mysqli.c b/databases/php72-mysqli/files/patch-mysqli.c
new file mode 100644
index 000000000000..3d74731142b6
--- /dev/null
+++ b/databases/php72-mysqli/files/patch-mysqli.c
@@ -0,0 +1,11 @@
+--- mysqli.c.orig	2016-12-06 18:05:01 UTC
++++ mysqli.c
+@@ -703,7 +703,7 @@ PHP_MINIT_FUNCTION(mysqli)
+ #ifdef MYSQLND_STRING_TO_INT_CONVERSION
+ 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_FLOAT_NATIVE", MYSQLND_OPT_INT_AND_FLOAT_NATIVE, CONST_CS | CONST_PERSISTENT);
+ #endif
+-#if MYSQL_VERSION_ID > 50110 || defined(MYSQLI_USE_MYSQLND)
++#if (MYSQL_VERSION_ID < 80000 && MYSQL_VERSION_ID > 50110) || defined(MYSQLI_USE_MYSQLND)
+ 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);
+ #endif
+ 
diff --git a/databases/php72-mysqli/files/patch-php_mysqli_structs.h b/databases/php72-mysqli/files/patch-php_mysqli_structs.h
new file mode 100644
index 000000000000..d0daeee9ee54
--- /dev/null
+++ b/databases/php72-mysqli/files/patch-php_mysqli_structs.h
@@ -0,0 +1,10 @@
+--- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
++++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
+@@ -54,6 +54,7 @@
+ #define WE_HAD_MBSTATE_T
+ #endif
+ 
++#define HAVE_ULONG 1
+ #include <my_global.h>
+ 
+ #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN)
diff --git a/databases/php72-odbc/Makefile b/databases/php72-odbc/Makefile
new file mode 100644
index 000000000000..f7b533287e45
--- /dev/null
+++ b/databases/php72-odbc/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-odbc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php72-odbc/files/patch-config.m4 b/databases/php72-odbc/files/patch-config.m4
new file mode 100644
index 000000000000..cf68ac678e4c
--- /dev/null
+++ b/databases/php72-odbc/files/patch-config.m4
@@ -0,0 +1,129 @@
+--- config.m4.orig	2016-10-25 15:23:21 UTC
++++ config.m4
+@@ -100,13 +100,17 @@ 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.
+                              Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0350)
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(adabas,,
+-[  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
++[  --with-adabas[=DIR]       Include Adabas D support [/usr/local]], no, no)
+ 
+   AC_MSG_CHECKING([for Adabas support])
+   if test "$PHP_ADABAS" != "no"; then
+@@ -135,7 +139,7 @@ fi
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(sapdb,,
+-[  --with-sapdb[=DIR]        Include SAP DB support [/usr/local]])
++[  --with-sapdb[=DIR]        Include SAP DB support [/usr/local]], no, no)
+ 
+   AC_MSG_CHECKING([for SAP DB support])
+   if test "$PHP_SAPDB" != "no"; then
+@@ -155,7 +159,7 @@ fi
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(solid,,
+-[  --with-solid[=DIR]        Include Solid support [/usr/local/solid]])
++[  --with-solid[=DIR]        Include Solid support [/usr/local/solid]], no, no)
+ 
+   AC_MSG_CHECKING(for Solid support)
+   if test "$PHP_SOLID" != "no"; then
+@@ -182,7 +186,7 @@ fi
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(ibm-db2,,
+-[  --with-ibm-db2[=DIR]      Include IBM DB2 support [/home/db2inst1/sqllib]])
++[  --with-ibm-db2[=DIR]      Include IBM DB2 support [/home/db2inst1/sqllib]], no, no)
+ 
+   AC_MSG_CHECKING(for IBM DB2 support)
+   if test "$PHP_IBM_DB2" != "no"; then
+@@ -221,7 +225,7 @@ fi
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(ODBCRouter,,
+-[  --with-ODBCRouter[=DIR]   Include ODBCRouter.com support [/usr]])
++[  --with-ODBCRouter[=DIR]   Include ODBCRouter.com support [/usr]], no, no)
+ 
+   AC_MSG_CHECKING(for ODBCRouter.com support)
+   if test "$PHP_ODBCROUTER" != "no"; then
+@@ -244,7 +248,7 @@ fi
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(empress,,
+ [  --with-empress[=DIR]      Include Empress support [\$EMPRESSPATH]
+-                          (Empress Version >= 8.60 required)])
++                          (Empress Version >= 8.60 required)], no, no)
+ 
+   AC_MSG_CHECKING(for Empress support)
+   if test "$PHP_EMPRESS" != "no"; then
+@@ -270,7 +274,7 @@ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(empress-bcs,,
+ [  --with-empress-bcs[=DIR]
+                           Include Empress Local Access support [\$EMPRESSPATH]
+-                          (Empress Version >= 8.60 required)])
++                          (Empress Version >= 8.60 required)], no, no)
+ 
+   AC_MSG_CHECKING(for Empress local access support)
+   if test "$PHP_EMPRESS_BCS" != "no"; then
+@@ -310,7 +314,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,,
+                           running this configure script:
+                             CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
+                             LDFLAGS=-lunix
+-                            CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
++                            CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no)
+ 
+   AC_MSG_CHECKING(for a custom ODBC support)
+   if test "$PHP_CUSTOM_ODBC" != "no"; then
+@@ -388,7 +392,7 @@ fi
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(iodbc,,
+-[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]])
++[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]], no, no)
+ 
+   AC_MSG_CHECKING(for iODBC support)
+   if test "$PHP_IODBC" != "no"; then
+@@ -426,7 +430,7 @@ fi
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(esoob,,
+-[  --with-esoob[=DIR]        Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
++[  --with-esoob[=DIR]        Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no)
+ 
+   AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
+   if test "$PHP_ESOOB" != "no"; then
+@@ -448,7 +452,7 @@ fi
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(unixODBC,,
+-[  --with-unixODBC[=DIR]     Include unixODBC support [/usr/local]])
++[  --with-unixODBC[=DIR]     Include unixODBC support [/usr/local]], no, no)
+ 
+   AC_MSG_CHECKING(for unixODBC support)
+   if test "$PHP_UNIXODBC" != "no"; then
+@@ -471,7 +475,7 @@ fi
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(dbmaker,,
+-[  --with-dbmaker[=DIR]      Include DBMaker support])
++[  --with-dbmaker[=DIR]      Include DBMaker support], no, no)
+ 
+   AC_MSG_CHECKING(for DBMaker support)
+   if test "$PHP_DBMAKER" != "no"; then
diff --git a/databases/php72-pdo/Makefile b/databases/php72-pdo/Makefile
new file mode 100644
index 000000000000..772441dca07f
--- /dev/null
+++ b/databases/php72-pdo/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-pdo
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php72-pdo_dblib/Makefile b/databases/php72-pdo_dblib/Makefile
new file mode 100644
index 000000000000..3f12ac594893
--- /dev/null
+++ b/databases/php72-pdo_dblib/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-pdo_dblib
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php72-pdo_firebird/Makefile b/databases/php72-pdo_firebird/Makefile
new file mode 100644
index 000000000000..d742ba1d892f
--- /dev/null
+++ b/databases/php72-pdo_firebird/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-pdo_firebird
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php72-pdo_mysql/Makefile b/databases/php72-pdo_mysql/Makefile
new file mode 100644
index 000000000000..f9a73ae8dd0a
--- /dev/null
+++ b/databases/php72-pdo_mysql/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-pdo_mysql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php72-pdo_odbc/Makefile b/databases/php72-pdo_odbc/Makefile
new file mode 100644
index 000000000000..db4ed6fb2a75
--- /dev/null
+++ b/databases/php72-pdo_odbc/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-pdo_odbc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php72-pdo_pgsql/Makefile b/databases/php72-pdo_pgsql/Makefile
new file mode 100644
index 000000000000..00de102e7d34
--- /dev/null
+++ b/databases/php72-pdo_pgsql/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-pdo_pgsql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php72-pdo_sqlite/Makefile b/databases/php72-pdo_sqlite/Makefile
new file mode 100644
index 000000000000..1e14f9add0bb
--- /dev/null
+++ b/databases/php72-pdo_sqlite/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-pdo_sqlite
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php72-pgsql/Makefile b/databases/php72-pgsql/Makefile
new file mode 100644
index 000000000000..2184de0cfbd3
--- /dev/null
+++ b/databases/php72-pgsql/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-pgsql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php72-sqlite3/Makefile b/databases/php72-sqlite3/Makefile
new file mode 100644
index 000000000000..ac33a9dcacc3
--- /dev/null
+++ b/databases/php72-sqlite3/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php72
+
+PKGNAMESUFFIX=	-sqlite3
+
+.include "${MASTERDIR}/Makefile"