php update

(Portage version: 2.0.52-r1)

21 files changed, 344 insertions, 50 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 389e7d0b0d29..7d8be42bfb97 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.46 2005/09/17 18:31:09 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.47 2005/09/18 13:21:54 hollow Exp $
+
+*php-5.0.5-r1 (18 Sep 2005)
+*php-5.0.4-r1 (18 Sep 2005)
+*php-4.4.0-r1 (18 Sep 2005)
+*php-4.3.11-r1 (18 Sep 2005)
+
+  18 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/4.4.0/php4-libtool-1.5.patch, +files/5.0.0/php5-libtool-1.5.patch,
+  +files/4.4.0/php4.3.11-pcre-security.patch,
+  +files/4.4.0/php4.4.0-pcre-security.patch,
+  +files/5.0.0/php5.0.4-pcre-security.patch,
+  +files/5.0.0/php5.0.4-xmlrcp-ccode.diff,
+  +files/5.0.0/php5.0.5-obj-serialize.patch, files/4.4.0/fastbuild.patch,
+  -files/5.0.0/php5-hphp-acinclude.patch,
+  -files/4.4.0/php4-hphp-acinclude.patch, -php-4.3.11.ebuild,
+  +php-4.3.11-r1.ebuild, -php-4.4.0.ebuild, +php-4.4.0-r1.ebuild,
+  -php-5.0.4.ebuild, +php-5.0.4-r1.ebuild, -php-5.0.5.ebuild,
+  +php-5.0.5-r1.ebuild:
+  Fix security issue in bundled PCRE lib for PHP 4.3.11, 4.4.0 and 5.0.4, bug #102373.
+  Fix object serialization bug in PHP 5.0.5, bug #105374.
+  Fix Hardened-PHP support for all PHP releases.
+  Various compilation fixes for all PHP releases.
+  Various dependency fixes for all PHP releases.
+  Deleted 'dbm' USE flag from all PHP ebuilds, it's not supported upstream.
+  Changed 'java' USE flag to 'java-internal' USE flag for PHP4.
 
   17 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> php-5.0.4.ebuild:
   Fixed up the remaining deps, tested here and looks good. Marking ~amd64, bug
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 34ee2acf8cad..ab9dcce6ef81 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,37 +1,32 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5cd036f5e99d22f116eb4a6f26924e3f php-4.4.0.ebuild 7353
-MD5 b8d498e1357d68abc8bcc8370592b68d php-5.0.5.ebuild 4299
-MD5 d3c798c1aa53e3d4ad3a26947d06d469 php-4.3.11.ebuild 7342
-MD5 458b0751d4a472ed546c193e6d22b462 ChangeLog 2275
+MD5 a65298219aa4ec75af61d3146cdc5ecd ChangeLog 3458
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 e0b21a5256893082a165f4ba4aa208d7 php-5.0.4.ebuild 4306
-MD5 43c95e9c27a1e40cf1fbb3408fd4a894 files/digest-php-4.4.0 144
-MD5 11e54e6a5fade48c67bab392af4e33c7 files/digest-php-5.0.4 143
-MD5 ef5a57ba8c9e35be8cb39c8ed1bc5235 files/digest-php-5.0.5 143
-MD5 c7b9dd0187054446166a5c9fb1a6b4d5 files/digest-php-4.3.11 146
-MD5 0b33a5e7250bf9ae8c240cd9d4963889 files/4.4.0/php4-hphp-acinclude.patch 618
-MD5 030fb5433c0418ee3034d5b502d32548 files/4.4.0/fastbuild.patch 9004
+MD5 45a393bb434a88865a599600edc692cd php-4.3.11-r1.ebuild 8032
+MD5 f2902a3f3aa665e93d369cc30292e7ce php-4.4.0-r1.ebuild 8043
+MD5 bd06908c37ec0769dd81a5085df82f98 php-5.0.4-r1.ebuild 5108
+MD5 eeb846ba9035984529ace906f490ae4e php-5.0.5-r1.ebuild 4594
+MD5 c404654d25a964dd2c39e36c12e041f3 files/digest-php-4.3.11-r1 223
+MD5 91f80296313ae803b3e43d8573fc30a7 files/digest-php-4.4.0-r1 221
+MD5 5a28614e8d33162ab224e75dcf7ac16b files/digest-php-5.0.4-r1 220
+MD5 93a34eb8acada7af6a38c91fc64aea5a files/digest-php-5.0.5-r1 143
+MD5 f0acca9c6387b8ca139d2849665bd16f files/4.4.0/fastbuild.patch 9012
+MD5 6d2047e069da7178fc841c4c7c890aa8 files/4.4.0/php4-imap-symlink.diff 620
 MD5 22ed61ab0175cd83985a90e5d2b3b8b2 files/4.4.0/php4-iodbc-config.diff 511
 MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/4.4.0/php4-with-iodbc.diff 443
-MD5 6d2047e069da7178fc841c4c7c890aa8 files/4.4.0/php4-imap-symlink.diff 620
-MD5 110af7b300bcbbfb821fbb58f7923d8b files/5.0.0/php5-iodbc-config.diff 511
+MD5 a7036ee38aa3b37256c0a6fe2afdbbe2 files/4.4.0/php4-libtool-1.5.patch 613
+MD5 adcac572e6f94c04e2c9a1c41e2b9551 files/4.4.0/php4.3.11-pcre-security.patch 2273
+MD5 c9d72d2abbccb6796460299ab4c973c3 files/4.4.0/php4.4.0-pcre-security.patch 2346
 MD5 7d198bde60f94cc8cea5ad9479901e21 files/5.0.0/php5-imap-symlink.diff 620
-MD5 fb08e1d8551091bc65872148dd2e46d1 files/5.0.0/php5-hphp-acinclude.patch 618
+MD5 110af7b300bcbbfb821fbb58f7923d8b files/5.0.0/php5-iodbc-config.diff 511
+MD5 7530065b6851a15b1c9d8b0ee5fb0a98 files/5.0.0/php5-libtool-1.5.patch 613
+MD5 ccc7b2c1df3a24af9c8b5211d4b7153d files/5.0.0/php5.0.4-pcre-security.patch 2258
+MD5 e157161249ad2b217dc532f5289ba74b files/5.0.0/php5.0.4-xmlrcp-ccode.diff 750
+MD5 54337f4eb052e6764a3790610eb8bbfc files/5.0.0/php5.0.5-obj-serialize.patch 1377
+MD5 2aca8867fada1d3345859f201ce7e428 files/5.1.0/php5-imap-symlink.diff 652
 MD5 63c7937867dd8cc04b5089c3678ef359 files/5.1.0/php5-iodbc-config.diff 519
-MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/5.1.0/php5-with-iodbc.diff 443
 MD5 058042718bc876bf27ab902673919ca9 files/5.1.0/php5-prefork.patch 850
-MD5 2aca8867fada1d3345859f201ce7e428 files/5.1.0/php5-imap-symlink.diff 652
+MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/5.1.0/php5-with-iodbc.diff 443
 MD5 273799e60d5a41a1e6f5ac53781a152f files/5.1.0/php5_soap_persistence_session.diff 1976
 MD5 389638f1d46b6c41cd4d87b471572f4b files/4.4.0/apache-1.3/70_mod_php.conf 484
 MD5 ee36e31632adb08b7abf70f78b5b2125 files/4.4.0/apache-2.0/70_mod_php.conf 485
 MD5 96ed6efe383833dbb880fef3b6c562bb files/5.1.0/apache-1.3/70_mod_php5.conf 524
 MD5 21bc6cc85150b5a5385f213d45efbe67 files/5.1.0/apache-2.0/70_mod_php5.conf 525
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDLGEKntT9W3vfTuoRAg5kAJ9VEbNOQqxTMV6xRT6Q7V7iD6Bs3QCfYYrP
-tVNxyFEBhl7oS/BTn4a+YYc=
-=Ceq6
------END PGP SIGNATURE-----
diff --git a/dev-lang/php/files/4.4.0/fastbuild.patch b/dev-lang/php/files/4.4.0/fastbuild.patch
index 0af555e9bcb6..47f0dc77a38d 100644
--- a/dev-lang/php/files/4.4.0/fastbuild.patch
+++ b/dev-lang/php/files/4.4.0/fastbuild.patch
@@ -1,6 +1,6 @@
-diff -u --recursive php-4.4.0/aclocal.m4 php-4.4.0-cgi/aclocal.m4
---- php-4.4.0/aclocal.m4	2005-07-11 11:07:27.000000000 +0100
-+++ php-4.4.0-cgi/aclocal.m4	2005-09-01 08:03:20.000000000 +0100
+diff -u --recursive php-4.4.0/acinclude.m4 php-4.4.0-cgi/acinclude.m4
+--- php-4.4.0/acinclude.m4	2005-09-14 22:39:22.000000000 +0200
++++ php-4.4.0-cgi/acinclude.m4	2005-09-14 22:39:54.000000000 +0200
 @@ -84,7 +84,7 @@
  dnl
  dnl which array to append to?
diff --git a/dev-lang/php/files/4.4.0/php4-hphp-acinclude.patch b/dev-lang/php/files/4.4.0/php4-libtool-1.5.patch
index 68a6bfe20420..076120384b4a 100644
--- a/dev-lang/php/files/4.4.0/php4-hphp-acinclude.patch
+++ b/dev-lang/php/files/4.4.0/php4-libtool-1.5.patch
@@ -1,4 +1,4 @@
---- acinclude.m4.orig	2005-09-08 13:16:38.000000000 +0200
+--- acinclude.m4	2005-09-08 13:16:38.000000000 +0200
 +++ acinclude.m4	2005-09-08 13:21:09.000000000 +0200
 @@ -783,12 +783,12 @@
  dnl
diff --git a/dev-lang/php/files/4.4.0/php4.3.11-pcre-security.patch b/dev-lang/php/files/4.4.0/php4.3.11-pcre-security.patch
new file mode 100644
index 000000000000..284825b6a1a6
--- /dev/null
+++ b/dev-lang/php/files/4.4.0/php4.3.11-pcre-security.patch
@@ -0,0 +1,38 @@
+--- configure.in	2005-09-17 21:00:43.000000000 +0200
++++ configure.in	2005-09-17 21:00:18.000000000 +0200
+@@ -41,7 +41,7 @@
+ MAJOR_VERSION=4
+ MINOR_VERSION=3
+ RELEASE_VERSION=11
+-EXTRA_VERSION=""
++EXTRA_VERSION="-gentoo-r1"
+ VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
+ 
+ dnl Define where extension directories are located in the configure context
+--- ext/pcre/config.m4	2003/12/16 22:14:55	1.29.2.5
++++ ext/pcre/config.m4	2005/08/09 17:41:56	1.29.2.7.2.1
+@@ -1,5 +1,5 @@
+ dnl
+-dnl $Id: php4.3.11-pcre-security.patch,v 1.1 2005/09/18 13:21:54 hollow Exp $
++dnl $Id: php4.3.11-pcre-security.patch,v 1.1 2005/09/18 13:21:54 hollow Exp $
+ dnl
+
+ dnl By default we'll compile and link against the bundled PCRE library
+@@ -13,7 +13,7 @@ PHP_ARG_WITH(pcre-regex,for PCRE support
+
+ if test "$PHP_PCRE_REGEX" != "no"; then
+   if test "$PHP_PCRE_REGEX" = "yes"; then
+-    PHP_NEW_EXTENSION(pcre, pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -I@ext_srcdir@/pcrelib)
++    PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib)
+     PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
+     AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
+   else
+@@ -50,7 +50,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then
+
+     AC_DEFINE(HAVE_PCRE, 1, [ ])
+     PHP_ADD_INCLUDE($PCRE_INCDIR)
+-    PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10)
++    PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000)
+   fi
+   PHP_SUBST(PCRE_SHARED_LIBADD)
+ fi
diff --git a/dev-lang/php/files/4.4.0/php4.4.0-pcre-security.patch b/dev-lang/php/files/4.4.0/php4.4.0-pcre-security.patch
new file mode 100644
index 000000000000..cf257def502a
--- /dev/null
+++ b/dev-lang/php/files/4.4.0/php4.4.0-pcre-security.patch
@@ -0,0 +1,38 @@
+--- configure.in	2005-09-17 17:44:30.000000000 +0200
++++ configure.in	2005-09-17 17:45:01.000000000 +0200
+@@ -41,7 +41,7 @@
+ MAJOR_VERSION=4
+ MINOR_VERSION=4
+ RELEASE_VERSION=0
+-EXTRA_VERSION=""
++EXTRA_VERSION="-gentoo-r1"
+ VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
+ 
+ dnl Define where extension directories are located in the configure context
+--- ext/pcre/config.m4	2005/05/31 12:22:27	1.29.2.7
++++ ext/pcre/config.m4	2005/08/09 17:41:56	1.29.2.7.2.1
+@@ -1,5 +1,5 @@
+ dnl
+-dnl $Id: config.m4,v 1.29.2.7 2005/05/31 12:22:27 sniper Exp $
++dnl $Id: config.m4,v 1.29.2.7.2.1 2005/08/09 17:41:56 andrei Exp $
+ dnl
+
+ dnl By default we'll compile and link against the bundled PCRE library
+@@ -13,7 +13,7 @@ PHP_ARG_WITH(pcre-regex,for PCRE support
+
+ if test "$PHP_PCRE_REGEX" != "no"; then
+   if test "$PHP_PCRE_REGEX" = "yes"; then
+-    PHP_NEW_EXTENSION(pcre, pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib)
++    PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib)
+     PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
+     AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
+   else
+@@ -50,7 +50,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then
+
+     AC_DEFINE(HAVE_PCRE, 1, [ ])
+     PHP_ADD_INCLUDE($PCRE_INCDIR)
+-    PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000)
++    PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000)
+   fi
+   PHP_SUBST(PCRE_SHARED_LIBADD)
+ fi
diff --git a/dev-lang/php/files/5.0.0/php5-hphp-acinclude.patch b/dev-lang/php/files/5.0.0/php5-libtool-1.5.patch
index c5f1e711725e..7404992272e1 100644
--- a/dev-lang/php/files/5.0.0/php5-hphp-acinclude.patch
+++ b/dev-lang/php/files/5.0.0/php5-libtool-1.5.patch
@@ -1,4 +1,4 @@
---- acinclude.m4.orig	2005-09-08 13:27:42.000000000 +0200
+--- acinclude.m4	2005-09-08 13:27:42.000000000 +0200
 +++ acinclude.m4	2005-09-08 13:28:28.000000000 +0200
 @@ -779,12 +779,12 @@
  dnl
diff --git a/dev-lang/php/files/5.0.0/php5.0.4-pcre-security.patch b/dev-lang/php/files/5.0.0/php5.0.4-pcre-security.patch
new file mode 100644
index 000000000000..548732dc9783
--- /dev/null
+++ b/dev-lang/php/files/5.0.0/php5.0.4-pcre-security.patch
@@ -0,0 +1,38 @@
+--- configure.in	2005-09-17 21:42:36.000000000 +0200
++++ configure.in	2005-09-17 21:42:51.000000000 +0200
+@@ -41,7 +41,7 @@
+ MAJOR_VERSION=5
+ MINOR_VERSION=0
+ RELEASE_VERSION=4
+-EXTRA_VERSION=""
++EXTRA_VERSION="-gentoo-r1"
+ VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
+ 
+ dnl Define where extension directories are located in the configure context
+--- ext/pcre/config.m4	2003/06/28 04:30:51	1.32
++++ ext/pcre/config.m4	2005/08/22 16:55:56	1.32.2.2
+@@ -1,5 +1,5 @@
+ dnl
+-dnl $Id: php5.0.4-pcre-security.patch,v 1.1 2005/09/18 13:21:54 hollow Exp $
++dnl $Id: php5.0.4-pcre-security.patch,v 1.1 2005/09/18 13:21:54 hollow Exp $
+ dnl
+
+ dnl By default we'll compile and link against the bundled PCRE library
+@@ -13,7 +13,7 @@ PHP_ARG_WITH(pcre-regex,for PCRE support
+
+ if test "$PHP_PCRE_REGEX" != "no"; then
+   if test "$PHP_PCRE_REGEX" = "yes"; then
+-    PHP_NEW_EXTENSION(pcre, pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -I@ext_srcdir@/pcrelib)
++    PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib)
+     PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
+     AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
+   else
+@@ -50,7 +50,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then
+
+     AC_DEFINE(HAVE_PCRE, 1, [ ])
+     PHP_ADD_INCLUDE($PCRE_INCDIR)
+-    PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10)
++    PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000)
+   fi
+   PHP_SUBST(PCRE_SHARED_LIBADD)
+ fi
diff --git a/dev-lang/php/files/5.0.0/php5.0.4-xmlrcp-ccode.diff b/dev-lang/php/files/5.0.0/php5.0.4-xmlrcp-ccode.diff
new file mode 100644
index 000000000000..15e5950d820f
--- /dev/null
+++ b/dev-lang/php/files/5.0.0/php5.0.4-xmlrcp-ccode.diff
@@ -0,0 +1,23 @@
+--- ext/xmlrpc/libxmlrpc/xml_element.c	2004-06-01 22:16:06.000000000 +0200
++++ ext/xmlrpc/libxmlrpc/xml_element.c	2005-04-22 13:54:17.000000000 +0200
+@@ -113,7 +116,7 @@
+ #include "expat.h"
+ #include "encodings.h"
+ 
+-#define my_free(thing)  if(thing) {free(thing); thing = 0;}
++#define my_free(thing)  if(thing) {free(thing); thing = NULL;}
+ 
+ #define XML_DECL_START                 "<?xml"
+ #define XML_DECL_START_LEN             sizeof(XML_DECL_START) - 1
+@@ -189,7 +192,10 @@
+ 
+       Q_Destroy(&root->children);
+       Q_Destroy(&root->attrs);
+-      my_free((char*)root->name);
++      if(root->name) {
++          free((char *)root->name);
++          root->name = NULL;
++      }
+       simplestring_free(&root->text);
+       my_free(root);
+    }
diff --git a/dev-lang/php/files/5.0.0/php5.0.5-obj-serialize.patch b/dev-lang/php/files/5.0.0/php5.0.5-obj-serialize.patch
new file mode 100644
index 000000000000..ed1ad2a25230
--- /dev/null
+++ b/dev-lang/php/files/5.0.0/php5.0.5-obj-serialize.patch
@@ -0,0 +1,42 @@
+--- ext/standard/incomplete_class.c	2004-11-25 20:28:37.000000000 +0000
++++ ext/standard/incomplete_class.c	2005-09-09 13:00:39.000000000 +0100
+@@ -122,7 +122,7 @@
+ 
+ /* {{{ php_lookup_class_name
+  */
+-char *php_lookup_class_name(zval *object, size_t *nlen)
++char *php_lookup_class_name(zval *object, zend_uint *nlen)
+ {
+ 	zval **val;
+ 	char *retval = NULL;
+@@ -144,7 +144,7 @@
+ 
+ /* {{{ php_store_class_name
+  */
+-void php_store_class_name(zval *object, const char *name, size_t len)
++void php_store_class_name(zval *object, const char *name, zend_uint len)
+ {
+ 	zval *val;
+ 	TSRMLS_FETCH();
+--- ./ext/standard/php_incomplete_class.h.bug34435	2005-06-29 10:29:08.000000000 +0100
++++ ./ext/standard/php_incomplete_class.h	2005-09-09 13:00:31.000000000 +0100
+@@ -42,7 +42,7 @@
+ 
+ #define PHP_CLASS_ATTRIBUTES											\
+ 	char *class_name;													\
+-	size_t name_len;													\
++	zend_uint name_len;													\
+ 	zend_bool free_class_name = 0;										\
+ 	zend_bool incomplete_class = 0
+ 
+@@ -55,8 +55,8 @@
+ 	
+ zend_class_entry *php_create_incomplete_class(TSRMLS_D);
+ 
+-char *php_lookup_class_name(zval *object, size_t *nlen);
+-void  php_store_class_name(zval *object, const char *name, size_t len);
++char *php_lookup_class_name(zval *object, zend_uint *nlen);
++void  php_store_class_name(zval *object, const char *name, zend_uint len);
+ 
+ #ifdef __cplusplus
+ };
diff --git a/dev-lang/php/files/digest-php-4.3.11 b/dev-lang/php/files/digest-php-4.3.11
deleted file mode 100644
index 137f89aa7bca..000000000000
--- a/dev-lang/php/files/digest-php-4.3.11
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575
-MD5 bff79f1e088f09337e1a7df03a62ac2f hardening-patch-4.3.11-0.4.2.patch.gz 101840
diff --git a/dev-lang/php/files/digest-php-4.3.11-r1 b/dev-lang/php/files/digest-php-4.3.11-r1
new file mode 100644
index 000000000000..8eda7cdd6588
--- /dev/null
+++ b/dev-lang/php/files/digest-php-4.3.11-r1
@@ -0,0 +1,3 @@
+MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575
+MD5 00c2176c90b085ba76871524392f7d03 hardening-patch-4.3.11-0.4.3.patch.gz 105574
+MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619
diff --git a/dev-lang/php/files/digest-php-4.4.0 b/dev-lang/php/files/digest-php-4.4.0
deleted file mode 100644
index 54b1e9f17e43..000000000000
--- a/dev-lang/php/files/digest-php-4.4.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074
-MD5 59978eb7252e9f0a0ee73cbbc2de217d hardening-patch-4.4.0-0.4.2.patch.gz 103923
diff --git a/dev-lang/php/files/digest-php-4.4.0-r1 b/dev-lang/php/files/digest-php-4.4.0-r1
new file mode 100644
index 000000000000..dd3eed8b1d00
--- /dev/null
+++ b/dev-lang/php/files/digest-php-4.4.0-r1
@@ -0,0 +1,3 @@
+MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074
+MD5 6eac3c5c5a7473c68a043c7657298f48 hardening-patch-4.4.0-0.4.3.patch.gz 104840
+MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619
diff --git a/dev-lang/php/files/digest-php-5.0.4 b/dev-lang/php/files/digest-php-5.0.4-r1
index 7f7e8495ddda..a2bcd3e685a9 100644
--- a/dev-lang/php/files/digest-php-5.0.4
+++ b/dev-lang/php/files/digest-php-5.0.4-r1
@@ -1,2 +1,3 @@
 MD5 fb1aac107870f897d26563a9cc5053c0 php-5.0.4.tar.bz2 4731383
 MD5 361cc41c54174e098169d38ce6510c36 hardening-patch-5.0.4-0.4.1.patch.gz 81342
+MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619
diff --git a/dev-lang/php/files/digest-php-5.0.5 b/dev-lang/php/files/digest-php-5.0.5
deleted file mode 100644
index 6c87f9274677..000000000000
--- a/dev-lang/php/files/digest-php-5.0.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b5d4ca75bbb11ee5b830fa67213d9f7f php-5.0.5.tar.bz2 4895556
-MD5 afdd90224b70999aab7698d35242396e hardening-patch-5.0.5-0.4.2.patch.gz 49662
diff --git a/dev-lang/php/files/digest-php-5.0.5-r1 b/dev-lang/php/files/digest-php-5.0.5-r1
new file mode 100644
index 000000000000..c7aa92f99282
--- /dev/null
+++ b/dev-lang/php/files/digest-php-5.0.5-r1
@@ -0,0 +1,2 @@
+MD5 b5d4ca75bbb11ee5b830fa67213d9f7f php-5.0.5.tar.bz2 4895556
+MD5 6af27b59251bb9ce4741b17e2e5358f7 hardening-patch-5.0.5-0.4.3.patch.gz 51173
diff --git a/dev-lang/php/php-4.3.11.ebuild b/dev-lang/php/php-4.3.11-r1.ebuild
index 19fcf1228bcb..4025a8d29819 100644
--- a/dev-lang/php/php-4.3.11.ebuild
+++ b/dev-lang/php/php-4.3.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11.ebuild,v 1.1 2005/09/11 18:57:09 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11-r1.ebuild,v 1.1 2005/09/18 13:21:54 hollow Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~sparc ~x86"
@@ -13,10 +13,9 @@ KEYWORDS="~sparc ~x86"
 
 PROVIDE="virtual/php virtual/httpd-php"
 
+# php package settings
 SLOT="4"
-PHPSAPI_ALLOWED="cli cgi apache apache2"
 MY_PHP_P="php-${PV}"
-PHP_S="${WORKDIR}/${MY_PHP_P}"
 PHP_PACKAGE=1
 
 inherit eutils php4_4-sapi apache-module
@@ -28,6 +27,9 @@ DESCRIPTION="The PHP language runtime engine"
 DEPEND="${DEPEND} app-admin/eselect-php"
 RDEPEND="${RDEPEND} app-admin/eselect-php"
 
+# fixed PCRE library for security issues, bug #102373
+SRC_URI="${SRC_URI} http://dl.longitekk.com/php-pcrelib-new-secpatch.tar.bz2"
+
 pkg_setup() {
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
@@ -68,6 +70,28 @@ pkg_setup() {
 	php4_4-sapi_pkg_setup
 }
 
+src_unpack() {
+	# custom src_unpack, used only for PHP ebuilds that need additional patches
+	# normally the eclass src_unpack is used
+	if [ "${PHP_PACKAGE}" == 1 ] ; then
+		unpack ${A}
+	fi
+
+	cd ${S}
+
+	# patch to fix PCRE library security issues, bug #102373
+	epatch ${FILESDIR}/4.4.0/php4.3.11-pcre-security.patch
+
+	# sobstitute the bundled PCRE library with a fixed version for bug #102373
+	einfo "Updating bundled PCRE library"
+	rm -rf ${S}/ext/pcre/pcrelib && mv -f ${WORKDIR}/pcrelib-new ${S}/ext/pcre/pcrelib || die "Unable to update the bundled PCRE library"
+
+	# we call the eclass src_unpack, but don't want ${A} to be unpacked again
+	PHP_PACKAGE=0
+	php4_4-sapi_src_unpack
+	PHP_PACKAGE=1
+}
+
 php_determine_sapis() {
 
 	# holds the list of sapis that we want to build
diff --git a/dev-lang/php/php-4.4.0.ebuild b/dev-lang/php/php-4.4.0-r1.ebuild
index 9ecd03366739..54ef4805588d 100644
--- a/dev-lang/php/php-4.4.0.ebuild
+++ b/dev-lang/php/php-4.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.0.ebuild,v 1.10 2005/09/17 17:45:04 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.0-r1.ebuild,v 1.1 2005/09/18 13:21:54 hollow Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -13,10 +13,9 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 PROVIDE="virtual/php virtual/httpd-php"
 
+# php package settings
 SLOT="4"
-PHPSAPI_ALLOWED="cli cgi apache apache2"
 MY_PHP_P="php-${PV}"
-PHP_S="${WORKDIR}/${MY_PHP_P}"
 PHP_PACKAGE=1
 
 inherit eutils php4_4-sapi apache-module
@@ -28,6 +27,9 @@ DESCRIPTION="The PHP language runtime engine"
 DEPEND="${DEPEND} app-admin/eselect-php"
 RDEPEND="${RDEPEND} app-admin/eselect-php"
 
+# fixed PCRE library for security issues, bug #102373
+SRC_URI="${SRC_URI} http://dl.longitekk.com/php-pcrelib-new-secpatch.tar.bz2"
+
 pkg_setup() {
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
@@ -68,6 +70,28 @@ pkg_setup() {
 	php4_4-sapi_pkg_setup
 }
 
+src_unpack() {
+	# custom src_unpack, used only for PHP ebuilds that need additional patches
+	# normally the eclass src_unpack is used
+	if [ "${PHP_PACKAGE}" == 1 ] ; then
+		unpack ${A}
+	fi
+
+	cd ${S}
+
+	# patch to fix PCRE library security issues, bug #102373
+	epatch ${FILESDIR}/4.4.0/php4.4.0-pcre-security.patch
+
+	# sobstitute the bundled PCRE library with a fixed version for bug #102373
+	einfo "Updating bundled PCRE library"
+	rm -rf ${S}/ext/pcre/pcrelib && mv -f ${WORKDIR}/pcrelib-new ${S}/ext/pcre/pcrelib || die "Unable to update the bundled PCRE library"
+
+	# we call the eclass src_unpack, but don't want ${A} to be unpacked again
+	PHP_PACKAGE=0
+	php4_4-sapi_src_unpack
+	PHP_PACKAGE=1
+}
+
 php_determine_sapis() {
 
 	# holds the list of sapis that we want to build
diff --git a/dev-lang/php/php-5.0.4.ebuild b/dev-lang/php/php-5.0.4-r1.ebuild
index 0b3efc257d23..2e89faffd553 100644
--- a/dev-lang/php/php-5.0.4.ebuild
+++ b/dev-lang/php/php-5.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.4.ebuild,v 1.11 2005/09/17 18:31:09 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.4-r1.ebuild,v 1.1 2005/09/18 13:21:54 hollow Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -13,10 +13,9 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 PROVIDE="virtual/php virtual/httpd-php"
 
+# php package settings
 SLOT="5"
-PHPSAPI_ALLOWED="cli cgi apache apache2"
 MY_PHP_P="php-${PV}"
-PHP_S="${WORKDIR}/${MY_PHP_P}"
 PHP_PACKAGE=1
 
 inherit eutils php5_0-sapi apache-module
@@ -28,6 +27,9 @@ DESCRIPTION="The PHP language runtime engine"
 DEPEND="${DEPEND} app-admin/eselect-php"
 RDEPEND="${RDEPEND} app-admin/eselect-php"
 
+# fixed PCRE library for security issues, bug #102373
+SRC_URI="${SRC_URI} http://dl.longitekk.com/php-pcrelib-new-secpatch.tar.bz2"
+
 pkg_setup() {
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
@@ -57,6 +59,31 @@ pkg_setup() {
 	php5_0-sapi_pkg_setup
 }
 
+src_unpack() {
+	# custom src_unpack, used only for PHP ebuilds that need additional patches
+	# normally the eclass src_unpack is used
+	if [ "${PHP_PACKAGE}" == 1 ] ; then
+		unpack ${A}
+	fi
+
+	cd ${S}
+
+	# fix a GCC4 compile bug in XMLRPC extension, bug #96813
+	epatch ${FILESDIR}/5.0.0/php5.0.4-xmlrcp-ccode.diff
+
+	# patch to fix PCRE library security issues, bug #102373
+	epatch ${FILESDIR}/5.0.0/php5.0.4-pcre-security.patch
+
+	# sobstitute the bundled PCRE library with a fixed version for bug #102373
+	einfo "Updating bundled PCRE library"
+	rm -rf ${S}/ext/pcre/pcrelib && mv -f ${WORKDIR}/pcrelib-new ${S}/ext/pcre/pcrelib || die "Unable to update the bundled PCRE library"
+
+	# we call the eclass src_unpack, but don't want ${A} to be unpacked again
+	PHP_PACKAGE=0
+	php5_0-sapi_src_unpack
+	PHP_PACKAGE=1
+}
+
 php_determine_sapis() {
 
 	# holds the list of sapis that we want to build
diff --git a/dev-lang/php/php-5.0.5.ebuild b/dev-lang/php/php-5.0.5-r1.ebuild
index cb36543b9b16..b2079644e3a6 100644
--- a/dev-lang/php/php-5.0.5.ebuild
+++ b/dev-lang/php/php-5.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5.ebuild,v 1.6 2005/09/14 15:37:22 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5-r1.ebuild,v 1.1 2005/09/18 13:21:54 hollow Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -13,10 +13,9 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 PROVIDE="virtual/php virtual/httpd-php"
 
+# php package settings
 SLOT="5"
-PHPSAPI_ALLOWED="cli cgi apache apache2"
 MY_PHP_P="php-${PV}"
-PHP_S="${WORKDIR}/${MY_PHP_P}"
 PHP_PACKAGE=1
 
 inherit eutils php5_0-sapi apache-module
@@ -57,6 +56,24 @@ pkg_setup() {
 	php5_0-sapi_pkg_setup
 }
 
+src_unpack() {
+	# custom src_unpack, used only for PHP ebuilds that need additional patches
+	# normally the eclass src_unpack is used
+	if [ "${PHP_PACKAGE}" == 1 ] ; then
+		unpack ${A}
+	fi
+
+	cd ${S}
+
+	# fix a object serialization bug, bug #105374
+	epatch ${FILESDIR}/5.0.0/php5.0.5-obj-serialize.patch
+
+	# we call the eclass src_unpack, but don't want ${A} to be unpacked again
+	PHP_PACKAGE=0
+	php5_0-sapi_src_unpack
+	PHP_PACKAGE=1
+}
+
 php_determine_sapis() {
 
 	# holds the list of sapis that we want to build