commit ffd3d77e14eecb60059e04ae79916f0fa5f8562b
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Tue Mar 19 11:56:32 2024 +0100
Rel 25; make mysqlnd understand mysql 8 unicode types
charset.patch | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
php.spec | 5 ++++-
2 files changed, 68 insertions(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index 83381db..c786cb7 100644
--- a/php.spec
+++ b/php.spec
@@ -155,7 +155,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%undefine with_filter
%endif
-%define rel 24
+%define rel 25
%define orgname php
%define ver_suffix 56
%define php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -200,6 +200,7 @@ Patch11: embed.patch
Patch12: openssl.patch
Patch13: crypt.patch
Patch14: %{orgname}-no_pear_install.patch
+Patch15: charset.patch
Patch17: %{orgname}-readline.patch
Patch18: %{orgname}-nohttpd.patch
Patch21: %{orgname}-dba-link.patch
@@ -2111,6 +2112,8 @@ cp -p php.ini-production php.ini
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
+
%patch17 -p1
%patch18 -p1
%patch21 -p1
diff --git a/charset.patch b/charset.patch
new file mode 100644
index 0000000..622a00b
--- /dev/null
+++ b/charset.patch
@@ -0,0 +1,64 @@
+commit 35a28fac51e4b210f8f3f51b754786908a977462
+Author: Johannes Schlüter <[email protected]>
+Date: Fri Apr 14 16:30:10 2017 +0200
+
+ Add support for MySQL 8's Unicode types
+
+diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c
+index 0fd74debd3..ac08b9b72d 100644
+--- a/ext/mysqlnd/mysqlnd_charset.c
++++ b/ext/mysqlnd/mysqlnd_charset.c
+@@ -688,6 +688,53 @@ const MYSQLND_CHARSET mysqlnd_charsets[] =
+ { 249, "gb18030", "gb18030_bin", 1, 4, "", mysqlnd_mbcharlen_gb18030,
my_ismbchar_gb18030},
+
+ { 254, UTF8_MB3, UTF8_MB3"_general_cs", 1, 3, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 255, UTF8_MB4, UTF8_MB4"_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 256, UTF8_MB4, UTF8_MB4"_de_pb_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 257, UTF8_MB4, UTF8_MB4"_is_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 258, UTF8_MB4, UTF8_MB4"_lv_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 259, UTF8_MB4, UTF8_MB4"_ro_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 260, UTF8_MB4, UTF8_MB4"_sl_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 261, UTF8_MB4, UTF8_MB4"_pl_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 262, UTF8_MB4, UTF8_MB4"_et_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 263, UTF8_MB4, UTF8_MB4"_es_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 264, UTF8_MB4, UTF8_MB4"_sv_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 265, UTF8_MB4, UTF8_MB4"_tr_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 266, UTF8_MB4, UTF8_MB4"_cs_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 267, UTF8_MB4, UTF8_MB4"_da_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 268, UTF8_MB4, UTF8_MB4"_lt_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 269, UTF8_MB4, UTF8_MB4"_sk_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 270, UTF8_MB4, UTF8_MB4"_es_trad_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 271, UTF8_MB4, UTF8_MB4"_la_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 272, UTF8_MB4, UTF8_MB4"_fa_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 273, UTF8_MB4, UTF8_MB4"_eo_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 274, UTF8_MB4, UTF8_MB4"_hu_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 275, UTF8_MB4, UTF8_MB4"_hr_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 276, UTF8_MB4, UTF8_MB4"_si_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 277, UTF8_MB4, UTF8_MB4"_vi_0900_ai_ci", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 278, UTF8_MB4, UTF8_MB4"_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 279, UTF8_MB4, UTF8_MB4"_de_pb_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 280, UTF8_MB4, UTF8_MB4"_is_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 281, UTF8_MB4, UTF8_MB4"_lv_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 282, UTF8_MB4, UTF8_MB4"_ro_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 283, UTF8_MB4, UTF8_MB4"_sl_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 284, UTF8_MB4, UTF8_MB4"_pl_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 285, UTF8_MB4, UTF8_MB4"_et_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 286, UTF8_MB4, UTF8_MB4"_es_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 287, UTF8_MB4, UTF8_MB4"_sv_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 288, UTF8_MB4, UTF8_MB4"_tr_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 289, UTF8_MB4, UTF8_MB4"_cs_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 290, UTF8_MB4, UTF8_MB4"_da_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 291, UTF8_MB4, UTF8_MB4"_lt_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 292, UTF8_MB4, UTF8_MB4"_sk_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 293, UTF8_MB4, UTF8_MB4"_es_trad_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 294, UTF8_MB4, UTF8_MB4"_la_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 295, UTF8_MB4, UTF8_MB4"_fa_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 296, UTF8_MB4, UTF8_MB4"_eo_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 297, UTF8_MB4, UTF8_MB4"_hu_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 298, UTF8_MB4, UTF8_MB4"_hr_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 299, UTF8_MB4, UTF8_MB4"_si_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 300, UTF8_MB4, UTF8_MB4"_vi_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
++ { 303, UTF8_MB4, UTF8_MB4"_ja_0900_as_cs", 1, 4, "",
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL}
+ };
+ /* }}} */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/ffd3d77e14eecb60059e04ae79916f0fa5f8562b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
