Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	php5.spec
@@ -1,5 +1,5 @@ # -# spec file for package php5 (Version 5.2.15) +# spec file for package php5 (Version 5.2.16) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -149,7 +149,7 @@ #define builtin_tz_ver 2007.9 ### ### -Version: 5.2.15 +Version: 5.2.16 Summary: PHP5 Core Files Release: 10 License: The PHP License, version 3.01 @@ -173,7 +173,7 @@ Source4: README.SUSE-pear #until it gets fixed in upstream... Source5: Registry.php -Source6: %{name}-%{version}-rpmlintrc +Source6: %{name}-rpmlintrc #SUSE specific stuff Patch1: php5-config.patch Patch2: php5-phpize.patch @@ -193,9 +193,6 @@ ##Patch12: suhosin-0.9.24-return-non-void.patch Patch13: configure.sqlite.patch -# fixes -Patch15: php-5.2.15-open_basedir.patch - #please use patch30 and up for security fixes Url: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1306,7 +1303,6 @@ pushd ext/suhosin ##patch12 popd -%patch15 # we build three SAPI %{__mkdir_p} build-apache2 @@ -1640,7 +1636,7 @@ # fix deadlock %{__cp} %{S:5} %{buildroot}/%{peardir}/PEAR # reminder: Will be removed when upstream fixes deadlock in pear -test %version = 5.2.15 +test %version = 5.2.16 # for pear XML files %{__install} -d -m 0755 %{buildroot}/var/lib/pear # provide compat symlink
[-] [+]	Deleted	php-5.2.15-open_basedir.patch ^
@@ -1,11 +0,0 @@ ---- main/fopen_wrappers.c 2010/12/09 17:04:29 306136 -+++ main/fopen_wrappers.c 2010/12/10 12:50:25 306184 -@@ -192,7 +192,7 @@ - if (strncmp(resolved_basedir, resolved_name, resolved_basedir_len) == 0) { - #endif - if (resolved_name_len > resolved_basedir_len && -- resolved_name[resolved_basedir_len] != PHP_DIR_SEPARATOR) { -+ resolved_name[resolved_basedir_len - 1] != PHP_DIR_SEPARATOR) { - return -1; - } else { - /* File is in the right directory */
[-] [+]	Deleted	php5-config.patch.old ^
@@ -1,473 +0,0 @@ ---- - php.ini-recommended \| 307 ++-------------------------------------------------- - 1 file changed, 15 insertions(+), 292 deletions(-) - -Index: php.ini-recommended -=================================================================== ---- php.ini-recommended.orig 2007-08-22 01:24:18.000000000 +0200 -+++ php.ini-recommended 2007-12-11 06:29:32.000000000 +0100 -@@ -244,7 +244,9 @@ safe_mode_allowed_env_vars = PHP_ - ; This directive contains a comma-delimited list of environment variables that - ; the end user won't be able to change using putenv(). These variables will be - ; protected even if safe_mode_allowed_env_vars is set to allow to change them. --safe_mode_protected_env_vars = LD_LIBRARY_PATH -+; the default is the same list ld.so uses when starting a setuid binary -+safe_mode_protected_env_vars = GCONV_PATH,GETCONF_DIR,HOSTALIASES,LD_AUDIT,LD_DEBUG,LD_DEBUG_OUTPUT,LD_DYNAMIC_WEAK,LD_LIBRARY_PATH,LD_ORIGIN_PATH,LD_PRELOAD,LD_PROFILE,LD_SHOW_AUXV,LD_USE_LOAD_BIAS,LOCALDOMAIN,LOCPATH,MALLOC_TRACE,NLSPATH,RESOLV_HOST_CONF,RES_OPTIONS,TMPDIR,TZDIR -+ - - ; open_basedir, if set, limits all file operations to the defined directory - ; and below. This directive makes most sense if used in a per-directory -@@ -406,7 +408,7 @@ track_errors = Off - - ; Disable the inclusion of HTML tags in error messages. - ; Note: Never use this feature for production boxes. --;html_errors = Off -+html_errors = Off - - ; If html_errors is set On PHP produces clickable error messages that direct - ; to a page describing the error or function causing the error in detail. -@@ -516,7 +518,7 @@ default_mimetype = "text/html" - ;;;;;;;;;;;;;;;;;;;;;;;;; - - ; UNIX: "/path1:/path2" --;include_path = ".:/php/includes" -+include_path = ".:/usr/share/php5:/usr/share/php5/PEAR" - ; - ; Windows: "\path1;\path2" - ;include_path = ".;c:\php\includes" -@@ -533,12 +535,12 @@ doc_root = - user_dir = - - ; Directory in which the loadable extensions (modules) reside. --extension_dir = "./" -+extension_dir = @extdir@ - - ; 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. --enable_dl = On -+enable_dl = Off - - ; cgi.force_redirect is necessary to provide security running PHP as a CGI under - ; most web servers. Left undefined, PHP turns this on by default. You can -@@ -591,7 +593,7 @@ file_uploads = On - - ; Temporary directory for HTTP uploaded files (will use system default if not - ; specified). --;upload_tmp_dir = -+upload_tmp_dir = "/tmp" - - ; Maximum allowed size for uploaded files. - upload_max_filesize = 2M -@@ -623,81 +625,6 @@ default_socket_timeout = 60 - ; fgets() and file() will work regardless of the source of the file. - ; auto_detect_line_endings = Off - -- --;;;;;;;;;;;;;;;;;;;;;; --; Dynamic Extensions ; --;;;;;;;;;;;;;;;;;;;;;; --; --; If you wish to have an extension loaded automatically, use the following --; syntax: --; --; extension=modulename.extension --; --; For example, on Windows: --; --; extension=msql.dll --; --; ... or under UNIX: --; --; extension=msql.so --; --; Note that it should be the name of the module only; no directory information --; needs to go here. Specify the location of the extension with the --; extension_dir directive above. -- -- --; Windows Extensions --; Note that ODBC support is built in, so no dll is needed for it. --; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) --; extension folders as well as the separate PECL DLL download (PHP 5). --; Be sure to appropriately set the extension_dir directive. -- --;extension=php_bz2.dll --;extension=php_curl.dll --;extension=php_dba.dll --;extension=php_dbase.dll --;extension=php_exif.dll --;extension=php_fdf.dll --;extension=php_gd2.dll --;extension=php_gettext.dll --;extension=php_gmp.dll --;extension=php_ifx.dll --;extension=php_imap.dll --;extension=php_interbase.dll --;extension=php_ldap.dll --;extension=php_mbstring.dll --;extension=php_mcrypt.dll --;extension=php_mhash.dll --;extension=php_mime_magic.dll --;extension=php_ming.dll --;extension=php_msql.dll --;extension=php_mssql.dll --;extension=php_mysql.dll --;extension=php_mysqli.dll --;extension=php_oci8.dll --;extension=php_openssl.dll --;extension=php_pdo.dll --;extension=php_pdo_firebird.dll --;extension=php_pdo_mssql.dll --;extension=php_pdo_mysql.dll --;extension=php_pdo_oci.dll --;extension=php_pdo_oci8.dll --;extension=php_pdo_odbc.dll --;extension=php_pdo_pgsql.dll --;extension=php_pdo_sqlite.dll --;extension=php_pgsql.dll --;extension=php_pspell.dll --;extension=php_shmop.dll --;extension=php_snmp.dll --;extension=php_soap.dll --;extension=php_sockets.dll --;extension=php_sqlite.dll --;extension=php_sybase_ct.dll --;extension=php_tidy.dll --;extension=php_xmlrpc.dll --;extension=php_xsl.dll --;extension=php_zip.dll -- - ;;;;;;;;;;;;;;;;;;; - ; Module Settings ; - ;;;;;;;;;;;;;;;;;;; -@@ -745,12 +672,6 @@ default_socket_timeout = 60 - define_syslog_variables = Off - - [mail function] --; For Win32 only. --SMTP = localhost --smtp_port = 25 -- --; For Win32 only. --;sendmail_from = me@example.com - - ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). - ;sendmail_path = -@@ -769,7 +690,7 @@ sql.safe_mode = Off - ;odbc.default_pw = Not yet implemented - - ; Allow or prevent persistent links. --odbc.allow_persistent = On -+odbc.allow_persistent = Off - - ; Check that a connection is still valid before reuse. - odbc.check_persistent = On -@@ -791,7 +712,7 @@ odbc.defaultbinmode = 1 - - [MySQL] - ; Allow or prevent persistent links. --mysql.allow_persistent = On -+mysql.allow_persistent = Off - - ; Maximum number of persistent links. -1 means no limit. - mysql.max_persistent = -1 -@@ -860,50 +781,9 @@ mysqli.default_pw = - ; Allow or prevent reconnect - mysqli.reconnect = Off - --[mSQL] --; Allow or prevent persistent links. --msql.allow_persistent = On -- --; Maximum number of persistent links. -1 means no limit. --msql.max_persistent = -1 -- --; Maximum number of links (persistent+non persistent). -1 means no limit. --msql.max_links = -1 -- --[OCI8] --; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA) --;oci8.privileged_connect = Off -- --; Connection: The maximum number of persistent OCI8 connections per --; process. Using -1 means no limit. --;oci8.max_persistent = -1 -- --; Connection: The maximum number of seconds a process is allowed to --; maintain an idle persistent connection. Using -1 means idle --; persistent connections will be maintained forever.
	Renamed	suhosin-patch-5.2.16-0.9.7.patch.gz ^
[-] [+]	Changed	php-5.2.16.tar.bz2/NEWS ^
@@ -1,5 +1,10 @@ PHP NEWS \|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\| +16 Dec 2010, PHP 5.2.16 +- Fixed bug #53517 (segfault in pgsql_stmt_execute() when postgres is down). + (gyp at balabit dot hu) +- Fixed bug #53516 (Regression in open_basedir handling). (Ilia) + 09 Dec 2010, PHP 5.2.15 - Fixed extract() to do not overwrite $GLOBALS and $this when using EXTR_OVERWRITE. (jorto at redhat dot com)
[-] [+]	Changed	php-5.2.16.tar.bz2/configure ^
@@ -2164,7 +2164,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=15 +PHP_RELEASE_VERSION=16 PHP_EXTRA_VERSION="" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr $PHP_MAJOR_VERSION \* 10000 + $PHP_MINOR_VERSION \* 100 + $PHP_RELEASE_VERSION`
[-] [+]	Changed	php-5.2.16.tar.bz2/configure.in ^
@@ -1,4 +1,4 @@ -## $Id: configure.in 306138 2010-12-09 19:35:13Z iliaa $ -- autoconf -- +## $Id: configure.in 306383 2010-12-15 13:37:15Z iliaa $ -- autoconf -- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=15 +PHP_RELEASE_VERSION=16 PHP_EXTRA_VERSION="" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
[-] [+]	Changed	php-5.2.16.tar.bz2/ext/gd/gd.c ^
@@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ / -/ $Id: gd.c 306097 2010-12-08 22:30:12Z iliaa $ / +/ $Id: gd.c 306235 2010-12-11 20:10:15Z mj $ / / gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -4593,8 +4593,8 @@ return; } - if (aa_steps != 4 \|\| aa_steps != 16) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "AA steps must be 4 or 16"); + if (aa_steps != 4 && aa_steps != 16) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Antialias steps must be 4 or 16"); RETURN_FALSE; }
[-] [+]	Changed	php-5.2.16.tar.bz2/ext/pdo_pgsql/pgsql_statement.c ^
@@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ / -/ $Id: pgsql_statement.c 293036 2010-01-03 09:23:27Z sebastian $ / +/ $Id: pgsql_statement.c 306192 2010-12-10 17:50:26Z felipe $ / #ifdef HAVE_CONFIG_H #include "config.h" @@ -156,7 +156,7 @@ chance to DEALLOCATE the prepared statements it has created. so, if we hit a 42P05 we * deallocate it and retry ONCE (thies 2005.12.15) / - if (!strcmp(sqlstate, "42P05")) { + if (sqlstate && !strcmp(sqlstate, "42P05")) { char buf[100]; / stmt_name == "pdo_crsr_%08x" / PGresult res; snprintf(buf, sizeof(buf), "DEALLOCATE %s", S->stmt_name);
[-] [+]	Changed	php-5.2.16.tar.bz2/ext/spl/tests/SplFileObject_fwrite_variation_001.phpt ^
@@ -9,6 +9,10 @@ $obj = New SplFileObject($file,'w'); $obj->fwrite('test_write',4); var_dump(file_get_contents($file)); +?> +--CLEAN-- +<?php +$file = dirname(__FILE__).'/SplFileObject_fwrite_variation_001.txt'; if(file_exists($file)) { unlink($file); }
[-] [+]	Changed	php-5.2.16.tar.bz2/ext/spl/tests/SplFileObject_fwrite_variation_002.phpt ^
@@ -9,6 +9,10 @@ $obj = New SplFileObject($file,'w'); $obj->fwrite('test_write',12); var_dump(file_get_contents($file)); +?> +--CLEAN-- +<?php +$file = dirname(__FILE__).'/SplFileObject_fwrite_variation_002.txt'; if(file_exists($file)) { unlink($file); }
[-] [+]	Changed	php-5.2.16.tar.bz2/ext/spl/tests/SplFileObject_fwrite_variation_003.phpt ^
@@ -10,6 +10,10 @@ $obj = New SplFileObject($file,'w'); $obj->fwrite('"test" \'write\''); var_dump(file_get_contents($file)); +?> +--CLEAN-- +<?php +$file = dirname(__FILE__).'/SplFileObject_fwrite_variation_002.txt'; if(file_exists($file)) { unlink($file); }
[-] [+]	Changed	php-5.2.16.tar.bz2/ext/xmlwriter/tests/bug48204.phpt ^
@@ -10,6 +10,8 @@ define('PHP_MAXPATHLEN', 260); } else if (stristr(PHP_OS, 'linux')) { define('PHP_MAXPATHLEN', 4096); + } else { + define('PHP_MAXPATHLEN', 1024); // Darwin, AIX for instance } } $path = str_repeat('a', PHP_MAXPATHLEN + 1);
[-] [+]	Changed	php-5.2.16.tar.bz2/main/fopen_wrappers.c ^
@@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ / -/ $Id: fopen_wrappers.c 306136 2010-12-09 17:04:29Z pajoye $ / +/ $Id: fopen_wrappers.c 306184 2010-12-10 12:50:25Z iliaa $ / / {{{ includes / @@ -192,7 +192,7 @@ if (strncmp(resolved_basedir, resolved_name, resolved_basedir_len) == 0) { #endif if (resolved_name_len > resolved_basedir_len && - resolved_name[resolved_basedir_len] != PHP_DIR_SEPARATOR) { + resolved_name[resolved_basedir_len - 1] != PHP_DIR_SEPARATOR) { return -1; } else { / File is in the right directory */
[-] [+]	Changed	php-5.2.16.tar.bz2/main/php_version.h ^
@@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 15 +#define PHP_RELEASE_VERSION 16 #define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.2.15" -#define PHP_VERSION_ID 50215 +#define PHP_VERSION "5.2.16" +#define PHP_VERSION_ID 50216
[-] [+]	Deleted	php5-5.2.15-rpmlintrc ^
@@ -1,4 +0,0 @@ -addFilter(".* 64bit-portability-issue rpmlint ") -addFilter(".* implicit-fortify-decl") -setBadness('64bit-portability-issue rpmlint', 0) -setBadness('implicit-fortify-decl', 0)
[-] [+]	Added	php5-rpmlintrc ^
@@ -0,0 +1,4 @@ +addFilter(".* 64bit-portability-issue rpmlint ") +addFilter(".* implicit-fortify-decl") +setBadness('64bit-portability-issue rpmlint', 0) +setBadness('implicit-fortify-decl', 0)
	Deleted	suhosin-0.9.29.tgz ^