Daniel Jahre:

updated php5 to version 5.2.1
	this is a SECURITY update

[2007020918103025997] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8225 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

package/alessandro/php/php.desc

@@ -44,9 +44,9 @@
 #endif
 
 #if xpkg == php5
-[V] 5.2.0
+[V] 5.2.1
 [O] pear_version=2006-05-17
-[D] 3372399683 php-5.2.0.tar.bz2 http://static.php.net/www.php.net/distributions/
+[D] 1591726929 php-5.2.1.tar.bz2 http://static.php.net/www.php.net/distributions/
 [D] 3500472770 install-pear-nozlib-2006-05-17.phar !http://pear.php.net/install-pear-nozlib.phar
 #endif
 

package/alessandro/php/php5/do-not-touch-httpd-conf.patch

@@ -1,43 +1,15 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/alessandro/php/php5/do-not-touch-httpd-conf.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- php-5.0.5/configure.orig	2005-09-13 22:02:51.000000000 +0200
-+++ php-5.0.5/configure	2005-09-13 22:00:52.000000000 +0200
-@@ -3672,7 +3672,7 @@
-                       \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
-                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                              -S SYSCONFDIR='$APXS_SYSCONFDIR' \
--                             -i -a -n php5 $SAPI_SHARED"
-+                             -i -n php5 $SAPI_SHARED"
-     fi
-   fi
- 
-@@ -4776,7 +4776,7 @@
-                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
--                       -i -a -n php5"
-+                       -i -n php5"
-   fi
+--- ./configure.vanilla	2007-02-09 16:45:22.000000000 +0100
++++ ./configure	2007-02-09 16:46:27.000000000 +0100
+@@ -4582,7 +4582,7 @@
+   $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
  
-   case $host_alias in
-@@ -5606,7 +5606,7 @@
+   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 
+     APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+     if test -z `$APXS -q SYSCONFDIR`; then
+@@ -6529,7 +6529,7 @@
                  \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                         -S SYSCONFDIR='$APXS_SYSCONFDIR' \
@@ -46,12 +18,12 @@
    fi
  
    case $host_alias in
-@@ -6618,7 +6618,7 @@
-                       \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
-                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                              -S SYSCONFDIR='$APXS_SYSCONFDIR' \
--                             -i -a -n php5 $SAPI_SHARED"
-+                             -i -n php5 $SAPI_SHARED"
-     fi
-   fi
+@@ -7528,7 +7528,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 
+     APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+     if test -z `$APXS -q SYSCONFDIR`; then