diff --git a/.gitignore b/.gitignore index 0c5f14e..f41ffac 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ php-7.*.xz.asc /php-8.2.3.tar.xz.asc /php-8.2.4RC1.tar.xz /php-8.2.4RC1.tar.xz.asc +/php-8.2.4.tar.xz +/php-8.2.4.tar.xz.asc diff --git a/php-8.1.0-systzdata-v22.patch b/php-8.1.0-systzdata-v23.patch similarity index 99% rename from php-8.1.0-systzdata-v22.patch rename to php-8.1.0-systzdata-v23.patch index d1c8d90..3157660 100644 --- a/php-8.1.0-systzdata-v22.patch +++ b/php-8.1.0-systzdata-v23.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: +r23: fix possible buffer overflow r22: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi r21: adapt for timelib 2021.03 (in 8.1.0) r20: adapt for timelib 2020.03 (in 8.0.10RC1) @@ -456,7 +457,7 @@ index e41315efdb..4b6547c0a3 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 cb3bb87..bc716d0 100644 --- a/php.spec +++ b/php.spec @@ -65,7 +65,7 @@ %bcond_without lmdb %global upver 8.2.4 -%global rcver RC1 +#global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: php @@ -111,7 +111,7 @@ Patch8: php-8.1.0-libdb.patch # Use system nikic/php-parser Patch41: php-8.2.0-parser.patch # use system tzdata -Patch42: php-8.1.0-systzdata-v22.patch +Patch42: php-8.1.0-systzdata-v23.patch # See http://bugs.php.net/53436 Patch43: php-7.4.0-phpize.patch # Use -lldap_r for OpenLDAP @@ -1543,6 +1543,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %changelog +* Wed Mar 15 2023 Remi Collet - 8.2.4-1 +- Update to 8.2.4 - http://www.php.net/releases/8_2_4.php + * Wed Mar 1 2023 Remi Collet - 8.2.4~RC1-1 - update to 8.2.4RC1 diff --git a/sources b/sources index 08379e9..f0df477 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (php-8.2.4RC1.tar.xz) = e98a20516bd0957b3758d75cb757f8bf40ace0eaf1f70eebe51811495c8c33d4c3c2d6bfbeb3810cdade113a3f1162914fc6a4be2803a56835983c2fc7cae580 -SHA512 (php-8.2.4RC1.tar.xz.asc) = aadf4844853be60a32e0076342512d9826f6e8b66aa16da736c0e46757fcc12fa99e26a1cc91b8a6e0938b16eb936b10524030f65ba3a3ea1569a329fdf8c6f0 +SHA512 (php-8.2.4.tar.xz) = 997435f3f921f305147a520497c68031aad6d1212365ddf04674d919fd2787d169d2898536a59709b5530857c5746a25cf43e726a2c3a30bcf3372107b2cd388 +SHA512 (php-8.2.4.tar.xz.asc) = 0923c54e590d547565d857e5b1df9c00243426cb4b226d701e4b170f9ab98e4a222f7eb10686307aac0066d364be994ca097ad668fc8c091dd2e4db02b56c976