Update PHP ports to 4.3.11 and 5.0.4 releases:

- fix security issues
- unbreak PEAR packages [1]

PR:		ports/78516 [1]
Submitted by:	Yen-Ming Lee <leeym@utopia.leeym.com> [1]
Tested by:	thierry

12 files changed, 52 insertions, 213 deletions

diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index e54469434044..42abe6522d2d 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	php4
-PORTVERSION=	4.3.10
-PORTREVISION?=	2
+PORTVERSION=	4.3.11
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
@@ -113,8 +113,8 @@ CONFIGURE_ENV=	ac_cv_pthreads_lib=${PTHREAD_LIBS} \
 .if defined(WITH_OPENSSL)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} \
-                --with-openssl-dir=${OPENSSLBASE}
-LDFLAGS+=       -L${OPENSSLLIB} -lcrypto -lssl
+		--with-openssl-dir=${OPENSSLBASE}
+LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 .endif
 
 .if defined(WITH_APACHE)
diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext
index 499105d57d48..e30e6237e741 100644
--- a/lang/php4/Makefile.ext
+++ b/lang/php4/Makefile.ext
@@ -139,6 +139,12 @@ USE_ICONV=	yes
 LIB_DEPENDS+=	c-client4.8:${PORTSDIR}/mail/cclient
 
 CONFIGURE_ARGS+=--with-imap=${LOCALBASE}
+.if !defined(WITHOUT_SSL)
+CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE}
+
+LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
+USE_OPENSSL=	yes
+.endif
 .endif
 
 .if ${PHP_MODNAME} == "interbase"
@@ -429,19 +435,6 @@ CONFIGURE_ARGS+=--enable-gd-jis-conv
 .	endif
 .endif
 
-.if ${PHP_MODNAME} == "imap"
-.	if !exists(${LOCALBASE}/lib/libc-client4.so)
-.		if !defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=--with-imap-ssl=${LOCALBASE}
-.		endif
-.	else
-WITH_IMAP_SSL!=	/usr/bin/ldd ${LOCALBASE}/lib/libc-client4.so | ${GREP} libssl || ${TRUE}
-.		if !empty(WITH_IMAP_SSL)
-CONFIGURE_ARGS+=--with-imap-ssl=${LOCALBASE}
-.		endif
-.	endif
-.endif
-
 .if ${PHP_MODNAME} == "mbstring"
 .	if defined(WITHOUT_REGEX)
 CONFIGURE_ARGS+=--disable-mbregex
diff --git a/lang/php4/distinfo b/lang/php4/distinfo
index cbfdb5370d4c..c1655cc872e4 100644
--- a/lang/php4/distinfo
+++ b/lang/php4/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-4.3.10.tar.bz2) = 7e56824dae9679c59a8234eb848aa542
-SIZE (php-4.3.10.tar.bz2) = 4026148
+MD5 (php-4.3.11.tar.bz2) = fbc67d240812136a9842bc1f2a217b7a
+SIZE (php-4.3.11.tar.bz2) = 4012575
diff --git a/lang/php4/files/patch-Zend::zend_execute.c b/lang/php4/files/patch-Zend::zend_execute.c
deleted file mode 100644
index bc6f098c8ad0..000000000000
--- a/lang/php4/files/patch-Zend::zend_execute.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- Zend/zend_execute.c.orig	Tue Dec 28 15:03:55 2004
-+++ Zend/zend_execute.c	Tue Dec 28 15:03:57 2004
-@@ -1577,6 +1577,10 @@
- 									EX(Ts)[EX(opline)->op1.u.var].EA.data.overloaded_element.elements_list = (zend_llist *) emalloc(sizeof(zend_llist));
- 									zend_llist_init(EX(Ts)[EX(opline)->op1.u.var].EA.data.overloaded_element.elements_list, sizeof(zend_overloaded_element), NULL, 0);
- 									EX(object).ptr->refcount++;
-+									/* is-ref needed so that assign to this in call won't separate it */
-+									if(EX(object).ptr->refcount > 1) {
-+										EX(object).ptr->is_ref = 1;
-+									}
- 								}
- 								zend_llist_add_element(EX(Ts)[EX(opline)->op1.u.var].EA.data.overloaded_element.elements_list, &overloaded_element);
- 								EX(fbc) = (zend_function *) emalloc(sizeof(zend_function));
diff --git a/lang/php4/files/patch-Zend::zend_strtod.c b/lang/php4/files/patch-Zend::zend_strtod.c
deleted file mode 100644
index f4f726c775bd..000000000000
--- a/lang/php4/files/patch-Zend::zend_strtod.c
+++ /dev/null
@@ -1,58 +0,0 @@
---- Zend/zend_strtod.c.orig	2004/12/14 08:35:26
-+++ Zend/zend_strtod.c	2004/12/21 01:08:09
-@@ -91,22 +91,21 @@
-
- #include <zend_strtod.h>
-
--#if defined(LIBC_SCCS) && !defined(lint)
--static char *rcsid = "$OpenBSD: strtod.c,v 1.19 2004/02/03 16:52:11 drahn Exp $";
--#endif /* LIBC_SCCS and not lint */
--
--#if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
--    defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
--    defined(__powerpc__) || defined(__ppc__) || defined(__m88k__) || \
--    defined(__hppa__) || defined(__x86_64__) || (defined(__arm__) && \
--    defined(__VFP_FP__))
-+#if defined(HAVE_INTTYPES_H)
-+#include <inttypes.h>
-+#elif defined(HAVE_STDINT_H)
-+#include <stdint.h>
-+#endif
-+
-+#ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
--#if BYTE_ORDER == BIG_ENDIAN
-+#endif
-+
-+#ifdef WORDS_BIGENDIAN
- #define IEEE_BIG_ENDIAN
- #else
- #define IEEE_LITTLE_ENDIAN
- #endif
--#endif
-
- #if defined(__arm__) && !defined(__VFP_FP__)
- /*
-@@ -123,20 +122,16 @@ static char *rcsid = "$OpenBSD: strtod.c
-
- #if defined(_MSC_VER)
- #define int32_t __int32
--#define u_int32_t unsigned __int32
-+#define uint32_t unsigned __int32
- #define IEEE_LITTLE_ENDIAN
- #endif
-
--#if defined(__sparc__) || defined(__ppc__)
--#define u_int32_t uint32_t
--#endif
--
- #ifdef HAVE_SYS_BITYPES_H
- #include <sys/bitypes.h>
- #endif
-
- #define Long	int32_t
--#define ULong	u_int32_t
-+#define ULong	uint32_t
-
- #ifdef __cplusplus
- #include "malloc.h"
diff --git a/lang/php4/files/patch-acinclude.m4 b/lang/php4/files/patch-acinclude.m4
new file mode 100644
index 000000000000..aa1a2e8d683c
--- /dev/null
+++ b/lang/php4/files/patch-acinclude.m4
@@ -0,0 +1,14 @@
+--- acinclude.m4.orig	Mon Apr  4 10:30:15 2005
++++ acinclude.m4	Mon Apr  4 10:33:00 2005
+@@ -1685,9 +1685,9 @@
+   unset OPENSSL_LIBDIR
+ 
+   dnl Fallbacks for different configure options
+-  if test "$PHP_OPENSSL" != "no"; then
++  if test -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then
+     PHP_OPENSSL_DIR=$PHP_OPENSSL
+-  elif test "$PHP_IMAP_SSL" != "no"; then
++  elif test -n "$PHP_IMAP_SSL" && test "$PHP_IMAP_SSL" != "no"; then
+     PHP_OPENSSL_DIR=$PHP_IMAP_SSL
+   fi
+ 
diff --git a/lang/php4/files/patch-ext::standard::php_var.h b/lang/php4/files/patch-ext::standard::php_var.h
deleted file mode 100644
index c3b01c3a9fd7..000000000000
--- a/lang/php4/files/patch-ext::standard::php_var.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/standard/php_var.h.orig	2004/09/05 16:29:04
-+++ ext/standard/php_var.h	2005/01/15 18:18:08
-@@ -41,6 +41,7 @@ PHPAPI void php_debug_zval_dump(zval **s
-
- struct php_unserialize_data {
- 	void *first;
-+	void *first_dtor;
- };
-
- typedef struct php_unserialize_data php_unserialize_data_t;
-@@ -54,7 +55,8 @@ PHPAPI int php_var_unserialize(zval **rv
-    zend_hash_destroy(&(var_hash))
-
- #define PHP_VAR_UNSERIALIZE_INIT(var_hash) \
--	(var_hash).first = 0
-+	(var_hash).first = 0; \
-+	(var_hash).first_dtor = 0
- #define PHP_VAR_UNSERIALIZE_DESTROY(var_hash) \
- 	var_destroy(&(var_hash))
-
diff --git a/lang/php4/files/patch-ext::standard::var_unserializer.c b/lang/php4/files/patch-ext::standard::var_unserializer.c
deleted file mode 100644
index 930becda86ed..000000000000
--- a/lang/php4/files/patch-ext::standard::var_unserializer.c
+++ /dev/null
@@ -1,87 +0,0 @@
---- ext/standard/var_unserializer.c.orig	2004/12/03 16:02:48
-+++ ext/standard/var_unserializer.c	2005/01/18 10:57:05
-@@ -56,6 +56,30 @@ static inline void var_push(php_unserial
- 	var_hash->data[var_hash->used_slots++] = *rval;
- }
-
-+static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval)
-+{
-+	var_entries *var_hash = var_hashx->first_dtor, *prev = NULL;
-+
-+	while (var_hash && var_hash->used_slots == VAR_ENTRIES_MAX) {
-+		prev = var_hash;
-+		var_hash = var_hash->next;
-+	}
-+
-+	if (!var_hash) {
-+		var_hash = emalloc(sizeof(var_entries));
-+		var_hash->used_slots = 0;
-+		var_hash->next = 0;
-+
-+		if (!var_hashx->first_dtor)
-+			var_hashx->first_dtor = var_hash;
-+		else
-+			prev->next = var_hash;
-+	}
-+
-+	(*rval)->refcount++;
-+	var_hash->data[var_hash->used_slots++] = *rval;
-+}
-+
- PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval **nzval)
- {
- 	int i;
-@@ -93,6 +117,7 @@ static int var_access(php_unserialize_da
- PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
- {
- 	void *next;
-+	int i;
- 	var_entries *var_hash = var_hashx->first;
-
- 	while (var_hash) {
-@@ -100,6 +125,17 @@ PHPAPI void var_destroy(php_unserialize_
- 		efree(var_hash);
- 		var_hash = next;
- 	}
-+
-+	var_hash = var_hashx->first_dtor;
-+
-+	while (var_hash) {
-+		for (i = 0; i < var_hash->used_slots; i++) {
-+			zval_ptr_dtor(&var_hash->data[i]);
-+		}
-+		next = var_hash->next;
-+		efree(var_hash);
-+		var_hash = next;
-+	}
- }
-
- /* }}} */
-@@ -177,7 +213,7 @@ static inline size_t parse_uiv(const uns
- static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, int elements)
- {
- 	while (elements-- > 0) {
--		zval *key, *data, *old_data;
-+		zval *key, *data, **old_data;
-
- 		ALLOC_INIT_ZVAL(key);
-
-@@ -205,14 +241,14 @@ static inline int process_nested_data(UN
-
- 		switch (Z_TYPE_P(key)) {
- 			case IS_LONG:
--				if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)) {
--					var_replace(var_hash, old_data, rval);
-+				if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) {
-+					var_push_dtor(var_hash, old_data);
- 				}
- 				zend_hash_index_update(ht, Z_LVAL_P(key), &data, sizeof(data), NULL);
- 				break;
- 			case IS_STRING:
--				if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)) {
--					var_replace(var_hash, old_data, rval);
-+				if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
-+					var_push_dtor(var_hash, old_data);
- 				}
- 				zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
- 				break;
diff --git a/lang/php4/files/patch-pear::Makefile.frag b/lang/php4/files/patch-pear::Makefile.frag
index ee24944b46c6..082aa5e74fb8 100644
--- a/lang/php4/files/patch-pear::Makefile.frag
+++ b/lang/php4/files/patch-pear::Makefile.frag
@@ -4,7 +4,7 @@
  # -*- makefile -*-
  
  peardir=$(PEAR_INSTALLDIR)
-+XML_RPC_ver=1.1.0
++XML_RPC_ver=1.2.2
  
  # Skip all php.ini files altogether
  PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0
diff --git a/lang/php4/files/patch-scripts::phpize.in b/lang/php4/files/patch-scripts::phpize.in
index a19ec72c181d..8b250b897908 100644
--- a/lang/php4/files/patch-scripts::phpize.in
+++ b/lang/php4/files/patch-scripts::phpize.in
@@ -1,16 +1,15 @@
---- scripts/phpize.in.orig	Fri Nov 14 03:21:15 2003
-+++ scripts/phpize.in	Wed Jul  7 01:34:05 2004
-@@ -56,5 +56,5 @@
+--- scripts/phpize.in.orig	Fri Apr  1 11:37:05 2005
++++ scripts/phpize.in	Fri Apr  1 11:37:25 2005
+@@ -102,9 +102,9 @@
  
--aclocal || exit 1
--autoconf || exit 1
--autoheader || exit 1
-+aclocal15 || exit 1
-+autoconf253 || exit 1
-+autoheader253 || exit 1
- test -x $builddir/build/shtool || chmod +x $builddir/build/shtool
-@@ -66,3 +66,3 @@
- fi
--libtoolize=`$builddir/build/shtool path glibtoolize libtoolize`
-+libtoolize=`$builddir/build/shtool path libtoolize13`
- $libtoolize -f -c || exit 1
+ phpize_autotools()
+ {
+-  aclocal    || exit 1
+-  autoconf   || exit 1
+-  autoheader || exit 1
++  aclocal15    || exit 1
++  autoconf253   || exit 1
++  autoheader253 || exit 1
+ }
+ 
+ # Main script
diff --git a/lang/php4/pkg-plist b/lang/php4/pkg-plist
index 83d8c709fbca..77fba0c8ea20 100644
--- a/lang/php4/pkg-plist
+++ b/lang/php4/pkg-plist
@@ -160,6 +160,10 @@ include/php/regex/regex_extra.h
 include/php/regex/utils.h
 lib/php/build/Makefile.global
 lib/php/build/acinclude.m4
+lib/php/build/config.guess
+lib/php/build/config.sub
+lib/php/build/libtool.m4
+lib/php/build/ltmain.sh
 lib/php/build/mkdep.awk
 lib/php/build/phpize.m4
 lib/php/build/scan_makefile_in.awk
diff --git a/lang/php4/pkg-plist.pear b/lang/php4/pkg-plist.pear
index f04740d29725..5bdbc68fce74 100644
--- a/lang/php4/pkg-plist.pear
+++ b/lang/php4/pkg-plist.pear
@@ -1,4 +1,6 @@
 bin/pear
+@unexec rm %D/lib/php/pear/.filemap 2> /dev/null || true
+@unexec rm %D/lib/php/pear/.lock 2> /dev/null || true
 share/pear/bootstrap/Archive/Tar.php
 share/pear/bootstrap/PEAR.php
 share/pear/bootstrap/System.php
@@ -21,13 +23,18 @@ share/pear/bootstrap/PEAR/Config.php
 share/pear/bootstrap/PEAR/Dependency.php
 share/pear/bootstrap/PEAR/Downloader.php
 share/pear/bootstrap/PEAR/ErrorStack.php
+share/pear/bootstrap/PEAR/Exception.php
 share/pear/bootstrap/PEAR/Frontend/CLI.php
 share/pear/bootstrap/PEAR/Installer.php
 share/pear/bootstrap/PEAR/Packager.php
 share/pear/bootstrap/PEAR/Registry.php
 share/pear/bootstrap/PEAR/Remote.php
+share/pear/bootstrap/PEAR/RunTest.php
 share/pear/bootstrap/XML/RPC.php
 share/pear/bootstrap/XML/RPC/Server.php
+@unexec rmdir %D/lib/php/pear/.registry 2> /dev/null || true
+@unexec rmdir %D/lib/php/pear 2> /dev/null || true
+@unexec rmdir %D/lib/php 2> /dev/null || true
 @dirrm share/pear/bootstrap/Archive
 @dirrm share/pear/bootstrap/Console
 @dirrm share/pear/bootstrap/OS