Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2013-10-30 15:49:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2013-10-15 10:43:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2013-10-30 15:49:21.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Oct 30 07:56:07 UTC 2013 - [email protected] + +- updatedto 5.4.21: + * About 10 bugs were fixed. + * added custom-tmp-dir.patch by Per Jessen + +------------------------------------------------------------------- Old: ---- php-5.4.20.tar.bz2 New: ---- php-5.4.21.tar.bz2 php5-custom-tmp-dir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.miPIsB/_old 2013-10-30 15:49:25.000000000 +0100 +++ /var/tmp/diff_new_pack.miPIsB/_new 2013-10-30 15:49:25.000000000 +0100 @@ -100,7 +100,7 @@ %define apache2_includedir %(%{apxs2} -q INCLUDEDIR) %define apache2_serverroot %(%{apxs2} -q PREFIX) %define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h;then echo 1; else echo 0; fi; else echo 0; fi) -Version: 5.4.20 +Version: 5.4.21 Release: 0 Provides: php Provides: php-api = %{apiver} @@ -174,6 +174,8 @@ Patch20: php5-per-mod-log.patch Patch21: php5-apache24-updates.patch Patch22: php5-systemd-unit.patch +# added to 5.5.5 +Patch23: php5-custom-tmp-dir.patch Url: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: PHP5 Core Files @@ -1306,6 +1308,7 @@ %patch20 -p1 %patch21 -p1 %patch22 +%patch23 -p1 # Safety check for API version change. vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h` ++++++ php-5.4.20.tar.bz2 -> php-5.4.21.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/php5/php-5.4.20.tar.bz2 /work/SRC/openSUSE:Factory/.php5.new/php-5.4.21.tar.bz2 differ: char 11, line 1 ++++++ php5-custom-tmp-dir.patch ++++++ diff -ru a/main/main.c b/main/main.c --- a/main/main.c 2012-05-08 07:22:56.000000000 +0200 +++ b/main/main.c 2012-05-10 17:23:32.000000000 +0200 @@ -522,6 +522,7 @@ STD_PHP_INI_ENTRY("default_mimetype", SAPI_DEFAULT_MIMETYPE, PHP_INI_ALL, OnUpdateString, default_mimetype, sapi_globals_struct,sapi_globals) STD_PHP_INI_ENTRY("error_log", NULL, PHP_INI_ALL, OnUpdateErrorLog, error_log, php_core_globals, core_globals) STD_PHP_INI_ENTRY("extension_dir", PHP_EXTENSION_DIR, PHP_INI_SYSTEM, OnUpdateStringUnempty, extension_dir, php_core_globals, core_globals) + STD_PHP_INI_ENTRY("sys_temp_dir", NULL, PHP_INI_SYSTEM, OnUpdateStringUnempty, sys_temp_dir, php_core_globals, core_globals) STD_PHP_INI_ENTRY("include_path", PHP_INCLUDE_PATH, PHP_INI_ALL, OnUpdateStringUnempty, include_path, php_core_globals, core_globals) PHP_INI_ENTRY("max_execution_time", "30", PHP_INI_ALL, OnUpdateTimeout) STD_PHP_INI_ENTRY("open_basedir", NULL, PHP_INI_ALL, OnUpdateBaseDir, open_basedir, php_core_globals, core_globals) diff -ru a/main/php_globals.h b/main/php_globals.h --- a/main/php_globals.h 2012-05-08 07:22:56.000000000 +0200 +++ b/main/php_globals.h 2012-05-10 17:23:32.000000000 +0200 @@ -85,6 +85,7 @@ char *open_basedir; char *extension_dir; char *php_binary; + char *sys_temp_dir; char *upload_tmp_dir; long upload_max_filesize; diff -ru a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c --- a/main/php_open_temporary_file.c 2012-05-08 07:22:56.000000000 +0200 +++ b/main/php_open_temporary_file.c 2012-05-10 17:23:32.000000000 +0200 @@ -196,6 +196,21 @@ return temporary_directory; } + /* Specify temporary directory by "sys_temp_dir" in .ini? */ + { + char *sys_temp_dir = PG(sys_temp_dir); + if(sys_temp_dir){ + int len = strlen(sys_temp_dir); + if (len >= 2 && sys_temp_dir[len - 1] == DEFAULT_SLASH) { + temporary_directory = zend_strndup(sys_temp_dir, len - 1); + return temporary_directory; + } else if (len >= 1 && sys_temp_dir[len - 1] != DEFAULT_SLASH) { + temporary_directory = zend_strndup(sys_temp_dir, len); + return temporary_directory; + } + } + } + #ifdef PHP_WIN32 /* We can't count on the environment variables TEMP or TMP, * and so must make the Win32 API call to get the default diff -ru a/php.ini-development b/php.ini-development --- a/php.ini-development 2012-05-08 07:22:56.000000000 +0200 +++ b/php.ini-development 2012-05-10 17:23:32.000000000 +0200 @@ -729,6 +729,10 @@ ; On windows: ; extension_dir = "ext" +; Directory where the temporary files should be placed. +; Defaults to the system default (see sys_get_temp_dir) +; sys_temp_dir = "/tmp" + ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically ; disabled on them. diff -ru a/php.ini-production b/php.ini-production --- a/php.ini-production 2012-05-08 07:22:56.000000000 +0200 +++ b/php.ini-production 2012-05-10 17:23:32.000000000 +0200 @@ -729,6 +729,10 @@ ; On windows: ; extension_dir = "ext" +; Directory where the temporary files should be placed. +; Defaults to the system default (see sys_get_temp_dir) +; sys_temp_dir = "/tmp" + ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically ; disabled on them. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
