0041-Add-patch-to-remove-build-timestamps-from-generated-.patch (5081B)
1 From: Thijs Kinkhorst <thijs@debian.org> 2 Date: Wed, 15 Jun 2016 09:18:03 +0200 3 Subject: Add patch to remove build timestamps from generated binaries. 4 5 --- 6 ext/standard/info.c | 1 - 7 sapi/apache2handler/config.m4 | 15 +++------------ 8 sapi/cgi/cgi_main.c | 4 ++-- 9 sapi/cli/php_cli.c | 4 ++-- 10 sapi/fpm/fpm/fpm_main.c | 4 ++-- 11 sapi/phpdbg/phpdbg.c | 4 +--- 12 6 files changed, 10 insertions(+), 22 deletions(-) 13 14 diff --git a/ext/standard/info.c b/ext/standard/info.c 15 index e74d6b4..883fbdf 100644 16 --- a/ext/standard/info.c 17 +++ b/ext/standard/info.c 18 @@ -865,7 +865,6 @@ PHPAPI void php_print_info(int flag) 19 php_info_print_box_end(); 20 php_info_print_table_start(); 21 php_info_print_table_row(2, "System", ZSTR_VAL(php_uname)); 22 - php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__); 23 #ifdef COMPILER 24 php_info_print_table_row(2, "Compiler", COMPILER); 25 #endif 26 diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 27 index f286b1a..fba92b8 100644 28 --- a/sapi/apache2handler/config.m4 29 +++ b/sapi/apache2handler/config.m4 30 @@ -59,18 +59,9 @@ if test "$PHP_APXS2" != "no"; then 31 APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" 32 33 APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` 34 - if test -z `$APXS -q SYSCONFDIR`; then 35 - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ 36 - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ 37 - -i -n php7" 38 - else 39 - APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` 40 - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ 41 - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ 42 - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ 43 - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ 44 - -i -a -n php7" 45 - fi 46 + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ 47 + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ 48 + -i -n php7" 49 50 case $host_alias in 51 *aix*) 52 diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c 53 index 0b6deb1..bb9014a 100644 54 --- a/sapi/cgi/cgi_main.c 55 +++ b/sapi/cgi/cgi_main.c 56 @@ -2342,9 +2342,9 @@ consult the installation file that came with this distribution, or visit \n\ 57 SG(request_info).no_headers = 1; 58 } 59 #if ZEND_DEBUG 60 - php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2017 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); 61 + php_printf("PHP %s (%s) (DEBUG)\nCopyright (c) 1997-2017 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); 62 #else 63 - php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2017 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); 64 + php_printf("PHP %s (%s)\nCopyright (c) 1997-2017 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); 65 #endif 66 php_request_shutdown((void *) 0); 67 fcgi_shutdown(); 68 diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c 69 index dc92045..bb28364 100644 70 --- a/sapi/cli/php_cli.c 71 +++ b/sapi/cli/php_cli.c 72 @@ -690,8 +690,8 @@ static int do_cli(int argc, char **argv) /* {{{ */ 73 goto out; 74 75 case 'v': /* show php version & quit */ 76 - php_printf("PHP %s (%s) (built: %s %s) ( %s)\nCopyright (c) 1997-2017 The PHP Group\n%s", 77 - PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__, 78 + php_printf("PHP %s (%s) ( %s)\nCopyright (c) 1997-2017 The PHP Group\n%s", 79 + PHP_VERSION, cli_sapi_module.name, 80 #if ZTS 81 "ZTS " 82 #else 83 diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c 84 index 6768113..545c52e 100644 85 --- a/sapi/fpm/fpm/fpm_main.c 86 +++ b/sapi/fpm/fpm/fpm_main.c 87 @@ -1756,9 +1756,9 @@ int main(int argc, char *argv[]) 88 SG(request_info).no_headers = 1; 89 90 #if ZEND_DEBUG 91 - php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2017 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); 92 + php_printf("PHP %s (%s) (DEBUG)\nCopyright (c) 1997-2017 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); 93 #else 94 - php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2017 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); 95 + php_printf("PHP %s (%s)\nCopyright (c) 1997-2017 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); 96 #endif 97 php_request_shutdown((void *) 0); 98 fcgi_shutdown(); 99 diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c 100 index b47c7c8..ab94bba 100644 101 --- a/sapi/phpdbg/phpdbg.c 102 +++ b/sapi/phpdbg/phpdbg.c 103 @@ -1699,10 +1699,8 @@ phpdbg_main: 104 phpdbg_do_help_cmd(exec); 105 } else if (show_version) { 106 phpdbg_out( 107 - "phpdbg %s (built: %s %s)\nPHP %s, Copyright (c) 1997-2017 The PHP Group\n%s", 108 + "phpdbg %s\nPHP %s, Copyright (c) 1997-2017 The PHP Group\n%s", 109 PHPDBG_VERSION, 110 - __DATE__, 111 - __TIME__, 112 PHP_VERSION, 113 get_zend_version() 114 );