diff --git a/.gitignore b/.gitignore index 78268ac..d6a5d5d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ php-7.1.*.xz /php-7.2.0.tar.xz /php-7.2.1RC1.tar.xz /php-7.2.1.tar.xz +/php-7.2.2RC1.tar.xz diff --git a/php-7.2.0-fixheader.patch b/php-7.2.0-fixheader.patch deleted file mode 100644 index bc822fd..0000000 --- a/php-7.2.0-fixheader.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- php-7.2.0/configure.ac.fixheader 2017-04-12 09:42:21.510812285 +0200 -+++ php-7.2.0/configure.ac 2017-04-12 09:43:45.055224385 +0200 -@@ -1263,10 +1263,10 @@ - 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]) - --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]) diff --git a/php-7.2.2-fixheader.patch b/php-7.2.2-fixheader.patch new file mode 100644 index 0000000..dc2a080 --- /dev/null +++ b/php-7.2.2-fixheader.patch @@ -0,0 +1,12 @@ +diff -up php-7.2.2RC1/configure.ac.fixheader php-7.2.2RC1/configure.ac +--- php-7.2.2RC1/configure.ac.fixheader 2018-01-16 09:14:15.231218443 +0100 ++++ php-7.2.2RC1/configure.ac 2018-01-16 09:17:21.740382942 +0100 +@@ -1272,7 +1272,7 @@ EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PR + 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]) + +-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]) diff --git a/php.spec b/php.spec index 371fff6..a491246 100644 --- a/php.spec +++ b/php.spec @@ -61,8 +61,8 @@ %global db_devel libdb-devel %endif -%global upver 7.2.1 -#global rcver RC1 +%global upver 7.2.2 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: php @@ -109,7 +109,7 @@ 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.2.0-fixheader.patch +Patch46: php-7.2.2-fixheader.patch # drop "Configure command" from phpinfo output Patch47: php-5.6.3-phpinfo.patch @@ -831,6 +831,9 @@ sed -e '/opcache.huge_code_pages/s/0/1/' -i 10-opcache.ini %build +# 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 @@ -1520,6 +1523,10 @@ rm -f README.{Zeus,QNX,CVS-RULES} %changelog +* Tue Jan 16 2018 Remi Collet - 7.2.2~RC1-1 +- update to 7.2.2RC1 +- define SOURCE_DATE_EPOCH for reproducible build + * Wed Jan 3 2018 Remi Collet - 7.2.1-1 - Update to 7.2.1 - http://www.php.net/releases/7_2_1.php diff --git a/sources b/sources index 261b810..2ca362c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-7.2.1.tar.xz) = 2445f2cff20214b521c48592e5ab42b770c291702178d7cb2a84912c81b7e5d2cc45948a3a4a7830194fa444708d544c73efbaa8e90c95ab77937f7feffb2ffc +SHA512 (php-7.2.2RC1.tar.xz) = e13dcbcbb47dfd0a79b5df38e8cb033d9e4c34eb1369e7cf611516db3cc51a392e2d17f3c88f372ebd1376eb66bbc8ccd4cc5611e53d5aedbd670b73ad9bf4c8