Update to 5.3.11 release.

Note: this port will be updated to 5.4.x as soon as suhosin will be released,
while php 5.3.x branch will continue to exist in lang/php53.

4 files changed, 10 insertions, 44 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 39404b778c5f..d9e6d60e60e2 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.3.10
-PORTREVISION?=	1
+PORTVERSION=	5.3.11
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
@@ -63,7 +63,7 @@ PATCH_SITES+=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	ale
 
 .if !defined(WITHOUT_SUHOSIN)
-PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.10.patch.gz
+PATCHFILES+=	suhosin-patch-5.3.x-0.9.10.patch.gz
 PATCH_SITES+=	http://download.suhosin.org/:suhosin
 PLIST_SUB+=	SUHOSIN=""
 .else
@@ -71,7 +71,7 @@ PLIST_SUB+=	SUHOSIN="@comment "
 .endif
 
 .if defined(WITH_MAILHEAD)
-PATCHFILES+=	php-${PORTVERSION}-mail-header.patch
+PATCHFILES+=	php-5.3.x-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 15e7d720106e..9592b488b342 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,6 +1,6 @@
-SHA256 (php-5.3.10.tar.bz2) = 339157af2b386534597d287da292f2545e81d9b452e8b3fe525fb2c534ff344a
-SIZE (php-5.3.10.tar.bz2) = 11707402
-SHA256 (suhosin-patch-5.3.10-0.9.10.patch.gz) = 4438caeab0a10c6c94aee9f7eaa703f5799f97d4e0579f43a947bb7314e38317
-SIZE (suhosin-patch-5.3.10-0.9.10.patch.gz) = 40967
-SHA256 (php-5.3.10-mail-header.patch) = 5cd43388b33fe5703c2c7d1de04d9b7030ee0a65d110c3793dfccb096ed2cc09
-SIZE (php-5.3.10-mail-header.patch) = 3346
+SHA256 (php-5.3.11.tar.bz2) = b4174c97ca8d8bcf4b52b8b9ef2c2f35e1b611a5a660e02d7cd3edf263a6bd5d
+SIZE (php-5.3.11.tar.bz2) = 11396215
+SHA256 (suhosin-patch-5.3.x-0.9.10.patch.gz) = 4438caeab0a10c6c94aee9f7eaa703f5799f97d4e0579f43a947bb7314e38317
+SIZE (suhosin-patch-5.3.x-0.9.10.patch.gz) = 40967
+SHA256 (php-5.3.x-mail-header.patch) = 5a677448b32d9f592703e2323a33facdb45e5c237dcca04aaea8ec3287f7db84
+SIZE (php-5.3.x-mail-header.patch) = 3325
diff --git a/lang/php5/files/patch-ext-pcre-php_pcre.c b/lang/php5/files/patch-ext-pcre-php_pcre.c
deleted file mode 100644
index d51f255d15f4..000000000000
--- a/lang/php5/files/patch-ext-pcre-php_pcre.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- ext/pcre/php_pcre.c	2012/01/01 13:15:04	321634
-+++ ext/pcre/php_pcre.c	2012/02/06 18:18:53	323097
-@@ -241,6 +241,7 @@
- 	char				*pattern;
- 	int					 do_study = 0;
- 	int					 poptions = 0;
-+	int				count = 0;
- 	unsigned const char *tables = NULL;
- #if HAVE_SETLOCALE
- 	char				*locale = setlocale(LC_CTYPE, NULL);
-@@ -252,10 +253,10 @@
- 	   back the compiled pattern, otherwise go on and compile it. */
- 	if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
- 		/*
--		 * We use a quick pcre_info() check to see whether cache is corrupted, and if it
-+		 * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
- 		 * is, we flush it and compile the pattern from scratch.
- 		 */
--		if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
-+		if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
- 			zend_hash_clean(&PCRE_G(pcre_cache));
- 		} else {
- #if HAVE_SETLOCALE
diff --git a/lang/php5/files/patch-sapi_apache2filter_config.m4 b/lang/php5/files/patch-sapi_apache2filter_config.m4
deleted file mode 100644
index 48a46efa6796..000000000000
--- a/lang/php5/files/patch-sapi_apache2filter_config.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- sapi/apache2filter/config.m4.orig	2010-07-26 13:06:55.000000000 +0200
-+++ sapi/apache2filter/config.m4	2010-07-26 13:07:19.000000000 +0200
-@@ -118,7 +118,7 @@
-     ;;
-   esac
- 
--  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser"; then
-+  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
-     PHP_BUILD_THREAD_SAFE
-   fi
-   AC_MSG_RESULT(yes)