Update to 5.2.0 release.

13 files changed, 19 insertions, 176 deletions

diff --git a/lang/php5-extensions/Makefile b/lang/php5-extensions/Makefile
index fada407dc17c..4b9fdfc301fd 100644
--- a/lang/php5-extensions/Makefile
+++ b/lang/php5-extensions/Makefile
@@ -47,7 +47,6 @@ OPTIONS=	BCMATH          "bc style precision math functions" off \
 		DOM             "DOM support" on \
 		EXIF            "EXIF support" off \
 		FILEINFO        "fileinfo support" off \
-		FILEPRO         "filePro support" off \
 		FRIBIDI         "FriBidi support" off \
 		FTP             "FTP support" off \
 		GD              "GD library support" off \
@@ -110,7 +109,7 @@ OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
 .endif
 
 ALL_OPTIONS=	BCMATH BZ2 CALENDAR CTYPE CURL DBA DBASE \
-		DOM EXIF FILEINFO FILEPRO FRIBIDI FTP GD GETTEXT \
+		DOM EXIF FILEINFO FRIBIDI FTP GD GETTEXT \
 		GMP ICONV IMAP INTERBASE LDAP MBSTRING MCRYPT \
 		MHASH MIME_MAGIC MING MSSQL MYSQL MYSQLI \
 		NCURSES ODBC OPENSSL PANDA PCNTL PCRE PDF PDO PGSQL POSIX \
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 7b29ab733548..b5968b0cd653 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.1.6
-PORTREVISION?=	3
+PORTVERSION=	5.2.0
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
@@ -58,7 +58,7 @@ MAN1=		php-config.1 phpize.1
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_SUHOSIN)
-PATCHFILES=	suhosin-patch-${PORTVERSION}-0.9.6.patch.gz
+PATCHFILES=	suhosin-patch-${PORTVERSION}-0.9.6.1.patch.gz
 PATCH_SITES=	http://www.hardened-php.net/suhosin/_media/
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	SUHOSIN=""
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index 41148c443970..cbc91b754f16 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -71,10 +71,6 @@ USE_GNOME=	libxml2
 CONFIGURE_ARGS+=--enable-exif
 .endif
 
-.if ${PHP_MODNAME} == "filepro"
-CONFIGURE_ARGS+=--enable-filepro
-.endif
-
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=--enable-ftp \
 		--with-openssl-dir=${OPENSSLBASE}
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index ed2a21921bdd..58b47d10c447 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,6 +1,6 @@
-MD5 (php-5.1.6.tar.bz2) = 08e423aa314369d4392a36b3f7246afc
-SHA256 (php-5.1.6.tar.bz2) = 3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996
-SIZE (php-5.1.6.tar.bz2) = 6454408
-MD5 (suhosin-patch-5.1.6-0.9.6.patch.gz) = 40533ea76767dacbcc8e67522db8ef50
-SHA256 (suhosin-patch-5.1.6-0.9.6.patch.gz) = 4fb2d60f903e765b182f3f72ac9fdb7f0912d94f5f7fb0b144d18ffdc6188118
-SIZE (suhosin-patch-5.1.6-0.9.6.patch.gz) = 23160
+MD5 (php-5.2.0.tar.bz2) = e6029fafcee029edcfa2ceed7a005333
+SHA256 (php-5.2.0.tar.bz2) = e105b6aad55589aecf20ae70ab7aa81eb202296fc52531f62e546af23077cca1
+SIZE (php-5.2.0.tar.bz2) = 6789838
+MD5 (suhosin-patch-5.2.0-0.9.6.1.patch.gz) = 37af5f50d10b7994a5747b88af3d6a54
+SHA256 (suhosin-patch-5.2.0-0.9.6.1.patch.gz) = fb8be454ad11e5c33dd315b4fc1f8f7a6ab10fb59a021cc1dee1a681f0c6483a
+SIZE (suhosin-patch-5.2.0-0.9.6.1.patch.gz) = 23082
diff --git a/lang/php5/files/patch-ext_standard_dir.c b/lang/php5/files/patch-ext_standard_dir.c
deleted file mode 100644
index 58a6bccb9cfe..000000000000
--- a/lang/php5/files/patch-ext_standard_dir.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/standard/dir.c.orig	Mon Oct 16 07:08:36 2006
-+++ ext/standard/dir.c	Mon Oct 16 07:08:40 2006
-@@ -16,7 +16,7 @@
-    +----------------------------------------------------------------------+
-  */
- 
--/* $Id: dir.c,v 1.147.2.3 2006/02/26 10:49:50 helly Exp $ */
-+/* $Id: dir.c,v 1.147.2.3.2.1 2006/10/04 23:19:25 iliaa Exp $ */
- 
- /* {{{ includes/startup/misc */
- 
-@@ -286,7 +286,7 @@
- 		RETURN_FALSE;
- 	}
- 
--	if (PG(safe_mode) && !php_checkuid(str, NULL, CHECKUID_CHECK_FILE_AND_DIR)) {
-+	if ((PG(safe_mode) && !php_checkuid(str, NULL, CHECKUID_CHECK_FILE_AND_DIR)) || php_check_open_basedir(str TSRMLS_CC)) {
- 		RETURN_FALSE;
- 	}
- 	ret = VCWD_CHDIR(str);
diff --git a/lang/php5/files/patch-main_main.c b/lang/php5/files/patch-main_main.c
deleted file mode 100644
index fdab9447de1d..000000000000
--- a/lang/php5/files/patch-main_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/main.c.orig	Sat Dec 10 09:36:39 2005
-+++ main/main.c	Sat Dec 10 09:37:37 2005
-@@ -311,7 +311,7 @@
- 	PHP_INI_ENTRY("smtp_port",					"25",		PHP_INI_ALL,		NULL)
- 	PHP_INI_ENTRY("browscap",					NULL,		PHP_INI_SYSTEM,		NULL)
- #if MEMORY_LIMIT
--	PHP_INI_ENTRY("memory_limit",				"8M",		PHP_INI_ALL,		OnChangeMemoryLimit)
-+	PHP_INI_ENTRY("memory_limit",				"12M",		PHP_INI_ALL,		OnChangeMemoryLimit)
- #endif
- 	PHP_INI_ENTRY("precision",					"14",		PHP_INI_ALL,		OnSetPrecision)
- 	PHP_INI_ENTRY("sendmail_from",				NULL,		PHP_INI_ALL,		NULL)
diff --git a/lang/php5/files/patch-main_php_open_temporary_file.c b/lang/php5/files/patch-main_php_open_temporary_file.c
deleted file mode 100644
index 85f7c51ab47d..000000000000
--- a/lang/php5/files/patch-main_php_open_temporary_file.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- main/php_open_temporary_file.c.orig	Mon Oct 16 07:21:14 2006
-+++ main/php_open_temporary_file.c	Mon Oct 16 07:22:00 2006
-@@ -16,7 +16,7 @@
-    +----------------------------------------------------------------------+
-  */
- 
--/* $Id: php_open_temporary_file.c,v 1.34.2.2 2006/05/23 23:22:26 iliaa Exp $ */
-+/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.4 2006/10/13 01:11:30 iliaa Exp $ */
- 
- #include "php.h"
- 
-@@ -206,6 +206,7 @@
- PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char **opened_path_p TSRMLS_DC)
- {
- 	int fd;
-+	const char *temp_dir;
- 
- 	if (!pfx) {
- 		pfx = "tmp.";
-@@ -214,11 +215,22 @@
- 		*opened_path_p = NULL;
- 	}
- 
-+	if (!dir || *dir == '\0') {
-+def_tmp:
-+		temp_dir = php_get_temporary_directory();
-+
-+		if (temp_dir && *temp_dir != '\0' && !php_check_open_basedir(temp_dir TSRMLS_CC)) {
-+			return php_do_open_temporary_file(temp_dir, pfx, opened_path_p TSRMLS_CC);
-+		} else {
-+			return -1;
-+		}
-+	}
-+
- 	/* Try the directory given as parameter. */
- 	fd = php_do_open_temporary_file(dir, pfx, opened_path_p TSRMLS_CC);
- 	if (fd == -1) {
- 		/* Use default temporary directory. */
--		fd = php_do_open_temporary_file(php_get_temporary_directory(), pfx, opened_path_p TSRMLS_CC);
-+		goto def_tmp;
- 	}
- 	return fd;
- }
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 7b29ab733548..b5968b0cd653 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.1.6
-PORTREVISION?=	3
+PORTVERSION=	5.2.0
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
@@ -58,7 +58,7 @@ MAN1=		php-config.1 phpize.1
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_SUHOSIN)
-PATCHFILES=	suhosin-patch-${PORTVERSION}-0.9.6.patch.gz
+PATCHFILES=	suhosin-patch-${PORTVERSION}-0.9.6.1.patch.gz
 PATCH_SITES=	http://www.hardened-php.net/suhosin/_media/
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	SUHOSIN=""
diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
index 41148c443970..cbc91b754f16 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -71,10 +71,6 @@ USE_GNOME=	libxml2
 CONFIGURE_ARGS+=--enable-exif
 .endif
 
-.if ${PHP_MODNAME} == "filepro"
-CONFIGURE_ARGS+=--enable-filepro
-.endif
-
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=--enable-ftp \
 		--with-openssl-dir=${OPENSSLBASE}
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index ed2a21921bdd..58b47d10c447 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,6 +1,6 @@
-MD5 (php-5.1.6.tar.bz2) = 08e423aa314369d4392a36b3f7246afc
-SHA256 (php-5.1.6.tar.bz2) = 3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996
-SIZE (php-5.1.6.tar.bz2) = 6454408
-MD5 (suhosin-patch-5.1.6-0.9.6.patch.gz) = 40533ea76767dacbcc8e67522db8ef50
-SHA256 (suhosin-patch-5.1.6-0.9.6.patch.gz) = 4fb2d60f903e765b182f3f72ac9fdb7f0912d94f5f7fb0b144d18ffdc6188118
-SIZE (suhosin-patch-5.1.6-0.9.6.patch.gz) = 23160
+MD5 (php-5.2.0.tar.bz2) = e6029fafcee029edcfa2ceed7a005333
+SHA256 (php-5.2.0.tar.bz2) = e105b6aad55589aecf20ae70ab7aa81eb202296fc52531f62e546af23077cca1
+SIZE (php-5.2.0.tar.bz2) = 6789838
+MD5 (suhosin-patch-5.2.0-0.9.6.1.patch.gz) = 37af5f50d10b7994a5747b88af3d6a54
+SHA256 (suhosin-patch-5.2.0-0.9.6.1.patch.gz) = fb8be454ad11e5c33dd315b4fc1f8f7a6ab10fb59a021cc1dee1a681f0c6483a
+SIZE (suhosin-patch-5.2.0-0.9.6.1.patch.gz) = 23082
diff --git a/lang/php53/files/patch-ext_standard_dir.c b/lang/php53/files/patch-ext_standard_dir.c
deleted file mode 100644
index 58a6bccb9cfe..000000000000
--- a/lang/php53/files/patch-ext_standard_dir.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/standard/dir.c.orig	Mon Oct 16 07:08:36 2006
-+++ ext/standard/dir.c	Mon Oct 16 07:08:40 2006
-@@ -16,7 +16,7 @@
-    +----------------------------------------------------------------------+
-  */
- 
--/* $Id: dir.c,v 1.147.2.3 2006/02/26 10:49:50 helly Exp $ */
-+/* $Id: dir.c,v 1.147.2.3.2.1 2006/10/04 23:19:25 iliaa Exp $ */
- 
- /* {{{ includes/startup/misc */
- 
-@@ -286,7 +286,7 @@
- 		RETURN_FALSE;
- 	}
- 
--	if (PG(safe_mode) && !php_checkuid(str, NULL, CHECKUID_CHECK_FILE_AND_DIR)) {
-+	if ((PG(safe_mode) && !php_checkuid(str, NULL, CHECKUID_CHECK_FILE_AND_DIR)) || php_check_open_basedir(str TSRMLS_CC)) {
- 		RETURN_FALSE;
- 	}
- 	ret = VCWD_CHDIR(str);
diff --git a/lang/php53/files/patch-main_main.c b/lang/php53/files/patch-main_main.c
deleted file mode 100644
index fdab9447de1d..000000000000
--- a/lang/php53/files/patch-main_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/main.c.orig	Sat Dec 10 09:36:39 2005
-+++ main/main.c	Sat Dec 10 09:37:37 2005
-@@ -311,7 +311,7 @@
- 	PHP_INI_ENTRY("smtp_port",					"25",		PHP_INI_ALL,		NULL)
- 	PHP_INI_ENTRY("browscap",					NULL,		PHP_INI_SYSTEM,		NULL)
- #if MEMORY_LIMIT
--	PHP_INI_ENTRY("memory_limit",				"8M",		PHP_INI_ALL,		OnChangeMemoryLimit)
-+	PHP_INI_ENTRY("memory_limit",				"12M",		PHP_INI_ALL,		OnChangeMemoryLimit)
- #endif
- 	PHP_INI_ENTRY("precision",					"14",		PHP_INI_ALL,		OnSetPrecision)
- 	PHP_INI_ENTRY("sendmail_from",				NULL,		PHP_INI_ALL,		NULL)
diff --git a/lang/php53/files/patch-main_php_open_temporary_file.c b/lang/php53/files/patch-main_php_open_temporary_file.c
deleted file mode 100644
index 85f7c51ab47d..000000000000
--- a/lang/php53/files/patch-main_php_open_temporary_file.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- main/php_open_temporary_file.c.orig	Mon Oct 16 07:21:14 2006
-+++ main/php_open_temporary_file.c	Mon Oct 16 07:22:00 2006
-@@ -16,7 +16,7 @@
-    +----------------------------------------------------------------------+
-  */
- 
--/* $Id: php_open_temporary_file.c,v 1.34.2.2 2006/05/23 23:22:26 iliaa Exp $ */
-+/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.4 2006/10/13 01:11:30 iliaa Exp $ */
- 
- #include "php.h"
- 
-@@ -206,6 +206,7 @@
- PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char **opened_path_p TSRMLS_DC)
- {
- 	int fd;
-+	const char *temp_dir;
- 
- 	if (!pfx) {
- 		pfx = "tmp.";
-@@ -214,11 +215,22 @@
- 		*opened_path_p = NULL;
- 	}
- 
-+	if (!dir || *dir == '\0') {
-+def_tmp:
-+		temp_dir = php_get_temporary_directory();
-+
-+		if (temp_dir && *temp_dir != '\0' && !php_check_open_basedir(temp_dir TSRMLS_CC)) {
-+			return php_do_open_temporary_file(temp_dir, pfx, opened_path_p TSRMLS_CC);
-+		} else {
-+			return -1;
-+		}
-+	}
-+
- 	/* Try the directory given as parameter. */
- 	fd = php_do_open_temporary_file(dir, pfx, opened_path_p TSRMLS_CC);
- 	if (fd == -1) {
- 		/* Use default temporary directory. */
--		fd = php_do_open_temporary_file(php_get_temporary_directory(), pfx, opened_path_p TSRMLS_CC);
-+		goto def_tmp;
- 	}
- 	return fd;
- }