bug #59755.

5 files changed, 61 insertions, 2 deletions

diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index f9f86d987a2c..0f1b2295eae5 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.31 2004/08/06 03:17:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.32 2004/08/09 00:01:53 robbat2 Exp $
+
+*php-cgi-5.0.0-r1 (08 Aug 2004)
+
+  08 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +files/php-5.0.0-httpauthfix.patch, +php-cgi-5.0.0-r1.ebuild:
+  bug #59755.
 
   05 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> -php-cgi-4.3.4-r2.ebuild,
   -php-cgi-4.3.5.ebuild, -php-cgi-4.3.6-r1.ebuild, -php-cgi-4.3.6.ebuild,
diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index 86a75da2565f..e1f57c24f181 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,7 +1,10 @@
 MD5 a673bafe30cbf7e555363d4c6a136081 php-cgi-4.3.8.ebuild 752
+MD5 29f7e1d0f053198c5092defbb2392049 php-cgi-5.0.0-r1.ebuild 755
 MD5 ff8d280e1df6a129bc07898d5acbb1c0 php-cgi-5.0.0.ebuild 751
-MD5 225acb65588e8a432232c8a5af15aca7 ChangeLog 4118
+MD5 828aa0c04ff112e8a811fc9b5f0e0c52 ChangeLog 4283
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0-r1 63
 MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8 282
 MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0 63
+MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
 MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
diff --git a/dev-php/php-cgi/files/digest-php-cgi-5.0.0-r1 b/dev-php/php-cgi/files/digest-php-cgi-5.0.0-r1
new file mode 100644
index 000000000000..6c4e3a2e19be
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-5.0.0-r1
@@ -0,0 +1 @@
+MD5 562b7ad1e903248bbe77884cb904b8b7 php-5.0.0.tar.bz2 4554054
diff --git a/dev-php/php-cgi/files/php-5.0.0-httpauthfix.patch b/dev-php/php-cgi/files/php-5.0.0-httpauthfix.patch
new file mode 100644
index 000000000000..7b3687c72aff
--- /dev/null
+++ b/dev-php/php-cgi/files/php-5.0.0-httpauthfix.patch
@@ -0,0 +1,11 @@
+--- php-5.0.0/sapi/apache/mod_php5.c	2004-07-10 09:46:09.000000000 +0200
++++ php-5.0.0.1/sapi/apache/mod_php5.c	2004-08-08 11:32:52.824203512 +0200
+@@ -485,7 +485,7 @@
+ 		tmp = uudecode(r->pool, authorization);
+ 		SG(request_info).auth_user = NULL;
+ 		tmp_user = getword_nulls_nc(r->pool, &tmp, ':');
+-		if (SG(request_info).auth_user) {
++		if (tmp_user) {
+ 			r->connection->user = pstrdup(r->connection->pool, tmp_user);
+ 			r->connection->ap_auth_type = "Basic";
+ 			SG(request_info).auth_user = estrdup(tmp_user);
diff --git a/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild b/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..3c044d447652
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild,v 1.1 2004/08/09 00:01:53 robbat2 Exp $
+
+PHPSAPI="cgi"
+MY_P="php-${PVR}"
+
+inherit php5-sapi eutils
+
+DESCRIPTION="PHP CGI"
+SLOT="0"
+KEYWORDS="-x86 -sparc -alpha -hppa -ppc"
+
+# for this revision only
+PDEPEND=">=${PHP_PROVIDER_PKG}-5.0.0"
+
+src_compile() {
+	# CLI needed to build stuff
+	my_conf="${my_conf} \
+		--enable-cgi \
+		--enable-cli \
+		--enable-fastcgi"
+
+	php5-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php5-sapi_src_install
+
+	# rename binary
+	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
+}
+
+pkg_postinst() {
+	einfo "This is a CGI only build."
+}