Hardened-PHP update and other fix for PHP 4.4.1.

(Portage version: 2.0.53_rc6)

7 files changed, 59 insertions, 8 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 5b39c9174e87..68e632e3d39e 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,14 @@
 # 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.50 2005/11/03 14:09:24 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.51 2005/11/03 23:54:59 chtekk Exp $
+
+*php-4.4.1-r1 (03 Nov 2005)
+
+  03 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
+  +files/4.4.1/php4.4.1-mod_rewrite-crash.patch, -php-4.4.1.ebuild,
+  +php-4.4.1-r1.ebuild:
+  Update Hardened-PHP to latest version for PHP 4.4.1 and 5.0.5, fix bug in
+  the Apache2 SAPI of PHP 4.4.1 (mentioned in bug #111032).
 
 *php-5.0.5-r3 (02 Nov 2005)
 *php-5.0.4-r3 (02 Nov 2005)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d202e17278e4..aad256376ea5 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,4 @@
-MD5 45f44f5a2b220b261c25edac7484c214 ChangeLog 8299
+MD5 8235dff8c693256dd4fe88160047f397 ChangeLog 8608
 MD5 389638f1d46b6c41cd4d87b471572f4b files/4-any/apache-1.3/70_mod_php.conf 484
 MD5 ee36e31632adb08b7abf70f78b5b2125 files/4-any/apache-2.0/70_mod_php.conf 485
 MD5 f0acca9c6387b8ca139d2849665bd16f files/4-any/php4-fastbuild.patch 9012
@@ -23,6 +23,7 @@ MD5 5f1f48c87cafe0949e73ef064c99e5ed files/4.4.0/php4.4.0-pcre-security.patch 17
 MD5 57644300fb52ad610fa52ae8ba6b522b files/4.4.0/php4.4.0-phpinfo_xss.patch 1284
 MD5 48d9c939434e9b01d0696410d59c503c files/4.4.0/php4.4.0-pspell-ext-segf.patch 8482
 MD5 83fb9efb602c178741ea2e40e13b014f files/4.4.0/php4.4.0-session_save_path-segf.patch 4132
+MD5 7a68ebae340c5eb9fdb97fa8e2e3870f files/4.4.1/php4.4.1-mod_rewrite-crash.patch 940
 MD5 96ed6efe383833dbb880fef3b6c562bb files/5.0-any/apache-1.3/70_mod_php5.conf 524
 MD5 21bc6cc85150b5a5385f213d45efbe67 files/5.0-any/apache-2.0/70_mod_php5.conf 525
 MD5 7d198bde60f94cc8cea5ad9479901e21 files/5.0-any/php5-imap-symlink.diff 620
@@ -57,12 +58,12 @@ MD5 273799e60d5a41a1e6f5ac53781a152f files/5.1-any/php5-soap_persistence_session
 MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/5.1-any/php5-with-iodbc.diff 443
 MD5 5f8f18e68edb61b60cfa21a4ff65170b files/digest-php-4.3.11-r3 223
 MD5 c9e2d252f3ae26871c06d35ebfe6fb1e files/digest-php-4.4.0-r3 221
-MD5 c4b89187ccc40af42b7304a0b74ee661 files/digest-php-4.4.1 63
+MD5 c273cf40d79922fb1d77d7bd352d1bb9 files/digest-php-4.4.1-r1 143
 MD5 71facfede997494a03e635bc07a14a2f files/digest-php-5.0.4-r3 220
-MD5 96fdb35fc6f5b775c569db88d89200d7 files/digest-php-5.0.5-r3 143
+MD5 cfdebb276cf798bc25f1ecc97d4c5072 files/digest-php-5.0.5-r3 143
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 MD5 dd4e596a3be26f261e3a5a52330f9b2d php-4.3.11-r3.ebuild 9240
 MD5 466de8a0d0e1860f4487428a1c7106d5 php-4.4.0-r3.ebuild 9235
-MD5 6af42707b3ac28685aed7d12667f6913 php-4.4.1.ebuild 7304
+MD5 7ed4999a2a6e2827f90768eded5b6d6d php-4.4.1-r1.ebuild 7871
 MD5 6e8ab5a55a1bc9eda90d0f8fa7e93b32 php-5.0.4-r3.ebuild 6293
 MD5 6ad12146831f0ab9b9bae8a5f6bfe566 php-5.0.5-r3.ebuild 5654
diff --git a/dev-lang/php/files/4.4.1/php4.4.1-mod_rewrite-crash.patch b/dev-lang/php/files/4.4.1/php4.4.1-mod_rewrite-crash.patch
new file mode 100644
index 000000000000..a08a19e405ee
--- /dev/null
+++ b/dev-lang/php/files/4.4.1/php4.4.1-mod_rewrite-crash.patch
@@ -0,0 +1,20 @@
+--- sapi/apache2handler/sapi_apache2.c	2005/10/12 21:41:36	1.1.2.40.2.5
++++ sapi/apache2handler/sapi_apache2.c	2005/11/02 17:55:17	1.1.2.40.2.6
+@@ -18,7 +18,7 @@
+    +----------------------------------------------------------------------+
+  */
+
+-/* $Id: sapi_apache2.c,v 1.1.2.40.2.5 2005/10/12 21:41:36 tony2001 Exp $ */
++/* $Id: sapi_apache2.c,v 1.1.2.40.2.6 2005/11/02 17:55:17 iliaa Exp $ */
+
+ #include <fcntl.h>
+
+@@ -535,7 +535,7 @@ normal:
+ 		if (!parent_req) {
+ 			parent_req = ctx->r;
+ 		}
+-		if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
++		if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
+ 			if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
+ 				zend_bailout();
+ 			}
diff --git a/dev-lang/php/files/digest-php-4.4.1 b/dev-lang/php/files/digest-php-4.4.1
deleted file mode 100644
index f88fc54cea9e..000000000000
--- a/dev-lang/php/files/digest-php-4.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6b5726471189f8a1f26dd7cc5e19b442 php-4.4.1.tar.bz2 4157749
diff --git a/dev-lang/php/files/digest-php-4.4.1-r1 b/dev-lang/php/files/digest-php-4.4.1-r1
new file mode 100644
index 000000000000..859996a4e2ce
--- /dev/null
+++ b/dev-lang/php/files/digest-php-4.4.1-r1
@@ -0,0 +1,2 @@
+MD5 3eef4e232d78ace49f348794072aaa71 hardening-patch-4.4.1-0.4.5.patch.gz 55044
+MD5 6b5726471189f8a1f26dd7cc5e19b442 php-4.4.1.tar.bz2 4157749
diff --git a/dev-lang/php/files/digest-php-5.0.5-r3 b/dev-lang/php/files/digest-php-5.0.5-r3
index 9a62d89ecd07..b054a427c59e 100644
--- a/dev-lang/php/files/digest-php-5.0.5-r3
+++ b/dev-lang/php/files/digest-php-5.0.5-r3
@@ -1,2 +1,2 @@
-MD5 6af27b59251bb9ce4741b17e2e5358f7 hardening-patch-5.0.5-0.4.3.patch.gz 51173
+MD5 724be0259e964c0ff96605712f438c3d hardening-patch-5.0.5-0.4.5.patch.gz 54134
 MD5 b5d4ca75bbb11ee5b830fa67213d9f7f php-5.0.5.tar.bz2 4895556
diff --git a/dev-lang/php/php-4.4.1.ebuild b/dev-lang/php/php-4.4.1-r1.ebuild
index 63ac3c5114cc..049e0b0463fd 100644
--- a/dev-lang/php/php-4.4.1.ebuild
+++ b/dev-lang/php/php-4.4.1-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.1.ebuild,v 1.1 2005/11/03 14:09:24 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.1-r1.ebuild,v 1.1 2005/11/03 23:54:59 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~x86"
@@ -67,6 +67,27 @@ 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}"
+
+	# fix PHP branding
+	sed -e 's|^EXTRA_VERSION=""|EXTRA_VERSION="-pl1-gentoo"|g' -i configure.in
+
+	# patch crash with mod_rewrite in Apache2 SAPI, mentioned in bug #111032
+	epatch "${FILESDIR}/4.4.1/php4.4.1-mod_rewrite-crash.patch"
+
+	# 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