Update lang/php5 to 5.2.4 - miscellaneous security fixes and over 120 other

bug fixes

7 files changed, 17 insertions, 64 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 18e9b52fd59..b8bb1d0f72b 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2007/08/01 01:40:07 taca Exp $
+# $NetBSD: Makefile,v 1.57 2007/09/02 21:12:40 jdolecek Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		3
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common
index 0a2b66dbe17..cf0719e64a3 100644
--- a/lang/php5/Makefile.common
+++ b/lang/php5/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2007/06/06 19:33:13 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.27 2007/09/02 21:12:41 jdolecek Exp $
 
 .if !defined(DISTNAME)
 DISTNAME=		php-${PHP_BASE_VERS}
@@ -15,7 +15,7 @@ EXTRACT_SUFX?=		.tar.bz2
 MAINTAINER?=		jdolecek@NetBSD.org
 HOMEPAGE?=		http://www.php.net/
 
-PHP_BASE_VERS=		5.2.3
+PHP_BASE_VERS=		5.2.4
 
 PHP_EXTENSION_DIR=	lib/php/20040412
 PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
diff --git a/lang/php5/PLIST b/lang/php5/PLIST
index 03a33945731..195d12745c6 100644
--- a/lang/php5/PLIST
+++ b/lang/php5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2007/05/05 21:45:12 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/09/02 21:12:41 jdolecek Exp $
 bin/php
 bin/php-config
 bin/phpize
@@ -82,15 +82,13 @@ include/php/ext/hash/php_hash_tiger.h
 include/php/ext/hash/php_hash_types.h
 include/php/ext/hash/php_hash_whirlpool.h
 include/php/ext/libxml/php_libxml.h
+include/php/ext/pcre/pcrelib/config.h
 include/php/ext/pcre/pcrelib/pcre.h
 include/php/ext/pcre/pcrelib/pcre_internal.h
-include/php/ext/pcre/pcrelib/pcre_scanner.h
-include/php/ext/pcre/pcrelib/pcre_stringpiece.h
-include/php/ext/pcre/pcrelib/pcrecpp.h
-include/php/ext/pcre/pcrelib/pcrecpparg.h
 include/php/ext/pcre/pcrelib/pcreposix.h
 include/php/ext/pcre/pcrelib/ucp.h
 include/php/ext/pcre/pcrelib/ucpinternal.h
+include/php/ext/pcre/pcrelib/ucptable.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/session/mod_files.h
 include/php/ext/session/mod_user.h
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 5442a339f31..a4401e96e50 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.45 2007/08/01 01:40:07 taca Exp $
+$NetBSD: distinfo,v 1.46 2007/09/02 21:12:41 jdolecek Exp $
 
-SHA1 (php-5.2.3/php-5.2.3.tar.bz2) = 0a02e05e1c663c0d4ee0b253917c0e140e606261
-RMD160 (php-5.2.3/php-5.2.3.tar.bz2) = 3c895cf7e513e5a3d7d9f742a9d56102cbb3a79b
-Size (php-5.2.3/php-5.2.3.tar.bz2) = 7417635 bytes
+SHA1 (php-5.2.4/php-5.2.4.tar.bz2) = 0e8f42d1363b17fbaeb3e7732ab1a501a9a12c8e
+RMD160 (php-5.2.4/php-5.2.4.tar.bz2) = 22728d27ec3ba3287943ea878fefbba0b4ffdc00
+Size (php-5.2.4/php-5.2.4.tar.bz2) = 7608429 bytes
 SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20
 SHA1 (patch-ad) = b324c33b1e70adee5b89dcecdd7690dcadcc18ec
-SHA1 (patch-ae) = b137b8527c42ed73dd3589a9e7cbc4a47267f21c
 SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e
 SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587
 SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc
 SHA1 (patch-ak) = 0a6445b5cf390cb63de8474d75c6e8a4c058afab
 SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50
-SHA1 (patch-am) = 430a79a913aa0885ff6ef9a8d7b938732747445a
-SHA1 (patch-an) = 8e33ce700049bdb05e5f56f0a8132b55e357abeb
+SHA1 (patch-an) = f07a08f8ee1a18f6371af9bd6c482d936e9220e4
diff --git a/lang/php5/patches/patch-ae b/lang/php5/patches/patch-ae
deleted file mode 100644
index 80ef96cc0cf..00000000000
--- a/lang/php5/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/08/01 01:40:08 taca Exp $
-
-Fix for CVE-2007-3806.
-
---- ext/standard/dir.c.orig	2007-02-25 02:16:23.000000000 +0900
-+++ ext/standard/dir.c
-@@ -395,6 +395,7 @@ PHP_FUNCTION(glob)
- 	} 
- #endif
- 
-+	memset(&globbuf, 0, sizeof(glob_t));
- 	globbuf.gl_offs = 0;
- 	if (0 != (ret = glob(pattern, flags & GLOB_FLAGMASK, NULL, &globbuf))) {
- #ifdef GLOB_NOMATCH
diff --git a/lang/php5/patches/patch-am b/lang/php5/patches/patch-am
deleted file mode 100644
index 248c955a0d5..00000000000
--- a/lang/php5/patches/patch-am
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-am,v 1.3 2007/06/07 10:45:18 adrianp Exp $
-
---- ext/standard/string.c.orig	2007-05-30 01:33:13.000000000 +0100
-+++ ext/standard/string.c
-@@ -1956,18 +1956,20 @@ static char *php_chunk_split(char *src, 
- 	char *p, *q;
- 	int chunks; /* complete chunks! */
- 	int restlen;
--	int out_len; 
-+	float out_len; 
- 
- 	chunks = srclen / chunklen;
- 	restlen = srclen - chunks * chunklen; /* srclen % chunklen */
- 
--	out_len = (srclen + (chunks + 1) * endlen + 1);
-+	out_len = chunks + 1;
-+	out_len *= endlen;
-+	out_len += srclen + 1;
- 
- 	if (out_len > INT_MAX || out_len <= 0) {
- 		return NULL;
- 	}
- 
--	dest = safe_emalloc(out_len, sizeof(char), 0);
-+	dest = safe_emalloc((int)out_len, sizeof(char), 0);
- 
- 	for (p = src, q = dest; p < (src + srclen - chunklen + 1); ) {
- 		memcpy(q, p, chunklen);
diff --git a/lang/php5/patches/patch-an b/lang/php5/patches/patch-an
index 7cf706f22f2..ff1cbbaf9c7 100644
--- a/lang/php5/patches/patch-an
+++ b/lang/php5/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.4 2007/06/11 17:45:30 heinz Exp $
+$NetBSD: patch-an,v 1.5 2007/09/02 21:12:42 jdolecek Exp $
 
---- configure.orig	2007-05-30 20:50:52.000000000 +0200
+--- configure.orig	2007-09-02 19:32:56.000000000 +0200
 +++ configure
-@@ -11985,7 +11985,7 @@ EOF
+@@ -12437,7 +12437,7 @@ EOF
  
-     echo "$ac_t""$PHP_ENABLE_FASTCGI" 1>&6
+     echo "$ac_t""$PHP_PATH_INFO_CHECK" 1>&6
  
--    INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
-+    INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php"
+-        INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
++        INSTALL_IT="@echo \"Installing PHP CGI binary:	\$(INSTALL_ROOT)@CGIDIR@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php"
      
    PHP_SAPI=cgi