summaryrefslogtreecommitdiff
path: root/databases/php72-mysqli/files
diff options
context:
space:
mode:
authorTorsten Zuehlsdorff <tz@FreeBSD.org>2017-11-16 10:48:48 +0000
committerTorsten Zuehlsdorff <tz@FreeBSD.org>2017-11-16 10:48:48 +0000
commit687591dd75e7bc33dfeb597493d97e5baaf89f1d (patch)
treea2ff3d816b255016827738be132f8fc8bff8f5d9 /databases/php72-mysqli/files
parentUpdate the cmake family to 3.9.6 (skip 3.9.5, the upstream (diff)
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
Notes
Notes: svn path=/head/; revision=454302
Diffstat (limited to 'databases/php72-mysqli/files')
-rw-r--r--databases/php72-mysqli/files/patch-mysqli.c11
-rw-r--r--databases/php72-mysqli/files/patch-php_mysqli_structs.h10
2 files changed, 21 insertions, 0 deletions
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)