diff options
| author | Remi Collet <remi@remirepo.net> | 2020-06-23 10:33:15 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-06-23 10:33:15 +0200 |
| commit | b43923d52943911cfb4be8ede9b36e884bac7cf8 (patch) | |
| tree | 428c9d640bde2717f4fc174f8b1e1583c8e8aeb3 | |
| parent | 3bba6d7aaef582b784ccf49de956a3802cc74849 (diff) | |
update to 7.4.8RC1
drop patch to fix PHP_UNAME
| -rw-r--r-- | failed.txt | 6 | ||||
| -rw-r--r-- | php-7.2.4-fixheader.patch | 12 | ||||
| -rw-r--r-- | php.spec | 15 |
3 files changed, 12 insertions, 21 deletions
@@ -1,14 +1,16 @@ -===== 7.4.7 (2020-06-11) +===== 7.4.8RC1 (2020-06-25) $ grep -ar 'Tests failed' /var/lib/mock/scl74*/build.log /var/lib/mock/scl74el7x/build.log:Tests failed : 0 -/var/lib/mock/scl74el8x/build.log:Tests failed : 16 +/var/lib/mock/scl74el8x/build.log:Tests failed : 1 /var/lib/mock/scl74fc30x/build.log:Tests failed : 0 /var/lib/mock/scl74fc31x/build.log:Tests failed : 0 /var/lib/mock/scl74fc32x/build.log:Tests failed : 0 +el8x: + 3 Bug #78338 (Array cross-border reading in PCRE) [ext/pcre/tests/bug78338.phpt] (1) proc_open give erratic test results :( diff --git a/php-7.2.4-fixheader.patch b/php-7.2.4-fixheader.patch deleted file mode 100644 index 52a4121..0000000 --- a/php-7.2.4-fixheader.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up php-7.2.4RC1/configure.ac.fixheader php-7.2.4RC1/configure.ac ---- php-7.2.4RC1/configure.ac.fixheader 2018-03-13 12:42:47.594623100 +0100 -+++ php-7.2.4RC1/configure.ac 2018-03-13 12:43:35.591871825 +0100 -@@ -1275,7 +1275,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d` - fi - AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) - --PHP_UNAME=`uname -a | xargs` -+PHP_UNAME=`uname | xargs` - AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) - PHP_OS=`uname | xargs` - AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) @@ -101,13 +101,12 @@ #global gh_date 20190612 %global gh_owner php %global gh_project php-src -%global upver 7.4.7 -#global rcver RC1 -#global lower RC1 +%global upver 7.4.8 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php -Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}} +Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}} Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -157,8 +156,6 @@ Patch42: php-7.3.3-systzdata-v18.patch Patch43: php-7.4.0-phpize.patch # Use -lldap_r for OpenLDAP Patch45: php-7.4.0-ldap_r.patch -# Make php_config.h constant across builds -Patch46: php-7.2.4-fixheader.patch # drop "Configure command" from phpinfo output Patch47: php-5.6.3-phpinfo.patch @@ -932,7 +929,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %patch45 -p1 -b .ldap_r %endif -%patch46 -p1 -b .fixheader %patch47 -p1 -b .phpinfo %patch91 -p1 -b .remi-oci8 @@ -1078,6 +1074,7 @@ exit 1 # Set build date from https://reproducible-builds.org/specs/source-date-epoch/ export SOURCE_DATE_EPOCH=$(date +%s -r NEWS) +export PHP_UNAME=$(uname) # Force use of system libtool: libtoolize --force --copy @@ -1811,6 +1808,10 @@ fi %changelog +* Tue Jun 23 2020 Remi Collet <remi@remirepo.net> - 7.4.8~RC1-1 +- update to 7.4.8RC1 +- drop patch to fix PHP_UNAME + * Tue Jun 9 2020 Remi Collet <remi@remirepo.net> - 7.4.7-1 - Update to 7.4.7 - http://www.php.net/releases/7_4_7.php - rebuild using oniguruma5php |