5 files changed, 7 insertions, 78 deletions

diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index e782ed165a76..ab6d32bf6d8f 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	php53
-PORTVERSION=	5.3.28
-PORTREVISION?=	3
+PORTVERSION=	5.3.29
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
@@ -64,7 +64,7 @@ PATCH_SITES+=	${MASTER_SITE_LOCAL} \
 PATCH_SITE_SUBDIR=	flo
 
 .if ${PORT_OPTIONS:MSUHOSIN}
-PATCHFILES+=	suhosin-patch-5.3.x-0.9.10.4.patch.gz
+PATCHFILES+=	suhosin-patch-5.3.x-0.9.10.5.patch.gz
 PLIST_SUB+=	SUHOSIN=""
 .else
 PLIST_SUB+=	SUHOSIN="@comment "
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 1e890c26fe13..b6c7f005d4af 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,6 +1,4 @@
-SHA256 (php-5.3.28.tar.bz2) = 0cac960c651c4fbb3d21cf2f2b279a06e21948fb35a0d1439b97296cac1d8513
-SIZE (php-5.3.28.tar.bz2) = 11051714
-SHA256 (suhosin-patch-5.3.x-0.9.10.4.patch.gz) = 694f81a68120df89589d20262389b25431f8f2485b81da7519ffbf39edef14fd
-SIZE (suhosin-patch-5.3.x-0.9.10.4.patch.gz) = 40805
-SHA256 (php-5.3.x-mail-header.patch) = 5a677448b32d9f592703e2323a33facdb45e5c237dcca04aaea8ec3287f7db84
-SIZE (php-5.3.x-mail-header.patch) = 3325
+SHA256 (php-5.3.29.tar.bz2) = c4e1cf6972b2a9c7f2777a18497d83bf713cdbecabb65d3ff62ba441aebb0091
+SIZE (php-5.3.29.tar.bz2) = 11396771
+SHA256 (suhosin-patch-5.3.x-0.9.10.5.patch.gz) = 5de84149facbf3c3f752a907c19e69e0f569d71facb034ce938c97004f19376b
+SIZE (suhosin-patch-5.3.x-0.9.10.5.patch.gz) = 40805
diff --git a/lang/php53/files/patch-cve-2014-0185 b/lang/php53/files/patch-cve-2014-0185
deleted file mode 100644
index fba6fe870146..000000000000
--- a/lang/php53/files/patch-cve-2014-0185
+++ /dev/null
@@ -1,26 +0,0 @@
---- sapi/fpm/fpm/fpm_unix.c.orig	2014-05-02 19:01:53.759889551 +0200
-+++ sapi/fpm/fpm/fpm_unix.c	2014-05-02 19:02:05.029888255 +0200
-@@ -35,7 +35,7 @@
- 	/* uninitialized */
- 	wp->socket_uid = -1;
- 	wp->socket_gid = -1;
--	wp->socket_mode = 0666;
-+	wp->socket_mode = 0660;
- 
- 	if (!c) {
- 		return 0;
---- sapi/fpm/php-fpm.conf.in.orig	2014-05-02 19:03:03.746956989 +0200
-+++ sapi/fpm/php-fpm.conf.in	2014-05-02 19:02:37.651887275 +0200
-@@ -158,10 +158,10 @@
- ; permissions must be set in order to allow connections from a web server. Many
- ; BSD-derived systems allow connections regardless of permissions. 
- ; Default Values: user and group are set as the running user
--;                 mode is set to 0666
-+;                 mode is set to 0660
- ;listen.owner = @php_fpm_user@
- ;listen.group = @php_fpm_group@
--;listen.mode = 0666
-+;listen.mode = 0660
-  
- ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
- ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
diff --git a/lang/php53/files/patch-ext_standard_basic_functions.c b/lang/php53/files/patch-ext_standard_basic_functions.c
deleted file mode 100644
index 1907338d0298..000000000000
--- a/lang/php53/files/patch-ext_standard_basic_functions.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/standard/basic_functions.c.orig	2008-06-09 14:06:40.000000000 +0200
-+++ ext/standard/basic_functions.c	2008-06-09 14:08:28.000000000 +0200
-@@ -3859,7 +3860,7 @@
- 		SetEnvironmentVariable(pe->key, "bugbug");
- #endif
- 		putenv(pe->previous_value);
--# if defined(PHP_WIN32)
-+# if defined(PHP_WIN32) || __FreeBSD_version < 700050
- 		efree(pe->previous_value);
- # endif
- 	} else {
-@@ -4461,7 +4462,7 @@
- 		pe.previous_value = NULL;
- 		for (env = environ; env != NULL && *env != NULL; env++) {
- 			if (!strncmp(*env, pe.key, pe.key_len) && (*env)[pe.key_len] == '=') {	/* found it */
--#if defined(PHP_WIN32)
-+#if defined(PHP_WIN32) || __FreeBSD_version < 700050
- 				/* must copy previous value because MSVCRT's putenv can free the string without notice */
- 				pe.previous_value = estrdup(*env);
- #else
diff --git a/lang/php53/files/patch-ext_standard_info.c b/lang/php53/files/patch-ext_standard_info.c
deleted file mode 100644
index 6fdaa803c25b..000000000000
--- a/lang/php53/files/patch-ext_standard_info.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- ext/standard/info.c.orig	2014-07-06 14:16:21.785793323 +0200
-+++ ext/standard/info.c	2014-07-06 14:20:20.630549152 +0200
-@@ -999,16 +999,16 @@
- 
- 		php_info_print_table_start();
- 		php_info_print_table_header(2, "Variable", "Value");
--		if (zend_hash_find(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void **) &data) != FAILURE) {
-+		if (zend_hash_find(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) {
- 			php_info_print_table_row(2, "PHP_SELF", Z_STRVAL_PP(data));
- 		}
--		if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE"), (void **) &data) != FAILURE) {
-+		if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) {
- 			php_info_print_table_row(2, "PHP_AUTH_TYPE", Z_STRVAL_PP(data));
- 		}
--		if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_USER", sizeof("PHP_AUTH_USER"), (void **) &data) != FAILURE) {
-+		if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_USER", sizeof("PHP_AUTH_USER"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) {
- 			php_info_print_table_row(2, "PHP_AUTH_USER", Z_STRVAL_PP(data));
- 		}
--		if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE) {
-+		if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) {
- 			php_info_print_table_row(2, "PHP_AUTH_PW", Z_STRVAL_PP(data));
- 		}
- 		php_print_gpcse_array("_REQUEST", sizeof("_REQUEST")-1 TSRMLS_CC);