From c7eee116e31b2265489829f318e2f5d86975e069 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 13 Feb 2021 19:11:00 +0300 Subject: [PATCH] upd: 7.4.9 -> 7.4.15, fix loading mysqli Delete not appliable strange patches --- .abf.yml | 2 +- php-exif_nesting_level.diff | 11 ------- php-mariadb-10.3.patch | 66 ------------------------------------- php7.spec | 19 +++++------ 4 files changed, 10 insertions(+), 88 deletions(-) delete mode 100644 php-exif_nesting_level.diff delete mode 100644 php-mariadb-10.3.patch diff --git a/.abf.yml b/.abf.yml index 6d33655..95efb49 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - php-7.4.9.tar.xz: 6d8996e0e033745565eab8f4a8c67438c0f61ee0 + php-7.4.15.tar.xz: a616fc6ebf29b96a41d31422ab7151ba54b0382a diff --git a/php-exif_nesting_level.diff b/php-exif_nesting_level.diff deleted file mode 100644 index 78c51af..0000000 --- a/php-exif_nesting_level.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- php-7.2.0/ext/exif/exif.c.exif_nesting_level.droplet 2017-11-29 12:55:33.396697427 +0100 -+++ php-7.2.0/ext/exif/exif.c 2017-11-29 12:55:51.777730539 +0100 -@@ -89,7 +89,7 @@ typedef unsigned char uchar; - - #define EFREE_IF(ptr) if (ptr) efree(ptr) - --#define MAX_IFD_NESTING_LEVEL 150 -+#define MAX_IFD_NESTING_LEVEL 250 - - /* {{{ arginfo */ - ZEND_BEGIN_ARG_INFO(arginfo_exif_tagname, 0) diff --git a/php-mariadb-10.3.patch b/php-mariadb-10.3.patch deleted file mode 100644 index 14eee10..0000000 --- a/php-mariadb-10.3.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c -index dc2e0e7e..a02254b0 100644 ---- a/ext/mysqli/mysqli.c -+++ b/ext/mysqli/mysqli.c -@@ -24,6 +24,7 @@ - - #include - -+#include - #include "php.h" - #include "php_ini.h" - #include "ext/standard/info.h" -diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c -index 6462c19c..f54a10a5 100644 ---- a/ext/mysqli/mysqli_api.c -+++ b/ext/mysqli/mysqli_api.c -@@ -614,7 +614,7 @@ PHP_FUNCTION(mysqli_change_user) - size_t user_len, password_len, dbname_len; - zend_ulong rc; - #if !defined(MYSQLI_USE_MYSQLND) && defined(HAVE_MYSQLI_SET_CHARSET) -- const CHARSET_INFO * old_charset; -+ const MY_CHARSET_INFO * old_charset; - #endif - - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osss!", &mysql_link, mysqli_link_class_entry, &user, &user_len, &password, &password_len, &dbname, &dbname_len) == FAILURE) { -diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c -index e8b1e348..7924bc3c 100644 ---- a/ext/mysqli/mysqli_nonapi.c -+++ b/ext/mysqli/mysqli_nonapi.c -@@ -328,7 +328,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne - php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); - - #if !defined(MYSQLI_USE_MYSQLND) -- mysql->mysql->reconnect = MyG(reconnect); -+/* mysql->mysql->reconnect = MyG(reconnect); */ - #endif - unsigned int allow_local_infile = MyG(allow_local_infile); - mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char *)&allow_local_infile); -diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c -index 8190d4ab..a42b3cf9 100644 ---- a/ext/mysqli/mysqli_prop.c -+++ b/ext/mysqli/mysqli_prop.c -@@ -23,6 +23,7 @@ - - #include - -+#include - #include "php.h" - #include "php_ini.h" - #include "ext/standard/info.h" -diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h -index 96fbacb8..dca05fbe 100644 ---- a/ext/mysqli/php_mysqli_structs.h -+++ b/ext/mysqli/php_mysqli_structs.h -@@ -73,11 +73,7 @@ - #include - #include - #include --#include --#include - #include --#include --#include - #include "mysqli_libmysql.h" - #endif /* MYSQLI_USE_MYSQLND */ - diff --git a/php7.spec b/php7.spec index 1a9e022..7eb848a 100644 --- a/php7.spec +++ b/php7.spec @@ -21,7 +21,7 @@ Summary: The PHP7 scripting language Name: php -Version: 7.4.9 +Version: 7.4.15 Release: 1 Source0: http://ch1.php.net/distributions/php-%{version}.tar.xz Group: Development/PHP @@ -38,7 +38,6 @@ Source9: php-fpm-tmpfiles.conf Source10: php.ini Patch0: php-7.3.4-libtool-2.4.6.patch Patch1: php-shared.diff -Patch2: php-mariadb-10.3.patch Patch3: php-7.4.1-missing-symbols.patch Patch4: https://src.fedoraproject.org/rpms/php/raw/master/f/php-7.4.0-phpize.patch Patch5: php-phpbuilddir.diff @@ -66,7 +65,6 @@ Patch30: php-5.3.x-fpm-0.6.5-mdv_conf.diff ##################################################################### # stolen from debian Patch50: php-session.save_path.diff -Patch51: php-exif_nesting_level.diff ##################################################################### # Stolen from fedora Patch102: php-install.diff @@ -643,6 +641,8 @@ encodings for convenience. Summary: MySQL database module for PHP Group: Development/PHP Requires: %{libname} >= %{EVRD} +# mysqlnd must be loaded before mysqli (undefined symbol: mysqlnd_global_stats) +Requires: %{name}-mysqlnd = %{EVRD} Obsoletes: %{name}-mysql < %{EVRD} %description mysqli @@ -1204,7 +1204,6 @@ fi %patch0 -p1 -b .libtool246~ %patch1 -p1 -b .shared.droplet -%patch2 -p1 -b .mariadb~ %patch3 -p1 -b .missingsym~ %patch4 -p1 -b .phpize~ %patch5 -p1 -b .phpbuilddir.droplet @@ -1233,7 +1232,6 @@ fi ##################################################################### # stolen from debian %patch50 -p1 -b .session.save_path.droplet -%patch51 -p1 -b .exif_nesting_level.droplet ##################################################################### # Stolen from fedora @@ -1576,6 +1574,8 @@ echo "extension = intl.so" > %{buildroot}%{_sysconfdir}/php.d/27_intl.ini echo "extension = ldap.so" > %{buildroot}%{_sysconfdir}/php.d/28_ldap.ini echo "extension = mbstring.so" > %{buildroot}%{_sysconfdir}/php.d/29_mbstring.ini echo "extension = fileinfo.so" > %{buildroot}%{_sysconfdir}/php.d/32_fileinfo.ini +# mysqlnd must be loaded before mysqli (undefined symbol: mysqlnd_global_stats) +echo "extension = mysqlnd.so" > %{buildroot}%{_sysconfdir}/php.d/36_mysqlnd.ini echo "extension = mysqli.so" > %{buildroot}%{_sysconfdir}/php.d/37_mysqli.ini echo "extension = enchant.so" > %{buildroot}%{_sysconfdir}/php.d/38_enchant.ini echo "extension = odbc.so" > %{buildroot}%{_sysconfdir}/php.d/39_odbc.ini @@ -1586,7 +1586,6 @@ echo "extension = pdo_mysql.so" > %{buildroot}%{_sysconfdir}/php.d/73_pdo_mysql echo "extension = pdo_odbc.so" > %{buildroot}%{_sysconfdir}/php.d/75_pdo_odbc.ini echo "extension = pdo_pgsql.so" > %{buildroot}%{_sysconfdir}/php.d/76_pdo_pgsql.ini echo "extension = pdo_sqlite.so" > %{buildroot}%{_sysconfdir}/php.d/77_pdo_sqlite.ini -echo "extension = mysqlnd.so" > %{buildroot}%{_sysconfdir}/php.d/78_mysqlnd.ini echo "extension = pgsql.so" > %{buildroot}%{_sysconfdir}/php.d/42_pgsql.ini echo "extension = posix.so" > %{buildroot}%{_sysconfdir}/php.d/43_posix.ini echo "extension = pspell.so" > %{buildroot}%{_sysconfdir}/php.d/44_pspell.ini @@ -2443,14 +2442,14 @@ fi %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/29_mbstring.ini %attr(0755,root,root) %{_libdir}/php/extensions/mbstring.so +%files mysqlnd +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/36_mysqlnd.ini +%attr(0755,root,root) %{_libdir}/php/extensions/mysqlnd.so + %files mysqli %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/37_mysqli.ini %attr(0755,root,root) %{_libdir}/php/extensions/mysqli.so -%files mysqlnd -%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/78_mysqlnd.ini -%attr(0755,root,root) %{_libdir}/php/extensions/mysqlnd.so - %files odbc %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/39_odbc.ini %attr(0755,root,root) %{_libdir}/php/extensions/odbc.so