Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Herbert <stuart@gentoo.org>2004-07-14 12:55:07 +0000
committerStuart Herbert <stuart@gentoo.org>2004-07-14 12:55:07 +0000
commit8f15b31c25e5fce38340a8ea4b10e63c263c74b7 (patch)
treec33f89dc3e5e56fe9bb5d16006438cf63640903f
parentdep fix to be on the safe side (diff)
downloadhistorical-8f15b31c25e5fce38340a8ea4b10e63c263c74b7.tar.gz
historical-8f15b31c25e5fce38340a8ea4b10e63c263c74b7.tar.bz2
historical-8f15b31c25e5fce38340a8ea4b10e63c263c74b7.zip
Now uses php5 final
Diffstat
-rw-r--r--dev-php/php/Manifest33
-rw-r--r--dev-php/php/files/digest-php-5.0.02
-rw-r--r--dev-php/php/files/php5_soap_persistence_session.diff35
-rw-r--r--dev-php/php/php-5.0.0.ebuild4
4 files changed, 55 insertions, 19 deletions
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 533bec32c7ed..b8155ba537da 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,28 +1,29 @@
-MD5 5fac6b65d72c24675e16ddd4c8b0867c php-5.0_beta1-r1.ebuild 1282
-MD5 03244f9fb8aa0331315765f0c3706d64 php-4.3.5.ebuild 1325
-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 a5e1df3bdb63ed29cf042d3db99ee583 php-5.0.0.ebuild 524
-MD5 2b4107bd48d5837d690a750a00e191a6 php-4.3.7-r1.ebuild 1074
-MD5 6d2bf1b20c4fdbbaab606ab5159f2e12 php-5.0_beta1.ebuild 1157
-MD5 9d5e57c7bd2789bc496a15d4bb6a91a4 php-4.3.6.ebuild 1076
MD5 416ad0ba1fa328e6edca21d800d420ff ChangeLog 14903
MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 783ac0764c54b652947786c83db46a81 php-4.3.4-r4.ebuild 1402
+MD5 959f6b3c182f6e9ea4dbc1d1f2c07ecf php-4.3.5-r1.ebuild 1076
+MD5 03244f9fb8aa0331315765f0c3706d64 php-4.3.5.ebuild 1325
MD5 dc278d7c6983a7ec62b2d9e00b5997d2 php-4.3.6-r1.ebuild 1075
+MD5 9d5e57c7bd2789bc496a15d4bb6a91a4 php-4.3.6.ebuild 1076
MD5 503533de9e999f4bcdee4e9e9fe15fbf php-4.3.6_rc2.ebuild 1123
+MD5 2b4107bd48d5837d690a750a00e191a6 php-4.3.7-r1.ebuild 1074
+MD5 00f02cb212243a65f986a296d34ca927 php-4.3.7.ebuild 1078
+MD5 c06d94b314ffa0fd89bb2b26e60f7574 php-5.0.0.ebuild 521
+MD5 5fac6b65d72c24675e16ddd4c8b0867c php-5.0_beta1-r1.ebuild 1282
+MD5 6d2bf1b20c4fdbbaab606ab5159f2e12 php-5.0_beta1.ebuild 1157
MD5 b56e1fe8a594347397a50b11a8bd0cb5 php-4.3.8.ebuild 1078
-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 1c8a4f1e84c9c40dd232bc40daafd0f4 files/digest-php-4.3.7-r1 207
+MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0 63
+MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1-r1 65
MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
-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 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
MD5 94bcbd53726fd6e56858274550dd3f3d files/digest-php-4.3.8 131
-MD5 145aa402c3215f537c8dada743b63816 files/digest-php-5.0.0 66
-MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
diff --git a/dev-php/php/files/digest-php-5.0.0 b/dev-php/php/files/digest-php-5.0.0
index fd4537e875e8..6c4e3a2e19be 100644
--- a/dev-php/php/files/digest-php-5.0.0
+++ b/dev-php/php/files/digest-php-5.0.0
@@ -1 +1 @@
-MD5 aa24589d3c173052998792e4a6d255fa php-5.0.0RC3.tar.bz2 4535975
+MD5 562b7ad1e903248bbe77884cb904b8b7 php-5.0.0.tar.bz2 4554054
diff --git a/dev-php/php/files/php5_soap_persistence_session.diff b/dev-php/php/files/php5_soap_persistence_session.diff
new file mode 100644
index 000000000000..626ac67f9081
--- /dev/null
+++ b/dev-php/php/files/php5_soap_persistence_session.diff
@@ -0,0 +1,35 @@
+diff -ruN php-5.0.0RC3.orig/ext/soap/soap.c php-5.0.0RC3/ext/soap/soap.c
+--- php-5.0.0RC3.orig/ext/soap/soap.c 2004-06-22 19:35:59.801348936 +0300
++++ php-5.0.0RC3/ext/soap/soap.c 2004-06-29 13:39:00.506820928 +0300
+@@ -1341,16 +1341,21 @@
+ soap_obj = NULL;
+ #if HAVE_PHP_SESSION
+ /* If persistent then set soap_obj from from the previous created session (if available) */
++ char soapname[32+sizeof("_bogus_session_name")]; //Now we use max 32 chars from class name, must be overwriten with dynamic allocation with exact length!!
+ if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) {
+ zval **tmp_soap;
+
++ bzero(soapname,32+sizeof("_bogus_session_name"));
++ strncpy(soapname,service->soap_class.ce->name,32);
++ strcat(soapname,"_bogus_session_name");
++
+ if (PS(session_status) != php_session_active &&
+ PS(session_status) != php_session_disabled) {
+ php_session_start(TSRMLS_C);
+ }
+
+ /* Find the soap object and assign */
+- if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), (void **) &tmp_soap) == SUCCESS &&
++ if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), (void **) &tmp_soap) == SUCCESS &&
+ Z_TYPE_PP(tmp_soap) == IS_OBJECT &&
+ Z_OBJCE_PP(tmp_soap) == service->soap_class.ce) {
+ soap_obj = *tmp_soap;
+@@ -1432,7 +1437,7 @@
+ /* If session then update session hash with new object */
+ if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) {
+ zval **tmp_soap_pp;
+- if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) {
++ if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) {
+ soap_obj = *tmp_soap_pp;
+ }
+ } else {
diff --git a/dev-php/php/php-5.0.0.ebuild b/dev-php/php/php-5.0.0.ebuild
index c13249c281b1..b5ab04a7905f 100644
--- a/dev-php/php/php-5.0.0.ebuild
+++ b/dev-php/php/php-5.0.0.ebuild
@@ -1,9 +1,9 @@
# 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-5.0.0.ebuild,v 1.1 2004/06/27 18:43:25 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.0.ebuild,v 1.2 2004/07/14 12:55:07 stuart Exp $
PHPSAPI="cli"
-MY_P="${PN}-${PV}RC3"
+MY_P="${PN}-${PV}"
inherit php5-sapi eutils
DESCRIPTION="PHP Shell Interpreter"