rpms/php
7
0
Fork 0
Code Issues Pull Requests Releases Activity

rebase to 8.1.27

Browse Source 
Related: RHEL-19093
This commit is contained in:
Remi Collet 2023-12-21 08:36:19 +01:00
parent b253ec1bb2
commit 1d0ea87cd4
4 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@ -1,8 +1,8 @@
/php-8.1.6.tar.xz /php-8.0.*.tar.xz
/php-8.1.6.tar.xz.asc /php-8.0.*.tar.xz.asc
/php-8.1.7.tar.xz /php-8.2.*.tar.xz
/php-8.1.7.tar.xz.asc /php-8.2.*.tar.xz.asc
/php-8.1.8.tar.xz
/php-8.1.8.tar.xz.asc
/php-8.1.14.tar.xz /php-8.1.14.tar.xz
/php-8.1.14.tar.xz.asc /php-8.1.14.tar.xz.asc
/php-8.1.27.tar.xz
/php-8.1.27.tar.xz.asc

3
php-8.1.0-systzdata-v22.patch → php-8.1.0-systzdata-v23.patch
View File

@ -5,6 +5,7 @@ Add support for use of the system timezone database, rather
than embedding a copy. Discussed upstream but was not desired. than embedding a copy. Discussed upstream but was not desired.
History: History:
r23: fix possible buffer overflow
r22: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi r22: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi
r21: adapt for timelib 2021.03 (in 8.1.0) r21: adapt for timelib 2021.03 (in 8.1.0)
r20: adapt for timelib 2020.03 (in 8.0.10RC1) r20: adapt for timelib 2020.03 (in 8.0.10RC1)
@ -456,7 +457,7 @@ index e41315efdb..4b6547c0a3 100644
+ size_t n; + size_t n;
+ char *data, *p; + 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); + p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
+ +

27
php.spec
View File

@ -64,7 +64,7 @@
%bcond_with imap %bcond_with imap
%bcond_without lmdb %bcond_without lmdb
%global upver 8.1.14 %global upver 8.1.27
#global rcver RC1 #global rcver RC1
Summary: PHP scripting language for creating dynamic web sites Summary: PHP scripting language for creating dynamic web sites
@ -111,7 +111,7 @@ Patch8: php-8.1.0-libdb.patch
# Use system nikic/php-parser # Use system nikic/php-parser
Patch41: php-8.1.0-parser.patch Patch41: php-8.1.0-parser.patch
# use system tzdata # 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 # See http://bugs.php.net/53436
Patch43: php-7.4.0-phpize.patch Patch43: php-7.4.0-phpize.patch
# Use -lldap_r for OpenLDAP # Use -lldap_r for OpenLDAP
@ -707,25 +707,25 @@ in pure PHP.
%setup -q -n php-%{upver}%{?rcver} %setup -q -n php-%{upver}%{?rcver}
%patch1 -p1 -b .mpmcheck %patch -P1 -p1 -b .mpmcheck
%patch5 -p1 -b .includedir %patch -P5 -p1 -b .includedir
%patch6 -p1 -b .embed %patch -P6 -p1 -b .embed
%patch8 -p1 -b .libdb %patch -P8 -p1 -b .libdb
%patch41 -p1 -b .syslib %patch -P41 -p1 -b .syslib
%patch42 -p1 -b .systzdata %patch -P42 -p1 -b .systzdata
%patch43 -p1 -b .headers %patch -P43 -p1 -b .headers
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
%patch45 -p1 -b .ldap_r %patch -P45 -p1 -b .ldap_r
%endif %endif
%patch47 -p1 -b .phpinfo %patch -P47 -p1 -b .phpinfo
# upstream patches # upstream patches
# security patches # security patches
# Fixes for tests # Fixes for tests
%patch300 -p1 -b .datetests %patch -P300 -p1 -b .datetests
# Prevent %%doc confusion over LICENSE files # Prevent %%doc confusion over LICENSE files
@ -1539,6 +1539,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%changelog %changelog
* Thu Dec 21 2023 Remi Collet <rcollet@redhat.com> - 8.1.27-1
- rebase to 8.1.27 RHEL-19093
* Fri Jan 13 2023 Remi Collet <rcollet@redhat.com> - 8.1.14-1 * Fri Jan 13 2023 Remi Collet <rcollet@redhat.com> - 8.1.14-1
- rebase to 8.1.14 - rebase to 8.1.14

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (php-8.1.14.tar.xz) = 75a5dc3b0490cd8105d4f6c5446522b38953d78fe7b568798db749740f365c818b251d86aba72f5e555c5fe4e4a28e352a9510803bf3cdfe37d125824ae84d61 SHA512 (php-8.1.27.tar.xz) = 07fb2b8e10e2487635e26bfd8a27949a26b85f76bc3984ad8599224bb7a7f9498d84299335ae5a0bba16599275e9747ab141f73f4f2076ddf49ebec8e76fd0ed
SHA512 (php-8.1.14.tar.xz.asc) = 80322fce4f0557a506019fafd3e5d1f06021ae05a0855b594e6432a3b58d08f5856cf7bb33f2e75259a58795b8dc3323c101fe464c9c4facdff15d920f0bcde7 SHA512 (php-8.1.27.tar.xz.asc) = 2138f31f12e8353b14fb38d79b2a0ebe10f00d8b34cbbfc89baefa6efed32000ece0d48de815c3e14908d3bb160a162ad2beed14d71cf7b532932f97192bae55