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

rebase to 8.0.30

Browse Source 
Resolves: RHEL-11946
This commit is contained in:
Remi Collet 2023-10-06 14:47:11 +02:00
parent ec27e2786c
commit 61c64c1235
4 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -12,3 +12,5 @@ php-8.1.*.xz.asc
/php-8.0.20.tar.xz.asc /php-8.0.20.tar.xz.asc
/php-8.0.27.tar.xz /php-8.0.27.tar.xz
/php-8.0.27.tar.xz.asc /php-8.0.27.tar.xz.asc
/php-8.0.30.tar.xz
/php-8.0.30.tar.xz.asc

3
php-8.0.10-systzdata-v21.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:
r22: fix possible buffer overflow
r21: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi r21: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi
r20: adapt for timelib 2020.03 (in 8.0.10RC1) r20: adapt for timelib 2020.03 (in 8.0.10RC1)
r19: adapt for timelib 2020.02 (in 8.0.0beta2) r19: adapt for timelib 2020.02 (in 8.0.0beta2)
@ -454,7 +455,7 @@ index e9bd0f136d..c04ff01adc 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);
+ +

36
php.spec
View File

@ -56,7 +56,7 @@
%bcond_with imap %bcond_with imap
%bcond_without lmdb %bcond_without lmdb
%global upver 8.0.27 %global upver 8.0.30
#global rcver RC1 #global rcver RC1
Summary: PHP scripting language for creating dynamic web sites Summary: PHP scripting language for creating dynamic web sites
@ -705,31 +705,31 @@ 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
%patch9 -p1 -b .deprecated %patch -P9 -p1 -b .deprecated
%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
%patch48 -p1 -b .sha %patch -P48 -p1 -b .sha
%patch49 -p1 -b .pharsha %patch -P49 -p1 -b .pharsha
%patch50 -p1 -b .openssl3 %patch -P50 -p1 -b .openssl3
rm ext/openssl/tests/p12_with_extra_certs.p12 rm ext/openssl/tests/p12_with_extra_certs.p12
%patch51 -p1 -b .libxcrypt %patch -P51 -p1 -b .libxcrypt
# 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
@ -1535,6 +1535,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%changelog %changelog
* Fri Oct 6 2023 Remi Collet <rcollet@redhat.com> - 8.0.30-1
- rebase to 8.0.30
- Resolves: RHEL-11946
* Fri Jan 13 2023 Remi Collet <rcollet@redhat.com> - 8.0.27-1 * Fri Jan 13 2023 Remi Collet <rcollet@redhat.com> - 8.0.27-1
- rebase to 8.0.27 - rebase to 8.0.27

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (php-8.0.27.tar.xz) = 443d4fe5d3165e2806e6ce03356f38b1d70fb4c86054f10b22e62191d5961bb51b10a31c49f3d74e6360836254db3107a8910589966481ebc7f5e06886b5e026 SHA512 (php-8.0.30.tar.xz) = fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
SHA512 (php-8.0.27.tar.xz.asc) = f76d8ffc14490a73ff426b8225a017caacab0607dfc10c6227f3eaece2b6b5fa83443a45e814768c98dde461fa60097009f966f5b4bdb5adc54fda20a0a36400 SHA512 (php-8.0.30.tar.xz.asc) = 7c2624f0b6a1f2ac23403a34c7f06f5085635d89210ca3b7ba41923c632003214ef3c442d2a6a852dce25eb365562748150da4cd146d7e4ab28ce05b8ab96f77