diff options
| author | Remi Collet <remi@remirepo.net> | 2023-04-21 15:22:35 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-04-21 15:22:35 +0200 |
| commit | c41b8d935894dcff746ffbcdac3527bdf3e19f05 (patch) | |
| tree | 644fd7091df45eccc2800bbf45bce303aee97e4e /php-8.0.28-intlinfo.patch | |
| parent | 4d58e98192ed9e1498dcac6dcc44965fb2894389 (diff) | |
use ICU 72.1
use oracle client library version 21.10
fix missing TZData version in intl phpinfo
fix possible buffer overflow in date
Diffstat (limited to 'php-8.0.28-intlinfo.patch')
| -rw-r--r-- | php-8.0.28-intlinfo.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/php-8.0.28-intlinfo.patch b/php-8.0.28-intlinfo.patch new file mode 100644 index 0000000..c4bf036 --- /dev/null +++ b/php-8.0.28-intlinfo.patch @@ -0,0 +1,33 @@ +From 0eeaba52f1900f5b3bc389ee0a44e2b70a7ab8f6 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 14 Apr 2023 10:23:21 +0200 +Subject: [PATCH] Fix GH-11071: Revert "Fix [-Wundef] warning in INTL + extension" + +This reverts commit ea8686540ac43e59dd3f8784e29a0c06e3446df2. +--- + ext/intl/php_intl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c +index 5826c2e3372f..a15e16604133 100644 +--- a/ext/intl/php_intl.c ++++ b/ext/intl/php_intl.c +@@ -281,7 +281,7 @@ PHP_RSHUTDOWN_FUNCTION( intl ) + /* {{{ PHP_MINFO_FUNCTION */ + PHP_MINFO_FUNCTION( intl ) + { +-#ifndef UCONFIG_NO_FORMATTING ++#if !UCONFIG_NO_FORMATTING + UErrorCode status = U_ZERO_ERROR; + const char *tzdata_ver = NULL; + #endif +@@ -292,7 +295,7 @@ PHP_MINFO_FUNCTION( intl ) + #ifdef U_ICU_DATA_VERSION + php_info_print_table_row( 2, "ICU Data version", U_ICU_DATA_VERSION ); + #endif +-#ifndef UCONFIG_NO_FORMATTING ++#if !UCONFIG_NO_FORMATTING + tzdata_ver = ucal_getTZDataVersion(&status); + if (U_ZERO_ERROR == status) { + php_info_print_table_row( 2, "ICU TZData version", tzdata_ver); |