From 07a59197db5368f41d264f32c514c87c379d814f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 10 May 2021 14:34:10 +0200
Subject: new package

---
 mysqlnd_ngen-fix.patch | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 mysqlnd_ngen-fix.patch

(limited to 'mysqlnd_ngen-fix.patch')

diff --git a/mysqlnd_ngen-fix.patch b/mysqlnd_ngen-fix.patch
new file mode 100644
index 0000000..28be2f3
--- /dev/null
+++ b/mysqlnd_ngen-fix.patch
@@ -0,0 +1,65 @@
+diff -up ./mysqli/config.m4.fix ./mysqli/config.m4
+--- ./mysqli/config.m4.fix	2021-05-10 12:07:40.455022526 +0200
++++ ./mysqli/config.m4	2021-05-10 12:22:06.477760111 +0200
+@@ -95,13 +95,9 @@ if test "$PHP_MYSQLI" != "no"; then
+                   mysqli_exception.c mysqli_result_iterator.c"
+   PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+   PHP_SUBST(MYSQLI_SHARED_LIBADD)
+-  PHP_INSTALL_HEADERS([ext/mysqli/php_mysqli_structs.h])
+ 
+   if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then
+     PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd)
+     AC_DEFINE([MYSQLI_USE_MYSQLND], 1, [Whether mysqlnd is enabled])
+-    PHP_INSTALL_HEADERS([ext/mysqli/mysqli_mysqlnd.h])
+-  else
+-    PHP_INSTALL_HEADERS([ext/mysqli/mysqli_libmysql.h])
+   fi
+ fi
+diff -up ./mysqlnd/config.m4.fix ./mysqlnd/config.m4
+--- ./mysqlnd/config.m4.fix	2021-05-10 11:49:47.301506047 +0200
++++ ./mysqlnd/config.m4	2021-05-10 12:07:57.418958506 +0200
+@@ -53,7 +53,7 @@ if test "$PHP_MYSQLND" != "no" || test "
+   fi
+   
+   if test "$PHP_MYSQLND_LDAP_KRB_SUPPORT" != "no"; then
+-    PKG_CHECK_MODULES([KRB5], [libkrb5])
++    PKG_CHECK_MODULES([KRB5], [krb5])
+     PHP_EVAL_LIBLINE($KRB5_LIBS, MYSQLND_SHARED_LIBADD)
+     PHP_EVAL_INCLINE($KRB5_CFLAGS)
+     AC_DEFINE([MYSQLND_HAVE_KRB5], 1, [LDAP Kerberos protocol support])
+@@ -67,11 +67,11 @@ if test "$PHP_MYSQLND" != "no" || test "
+   if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then
+     PHP_SETUP_OPENSSL(MYSQLND_SHARED_LIBADD, [AC_DEFINE(MYSQLND_HAVE_SSL,1,[Enable mysqlnd code that uses OpenSSL directly])])
+   fi
++  PHP_SUBST(MYSQLND_SHARED_LIBADD)
+ 
+   mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
+   PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+   PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
+-  PHP_INSTALL_HEADERS([ext/mysqlnd/])
+ fi
+ 
+ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
+diff -up ./pdo_mysql/config.m4.fix ./pdo_mysql/config.m4
+--- ./pdo_mysql/config.m4.fix	2021-05-10 11:50:56.549183180 +0200
++++ ./pdo_mysql/config.m4	2021-05-10 11:51:21.302067764 +0200
+@@ -14,19 +14,6 @@ if test -z "$PHP_ZLIB_DIR"; then
+ fi
+ 
+ if test "$PHP_PDO_MYSQL" != "no"; then
+-  dnl This depends on ext/mysqli/config.m4 providing the PHP_MYSQL_SOCKET_SEARCH
+-  dnl macro and --with-mysql-sock configure option.
+-  AC_MSG_CHECKING([for MySQL UNIX socket location])
+-  if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
+-    MYSQL_SOCK=$PHP_MYSQL_SOCK
+-    AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, "$MYSQL_SOCK", [ ])
+-    AC_MSG_RESULT([$MYSQL_SOCK])
+-  elif test "$PHP_MYSQL_SOCK" = "yes"; then
+-    PHP_MYSQL_SOCKET_SEARCH
+-  else
+-    AC_MSG_RESULT([no])
+-  fi
+-
+   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
+     AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.])
+   fi
-- 
cgit