diff --git a/download b/download index 9ca0dc482d6cb1fa2896c2bd4ae761720cad0205..fcbef55dd236a84d6a290f2a438675ba0e327433 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -d1fd4a5279ca6bb34ebd31df782fef3d php-8.0.27.tar.xz -8a10e849c1736dab96fb2d08836ad940 php-8.0.27.tar.xz.asc +453206c948d9504b91fcec30fcb59b75 php-8.0.30.tar.xz +4970d7221879c2bdf4ffb9ef29571443 php-8.0.30.tar.xz.asc diff --git a/php-8.0.10-systzdata-v21.patch b/php-8.0.10-systzdata-v21.patch index 779f538a3901367b993f740bcf0e59decad69503..699dc116465578fbcf8b3a75eafcf3bffdbe9246 100644 --- a/php-8.0.10-systzdata-v21.patch +++ b/php-8.0.10-systzdata-v21.patch @@ -5,6 +5,7 @@ Add support for use of the system timezone database, rather than embedding a copy. Discussed upstream but was not desired. History: +r22: fix possible buffer overflow r21: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi r20: adapt for timelib 2020.03 (in 8.0.10RC1) r19: adapt for timelib 2020.02 (in 8.0.0beta2) @@ -454,7 +455,7 @@ index e9bd0f136d..c04ff01adc 100644 + size_t n; + char *data, *p; + -+ data = malloc(3 * sysdb->index_size + 7); ++ data = malloc(3 * sysdb->index_size + sizeof(FAKE_HEADER) - 1); + + p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1); + diff --git a/php.spec b/php.spec index a5b1ffac1bfa9c4ae21e5f150f2022c186b34ed3..535db5e6b3e17ff814c6b78afc8dcb6f07247a2e 100644 --- a/php.spec +++ b/php.spec @@ -55,7 +55,7 @@ %global with_tidy 0 %endif -%global upver 8.0.27 +%global upver 8.0.30 #global rcver RC1 Summary: PHP scripting language for creating dynamic web sites @@ -694,28 +694,28 @@ in pure PHP. %setup -q -n php-%{upver}%{?rcver} -%patch1 -p1 -b .mpmcheck -%patch5 -p1 -b .includedir -%patch6 -p1 -b .embed -%patch8 -p1 -b .libdb -%patch9 -p1 -b .deprecated +%patch -P1 -p1 -b .mpmcheck +%patch -P5 -p1 -b .includedir +%patch -P6 -p1 -b .embed +%patch -P8 -p1 -b .libdb +%patch -P9 -p1 -b .deprecated -%patch42 -p1 -b .systzdata -%patch43 -p1 -b .headers +%patch -P42 -p1 -b .systzdata +%patch -P43 -p1 -b .headers %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -%patch45 -p1 -b .ldap_r +%patch -P45 -p1 -b .ldap_r %endif -%patch47 -p1 -b .phpinfo -%patch48 -p1 -b .sha -%patch49 -p1 -b .pharsha -%patch51 -p1 -b .libxcrypt +%patch -P47 -p1 -b .phpinfo +%patch -P48 -p1 -b .sha +%patch -P49 -p1 -b .pharsha +%patch -P51 -p1 -b .libxcrypt # upstream patches # security patches # Fixes for tests -%patch300 -p1 -b .datetests +%patch -P300 -p1 -b .datetests %patch1000 -p1 @@ -1510,9 +1510,12 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %changelog -* Wed Mar 1 2023 Liwei Ge - 8.0.27-1.0.1 +* Mon Oct 23 2023 Liwei Ge - 8.0.30-1.0.1 - Support loongarch64 platform +* Fri Oct 6 2023 Remi Collet - 8.0.30-1 +- rebase to 8.0.30 + * Fri Jan 13 2023 Remi Collet - 8.0.27-1 - rebase to 8.0.27