Fri Aug 17 15:34:01 2012 UTC ()
Update php54 package to 5.4.6 (PHP 5.4.6).

PHP                                                                        NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
16 Aug 2012, PHP 5.4.6

- CLI Server:
  . Implemented FR #62700 (have the console output 'Listening on
    http://localhost:8000'). (pascal.chevrel@free.fr)

- Core:
  . Fixed bug #62661 (Interactive php-cli crashes if include() is used in
    auto_prepend_file). (Laruence)
  . Fixed bug #62653: (unset($array[$float]) causes a crash). (Nikita Popov,
    Laruence)
  . Fixed bug #62565 (Crashes due non-initialized internal properties_table).
    (Felipe)
  . Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK
    with run-test.php). (Laruence)

- CURL:
  . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false).
    (r.hampartsumyan@gmail.com, Laruence)

- DateTime:
  . Fixed Bug #62500 (Segfault in DateInterval class when extended). (Laruence)

- Fileinfo:
  . Fixed bug #61964 (finfo_open with directory causes invalid free).
    (reeze.xia@gmail.com)

- Intl:
  . Fixed bug #62564 (Extending MessageFormatter and adding property causes
    crash). (Felipe)

- MySQLnd:
  . Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode). (Laruence)

- readline:
  . Fixed bug #62612 (readline extension compilation fails with
    sapi/cli/cli.h: No such file). (Johannes)

- Reflection:
  . Implemented FR #61602 (Allow access to name of constant used as default
    value). (reeze.xia@gmail.com)

- SimpleXML:
  . Implemented FR #55218 Get namespaces from current node. (Lonny)

- SPL:
  . Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance
    gives Segmentation fault). (Laruence, Gustavo)
  . Fixed bug #61527 (ArrayIterator gives misleading notice on next() when
    moved to the end). (reeze.xia@gmail.com)

- Streams:
  . Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build).
    (Laruence)

- Zlib:
  . Fixed bug #55544 (ob_gzhandler always conflicts with
    zlib.output_compression). (Laruence)


(taca)
diff -r1.2 -r1.3 pkgsrc/lang/php54/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/php54/Makefile.common
diff -r1.2 -r1.3 pkgsrc/lang/php54/PLIST
diff -r1.5 -r1.6 pkgsrc/lang/php54/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/php54/patches/patch-main_main.c
diff -r1.1 -r1.2 pkgsrc/lang/php54/patches/patch-sapi_fpm_fpm__fpm_sockets.h
diff -r1.1 -r0 pkgsrc/lang/php54/patches/patch-sapi_fpm_fpm__fpm_sockets.c
cvs diff -r1.2 -r1.3 pkgsrc/lang/php54/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php54/Attic/Makefile 2012/07/25 13:16:01 1.2
+++ pkgsrc/lang/php54/Attic/Makefile 2012/08/17 15:34:01 1.3
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.2 2012/07/25 13:16:01 fhajny Exp $ 1# $NetBSD: Makefile,v 1.3 2012/08/17 15:34:01 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
15PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
16 15
17USE_TOOLS+= gmake lex pkg-config 16USE_TOOLS+= gmake lex pkg-config
18LIBTOOL_OVERRIDE= # empty 17LIBTOOL_OVERRIDE= # empty
19 18
20.include "Makefile.php" 19.include "Makefile.php"
cvs diff -r1.2 -r1.3 pkgsrc/lang/php54/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/php54/Attic/Makefile.common 2012/07/20 12:29:05 1.2
+++ pkgsrc/lang/php54/Attic/Makefile.common 2012/08/17 15:34:01 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.2 2012/07/20 12:29:05 taca Exp $ 1# $NetBSD: Makefile.common,v 1.3 2012/08/17 15:34:01 taca Exp $
2# used by lang/php54/Makefile.php 2# used by lang/php54/Makefile.php
3# used by lang/php/ext.mk 3# used by lang/php/ext.mk
4# used by meta-pkgs/php54-extensions/Makefile 4# used by meta-pkgs/php54-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.4.5 41PHP_BASE_VERS= 5.4.6
42 42
43PHP_EXTENSION_DIR= lib/php/20120301 43PHP_EXTENSION_DIR= lib/php/20120301
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.2 -r1.3 pkgsrc/lang/php54/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/php54/Attic/PLIST 2012/07/25 13:01:05 1.2
+++ pkgsrc/lang/php54/Attic/PLIST 2012/08/17 15:34:01 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2012/07/25 13:01:05 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.3 2012/08/17 15:34:01 taca Exp $
2bin/phar 2bin/phar
3bin/phar.phar 3bin/phar.phar
4bin/php 4bin/php
5bin/php-config 5bin/php-config
6bin/phpize 6bin/phpize
7include/php/TSRM/TSRM.h 7include/php/TSRM/TSRM.h
8include/php/TSRM/readdir.h 8include/php/TSRM/readdir.h
9include/php/TSRM/tsrm_config.h 9include/php/TSRM/tsrm_config.h
10include/php/TSRM/tsrm_config.w32.h 10include/php/TSRM/tsrm_config.w32.h
11include/php/TSRM/tsrm_config_common.h 11include/php/TSRM/tsrm_config_common.h
12include/php/TSRM/tsrm_nw.h 12include/php/TSRM/tsrm_nw.h
13include/php/TSRM/tsrm_strtok_r.h 13include/php/TSRM/tsrm_strtok_r.h
14include/php/TSRM/tsrm_virtual_cwd.h 14include/php/TSRM/tsrm_virtual_cwd.h
@@ -208,26 +208,27 @@ include/php/main/spprintf.h @@ -208,26 +208,27 @@ include/php/main/spprintf.h
208include/php/main/streams/php_stream_context.h 208include/php/main/streams/php_stream_context.h
209include/php/main/streams/php_stream_filter_api.h 209include/php/main/streams/php_stream_filter_api.h
210include/php/main/streams/php_stream_glob_wrapper.h 210include/php/main/streams/php_stream_glob_wrapper.h
211include/php/main/streams/php_stream_mmap.h 211include/php/main/streams/php_stream_mmap.h
212include/php/main/streams/php_stream_plain_wrapper.h 212include/php/main/streams/php_stream_plain_wrapper.h
213include/php/main/streams/php_stream_transport.h 213include/php/main/streams/php_stream_transport.h
214include/php/main/streams/php_stream_userspace.h 214include/php/main/streams/php_stream_userspace.h
215include/php/main/streams/php_streams_int.h 215include/php/main/streams/php_streams_int.h
216${PLIST.suhosin}include/php/main/suhosin_globals.h 216${PLIST.suhosin}include/php/main/suhosin_globals.h
217${PLIST.suhosin}include/php/main/suhosin_logo.h 217${PLIST.suhosin}include/php/main/suhosin_logo.h
218${PLIST.suhosin}include/php/main/suhosin_patch.h 218${PLIST.suhosin}include/php/main/suhosin_patch.h
219include/php/main/win32_internal_function_disabled.h 219include/php/main/win32_internal_function_disabled.h
220include/php/main/win95nt.h 220include/php/main/win95nt.h
 221include/php/sapi/cli/cli.h
221lib/php/build/Makefile.global 222lib/php/build/Makefile.global
222lib/php/build/acinclude.m4 223lib/php/build/acinclude.m4
223lib/php/build/config.guess 224lib/php/build/config.guess
224lib/php/build/config.sub 225lib/php/build/config.sub
225lib/php/build/libtool.m4 226lib/php/build/libtool.m4
226lib/php/build/ltmain.sh 227lib/php/build/ltmain.sh
227lib/php/build/mkdep.awk 228lib/php/build/mkdep.awk
228lib/php/build/phpize.m4 229lib/php/build/phpize.m4
229lib/php/build/run-tests.php 230lib/php/build/run-tests.php
230lib/php/build/scan_makefile_in.awk 231lib/php/build/scan_makefile_in.awk
231lib/php/build/shtool 232lib/php/build/shtool
232libexec/cgi-bin/php 233libexec/cgi-bin/php
233man/man1/php-config.1 234man/man1/php-config.1
cvs diff -r1.5 -r1.6 pkgsrc/lang/php54/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php54/Attic/distinfo 2012/07/31 12:23:12 1.5
+++ pkgsrc/lang/php54/Attic/distinfo 2012/08/17 15:34:01 1.6
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1$NetBSD: distinfo,v 1.5 2012/07/31 12:23:12 fhajny Exp $ 1$NetBSD: distinfo,v 1.6 2012/08/17 15:34:01 taca Exp $
2 2
3SHA1 (php-5.4.5.tar.bz2) = b6c5e6653ba28e2f071bafe30c9691eddb950ba0 3SHA1 (php-5.4.6.tar.bz2) = a092ff9632f96189ade4415ca1e0a89cbc289a4b
4RMD160 (php-5.4.5.tar.bz2) = 1f89a9b31d5e14765ad9c4acff43aad825e1f9d8 4RMD160 (php-5.4.6.tar.bz2) = 5bfc64635ce86a613d8af38bbde9fe76ef846c45
5Size (php-5.4.5.tar.bz2) = 11011780 bytes 5Size (php-5.4.6.tar.bz2) = 11026249 bytes
6SHA1 (patch-acinclude.m4) = afead7122844e8290d9ef4fdb8deec3c40cf0746 6SHA1 (patch-acinclude.m4) = afead7122844e8290d9ef4fdb8deec3c40cf0746
7SHA1 (patch-configure) = 5930b32de104cda553c9701086ffdf35a93f8d97 7SHA1 (patch-configure) = 5930b32de104cda553c9701086ffdf35a93f8d97
8SHA1 (patch-ext_gd_config.m4) = 089f1c88bd4daa8ebc8911122423c1f88e5d84a0 8SHA1 (patch-ext_gd_config.m4) = 089f1c88bd4daa8ebc8911122423c1f88e5d84a0
9SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc 9SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
10SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b 10SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b
11SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 11SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
12SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 12SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
13SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba 13SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba
14SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c 14SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
15SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841 15SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841
16SHA1 (patch-main_main.c) = 3535bd480d176a488405555d03f3bf7e2ce22ad5 16SHA1 (patch-main_main.c) = 3e8f62eed3daadf2c93adeade234e378e792be04
17SHA1 (patch-main_streams_cast.c) = ebf23f9908340be3d1f947c4112ec940f9324ecb 17SHA1 (patch-main_streams_cast.c) = ebf23f9908340be3d1f947c4112ec940f9324ecb
18SHA1 (patch-php.ini-development) = 79512bd276adaed6bcf5f7f28e965f8a6b589add 18SHA1 (patch-php.ini-development) = 79512bd276adaed6bcf5f7f28e965f8a6b589add
19SHA1 (patch-php.ini-production) = f5d275abe7668a139999b3607e99f271450f56ae 19SHA1 (patch-php.ini-production) = f5d275abe7668a139999b3607e99f271450f56ae
20SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d 20SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
21SHA1 (patch-sapi_cgi_Makefile.frag) = ba16463cc2a350df1db80c78ac9aec44b20d4bfe 21SHA1 (patch-sapi_cgi_Makefile.frag) = ba16463cc2a350df1db80c78ac9aec44b20d4bfe
22SHA1 (patch-sapi_fpm_fpm__fpm_sockets.c) = 378bfa7f4d1eb1dcc0af25f426cd3e62d1b9290d 22SHA1 (patch-sapi_fpm_fpm__fpm_sockets.h) = 012cfc14cb912cee3045ca1741876161ee44e8d5
23SHA1 (patch-sapi_fpm_fpm__fpm_sockets.h) = 28ee07f01464b44c2bbdea6a8073e636e064b453 
cvs diff -r1.1 -r1.2 pkgsrc/lang/php54/patches/Attic/patch-main_main.c (expand / switch to unified diff)

--- pkgsrc/lang/php54/patches/Attic/patch-main_main.c 2012/07/25 13:16:02 1.1
+++ pkgsrc/lang/php54/patches/Attic/patch-main_main.c 2012/08/17 15:34:01 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-main_main.c,v 1.1 2012/07/25 13:16:02 fhajny Exp $ 1$NetBSD: patch-main_main.c,v 1.2 2012/08/17 15:34:01 taca Exp $
2 2
3Fix fd leak on SunOS (https://bugs.php.net/bug.php?id=47675). 3Fix fd leak on SunOS (https://bugs.php.net/bug.php?id=47675).
 4
4--- main/main.c.orig 2012-06-13 04:54:23.000000000 +0000 5--- main/main.c.orig 2012-06-13 04:54:23.000000000 +0000
5+++ main/main.c 6+++ main/main.c
6@@ -2388,7 +2388,7 @@ PHPAPI int php_execute_script(zend_file_ 7@@ -2388,7 +2388,7 @@ PHPAPI int php_execute_script(zend_file_
7 zend_file_handle *prepend_file_p, *append_file_p; 8 zend_file_handle *prepend_file_p, *append_file_p;
8 zend_file_handle prepend_file = {0}, append_file = {0}; 9 zend_file_handle prepend_file = {0}, append_file = {0};
9 #if HAVE_BROKEN_GETCWD  10 #if HAVE_BROKEN_GETCWD
10- int old_cwd_fd = -1; 11- int old_cwd_fd = -1;
11+ volatile int old_cwd_fd = -1; 12+ volatile int old_cwd_fd = -1;
12 #else 13 #else
13 char *old_cwd; 14 char *old_cwd;
14 ALLOCA_FLAG(use_heap) 15 ALLOCA_FLAG(use_heap)
cvs diff -r1.1 -r1.2 pkgsrc/lang/php54/patches/Attic/patch-sapi_fpm_fpm__fpm_sockets.h (expand / switch to unified diff)

--- pkgsrc/lang/php54/patches/Attic/patch-sapi_fpm_fpm__fpm_sockets.h 2012/07/31 12:23:12 1.1
+++ pkgsrc/lang/php54/patches/Attic/patch-sapi_fpm_fpm__fpm_sockets.h 2012/08/17 15:34:01 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-sapi_fpm_fpm__fpm_sockets.h,v 1.1 2012/07/31 12:23:12 fhajny Exp $ 1$NetBSD: patch-sapi_fpm_fpm__fpm_sockets.h,v 1.2 2012/08/17 15:34:01 taca Exp $
2 2
3Silly bug. 'sun' is of course taken on SunOS. 3Silly bug. 'sun' is of course taken on SunOS.
4--- sapi/fpm/fpm/fpm_sockets.h.orig 2012-07-18 06:19:16.000000000 +0000 4
 5--- sapi/fpm/fpm/fpm_sockets.h.orig 2012-08-15 04:26:05.000000000 +0000
5+++ sapi/fpm/fpm/fpm_sockets.h 6+++ sapi/fpm/fpm/fpm_sockets.h
6@@ -25,7 +25,7 @@ 7@@ -25,7 +25,7 @@
7 enum fpm_address_domain fpm_sockets_domain_from_address(char *addr); 8 enum fpm_address_domain fpm_sockets_domain_from_address(char *addr);
8 int fpm_sockets_init_main(); 9 int fpm_sockets_init_main();
9 int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq); 10 int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq);
10-int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen); 11-int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen);
11+int fpm_socket_unix_test_connect(struct sockaddr_un *fpm_sun, size_t socklen); 12+int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen);
12  13
13  14
14 static inline int fd_set_blocked(int fd, int blocked) /* {{{ */ 15 static inline int fd_set_blocked(int fd, int blocked) /* {{{ */
File Deleted: pkgsrc/lang/php54/patches/Attic/patch-sapi_fpm_fpm__fpm_sockets.c