You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
131 lines
6.0 KiB
131 lines
6.0 KiB
From: Thijs Kinkhorst <thijs@debian.org>
|
|
Date: Wed, 15 Jun 2016 09:18:03 +0200
|
|
Subject: Add patch to remove build timestamps from generated binaries.
|
|
|
|
---
|
|
ext/standard/info.c | 1 -
|
|
sapi/apache2handler/config.m4 | 15 +++------------
|
|
sapi/cgi/cgi_main.c | 4 ++--
|
|
sapi/cli/php_cli.c | 4 ++--
|
|
sapi/fpm/fpm/fpm_main.c | 4 ++--
|
|
sapi/litespeed/lsapi_main.c | 4 ++--
|
|
sapi/phpdbg/phpdbg.c | 4 +---
|
|
7 files changed, 12 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/ext/standard/info.c b/ext/standard/info.c
|
|
index e6eaac3..024e5c9 100644
|
|
--- a/ext/standard/info.c
|
|
+++ b/ext/standard/info.c
|
|
@@ -863,7 +863,6 @@ PHPAPI void php_print_info(int flag)
|
|
php_info_print_box_end();
|
|
php_info_print_table_start();
|
|
php_info_print_table_row(2, "System", ZSTR_VAL(php_uname));
|
|
- php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__);
|
|
#ifdef COMPILER
|
|
php_info_print_table_row(2, "Compiler", COMPILER);
|
|
#endif
|
|
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
|
|
index f286b1a..fba92b8 100644
|
|
--- a/sapi/apache2handler/config.m4
|
|
+++ b/sapi/apache2handler/config.m4
|
|
@@ -59,18 +59,9 @@ if test "$PHP_APXS2" != "no"; then
|
|
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
|
|
|
|
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
|
- if test -z `$APXS -q SYSCONFDIR`; then
|
|
- INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
|
- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
- -i -n php7"
|
|
- else
|
|
- APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
|
|
- INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
|
- \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
|
|
- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
- -S SYSCONFDIR='$APXS_SYSCONFDIR' \
|
|
- -i -a -n php7"
|
|
- fi
|
|
+ INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
|
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
+ -i -n php7"
|
|
|
|
case $host_alias in
|
|
*aix*)
|
|
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
|
|
index 8983b53..589e299 100644
|
|
--- a/sapi/cgi/cgi_main.c
|
|
+++ b/sapi/cgi/cgi_main.c
|
|
@@ -2216,9 +2216,9 @@ consult the installation file that came with this distribution, or visit \n\
|
|
SG(request_info).no_headers = 1;
|
|
}
|
|
#if ZEND_DEBUG
|
|
- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
|
|
+ php_printf("PHP %s (%s) (DEBUG)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
|
|
#else
|
|
- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
|
|
+ php_printf("PHP %s (%s)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
|
|
#endif
|
|
php_request_shutdown((void *) 0);
|
|
fcgi_shutdown();
|
|
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
|
|
index 978c8b3..3ee61a4 100644
|
|
--- a/sapi/cli/php_cli.c
|
|
+++ b/sapi/cli/php_cli.c
|
|
@@ -682,8 +682,8 @@ static int do_cli(int argc, char **argv) /* {{{ */
|
|
goto out;
|
|
|
|
case 'v': /* show php version & quit */
|
|
- php_printf("PHP %s (%s) (built: %s %s) ( %s)\nCopyright (c) 1997-2016 The PHP Group\n%s",
|
|
- PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__,
|
|
+ php_printf("PHP %s (%s) ( %s)\nCopyright (c) 1997-2016 The PHP Group\n%s",
|
|
+ PHP_VERSION, cli_sapi_module.name,
|
|
#if ZTS
|
|
"ZTS "
|
|
#else
|
|
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
|
|
index 5adeb63..5e60255 100644
|
|
--- a/sapi/fpm/fpm/fpm_main.c
|
|
+++ b/sapi/fpm/fpm/fpm_main.c
|
|
@@ -1757,9 +1757,9 @@ int main(int argc, char *argv[])
|
|
SG(request_info).no_headers = 1;
|
|
|
|
#if ZEND_DEBUG
|
|
- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
|
|
+ php_printf("PHP %s (%s) (DEBUG)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
|
|
#else
|
|
- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
|
|
+ php_printf("PHP %s (%s)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
|
|
#endif
|
|
php_request_shutdown((void *) 0);
|
|
fcgi_shutdown();
|
|
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
|
|
index b0ea105..4feb8f3 100644
|
|
--- a/sapi/litespeed/lsapi_main.c
|
|
+++ b/sapi/litespeed/lsapi_main.c
|
|
@@ -811,9 +811,9 @@ static int cli_main( int argc, char * argv[] )
|
|
case 'v':
|
|
if (php_request_startup() != FAILURE) {
|
|
#if ZEND_DEBUG
|
|
- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2015 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
|
|
+ php_printf("PHP %s (%s) (DEBUG)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
|
|
#else
|
|
- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2015 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
|
|
+ php_printf("PHP %s (%s)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
|
|
#endif
|
|
#ifdef PHP_OUTPUT_NEWAPI
|
|
php_output_end_all();
|
|
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
|
|
index 68a164c..82565d8 100644
|
|
--- a/sapi/phpdbg/phpdbg.c
|
|
+++ b/sapi/phpdbg/phpdbg.c
|
|
@@ -1520,10 +1520,8 @@ phpdbg_main:
|
|
sapi_startup(phpdbg);
|
|
phpdbg->startup(phpdbg);
|
|
printf(
|
|
- "phpdbg %s (built: %s %s)\nPHP %s, Copyright (c) 1997-2016 The PHP Group\n%s",
|
|
+ "phpdbg %s\nPHP %s, Copyright (c) 1997-2016 The PHP Group\n%s",
|
|
PHPDBG_VERSION,
|
|
- __DATE__,
|
|
- __TIME__,
|
|
PHP_VERSION,
|
|
get_zend_version()
|
|
);
|