Added missing patch files for php-5.0.4

Package-Manager: portage-2.0.51.22-r2

7 files changed, 116 insertions, 2 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index f7d0c1037dda..a45415395926 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.34 2005/09/04 16:58:08 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.35 2005/09/04 22:21:18 stuart Exp $
+
+  04 Sep 2005; Stuart Herbert <stuart@gentoo.org>
+  +files/5.1.0/php5-imap-symlink.diff, +files/5.1.0/php5-iodbc-config.diff,
+  +files/5.1.0/php5-prefork.patch, +files/5.1.0/php5-with-iodbc.diff,
+  +files/5.1.0/php5_soap_persistence_session.diff:
+  Added missing patch files for PHP 5.0 from the overlay
 
   05 Sep 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 498451399786..3231e4effca3 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,11 +1,16 @@
 MD5 b2d154065e47e14f7062af8f1617c30d php-4.4.0.ebuild 7541
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 f56e12c53aaba8b886c557686bb5eb7d ChangeLog 298
+MD5 00fe92cfee8d517ee0f8e1c1864759e1 ChangeLog 603
 MD5 59669e8cec6edf0833db4f04341b533a php-5.0.4.ebuild 4472
 MD5 5bdec1212806fa8f4ccc046325e4ea52 files/digest-php-4.4.0 143
 MD5 11e54e6a5fade48c67bab392af4e33c7 files/digest-php-5.0.4 143
 MD5 110af7b300bcbbfb821fbb58f7923d8b files/5.0.0/php5-iodbc-config.diff 511
 MD5 7d198bde60f94cc8cea5ad9479901e21 files/5.0.0/php5-imap-symlink.diff 620
+MD5 2aca8867fada1d3345859f201ce7e428 files/5.1.0/php5-imap-symlink.diff 652
+MD5 63c7937867dd8cc04b5089c3678ef359 files/5.1.0/php5-iodbc-config.diff 519
+MD5 058042718bc876bf27ab902673919ca9 files/5.1.0/php5-prefork.patch 850
+MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/5.1.0/php5-with-iodbc.diff 443
+MD5 273799e60d5a41a1e6f5ac53781a152f files/5.1.0/php5_soap_persistence_session.diff 1976
 MD5 22ed61ab0175cd83985a90e5d2b3b8b2 files/4.4.0/php4-iodbc-config.diff 511
 MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/4.4.0/php4-with-iodbc.diff 443
 MD5 6d2047e069da7178fc841c4c7c890aa8 files/4.4.0/php4-imap-symlink.diff 620
diff --git a/dev-lang/php/files/5.1.0/php5-imap-symlink.diff b/dev-lang/php/files/5.1.0/php5-imap-symlink.diff
new file mode 100644
index 000000000000..13c2bddcbb40
--- /dev/null
+++ b/dev-lang/php/files/5.1.0/php5-imap-symlink.diff
@@ -0,0 +1,15 @@
+--- ext/imap/config.m4	2005-09-04 00:56:31.000000000 +0200
++++ ext/imap/config.m4	2005-09-04 00:57:03.000000000 +0200
+@@ -146,12 +146,6 @@
+       AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
+     fi
+ 
+-    if test -r "$IMAP_DIR/c-client/c-client.a"; then
+-      ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
+-    elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
+-      ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
+-    fi
+-
+     for lib in c-client4 c-client imap; do
+       IMAP_LIB=$lib
+       IMAP_LIB_CHK($PHP_LIBDIR)
diff --git a/dev-lang/php/files/5.1.0/php5-iodbc-config.diff b/dev-lang/php/files/5.1.0/php5-iodbc-config.diff
new file mode 100644
index 000000000000..b6d1b68dc691
--- /dev/null
+++ b/dev-lang/php/files/5.1.0/php5-iodbc-config.diff
@@ -0,0 +1,14 @@
+--- ext/odbc/config.m4	2005-08-10 02:08:48.000000000 +0200
++++ ext/odbc/config.m4	2005-08-10 02:09:14.000000000 +0200
+@@ -440,9 +440,9 @@
+   fi
+   if test "$withval" != "no"; then
+     PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib)
+-    PHP_ADD_INCLUDE($withval/include, 1)
++    PHP_ADD_INCLUDE($withval/include/iodbc, 1)
+     ODBC_TYPE=iodbc
+-    ODBC_INCLUDE=-I$withval/include
++    ODBC_INCLUDE=-I$withval/include/iodbc
+     ODBC_LFLAGS=-L$withval/$PHP_LIBDIR
+     ODBC_LIBS=-liodbc
+     AC_DEFINE(HAVE_IODBC,1,[ ])
diff --git a/dev-lang/php/files/5.1.0/php5-prefork.patch b/dev-lang/php/files/5.1.0/php5-prefork.patch
new file mode 100644
index 000000000000..135579c33d82
--- /dev/null
+++ b/dev-lang/php/files/5.1.0/php5-prefork.patch
@@ -0,0 +1,26 @@
+diff -u --recursive php-5.0.4-orig/sapi/apache2filter/config.m4 php-5.0.4/sapi/apache2filter/config.m4
+--- php-5.0.4-orig/sapi/apache2filter/config.m4	2005-03-13 20:30:44.767051120 +0000
++++ php-5.0.4/sapi/apache2filter/config.m4	2005-03-13 20:32:01.999310032 +0000
+@@ -115,9 +115,6 @@
+     ;;
+   esac
+ 
+-  if test "$APXS_MPM" != "prefork"; then
+-    PHP_BUILD_THREAD_SAFE
+-  fi
+   AC_MSG_RESULT(yes)
+   
+   PHP_SUBST(APXS)
+diff -u --recursive php-5.0.4-orig/sapi/apache2handler/config.m4 php-5.0.4/sapi/apache2handler/config.m4
+--- php-5.0.4-orig/sapi/apache2handler/config.m4	2005-03-13 20:30:44.771050512 +0000
++++ php-5.0.4/sapi/apache2handler/config.m4	2005-03-13 20:31:50.106118072 +0000
+@@ -114,9 +114,6 @@
+     ;;
+   esac
+ 
+-  if test "$APXS_MPM" != "prefork"; then
+-    PHP_BUILD_THREAD_SAFE
+-  fi
+   AC_MSG_RESULT(yes)
+ 
+   PHP_SUBST(APXS)
diff --git a/dev-lang/php/files/5.1.0/php5-with-iodbc.diff b/dev-lang/php/files/5.1.0/php5-with-iodbc.diff
new file mode 100644
index 000000000000..81afcc0f2de1
--- /dev/null
+++ b/dev-lang/php/files/5.1.0/php5-with-iodbc.diff
@@ -0,0 +1,13 @@
+--- ext/odbc/php_odbc_includes.h	2005-02-22 17:55:18.000000000 +0000
++++ ext/odbc/php_odbc_includes.h	2005-02-22 17:55:26.000000000 +0000
+@@ -91,8 +91,8 @@
+ #elif defined(HAVE_IODBC) /* iODBC library */
+ 
+ #define ODBC_TYPE "iODBC"
+-#include <isql.h>
+-#include <isqlext.h>
++#include <iodbc/isql.h>
++#include <iodbc/isqlext.h>
+ #define HAVE_SQL_EXTENDED_FETCH 1
+ #define SQL_FD_FETCH_ABSOLUTE   0x00000010L
+ #define SQL_CURSOR_DYNAMIC      2UL
diff --git a/dev-lang/php/files/5.1.0/php5_soap_persistence_session.diff b/dev-lang/php/files/5.1.0/php5_soap_persistence_session.diff
new file mode 100644
index 000000000000..626ac67f9081
--- /dev/null
+++ b/dev-lang/php/files/5.1.0/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 {