Sat Mar 16 01:58:19 2013 UTC ()
Update php53 to 5.3.23.

14 Mar 2013, PHP 5.3.23

- SOAP
  . Improved check that soap.wsdl_cache_dir conforms to open_basedir (Dmitry)
  . Disabled external entities loading. (Dmitry)

- SPL:
  . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence)
  . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
    (patch by kriss@krizalys.com, Laruence)
  . Fixed bug #52861 (unset fails with ArrayObject and deep arrays).
    (Mike Willbanks)


(taca)
diff -r1.38 -r1.39 pkgsrc/lang/php53/Makefile
diff -r1.22 -r1.23 pkgsrc/lang/php53/Makefile.common
diff -r1.59 -r1.60 pkgsrc/lang/php53/distinfo
diff -r1.4 -r1.5 pkgsrc/lang/php53/patches/patch-ab
cvs diff -r1.38 -r1.39 pkgsrc/lang/php53/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php53/Attic/Makefile 2013/02/28 21:28:20 1.38
+++ pkgsrc/lang/php53/Attic/Makefile 2013/03/16 01:58:17 1.39
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.38 2013/02/28 21:28:20 imil Exp $ 1# $NetBSD: Makefile,v 1.39 2013/03/16 01:58:17 taca Exp $
2 2
3# 3#
4# We can't omit PKGNAME here to handle PKG_OPTIONS. 4# We can't omit PKGNAME here to handle PKG_OPTIONS.
5# 5#
6PKGNAME= php-${PHP_BASE_VERS} 6PKGNAME= php-${PHP_BASE_VERS}
7PKGREVISION= 1 
8CATEGORIES= lang 7CATEGORIES= lang
9 8
10HOMEPAGE= http://www.php.net/ 9HOMEPAGE= http://www.php.net/
11COMMENT= PHP Hypertext Preprocessor version 5 10COMMENT= PHP Hypertext Preprocessor version 5
12LICENSE= php 11LICENSE= php
13 12
14TEST_TARGET= test 13TEST_TARGET= test
15 14
16USE_TOOLS+= gmake lex pkg-config 15USE_TOOLS+= gmake lex pkg-config
17LIBTOOL_OVERRIDE= # empty 16LIBTOOL_OVERRIDE= # empty
18 17
19.include "Makefile.php" 18.include "Makefile.php"
20 19
cvs diff -r1.22 -r1.23 pkgsrc/lang/php53/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/php53/Attic/Makefile.common 2013/02/22 03:06:16 1.22
+++ pkgsrc/lang/php53/Attic/Makefile.common 2013/03/16 01:58:18 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.22 2013/02/22 03:06:16 taca Exp $ 1# $NetBSD: Makefile.common,v 1.23 2013/03/16 01:58:18 taca Exp $
2# used by lang/php53/Makefile.php 2# used by lang/php53/Makefile.php
3# used by lang/php/ext.mk 3# used by lang/php/ext.mk
4# used by meta-pkgs/php53-extensions/Makefile 4# used by meta-pkgs/php53-extensions/Makefile
5 5
6# 6#
7# NOTE: 7# NOTE:
8# The suhosin option includes a patch from http://www.hardened-php.net/ 8# The suhosin option includes a patch from http://www.hardened-php.net/
9# Which tracks with the exact version number of PHP. There may be a delay 9# Which tracks with the exact version number of PHP. There may be a delay
10# in the patch which can leave the option broken until an updated patch 10# in the patch which can leave the option broken until an updated patch
11# is released. When updating PHP please don't forget to update the 11# is released. When updating PHP please don't forget to update the
12# distnfo with the details of the suhosin patch as well. 12# distnfo with the details of the suhosin patch as well.
13# 13#
14# Check these packages when update to new release of PHP and consider to 14# Check these packages when update to new release of PHP and consider to
@@ -28,24 +28,24 @@ DISTNAME= php-${PHP_BASE_VERS} @@ -28,24 +28,24 @@ DISTNAME= php-${PHP_BASE_VERS}
28CATEGORIES+= www 28CATEGORIES+= www
29 29
30.if !defined(PECL_VERSION) 30.if !defined(PECL_VERSION)
31MASTER_SITES?= http://www.php.net/distributions/ \ 31MASTER_SITES?= http://www.php.net/distributions/ \
32 http://uk.php.net/distributions/ \ 32 http://uk.php.net/distributions/ \
33 http://de.php.net/distributions/ \ 33 http://de.php.net/distributions/ \
34 http://us.php.net/distributions/ 34 http://us.php.net/distributions/
35EXTRACT_SUFX?= .tar.bz2 35EXTRACT_SUFX?= .tar.bz2
36.endif 36.endif
37 37
38MAINTAINER?= pkgsrc-users@NetBSD.org 38MAINTAINER?= pkgsrc-users@NetBSD.org
39HOMEPAGE?= http://www.php.net/ 39HOMEPAGE?= http://www.php.net/
40 40
41PHP_BASE_VERS= 5.3.22 41PHP_BASE_VERS= 5.3.23
42 42
43PHP_EXTENSION_DIR= lib/php/20090630 43PHP_EXTENSION_DIR= lib/php/20090630
44PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} 44PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
45 45
46PKG_SYSCONFVAR?= php 46PKG_SYSCONFVAR?= php
47 47
48# needed due to (broken?) configure checks in php-xmlrpc and php5-dom 48# needed due to (broken?) configure checks in php-xmlrpc and php5-dom
49CONFIGURE_ENV+= PHP_LIBXML_SHARED="1" 49CONFIGURE_ENV+= PHP_LIBXML_SHARED="1"
50 50
51.include "../../mk/bsd.prefs.mk" 51.include "../../mk/bsd.prefs.mk"
cvs diff -r1.59 -r1.60 pkgsrc/lang/php53/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php53/Attic/distinfo 2013/02/28 21:28:20 1.59
+++ pkgsrc/lang/php53/Attic/distinfo 2013/03/16 01:58:18 1.60
@@ -1,23 +1,20 @@ @@ -1,23 +1,20 @@
1$NetBSD: distinfo,v 1.59 2013/02/28 21:28:20 imil Exp $ 1$NetBSD: distinfo,v 1.60 2013/03/16 01:58:18 taca Exp $
2 2
3SHA1 (php-5.3.22.tar.bz2) = 8a0948040d70bd7ebf1f3001c4462649b43d5ab0 3SHA1 (php-5.3.23.tar.bz2) = fe9d84ada4747629f31051f9c689629261558056
4RMD160 (php-5.3.22.tar.bz2) = dc51c94f4201aeb3bef03df8d1def780a1ab60f5 4RMD160 (php-5.3.23.tar.bz2) = a537ed70a94ebbc8c1ee12a897f2f78b98a1dee4
5Size (php-5.3.22.tar.bz2) = 11366482 bytes 5Size (php-5.3.23.tar.bz2) = 11410987 bytes
6SHA1 (suhosin-patch-5.3.21-0.9.10.patch.bz2) = 7df6bb0f39fe4111a96a7d6ce694f954f1796c48 
7RMD160 (suhosin-patch-5.3.21-0.9.10.patch.bz2) = 4f2039676592c94fd923cdf7a35255d663ab56df 
8Size (suhosin-patch-5.3.21-0.9.10.patch.bz2) = 33131 bytes 
9SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e 6SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e
10SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b 7SHA1 (patch-ab) = 718248326c74ffa8a0f7df47b641fed39b838ba1
11SHA1 (patch-ac) = b6eb40116f3770464120b6ea9061624609b9564e 8SHA1 (patch-ac) = b6eb40116f3770464120b6ea9061624609b9564e
12SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881 9SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881
13SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56 10SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56
14SHA1 (patch-af) = 1618b23fd6d090ce5aa929208416028724278bfc 11SHA1 (patch-af) = 1618b23fd6d090ce5aa929208416028724278bfc
15SHA1 (patch-ag) = 37225805be13ec76d8ac17833da8115e99b78745 12SHA1 (patch-ag) = 37225805be13ec76d8ac17833da8115e99b78745
16SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83 13SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83
17SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f 14SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f
18SHA1 (patch-aj) = 8698b3caa6299843c7483473b0cb18ceffa3dada 15SHA1 (patch-aj) = 8698b3caa6299843c7483473b0cb18ceffa3dada
19SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e 16SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e
20SHA1 (patch-ext_standard_basic__functions.c) = 18596d281017760293189d87d19de9c5c772232d 17SHA1 (patch-ext_standard_basic__functions.c) = 18596d281017760293189d87d19de9c5c772232d
21SHA1 (patch-main_main.c) = 3e8f62eed3daadf2c93adeade234e378e792be04 18SHA1 (patch-main_main.c) = 3e8f62eed3daadf2c93adeade234e378e792be04
22SHA1 (patch-main_streams_cast.c) = c169ccb73dc660e40eff9f9e168374f35eedadad 19SHA1 (patch-main_streams_cast.c) = c169ccb73dc660e40eff9f9e168374f35eedadad
23SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23 20SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23
cvs diff -r1.4 -r1.5 pkgsrc/lang/php53/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/lang/php53/patches/Attic/patch-ab 2011/03/19 07:01:19 1.4
+++ pkgsrc/lang/php53/patches/Attic/patch-ab 2013/03/16 01:58:18 1.5
@@ -1,72 +1,72 @@ @@ -1,72 +1,72 @@
1$NetBSD: patch-ab,v 1.4 2011/03/19 07:01:19 taca Exp $ 1$NetBSD: patch-ab,v 1.5 2013/03/16 01:58:18 taca Exp $
2 2
3--- configure.orig 2011-03-17 07:55:56.000000000 +0000 3--- configure.orig 2013-03-14 17:17:01.000000000 +0000
4+++ configure 4+++ configure
5@@ -13699,7 +13699,7 @@ EOF 5@@ -17392,7 +17392,7 @@ echo "${ECHO_T}no" >&6
6 PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH" 6 PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH"
7  7
8  8
9- 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)" 9- 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)"
10+ INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php" 10+ INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php"
11  11
12 if test "$PHP_SAPI" != "default"; then 12 if test "$PHP_SAPI" != "default"; then
13 { echo "configure: error:  13 { { echo "$as_me:$LINENO: error:
14@@ -22963,7 +22963,7 @@ fi 14@@ -33475,7 +33475,7 @@ echo "$as_me: error: OpenSSL version 0.9
15 if test "$found_openssl" = "no"; then 15 if test "$found_openssl" = "no"; then
16  16
17 if test "$PHP_OPENSSL_DIR" = "yes"; then 17 if test "$PHP_OPENSSL_DIR" = "yes"; then
18- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 18- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
19+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 19+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
20 fi 20 fi
21  21
22 for i in $PHP_OPENSSL_DIR; do 22 for i in $PHP_OPENSSL_DIR; do
23@@ -24930,7 +24930,7 @@ echo "configure:24910: checking bundled  23@@ -35650,7 +35650,7 @@ echo "${ECHO_T}yes" >&6
24 PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" 24 PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
25  25
26  26
27- for header_file in ext/sqlite3/libsqlite/sqlite3.h; do 27- for header_file in ext/sqlite3/libsqlite/sqlite3.h; do
28+ for header_file; do 28+ for header_file; do
29  29
30  30
31 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 31 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
32@@ -35788,7 +35788,7 @@ fi 32@@ -47718,7 +47718,7 @@ echo "$as_me: error: OpenSSL version 0.9
33 if test "$found_openssl" = "no"; then 33 if test "$found_openssl" = "no"; then
34  34
35 if test "$PHP_OPENSSL_DIR" = "yes"; then 35 if test "$PHP_OPENSSL_DIR" = "yes"; then
36- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 36- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
37+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 37+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
38 fi 38 fi
39  39
40 for i in $PHP_OPENSSL_DIR; do 40 for i in $PHP_OPENSSL_DIR; do
41@@ -49814,7 +49814,7 @@ fi 41@@ -65336,7 +65336,7 @@ echo "$as_me: error: OpenSSL version 0.9
42 if test "$found_openssl" = "no"; then 42 if test "$found_openssl" = "no"; then
43  43
44 if test "$PHP_OPENSSL_DIR" = "yes"; then 44 if test "$PHP_OPENSSL_DIR" = "yes"; then
45- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 45- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
46+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 46+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
47 fi 47 fi
48  48
49 for i in $PHP_OPENSSL_DIR; do 49 for i in $PHP_OPENSSL_DIR; do
50@@ -83901,7 +83901,7 @@ fi 50@@ -106941,7 +106941,7 @@ echo "$as_me: error: OpenSSL version 0.9
51 if test "$found_openssl" = "no"; then 51 if test "$found_openssl" = "no"; then
52  52
53 if test "$PHP_OPENSSL_DIR" = "yes"; then 53 if test "$PHP_OPENSSL_DIR" = "yes"; then
54- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 54- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
55+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 55+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
56 fi 56 fi
57  57
58 for i in $PHP_OPENSSL_DIR; do 58 for i in $PHP_OPENSSL_DIR; do
59@@ -107041,12 +107041,7 @@ old_CC=$CC 59@@ -138087,12 +138087,7 @@ old_CC=$CC
60 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then 60 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
61 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" 61 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
62 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" 62 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
63- cat >meta_ccld<<EOF 63- cat >meta_ccld<<EOF
64-#! /bin/sh 64-#! /bin/sh
65-exec $CC $ac_cv_pthreads_cflags \$@ 65-exec $CC $ac_cv_pthreads_cflags \$@
66-EOF 66-EOF
67- CC="$abs_builddir/meta_ccld" 67- CC="$abs_builddir/meta_ccld"
68- chmod +x meta_ccld 68- chmod +x meta_ccld
69+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags" 69+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
70 fi 70 fi
71  71
72 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then 72 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then