php: Updated (5.3.10 -> 5.4.0)

develop/php/no-httpd.conf.patch

@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../php/no-httpd.conf.patch
+# Copyright (C) 2012 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -18,18 +19,18 @@ The default Apache httpd.conf must not be touched.
 
   - Rene Rebe <rene@exactcode.de>
 
---- ./configure.orig	2005-04-04 19:49:07.310697440 -0400
-+++ ./configure	2005-04-04 19:49:46.293990696 -0400
-@@ -3574,7 +3574,7 @@
+--- ./configure.orig      2012-02-29 08:37:24.000000000 +0100
++++ ./configure   2012-03-03 17:31:38.764090638 +0100
+@@ -6496,7 +6496,7 @@
    $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
  
    if test "$?" != "0"; then
 -    APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
 +    APACHE_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option
-   else 
+   else
      APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
      if test -z `$APXS -q SYSCONFDIR`; then
-@@ -3587,7 +3587,7 @@
+@@ -6509,7 +6509,7 @@
                        \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                         $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                               -S SYSCONFDIR='$APXS_SYSCONFDIR' \
@@ -38,7 +39,7 @@ The default Apache httpd.conf must not be touched.
      fi
    fi
  
-@@ -4691,7 +4691,7 @@
+@@ -7604,7 +7604,7 @@
                  \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                         -S SYSCONFDIR='$APXS_SYSCONFDIR' \
@@ -47,7 +48,7 @@ The default Apache httpd.conf must not be touched.
    fi
  
    case $host_alias in
-@@ -5521,7 +5521,7 @@
+@@ -8416,7 +8416,7 @@
                  \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                         -S SYSCONFDIR='$APXS_SYSCONFDIR' \
@@ -56,16 +57,16 @@ The default Apache httpd.conf must not be touched.
    fi
  
    case $host_alias in
-@@ -6520,7 +6520,7 @@
+@@ -9385,7 +9385,7 @@
    $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
  
    if test "$?" != "0"; then
 -    APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
 +    APACHE_HOOKS_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option
-   else 
+   else
      APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
      if test -z `$APXS -q SYSCONFDIR`; then
-@@ -6533,7 +6533,7 @@
+@@ -9398,7 +9398,7 @@
                        \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                         $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                               -S SYSCONFDIR='$APXS_SYSCONFDIR' \
@@ -74,3 +75,4 @@ The default Apache httpd.conf must not be touched.
      fi
    fi
  
+ 

develop/php/php.conf

@@ -78,7 +78,9 @@ if [ "$SDECFG_PKG_PHP_EXTRACONFOPT" ]; then
 	var_append extraconfopt " " "$SDECFG_PKG_PHP_EXTRACONFOPT"
 fi
 
-[ "$SDECFG_PKG_PHP_FPM" == 1 ] && var_append extraconfopt " " "--enable-fpm"
+# Since php 5.4.0 more than one SAPI can be built at one run
+# so there is no reason to not force the FPM SAPI always
+var_append extraconfopt " " "--enable-fpm"
 
 hook_add postmake 5 'cp php.ini-* $root$docdir'
 

develop/php/php.desc

@@ -28,7 +28,7 @@
 
 [L] OpenSource
 [S] Stable
-[V] 5.3.10
+[V] 5.4.0
 [P] X -?---5---9 178.100
 
-[D] 2207389800 php-5.3.10.tar.bz2 http://www.php.net/distributions/
+[D] 2099847510 php-5.4.0.tar.bz2 http://www.php.net/distributions/