summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-07-08 07:49:35 +0200
committerRemi Collet <remi@remirepo.net>2020-07-08 07:49:35 +0200
commitc3b4827ef261f7028e0ff02a55d5ad300b3ca0f6 (patch)
tree3554d9b91605b67762b02ef9638cc59a435d107f
parenta67c40947eaa476040af3827f74a7f954fe883fe (diff)
Update to 7.2.32 (no change)
display build system and provider in phpinfo (from 8.0)
-rw-r--r--failed.txt8
-rw-r--r--php-7.2.32-fixheader.patch (renamed from php-7.2.4-fixheader.patch)0
-rw-r--r--php-7.2.32-phpinfo.patch (renamed from php-5.6.3-phpinfo.patch)0
-rw-r--r--php72.spec20
4 files changed, 20 insertions, 8 deletions
diff --git a/failed.txt b/failed.txt
index 41688bd..673c2fc 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,13 +1,15 @@
-===== 7.2.31 (2020-05-14)
+===== 7.2.32 (2020-07-09)
$ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
/var/lib/mock/el6i/build.log:Tests failed : 0
/var/lib/mock/el6x/build.log:Tests failed : 0
-/var/lib/mock/el7x/build.log:Tests failed : 0
-/var/lib/mock/el8x72/build.logTests failed : 18
+/var/lib/mock/el7x/build.log:Tests failed : 1
+/var/lib/mock/el8x72/build.logTests failed : 17
+el7x:
+ 1 Bug #69521 Segfault in gc_collect_cycles() [ext/standard/tests/streams/bug69521.phpt]
el8x:
5 openssl failure under investigation
diff --git a/php-7.2.4-fixheader.patch b/php-7.2.32-fixheader.patch
index 52a4121..52a4121 100644
--- a/php-7.2.4-fixheader.patch
+++ b/php-7.2.32-fixheader.patch
diff --git a/php-5.6.3-phpinfo.patch b/php-7.2.32-phpinfo.patch
index 086be15..086be15 100644
--- a/php-5.6.3-phpinfo.patch
+++ b/php-7.2.32-phpinfo.patch
diff --git a/php72.spec b/php72.spec
index 92597c2..f113167 100644
--- a/php72.spec
+++ b/php72.spec
@@ -120,13 +120,13 @@
%global db_devel libdb-devel
%endif
-%global upver 7.2.31
+%global upver 7.2.32
#global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: %{upver}%{?rcver:~%{rcver}}
-Release: 2%{?dist}
+Release: 1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -176,10 +176,11 @@ Patch42: php-7.2.16-systzdata-v17.patch
Patch43: php-7.2.12-phpize.patch
# Use -lldap_r for OpenLDAP
Patch45: php-7.2.3-ldap_r.patch
-# Make php_config.h constant across builds
-Patch46: php-7.2.4-fixheader.patch
+# Make php_config.h constant across builds (from 7.4)
+Patch46: php-7.2.32-fixheader.patch
# drop "Configure command" from phpinfo output
-Patch47: php-5.6.3-phpinfo.patch
+# and add build system and provider (from 8.0)
+Patch47: php-7.2.32-phpinfo.patch
# getallheaders for FPM backported from 7.3
Patch48: php-7.2.8-getallheaders.patch
# backport PDOStatement::getColumnMeta from 7.4
@@ -1283,6 +1284,11 @@ fi
# Set build date from https://reproducible-builds.org/specs/source-date-epoch/
export SOURCE_DATE_EPOCH=$(date +%s -r NEWS)
+export PHP_UNAME=$(uname)
+export PHP_BUILD_SYSTEM=$(cat /etc/redhat-release | sed -e 's/ Beta//')
+%if 0%{?vendor:1}
+export PHP_BUILD_PROVIDER="%{vendor}"
+%endif
# aclocal workaround - to be improved
cat $(aclocal --print-ac-dir)/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >>aclocal.m4
@@ -2219,6 +2225,10 @@ fi
%changelog
+* Wed Jul 7 2021 Remi Collet <remi@remirepo.net> - 7.2.32-1
+- Update to 7.2.32 (no change)
+- display build system and provider in phpinfo (from 8.0)
+
* Tue Jun 9 2020 Remi Collet <remi@remirepo.net> - 7.2.31-2
- rebuild using oniguruma5php
- build phpdbg only once