fix bugs 55150, 52165, 52912.

6 files changed, 80 insertions, 21 deletions

diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 28281cf92447..ad41284e0c6d 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,15 +1,16 @@
 MD5 e0264ff0ce8780f86999c915fe6f37dd mod_php-4.3.7.ebuild 5755
 MD5 1f3767f088bfa194a9556d4c30174028 mod_php-4.3.6-r2.ebuild 5754
+MD5 1793553494082a28a6217c13888322bd mod_php-4.3.7-r1.ebuild 5914
 MD5 62416e36a0f7a081b1d17f83879b014b mod_php-4.3.6.ebuild 5728
 MD5 3abd216bcec4851443ed867c82f11a51 mod_php-4.3.6-r1.ebuild 5734
 MD5 724533152eb2e4dd32a16a966c088fd8 mod_php-4.3.5.ebuild 5728
-MD5 e5a612fd93bd2b871dd00af8d8d7dcf8 ChangeLog 29128
+MD5 8a36f7a065dd0490aae3830f3c4ca912 ChangeLog 29305
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 941132c445d2a1e105363147b4876c70 mod_php-4.3.6_rc2.ebuild 5775
 MD5 c84c1daa721ac0302ef398f55f3799ad mod_php-4.3.4-r4.ebuild 5372
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 3808a6e5185d9d2bb981e195dc59c101 files/70_mod_php.conf 1354
+MD5 0c2e81f561985f3749c37cf525de7583 files/70_mod_php.conf 1364
 MD5 c166c2da0029a4eb9b760e0aecd80ade files/digest-mod_php-4.3.5 205
 MD5 707c9fff181593ffacc69ce674a92a8a files/digest-mod_php-4.3.6 350
 MD5 01013db7bcb660532237428f5aa61b26 files/digest-mod_php-4.3.7 281
@@ -19,4 +20,5 @@ MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
 MD5 0f5e1f8a748d308e073f290fe89075a1 files/digest-mod_php-4.3.4-r4 205
 MD5 707c9fff181593ffacc69ce674a92a8a files/digest-mod_php-4.3.6-r1 350
 MD5 707c9fff181593ffacc69ce674a92a8a files/digest-mod_php-4.3.6-r2 350
+MD5 01013db7bcb660532237428f5aa61b26 files/digest-mod_php-4.3.7-r1 281
 MD5 b8cfdda8dd4c656e170607b282cb0019 files/mod_php-4.3.4-r3.diff 1717
diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index 5db6c1686479..4efa7d1799f8 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,15 +1,17 @@
 MD5 021f585c6dbc6fbd4a9d28368508e7dd php-cgi-4.3.5.ebuild 688
+MD5 7c6940e402dd751750e991c5dfa66193 php-cgi-4.3.7-r1.ebuild 757
 MD5 5b1a215e21110a1e5a603b3a21e5fd53 php-cgi-4.3.7.ebuild 687
 MD5 5aa53b97a819a20050bf25a19ad19cc8 php-cgi-4.3.6-r1.ebuild 688
 MD5 417086a2a3c4e674e77e6c5150a68133 php-cgi-4.3.6_rc2.ebuild 736
 MD5 22244fe422175e6371727eba17d37ff1 php-cgi-4.3.4-r2.ebuild 713
 MD5 82a39f964c36d9f753fe658c17d58fc0 php-cgi-4.3.6.ebuild 685
-MD5 1535cf81b02f1821a2a8f21afcc59a4a ChangeLog 2199
+MD5 e5d1fb6db8c0a4bb006093aec129c3f1 ChangeLog 2356
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 ccf6c900c87cc5afeb677f396286e8ab files/digest-php-cgi-4.3.6_rc2 353
 MD5 abf76ecb45117098456e6ee3bf69944e files/digest-php-cgi-4.3.5 282
 MD5 707c9fff181593ffacc69ce674a92a8a files/digest-php-cgi-4.3.6 350
-MD5 8f29e20cdf496ab8f73a0499f9f3947d files/digest-php-cgi-4.3.7 282
+MD5 01013db7bcb660532237428f5aa61b26 files/digest-php-cgi-4.3.7 281
 MD5 c2702f299c02afa047535bf819093868 files/digest-php-cgi-4.3.4-r2 282
 MD5 707c9fff181593ffacc69ce674a92a8a files/digest-php-cgi-4.3.6-r1 350
+MD5 01013db7bcb660532237428f5aa61b26 files/digest-php-cgi-4.3.7-r1 281
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 5e6645423fc1..83b654cfd1b9 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.94 2004/06/25 01:23:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.95 2004/06/28 00:10:42 robbat2 Exp $
+
+*php-4.3.7-r1 (27 Jun 2004)
+
+  27 Jun 2004; Robin H. Johnson <robbat2@gentoo.org> php-4.3.7-r1.ebuild:
+  fix bugs 55150, 52165, 52912.
 
   21 Jun 2004; Robin H. Johnson <robbat2@gentoo.org> :
   digest fix
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index b2d7b15a6222..ca8915a4b4e9 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,24 +1,26 @@
-MD5 981c50331788ba2db54eab0cc4aa8698 ChangeLog 14178
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 783ac0764c54b652947786c83db46a81 php-4.3.4-r4.ebuild 1402
-MD5 959f6b3c182f6e9ea4dbc1d1f2c07ecf php-4.3.5-r1.ebuild 1076
+MD5 5fac6b65d72c24675e16ddd4c8b0867c php-5.0_beta1-r1.ebuild 1282
 MD5 03244f9fb8aa0331315765f0c3706d64 php-4.3.5.ebuild 1325
-MD5 62e5fa434916b7b40bac6a0a1af7a8f6 php-4.3.6-r1.ebuild 1078
-MD5 9d5e57c7bd2789bc496a15d4bb6a91a4 php-4.3.6.ebuild 1076
-MD5 503533de9e999f4bcdee4e9e9fe15fbf php-4.3.6_rc2.ebuild 1123
+MD5 959f6b3c182f6e9ea4dbc1d1f2c07ecf php-4.3.5-r1.ebuild 1076
+MD5 783ac0764c54b652947786c83db46a81 php-4.3.4-r4.ebuild 1402
 MD5 00f02cb212243a65f986a296d34ca927 php-4.3.7.ebuild 1078
-MD5 5fac6b65d72c24675e16ddd4c8b0867c php-5.0_beta1-r1.ebuild 1282
-MD5 6d2bf1b20c4fdbbaab606ab5159f2e12 php-5.0_beta1.ebuild 1157
 MD5 a5e1df3bdb63ed29cf042d3db99ee583 php-5.0.0.ebuild 524
-MD5 145aa402c3215f537c8dada743b63816 files/digest-php-5.0.0 66
+MD5 71677274337848ef9d4ccd0ae932a0d2 php-4.3.7-r1.ebuild 1080
+MD5 6d2bf1b20c4fdbbaab606ab5159f2e12 php-5.0_beta1.ebuild 1157
+MD5 9d5e57c7bd2789bc496a15d4bb6a91a4 php-4.3.6.ebuild 1076
+MD5 b796e83d162045507c05bd70c4b65fd5 ChangeLog 14313
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 62e5fa434916b7b40bac6a0a1af7a8f6 php-4.3.6-r1.ebuild 1078
+MD5 503533de9e999f4bcdee4e9e9fe15fbf php-4.3.6_rc2.ebuild 1123
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
+MD5 06b23ac6e8c9a6658fa121c1fed7ee02 files/digest-php-4.3.6_rc2 202
 MD5 bb70a1c76063845cc7a7aa8b1be746da files/digest-php-4.3.4-r4 131
-MD5 f2214a80da2f53f5a17caeddfc34876f files/digest-php-4.3.5 131
 MD5 f2214a80da2f53f5a17caeddfc34876f files/digest-php-4.3.5-r1 131
-MD5 82e070bb15c97bb48b2533ab3f23d122 files/digest-php-4.3.6 276
 MD5 82e070bb15c97bb48b2533ab3f23d122 files/digest-php-4.3.6-r1 276
-MD5 06b23ac6e8c9a6658fa121c1fed7ee02 files/digest-php-4.3.6_rc2 202
-MD5 1c8a4f1e84c9c40dd232bc40daafd0f4 files/digest-php-4.3.7 207
-MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
+MD5 1c8a4f1e84c9c40dd232bc40daafd0f4 files/digest-php-4.3.7-r1 207
 MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1-r1 65
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
+MD5 f2214a80da2f53f5a17caeddfc34876f files/digest-php-4.3.5 131
+MD5 82e070bb15c97bb48b2533ab3f23d122 files/digest-php-4.3.6 276
+MD5 1c8a4f1e84c9c40dd232bc40daafd0f4 files/digest-php-4.3.7 207
+MD5 145aa402c3215f537c8dada743b63816 files/digest-php-5.0.0 66
+MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
diff --git a/dev-php/php/files/digest-php-4.3.7-r1 b/dev-php/php/files/digest-php-4.3.7-r1
new file mode 100644
index 000000000000..abd92d2f9274
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.7-r1
@@ -0,0 +1,3 @@
+MD5 5293fdc909a306a2636e0fafcc79442c php-4.3.7.tar.bz2 3963734
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
+MD5 85faf5afdf7dfcd0368a290a2e00e7d5 hardened-php-4.3.7-0.1.2.patch.gz 9592
diff --git a/dev-php/php/php-4.3.7-r1.ebuild b/dev-php/php/php-4.3.7-r1.ebuild
new file mode 100644
index 000000000000..65d375dc9dee
--- /dev/null
+++ b/dev-php/php/php-4.3.7-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.7-r1.ebuild,v 1.1 2004/06/28 00:10:42 robbat2 Exp $
+
+PHPSAPI="cli"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 s390"
+
+src_unpack() {
+	php-sapi_src_unpack
+	if [ "${ARCH}" == "amd64" ] ; then
+		epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
+	fi
+}
+
+src_compile() {
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+
+	php-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	einfo "Installing manpage"
+	doman sapi/cli/php.1
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CLI only build."
+	einfo "You cannot use it on a webserver."
+
+	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+		einfo "Cleaning up an old PEAR install glitch"
+		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
+	fi
+}