security fixes + apache/php stabilization x86

(Portage version: 2.0.52-r1)

12 files changed, 432 insertions, 10 deletions

diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 874e69f2aa4a..bfe44e86cefe 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.188 2005/09/04 17:28:45 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.189 2005/09/18 20:56:51 hollow Exp $
+
+*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/php4.3.11-imap-symlink.diff, +files/php4.4.0-imap-symlink.diff,
+  +files/php4.3.11-pcre-security.patch, +files/php4.4.0-pcre-security.patch,
+  +php-4.3.11-r1.ebuild, +php-4.4.0-r1.ebuild:
+  Fix security issue in PHP 4.3.11 and 4.4.0, bug #102373, Fix sandbox issue
+  in PHP 4.3.11 and 4.4.0, bug #105351
 
   04 Sep 2005; Stuart Herbert <stuart@gentoo.org> -php-5.0.4-r1.ebuild,
   -php-5.1.0_beta-r2.ebuild:
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 4c081a352109..3a3c14d0203e 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,11 +1,19 @@
-MD5 ac227180d232cc83a28d006bfd4835c5 ChangeLog 25440
+MD5 75fbd9b5aa16fcc43ff14227343c8d4d ChangeLog 25862
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 1832b7dad433181a1ea82028e176f098 php-4.4.0.ebuild 1080
 MD5 eaa1a899f214a9ad1a095e9f6a4f5fc5 php-4.3.11.ebuild 1214
-MD5 f25bbe20f37a0eb83f7a57ca2c3a25e3 files/digest-php-4.4.0 211
-MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
+MD5 1832b7dad433181a1ea82028e176f098 php-4.4.0.ebuild 1080
+MD5 a849d85e2acd40dadc159517c295d079 php-4.3.11-r1.ebuild 1860
+MD5 8d6892eb3d51a446bc45424b8878f76e php-4.4.0-r1.ebuild 1727
 MD5 522f94bfc40f65c2263785f960035875 files/libmbfl-headers.patch 309
-MD5 289778209b2df87dbc5052351e604b1a files/digest-php-4.3.11 213
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
+MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
 MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
 MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
+MD5 c0d80a45c967897cb3adf43da13552ca files/php4.3.11-pcre-security.patch 6261
+MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
+MD5 0e81c02fe48c1bfa9846f9cfbf70a220 files/php4.4.0-pcre-security.patch 6407
+MD5 d1536bfe7ebf7dab5076fcd56b03250a files/digest-php-4.3.11-r1 290
+MD5 c3936dcc33eacdde589f42f0f28e4bd6 files/digest-php-4.3.11 213
+MD5 58cd61c7ae093d9e2b847d68e76b88a2 files/digest-php-4.4.0-r1 288
+MD5 b3403a09e5d5fa394900b99ca6f63335 files/digest-php-4.4.0 211
diff --git a/dev-php/php/files/digest-php-4.3.11 b/dev-php/php/files/digest-php-4.3.11
index afa221c26709..ee98e2095709 100644
--- a/dev-php/php/files/digest-php-4.3.11
+++ b/dev-php/php/files/digest-php-4.3.11
@@ -1,3 +1,3 @@
-MD5 611cdddabfd71ffb724c428be33c14cb hardening-patch-4.3.11-0.3.2.patch.gz 80613
 MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575
 MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
+MD5 611cdddabfd71ffb724c428be33c14cb hardening-patch-4.3.11-0.3.2.patch.gz 80613
diff --git a/dev-php/php/files/digest-php-4.3.11-r1 b/dev-php/php/files/digest-php-4.3.11-r1
new file mode 100644
index 000000000000..5bff16fceb06
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.11-r1
@@ -0,0 +1,4 @@
+MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
+MD5 611cdddabfd71ffb724c428be33c14cb hardening-patch-4.3.11-0.3.2.patch.gz 80613
+MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619
diff --git a/dev-php/php/files/digest-php-4.4.0 b/dev-php/php/files/digest-php-4.4.0
index 413538df8e6b..70d0e03a076c 100644
--- a/dev-php/php/files/digest-php-4.4.0
+++ b/dev-php/php/files/digest-php-4.4.0
@@ -1,3 +1,3 @@
-MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
 MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
+MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347
diff --git a/dev-php/php/files/digest-php-4.4.0-r1 b/dev-php/php/files/digest-php-4.4.0-r1
new file mode 100644
index 000000000000..1471bf09112b
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.4.0-r1
@@ -0,0 +1,4 @@
+MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
+MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347
+MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619
diff --git a/dev-php/php/files/php4.3.11-imap-symlink.diff b/dev-php/php/files/php4.3.11-imap-symlink.diff
new file mode 100644
index 000000000000..8e80f433be44
--- /dev/null
+++ b/dev-php/php/files/php4.3.11-imap-symlink.diff
@@ -0,0 +1,30 @@
+--- configure	2005-09-18 02:13:48.000000000 +0200
++++ configure	2005-09-18 16:45:07.000000000 +0200
+@@ -42421,12 +42421,6 @@
+       { echo "configure: error: Cannot find rfc822.h. Please check your c-client installation." 1>&2; exit 1; }
+     fi
+ 
+-    if test -r "$IMAP_DIR/c-client/c-client.a"; then
+-      ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
+-    elif test -r "$IMAP_DIR/lib/c-client.a"; then
+-      ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1
+-    fi
+-
+     for lib in c-client4 c-client imap; do
+       IMAP_LIB=$lib
+       
+--- ext/imap/config.m4	2005-09-04 02:48:47.000000000 +0200
++++ ext/imap/config.m4	2005-09-04 02:49:05.000000000 +0200
+@@ -158,12 +158,6 @@
+       AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
+     fi
+ 
+-    if test -r "$IMAP_DIR/c-client/c-client.a"; then
+-      ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
+-    elif test -r "$IMAP_DIR/lib/c-client.a"; then
+-      ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1
+-    fi
+-
+     for lib in c-client4 c-client imap; do
+       IMAP_LIB=$lib
+       IMAP_LIB_CHK(lib)
diff --git a/dev-php/php/files/php4.3.11-pcre-security.patch b/dev-php/php/files/php4.3.11-pcre-security.patch
new file mode 100644
index 000000000000..04fcfde62426
--- /dev/null
+++ b/dev-php/php/files/php4.3.11-pcre-security.patch
@@ -0,0 +1,103 @@
+--- configure	2005-09-18 02:13:48.000000000 +0200
++++ configure	2005-09-18 21:07:09.000000000 +0200
+@@ -1682,7 +1682,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"
+ 
+ 
+@@ -70903,7 +70897,7 @@
+   ext_builddir=ext/pcre
+   ext_srcdir=$abs_srcdir/ext/pcre
+ 
+-  ac_extra=`echo "-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -I@ext_srcdir@/pcrelib"|sed s#@ext_srcdir@#$ext_srcdir#g`
++  ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib"|sed s#@ext_srcdir@#$ext_srcdir#g`
+ 
+   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
+ 
+@@ -70927,7 +70921,7 @@
+ 
+ 
+   old_IFS=$IFS
+-  for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do
++  for ac_src in 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; do
+   
+       IFS=.
+       set $ac_src
+@@ -70973,7 +70967,7 @@
+ 
+ 
+   old_IFS=$IFS
+-  for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do
++  for ac_src in 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; do
+   
+       IFS=.
+       set $ac_src
+@@ -71049,7 +71043,7 @@
+ 
+ 
+   old_IFS=$IFS
+-  for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do
++  for ac_src in 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; do
+   
+       IFS=.
+       set $ac_src
+@@ -71092,7 +71086,7 @@
+ 
+ 
+   old_IFS=$IFS
+-  for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do
++  for ac_src in 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; do
+   
+       IFS=.
+       set $ac_src
+@@ -71293,7 +71287,7 @@
+   ext_builddir=ext/pcre
+   ext_srcdir=$abs_srcdir/ext/pcre
+ 
+-  ac_extra=`echo "-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10"|sed s#@ext_srcdir@#$ext_srcdir#g`
++  ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000"|sed s#@ext_srcdir@#$ext_srcdir#g`
+ 
+   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
+ 
+--- 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 20:56:51 hollow Exp $
++dnl $Id: php4.3.11-pcre-security.patch,v 1.1 2005/09/18 20:56:51 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-php/php/files/php4.4.0-imap-symlink.diff b/dev-php/php/files/php4.4.0-imap-symlink.diff
new file mode 100644
index 000000000000..5c9eee40faa1
--- /dev/null
+++ b/dev-php/php/files/php4.4.0-imap-symlink.diff
@@ -0,0 +1,30 @@
+--- configure	2005-09-18 02:12:50.000000000 +0200
++++ configure	2005-09-18 16:48:53.000000000 +0200
+@@ -42726,12 +42726,6 @@
+       { echo "configure: error: Cannot find rfc822.h. Please check your c-client installation." 1>&2; exit 1; }
+     fi
+ 
+-    if test -r "$IMAP_DIR/c-client/c-client.a"; then
+-      ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
+-    elif test -r "$IMAP_DIR/lib/c-client.a"; then
+-      ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1
+-    fi
+-
+     for lib in c-client4 c-client imap; do
+       IMAP_LIB=$lib
+       
+--- ext/imap/config.m4	2005-09-04 02:48:47.000000000 +0200
++++ ext/imap/config.m4	2005-09-04 02:49:05.000000000 +0200
+@@ -158,12 +158,6 @@
+       AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
+     fi
+ 
+-    if test -r "$IMAP_DIR/c-client/c-client.a"; then
+-      ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
+-    elif test -r "$IMAP_DIR/lib/c-client.a"; then
+-      ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1
+-    fi
+-
+     for lib in c-client4 c-client imap; do
+       IMAP_LIB=$lib
+       IMAP_LIB_CHK(lib)
diff --git a/dev-php/php/files/php4.4.0-pcre-security.patch b/dev-php/php/files/php4.4.0-pcre-security.patch
new file mode 100644
index 000000000000..fb9cd7f85569
--- /dev/null
+++ b/dev-php/php/files/php4.4.0-pcre-security.patch
@@ -0,0 +1,103 @@
+--- configure	2005-09-18 02:12:50.000000000 +0200
++++ configure	2005-09-18 21:00:29.000000000 +0200
+@@ -1685,7 +1685,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"
+ 
+ 
+@@ -71512,7 +71506,7 @@
+   ext_builddir=ext/pcre
+   ext_srcdir=$abs_srcdir/ext/pcre
+ 
+-  ac_extra=`echo "-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib"|sed s#@ext_srcdir@#$ext_srcdir#g`
++  ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib"|sed s#@ext_srcdir@#$ext_srcdir#g`
+ 
+   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
+ 
+@@ -71536,7 +71530,7 @@
+ 
+ 
+   old_IFS=$IFS
+-  for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do
++  for ac_src in 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; do
+   
+       IFS=.
+       set $ac_src
+@@ -71582,7 +71576,7 @@
+ 
+ 
+   old_IFS=$IFS
+-  for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do
++  for ac_src in 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; do
+   
+       IFS=.
+       set $ac_src
+@@ -71658,7 +71652,7 @@
+ 
+ 
+   old_IFS=$IFS
+-  for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do
++  for ac_src in 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; do
+   
+       IFS=.
+       set $ac_src
+@@ -71701,7 +71695,7 @@
+ 
+ 
+   old_IFS=$IFS
+-  for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do
++  for ac_src in 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; do
+   
+       IFS=.
+       set $ac_src
+@@ -71902,7 +71896,7 @@
+   ext_builddir=ext/pcre
+   ext_srcdir=$abs_srcdir/ext/pcre
+ 
+-  ac_extra=`echo "-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000"|sed s#@ext_srcdir@#$ext_srcdir#g`
++  ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000"|sed s#@ext_srcdir@#$ext_srcdir#g`
+ 
+   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
+ 
+--- 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: php4.4.0-pcre-security.patch,v 1.1 2005/09/18 20:56:51 hollow Exp $
++dnl $Id: php4.4.0-pcre-security.patch,v 1.1 2005/09/18 20:56:51 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 -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-php/php/php-4.3.11-r1.ebuild b/dev-php/php/php-4.3.11-r1.ebuild
new file mode 100644
index 000000000000..365d51ae2c95
--- /dev/null
+++ b/dev-php/php/php-4.3.11-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.11-r1.ebuild,v 1.1 2005/09/18 20:56:51 hollow Exp $
+
+PHPSAPI="cli"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+IUSE=""
+
+# fixed PCRE library for security issues, bug #102373
+SRC_URI="${SRC_URI} http://dl.longitekk.com/php-pcrelib-new-secpatch.tar.bz2"
+
+src_unpack() {
+	php-sapi_src_unpack
+	[ "${ARCH}" == "amd64" ] && epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
+
+	# Bug 88756
+	use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch
+
+	# Bug 88795
+	use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch
+
+	# fix imap symlink creation, bug #105351
+	use imap && epatch ${FILESDIR}/php4.3.11-imap-symlink.diff
+
+	# we need to unpack the files here, the eclass doesn't handle this
+	cd ${WORKDIR}
+	unpack php-pcrelib-new-secpatch.tar.bz2
+	cd ${S}
+
+	# patch to fix PCRE library security issues, bug #102373
+	epatch ${FILESDIR}/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"
+}
+
+src_compile() {
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+
+	php-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	einfo "Installing manpage"
+	doman sapi/cli/php.1
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CLI only build."
+	einfo "You cannot use it on a webserver."
+
+	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+		einfo "Cleaning up an old PEAR install glitch"
+		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
+	fi
+}
diff --git a/dev-php/php/php-4.4.0-r1.ebuild b/dev-php/php/php-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..b4adc55e6e12
--- /dev/null
+++ b/dev-php/php/php-4.4.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.4.0-r1.ebuild,v 1.1 2005/09/18 20:56:51 hollow Exp $
+
+PHPSAPI="cli"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+IUSE=""
+
+# fixed PCRE library for security issues, bug #102373
+SRC_URI="${SRC_URI} http://dl.longitekk.com/php-pcrelib-new-secpatch.tar.bz2"
+
+src_unpack() {
+	php-sapi_src_unpack
+	[ "${ARCH}" == "amd64" ] && epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
+
+	# fix imap symlink creation, bug #105351
+	use imap && epatch ${FILESDIR}/php4.4.0-imap-symlink.diff
+
+	# we need to unpack the files here, the eclass doesn't handle this
+	cd ${WORKDIR}
+	unpack php-pcrelib-new-secpatch.tar.bz2
+	cd ${S}
+
+	# patch to fix PCRE library security issues, bug #102373
+	epatch ${FILESDIR}/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"
+}
+
+src_compile() {
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+
+	php-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	einfo "Installing manpage"
+	doman sapi/cli/php.1
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CLI only build."
+	einfo "You cannot use it on a webserver."
+
+	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+		einfo "Cleaning up an old PEAR install glitch"
+		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
+	fi
+}