Version bump, many upstream fixes. Bug #60216. Bug #60247.

8 files changed, 144 insertions, 2 deletions

diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index d0e545256ca4..7e5144c9d103 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,14 @@
 # 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.34 2004/08/12 11:08:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.35 2004/08/13 21:42:27 robbat2 Exp $
+
+*php-cgi-5.0.1 (13 Aug 2004)
+*php-cgi-4.3.9_rc1-r1 (13 Aug 2004)
+*php-cgi-4.3.8-r1 (13 Aug 2004)
+
+  13 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> +php-cgi-4.3.8-r1.ebuild,
+  +php-cgi-4.3.9_rc1-r1.ebuild, +php-cgi-5.0.1.ebuild:
+  Version bump, many upstream fixes. Bug #60216. Bug #60247.
 
   12 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> php-cgi-5.0.0-r1.ebuild:
   Roll out 5.0.0-r1 to ~x86 ONLY. Other interested arches need to keyword the
diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index 01a796a16450..bac225fc5d4c 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,12 +1,18 @@
+MD5 b82aedc109a5fdb2733b082654113f6f php-cgi-4.3.8-r1.ebuild 769
 MD5 a673bafe30cbf7e555363d4c6a136081 php-cgi-4.3.8.ebuild 752
+MD5 dea7eefba04e3e8d7fa6dcb9f01bd95a php-cgi-5.0.1.ebuild 898
 MD5 3411777bc579d53726a119e9bcd58c0c php-cgi-4.3.9_rc1.ebuild 866
 MD5 dea7eefba04e3e8d7fa6dcb9f01bd95a php-cgi-5.0.0-r1.ebuild 898
 MD5 ff8d280e1df6a129bc07898d5acbb1c0 php-cgi-5.0.0.ebuild 751
-MD5 2fa08336920899762c233124e10949e8 ChangeLog 4693
+MD5 923152c735702f5e52e9af2990b42198 php-cgi-4.3.9_rc1-r1.ebuild 883
+MD5 1efe87b4b873fcd20e95a38268b1d572 ChangeLog 4987
 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 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0 63
+MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-cgi-5.0.1 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 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-4.3.8-r1 b/dev-php/php-cgi/files/digest-php-cgi-4.3.8-r1
new file mode 100644
index 000000000000..32ce7de3a557
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-4.3.8-r1
@@ -0,0 +1,4 @@
+MD5 e8ab484fcb94cd2e0d7ecfd0762cfd33 php-4.3.8.tar.bz2 3963437
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
+MD5 394389c893680d8a0cea7e6c974e8619 hardened-php-4.3.8-0.2.2.patch.gz 17178
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.9_rc1-r1 b/dev-php/php-cgi/files/digest-php-cgi-4.3.9_rc1-r1
new file mode 100644
index 000000000000..efb25538f090
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-4.3.9_rc1-r1
@@ -0,0 +1,3 @@
+MD5 b741b28a55ae1b2b12ca53f590ac9f99 php-4.3.9RC1.tar.bz2 4000405
+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.1 b/dev-php/php-cgi/files/digest-php-cgi-5.0.1
new file mode 100644
index 000000000000..cbad23e72d02
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-5.0.1
@@ -0,0 +1 @@
+MD5 b12042826ddba29fba3ae5a2eac3c391 php-5.0.1.tar.bz2 4569781
diff --git a/dev-php/php-cgi/php-cgi-4.3.8-r1.ebuild b/dev-php/php-cgi/php-cgi-4.3.8-r1.ebuild
new file mode 100644
index 000000000000..c05417913be7
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-4.3.8-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-4.3.8-r1.ebuild,v 1.1 2004/08/13 21:42:27 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.8"
+
+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-4.3.9_rc1-r1.ebuild b/dev-php/php-cgi/php-cgi-4.3.9_rc1-r1.ebuild
new file mode 100644
index 000000000000..ad188105826e
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-4.3.9_rc1-r1.ebuild
@@ -0,0 +1,40 @@
+# 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.9_rc1-r1.ebuild,v 1.1 2004/08/13 21:42:27 robbat2 Exp $
+
+PHPSAPI="cgi"
+SRC_URI_BASE="http://downloads.php.net/ilia/" # for RC only
+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.8"
+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.1.ebuild b/dev-php/php-cgi/php-cgi-5.0.1.ebuild
new file mode 100644
index 000000000000..dde9f38c2f23
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-5.0.1.ebuild
@@ -0,0 +1,42 @@
+# 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.1.ebuild,v 1.1 2004/08/13 21:42:27 robbat2 Exp $
+
+PHPSAPI="cgi"
+MY_P="php-${PV}"
+
+inherit php5-sapi eutils
+
+DESCRIPTION="PHP CGI"
+SLOT="0"
+KEYWORDS="~x86"
+
+# provides all base PHP extras (eg PEAR, extension building stuff)
+DEPEND_PHP=">=${PHP_PROVIDER_PKG}-5.0.0-r1"
+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
+
+	# rename binary
+	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
+}
+
+pkg_postinst() {
+	einfo "This is a CGI only build."
+}