Thu May 1 15:52:33 2014 UTC ()
Update php55 to 5.5.12.

01 May 2014, PHP 5.5.12
- Core:
  . Fixed bug #61019 (Out of memory on command stream_get_contents). (Mike)
  . Fixed bug #64330 (stream_socket_server() creates wrong Abstract Namespace
    UNIX sockets). (Mike)
  . Fixed bug #66182 (exit in stream filter produces segfault). (Mike)
  . Fixed bug #66736 (fpassthru broken). (Mike)
  . Fixed bug #67024 (getimagesize should recognize BMP files with negative
    height). (Gabor Buella)
  . Fixed bug #67043 (substr_compare broke by previous change) (Tjerk)

- cURL:
  . Fixed bug #66562 (curl_exec returns differently than curl_multi_getcontent).
    (Freek Lijten)

- Date:
  . Fixed bug #66721 (__wakeup of DateTime segfaults when invalid object data is
    supplied). (Boro Sitnikovski)

- Embed:
  . Fixed bug #65715 (php5embed.lib isn't provided anymore). (Anatol).

- Fileinfo:
  . Fixed bug #66987 (Memory corruption in fileinfo ext / bigendian).
    (Remi)

- FPM:
  . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf).
  . Fixed bug #67060 (possible privilege escalation due to insecure default configuration). (CVE-2014-0185) (christian at hoffie dot info)

- JSON:
  . Fixed bug #66021 (Blank line inside empty array/object when
    JSON_PRETTY_PRINT is set). (Kevin Israel)

- LDAP:
  . Fixed issue with null bytes in LDAP bindings. (Matthew Daley)

- mysqli:
  . Fixed problem in mysqli_commit()/mysqli_rollback() with second parameter
    (extra comma) and third parameters (lack of escaping). (Andrey)

- OpenSSL:
  . Fix bug #66942 (memory leak in openssl_seal()). (Chuan Ma)
  . Fix bug #66952 (memory leak in openssl_open()). (Chuan Ma)

- SimpleXML:
  . Fixed bug #66084 (simplexml_load_string() mangles empty node name)
    (Anatol)

- SQLite:
  . Fixed bug #66967 (Updated bundled libsqlite to 3.8.4.3). (Anatol)

- XSL:
  . Fixed bug #53965 (<xsl:include> cannot find files with relative paths
    when loaded with "file://"). (Anatol)

- Apache2 Handler SAPI:
  . Fixed Apache log issue caused by APR's lack of support for %zu
    (APR issue https://issues.apache.org/bugzilla/show_bug.cgi?id=56120).
    (Jeff Trawick)


(taca)
diff -r1.60 -r1.61 pkgsrc/lang/php/phpversion.mk
diff -r1.19 -r1.20 pkgsrc/lang/php55/distinfo
diff -r1.5 -r1.6 pkgsrc/lang/php55/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c
cvs diff -r1.60 -r1.61 pkgsrc/lang/php/phpversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2014/04/05 03:43:40 1.60
+++ pkgsrc/lang/php/phpversion.mk 2014/05/01 15:52:33 1.61
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: phpversion.mk,v 1.60 2014/04/05 03:43:40 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.61 2014/05/01 15:52:33 taca Exp $
2# 2#
3# This file selects a PHP version, based on the user's preferences and 3# This file selects a PHP version, based on the user's preferences and
4# the installed packages. It does not add a dependency on the PHP 4# the installed packages. It does not add a dependency on the PHP
5# package. 5# package.
6# 6#
7# === User-settable variables === 7# === User-settable variables ===
8# 8#
9# PHP_VERSION_DEFAULT 9# PHP_VERSION_DEFAULT
10# The PHP version to choose when more than one is acceptable to 10# The PHP version to choose when more than one is acceptable to
11# the package. 11# the package.
12# 12#
13# Possible: 53 54 55 13# Possible: 53 54 55
14# Default: 54 14# Default: 54
@@ -73,27 +73,27 @@ @@ -73,27 +73,27 @@
73# initial release of major version. 73# initial release of major version.
74# 74#
75# Example: lib/php/20090630 75# Example: lib/php/20090630
76# 76#
77# Keywords: php 77# Keywords: php
78# 78#
79 79
80.if !defined(PHPVERSION_MK) 80.if !defined(PHPVERSION_MK)
81PHPVERSION_MK= defined 81PHPVERSION_MK= defined
82 82
83# Define each PHP's version. 83# Define each PHP's version.
84PHP53_VERSION= 5.3.28 84PHP53_VERSION= 5.3.28
85PHP54_VERSION= 5.4.27 85PHP54_VERSION= 5.4.27
86PHP55_VERSION= 5.5.11 86PHP55_VERSION= 5.5.12
87 87
88# Define initial release of major version. 88# Define initial release of major version.
89PHP53_RELDATE= 20090630 89PHP53_RELDATE= 20090630
90PHP54_RELDATE= 20120301 90PHP54_RELDATE= 20120301
91PHP55_RELDATE= 20130620 91PHP55_RELDATE= 20130620
92 92
93_VARGROUPS+= php 93_VARGROUPS+= php
94_USER_VARS.php= PHP_VERSION_DEFAULT 94_USER_VARS.php= PHP_VERSION_DEFAULT
95_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD 95_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
96_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 96_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
97 PKG_PHP_MAJOR_VERS 97 PKG_PHP_MAJOR_VERS
98 98
99.include "../../mk/bsd.prefs.mk" 99.include "../../mk/bsd.prefs.mk"
cvs diff -r1.19 -r1.20 pkgsrc/lang/php55/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php55/Attic/distinfo 2014/04/14 10:17:19 1.19
+++ pkgsrc/lang/php55/Attic/distinfo 2014/05/01 15:52:33 1.20
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.19 2014/04/14 10:17:19 jperkin Exp $ 1$NetBSD: distinfo,v 1.20 2014/05/01 15:52:33 taca Exp $
2 2
3SHA1 (php-5.5.11.tar.bz2) = 58d660e5455b3f2abdfe3205182ffe3a58b5d1cd 3SHA1 (php-5.5.12.tar.bz2) = eaa0b27368f98af2fa9aa6f08d7ea23bdb53c748
4RMD160 (php-5.5.11.tar.bz2) = 9666e7e595ffa8cc8db87534d75fb05efda495ad 4RMD160 (php-5.5.12.tar.bz2) = c09c98e85c503cf030b0f215fcab0986945ce7ba
5Size (php-5.5.11.tar.bz2) = 13207627 bytes 5Size (php-5.5.12.tar.bz2) = 13251734 bytes
6SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a 6SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
7SHA1 (patch-aclocal.m4) = 14ae2898e1d68b552e76a7e4ee7006f1aee1f932 7SHA1 (patch-aclocal.m4) = 14ae2898e1d68b552e76a7e4ee7006f1aee1f932
8SHA1 (patch-build_libtool.m4) = 6ee935c55cc01704c6e9edb4e383b2ddb7c746e7 8SHA1 (patch-build_libtool.m4) = 6ee935c55cc01704c6e9edb4e383b2ddb7c746e7
9SHA1 (patch-configure) = 8d8af34ce99d91f8086079963b31b145caab66d3 9SHA1 (patch-configure) = 7b4bef368e6709c26c0db31a4c7ebc04e4d55e9c
10SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2 10SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2
11SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc 11SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
12SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b 12SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b
13SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f 13SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f
14SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 14SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
15SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 15SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
16SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba 16SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba
17SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c 17SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8b72c83819e4d348001c11ec122d377f95b2099d 18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941
19SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4 19SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
20SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937 20SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937
21SHA1 (patch-php.ini-development) = 4fc40f0af5f6e58b614794e066a5738694dc8ef8 21SHA1 (patch-php.ini-development) = 4fc40f0af5f6e58b614794e066a5738694dc8ef8
22SHA1 (patch-php.ini-production) = 47c1b14ee78fbcaa084a58d2c0c3e843104072be 22SHA1 (patch-php.ini-production) = 47c1b14ee78fbcaa084a58d2c0c3e843104072be
23SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d 23SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
24SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9 24SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9
25SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593 25SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593
cvs diff -r1.5 -r1.6 pkgsrc/lang/php55/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/php55/patches/Attic/patch-configure 2014/03/19 21:56:31 1.5
+++ pkgsrc/lang/php55/patches/Attic/patch-configure 2014/05/01 15:52:33 1.6
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $ 1$NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
2 2
3--- configure.orig 2014-03-05 10:52:32.000000000 +0000 3--- configure.orig 2014-04-30 08:40:22.000000000 +0000
4+++ configure 4+++ configure
5@@ -23604,7 +23604,7 @@ fi 5@@ -23604,7 +23604,7 @@ fi
6 if test "$found_openssl" = "no"; then 6 if test "$found_openssl" = "no"; then
7  7
8 if test "$PHP_OPENSSL_DIR" = "yes"; then 8 if test "$PHP_OPENSSL_DIR" = "yes"; then
9- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 9- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
10+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 10+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
11 fi 11 fi
12  12
13 for i in $PHP_OPENSSL_DIR; do 13 for i in $PHP_OPENSSL_DIR; do
14@@ -25754,7 +25754,7 @@ $as_echo "yes" >&6; } 14@@ -25754,7 +25754,7 @@ $as_echo "yes" >&6; }
15 PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" 15 PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
16  16
@@ -28,90 +28,90 @@ $NetBSD: patch-configure,v 1.5 2014/03/1 @@ -28,90 +28,90 @@ $NetBSD: patch-configure,v 1.5 2014/03/1
28+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 28+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
29 fi 29 fi
30  30
31 for i in $PHP_OPENSSL_DIR; do 31 for i in $PHP_OPENSSL_DIR; do
32@@ -48213,7 +48213,7 @@ fi 32@@ -48213,7 +48213,7 @@ fi
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@@ -65190,7 +65190,7 @@ rm -f core *.core core.conftest.* gmon.o 41@@ -65189,7 +65189,7 @@ rm -f core *.core core.conftest.* gmon.o
42 fi 42 fi
43  43
44  44
45-if test "$flock_type" == "unknown"; then 45-if test "$flock_type" == "unknown"; then
46+if test "$flock_type" = "unknown"; then 46+if test "$flock_type" = "unknown"; then
47 as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5 47 as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5
48 fi 48 fi
49  49
50@@ -104584,12 +104584,7 @@ old_CC=$CC 50@@ -104582,12 +104582,7 @@ old_CC=$CC
51 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then 51 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
52 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" 52 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
53 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" 53 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
54- cat >meta_ccld<<EOF 54- cat >meta_ccld<<EOF
55-#! /bin/sh 55-#! /bin/sh
56-exec $CC $ac_cv_pthreads_cflags \$@ 56-exec $CC $ac_cv_pthreads_cflags \$@
57-EOF 57-EOF
58- CC="$abs_builddir/meta_ccld" 58- CC="$abs_builddir/meta_ccld"
59- chmod +x meta_ccld 59- chmod +x meta_ccld
60+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags" 60+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
61 fi 61 fi
62  62
63 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then 63 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
64@@ -107703,7 +107698,7 @@ if test -z "$aix_libpath"; then aix_libp 64@@ -107701,7 +107696,7 @@ if test -z "$aix_libpath"; then aix_libp
65 hardcode_shlibpath_var=no 65 hardcode_shlibpath_var=no
66 ;; 66 ;;
67  67
68- freebsd1*) 68- freebsd1*)
69+ freebsd1|freebsd1.*) 69+ freebsd1|freebsd1.*)
70 ld_shlibs=no 70 ld_shlibs=no
71 ;; 71 ;;
72  72
73@@ -108352,7 +108347,7 @@ dgux*) 73@@ -108350,7 +108345,7 @@ dgux*)
74 shlibpath_var=LD_LIBRARY_PATH 74 shlibpath_var=LD_LIBRARY_PATH
75 ;; 75 ;;
76  76
77-freebsd1*) 77-freebsd1*)
78+freebsd1|freebsd1.*) 78+freebsd1|freebsd1.*)
79 dynamic_linker=no 79 dynamic_linker=no
80 ;; 80 ;;
81  81
82@@ -108363,7 +108358,7 @@ freebsd* | dragonfly*) 82@@ -108361,7 +108356,7 @@ freebsd* | dragonfly*)
83 objformat=`/usr/bin/objformat` 83 objformat=`/usr/bin/objformat`
84 else 84 else
85 case $host_os in 85 case $host_os in
86- freebsd[123]*) objformat=aout ;; 86- freebsd[123]*) objformat=aout ;;
87+ freebsd[123]|freebsd[123].*) objformat=aout ;; 87+ freebsd[123]|freebsd[123].*) objformat=aout ;;
88 *) objformat=elf ;; 88 *) objformat=elf ;;
89 esac 89 esac
90 fi 90 fi
91@@ -110443,7 +110438,7 @@ if test -z "$aix_libpath"; then aix_libp 91@@ -110441,7 +110436,7 @@ if test -z "$aix_libpath"; then aix_libp
92 ;; 92 ;;
93 esac 93 esac
94 ;; 94 ;;
95- freebsd[12]*) 95- freebsd[12]*)
96+ freebsd[12]|freebsd[12].*) 96+ freebsd[12]|freebsd[12].*)
97 # C++ shared libraries reported to be fairly broken before switch to ELF 97 # C++ shared libraries reported to be fairly broken before switch to ELF
98 ld_shlibs_CXX=no 98 ld_shlibs_CXX=no
99 ;; 99 ;;
100@@ -111989,7 +111984,7 @@ dgux*) 100@@ -111987,7 +111982,7 @@ dgux*)
101 shlibpath_var=LD_LIBRARY_PATH 101 shlibpath_var=LD_LIBRARY_PATH
102 ;; 102 ;;
103  103
104-freebsd1*) 104-freebsd1*)
105+freebsd1|freebsd1.*) 105+freebsd1|freebsd1.*)
106 dynamic_linker=no 106 dynamic_linker=no
107 ;; 107 ;;
108  108
109@@ -112000,7 +111995,7 @@ freebsd* | dragonfly*) 109@@ -111998,7 +111993,7 @@ freebsd* | dragonfly*)
110 objformat=`/usr/bin/objformat` 110 objformat=`/usr/bin/objformat`
111 else 111 else
112 case $host_os in 112 case $host_os in
113- freebsd[123]*) objformat=aout ;; 113- freebsd[123]*) objformat=aout ;;
114+ freebsd[123]|freebsd[123].*) objformat=aout ;; 114+ freebsd[123]|freebsd[123].*) objformat=aout ;;
115 *) objformat=elf ;; 115 *) objformat=elf ;;
116 esac 116 esac
117 fi 117 fi
cvs diff -r1.1 -r1.2 pkgsrc/lang/php55/patches/Attic/patch-ext_sqlite3_libsqlite_sqlite3.c (expand / switch to unified diff)

--- pkgsrc/lang/php55/patches/Attic/patch-ext_sqlite3_libsqlite_sqlite3.c 2014/04/14 10:17:19 1.1
+++ pkgsrc/lang/php55/patches/Attic/patch-ext_sqlite3_libsqlite_sqlite3.c 2014/05/01 15:52:33 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ext_sqlite3_libsqlite_sqlite3.c,v 1.1 2014/04/14 10:17:19 jperkin Exp $ 1$NetBSD: patch-ext_sqlite3_libsqlite_sqlite3.c,v 1.2 2014/05/01 15:52:33 taca Exp $
2 2
3Don't redefine _XOPEN_SOURCE, it is already set from php. 3Don't redefine _XOPEN_SOURCE, it is already set from php.
4 4
5--- ext/sqlite3/libsqlite/sqlite3.c.orig 2014-04-01 12:32:03.000000000 +0000 5--- ext/sqlite3/libsqlite/sqlite3.c.orig 2014-04-29 08:04:30.000000000 +0000
6+++ ext/sqlite3/libsqlite/sqlite3.c 6+++ ext/sqlite3/libsqlite/sqlite3.c
7@@ -7822,7 +7822,7 @@ struct sqlite3_rtree_geometry { 7@@ -7867,7 +7867,7 @@ struct sqlite3_rtree_geometry {
8 ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit 8 ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
9 ** it. 9 ** it.
10 */ 10 */
11-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) 11-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
12+#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__sun) 12+#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__sun)
13 # define _XOPEN_SOURCE 600 13 # define _XOPEN_SOURCE 600
14 #endif 14 #endif
15  15