diff --git a/php-5.4.9-phpinfo.patch b/php-5.4.9-phpinfo.patch new file mode 100644 index 0000000..b52a2f8 --- /dev/null +++ b/php-5.4.9-phpinfo.patch @@ -0,0 +1,27 @@ + +Drop "Configure Command" from phpinfo as it doesn't +provide any useful information. +The available extensions are not related to this command. + +--- php-5.4.9/ext/standard/info.c.orig 2012-12-11 10:43:02.450578276 +0100 ++++ php-5.4.9/ext/standard/info.c 2012-12-11 10:44:12.530820821 +0100 +@@ -704,9 +704,6 @@ + #ifdef ARCHITECTURE + php_info_print_table_row(2, "Architecture", ARCHITECTURE); + #endif +-#ifdef CONFIGURE_COMMAND +- php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); +-#endif + + if (sapi_module.pretty_name) { + php_info_print_table_row(2, "Server API", sapi_module.pretty_name ); +--- php-5.4.9/ext/standard/tests/general_functions/phpinfo.phpt.orig 2012-12-11 11:07:26.959156091 +0100 ++++ php-5.4.9/ext/standard/tests/general_functions/phpinfo.phpt 2012-12-11 11:07:30.899170970 +0100 +@@ -20,7 +20,6 @@ + + System => %s + Build Date => %s%a +-Configure Command => %s + Server API => Command Line Interface + Virtual Directory Support => %s + Configuration File (php.ini) Path => %s diff --git a/php.spec b/php.spec index 31b3fe9..c9c74fa 100644 --- a/php.spec +++ b/php.spec @@ -58,7 +58,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: 5.4.9 -Release: 2%{?dist} +Release: 3%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -107,6 +107,8 @@ Patch44: php-5.4.5-system-libzip.patch Patch45: php-5.4.8-ldap_r.patch # Make php_config.h constant across builds Patch46: php-5.4.9-fixheader.patch +# drop "Configure command" from phpinfo output +Patch47: php-5.4.9-phpinfo.patch # Fixes for tests @@ -680,6 +682,7 @@ support for using the enchant library to PHP. %patch45 -p1 -b .ldap_r %endif %patch46 -p1 -b .fixheader +%patch47 -p1 -b .phpinfo # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -1412,6 +1415,9 @@ fi %changelog +* Tue Dec 11 2012 Remi Collet 5.4.9-3 +- drop "Configure Command" from phpinfo output + * Tue Dec 11 2012 Joe Orton - 5.4.9-2 - prevent php_config.h changes across (otherwise identical) rebuilds