diff options
| -rw-r--r-- | failed.txt | 10 | ||||
| -rw-r--r-- | php-7.0.0-fixheader.patch | 23 | ||||
| -rw-r--r-- | php71.spec | 16 |
3 files changed, 14 insertions, 35 deletions
@@ -1,4 +1,4 @@ -===== 7.1.13 (2018-01-04) +===== 7.1.14RC1 (2018-01-17) $ grep -r 'Tests failed' /var/lib/mock/*/build.log @@ -6,19 +6,17 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log /var/lib/mock/el6x/build.log:Tests failed : 0 /var/lib/mock/el7x/build.log:Tests failed : 0 /var/lib/mock/fc24i/build.log:Tests failed : 0 -/var/lib/mock/fc24x/build.log:Tests failed : 1 +/var/lib/mock/fc24x/build.log:Tests failed : 0 /var/lib/mock/fc25i/build.log:Tests failed : 1 /var/lib/mock/fc25x/build.log:Tests failed : 0 /var/lib/mock/fc26i/build.log:Tests failed : 0 -/var/lib/mock/fc26x/build.log:Tests failed : 0 +/var/lib/mock/fc26x/build.log:Tests failed : 1 /var/lib/mock/fc27i/build.log:Tests failed : 0 /var/lib/mock/fc27x/build.log:Tests failed : 0 -fc24x: +fc25i, fc26x: 1 Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt] -fc25i: - 1 Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt] 1 proc_open give erratic test results :( diff --git a/php-7.0.0-fixheader.patch b/php-7.0.0-fixheader.patch deleted file mode 100644 index 771a19e..0000000 --- a/php-7.0.0-fixheader.patch +++ /dev/null @@ -1,23 +0,0 @@ - -Make generated php_config.h constant across rebuilds. - ---- php-7.0.0/configure.in.fixheader -+++ php-7.0.0/configure.in -@@ -1278,7 +1278,7 @@ fi - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" - EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" - --PHP_BUILD_DATE=`date '+%Y-%m-%d'` -+PHP_BUILD_DATE=`date '+%Y-%m-%d' -r $srcdir/NEWS` - AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) - - case $host_alias in -@@ -1289,7 +1289,7 @@ case $host_alias in - AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host]) - ;; - *) -- 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]) @@ -107,13 +107,13 @@ %global db_devel libdb-devel %endif -%global upver 7.1.13 -#global rcver RC1 +%global upver 7.1.14 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 3%{?dist} +Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -159,8 +159,6 @@ Patch42: php-7.1.0-systzdata-v14.patch Patch43: php-5.4.0-phpize.patch # Use -lldap_r for OpenLDAP Patch45: php-5.6.3-ldap_r.patch -# Make php_config.h constant across builds -Patch46: php-7.0.0-fixheader.patch # drop "Configure command" from phpinfo output Patch47: php-5.6.3-phpinfo.patch # Automatically load OpenSSL configuration file @@ -1011,7 +1009,6 @@ support for JavaScript Object Notation (JSON) to PHP. %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %patch45 -p1 -b .ldap_r %endif -%patch46 -p1 -b .fixheader %patch47 -p1 -b .phpinfo %patch48 -p1 -b .loadconf @@ -1174,6 +1171,9 @@ cat %{SOURCE1} %{SOURCE11} >httpd-php.conf %build %{?dtsenable} +# Set build date from https://reproducible-builds.org/specs/source-date-epoch/ +export SOURCE_DATE_EPOCH=$(date +%s -r NEWS) + # aclocal workaround - to be improved cat $(aclocal --print-ac-dir)/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >>aclocal.m4 @@ -2058,6 +2058,10 @@ fi %changelog +* Wed Jan 17 2018 Remi Collet <remi@remirepo.net> - 7.1.14~RC1-1 +- Update to 7.1.14RC1 +- define SOURCE_DATE_EPOCH for reproducible build + * Tue Jan 16 2018 Remi Collet <remi@remirepo.net> - 7.1.13-3 - rebuild for gdbm 1.13 (1.14 was reverted) |