Update PHP5 to 5.2.1. Includes several important security fixes and

large number of other fixes. Update for all users is strongly advised.

6 files changed, 59 insertions, 54 deletions

diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common
index 8901ea20fb2..07a0ebd0b9e 100644
--- a/lang/php5/Makefile.common
+++ b/lang/php5/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2006/11/07 16:46:51 tron Exp $
+# $NetBSD: Makefile.common,v 1.23 2007/02/20 20:46:19 jdolecek Exp $
 
 .if !defined(DISTNAME)
 DISTNAME=		php-${PHP_BASE_VERS}
@@ -15,7 +15,7 @@ EXTRACT_SUFX?=		.tar.bz2
 MAINTAINER?=		jdolecek@NetBSD.org
 HOMEPAGE?=		http://www.php.net/
 
-PHP_BASE_VERS=		5.2.0
+PHP_BASE_VERS=		5.2.1
 
 PHP_EXTENSION_DIR=	lib/php/20040412
 PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index 14205e4ab65..df3092b1a75 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.21 2006/11/06 22:17:50 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.22 2007/02/20 20:46:19 jdolecek Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -50,9 +50,9 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
-.else
+#.if !empty(PKG_OPTIONS:Mssl)
+#.  include "../../security/openssl/buildlink3.mk"
+#CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+#.else
 CONFIGURE_ARGS+=	--without-openssl
-.endif
+#.endif
diff --git a/lang/php5/PLIST b/lang/php5/PLIST
index 07996e7ccd8..5f9d016e8ba 100644
--- a/lang/php5/PLIST
+++ b/lang/php5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/08/19 14:47:44 taca Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/02/20 20:46:20 jdolecek Exp $
 bin/pear
 bin/peardev
 bin/pecl
@@ -48,7 +48,6 @@ include/php/Zend/zend_language_parser.h
 include/php/Zend/zend_language_scanner.h
 include/php/Zend/zend_list.h
 include/php/Zend/zend_llist.h
-include/php/Zend/zend_mm.h
 include/php/Zend/zend_modules.h
 include/php/Zend/zend_multibyte.h
 include/php/Zend/zend_multiply.h
@@ -73,6 +72,7 @@ include/php/ext/date/lib/timelib.h
 include/php/ext/date/lib/timelib_config.h
 include/php/ext/date/lib/timelib_structs.h
 include/php/ext/date/php_date.h
+include/php/ext/filter/php_filter.h
 include/php/ext/hash/php_hash.h
 include/php/ext/hash/php_hash_adler32.h
 include/php/ext/hash/php_hash_crc32.h
@@ -86,20 +86,28 @@ include/php/ext/hash/php_hash_tiger.h
 include/php/ext/hash/php_hash_types.h
 include/php/ext/hash/php_hash_whirlpool.h
 include/php/ext/libxml/php_libxml.h
-include/php/ext/pcre/pcrelib/internal.h
 include/php/ext/pcre/pcrelib/pcre.h
 include/php/ext/pcre/pcrelib/pcre_internal.h
 include/php/ext/pcre/pcrelib/pcre_scanner.h
 include/php/ext/pcre/pcrelib/pcre_stringpiece.h
 include/php/ext/pcre/pcrelib/pcrecpp.h
-include/php/ext/pcre/pcrelib/pcreposix.h
 include/php/ext/pcre/pcrelib/pcrecpparg.h
+include/php/ext/pcre/pcrelib/pcreposix.h
 include/php/ext/pcre/pcrelib/ucp.h
 include/php/ext/pcre/pcrelib/ucpinternal.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/session/mod_files.h
 include/php/ext/session/mod_user.h
 include/php/ext/session/php_session.h
+include/php/ext/spl/php_spl.h
+include/php/ext/spl/spl_array.h
+include/php/ext/spl/spl_directory.h
+include/php/ext/spl/spl_engine.h
+include/php/ext/spl/spl_exceptions.h
+include/php/ext/spl/spl_functions.h
+include/php/ext/spl/spl_iterators.h
+include/php/ext/spl/spl_observer.h
+include/php/ext/spl/spl_sxe.h
 include/php/ext/standard/base64.h
 include/php/ext/standard/basic_functions.h
 include/php/ext/standard/crc32.h
@@ -372,11 +380,13 @@ share/php/php.gif
 @dirrm include/php/main
 @dirrm include/php/ext/xml
 @dirrm include/php/ext/standard
+@dirrm include/php/ext/spl
 @dirrm include/php/ext/session
 @dirrm include/php/ext/pcre/pcrelib
 @dirrm include/php/ext/pcre
 @dirrm include/php/ext/libxml
 @dirrm include/php/ext/hash
+@dirrm include/php/ext/filter
 @dirrm include/php/ext/date/lib
 @dirrm include/php/ext/date
 @dirrm include/php/ext
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 7e9ce5be8e4..c5b2267240b 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.35 2006/11/07 17:24:39 tron Exp $
+$NetBSD: distinfo,v 1.36 2007/02/20 20:46:20 jdolecek Exp $
 
-SHA1 (php-5.2.0/php-5.2.0.tar.bz2) = 6306829b1b252156ca3a936ec809aba89a71d9e1
-RMD160 (php-5.2.0/php-5.2.0.tar.bz2) = baabe854ac219935ed9f58d348ebf08fb84853de
-Size (php-5.2.0/php-5.2.0.tar.bz2) = 6789838 bytes
+SHA1 (php-5.2.1/php-5.2.1.tar.bz2) = 978ce7cde3d988d9aa672e32e46f815a8b25baa0
+RMD160 (php-5.2.1/php-5.2.1.tar.bz2) = f75078e0e43cb9c64e6d0a8d51a2ebd23cc9131d
+Size (php-5.2.1/php-5.2.1.tar.bz2) = 7163383 bytes
 SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20
-SHA1 (patch-ac) = 95cf7bbbf1a9ce645195854f3b176dd56c94fe47
 SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e
 SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587
 SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc
 SHA1 (patch-ak) = 0a6445b5cf390cb63de8474d75c6e8a4c058afab
+SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50
diff --git a/lang/php5/patches/patch-ac b/lang/php5/patches/patch-ac
deleted file mode 100644
index 04b6cb00201..00000000000
--- a/lang/php5/patches/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/11/07 17:24:39 tron Exp $
-
---- ext/curl/interface.c.orig	2006-10-11 00:12:59.000000000 +0100
-+++ ext/curl/interface.c	2006-11-07 17:17:18.000000000 +0000
-@@ -28,6 +28,18 @@
- 
- #if HAVE_CURL
- 
-+#ifndef CURLOPT_PASSWDDATA
-+#define CURLOPT_PASSWDDATA	0
-+#endif
-+
-+#ifndef	CURLOPT_PASSWDFUNCTION
-+#define	CURLOPT_PASSWDFUNCTION	0
-+#endif
-+
-+#ifndef CURLOPT_FTPASCII
-+#define	CURLOPT_FTPASCII	0
-+#endif
-+
- #include <stdio.h>
- #include <string.h>
- 
-@@ -1158,11 +1170,13 @@
- 	dupch->handlers->read->fp = ch->handlers->read->fp;
- 	dupch->handlers->read->fd = ch->handlers->read->fd;
- 
-+#if CURLOPT_PASSWDDATA != 0
- 	if (ch->handlers->passwd) {
- 		zval_add_ref(&ch->handlers->passwd);
- 		dupch->handlers->passwd = ch->handlers->passwd;
- 		curl_easy_setopt(ch->cp, CURLOPT_PASSWDDATA, (void *) dupch);
- 	}
-+#endif
- 	if (ch->handlers->write->func_name) {
- 		zval_add_ref(&ch->handlers->write->func_name);
- 		dupch->handlers->write->func_name = ch->handlers->write->func_name;
diff --git a/lang/php5/patches/patch-al b/lang/php5/patches/patch-al
new file mode 100644
index 00000000000..be353de85a2
--- /dev/null
+++ b/lang/php5/patches/patch-al
@@ -0,0 +1,32 @@
+$NetBSD: patch-al,v 1.3 2007/02/20 20:46:20 jdolecek Exp $
+
+--- ext/gd/config.m4.orig	2007-02-20 21:14:31.000000000 +0100
++++ ext/gd/config.m4
+@@ -48,18 +48,7 @@ dnl Checks for the configure options
+ dnl
+ 
+ AC_DEFUN([PHP_GD_ZLIB],[
+-	if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
+-		if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
+-			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+-			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
+-		elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
+-			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+-			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
+-		else
+-			AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"])
+-		fi
+-	else
+-		for i in /usr/local /usr; do
++		for i in "$PHP_ZLIB_DIR" /usr/local /usr; do
+ 			if test -f "$i/include/zlib/zlib.h"; then
+ 				PHP_ZLIB_DIR="$i"
+ 				PHP_ZLIB_INCDIR="$i/include/zlib"
+@@ -68,7 +57,6 @@ AC_DEFUN([PHP_GD_ZLIB],[
+ 				PHP_ZLIB_INCDIR="$i/include"
+ 			fi
+ 		done
+-	fi
+ ])
+ 
+ AC_DEFUN([PHP_GD_JPEG],[