From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 15 Dec 2017 21:04:24 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.2RC1~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb77c2c2a7164622e920befab0aaff6d2edc12a1;p=php

Merge branch 'PHP-7.1' into PHP-7.2
---

eb77c2c2a7164622e920befab0aaff6d2edc12a1
diff --cc NEWS
index a7393413a3,c990615010..e8d8ef71e4
--- a/NEWS
+++ b/NEWS
@@@ -20,8 -19,12 +20,10 @@@ PH
      (Daniel Ciochiu)
    . Fixed bug #75074 (php-process crash when is_file() is used with strings
      longer 260 chars). (Anatol)
+   . Fixed bug #69727 (Remove timestamps from build to make it reproducible).
+     (jelle van der Waa)
  
 -- CLI Server:
 -  . Fixed bug #60471 (Random "Invalid request (unexpected EOF)" using a router
 -    script). (SammyK)
 +- CLI server:
    . Fixed bug #73830 (Directory does not exist). (Anatol)
  
  - FPM:
diff --cc configure.ac
index f7800250fe,40f44702ff..a9ef3f6a82
--- a/configure.ac
+++ b/configure.ac
@@@ -1268,13 -1285,24 +1268,14 @@@ f
  EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
  EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
  
- PHP_BUILD_DATE=`date '+%Y-%m-%d'`
+ # SOURCE_DATE_EPOCH for reproducible builds https://reproducible-builds.org/specs/source-date-epoch/
+ PHP_BUILD_DATE=`date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d`
  AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
  
 -case $host_alias in
 -*netware*)
 -  PHP_OS="NetWare"
 -  PHP_UNAME="NetWare"
 -  AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[hardcode for each of the cross compiler host])
 -  AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host])
 -  ;;
 -*)
 -  PHP_UNAME=`uname -a | xargs`
 -  AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
 -  PHP_OS=`uname | xargs`
 -  AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
 -  ;;
 -esac
 +PHP_UNAME=`uname -a | xargs`
 +AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
 +PHP_OS=`uname | xargs`
 +AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
  
  PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)