New version, solves bugs #73698, 73525, 72752, 72735.

6 files changed, 108 insertions, 12 deletions

diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index 995d47b12225..46712603e395 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,13 @@
 # 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.43 2004/11/07 08:00:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.44 2004/12/16 06:46:47 robbat2 Exp $
+
+*php-cgi-4.3.10 (15 Dec 2004)
+*php-cgi-5.0.3 (15 Dec 2004)
+
+  15 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> +php-cgi-4.3.10.ebuild,
+  +php-cgi-5.0.3.ebuild:
+  New version, solves bugs #73698, 73525, 72752, 72735.
 
   07 Nov 2004; Markus Rothe <corsair@gentoo.org> php-cgi-5.0.2.ebuild:
   Marked ~ppc64
diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index 757f94c31546..f4bcbb068d21 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,24 +1,28 @@
-MD5 4022e22ee556b9482758922cddc82a22 ChangeLog 5907
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 ca42c18e46b70937fe8c3ff46ec89dc2 php-cgi-4.3.8-r1.ebuild 771
 MD5 a673bafe30cbf7e555363d4c6a136081 php-cgi-4.3.8.ebuild 752
-MD5 97e002bcf522c1fb90a38b7708789ce3 php-cgi-4.3.9-r1.ebuild 813
-MD5 28661c422a37c7eb23140532a3d84ab6 php-cgi-4.3.9.ebuild 795
-MD5 6069f9c2784adf67f7fb2ed0e860ca0d php-cgi-4.3.9_rc1-r1.ebuild 886
+MD5 dffa69fb33eb0cadc0ba2d01e178dda8 php-cgi-5.0.1.ebuild 895
 MD5 3411777bc579d53726a119e9bcd58c0c php-cgi-4.3.9_rc1.ebuild 866
+MD5 7ed4415bf033ce8e8f75347c7601cdc9 php-cgi-5.0.3.ebuild 926
 MD5 dea7eefba04e3e8d7fa6dcb9f01bd95a php-cgi-5.0.0-r1.ebuild 898
 MD5 ff8d280e1df6a129bc07898d5acbb1c0 php-cgi-5.0.0.ebuild 751
-MD5 dffa69fb33eb0cadc0ba2d01e178dda8 php-cgi-5.0.1.ebuild 895
+MD5 28661c422a37c7eb23140532a3d84ab6 php-cgi-4.3.9.ebuild 795
+MD5 8cfb5f1d002517f56fc3420761f9d104 php-cgi-4.3.10.ebuild 814
+MD5 97e002bcf522c1fb90a38b7708789ce3 php-cgi-4.3.9-r1.ebuild 813
 MD5 ad706bf1cfd99db6f3c56df52111feff php-cgi-5.0.2.ebuild 910
+MD5 6069f9c2784adf67f7fb2ed0e860ca0d php-cgi-4.3.9_rc1-r1.ebuild 886
+MD5 4022e22ee556b9482758922cddc82a22 ChangeLog 5907
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0-r1 63
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1 208
 MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8 282
-MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8-r1 282
 MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-php-cgi-4.3.9 205
-MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-php-cgi-4.3.9-r1 205
-MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1 208
-MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1-r1 208
 MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0 63
-MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0-r1 63
 MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-cgi-5.0.1 63
 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-cgi-5.0.2 63
+MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-cgi-5.0.3 63
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1-r1 208
+MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8-r1 282
+MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-php-cgi-4.3.9-r1 205
 MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
+MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-php-cgi-4.3.10 206
 MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.10 b/dev-php/php-cgi/files/digest-php-cgi-4.3.10
new file mode 100644
index 000000000000..1cab79adb8b6
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-4.3.10
@@ -0,0 +1,3 @@
+MD5 7e56824dae9679c59a8234eb848aa542 php-4.3.10.tar.bz2 4026148
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
diff --git a/dev-php/php-cgi/files/digest-php-cgi-5.0.3 b/dev-php/php-cgi/files/digest-php-cgi-5.0.3
new file mode 100644
index 000000000000..eb20872d0cc2
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-5.0.3
@@ -0,0 +1 @@
+MD5 fd26455febdddee0977ce226b9108d9c php-5.0.3.tar.bz2 4607759
diff --git a/dev-php/php-cgi/php-cgi-4.3.10.ebuild b/dev-php/php-cgi/php-cgi-4.3.10.ebuild
new file mode 100644
index 000000000000..67b3b2bc73d0
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-4.3.10.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-4.3.10.ebuild,v 1.1 2004/12/16 06:46:47 robbat2 Exp $
+
+PHPSAPI="cgi"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP CGI"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~alpha ~hppa ~ppc ~ia64"
+
+# for this revision only
+PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
+PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+
+src_compile() {
+	# CLI needed to build stuff
+	myconf="${myconf} \
+		--enable-cgi \
+		--enable-cli \
+		--enable-fastcgi"
+
+	php-sapi_src_compile
+}
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	rm -f ${D}/usr/bin/php
+	# rename binary
+	newbin ${S}/sapi/cgi/php php-cgi
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CGI only build."
+}
diff --git a/dev-php/php-cgi/php-cgi-5.0.3.ebuild b/dev-php/php-cgi/php-cgi-5.0.3.ebuild
new file mode 100644
index 000000000000..f5348ac7fe8b
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-5.0.3.ebuild
@@ -0,0 +1,43 @@
+# 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.3.ebuild,v 1.1 2004/12/16 06:46:47 robbat2 Exp $
+
+PHPSAPI="cgi"
+MY_P="php-${PV}"
+
+inherit php5-sapi eutils
+
+DESCRIPTION="PHP CGI"
+SLOT="0"
+KEYWORDS="~ia64 ~ppc ~x86 ~ppc64"
+
+# provides all base PHP extras (eg PEAR, extension building stuff)
+DEPEND_PHP=">=${PHP_PROVIDER_PKG}-5.0.3"
+DEPEND="${DEPEND} ${DEPEND_PHP}"
+RDEPEND="${RDEPEND} ${DEPEND_PHP}"
+
+PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+
+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
+
+	rm -f ${D}/usr/bin/php
+	# rename binary
+	newbin ${S}/sapi/cgi/php php-cgi
+}
+
+pkg_postinst() {
+	einfo "This is a CGI only build."
+}