From: kloczek <kloczek@pld-linux.org>
Date: Sat, 9 Feb 2002 14:04:54 +0000 (+0000)
Subject: - updated for 4.1.1 (merge DEVEL branch to HEAD).
X-Git-Tag: php-4_1_1-1~6
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp.git;a=commitdiff_plain;h=68abf4df74e0ec2d683bf68169c96b5b0649edd5

- updated for 4.1.1 (merge DEVEL branch to HEAD).

Changed files:
    php-ac250.patch -> 1.2
    php-link-libs.patch -> 1.4
    php-mailsecurity2.patch -> 1.2
    php-mysql-socket.patch -> 1.5
    php-oracle9.patch -> 1.2
---

diff --git a/php-ac250.patch b/php-ac250.patch
index b3ca27d..68411c5 100644
--- a/php-ac250.patch
+++ b/php-ac250.patch
@@ -114,8 +114,8 @@
    PHP_EXTENSION(yp, $ext_shared)
  
    case "$host_alias" in
---- php-4.0.6/acinclude.m4.wiget	Sun Jun 10 21:52:56 2001
-+++ php-4.0.6/acinclude.m4	Fri Jul  6 09:26:10 2001
+--- php-4.1.1/acinclude.m4.wiget	Sun Jun 10 21:52:56 2001
++++ php-4.1.1/acinclude.m4	Fri Jul  6 09:26:10 2001
 @@ -351,7 +351,7 @@
    AC_SUBST($1)
  ])
@@ -134,19 +134,6 @@
    $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $1
  ])
  
-@@ -798,12 +798,6 @@
-   PHP_FAST_OUTPUT($ext_builddir/Makefile)
- ])
- 
--PHP_SUBST(EXT_SUBDIRS)
--PHP_SUBST(EXT_STATIC)
--PHP_SUBST(EXT_SHARED)
--PHP_SUBST(EXT_LIBS)
--PHP_SUBST(EXT_LTLIBS)
--
- dnl
- dnl Solaris requires main code to be position independent in order
- dnl to let shared objects find symbols.  Weird.  Ugly.
 @@ -914,6 +908,7 @@
  dnl ## This macro can be used several times.
  AC_DEFUN(PHP_OUTPUT,[
@@ -155,18 +142,6 @@
  ])
  
  AC_DEFUN(PHP_DECLARED_TIMEZONE,[
-@@ -954,11 +949,6 @@
-   fi
- ])
- 
--AC_DEFUN(AC_ADD_LIBPATH, [indir([PHP_ADD_LIBPATH])])
--AC_DEFUN(AC_ADD_LIBRARY, [indir([PHP_ADD_LIBRARY])])
--AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH, [indir([PHP_ADD_LIBRARY_WITH_PATH])])
--AC_DEFUN(AC_ADD_INCLUDE, [indir([PHP_ADD_INCLUDE])])
--
- AC_DEFUN(PHP_FOPENCOOKIE,[
- 	AC_CHECK_FUNC(fopencookie, [ have_glibc_fopencookie=yes ])
- 
 --- php-4.0.6/configure.in.wiget	Fri Jul  6 08:37:53 2001
 +++ php-4.0.6/configure.in	Fri Jul  6 09:32:15 2001
 @@ -5,7 +5,7 @@
@@ -260,3 +235,14 @@
  dnl ## Local Variables:
  dnl ## tab-width: 4
  dnl ## End:
+--- php-4.1.1/ext/imap/config.m4.orig	Tue Aug  7 18:18:04 2001
++++ php-4.1.1/ext/imap/config.m4	Sat Jan 19 13:50:24 2002
+@@ -133,7 +133,7 @@
+       #endif
+     ],[
+       AC_DEFINE(HAVE_IMAP2001, 1, [ ])
+-    ],[ ])
++    ],[:])
+     CPPFLAGS=$old_CPPFLAGS
+ 
+     AC_CHECK_LIB(pam, pam_start) 
diff --git a/php-link-libs.patch b/php-link-libs.patch
index cc0d885..d69e07f 100644
--- a/php-link-libs.patch
+++ b/php-link-libs.patch
@@ -1,12 +1,3 @@
---- php-4.0.6/ext/bz2/Makefile.in.wiget	Wed Oct 18 20:32:21 2000
-+++ php-4.0.6/ext/bz2/Makefile.in	Wed Jul  4 22:44:51 2001
-@@ -3,5 +3,6 @@
- LTLIBRARY_NAME        = libbz2.la
- LTLIBRARY_SOURCES     = bz2.c
- LTLIBRARY_SHARED_NAME = bz2.la
-+LTLIBRARY_SHARED_LIBADD = $(BZ2_SHARED_LIBADD)
- 
- include $(top_srcdir)/build/dynlib.mk
 --- php-4.0.6/ext/yp/Makefile.in.wiget	Tue May  2 03:21:26 2000
 +++ php-4.0.6/ext/yp/Makefile.in	Wed Jul  4 22:44:51 2001
 @@ -2,5 +2,6 @@
@@ -16,8 +7,8 @@
 +LTLIBRARY_SHARED_LIBADD = $(NSL_SHARED_LIBADD)
  
  include $(top_srcdir)/build/dynlib.mk
---- php-4.0.6/ext/yp/config.m4.wiget	Tue May  2 03:21:26 2000
-+++ php-4.0.6/ext/yp/config.m4	Wed Jul  4 22:44:51 2001
+--- php-4.1.1/ext/yp/config.m4.wiget	Tue May  2 03:21:26 2000
++++ php-4.1.1/ext/yp/config.m4	Wed Jul  4 22:44:51 2001
 @@ -6,8 +6,11 @@
  [  --enable-yp             Include YP support])
  
@@ -28,7 +19,7 @@
 +  AC_CHECK_LIB(nsl, yp_match, [AC_DEFINE(HAVE_YP,1,[ ])], [AC_MSG_ERROR(YP module requires libnsl)],)
    PHP_EXTENSION(yp, $ext_shared)
 +
-   case "$host_alias" in
+   case $host_alias in
    *solaris*)
      AC_DEFINE(SOLARIS_YP,1,[ ]) ;;
 --- php-4.0.6/configure.in.wiget	Wed Jun 20 22:12:59 2001
diff --git a/php-mailsecurity2.patch b/php-mailsecurity2.patch
index be1c755..0e4e89d 100644
--- a/php-mailsecurity2.patch
+++ b/php-mailsecurity2.patch
@@ -1,17 +1,6 @@
-Index: php4/ext/standard/mail.c
-===================================================================
-RCS file: /repository/php4/ext/standard/mail.c,v
-retrieving revision 1.33
-retrieving revision 1.44
-diff -u -r1.33 -r1.44
---- php4/ext/standard/mail.c	2 Apr 2001 16:37:50 -0000	1.33
+--- php4/ext/standard/mail.c	2 Apr 2001 16:37:50 -0000	1.41
 +++ php4/ext/standard/mail.c	25 Sep 2001 22:48:43 -0000	1.44
-@@ -12,11 +12,11 @@
-    | obtain it through the world-wide-web, please send a note to          |
-    | license@php.net so we can mail you a copy immediately.               |
-    +----------------------------------------------------------------------+
--   | Authors:                                                             |
-+   | Authors: Rasmus Lerdorf <rasmus@php.net>                             |
+@@ -12,7 +12,7 @@
     +----------------------------------------------------------------------+
   */
  
@@ -20,15 +9,6 @@ diff -u -r1.33 -r1.44
  
  #include <stdlib.h>
  #include <ctype.h>
-@@ -34,6 +34,8 @@
- #endif
- #include "php_mail.h"
- #include "php_ini.h"
-+#include "safe_mode.h"
-+#include "exec.h"
- 
- #if HAVE_SENDMAIL
- #ifdef PHP_WIN32
 @@ -54,8 +56,8 @@
  	}
  
@@ -40,14 +20,6 @@ diff -u -r1.33 -r1.44
  	} else {
  		php_error(E_WARNING, "Must give string parameter to ezmlm_hash()");
  		RETURN_FALSE;
-@@ -70,6 +72,7 @@
- 	
- 	RETURN_LONG((int) h);
- }
-+/* }}} */
- 
- /* {{{ proto int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
-    Send an email message */
 @@ -85,8 +88,8 @@
  	}
  	/* To: */
@@ -64,9 +36,8 @@ diff -u -r1.33 -r1.44
  	/* Subject: */
  	convert_to_string_ex(argv[1]);
 -	if ((*argv[1])->value.str.val) {
--		subject = (*argv[1])->value.str.val;
 +	if (Z_STRVAL_PP(argv[1])) {
-+		subject = Z_STRVAL_PP(argv[1]);
+ 		subject = Z_STRVAL_PP(argv[1]);
  	} else {
  		php_error(E_WARNING, "No subject field in mail command");
  		RETURN_FALSE;
@@ -75,143 +46,8 @@ diff -u -r1.33 -r1.44
  	/* message body */
  	convert_to_string_ex(argv[2]);
 -	if ((*argv[2])->value.str.val) {
--		message = (*argv[2])->value.str.val;
 +	if (Z_STRVAL_PP(argv[2])) {
-+		message = Z_STRVAL_PP(argv[2]);
+ 		message = Z_STRVAL_PP(argv[2]);
  	} else {
  		/* this is not really an error, so it is allowed. */
  		php_error(E_WARNING, "No message string in mail command");
-@@ -113,41 +116,46 @@
- 
- 	if (argc >= 4) {			/* other headers */
- 		convert_to_string_ex(argv[3]);
--		headers = (*argv[3])->value.str.val;
-+		headers = Z_STRVAL_PP(argv[3]);
- 	}
- 	
- 	if (argc == 5) {			/* extra options that get passed to the mailer */
- 		convert_to_string_ex(argv[4]);
--		extra_cmd = (*argv[4])->value.str.val;
-+		extra_cmd = php_escape_shell_arg(Z_STRVAL_PP(argv[4]));
- 	}
- 	
- 	if (php_mail(to, subject, message, headers, extra_cmd)) {
--		RETURN_TRUE;
-+		RETVAL_TRUE;
- 	} else {
--		RETURN_FALSE;
-+		RETVAL_FALSE;
- 	}
-+	if (extra_cmd) efree (extra_cmd);
- }
- /* }}} */
- 
--int php_mail(char *to, char *subject, char *message, char *headers, char *extra_cmd)
-+/* {{{ php_mail
-+ */
-+PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char *extra_cmd)
- {
- #ifdef PHP_WIN32
- 	int tsm_err;
--#else
-+#endif
- 	FILE *sendmail;
- 	int ret;
- 	char *sendmail_path = INI_STR("sendmail_path");
- 	char *sendmail_cmd = NULL;
--#endif
- 
-+	if (!sendmail_path) {
- #ifdef PHP_WIN32
--	if (TSendMail(INI_STR("SMTP"), &tsm_err, headers, subject, to, message) != SUCCESS){
--		php_error(E_WARNING, GetSMErrorText(tsm_err));
--		return 0;
--	}
-+		/* handle old style win smtp sending */
-+		if (TSendMail(INI_STR("SMTP"), &tsm_err, headers, subject, to, message) != SUCCESS){
-+			php_error(E_WARNING, GetSMErrorText(tsm_err));
-+			return 0;
-+		}
-+		return 1;
- #else
--	if (!sendmail_path) {
- 		return 0;
-+#endif
- 	}
- 	if (extra_cmd != NULL) {
- 		sendmail_cmd = emalloc (strlen (sendmail_path) + strlen (extra_cmd) + 2);
-@@ -158,7 +166,11 @@
- 		sendmail_cmd = sendmail_path;
- 	}
- 
-+#ifdef PHP_WIN32
-+	sendmail = popen(sendmail_cmd, "wb");
-+#else
- 	sendmail = popen(sendmail_cmd, "w");
-+#endif
- 	if (extra_cmd != NULL)
- 		efree (sendmail_cmd);
- 
-@@ -170,11 +182,16 @@
- 		}
- 		fprintf(sendmail, "\n%s\n", message);
- 		ret = pclose(sendmail);
-+#ifdef PHP_WIN32
-+		if (ret == -1)
-+#else
- #if defined(EX_TEMPFAIL)
--		if ((ret != EX_OK)&&(ret != EX_TEMPFAIL)) {
-+		if ((ret != EX_OK)&&(ret != EX_TEMPFAIL)) 
- #else
--		if (ret != EX_OK) {
-+		if (ret != EX_OK) 
-+#endif
- #endif
-+		{
- 			return 0;
- 		} else {
- 			return 1;
-@@ -183,18 +200,27 @@
- 		php_error(E_WARNING, "Could not execute mail delivery program");
- 		return 0;
- 	}
--#endif
- 	return 1;
- }
-+/* }}} */
- 
-+/* {{{ PHP_MINFO_FUNCTION
-+ */
- PHP_MINFO_FUNCTION(mail)
- {
-+	char *sendmail_path = INI_STR("sendmail_path");
-+
- #ifdef PHP_WIN32
--        php_info_print_table_row(2, "Internal Sendmail Support for Windows 4", "enabled");
-+	if (!sendmail_path) {
-+        php_info_print_table_row(2, "Internal Sendmail Support for Windows", "enabled");
-+	} else {
-+        php_info_print_table_row(2, "Path to sendmail", sendmail_path);
-+	}
- #else
--        php_info_print_table_row(2, "Path to sendmail", INI_STR("sendmail_path") );
-+    php_info_print_table_row(2, "Path to sendmail", sendmail_path);
- #endif
- }
-+/* }}} */
- 
- #else
- 
-@@ -203,9 +229,11 @@
- 
- #endif
- 
--
- /*
-  * Local variables:
-  * tab-width: 4
-+ * c-basic-offset: 4
-  * End:
-+ * vim600: sw=4 ts=4 fdm=marker
-+ * vim<600: sw=4 ts=4
-  */
diff --git a/php-mysql-socket.patch b/php-mysql-socket.patch
index de6e3dd..20c96b2 100644
--- a/php-mysql-socket.patch
+++ b/php-mysql-socket.patch
@@ -1,6 +1,6 @@
---- php-4.0.4/ext/mysql/config.m4.wiget	Tue Nov 21 12:07:50 2000
-+++ php-4.0.4/ext/mysql/config.m4	Wed Dec 20 17:12:47 2000
-@@ -16,18 +16,25 @@
+--- php-4.1.1/ext/mysql/config.m4.orig	Sat Nov  3 22:26:27 2001
++++ php-4.1.1/ext/mysql/config.m4	Sat Jan 19 10:20:23 2002
+@@ -16,19 +16,25 @@
  ])
  	
  AC_DEFUN(PHP_MYSQL_SOCK,[
@@ -11,30 +11,30 @@
 -      /var/tmp/mysql.sock \
 -      /var/lib/mysql/mysql.sock \
 -      /var/mysql/mysql.sock \
+-      /Private/tmp/mysql.sock \
 -      ; do
 -    if test -r $i; then
 -      MYSQL_SOCK=$i
--    fi
++    AC_ARG_WITH(mysql_sock,
++  [  --with-mysql-socket=PATH	
++                                Specify location of MySQL UNIX socket,
++  			      defaults search in know locations],[
++  	MYSQL_SOCK=$withval
++  	],)
++    if test "$MYSQL_SOCK" = "" -o "$MYSQL_SOCK" = "no" -o "MYSQL_SOCK" = "yes"; then
++      AC_MSG_CHECKING(for MySQL UNIX socket)
++      MYSQL_SOCK=/tmp/mysql.sock
++      for i in  \
++          /var/run/mysqld/mysqld.sock \
++          /var/tmp/mysql.sock \
++          /var/lib/mysql/mysql.sock \
++          ; do
++        if test -r $i; then
++          MYSQL_SOCK=$i
++        fi
++      done
+     fi
 -  done
-+   AC_ARG_WITH(mysql_sock,
-+ [  --with-mysql-socket=PATH	
-+                               Specify location of MySQL UNIX socket,
-+ 			      defaults search in know locations],[
-+ 	MYSQL_SOCK=$withval
-+ 	],)
-+   if test "$MYSQL_SOCK" = "" -o "$MYSQL_SOCK" = "no" -o "MYSQL_SOCK" = "yes"; then
-+     AC_MSG_CHECKING(for MySQL UNIX socket)
-+     MYSQL_SOCK=/tmp/mysql.sock
-+     for i in  \
-+         /var/run/mysqld/mysqld.sock \
-+         /var/tmp/mysql.sock \
-+         /var/lib/mysql/mysql.sock \
-+         ; do
-+       if test -r $i; then
-+         MYSQL_SOCK=$i
-+       fi
-+     done
-+   fi
    AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "$MYSQL_SOCK", [ ])
    AC_MSG_RESULT($MYSQL_SOCK)
  ])
diff --git a/php-oracle9.patch b/php-oracle9.patch
index bf96d7b..8c115fc 100644
--- a/php-oracle9.patch
+++ b/php-oracle9.patch
@@ -1,27 +1,3 @@
-diff -ur php-4.0.6/ext/oci8/config.m4 php-4.0.6.ora/ext/oci8/config.m4
---- php-4.0.6/ext/oci8/config.m4	Sat May 12 11:29:07 2001
-+++ php-4.0.6.ora/ext/oci8/config.m4	Mon Sep 17 16:15:22 2001
-@@ -5,6 +5,8 @@
-   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
- 	OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
- 	test -z "$OCI8_VERSION" && OCI8_VERSION=7.3
-+  elif test -f $OCI8_DIR/lib/libclntsh.s?.9.0; then
-+	OCI8_VERSION=9.0
-   elif test -f $OCI8_DIR/lib/libclntsh.s?.8.0; then
- 	OCI8_VERSION=8.1
-   elif test -f $OCI8_DIR/lib/libclntsh.s?.1.0; then
-@@ -72,6 +74,11 @@
- 	  ;;
- 
- 	8.1)
-+  	  PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
-+  	  PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
-+  	  AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
-+	  ;;
-+	9.0)
-   	  PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
-   	  PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
-   	  AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
 diff -ur php-4.0.6/ext/oracle/config.m4 php-4.0.6.ora/ext/oracle/config.m4
 --- php-4.0.6/ext/oracle/config.m4	Sat May 12 11:29:07 2001
 +++ php-4.0.6.ora/ext/oracle/config.m4	Mon Sep 17 16:16:43 2001
@@ -29,11 +5,11 @@ diff -ur php-4.0.6/ext/oracle/config.m4 php-4.0.6.ora/ext/oracle/config.m4
    if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
    	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
  	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
-+  elif test -f $ORACLE_DIR/lib/libclntsh.s?.9.0; then
++  elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
 +    ORACLE_VERSION=9.0
-   elif test -f $ORACLE_DIR/lib/libclntsh.s?.8.0; then
+   elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
      ORACLE_VERSION=8.1
-   elif test -f $ORACLE_DIR/lib/libclntsh.s?.1.0; then
+   elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
 @@ -148,6 +150,10 @@
  	  ;;