Update php53 pacakge to 5.3.13 (PHP 5.3.13).

08 May 2012, PHP 5.3.13
- CGI
  . Improve fix for PHP-CGI query string parameter vulnerability, CVE-2012-2311.
    (Stas)

5 files changed, 12 insertions, 37 deletions

diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 65c83992ecc..9fd27ffa305 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2012/05/06 14:27:46 taca Exp $
+# $NetBSD: Makefile,v 1.27 2012/05/09 06:52:51 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		1
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
diff --git a/lang/php53/Makefile.common b/lang/php53/Makefile.common
index f5140837a68..fd6e6567251 100644
--- a/lang/php53/Makefile.common
+++ b/lang/php53/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2012/05/04 01:48:41 taca Exp $
+# $NetBSD: Makefile.common,v 1.13 2012/05/09 06:52:51 taca Exp $
 # used by lang/php53/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php53-extensions/Makefile
@@ -24,7 +24,6 @@
 
 .if !defined(DISTNAME)
 DISTNAME=		php-${PHP_BASE_VERS}
-DIST_SUBDIR=		${DISTNAME}
 .endif
 CATEGORIES+=		www
 
@@ -39,7 +38,7 @@ EXTRACT_SUFX?=		.tar.bz2
 MAINTAINER?=		pkgsrc-users@NetBSD.org
 HOMEPAGE?=		http://www.php.net/
 
-PHP_BASE_VERS=		5.3.12
+PHP_BASE_VERS=		5.3.13
 
 PHP_EXTENSION_DIR=	lib/php/20090630
 PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
diff --git a/lang/php53/Makefile.php b/lang/php53/Makefile.php
index 7aaca4de838..17287d32a78 100644
--- a/lang/php53/Makefile.php
+++ b/lang/php53/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.15 2012/05/04 01:48:41 taca Exp $
+# $NetBSD: Makefile.php,v 1.16 2012/05/09 06:52:51 taca Exp $
 # used by lang/php53/Makefile
 # used by www/ap-php/Makefile
 
@@ -61,7 +61,7 @@ PKG_SUGGESTED_OPTIONS+=	inet6 ssl
 
 .if !empty(PKG_OPTIONS:Msuhosin)
 SUHOSIN_PHPVER=		5.3.9
-.  if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != 5.3.10 && ${PHP_BASE_VERS} != 5.3.11 && ${PHP_BASE_VERS} != 5.3.12
+.  if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != 5.3.13
 PKG_FAIL_REASON+=	"The suhosin patch is currently not available for"
 PKG_FAIL_REASON+=	"this version of PHP.  You may have to wait until"
 PKG_FAIL_REASON+=	"an updated patch is released or temporarily"
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index ae98e1f86d9..ba54a348af0 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.40 2012/05/06 14:31:20 taca Exp $
+$NetBSD: distinfo,v 1.41 2012/05/09 06:52:51 taca Exp $
 
-SHA1 (php-5.3.12/php-5.3.12.tar.bz2) = 1aef7c01207637671299e3eb2d74eb81dd6a8f83
-RMD160 (php-5.3.12/php-5.3.12.tar.bz2) = 5d91c2d16b54632aa123677f63776b312872997c
-Size (php-5.3.12/php-5.3.12.tar.bz2) = 11394871 bytes
-SHA1 (php-5.3.12/suhosin-patch-5.3.9-0.9.10.patch.gz) = 7b9ef5c3e0831154df0d6290aba0989ca90138ed
-RMD160 (php-5.3.12/suhosin-patch-5.3.9-0.9.10.patch.gz) = ce43921fd9b183b154713ecda98294f6c68d5f22
-Size (php-5.3.12/suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967 bytes
+SHA1 (php-5.3.13.tar.bz2) = 8a52dae3fc9e27814c15fc0ebd744bee38305248
+RMD160 (php-5.3.13.tar.bz2) = 1ad55e7bd1262471c66d2236fbba76c137960029
+Size (php-5.3.13.tar.bz2) = 11396389 bytes
+SHA1 (suhosin-patch-5.3.9-0.9.10.patch.gz) = 7b9ef5c3e0831154df0d6290aba0989ca90138ed
+RMD160 (suhosin-patch-5.3.9-0.9.10.patch.gz) = ce43921fd9b183b154713ecda98294f6c68d5f22
+Size (suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967 bytes
 SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e
 SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b
 SHA1 (patch-ac) = 1720f154232241c19d0c6e08a824e33252f1b690
@@ -19,4 +19,3 @@ SHA1 (patch-aj) = d611d13fcc28c5d2b9e9586832ce4b8ae5707b48
 SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e
 SHA1 (patch-main_streams_cast.c) = c169ccb73dc660e40eff9f9e168374f35eedadad
 SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23
-SHA1 (patch-sapi_cgi_cgi__main.c) = 13fb85106ab2612f733caef3a42280fdca45ad6e
diff --git a/lang/php53/patches/patch-sapi_cgi_cgi__main.c b/lang/php53/patches/patch-sapi_cgi_cgi__main.c
deleted file mode 100644
index 59b57635972..00000000000
--- a/lang/php53/patches/patch-sapi_cgi_cgi__main.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Additional fix for CVE-2012-1823.
-
---- sapi/cgi/cgi_main.c.orig	2012-05-03 13:54:59.000000000 +0000
-+++ sapi/cgi/cgi_main.c
-@@ -1557,13 +1557,14 @@ int main(int argc, char *argv[])
- 			getenv("REQUEST_METHOD")
- 		) {
- 			cgi = 1;
-+			skip_getopt = 1;
- 		}
- 	}
- 
- 	if(query_string = getenv("QUERY_STRING")) {
- 		decoded_query_string = strdup(query_string);
- 		php_url_decode(decoded_query_string, strlen(decoded_query_string));
--		if(*decoded_query_string == '-' && strchr(decoded_query_string, '=') == NULL) {
-+		if(*decoded_query_string == '-' && strchr(query_string, '=') == NULL) {
- 			skip_getopt = 1;
- 		}
- 		free(decoded_query_string);