Fri May 2 13:04:12 2014 UTC ()
Update php54 to 5.4.28.

01 May 2014, PHP 5.4.28

- 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 #66171 (Symlinks and session handler allow open_basedir bypass).
    (Jann Horn, Stas)
  . 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)

- 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 (sapi/fpm: possible privilege escalation due to insecure
    default configuration) (CVE-2014-0185). (Stas)

- 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)

- 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)

- 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.61 -r1.62 pkgsrc/lang/php/phpversion.mk
diff -r1.37 -r1.38 pkgsrc/lang/php54/distinfo
diff -r1.6 -r1.7 pkgsrc/lang/php54/patches/patch-configure
cvs diff -r1.61 -r1.62 pkgsrc/lang/php/phpversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2014/05/01 15:52:33 1.61
+++ pkgsrc/lang/php/phpversion.mk 2014/05/02 13:04:12 1.62
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: phpversion.mk,v 1.61 2014/05/01 15:52:33 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.62 2014/05/02 13:04:12 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
@@ -72,27 +72,27 @@ @@ -72,27 +72,27 @@
72# Relative path to ${PREFIX} for PHP's extensions. It is derived from 72# Relative path to ${PREFIX} for PHP's extensions. It is derived from
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.28
86PHP55_VERSION= 5.5.12 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
cvs diff -r1.37 -r1.38 pkgsrc/lang/php54/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php54/Attic/distinfo 2014/04/05 03:43:40 1.37
+++ pkgsrc/lang/php54/Attic/distinfo 2014/05/02 13:04:12 1.38
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.37 2014/04/05 03:43:40 taca Exp $ 1$NetBSD: distinfo,v 1.38 2014/05/02 13:04:12 taca Exp $
2 2
3SHA1 (php-5.4.27.tar.bz2) = 798f2a803d81b386da62e1986ac0f743ecb6c3be 3SHA1 (php-5.4.28.tar.bz2) = 857d458b0daf89f36f8d652c5d8bd5fe509bc691
4RMD160 (php-5.4.27.tar.bz2) = 22daa29c54ee1cf7219d16b66f49e7aab774a52d 4RMD160 (php-5.4.28.tar.bz2) = 22f3ac1c56b104a9fa615a26aa90b5591dea29ef
5Size (php-5.4.27.tar.bz2) = 12272737 bytes 5Size (php-5.4.28.tar.bz2) = 12266216 bytes
6SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00 6SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00
7SHA1 (patch-aclocal.m4) = eae2ed8ea2985933c4fe88ba52577c14ac88eb92 7SHA1 (patch-aclocal.m4) = eae2ed8ea2985933c4fe88ba52577c14ac88eb92
8SHA1 (patch-build_libtool.m4) = 6dfef7c07a42dc54611c104265ef43c50a4e88ca 8SHA1 (patch-build_libtool.m4) = 6dfef7c07a42dc54611c104265ef43c50a4e88ca
9SHA1 (patch-configure) = 361f943d4aa2ef18335091f3c7ebcc5c17b37810 9SHA1 (patch-configure) = 7d14d78b6bb1b70d8467afb7baf54e51f313542c
10SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891 10SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
11SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc 11SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
12SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b 12SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b
13SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 13SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
14SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 14SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
15SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba 15SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba
16SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c 16SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
17SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841 17SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841
18SHA1 (patch-php.ini-development) = 056a74646cbeb0b2bcfc18463348343d817b54bc 18SHA1 (patch-php.ini-development) = 056a74646cbeb0b2bcfc18463348343d817b54bc
19SHA1 (patch-php.ini-production) = ac61016e18077a0870b8c8c42e89e3848c26d1f2 19SHA1 (patch-php.ini-production) = ac61016e18077a0870b8c8c42e89e3848c26d1f2
20SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d 20SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
21SHA1 (patch-sapi_cgi_Makefile.frag) = c271096b8565e89a85b0189c6f503f3fb5cd4b27 21SHA1 (patch-sapi_cgi_Makefile.frag) = c271096b8565e89a85b0189c6f503f3fb5cd4b27
22SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593 22SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593
cvs diff -r1.6 -r1.7 pkgsrc/lang/php54/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/php54/patches/Attic/patch-configure 2014/03/19 21:50:23 1.6
+++ pkgsrc/lang/php54/patches/Attic/patch-configure 2014/05/02 13:04:12 1.7
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-configure,v 1.6 2014/03/19 21:50:23 asau Exp $ 1$NetBSD: patch-configure,v 1.7 2014/05/02 13:04:12 taca Exp $
2 2
3--- configure.orig 2014-03-05 08:26:39.000000000 +0000 3--- configure.orig 2014-04-30 03:00:42.000000000 +0000
4+++ configure 4+++ configure
5@@ -23554,7 +23554,7 @@ fi 5@@ -23554,7 +23554,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@@ -25704,7 +25704,7 @@ $as_echo "yes" >&6; } 14@@ -25704,7 +25704,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,81 +28,81 @@ $NetBSD: patch-configure,v 1.6 2014/03/1 @@ -28,81 +28,81 @@ $NetBSD: patch-configure,v 1.6 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@@ -51409,7 +51409,7 @@ fi 32@@ -51409,7 +51409,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@@ -105616,12 +105616,7 @@ old_CC=$CC 41@@ -105614,12 +105614,7 @@ old_CC=$CC
42 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then 42 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
43 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" 43 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
44 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" 44 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
45- cat >meta_ccld<<EOF 45- cat >meta_ccld<<EOF
46-#! /bin/sh 46-#! /bin/sh
47-exec $CC $ac_cv_pthreads_cflags \$@ 47-exec $CC $ac_cv_pthreads_cflags \$@
48-EOF 48-EOF
49- CC="$abs_builddir/meta_ccld" 49- CC="$abs_builddir/meta_ccld"
50- chmod +x meta_ccld 50- chmod +x meta_ccld
51+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags" 51+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
52 fi 52 fi
53  53
54 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then 54 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
55@@ -108735,7 +108730,7 @@ if test -z "$aix_libpath"; then aix_libp 55@@ -108733,7 +108728,7 @@ if test -z "$aix_libpath"; then aix_libp
56 hardcode_shlibpath_var=no 56 hardcode_shlibpath_var=no
57 ;; 57 ;;
58  58
59- freebsd1*) 59- freebsd1*)
60+ freebsd1|freebsd1.*) 60+ freebsd1|freebsd1.*)
61 ld_shlibs=no 61 ld_shlibs=no
62 ;; 62 ;;
63  63
64@@ -109384,7 +109379,7 @@ dgux*) 64@@ -109382,7 +109377,7 @@ dgux*)
65 shlibpath_var=LD_LIBRARY_PATH 65 shlibpath_var=LD_LIBRARY_PATH
66 ;; 66 ;;
67  67
68-freebsd1*) 68-freebsd1*)
69+freebsd1|freebsd1.*) 69+freebsd1|freebsd1.*)
70 dynamic_linker=no 70 dynamic_linker=no
71 ;; 71 ;;
72  72
73@@ -109395,7 +109390,7 @@ freebsd* | dragonfly*) 73@@ -109393,7 +109388,7 @@ freebsd* | dragonfly*)
74 objformat=`/usr/bin/objformat` 74 objformat=`/usr/bin/objformat`
75 else 75 else
76 case $host_os in 76 case $host_os in
77- freebsd[123]*) objformat=aout ;; 77- freebsd[123]*) objformat=aout ;;
78+ freebsd[123]|freebsd[123].*) objformat=aout ;; 78+ freebsd[123]|freebsd[123].*) objformat=aout ;;
79 *) objformat=elf ;; 79 *) objformat=elf ;;
80 esac 80 esac
81 fi 81 fi
82@@ -111475,7 +111470,7 @@ if test -z "$aix_libpath"; then aix_libp 82@@ -111473,7 +111468,7 @@ if test -z "$aix_libpath"; then aix_libp
83 ;; 83 ;;
84 esac 84 esac
85 ;; 85 ;;
86- freebsd[12]*) 86- freebsd[12]*)
87+ freebsd[12]|freebsd[12].*) 87+ freebsd[12]|freebsd[12].*)
88 # C++ shared libraries reported to be fairly broken before switch to ELF 88 # C++ shared libraries reported to be fairly broken before switch to ELF
89 ld_shlibs_CXX=no 89 ld_shlibs_CXX=no
90 ;; 90 ;;
91@@ -113021,7 +113016,7 @@ dgux*) 91@@ -113019,7 +113014,7 @@ dgux*)
92 shlibpath_var=LD_LIBRARY_PATH 92 shlibpath_var=LD_LIBRARY_PATH
93 ;; 93 ;;
94  94
95-freebsd1*) 95-freebsd1*)
96+freebsd1|freebsd1.*) 96+freebsd1|freebsd1.*)
97 dynamic_linker=no 97 dynamic_linker=no
98 ;; 98 ;;
99  99
100@@ -113032,7 +113027,7 @@ freebsd* | dragonfly*) 100@@ -113030,7 +113025,7 @@ freebsd* | dragonfly*)
101 objformat=`/usr/bin/objformat` 101 objformat=`/usr/bin/objformat`
102 else 102 else
103 case $host_os in 103 case $host_os in
104- freebsd[123]*) objformat=aout ;; 104- freebsd[123]*) objformat=aout ;;
105+ freebsd[123]|freebsd[123].*) objformat=aout ;; 105+ freebsd[123]|freebsd[123].*) objformat=aout ;;
106 *) objformat=elf ;; 106 *) objformat=elf ;;
107 esac 107 esac
108 fi 108 fi