--- a/usr/src/cmd/php5/METADATA Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/cmd/php5/METADATA Wed Feb 13 10:12:56 2013 +0000
@@ -1,15 +1,16 @@
NAME: php
-VERSION: 5.2.12
+VERSION: 5.2.17
DESCRIPTION: PHP Web scripting language
LICENSE: PHP, GPLv2, LGPLv2, Apache v2.0
PACKAGE: SUNWphp52u SUNWphp52r SUNWphp52d SUNWphp52u-pear SUNWphp52r-pear SUNWphp52u-mysql SUNWphp52r-mysql SUNWphp52u-pgsql SUNWphp52r-pgsql SUNWapch22m-php52 SUNWapch22r-php52 SUNWphp52u-apc SUNWphp52r-apc SUNWphp52u-idn SUNWphp52r-idn SUNWphp52u-memcache SUNWphp52r-memcache SUNWphp52u-tcpwrap SUNWphp52r-tcpwrap SUNWphp52u-suhosin SUNWphp52r-suhosin SUNWphp52u-xdebug SUNWphp52r-xdebug
PROJECT_URL: http://www.php.net/
-SOURCE_DOWNLOAD: ftp://tarballs.opensolaris.org/pub/php-5.2.12.tar.bz2
+SOURCE_DOWNLOAD: http://museum.php.net/php5/php-5.2.17.tar.bz2
SUPPORT: C
BUGTRAQ: solaris/utility/php
-OSR: 7242
+OSR: 10081
COMMENTS:
- download="http://us.php.net/get/php-5.2.12.tar.bz2/from/this/mirror"
+ original OSR was 7242, but previous upgrades were under 10081
+ download="http://us.php.net/get/php-5.2.17.tar.bz2/from/this/mirror"
LSARC: 2008/538 2009/124
MODIFICATIONS:
Patch to build with apache 2.2 bundled within SFW
--- a/usr/src/cmd/php5/Makefile.sfw Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/cmd/php5/Makefile.sfw Wed Feb 13 10:12:56 2013 +0000
@@ -18,9 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)Makefile.sfw 1.40 10/07/09 SMI"
+#pragma ident "@(#)Makefile.sfw 1.47 11/06/15 SMI"
PHP_REL=5.2
#
@@ -134,8 +134,7 @@
PHP_PEAR_EXTENSION_DIR=/var/php/$(PHP_REL)/modules \
PHP_PEAR_INSTALL_DIR=/var/php/$(PHP_REL)/pear \
PHP_PEAR_SIG_BIN=/usr/gnu/bin/gpg \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) \
+ $(SFW_ENV) \
DESTDIR=$(ROOT) \
INSTALL_ROOT=$(ROOT) \
INSTALL=/usr/ucb/install
@@ -149,8 +148,7 @@
LDFLAGS="-L$(ROOT)/usr/postgres/8.3/lib -L$(ROOT)$(MYSQL_LIBDIR) -lrt" \
LIBS="-lsocket -lnsl -ldl -lposix4" \
EXTENSION_DIR=$(ZTS_MODULES_DIR) \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) \
+ $(SFW_ENV) \
DESTDIR=$(ROOT) \
INSTALL_ROOT=$(ROOT) \
INSTALL=/usr/ucb/install
@@ -423,14 +421,13 @@
gpatch -p1 -i ../patches/php_dl.c.patch && \
gpatch -p1 -i ../patches/php_6818228.patch && \
gpatch -p1 -i ../patches/php_6825797.patch && \
- gpatch -p1 -i ../patches/php_6912354.patch && \
gpatch -p1 -i ../patches/php_perf_zend_execute_inline.patch && \
gpatch -p1 -i ../patches/php_perf_safe_address.patch && \
gpatch -p1 -i ../patches/php_pdo_stmt_race.patch && \
gpatch -p1 -i ../patches/php_perf_nsapi.c.patch && \
gpatch -p1 -i ../patches/php_run-tests.php.patch)
(cd $(PHP_DIR); env - $(PRECONF_ENVLINE) \
- ./buildconf --force )
+ $(CONFIG_SHELL) ./buildconf --force )
(cd $(PHP_DIR); \
cat configure | \
sed -e "s#-i -a -n php5#-i -n php5#" > configure.tmp; \
@@ -479,16 +476,20 @@
phpize-proto: build_php
cat $(PHP_DIR)/scripts/phpize | \
+ sed -e "s,^#!/bin/sh,#!$(CONFIG_SHELL)," | \
sed -e "s#^prefix=.*#prefix=`pwd`/$(PHP_DIR)#" | \
sed -e "s#^includedir=.*#includedir=`pwd`/$(PHP_DIR)#" | \
sed -e "s#^phpdir=.*#phpdir=`pwd`/$(PHP_DIR)#" | \
sed -e "s#phpdir/phpize.m4#phpdir/scripts/phpize.m4#" | \
+ sed -e "s#$PHP_AUTOCONF || exit 1#$PHP_AUTOCONF -f || exit 1#" | \
+ sed -e "s#$PHP_AUTOHEADER || exit 1#$PHP_AUTOHEADER -f || exit 1#" | \
sed -e 's#cd "$$phpdir" && cp $$FILES_BUILD "$$builddir"/build#cd "$$phpdir/build" \&\& cp $$FILES_BUILD "$$builddir"/build#' \
> phpize-proto
chmod 755 phpize-proto
php-config-proto: build_php
cat $(PHP_DIR)/scripts/php-config | \
+ sed -e "s,^#! /bin/sh,#!$(CONFIG_SHELL)," | \
sed -e "s#^prefix=.*#prefix=`pwd`/$(PHP_DIR)#" | \
sed -e "s#^include_dir=.*#include_dir=`pwd`/$(PHP_DIR)#" \
> php-config-proto
@@ -496,6 +497,7 @@
phpize-proto.zts: build_php
cat $(PHP_NSAPI)/scripts/phpize | \
+ sed -e "s,^#!/bin/sh,#!$(CONFIG_SHELL)," | \
sed -e "s#^prefix=.*#prefix=`pwd`/$(PHP_NSAPI)#" | \
sed -e "s#^includedir=.*#includedir=`pwd`/$(PHP_NSAPI)#" | \
sed -e "s#^extension_dir=.*#extension_dir=`pwd`/$(ZTS_MODULES_DIR)#" | \
@@ -507,6 +509,7 @@
php-config-proto.zts: build_php
cat $(PHP_DIR)/scripts/php-config | \
+ sed -e "s,^#! /bin/sh,#!$(CONFIG_SHELL)," | \
sed -e "s#^prefix=.*#prefix=`pwd`/$(PHP_NSAPI)#" | \
sed -e "s#^include_dir=.*#include_dir=`pwd`/$(PHP_NSAPI)#" | \
sed -e "s#^extension_dir=.*#extension_dir=`pwd`/$(ZTS_MODULES_DIR)#" \
@@ -532,15 +535,17 @@
$(SUHOSIN_DIR)/config.status: $(SUHOSIN_DIR)/configure
(cd $(SUHOSIN_DIR); \
- env - $(ENVLINE) ../phpize-proto; \
- env - $(ENVLINE) sh ./configure \
+ env - $(ENVLINE) $(CONFIG_SHELL) ../phpize-proto)
+ (cd $(SUHOSIN_DIR); \
+ env - $(ENVLINE) $(CONFIG_SHELL) ./configure \
--enable-suhosin \
--with-php-config=../php-config-proto )
$(SUHOSIN_ZTS)/config.status: $(SUHOSIN_DIR)/configure
(cd $(SUHOSIN_ZTS); \
- env - $(ZTS_ENVLINE) ../phpize-proto.zts; \
- env - $(ZTS_ENVLINE) sh ./configure \
+ env - $(ZTS_ENVLINE) $(CONFIG_SHELL) ../phpize-proto.zts)
+ (cd $(SUHOSIN_ZTS); \
+ env - $(ZTS_ENVLINE) $(CONFIG_SHELL) ./configure \
--enable-suhosin \
--with-php-config=../php-config-proto.zts )
@@ -568,15 +573,16 @@
$(TCPWRAP_DIR)/config.status: $(TCPWRAP_DIR)/configure
(cd $(TCPWRAP_DIR); \
- env - $(ENVLINE) ../phpize-proto; \
- env - $(ENVLINE) sh ./configure \
+ env - $(ENVLINE) $(CONFIG_SHELL) ../phpize-proto)
+ (cd $(TCPWRAP_DIR); \
+ env - $(ENVLINE) $(CONFIG_SHELL) ./configure \
--with-tcpwrap=$(ROOT)/usr/sfw \
--with-php-config=../php-config-proto )
$(TCPWRAP_ZTS)/config.status: $(TCPWRAP_DIR)/configure
(cd $(TCPWRAP_ZTS); \
- env - $(ZTS_ENVLINE) ../phpize-proto.zts; \
- env - $(ZTS_ENVLINE) sh ./configure \
+ env - $(ZTS_ENVLINE) $(CONFIG_SHELL) ../phpize-proto.zts; \
+ env - $(ZTS_ENVLINE) $(CONFIG_SHELL) ./configure \
--with-tcpwrap=$(ROOT)/usr/sfw \
--with-php-config=../php-config-proto.zts )
@@ -607,15 +613,17 @@
$(IDN_DIR)/config.status: $(IDN_DIR)/configure
(cd $(IDN_DIR); \
- env - $(ENVLINE) ../phpize-proto; \
- env - $(ENVLINE) sh ./configure \
+ env - $(ENVLINE) $(CONFIG_SHELL) ../phpize-proto)
+ (cd $(IDN_DIR); \
+ env - $(ENVLINE) $(CONFIG_SHELL) ./configure \
--with-idn \
--with-php-config=../php-config-proto )
$(IDN_ZTS)/config.status: $(IDN_DIR)/configure
(cd $(IDN_ZTS); \
- env - $(ZTS_ENVLINE) ../phpize-proto.zts; \
- env - $(ZTS_ENVLINE) sh ./configure \
+ env - $(ZTS_ENVLINE) $(CONFIG_SHELL) ../phpize-proto.zts)
+ (cd $(IDN_ZTS); \
+ env - $(ZTS_ENVLINE) $(CONFIG_SHELL) ./configure \
--with-idn \
--with-php-config=../php-config-proto.zts )
@@ -647,16 +655,18 @@
$(APC_DIR)/config.status: $(APC_DIR)/configure
(cd $(APC_DIR); \
- env - $(ENVLINE) ../phpize-proto; \
- env - $(ENVLINE) sh ./configure \
+ env - $(ENVLINE) $(CONFIG_SHELL) ../phpize-proto)
+ (cd $(APC_DIR); \
+ env - $(ENVLINE) $(CONFIG_SHELL) ./configure \
--enable-apc \
--enable-apc-mmap \
--with-php-config=../php-config-proto )
$(APC_ZTS)/config.status: $(APC_DIR)/configure
(cd $(APC_ZTS); \
- env - $(ZTS_ENVLINE) ../phpize-proto.zts; \
- env - $(ZTS_ENVLINE) sh ./configure \
+ env - $(ZTS_ENVLINE) $(CONFIG_SHELL) ../phpize-proto.zts)
+ (cd $(APC_ZTS); \
+ env - $(ZTS_ENVLINE) $(CONFIG_SHELL) ./configure \
--enable-apc \
--enable-apc-mmap \
--with-php-config=../php-config-proto.zts )
@@ -691,15 +701,17 @@
$(XDEBUG_DIR)/config.status: $(XDEBUG_DIR)/configure
(cd $(XDEBUG_DIR); \
- env - $(ENVLINE) ../phpize-proto; \
- env - $(ENVLINE) sh ./configure \
+ env - $(ENVLINE) $(CONFIG_SHELL) ../phpize-proto)
+ (cd $(XDEBUG_DIR); \
+ env - $(ENVLINE) $(CONFIG_SHELL) ./configure \
--enable-xdebug \
--with-php-config=../php-config-proto )
$(XDEBUG_ZTS)/config.status: $(XDEBUG_DIR)/configure
(cd $(XDEBUG_ZTS); \
- env - $(ZTS_ENVLINE) ../phpize-proto.zts; \
- env - $(ZTS_ENVLINE) sh ./configure \
+ env - $(ZTS_ENVLINE) $(CONFIG_SHELL) ../phpize-proto.zts)
+ (cd $(XDEBUG_ZTS); \
+ env - $(ZTS_ENVLINE) $(CONFIG_SHELL) ./configure \
--enable-xdebug \
--with-php-config=../php-config-proto.zts )
@@ -730,8 +742,9 @@
$(MEMCACHE_DIR)/config.status: $(MEMCACHE_DIR)/configure
(cd $(MEMCACHE_DIR); \
- env - $(ENVLINE) ../phpize-proto; \
- env - $(ENVLINE) sh ./configure \
+ env - $(ENVLINE) $(CONFIG_SHELL) ../phpize-proto)
+ (cd $(MEMCACHE_DIR); \
+ env - $(ENVLINE) $(CONFIG_SHELL) ./configure \
--disable-debug \
--enable-memcache \
--with-php-config=../php-config-proto \
@@ -739,8 +752,9 @@
$(MEMCACHE_ZTS)/config.status: $(MEMCACHE_DIR)/configure
(cd $(MEMCACHE_ZTS); \
- env - $(ZTS_ENVLINE) ../phpize-proto.zts; \
- env - $(ZTS_ENVLINE) sh ./configure \
+ env - $(ZTS_ENVLINE) $(CONFIG_SHELL) ../phpize-proto.zts)
+ (cd $(MEMCACHE_ZTS); \
+ env - $(ZTS_ENVLINE) $(CONFIG_SHELL) ./configure \
--disable-debug \
--enable-memcache \
--with-php-config=../php-config-proto.zts \
--- a/usr/src/cmd/php5/install-php5 Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/cmd/php5/install-php5 Wed Feb 13 10:12:56 2013 +0000
@@ -20,10 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)install-php5 1.16 10/01/22 SMI"
+#pragma ident "@(#)install-php5 1.17 11/02/07 SMI"
set -o errexit
@@ -216,8 +215,6 @@
cd ${PEAR_TOPDIR};
gpatch -p0 -i ${CWD}/patches/pear_Builder_php.patch;
- gpatch -p0 -i ${CWD}/patches/pear_all-tests.php.patch;
- gpatch -p0 -i ${CWD}/patches/pear_genpackage.xml.pl.patch;
# Ship default PEAR registry files as generated registry files
# are corrupted by default.
--- a/usr/src/cmd/php5/patches/imap_unix_Makefile.patch Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/cmd/php5/patches/imap_unix_Makefile.patch Wed Feb 13 10:12:56 2013 +0000
@@ -14,7 +14,7 @@
ACTIVEFILE=/usr/share/news/active \
RSHPATH=/usr/bin/rsh \
- BASECFLAGS="-g -O -w" \
-+ BASECFLAGS="$$CFLAGS" \
++ BASECFLAGS="$$CFLAGS -D__USE_LEGACY_PROTOTYPES__" \
BASELDFLAGS="-lsocket -lnsl -lgen" \
- RANLIB=true CC=/opt/SUNWspro/bin/cc
+ RANLIB=true CC="$$CC"
--- a/usr/src/cmd/php5/patches/pear_Makefile_global.patch Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/cmd/php5/patches/pear_Makefile_global.patch Wed Feb 13 10:12:56 2013 +0000
@@ -9,7 +9,7 @@
DEFS = -DPHP_ATOM_INC -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
-@@ -39,19 +41,19 @@
+@@ -37,19 +39,19 @@
install-modules: build-modules
@test -d modules && \
@@ -34,7 +34,7 @@
for i in `echo $(INSTALL_HEADERS)`; do \
if test "$(PHP_PECL_EXTENSION)"; then \
src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \
-@@ -59,12 +61,12 @@
+@@ -57,12 +59,12 @@
src=$$i; \
fi; \
if test -f "$(top_srcdir)/$$src"; then \
--- a/usr/src/cmd/php5/patches/pear_all-tests.php.patch Wed Feb 13 09:58:27 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
---- test/Structures_Graph/tests/all-tests.php.ORIG Tue Sep 16 10:08:43 2008
-+++ test/Structures_Graph/tests/all-tests.php Tue Sep 16 10:08:58 2008
-@@ -1,4 +1,4 @@
--#!/usr/bin/php
-+#!/usr/php/5.2/bin/php
- <?php
- /* vim: set expandtab tabstop=4 shiftwidth=4 foldmethod=marker: */
- // +-----------------------------------------------------------------------------+
--- a/usr/src/cmd/php5/patches/pear_genpackage.xml.pl.patch Wed Feb 13 09:58:27 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
---- data/Structures_Graph/genpackage.xml.pl.ORIG Thu Oct 8 13:16:13 2009
-+++ data/Structures_Graph/genpackage.xml.pl Thu Oct 8 13:16:22 2009
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/perl5/bin/perl
- while (<>) {
- if (!/FILESGOHERE/) {
- print $_;
--- a/usr/src/cmd/php5/patches/php_6912354.patch Wed Feb 13 09:58:27 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
---- php-5.2.12/ext/ldap/ldap.c 2009-11-18 09:44:58.000000000 -0800
-+++ php-5.2.12/ext/ldap/ldap.c 2009-12-21 11:13:14.000000000 -0800
-@@ -2009,6 +2009,7 @@
- resultentry->id = Z_LVAL_PP(result);
- zend_list_addref(resultentry->id);
- resultentry->data = entry;
-+ resultentry->ber = NULL;
- }
- }
- /* }}} */
-@@ -2037,6 +2038,7 @@
- resultentry_next->id = resultentry->id;
- zend_list_addref(resultentry->id);
- resultentry_next->data = entry_next;
-+ resultentry_next->ber = NULL;
- }
- }
- /* }}} */
--- a/usr/src/cmd/php5/patches/php_dtrace.patch Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/cmd/php5/patches/php_dtrace.patch Wed Feb 13 10:12:56 2013 +0000
@@ -402,9 +402,9 @@
#include "tsrm_virtual_cwd.h"
Index: php-5.2.11/Zend/zend_vm_def.h
===================================================================
---- php-5.2.11.orig/Zend/zend_vm_def.h 2009-11-02 02:59:10.970584885 +0100
-+++ php-5.2.11/Zend/zend_vm_def.h 2009-11-02 02:59:56.085971641 +0100
-@@ -2243,6 +2243,11 @@
+--- php-5.2.17/Zend/zend_vm_def.h.ORIG Mon Jul 5 02:08:35 2010
++++ php-5.2.17/Zend/zend_vm_def.h Mon Jan 31 13:46:32 2011
+@@ -2249,6 +2249,11 @@
ZEND_VM_CONTINUE(); /* CHECK_ME */
}
ce = Z_OBJCE_P(EG(exception));
@@ -468,9 +468,9 @@
Index: php-5.2.11/main/php_config.h.in
===================================================================
---- php-5.2.11.orig/main/php_config.h.in 2009-11-02 02:59:10.000000000 +0100
-+++ php-5.2.11/main/php_config.h.in 2009-11-02 03:00:26.911891334 +0100
-@@ -731,6 +731,9 @@
+--- php-5.2.17/main/php_config.h.in.ORIG Thu Jan 6 15:04:47 2011
++++ php-5.2.17/main/php_config.h.in Mon Jan 31 13:46:34 2011
+@@ -725,6 +725,9 @@
/* Define if you have the <sys/resource.h> header file. */
#undef HAVE_SYS_RESOURCE_H
@@ -482,9 +482,9 @@
Index: php-5.2.12/acinclude.m4
===================================================================
---- php-5.2.12/acinclude.m4.ORIG Sat Nov 28 22:13:22 2009
-+++ php-5.2.12/acinclude.m4 Thu Dec 17 18:48:10 2009
-@@ -2874,3 +2874,56 @@
+--- php-5.2.17/acinclude.m4.ORIG Wed May 5 14:55:44 2010
++++ php-5.2.17/acinclude.m4 Mon Jan 31 13:46:34 2011
+@@ -2877,3 +2877,56 @@
fi
])
@@ -541,12 +541,12 @@
+ $SED -ibak 's,PHP_,DTRACE_,g' $2
+])
+
-
+
Index: php-5.2.12/configure.in
===================================================================
---- php-5.2.12/configure.in.ORIG Wed Dec 16 04:45:18 2009
-+++ php-5.2.12/configure.in Thu Dec 17 18:48:23 2009
-@@ -882,6 +882,23 @@
+--- php-5.2.17/configure.in.ORIG Thu Jan 6 15:01:19 2011
++++ php-5.2.17/configure.in Mon Jan 31 13:46:34 2011
+@@ -881,6 +881,23 @@
AC_DEFINE(HAVE_IPV6, 1, [Whether to enable IPv6 support])
fi
@@ -570,7 +570,7 @@
AC_MSG_CHECKING([how big to make fd sets])
PHP_ARG_ENABLE(fd-setsize,,
[ --enable-fd-setsize Set size of descriptor sets], no, no)
-@@ -1213,6 +1230,7 @@
+@@ -1211,6 +1228,7 @@
PHP_SUBST(PHP_CLI_TARGET)
PHP_SUBST(PHP_SAPI_OBJS)
PHP_SUBST(PHP_CLI_OBJS)
@@ -578,7 +578,7 @@
PHP_SUBST(PHP_GLOBAL_OBJS)
PHP_SUBST(PHP_MODULES)
-@@ -1402,7 +1420,7 @@
+@@ -1400,7 +1418,7 @@
PHP_ADD_SOURCES(Zend, \
zend_language_parser.c zend_language_scanner.c \
zend_ini_parser.c zend_ini_scanner.c \
@@ -587,7 +587,7 @@
zend_execute_API.c zend_highlight.c zend_llist.c \
zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
-@@ -1434,6 +1452,13 @@
+@@ -1432,6 +1450,13 @@
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend)
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Zend/Makefile.frag,$abs_srcdir/Zend,Zend)
--- a/usr/src/cmd/php5/patches/php_ini.patch Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/cmd/php5/patches/php_ini.patch Wed Feb 13 10:12:56 2013 +0000
@@ -1,5 +1,5 @@
---- php-5.2.9/php.ini-recommended.ORIG Thu Jan 29 12:15:27 2009
-+++ php-5.2.9/php.ini-recommended Thu Jan 29 12:17:55 2009
+--- php-5.2.17/php.ini-recommended.ORIG Tue Feb 1 21:23:46 2011
++++ php-5.2.17/php.ini-recommended Mon Jan 17 08:53:16 2011
@@ -523,6 +523,7 @@
; UNIX: "/path1:/path2"
@@ -17,7 +17,7 @@
; 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
-@@ -620,7 +621,7 @@
+@@ -623,7 +624,7 @@
; user_agent="PHP"
; Default timeout for socket based streams (seconds)
@@ -26,7 +26,7 @@
; If your scripts have to deal with files from Macintosh systems,
; or you are running on a Mac and need to deal with files from
-@@ -650,60 +651,12 @@
+@@ -653,60 +654,12 @@
; 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.
@@ -46,7 +46,6 @@
-;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
@@ -56,6 +55,7 @@
-;extension=php_interbase.dll
-;extension=php_ldap.dll
-;extension=php_mbstring.dll
+-;extension=php_exif.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_mime_magic.dll
@@ -91,7 +91,7 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -1041,6 +994,7 @@
+@@ -1044,6 +997,7 @@
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
;session.save_path = "/tmp"
@@ -99,7 +99,7 @@
; Whether to use cookies.
session.use_cookies = 1
-@@ -1079,11 +1033,11 @@
+@@ -1082,11 +1036,11 @@
; on each request.
session.gc_probability = 1
@@ -113,7 +113,7 @@
; NOTE: If you are using the subdirectory option for storing session files
; (see session.save_path above), then garbage collection does *not*
-@@ -1111,12 +1065,11 @@
+@@ -1114,12 +1068,11 @@
session.entropy_length = 0
; Specified here to create the session id.
--- a/usr/src/cmd/php5/patches/php_pdo_stmt_race.patch Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/cmd/php5/patches/php_pdo_stmt_race.patch Wed Feb 13 10:12:56 2013 +0000
@@ -1,8 +1,8 @@
Index: php-5.2.11/ext/pdo/pdo_stmt.c
===================================================================
---- php-5.2.11/ext/pdo/pdo_stmt.c (revision 289806)
-+++ php-5.2.11/ext/pdo/pdo_stmt.c (working copy)
-@@ -2312,6 +2312,54 @@
+--- php-5.2.17/ext/pdo/pdo_stmt.c.ORIG Wed Jun 16 16:13:29 2010
++++ php-5.2.17/ext/pdo/pdo_stmt.c Tue Feb 1 11:42:48 2011
+@@ -2321,6 +2321,54 @@
return -1;
}
@@ -57,7 +57,7 @@
static zend_object_value dbstmt_clone_obj(zval *zobject TSRMLS_DC)
{
zend_object_value retval;
-@@ -2325,7 +2373,7 @@
+@@ -2334,7 +2382,7 @@
stmt->refcount = 1;
ALLOC_HASHTABLE(stmt->properties);
zend_hash_init(stmt->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
@@ -66,7 +66,7 @@
old_stmt = (pdo_stmt_t *)zend_object_store_get_object(zobject TSRMLS_CC);
-@@ -2454,7 +2502,7 @@
+@@ -2463,7 +2511,7 @@
stmt->refcount = 1;
ALLOC_HASHTABLE(stmt->properties);
zend_hash_init(stmt->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
Binary file usr/src/cmd/php5/php-5.2.12.tar.bz2 has changed
Binary file usr/src/cmd/php5/php-5.2.17.tar.bz2 has changed
--- a/usr/src/pkgdefs/SUNWphp52d/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52d/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,6 +1,6 @@
--------------------------------------------------------------------
The PHP License, version 3.01
-Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
--------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52r-apc/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52r-apc/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52r-idn/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52r-idn/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52r-memcache/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52r-memcache/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52r-mysql/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52r-mysql/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -12,7 +12,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52r-pear/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52r-pear/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -12,7 +12,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52r-pear/prototype_com Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52r-pear/prototype_com Wed Feb 13 10:12:56 2013 +0000
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or it's affiliates. All rights reserved.
#
-#pragma ident "@(#)prototype_com 1.4 09/12/18 SMI"
+#pragma ident "@(#)prototype_com 1.5 11/02/07 SMI"
# SUNWphp52r-pear
#
@@ -117,10 +116,7 @@
f none var/php/5.2/pear/Console/Getopt.php 0644 root bin
f none var/php/5.2/pear/data/PEAR/package.dtd 0644 root bin
f none var/php/5.2/pear/data/PEAR/template.spec 0644 root bin
-f none var/php/5.2/pear/data/Structures_Graph/genpackage.xml.pl 0644 root bin
f none var/php/5.2/pear/data/Structures_Graph/LICENSE 0644 root bin
-f none var/php/5.2/pear/data/Structures_Graph/package.sh 0644 root bin
-f none var/php/5.2/pear/data/Structures_Graph/publish.sh 0644 root bin
f none var/php/5.2/pear/doc/Archive_Tar/docs/Archive_Tar.txt 0644 root bin
f none var/php/5.2/pear/doc/PEAR/INSTALL 0644 root bin
f none var/php/5.2/pear/doc/PEAR/LICENSE 0644 root bin
@@ -244,8 +240,7 @@
f none var/php/5.2/pear/Structures/Graph/Manipulator/TopologicalSorter.php 0644 root bin
f none var/php/5.2/pear/Structures/Graph/Node.php 0644 root bin
f none var/php/5.2/pear/System.php 0644 root bin
-f none var/php/5.2/pear/test/Structures_Graph/tests/all-tests.php 0644 root bin
-f none var/php/5.2/pear/test/Structures_Graph/tests/README 0644 root bin
+f none var/php/5.2/pear/test/Structures_Graph/tests/AllTests.php 0644 root bin
f none var/php/5.2/pear/test/Structures_Graph/tests/testCase/BasicGraph.php 0644 root bin
f none var/php/5.2/pear/test/XML_Util/tests/AllTests.php 0644 root bin
f none var/php/5.2/pear/test/XML_Util/tests/testBasic_apiVersion.phpt 0644 root bin
--- a/usr/src/pkgdefs/SUNWphp52r-pgsql/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52r-pgsql/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -11,7 +11,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52r-suhosin/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52r-suhosin/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52r-tcpwrap/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52r-tcpwrap/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52r-xdebug/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52r-xdebug/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52r/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52r/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -12,7 +12,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52u-apc/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52u-apc/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52u-idn/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52u-idn/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52u-memcache/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52u-memcache/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52u-mysql/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52u-mysql/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -12,7 +12,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52u-pear/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52u-pear/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52u-pgsql/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52u-pgsql/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -11,7 +11,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52u-suhosin/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52u-suhosin/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52u-tcpwrap/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52u-tcpwrap/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52u-xdebug/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52u-xdebug/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -1,7 +1,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52u/copyright Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52u/copyright Wed Feb 13 10:12:56 2013 +0000
@@ -12,7 +12,7 @@
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
- * Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+ * Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
* --------------------------------------------------------------------
*
* Redistribution and use in source and binary forms, with or without
--- a/usr/src/pkgdefs/SUNWphp52u/prototype_com Wed Feb 13 09:58:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWphp52u/prototype_com Wed Feb 13 10:12:56 2013 +0000
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)prototype_com 1.14 10/01/06 SMI"
+#pragma ident "@(#)prototype_com 1.15 11/02/07 SMI"
# SUNWphp52u
#
@@ -47,6 +46,7 @@
d none usr/php/5.2/include/php/ext/gd/libgd 0755 root bin
d none usr/php/5.2/include/php/ext/hash 0755 root bin
d none usr/php/5.2/include/php/ext/iconv 0755 root bin
+d none usr/php/5.2/include/php/ext/json 0755 root bin
d none usr/php/5.2/include/php/ext/libxml 0755 root bin
d none usr/php/5.2/include/php/ext/mbstring 0755 root bin
d none usr/php/5.2/include/php/ext/mbstring/libmbfl 0755 root bin
@@ -178,6 +178,7 @@
f none usr/php/5.2/include/php/ext/hash/php_hash_tiger.h 0444 root bin
f none usr/php/5.2/include/php/ext/hash/php_hash_types.h 0444 root bin
f none usr/php/5.2/include/php/ext/hash/php_hash_whirlpool.h 0444 root bin
+f none usr/php/5.2/include/php/ext/iconv/php_iconv_aliased_libiconv.h 0444 root bin
f none usr/php/5.2/include/php/ext/iconv/php_have_bsd_iconv.h 0444 root bin
f none usr/php/5.2/include/php/ext/iconv/php_have_glibc_iconv.h 0444 root bin
f none usr/php/5.2/include/php/ext/iconv/php_have_ibm_iconv.h 0444 root bin
@@ -187,6 +188,7 @@
f none usr/php/5.2/include/php/ext/iconv/php_iconv_supports_errno.h 0444 root bin
f none usr/php/5.2/include/php/ext/iconv/php_php_iconv_h_path.h 0444 root bin
f none usr/php/5.2/include/php/ext/iconv/php_php_iconv_impl.h 0444 root bin
+f none usr/php/5.2/include/php/ext/json/php_json.h 0444 root bin
f none usr/php/5.2/include/php/ext/libxml/php_libxml.h 0444 root bin
f none usr/php/5.2/include/php/ext/mbstring/libmbfl/config.h 0444 root bin
f none usr/php/5.2/include/php/ext/mbstring/libmbfl/mbfl/eaw_table.h 0444 root bin