9 files changed, 71 insertions, 52 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 32412b80a92f..abd5f0c4ba6e 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,15 @@
 # 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.37 2005/09/07 20:04:12 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.38 2005/09/08 20:47:34 stuart Exp $
+
+*php-4.4.0 (08 Sep 2005)
+
+  08 Sep 2005; Stuart Herbert <stuart@gentoo.org>
+  +files/4.4.0/php4-hphp-acinclude.patch,
+  +files/5.0.0/php5-hphp-acinclude.patch, php-4.4.0.ebuild, php-5.0.4.ebuild,
+  php-5.0.5.ebuild:
+  Hardened-PHP fix from the overlay
+  Slight change to symlink creation behaviour
 
   07 Sep 2005; Konstantin Arkhipov <voxus@gentoo.org> php-5.0.4.ebuild,
   php-5.0.5.ebuild:
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 8685f8aa3a3c..aedf835f3ad8 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,23 +1,25 @@
-MD5 b2d154065e47e14f7062af8f1617c30d php-4.4.0.ebuild 7541
-MD5 a7216da0a9cac6789ece7b0b4120ca48 php-5.0.5.ebuild 4473
-MD5 7d6afe3c769e3ad7b6ac0c1031b92f90 ChangeLog 833
+MD5 93d5ad7cde3abec39d4234b8e98b331b php-4.4.0.ebuild 7256
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 04b71dff779858238960702a6119b8de php-5.0.4.ebuild 4478
-MD5 5bdec1212806fa8f4ccc046325e4ea52 files/digest-php-4.4.0 143
+MD5 69a7fb14f1e2c2c237b10851a4a7c21a ChangeLog 1132
+MD5 e4b9b407adc5e03f48387e472fde0c4a php-5.0.4.ebuild 4216
+MD5 5dfe1798af0457de606c52cd004b5cbf php-5.0.5.ebuild 4211
 MD5 11e54e6a5fade48c67bab392af4e33c7 files/digest-php-5.0.4 143
-MD5 d16ca4eaa6aca25c7b29484da6b81b85 files/digest-php-5.0.5 63
-MD5 030fb5433c0418ee3034d5b502d32548 files/4.4.0/fastbuild.patch 9004
-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 43c95e9c27a1e40cf1fbb3408fd4a894 files/digest-php-4.4.0 144
+MD5 ef5a57ba8c9e35be8cb39c8ed1bc5235 files/digest-php-5.0.5 143
 MD5 110af7b300bcbbfb821fbb58f7923d8b files/5.0.0/php5-iodbc-config.diff 511
 MD5 7d198bde60f94cc8cea5ad9479901e21 files/5.0.0/php5-imap-symlink.diff 620
+MD5 fb08e1d8551091bc65872148dd2e46d1 files/5.0.0/php5-hphp-acinclude.patch 618
+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 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 030fb5433c0418ee3034d5b502d32548 files/4.4.0/fastbuild.patch 9004
+MD5 0b33a5e7250bf9ae8c240cd9d4963889 files/4.4.0/php4-hphp-acinclude.patch 618
 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
+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
diff --git a/dev-lang/php/files/4.4.0/php4-hphp-acinclude.patch b/dev-lang/php/files/4.4.0/php4-hphp-acinclude.patch
new file mode 100644
index 000000000000..68a6bfe20420
--- /dev/null
+++ b/dev-lang/php/files/4.4.0/php4-hphp-acinclude.patch
@@ -0,0 +1,19 @@
+--- acinclude.m4.orig	2005-09-08 13:16:38.000000000 +0200
++++ acinclude.m4	2005-09-08 13:21:09.000000000 +0200
+@@ -783,12 +783,12 @@
+ dnl
+ AC_DEFUN([PHP_BUILD_PROGRAM],[
+   OVERALL_TARGET=[]ifelse($1,,php,$1)
+-  php_c_pre='$(CC)'
++  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
+   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
+-  php_c_post=' && echo > $[@]'
+-  php_cxx_pre='$(CXX)'
++  php_c_post=
++  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
+   php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
+-  php_cxx_post=' && echo > $[@]'
++  php_cxx_post=
+   php_lo=o
+ 
+   case $with_pic in
diff --git a/dev-lang/php/files/5.0.0/php5-hphp-acinclude.patch b/dev-lang/php/files/5.0.0/php5-hphp-acinclude.patch
new file mode 100644
index 000000000000..c5f1e711725e
--- /dev/null
+++ b/dev-lang/php/files/5.0.0/php5-hphp-acinclude.patch
@@ -0,0 +1,19 @@
+--- acinclude.m4.orig	2005-09-08 13:27:42.000000000 +0200
++++ acinclude.m4	2005-09-08 13:28:28.000000000 +0200
+@@ -779,12 +779,12 @@
+ dnl
+ AC_DEFUN([PHP_BUILD_PROGRAM],[
+   OVERALL_TARGET=[]ifelse($1,,php,$1)
+-  php_c_pre='$(CC)'
++  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
+   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
+-  php_c_post=' && echo > $[@]'
+-  php_cxx_pre='$(CXX)'
++  php_c_post=
++  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
+   php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
+-  php_cxx_post=' && echo > $[@]'
++  php_cxx_post=
+   php_lo=o
+ 
+   case $with_pic in
diff --git a/dev-lang/php/files/digest-php-4.4.0 b/dev-lang/php/files/digest-php-4.4.0
index f073a5de27eb..54b1e9f17e43 100644
--- a/dev-lang/php/files/digest-php-4.4.0
+++ b/dev-lang/php/files/digest-php-4.4.0
@@ -1,2 +1,2 @@
 MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074
-MD5 4d489ca6274366c1c1b1407d2ca8f440 hardening-patch-4.4.0-0.4.1.patch.gz 37189
+MD5 59978eb7252e9f0a0ee73cbbc2de217d hardening-patch-4.4.0-0.4.2.patch.gz 103923
diff --git a/dev-lang/php/files/digest-php-5.0.5 b/dev-lang/php/files/digest-php-5.0.5
index efd648bcacfb..6c87f9274677 100644
--- a/dev-lang/php/files/digest-php-5.0.5
+++ b/dev-lang/php/files/digest-php-5.0.5
@@ -1 +1,2 @@
 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/php-4.4.0.ebuild b/dev-lang/php/php-4.4.0.ebuild
index 10f5b974049c..405f2a0d354b 100644
--- a/dev-lang/php/php-4.4.0.ebuild
+++ b/dev-lang/php/php-4.4.0.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.1 2005/09/04 16:58:08 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.0.ebuild,v 1.2 2005/09/08 20:47:34 stuart Exp $
 
 IUSE="${IUSE} cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~ppc ~x86"
@@ -267,17 +267,6 @@ src_install() {
 
 pkg_postinst()
 {
-	# Create the symlinks with eselect
-	if useq cli ; then
-		eselect php set php4
-		eselect php-devel set php4
-	fi
-
-	if useq cgi ; then
-		eselect php-cgi set php4
-		eselect php-devel set php4
-	fi
-
 	# Output some general info to the user
 	if useq apache || useq apache2 ; then
 		APACHE1_MOD_DEFINE="PHP4"
diff --git a/dev-lang/php/php-5.0.4.ebuild b/dev-lang/php/php-5.0.4.ebuild
index 7b64f70ecf80..645b8b02e6ff 100644
--- a/dev-lang/php/php-5.0.4.ebuild
+++ b/dev-lang/php/php-5.0.4.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.2 2005/09/07 20:04:12 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.4.ebuild,v 1.3 2005/09/08 20:47:34 stuart Exp $
 
 IUSE="${IUSE} cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -88,6 +88,7 @@ src_compile() {
 	for x in ${PHPSAPIS} ; do
 		if [ "${CLEAN_REQUIRED}" = 1 ]; then
 			make clean
+			# echo > /dev/null
 		fi
 
 		PHPSAPI=${x}
@@ -161,17 +162,6 @@ src_install() {
 
 pkg_postinst()
 {
-	# Create the symlinks with eselect
-	if useq cli ; then
-		eselect php set php5
-		eselect php-devel set php5
-	fi
-
-	if useq cgi ; then
-		eselect php-cgi set php5
-		eselect php-devel set php5
-	fi
-
 	# Output some general info to the user
 	if useq apache || useq apache2 ; then
 		APACHE1_MOD_DEFINE="PHP5"
diff --git a/dev-lang/php/php-5.0.5.ebuild b/dev-lang/php/php-5.0.5.ebuild
index 4ef1ae0d3d8f..065dd80ad813 100644
--- a/dev-lang/php/php-5.0.5.ebuild
+++ b/dev-lang/php/php-5.0.5.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.2 2005/09/07 20:04:12 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5.ebuild,v 1.3 2005/09/08 20:47:34 stuart Exp $
 
 IUSE="${IUSE} cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~amd64 ~x86"
@@ -88,6 +88,7 @@ src_compile() {
 	for x in ${PHPSAPIS} ; do
 		if [ "${CLEAN_REQUIRED}" = 1 ]; then
 			make clean
+			# echo > /dev/null
 		fi
 
 		PHPSAPI=${x}
@@ -161,17 +162,6 @@ src_install() {
 
 pkg_postinst()
 {
-	# Create the symlinks with eselect
-	if useq cli ; then
-		eselect php set php5
-		eselect php-devel set php5
-	fi
-
-	if useq cgi ; then
-		eselect php-cgi set php5
-		eselect php-devel set php5
-	fi
-
 	# Output some general info to the user
 	if useq apache || useq apache2 ; then
 		APACHE1_MOD_DEFINE="PHP5"