Update to 4.4.5 release.

5 files changed, 15 insertions, 74 deletions

diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index 504f2787faee..003205b950b3 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	php4
-PORTVERSION=	4.4.4
-PORTREVISION?=	1
+PORTVERSION=	4.4.5
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
@@ -65,7 +65,7 @@ PLIST_SUB+=	SUHOSIN="@comment "
 .endif
 
 .if defined(WITH_MAILHEAD)
-PATCHFILES+=	php-${PORTVERSION}-mail-header.patch:mail
+PATCHFILES+=	php-4.4.4-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext
index e10df4e186b2..0fa18e1a88b0 100644
--- a/lang/php4/Makefile.ext
+++ b/lang/php4/Makefile.ext
@@ -390,7 +390,10 @@ CONFIGURE_ARGS+=--with-zlib=/usr
 CONFIGURE_ARGS+=--without-cdb
 .	endif
 .	if defined(WITH_DB4)
-WITH_DB4_VER?=	43
+WITH_DB4_VER?=	44
+.		if ${WITH_DB4_VER} == 43
+LIB_DEPENDS+=	db-4.3.0:${PORTSDIR}/databases/db43
+.		else
 .		if ${WITH_DB4_VER} == 42
 LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
 .		else
@@ -400,7 +403,8 @@ LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
 .		if ${WITH_DB4_VER} == 4
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
 .		else
-LIB_DEPENDS+=	db-4.3.0:${PORTSDIR}/databases/db43
+LIB_DEPENDS+=	db-4.4.0:${PORTSDIR}/databases/db44
+.		endif
 .		endif
 .		endif
 .		endif
diff --git a/lang/php4/distinfo b/lang/php4/distinfo
index 6be02f7673c3..7f9095033337 100644
--- a/lang/php4/distinfo
+++ b/lang/php4/distinfo
@@ -1,9 +1,9 @@
-MD5 (php-4.4.4.tar.bz2) = bc6fa8908e2ac36e93bab9f7d42cda3a
-SHA256 (php-4.4.4.tar.bz2) = 9f0742fce014a255f8453c1264afee5de289a9e9dcd57c448c77b46978f6a76b
-SIZE (php-4.4.4.tar.bz2) = 4478698
-MD5 (suhosin-patch-4.4.4-0.9.6.patch.gz) = 26b7a0ad744e374aa43f1e0d56561ac5
-SHA256 (suhosin-patch-4.4.4-0.9.6.patch.gz) = c5bdd934c654199630b73c8b214e53b9817e4bfc470ab9f67d6a0a587a602bff
-SIZE (suhosin-patch-4.4.4-0.9.6.patch.gz) = 21605
+MD5 (php-4.4.5.tar.bz2) = bf61d557c82962dc9533f6ef35283d4c
+SHA256 (php-4.4.5.tar.bz2) = fb3ca7887aaf1b77adeb623865d4ce452611c5fef849f78be2e2df1b22332af9
+SIZE (php-4.4.5.tar.bz2) = 4535091
+MD5 (suhosin-patch-4.4.5-0.9.6.patch.gz) = acaa585bbc0117910e214d333ce448df
+SHA256 (suhosin-patch-4.4.5-0.9.6.patch.gz) = 5e88b2b5c46f1501c46e7c2c920160711ab8cb119b817d45614bbb2bd16eb418
+SIZE (suhosin-patch-4.4.5-0.9.6.patch.gz) = 21523
 MD5 (php-4.4.4-mail-header.patch) = c0c6df6fad5d84de5038eb6f1bb65429
 SHA256 (php-4.4.4-mail-header.patch) = 4c7018ee4e64536d3356a55cbce4da3f6ef6876dfde60d76c9fb4f3bb658e75e
 SIZE (php-4.4.4-mail-header.patch) = 3420
diff --git a/lang/php4/files/patch-ext_standard_dir.c b/lang/php4/files/patch-ext_standard_dir.c
deleted file mode 100644
index ef819306883b..000000000000
--- a/lang/php4/files/patch-ext_standard_dir.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/standard/dir.c.orig	Mon Oct 16 06:59:56 2006
-+++ ext/standard/dir.c	Mon Oct 16 07:00:06 2006
-@@ -16,7 +16,7 @@
-    +----------------------------------------------------------------------+
-  */
- 
--/* $Id: dir.c,v 1.109.2.18.2.2 2006/01/01 13:46:57 sniper Exp $ */
-+/* $Id: dir.c,v 1.109.2.18.2.3 2006/10/04 23:20:02 iliaa Exp $ */
- 
- /* {{{ includes/startup/misc */
- 
-@@ -275,7 +275,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/php4/files/patch-main_php_open_temporary_file.c b/lang/php4/files/patch-main_php_open_temporary_file.c
deleted file mode 100644
index 1af8a22b5a6e..000000000000
--- a/lang/php4/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:26:57 2006
-+++ main/php_open_temporary_file.c	Mon Oct 16 07:27:01 2006
-@@ -16,7 +16,7 @@
-    +----------------------------------------------------------------------+
-  */
- 
--/* $Id: php_open_temporary_file.c,v 1.18.2.10.2.3 2006/05/23 23:23:39 iliaa Exp $ */
-+/* $Id: php_open_temporary_file.c,v 1.18.2.10.2.6 2006/10/13 01:12:11 iliaa Exp $ */
- 
- #include "php.h"
- 
-@@ -207,6 +207,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.";
-@@ -215,11 +216,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;
- }