update to PHP 5.4.0RC6

2012-01-20 16:37:26 +01:00 · 2012-01-20 16:37:26 +01:00 · 28750bd318
commit 28750bd318
parent 327d608754
20 changed files with 762 additions and 1127 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 php.spec~
 /php-5.3.7.tar.bz2
 /php-5.3.8.tar.bz2
+/php-5.4.0RC6.tar.bz2
--- a/macros.php
+++ b/macros.php
@ -3,6 +3,17 @@
 # 
 %php_core_api @PHP_APIVER@
 %php_zend_api @PHP_ZENDVER@
-%php_pdo_api @PHP_PDOVER@
+%php_pdo_api  @PHP_PDOVER@

-%php_extdir %{_libdir}/php/modules
+%php_extdir    %{_libdir}/php/modules
+%php_ztsextdir %{_libdir}/php-zts/modules
+
+%php_inidir    %{_sysconfdir}/php.d
+%php_ztsinidir %{_sysconfdir}/php-zts.d
+
+%php_incldir    %{_includedir}/php
+%php_ztsincldir %{_includedir}/php-zts/php
+
+%__php         %{_bindir}/php
+%php_bindir    %{_bindir}
+%php_ztsbindir %{_bindir}/php-zts
--- a/php-4.3.11-shutdown.patch
+++ b/php-4.3.11-shutdown.patch
@ -1,38 +0,0 @@
--- php-4.3.11/ext/snmp/php_snmp.h.shutdown
-+++ php-4.3.11/ext/snmp/php_snmp.h
-@@ -39,7 +39,6 @@
- #endif
- 
- PHP_MINIT_FUNCTION(snmp);
-PHP_MSHUTDOWN_FUNCTION(snmp);
- PHP_MINFO_FUNCTION(snmp);
- 
- PHP_FUNCTION(snmpget);
--- php-4.3.11/ext/snmp/snmp.c.shutdown
-+++ php-4.3.11/ext/snmp/snmp.c
-@@ -156,7 +156,7 @@
- 	"snmp",
- 	snmp_functions,
- 	PHP_MINIT(snmp),
-	PHP_MSHUTDOWN(snmp),
-+	NULL,
- 	NULL,
- 	NULL,
- 	PHP_MINFO(snmp),
-@@ -208,16 +208,6 @@
- }
- /* }}} */
- 
-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
-PHP_MSHUTDOWN_FUNCTION(snmp)
-{
-	snmp_shutdown("snmpapp");
-
-	return SUCCESS;
-}
-/* }}} */
-
- /* {{{ PHP_MINFO_FUNCTION
-  */
- PHP_MINFO_FUNCTION(snmp)
--- a/php-5.0.4-tests-wddx.patch
+++ b/php-5.0.4-tests-wddx.patch
@ -1,26 +0,0 @@
-
-The wddx tests presume that "2040-06-12T04:32:12" cannot be parsed;
-that's only true on platforms with a 32-bit time_t.
-
--- php-5.0.5/ext/wddx/tests/001.phpt.tests-wddx
-+++ php-5.0.5/ext/wddx/tests/001.phpt
-@@ -18,7 +18,7 @@
-   ["aDateTime2"]=>
-   int(329632332)
-   ["aDateTime3"]=>
-  string(22) "2040-06-12T04:32:12+00"
-+  string(12) "NotADateTime"
-   ["aBoolean"]=>
-   bool(true)
-   ["anArray"]=>
--- php-5.0.5/ext/wddx/tests/wddx.xml.tests-wddx
-+++ php-5.0.5/ext/wddx/tests/wddx.xml
-@@ -20,7 +20,7 @@
-                          <dateTime>1980-06-12T04:32:12+00</dateTime>
-                      </var>
-                      <var name='aDateTime3'>
-                         <dateTime>2040-06-12T04:32:12+00</dateTime>
-+                         <dateTime>NotADateTime</dateTime>
-                      </var>
-                      <var name='aBoolean'>
-                          <boolean value='true'/>
--- a/php-5.2.4-norpath.patch
+++ b/php-5.2.4-norpath.patch
@ -1,18 +0,0 @@
--- php-5.2.4/acinclude.m4.norpath
-+++ php-5.2.4/acinclude.m4
-@@ -432,6 +432,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[
- dnl internal, don't use
- AC_DEFUN([_PHP_ADD_LIBPATH_GLOBAL],[
-   PHP_RUN_ONCE(LIBPATH, $1, [
-+    test "x$PHP_RPATH" != "xno" &&
-     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$1"
-     LDFLAGS="$LDFLAGS -L$1"
-     PHP_RPATHS="$PHP_RPATHS $1"
-@@ -451,6 +452,7 @@ AC_DEFUN([PHP_ADD_LIBPATH],[
-     ],[
-       if test "$ext_shared" = "yes"; then
-         $2="-L$ai_p [$]$2"
-+        test "x$PHP_RPATH" != "xno" && \
-         test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2"
-       else
-         _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
--- a/php-5.2.7-tests-dashn.patch
+++ b/php-5.2.7-tests-dashn.patch
@ -1,11 +0,0 @@
--- php-5.2.7/Makefile.global.orig	2008-12-05 07:37:27.000000000 +0100
-+++ php-5.2.7/Makefile.global	2008-12-05 07:37:55.000000000 +0100
-@@ -67,7 +67,7 @@
- 		done; \
- 	fi
- 
-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
-+PHP_TEST_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
- PHP_TEST_SHARED_EXTENSIONS =  ` \
- 	if test "x$(PHP_MODULES)" != "x"; then \
- 		for i in $(PHP_MODULES)""; do \
--- a/php-5.3.0-install.patch
+++ b/php-5.3.0-install.patch
@ -1,12 +0,0 @@
-diff -up php5.3-200812131330/sapi/apache2handler/config.m4.install php5.3-200812131330/sapi/apache2handler/config.m4
--- php5.3-200812131330/sapi/apache2handler/config.m4.install	2008-03-12 00:31:53.000000000 +0100
-+++ php5.3-200812131330/sapi/apache2handler/config.m4	2008-12-13 16:20:06.000000000 +0100
-@@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then
-   fi
- 
-   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-  if test -z `$APXS -q SYSCONFDIR`; then
-+  if true; then
-     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                        -i -n php5"
--- a/php-5.3.0-libedit.patch
+++ b/php-5.3.0-libedit.patch
@ -1,58 +0,0 @@
-diff -up php-5.3.0/ext/readline/config.m4.BAD php-5.3.0/ext/readline/config.m4
--- php-5.3.0/ext/readline/config.m4.BAD	2009-11-17 16:14:45.289616920 -0500
-+++ php-5.3.0/ext/readline/config.m4	2009-11-17 16:14:59.588616924 -0500
-@@ -55,7 +55,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
- elif test "$PHP_LIBEDIT" != "no"; then
- 
-   for i in $PHP_LIBEDIT /usr/local /usr; do
-    test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break
-+    test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
-   done
- 
-   if test -z "$LIBEDIT_DIR"; then
-diff -up php-5.3.0/ext/readline/readline.c.BAD php-5.3.0/ext/readline/readline.c
--- php-5.3.0/ext/readline/readline.c.BAD	2009-11-17 16:15:30.151716204 -0500
-+++ php-5.3.0/ext/readline/readline.c	2009-11-17 16:16:27.902715621 -0500
-@@ -33,8 +33,10 @@
- #define rl_completion_matches completion_matches
- #endif
- 
-+#ifdef HAVE_LIBEDIT
-+#include <editline/readline.h>
-+#else
- #include <readline/readline.h>
-#ifndef HAVE_LIBEDIT
- #include <readline/history.h>
- #endif
- 
-diff -up php-5.3.0/sapi/cli/php_cli.c.BAD php-5.3.0/sapi/cli/php_cli.c
--- php-5.3.0/sapi/cli/php_cli.c.BAD	2009-11-17 16:16:51.421617342 -0500
-+++ php-5.3.0/sapi/cli/php_cli.c	2009-11-17 16:17:35.026715984 -0500
-@@ -76,8 +76,11 @@
- #endif
- 
- #if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
-+
-+#if HAVE_LIBEDIT
-+#include <editline/readline.h>
-+#else
- #include <readline/readline.h>
-#if !HAVE_LIBEDIT
- #include <readline/history.h>
- #endif
- #include "php_cli_readline.h"
-diff -up php-5.3.0/sapi/cli/php_cli_readline.c.BAD php-5.3.0/sapi/cli/php_cli_readline.c
--- php-5.3.0/sapi/cli/php_cli_readline.c.BAD	2009-11-17 16:17:51.398715697 -0500
-+++ php-5.3.0/sapi/cli/php_cli_readline.c	2009-11-17 16:18:19.241715654 -0500
-@@ -49,8 +49,10 @@
- #include <unixlib/local.h>
- #endif
- 
-+#if HAVE_LIBEDIT
-+#include <editline/readline.h>
-+#else
- #include <readline/readline.h>
-#if !HAVE_LIBEDIT
- #include <readline/history.h>
- #endif
- 
--- a/php-5.3.3-macropen.patch
+++ b/php-5.3.3-macropen.patch
@ -1,39 +0,0 @@
-diff -up php5.3-201006130830/ext/dba/dba.c.macropen php5.3-201006130830/ext/dba/dba.c
--- php5.3-201006130830/ext/dba/dba.c.macropen	2010-03-03 02:35:57.000000000 +0100
-+++ php5.3-201006130830/ext/dba/dba.c	2010-06-13 11:07:54.501185871 +0200
-@@ -912,7 +912,7 @@ static void php_dba_open(INTERNAL_FUNCTI
- 		}
- 	}
- 
-	if (error || hptr->open(info, &error TSRMLS_CC) != SUCCESS) {
-+	if (error || (hptr->open)(info, &error TSRMLS_CC) != SUCCESS) {
- 		dba_close(info TSRMLS_CC);
- 		php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), Z_STRVAL_PP(args[1]), E_WARNING, "Driver initialization failed for handler: %s%s%s", hptr->name, error?": ":"", error?error:"");
- 		FREENOW;
-diff -up php5.3-201006130830/ext/dba/dba_db3.c.macropen php5.3-201006130830/ext/dba/dba_db3.c
--- php5.3-201006130830/ext/dba/dba_db3.c.macropen	2010-01-03 10:36:52.000000000 +0100
-+++ php5.3-201006130830/ext/dba/dba_db3.c	2010-06-13 11:07:54.501185871 +0200
-@@ -91,7 +91,7 @@ DBA_OPEN_FUNC(db3)
- 
- 	if ((err=db_create(&dbp, NULL, 0)) == 0) {
- 	    dbp->set_errcall(dbp, php_dba_db3_errcall_fcn);
-	    if ((err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
-+	    if ((err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
- 			dba_db3_data *data;
- 
- 			data = pemalloc(sizeof(*data), info->flags&DBA_PERSISTENT);
-diff -up php5.3-201006130830/ext/dba/dba_db4.c.macropen php5.3-201006130830/ext/dba/dba_db4.c
--- php5.3-201006130830/ext/dba/dba_db4.c.macropen	2010-06-03 10:35:55.000000000 +0200
-+++ php5.3-201006130830/ext/dba/dba_db4.c	2010-06-13 11:12:11.841435434 +0200
-@@ -125,9 +125,9 @@ DBA_OPEN_FUNC(db4)
- 	    dbp->set_errcall(dbp, php_dba_db4_errcall_fcn);
- 	    if (
- #if (DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
-			(err=dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
-+			(err=(dbp->open)(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
- #else
-			(err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
-+			(err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
- #endif
- 			dba_db4_data *data;
- 
--- a/php-5.3.7-gnusrc.patch
+++ b/php-5.3.7-gnusrc.patch
@ -1,115 +0,0 @@
-diff -up php-5.3.7RC3/configure.in.gnusrc php-5.3.7RC3/configure.in
--- php-5.3.7RC3/configure.in.gnusrc	2011-07-14 14:01:37.000000000 +0200
-+++ php-5.3.7RC3/configure.in	2011-07-15 17:46:36.118082437 +0200
-@@ -58,6 +58,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
- AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
- AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
- 
-+AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions])
-+
- dnl Setting up the PHP version based on the information above.
- dnl -------------------------------------------------------------------------
- 
-diff -up php-5.3.7RC3/ext/interbase/interbase.c.gnusrc php-5.3.7RC3/ext/interbase/interbase.c
--- php-5.3.7RC3/ext/interbase/interbase.c.gnusrc	2011-02-24 03:42:38.000000000 +0100
-+++ php-5.3.7RC3/ext/interbase/interbase.c	2011-07-15 17:46:36.119082439 +0200
-@@ -24,7 +24,6 @@
- #include "config.h"
- #endif
- 
-#define _GNU_SOURCE
- 
- #include "php.h"
- 
-diff -up php-5.3.7RC3/ext/pdo_firebird/firebird_driver.c.gnusrc php-5.3.7RC3/ext/pdo_firebird/firebird_driver.c
--- php-5.3.7RC3/ext/pdo_firebird/firebird_driver.c.gnusrc	2011-06-17 04:00:20.000000000 +0200
-+++ php-5.3.7RC3/ext/pdo_firebird/firebird_driver.c	2011-07-15 17:46:36.119082439 +0200
-@@ -22,7 +22,6 @@
- #include "config.h"
- #endif
- 
-#define _GNU_SOURCE
- 
- #include "php.h"
- #ifdef ZEND_ENGINE_2
-diff -up php-5.3.7RC3/ext/standard/file.c.gnusrc php-5.3.7RC3/ext/standard/file.c
--- php-5.3.7RC3/ext/standard/file.c.gnusrc	2011-06-19 16:50:44.000000000 +0200
-+++ php-5.3.7RC3/ext/standard/file.c	2011-07-15 17:46:36.120082441 +0200
-@@ -113,9 +113,6 @@ php_file_globals file_globals;
- #endif
- 
- #if defined(HAVE_FNMATCH) && !defined(PHP_WIN32)
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-# endif
- # include <fnmatch.h>
- #endif
- 
-diff -up php-5.3.7RC3/ext/zlib/zlib_fopen_wrapper.c.gnusrc php-5.3.7RC3/ext/zlib/zlib_fopen_wrapper.c
--- php-5.3.7RC3/ext/zlib/zlib_fopen_wrapper.c.gnusrc	2011-01-01 03:19:59.000000000 +0100
-+++ php-5.3.7RC3/ext/zlib/zlib_fopen_wrapper.c	2011-07-15 17:46:36.121082444 +0200
-@@ -19,8 +19,6 @@
- 
- /* $Id: zlib_fopen_wrapper.c 306939 2011-01-01 02:19:59Z felipe $ */
- 
-#define _GNU_SOURCE
-
- #include "php.h"
- #include "php_zlib.h"
- #include "fopen_wrappers.h"
-diff -up php-5.3.7RC3/main/php.h.gnusrc php-5.3.7RC3/main/php.h
--- php-5.3.7RC3/main/php.h.gnusrc	2011-01-01 03:19:59.000000000 +0100
-+++ php-5.3.7RC3/main/php.h	2011-07-15 17:46:36.122082447 +0200
-@@ -30,6 +30,7 @@
- #define PHP_HAVE_STREAMS
- #define YYDEBUG 0
- 
-+#include "php_config.h"
- #include "php_version.h"
- #include "zend.h"
- #include "zend_qsort.h"
-diff -up php-5.3.7RC3/main/streams/cast.c.gnusrc php-5.3.7RC3/main/streams/cast.c
--- php-5.3.7RC3/main/streams/cast.c.gnusrc	2011-01-20 07:32:59.000000000 +0100
-+++ php-5.3.7RC3/main/streams/cast.c	2011-07-15 17:46:36.122082447 +0200
-@@ -18,7 +18,6 @@
- 
- /* $Id: cast.c 307611 2011-01-20 06:32:59Z pajoye $ */
- 
-#define _GNU_SOURCE
- #include "php.h"
- #include "php_globals.h"
- #include "php_network.h"
-diff -up php-5.3.7RC3/main/streams/memory.c.gnusrc php-5.3.7RC3/main/streams/memory.c
--- php-5.3.7RC3/main/streams/memory.c.gnusrc	2011-01-01 03:19:59.000000000 +0100
-+++ php-5.3.7RC3/main/streams/memory.c	2011-07-15 17:46:36.123082450 +0200
-@@ -18,7 +18,6 @@
- 
- /* $Id: memory.c 306939 2011-01-01 02:19:59Z felipe $ */
- 
-#define _GNU_SOURCE
- #include "php.h"
- 
- PHPAPI int php_url_decode(char *str, int len);
-diff -up php-5.3.7RC3/main/streams/streams.c.gnusrc php-5.3.7RC3/main/streams/streams.c
--- php-5.3.7RC3/main/streams/streams.c.gnusrc	2011-07-15 17:47:00.053139110 +0200
-+++ php-5.3.7RC3/main/streams/streams.c	2011-07-15 17:47:03.960148477 +0200
-@@ -21,7 +21,6 @@
- 
- /* $Id: streams.c 312937 2011-07-05 16:09:06Z cataphract $ */
- 
-#define _GNU_SOURCE
- #include "php.h"
- #include "php_globals.h"
- #include "php_network.h"
-diff -up php-5.3.7RC3/Zend/zend_language_parser.c.gnusrc php-5.3.7RC3/Zend/zend_language_parser.c
--- php-5.3.7RC3/Zend/zend_language_parser.c.gnusrc	2011-07-14 10:39:30.000000000 +0200
-+++ php-5.3.7RC3/Zend/zend_language_parser.c	2011-07-15 17:46:36.126082456 +0200
-@@ -112,6 +112,8 @@
- #include "zend_API.h"
- #include "zend_constants.h"
- 
-+#include <string.h>
-+
- 
- #define YYERROR_VERBOSE
- #define YYSTYPE znode
--- a/php-5.3.8-aconf259.patch
+++ b/php-5.3.8-aconf259.patch
@ -1,195 +0,0 @@
-diff -up php-5.3.8/build/buildcheck.sh.aconf259 php-5.3.8/build/buildcheck.sh
--- php-5.3.8/build/buildcheck.sh.aconf259	2011-05-18 21:55:34.000000000 +0200
-+++ php-5.3.8/build/buildcheck.sh	2011-09-12 17:42:17.016672712 +0200
-@@ -28,33 +28,23 @@ if test -z "$PHP_AUTOCONF"; then
-   PHP_AUTOCONF='autoconf'
- fi
- 
-# autoconf 2.13 or newer
-+# autoconf 2.59 or newer
- ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
- if test -z "$ac_version"; then
- echo "buildconf: autoconf not found."
-echo "           You need autoconf version 2.13 or newer installed"
-+echo "           You need autoconf version 2.59 or newer installed"
- echo "           to build PHP from SVN."
- exit 1
- fi
- IFS=.; set $ac_version; IFS=' '
-if test "$1" = "2" -a "$2" -lt "13" || test "$1" -lt "2"; then
-+if test "$1" = "2" -a "$2" -lt "59" || test "$1" -lt "2"; then
- echo "buildconf: autoconf version $ac_version found."
-echo "           You need autoconf version 2.13 or newer installed"
-+echo "           You need autoconf version 2.59 or newer installed"
- echo "           to build PHP from SVN."
- exit 1
- fi
- 
-if test "$1" = "2" -a "$2" -gt "59"; then
-  echo "buildconf: You need autoconf 2.59 or lower to build this version of PHP."
-  echo "           You are currently trying to use $ac_version"
-  echo "           Most distros have separate autoconf 2.13 or 2.59 packages."
-  echo "           On Debian/Ubuntu both autoconf2.13 and autoconf2.59 packages exist."
-  echo "           Install autoconf2.13 and set the PHP_AUTOCONF env var to "
-  echo "           autoconf2.13 and try again."
-  exit 1
-else
-  echo "buildconf: autoconf version $ac_version (ok)"
-fi
-+echo "buildconf: autoconf version $ac_version (ok)"
- 
- if test "$1" = "2" -a "$2" -ge "50"; then
-   ./vcsclean
-diff -up php-5.3.8/configure.in.aconf259 php-5.3.8/configure.in
--- php-5.3.8/configure.in.aconf259	2011-09-12 17:42:17.008672708 +0200
-+++ php-5.3.8/configure.in	2011-09-12 17:42:17.017672713 +0200
-@@ -1,28 +1,6 @@
- ## $Id: configure.in 315343 2011-08-23 08:56:29Z johannes $ -*- autoconf -*-
- dnl ## Process this file with autoconf to produce a configure script.
- 
-divert(1)
-
-dnl ## Diversion 1 is the autoconf + automake setup phase. We also
-dnl ## set the PHP version, deal with platform-specific compile
-dnl ## options and check for the basic compile tools.
-
-dnl ## Diversion 2 is the initial checking of OS features, programs,
-dnl ## libraries and so on.
-
-dnl ## In diversion 3 we check for compile-time options to the PHP
-dnl ## core and how to deal with different system dependencies. 
-dnl ## This includes whether debugging or short tags are enabled
-dnl ## and the default behaviour of php.ini options.
-dnl ## This is also where an SAPI interface is selected (choosing between
-dnl ## Apache module, CGI etc.)
-
-dnl ## In diversion 4 we check user-configurable general settings.
-
-dnl ## In diversion 5 we check which extensions should be compiled.
-dnl ## All of these are normally in the extension directories.
-dnl ## Diversion 5 is the last one.  Here we generate files and clean up.
-
- dnl include Zend specific macro definitions first
- dnl -------------------------------------------------------------------------
- sinclude(Zend/acinclude.m4)
-@@ -30,8 +8,10 @@ sinclude(Zend/acinclude.m4)
- dnl Basic autoconf + automake initialization, generation of config.nice.
- dnl -------------------------------------------------------------------------
- 
-AC_PREREQ(2.13)
-+AC_PREREQ(2.59)
- AC_INIT(README.SVN-RULES)
-+ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
-+
- 
- PHP_CONFIG_NICE(config.nice)
- 
-@@ -292,14 +272,6 @@ sinclude(TSRM/threads.m4)
- sinclude(TSRM/tsrm.m4)
- 
- 
-divert(2)
-
-dnl ## Diversion 2 is where we set PHP-specific options and come up
-dnl ## with reasonable default values for them. We check for pthreads here
-dnl ## because the information is needed by the SAPI configuration.
-dnl ## This is also where an SAPI interface is selected (choosing between
-dnl ## Apache module, CGI etc.)
-
- dnl .
- dnl -------------------------------------------------------------------------
- 
-@@ -331,13 +303,6 @@ if test "$enable_maintainer_zts" = "yes"
-   PTHREADS_FLAGS
- fi
- 
-divert(3)
-
-dnl ## In diversion 3 we check for compile-time options to the PHP
-dnl ## core and how to deal with different system dependencies. 
-dnl ## This includes whether debugging or short tags are enabled
-dnl ## and the default behaviour of php.ini options.
-
- dnl Starting system checks.
- dnl -------------------------------------------------------------------------
- 
-@@ -677,10 +642,6 @@ if test "x$php_crypt_r" = "x1"; then
-   PHP_CRYPT_R_STYLE
- fi
- 
-divert(4)
-
-dnl ## In diversion 4 we check user-configurable general settings.
-
- dnl General settings.
- dnl -------------------------------------------------------------------------
- PHP_CONFIGURE_PART(General settings)
-@@ -918,11 +879,6 @@ else
-   AC_MSG_RESULT([using system default])
- fi
- 
-divert(5)
-
-dnl ## In diversion 5 we check which extensions should be compiled.
-dnl ## All of these are normally in the extension directories.
-
- dnl Extension configuration.
- dnl -------------------------------------------------------------------------
- 
-diff -up php-5.3.8/ext/standard/config.m4.aconf259 php-5.3.8/ext/standard/config.m4
--- php-5.3.8/ext/standard/config.m4.aconf259	2010-06-17 12:22:03.000000000 +0200
-+++ php-5.3.8/ext/standard/config.m4	2011-09-12 17:42:17.018672714 +0200
-@@ -1,7 +1,5 @@
- dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- autoconf -*-
- 
-divert(3)dnl
-
- dnl
- dnl Check if flush should be called explicitly after buffered io
- dnl
-@@ -342,8 +340,6 @@ dnl
- AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy)
- AC_FUNC_FNMATCH	
- 
-divert(5)dnl
-
- dnl
- dnl Check if there is a support means of creating a new process
- dnl and defining which handles it receives
-diff -up php-5.3.8/scripts/php-config.in.aconf259 php-5.3.8/scripts/php-config.in
--- php-5.3.8/scripts/php-config.in.aconf259	2011-04-18 13:13:37.000000000 +0200
-+++ php-5.3.8/scripts/php-config.in	2011-09-12 17:42:17.019672714 +0200
-@@ -2,6 +2,7 @@
- 
- SED="@SED@"
- prefix="@prefix@"
-+datarootdir="@datarootdir@"
- exec_prefix="@exec_prefix@"
- version="@PHP_VERSION@"
- vernum="@PHP_VERSION_ID@"
-diff -up php-5.3.8/scripts/phpize.in.aconf259 php-5.3.8/scripts/phpize.in
--- php-5.3.8/scripts/phpize.in.aconf259	2009-06-24 09:42:33.000000000 +0200
-+++ php-5.3.8/scripts/phpize.in	2011-09-12 17:43:12.706714796 +0200
-@@ -2,6 +2,7 @@
- 
- # Variable declaration
- prefix='@prefix@'
-+datarootdir='@datarootdir@'
- exec_prefix="`eval echo @exec_prefix@`"
- phpdir="`eval echo @libdir@`/build"
- includedir="`eval echo @includedir@`/php"
-diff -up php-5.3.8/scripts/phpize.m4.aconf259 php-5.3.8/scripts/phpize.m4
--- php-5.3.8/scripts/phpize.m4.aconf259	2010-11-02 10:58:08.000000000 +0100
-+++ php-5.3.8/scripts/phpize.m4	2011-09-12 17:42:17.020672715 +0200
-@@ -1,9 +1,8 @@
- dnl This file becomes configure.in for self-contained extensions.
- 
-divert(1)
-
-AC_PREREQ(2.13)
-+AC_PREREQ(2.59)
- AC_INIT(config.m4)
-+ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
- 
- PHP_CONFIG_NICE(config.nice)
- 
--- a/php-5.3.8-isa.patch
+++ b/php-5.3.8-isa.patch
@ -1,45 +0,0 @@
--- php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c	2011/09/23 09:29:27	317182
-+++ php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c	2011/09/23 09:52:09	317183
-@@ -816,13 +816,19 @@
- 	int class_name_len;
- 	zend_class_entry *instance_ce;
- 	zend_class_entry **ce;
-+	zend_bool allow_string = only_subclass;
- 	zend_bool retval;
- 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs", &obj, &class_name, &class_name_len) == FAILURE) {
-+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs|b", &obj, &class_name, &class_name_len, &allow_string) == FAILURE) {
- 		return;
- 	}
-	
-	if (Z_TYPE_P(obj) == IS_STRING) {
-+	/*
-+	   allow_string - is_a default is no, is_subclass_of is yes. 
-+	   if it's allowed, then the autoloader will be called if the class does not exist.
-+	   default behaviour is different, as 'is_a' usage is normally to test mixed return values 
-+	*/
-+
-+	if (allow_string && Z_TYPE_P(obj) == IS_STRING) {
- 		zend_class_entry **the_ce;
- 		if (zend_lookup_class(Z_STRVAL_P(obj), Z_STRLEN_P(obj), &the_ce TSRMLS_CC) == FAILURE) {
- 			RETURN_FALSE;
-@@ -848,7 +854,7 @@
- }
- 
- 
-/* {{{ proto bool is_subclass_of(object object, string class_name)
-+/* {{{ proto bool is_subclass_of(mixed object_or_string, string class_name [, bool allow_string=true])
-    Returns true if the object has this class as one of its parents */
- ZEND_FUNCTION(is_subclass_of)
- {
-@@ -857,8 +863,8 @@
- /* }}} */
- 
- 
-/* {{{ proto bool is_a(object object, string class_name)
-   Returns true if the object is of this class or has this class as one of its parents */
-+/* {{{ proto bool is_a(mixed object_or_string, string class_name [, bool allow_string=false])
-+   Returns true if the first argument is an object and is this class or has this class as one of its parents, */
- ZEND_FUNCTION(is_a)
- {
- 	is_a_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
--- a/php-5.3.8-mysqlnd.patch
+++ b/php-5.3.8-mysqlnd.patch
@ -1,77 +0,0 @@
-diff -up php-5.3.8/ext/mysqlnd/config9.m4.mysqlnd php-5.3.8/ext/mysqlnd/config9.m4
--- php-5.3.8/ext/mysqlnd/config9.m4.mysqlnd	2011-03-23 18:14:28.000000000 +0100
-+++ php-5.3.8/ext/mysqlnd/config9.m4	2011-09-12 17:44:54.403846592 +0200
-@@ -3,6 +3,10 @@ dnl $Id: config9.m4 309609 2011-03-23 17
- dnl config.m4 for mysqlnd driver
- 
- 
-+PHP_ARG_ENABLE(mysqlnd, whether to enable mysqlnd,
-+  [  --enable-mysqlnd       Enable mysqlnd expliciely, will be done implicitly
-+                         when required by other extensions], no, yes)
-+
- PHP_ARG_ENABLE(mysqlnd_compression_support, whether to enable compressed protocol support in mysqlnd,
- [  --disable-mysqlnd-compression-support
-                             Disable support for the MySQL compressed protocol in mysqlnd], yes, no)
-@@ -13,7 +17,7 @@ if test -z "$PHP_ZLIB_DIR"; then
- fi
- 
- dnl If some extension uses mysqlnd it will get compiled in PHP core
-if test "$PHP_MYSQLND_ENABLED" = "yes"; then
-+if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
-   mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
-   mysqlnd_base_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
-                    mysqlnd_loaddata.c mysqlnd_net.c mysqlnd_statistics.c \
-@@ -27,12 +31,12 @@ if test "$PHP_MYSQLND_ENABLED" = "yes"; 
-   AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
- 
-   mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
-  PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
-+  PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, $ext_shared)
-   PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
-   PHP_INSTALL_HEADERS([ext/mysqlnd/])
- fi
- 
-if test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
-+if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
-   PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
- 
-   dnl This creates a file so it has to be after above macros
-diff -up php-5.3.8/ext/mysqlnd/mysqlnd.c.mysqlnd php-5.3.8/ext/mysqlnd/mysqlnd.c
--- php-5.3.8/ext/mysqlnd/mysqlnd.c.mysqlnd	2011-09-12 17:50:37.676119503 +0200
-+++ php-5.3.8/ext/mysqlnd/mysqlnd.c	2011-09-12 17:50:41.695136669 +0200
-@@ -620,7 +620,7 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MY
- 		if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) {
- 			DBG_INF_FMT("socket=%s", socket_or_pipe? socket_or_pipe:"n/a");
- 			if (!socket_or_pipe) {
-				socket_or_pipe = "/tmp/mysql.sock";
-+				socket_or_pipe = "/var/lib/mysql/mysql.sock";
- 			}
- 			transport_len = spprintf(&transport, 0, "unix://%s", socket_or_pipe);
- 			unix_socket = TRUE;
-diff -up php-5.3.8/ext/mysqlnd/php_mysqlnd.c.mysqlnd php-5.3.8/ext/mysqlnd/php_mysqlnd.c
--- php-5.3.8/ext/mysqlnd/php_mysqlnd.c.mysqlnd	2011-08-06 16:47:44.000000000 +0200
-+++ php-5.3.8/ext/mysqlnd/php_mysqlnd.c	2011-09-12 17:44:54.404846593 +0200
-@@ -299,6 +299,11 @@ zend_module_entry mysqlnd_module_entry =
- };
- /* }}} */
- 
-+/* {{{ COMPILE_DL_MYSQLND */
-+#ifdef COMPILE_DL_MYSQLND
-+ZEND_GET_MODULE(mysqlnd)
-+#endif
-+/* }}} */
- 
- /*
-  * Local variables:
-diff -up php-5.3.8/ext/pdo_mysql/pdo_mysql.c.mysqlnd php-5.3.8/ext/pdo_mysql/pdo_mysql.c
--- php-5.3.8/ext/pdo_mysql/pdo_mysql.c.mysqlnd	2011-09-12 17:49:24.769799256 +0200
-+++ php-5.3.8/ext/pdo_mysql/pdo_mysql.c	2011-09-12 17:49:31.216828314 +0200
-@@ -42,7 +42,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql);
- #  ifdef PHP_MYSQL_UNIX_SOCK_ADDR
- #   define PDO_MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR
- #  else
-#   define PDO_MYSQL_UNIX_ADDR "/tmp/mysql.sock"
-+#   define PDO_MYSQL_UNIX_ADDR "/var/lib/mysql/mysql.sock"
- #  endif
- # endif
- #endif
--- a/php-5.4.0-dlopen.patch
+++ b/php-5.4.0-dlopen.patch
@ -1,17 +1,17 @@
--- php-5.0.4/Zend/zend.h.dlopen
-+++ php-5.0.4/Zend/zend.h
-@@ -102,11 +102,11 @@
+--- php-5.4.0RC5/Zend/zend.h.dlopen	2012-01-18 17:10:33.972013835 +0100
+++ php-5.4.0RC5/Zend/zend.h	2012-01-18 17:12:39.175019492 +0100
+@@ -90,11 +90,11 @@
 # endif
 
 # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
 -#  define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
-+#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
+#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW  | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
 # elif defined(RTLD_DEEPBIND)
 -#  define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)
-+#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND)
+#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW  | RTLD_GLOBAL | RTLD_DEEPBIND)
 # else
 -#  define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL)
-+#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW | RTLD_GLOBAL)
+#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW  | RTLD_GLOBAL)
 # endif
 # define DL_UNLOAD					dlclose
 # if defined(DLSYM_NEEDS_UNDERSCORE)
--- a/php-5.4.0-easter.patch
+++ b/php-5.4.0-easter.patch
@ -1,7 +1,7 @@
-diff -up php-5.3.0/ext/standard/basic_functions.c.easter php-5.3.0/ext/standard/basic_functions.c
--- php-5.3.0/ext/standard/basic_functions.c.easter	2009-06-20 08:07:35.000000000 +0200
-+++ php-5.3.0/ext/standard/basic_functions.c	2009-07-12 13:46:08.000000000 +0200
-@@ -1547,9 +1547,6 @@ ZEND_END_ARG_INFO()
+diff -up php-5.4.0RC5/ext/standard/basic_functions.c.easter php-5.4.0RC5/ext/standard/basic_functions.c
+--- php-5.4.0RC5/ext/standard/basic_functions.c.easter	2012-01-18 17:17:54.016033939 +0100
+++ php-5.4.0RC5/ext/standard/basic_functions.c	2012-01-18 17:18:54.022036314 +0100
+@@ -1554,9 +1554,6 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO(arginfo_php_real_logo_guid, 0)
 ZEND_END_ARG_INFO()
 
@ -11,7 +11,7 @@ diff -up php-5.3.0/ext/standard/basic_functions.c.easter php-5.3.0/ext/standard/
 ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0)
 ZEND_END_ARG_INFO()
 
-@@ -2695,7 +2692,6 @@ const zend_function_entry basic_function
+@@ -2719,7 +2716,6 @@ const zend_function_entry basic_function
 	PHP_FE(phpcredits,														arginfo_phpcredits)
 	PHP_FE(php_logo_guid,													arginfo_php_logo_guid)
 	PHP_FE(php_real_logo_guid,												arginfo_php_real_logo_guid)
@ -19,10 +19,10 @@ diff -up php-5.3.0/ext/standard/basic_functions.c.easter php-5.3.0/ext/standard/
 	PHP_FE(zend_logo_guid,													arginfo_zend_logo_guid)
 	PHP_FE(php_sapi_name,													arginfo_php_sapi_name)
 	PHP_FE(php_uname,														arginfo_php_uname)
-diff -up php-5.3.0/ext/standard/info.c.easter php-5.3.0/ext/standard/info.c
--- php-5.3.0/ext/standard/info.c.easter	2009-01-17 03:05:13.000000000 +0100
-+++ php-5.3.0/ext/standard/info.c	2009-07-12 13:46:11.000000000 +0200
-@@ -1268,21 +1268,7 @@ PHP_FUNCTION(phpcredits)
+diff -up php-5.4.0RC5/ext/standard/info.c.easter php-5.4.0RC5/ext/standard/info.c
+--- php-5.4.0RC5/ext/standard/info.c.easter	2012-01-18 17:17:44.712033203 +0100
+++ php-5.4.0RC5/ext/standard/info.c	2012-01-18 17:19:58.097039189 +0100
+@@ -1195,21 +1195,7 @@ PHP_FUNCTION(phpcredits)
  */
 PHPAPI char *php_logo_guid(void)
 {
@ -45,7 +45,7 @@ diff -up php-5.3.0/ext/standard/info.c.easter php-5.3.0/ext/standard/info.c
 
 }
 /* }}} */
-@@ -1313,18 +1299,6 @@ PHP_FUNCTION(php_real_logo_guid)
+@@ -1238,18 +1224,6 @@ PHP_FUNCTION(php_real_logo_guid)
 }
 /* }}} */
 
@ -64,9 +64,9 @@ diff -up php-5.3.0/ext/standard/info.c.easter php-5.3.0/ext/standard/info.c
 /* {{{ proto string zend_logo_guid(void)
    Return the special ID used to request the Zend logo in phpinfo screens*/
 PHP_FUNCTION(zend_logo_guid)
-diff -up php-5.3.0/ext/standard/info.h.easter php-5.3.0/ext/standard/info.h
--- php-5.3.0/ext/standard/info.h.easter	2008-12-31 12:15:45.000000000 +0100
-+++ php-5.3.0/ext/standard/info.h	2009-07-12 13:45:34.000000000 +0200
+diff -up php-5.4.0RC5/ext/standard/info.h.easter php-5.4.0RC5/ext/standard/info.h
+--- php-5.4.0RC5/ext/standard/info.h.easter	2012-01-18 17:17:37.245032832 +0100
+++ php-5.4.0RC5/ext/standard/info.h	2012-01-18 17:20:17.160040044 +0100
@@ -51,7 +51,6 @@
 #endif /* HAVE_CREDITS_DEFS */
 
@ -83,10 +83,10 @@ diff -up php-5.3.0/ext/standard/info.h.easter php-5.3.0/ext/standard/info.h
 PHP_FUNCTION(php_sapi_name);
 PHP_FUNCTION(php_uname);
 PHP_FUNCTION(php_ini_scanned_files);
-diff -up php-5.3.0/main/logos.h.easter php-5.3.0/main/logos.h
--- php-5.3.0/main/logos.h.easter	2008-12-31 12:15:47.000000000 +0100
-+++ php-5.3.0/main/logos.h	2009-07-12 13:46:15.000000000 +0200
-@@ -492,589 +492,3 @@ static const unsigned char php_logo[] = 
+diff -up php-5.4.0RC5/main/logos.h.easter php-5.4.0RC5/main/logos.h
+--- php-5.4.0RC5/main/logos.h.easter	2012-01-18 17:17:27.975032470 +0100
+++ php-5.4.0RC5/main/logos.h	2012-01-18 17:21:27.036043180 +0100
+@@ -492,589 +492,3 @@ static const unsigned char php_logo[] =
 	 21, 116, 187, 251, 221, 240, 142, 119, 188,   3, 
 	  1,   0,  59,   0 };
 
@ -676,9 +676,9 @@ diff -up php-5.3.0/main/logos.h.easter php-5.3.0/main/logos.h
 -	 54, 240,   3,  66, 148,   6, 228, 178,  11, 192, 
 -	192,   4, 236, 158, 239,   2,  17,  16,   0,  59};
 -
-diff -up php-5.3.0/main/php_logos.c.easter php-5.3.0/main/php_logos.c
--- php-5.3.0/main/php_logos.c.easter	2008-12-31 12:15:47.000000000 +0100
-+++ php-5.3.0/main/php_logos.c	2009-07-12 13:45:50.000000000 +0200
+diff -up php-5.4.0RC5/main/php_logos.c.easter php-5.4.0RC5/main/php_logos.c
+--- php-5.4.0RC5/main/php_logos.c.easter	2012-01-18 17:17:17.895031787 +0100
+++ php-5.4.0RC5/main/php_logos.c	2012-01-18 17:21:46.877044070 +0100
@@ -56,7 +56,6 @@ int php_init_info_logos(void)
 		return FAILURE;
 
--- a/php-5.4.0-phpize.patch
+++ b/php-5.4.0-phpize.patch
@ -1,6 +1,6 @@
--- scripts/phpize.in.orig	2010-12-01 17:00:27.110013483 +0100
-+++ scripts/phpize.in	2010-12-01 17:02:12.555757906 +0100
-@@ -161,6 +161,15 @@
+--- php-5.4.0RC5/scripts/phpize.in.orig	2012-01-18 17:13:54.018022983 +0100
+++ php-5.4.0RC5/scripts/phpize.in	2012-01-18 17:14:40.614024941 +0100
+@@ -162,6 +162,15 @@
   $PHP_AUTOHEADER || exit 1
 }
 
@ -16,7 +16,7 @@
 # Main script
 
 case "$1" in 
-@@ -179,12 +188,15 @@
+@@ -180,12 +189,15 @@
 
   # Version
   --version|-v)
--- a/php-fpm-www.conf
+++ b/php-fpm-www.conf
@ -209,5 +209,6 @@ slowlog = /var/log/php-fpm/www-slow.log
 ;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
 ;php_flag[display_errors] = off
 php_admin_value[error_log] = /var/log/php-fpm/www-error.log
+php_admin_value[session.save_path] = /var/lib/php/session
 php_admin_flag[log_errors] = on
-;php_admin_value[memory_limit] = 32M
+;php_admin_value[memory_limit] = 128M
--- a/php.ini
+++ b/php.ini
--- a/php.spec
+++ b/php.spec
@ -1,15 +1,18 @@
 %global contentdir  /var/www
 # API/ABI check
-%global apiver      20090626
-%global zendver     20090626
+%global apiver      20100412
+%global zendver     20100525
 %global pdover      20080721
 # Extension version
 %global fileinfover 1.0.5-dev
 %global pharver     2.0.1
 %global zipver      1.9.1
 %global jsonver     1.2.1
+# For PHP Release Candidate version
+%global rcver       RC6

 %global httpd_mmn %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
+%global mysql_sock %(mysql_config --socket || echo /var/lib/mysql/mysql.sock)

 # Regression tests take a long time, you can skip 'em with this
 %{!?runselftest: %{expand: %%global runselftest 1}}
@ -36,13 +39,13 @@

 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.3.8
-Release: 4%{?dist}.4
+Version: 5.4.0
+Release: 0.1.%{rcver}%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/

-Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
+Source0: http://www.php.net/distributions/php-%{version}%{?rcver}.tar.bz2
 Source1: php.conf
 Source2: php.ini
 Source3: macros.php
@ -52,43 +55,33 @@ Source6: php-fpm.service
 Source7: php-fpm.logrotate

 # Build fixes
-Patch1: php-5.3.7-gnusrc.patch
-Patch2: php-5.3.0-install.patch
-Patch3: php-5.2.4-norpath.patch
 Patch5: php-5.2.0-includedir.patch
 Patch6: php-5.2.4-embed.patch
 Patch7: php-5.3.0-recode.patch
-# from http://svn.php.net/viewvc?view=revision&revision=311042
-# and  http://svn.php.net/viewvc?view=revision&revision=311908
-Patch8: php-5.3.8-aconf259.patch
-# from http://svn.php.net/viewvc?view=revision&revision=316281
-# + fix harcoded mysql.sock path
-Patch9: php-5.3.8-mysqlnd.patch

 # Fixes for extension modules
-Patch20: php-4.3.11-shutdown.patch
-Patch21: php-5.3.3-macropen.patch

 # Functional changes
-Patch40: php-5.0.4-dlopen.patch
-Patch41: php-5.3.0-easter.patch
+Patch40: php-5.4.0-dlopen.patch
+Patch41: php-5.4.0-easter.patch
 Patch42: php-5.3.1-systzdata-v7.patch
 # See http://bugs.php.net/53436
-Patch43: php-5.3.4-phpize.patch
-# http://svn.php.net/viewvc?view=revision&revision=317183
-Patch44: php-5.3.8-isa.patch
+Patch43: php-5.4.0-phpize.patch

 # Fixes for tests
-Patch61: php-5.0.4-tests-wddx.patch
+

 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel
 BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
-BuildRequires: libstdc++-devel, openssl-devel, sqlite-devel >= 3.6.0
-BuildRequires: zlib-devel, pcre-devel >= 6.6, smtpdaemon, libedit-devel
+BuildRequires: libstdc++-devel, openssl-devel
+BuildRequires: sqlite-devel >= 3.6.0
+BuildRequires: zlib-devel, smtpdaemon, libedit-devel
+BuildRequires: pcre-devel >= 6.6
 BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++
 BuildRequires: libtool-ltdl-devel
+BuildRequires: bison

 Obsoletes: php-dbg, php3, phpfi, stronghold-php, php-zts < 5.3.7
 Provides: php-zts = %{version}-%{release}
@ -106,9 +99,11 @@ Requires(pre): httpd
 # Don't provides extensions, which are not shared library, as .so
 # RPM 4.8
 %{?filter_provides_in: %filter_provides_in %{_libdir}/php/modules/.*\.so$}
+%{?filter_provides_in: %filter_provides_in %{_libdir}/php-zts/modules/.*\.so$}
 %{?filter_setup}
 # RPM 4.9
 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/php/modules/.*\\.so$
+%global __provides_exclude_from %{__provides_exclude_from}|%{_libdir}/php-zts/modules/.*\\.so$


 %description
@ -134,6 +129,7 @@ Provides: php-readline, php-readline%{?_isa}
 The php-cli package contains the command-line interface 
 executing PHP scripts, /usr/bin/php, and the CGI interface.

+
 %if %{with_fpm}
 %package fpm
 Group: Development/Languages
@ -159,10 +155,7 @@ any size, especially busier sites.
 %package common
 Group: Development/Languages
 Summary: Common files for PHP
-# Remove this when value change
-Provides: php-api = %{apiver}, php-zend-abi = %{zendver}
-Provides: php(api) = %{apiver}, php(zend-abi) = %{zendver}
-# New ABI/API check - Arch specific
+# ABI/API check - Arch specific
 Provides: php-api = %{apiver}%{isasuffix}, php-zend-abi = %{zendver}%{isasuffix}
 Provides: php(api) = %{apiver}%{isasuffix}, php(zend-abi) = %{zendver}%{isasuffix}
 # Provides for all builtin/shared modules:
@ -215,6 +208,8 @@ Group: Development/Libraries
 Summary: Files needed for building PHP extensions
 Requires: php%{?_isa} = %{version}-%{release}, autoconf, automake
 Obsoletes: php-pecl-pdo-devel
+Provides: php-zts-devel = %{version}-%{release}
+Provides: php-zts-devel%{?_isa} = %{version}-%{release}

 %description devel
 The php-devel package contains the files needed for building PHP
@ -257,9 +252,7 @@ Summary: A database access abstraction module for PHP applications
 Group: Development/Languages
 Requires: php-common%{?_isa} = %{version}-%{release}
 Obsoletes: php-pecl-pdo-sqlite, php-pecl-pdo
-# Remove this when value change
-Provides: php-pdo-abi = %{pdover}
-# New ABI/API check - Arch specific
+# ABI/API check - Arch specific
 Provides: php-pdo-abi = %{pdover}%{isasuffix}
 Provides: php-sqlite3, php-sqlite3%{?_isa}
 Provides: php-pdo_sqlite, php-pdo_sqlite%{?_isa}
@ -554,26 +547,16 @@ support for using the enchant library to PHP.


 %prep
-%setup -q
-%patch1 -p1 -b .gnusrc
-%patch2 -p1 -b .install
-%patch3 -p1 -b .norpath
+%setup -q -n php-%{version}%{?rcver}
+
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
 %patch7 -p1 -b .recode
-%patch8 -p1 -b .aconf26x
-%patch9 -p1 -b .mysqlnd
-
-%patch20 -p1 -b .shutdown
-%patch21 -p1 -b .macropen

 %patch40 -p1 -b .dlopen
 %patch41 -p1 -b .easter
 %patch42 -p1 -b .systzdata
-%patch43 -p0 -b .headers
-%patch44 -p4 -b .isa
-
-%patch61 -p1 -b .tests-wddx
+%patch43 -p1 -b .headers

 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@ -582,7 +565,7 @@ cp ext/ereg/regex/COPYRIGHT regex_COPYRIGHT
 cp ext/gd/libgd/README gd_README

 # Multiple builds for multiple SAPIs
-mkdir build-cgi build-apache build-embedded build-zts \
+mkdir build-cgi build-apache build-embedded build-zts build-ztscli \
 %if %{with_fpm}
    build-fpm
 %endif
@ -598,6 +581,13 @@ rm -f ext/standard/tests/file/bug22414.phpt \
      ext/iconv/tests/bug16069.phpt

 # Safety check for API version change.
+pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h)
+if test "x${pver}" != "x%{version}%{?rcver}"; then
+   : Error: Upstream PHP version is now ${pver}, expecting %{version}%{?rcver}.
+   : Update the version/rcver macros and rebuild.
+   exit 1
+fi
+
 vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h`
 if test "x${vapi}" != "x%{apiver}"; then
   : Error: Upstream API version is now ${vapi}, expecting %{apiver}.
@ -680,7 +670,7 @@ PEAR_INSTALLDIR=%{_datadir}/pear; export PEAR_INSTALLDIR
 # Shell function to configure and build a PHP tree.
 build() {
 # bison-1.875-2 seems to produce a broken parser; workaround.
-mkdir Zend && cp ../Zend/zend_{language,ini}_{parser,scanner}.[ch] Zend
+# mkdir Zend && cp ../Zend/zend_{language,ini}_{parser,scanner}.[ch] Zend
 ln -sf ../configure
 %configure \
 	--cache-file=../config.cache \
@ -715,11 +705,10 @@ ln -sf ../configure
 	--enable-ucd-snmp-hack \
 	--enable-shmop \
 	--enable-calendar \
-        --without-sqlite \
        --with-libxml-dir=%{_prefix} \
 	--enable-xml \
        --with-system-tzdata \
-        --with-mhash \
+	--with-mhash \
 	$* 
 if test $? != 0; then 
  tail -500 config.log
@ -732,6 +721,7 @@ make %{?_smp_mflags}

 # Build /usr/bin/php-cgi with the CGI SAPI, and all the shared extensions
 pushd build-cgi
+
 build --enable-force-cgi-redirect \
      --libdir=%{_libdir}/php \
      --enable-pcntl \
@ -746,6 +736,7 @@ build --enable-force-cgi-redirect \
      --enable-mysqlnd=shared \
      --with-mysql=shared,mysqlnd \
      --with-mysqli=shared,mysqlnd \
+      --with-mysql-sock=%{mysql_sock} \
      --with-interbase=shared,%{_libdir}/firebird \
      --with-pdo-firebird=shared,%{_libdir}/firebird \
      --enable-dom=shared \
@ -823,14 +814,83 @@ build --enable-embed \
      ${without_shared}
 popd

+# Build a special thread-safe (mainly for modules)
+pushd build-ztscli
+
+EXTENSION_DIR=%{_libdir}/php-zts/modules
+build --enable-force-cgi-redirect \
+      --bindir=%{_bindir}/php-zts \
+      --includedir=%{_includedir}/php-zts \
+      --libdir=%{_libdir}/php-zts \
+      --enable-maintainer-zts \
+      --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \
+      --enable-pcntl \
+      --with-imap=shared --with-imap-ssl \
+      --enable-mbstring=shared \
+      --enable-mbregex \
+      --with-gd=shared \
+      --enable-bcmath=shared \
+      --enable-dba=shared --with-db4=%{_prefix} \
+      --with-xmlrpc=shared \
+      --with-ldap=shared --with-ldap-sasl \
+      --enable-mysqlnd=shared \
+      --with-mysql=shared,mysqlnd \
+      --with-mysqli=shared,mysqlnd \
+      --with-mysql-sock=%{mysql_sock} \
+      --enable-mysqlnd-threading \
+      --with-interbase=shared,%{_libdir}/firebird \
+      --with-pdo-firebird=shared,%{_libdir}/firebird \
+      --enable-dom=shared \
+      --with-pgsql=shared \
+      --enable-wddx=shared \
+      --with-snmp=shared,%{_prefix} \
+      --enable-soap=shared \
+      --with-xsl=shared,%{_prefix} \
+      --enable-xmlreader=shared --enable-xmlwriter=shared \
+      --with-curl=shared,%{_prefix} \
+      --enable-fastcgi \
+      --enable-pdo=shared \
+      --with-pdo-odbc=shared,unixODBC,%{_prefix} \
+      --with-pdo-mysql=shared,mysqlnd \
+      --with-pdo-pgsql=shared,%{_prefix} \
+      --with-pdo-sqlite=shared,%{_prefix} \
+      --with-pdo-dblib=shared,%{_prefix} \
+      --with-sqlite3=shared,%{_prefix} \
+      --enable-json=shared \
+%if %{with_zip}
+      --enable-zip=shared \
+%endif
+      --without-readline \
+      --with-libedit \
+      --with-pspell=shared \
+      --enable-phar=shared \
+      --with-mcrypt=shared,%{_prefix} \
+      --with-tidy=shared,%{_prefix} \
+      --with-mssql=shared,%{_prefix} \
+      --enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \
+      --enable-posix=shared \
+      --with-unixODBC=shared,%{_prefix} \
+      --enable-fileinfo=shared \
+      --enable-intl=shared \
+      --with-icu-dir=%{_prefix} \
+      --with-enchant=shared,%{_prefix} \
+      --with-recode=shared,%{_prefix}
+popd
+
 # Build a special thread-safe Apache SAPI
 pushd build-zts
-EXTENSION_DIR=%{_libdir}/php-zts/modules
-build --with-apxs2=%{_sbindir}/apxs ${without_shared} \
+build --with-apxs2=%{_sbindir}/apxs \
+      --bindir=%{_bindir}/php-zts \
+      --includedir=%{_includedir}/php-zts \
      --libdir=%{_libdir}/php-zts \
-      --without-mysql --disable-pdo \
      --enable-maintainer-zts \
-      --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d
+      --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \
+      --enable-pdo=shared \
+      --with-mysql=shared,%{_prefix} \
+      --with-mysqli=shared,%{mysql_config} \
+      --with-pdo-mysql=shared,%{mysql_config} \
+      --with-pdo-sqlite=shared,%{_prefix} \
+      ${without_shared}
 popd

 ### NOTE!!! EXTENSION_DIR was changed for the -zts build, so it must remain
@ -858,8 +918,25 @@ unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT

+# Install the extensions for the ZTS version
+make -C build-ztscli install \
+     INSTALL_ROOT=$RPM_BUILD_ROOT
+
+# rename extensions build with mysqlnd
+mv $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/mysql.so \
+   $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/mysqlnd_mysql.so
+mv $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/mysqli.so \
+   $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/mysqlnd_mysqli.so
+mv $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/pdo_mysql.so \
+   $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/pdo_mysqlnd.so
+
+# Install the extensions for the ZTS version modules for libmysql
+make -C build-zts install-modules \
+     INSTALL_ROOT=$RPM_BUILD_ROOT
+
 # Install the version for embedded script language in applications + php_embed.h
-make -C build-embedded install-sapi install-headers INSTALL_ROOT=$RPM_BUILD_ROOT
+make -C build-embedded install-sapi install-headers \
+     INSTALL_ROOT=$RPM_BUILD_ROOT

 %if %{with_fpm}
 # Install the php-fpm binary
@ -887,11 +964,10 @@ make -C build-apache install-modules \
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 install -m 755 -d $RPM_BUILD_ROOT%{contentdir}/icons
-install -m 644    *.gif $RPM_BUILD_ROOT%{contentdir}/icons/
+install -m 644 php.gif $RPM_BUILD_ROOT%{contentdir}/icons/php.gif

 # For third-party packaging:
-install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/php/pear \
-                  $RPM_BUILD_ROOT%{_datadir}/php
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php

 # install the DSO
 install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules
@ -901,11 +977,11 @@ install -m 755 build-apache/libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/httpd/modu
 install -m 755 build-zts/libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules/libphp5-zts.so

 # Apache config fragment
-install -m 755 -d $RPM_BUILD_ROOT/etc/httpd/conf.d
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d

 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
-#install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d
 install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php
 install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session

@ -919,15 +995,15 @@ install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf
 mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf.default .
+# tmpfiles.d
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
+install -m 644 php-fpm.tmpfiles $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/php-fpm.conf
 # install systemd unit files and scripts for handling server startup
 install -m 755 -d $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/
 # LogRotate
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/php-fpm
-# tmpfiles.d
-install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-install -m 644 php-fpm.tmpfiles $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/php-fpm.conf
 %endif

 # Fix the link
@ -938,16 +1014,23 @@ for mod in pgsql mysql mysqli odbc ldap snmp xmlrpc imap \
    mysqlnd mysqlnd_mysql mysqlnd_mysqli pdo_mysqlnd \
    mbstring gd dom xsl soap bcmath dba xmlreader xmlwriter \
    pdo pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite json %{zipmod} \
-    sqlite3 enchant phar fileinfo intl \
+    sqlite3  interbase pdo_firebird \
+    enchant phar fileinfo intl \
    mcrypt tidy pdo_dblib mssql pspell curl wddx \
-    posix sysvshm sysvsem sysvmsg recode interbase pdo_firebird; do
+    posix sysvshm sysvsem sysvmsg recode; do
    cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
 ; Enable ${mod} extension module
 extension=${mod}.so
+EOF
+    cat > $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/${mod}.ini <<EOF
+; Enable ${mod} extension module
+extension=${mod}.so
 EOF
    cat > files.${mod} <<EOF
 %attr(755,root,root) %{_libdir}/php/modules/${mod}.so
+%attr(755,root,root) %{_libdir}/php-zts/modules/${mod}.so
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/php.d/${mod}.ini
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php-zts.d/${mod}.ini
 EOF
 done

@ -994,7 +1077,10 @@ install -m 644 -c macros.php \

 # Remove unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \
+       $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/*.a \
       $RPM_BUILD_ROOT%{_bindir}/{phptar} \
+       $RPM_BUILD_ROOT%{_bindir}/php-zts/phar* \
+       $RPM_BUILD_ROOT%{_bindir}/php-zts/php-cgi \
       $RPM_BUILD_ROOT%{_datadir}/pear \
       $RPM_BUILD_ROOT%{_libdir}/libphp5.la

@ -1060,12 +1146,12 @@ fi
 %doc php.ini-*
 %config(noreplace) %{_sysconfdir}/php.ini
 %dir %{_sysconfdir}/php.d
-#dir %{_sysconfdir}/php-zts.d
+%dir %{_sysconfdir}/php-zts.d
 %dir %{_libdir}/php
 %dir %{_libdir}/php/modules
-#dir %{_libdir}/php-zts/modules
+%dir %{_libdir}/php-zts
+%dir %{_libdir}/php-zts/modules
 %dir %{_localstatedir}/lib/php
-%dir %{_libdir}/php/pear
 %dir %{_datadir}/php

 %files cli
@ -1088,27 +1174,34 @@ fi
 %config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/php-fpm.conf
-%{_sbindir}/php-fpm
 %{_unitdir}/php-fpm.service
+%{_sbindir}/php-fpm
 %dir %{_sysconfdir}/php-fpm.d
 # log owned by apache for log
-%attr(770,apache,apache) %dir %{_localstatedir}/log/php-fpm
+%attr(770,apache,root) %dir %{_localstatedir}/log/php-fpm
 %dir %{_localstatedir}/run/php-fpm
 %{_mandir}/man8/php-fpm.8*
+%{_datadir}/fpm/status.html
 %endif

 %files devel
 %defattr(-,root,root)
 %{_bindir}/php-config
+%{_bindir}/php-zts/php-config
+%{_bindir}/php-zts/phpize
+# usefull only to test other module during build
+%{_bindir}/php-zts/php
 %{_includedir}/php
+%{_includedir}/php-zts
 %{_libdir}/php/build
+%{_libdir}/php-zts/build
 %{_mandir}/man1/php-config.1*
 %config %{_sysconfdir}/rpm/macros.php

 %files embedded
 %defattr(-,root,root,-)
 %{_libdir}/libphp5.so
-%{_libdir}/libphp5-%{version}.so
+%{_libdir}/libphp5-%{version}%{?rcver}.so

 %files pgsql -f files.pgsql
 %files mysql -f files.mysql
@ -1139,6 +1232,10 @@ fi


 %changelog
+* Wed Jan 18 2012 Remi Collet <remi@fedoraproject.org> 5.4.0-0.1.RC6
+- update to PHP 5.4.0RC6
+  https://fedoraproject.org/wiki/Features/Php54
+
 * Sun Jan 08 2012 Remi Collet <remi@fedoraproject.org> 5.3.8-4.4
 - fix systemd unit

--- a/2
+++ b/2
@ -1 +1 @@
-704cd414a0565d905e1074ffdc1fadfb  php-5.3.8.tar.bz2
+57ebb13b37bdce10ce2e2a2327873555  php-5.4.0RC6.tar.bz2