Merge branch '2.4' into 2.5

mod_php/.md5sum

@@ -1 +1 @@
-7380ffecebd95c6edb317ef861229ebd  php-5.2.6.tar.bz2
+9ffc42edbb7faad965699666ddd559bc  php-5.2.7.tar.bz2

mod_php/Pkgfile

@@ -1,11 +1,11 @@
 # Description: PHP DSO module for apache 
 # URL:         http://www.php.net
 # Maintainer:  Juergen Daubert, juergen dot daubert at t-online dot de
-# Depends on:  apache libxml2
+# Depends on:  apache zlib libxml2
 
 name=mod_php
-version=5.2.6
-release=2
+version=5.2.7
+release=1
 source=(http://www.php.net/distributions/php-$version.tar.bz2)
 
 build () {

php-fcgi/.md5sum

@@ -1,2 +1,2 @@
-7380ffecebd95c6edb317ef861229ebd  php-5.2.6.tar.bz2
+9ffc42edbb7faad965699666ddd559bc  php-5.2.7.tar.bz2
 000e63b28460601ad0029c0e5b86acfe  php-fcgi

php-fcgi/Pkgfile

@@ -1,11 +1,11 @@
 # Description: CGI/FastCGI version of the PHP interpreter
 # URL:         http://www.php.net
 # Maintainer:  Juergen Daubert, juergen dot daubert at t-online dot de
-# Depends on:  libxml2
+# Depends on:  zlib libxml2
 
 name=php-fcgi
-version=5.2.6
-release=2
+version=5.2.7
+release=1
 source=(http://www.php.net/distributions/php-$version.tar.bz2 
         php-fcgi)
 

php-mysql/.md5sum

@@ -1 +1 @@
-7380ffecebd95c6edb317ef861229ebd  php-5.2.6.tar.bz2
+9ffc42edbb7faad965699666ddd559bc  php-5.2.7.tar.bz2

php-mysql/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  mysql zlib
 
 name=php-mysql
-version=5.2.6
+version=5.2.7
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.bz2)
 

php/.footprint

@@ -102,6 +102,7 @@ drwxr-xr-x	root/root	usr/include/php/ext/hash/
 drwxr-xr-x	root/root	usr/include/php/ext/iconv/
 -rw-r--r--	root/root	usr/include/php/ext/iconv/php_have_bsd_iconv.h
 -rw-r--r--	root/root	usr/include/php/ext/iconv/php_have_glibc_iconv.h
+-rw-r--r--	root/root	usr/include/php/ext/iconv/php_have_ibm_iconv.h
 -rw-r--r--	root/root	usr/include/php/ext/iconv/php_have_iconv.h
 -rw-r--r--	root/root	usr/include/php/ext/iconv/php_have_libiconv.h
 -rw-r--r--	root/root	usr/include/php/ext/iconv/php_iconv.h
@@ -117,7 +118,6 @@ drwxr-xr-x	root/root	usr/include/php/ext/pcre/pcrelib/
 -rw-r--r--	root/root	usr/include/php/ext/pcre/pcrelib/pcre_internal.h
 -rw-r--r--	root/root	usr/include/php/ext/pcre/pcrelib/pcreposix.h
 -rw-r--r--	root/root	usr/include/php/ext/pcre/pcrelib/ucp.h
--rw-r--r--	root/root	usr/include/php/ext/pcre/pcrelib/ucpinternal.h
 -rw-r--r--	root/root	usr/include/php/ext/pcre/pcrelib/ucptable.h
 -rw-r--r--	root/root	usr/include/php/ext/pcre/php_pcre.h
 drwxr-xr-x	root/root	usr/include/php/ext/pdo/
@@ -206,11 +206,8 @@ drwxr-xr-x	root/root	usr/include/php/ext/xml/
 -rw-r--r--	root/root	usr/include/php/ext/xml/php_xml.h
 drwxr-xr-x	root/root	usr/include/php/ext/zip/
 drwxr-xr-x	root/root	usr/include/php/ext/zip/lib/
-drwxr-xr-x	root/root	usr/include/php/ext/zip/lib/lib/
 -rw-r--r--	root/root	usr/include/php/ext/zip/lib/zip.h
--rw-r--r--	root/root	usr/include/php/ext/zip/lib/zip_alias.h
 -rw-r--r--	root/root	usr/include/php/ext/zip/lib/zipint.h
--rw-r--r--	root/root	usr/include/php/ext/zip/lib/zipint_alias.h
 drwxr-xr-x	root/root	usr/include/php/include/
 drwxr-xr-x	root/root	usr/include/php/main/
 -rw-r--r--	root/root	usr/include/php/main/SAPI.h

php/.md5sum

@@ -1,2 +1,2 @@
 683de3db60200bc38aa6e154aa925fa6  extensions.ini
-7380ffecebd95c6edb317ef861229ebd  php-5.2.6.tar.bz2
+9ffc42edbb7faad965699666ddd559bc  php-5.2.7.tar.bz2

php/Pkgfile

@@ -1,11 +1,11 @@
 # Description: PHP interpreter, extension modules and support stuff
 # URL:         http://www.php.net
 # Maintainer:  Juergen Daubert, juergen dot daubert at t-online dot de
-# Depends on:  ncurses readline libxml2 bzip2 curl db gdbm zip
+# Depends on:  ncurses readline zlib libxml2 bzip2 curl db gdbm zip
 
 name=php
-version=5.2.6
-release=3
+version=5.2.7
+release=1
 source=(http://www.php.net/distributions/php-$version.tar.bz2 
         extensions.ini)