Fri Apr 4 03:05:00 2014 UTC ()
Update php55 to 5.5.11.
CVE-2013-7345 is already fixed in 5.5.10nb2.

03 Apr 2014, PHP 5.5.11

- Core:
  . Allow zero length comparison in substr_compare() (Tjerk)
  . Fixed bug #60602 (proc_open() changes environment array) (Tjerk)

- SPL:
  . Added feature #65545 (SplFileObject::fread()) (Tjerk)

- cURL:
  . Fixed bug #66109 (Can't reset CURLOPT_CUSTOMREQUEST to default behaviour) (Tjerk)
  . Fix compilation on libcurl versions between 7.10.5 and 7.12.2, inclusive.
    (Adam)

- FPM:
  . Added clear_env configuration directive to disable clearenv() call.
  (Github PR# 598, Paul Annesley)

- Fileinfo:
  . Fixed bug #66946 (fileinfo: extensive backtracking in awk rule regular
    expression). (CVE-2013-7345) (Remi)

- GD:
  . Fixed bug #66714 (imageconvolution breakage). (Brad Daily)
  . Fixed bug #66869 (Invalid 2nd argument crashes imageaffinematrixget) (Pierre)
  . Fixed bug #66887 (imagescale - poor quality of scaled image). (Remi)
  . Fixed bug #66890 (imagescale segfault). (Remi)
  . Fixed bug #66893 (imagescale ignore method argument). (Remi)

- Hash:
  . hash_pbkdf2() now works correctly if the $length argument is not specified.
    (Nikita)

- Intl:
  . Fixed bug #66873 (A reproductible crash in UConverter when given invalid
    encoding) (Stas)

- Mail:
  . Fixed bug #66535 (Don't add newline after X-PHP-Originating-Script) (Tjerk)

- MySQLi:
  . Fixed bug #66762 (Segfault in mysqli_stmt::bind_result() when link closed)
  (Remi)

- OPCache
  . Added function opcache_is_script_cached(). (Danack)
  . Added information about interned strings usage. (Terry, Julien, Dmitry)

- Openssl:
  . Fixed bug #66833 (Default disgest algo is still MD5, switch to SHA1). (Remi)

- GMP
  . Fixed bug #66872 (invalid argument crashes gmp_testbit) (Pierre)

- SQLite:
  . Updated bundled libsqlite to 3.8.3.1 (Anatol)


(taca)
diff -r1.58 -r1.59 pkgsrc/lang/php/phpversion.mk
diff -r1.11 -r1.12 pkgsrc/lang/php55/Makefile
diff -r1.17 -r1.18 pkgsrc/lang/php55/distinfo
diff -r1.1 -r0 pkgsrc/lang/php55/patches/patch-ext_fileinfo_data__file.c
diff -r1.3 -r1.4 pkgsrc/lang/php55/patches/patch-php.ini-development
diff -r1.3 -r1.4 pkgsrc/lang/php55/patches/patch-php.ini-production
cvs diff -r1.58 -r1.59 pkgsrc/lang/php/phpversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2014/03/09 14:09:20 1.58
+++ pkgsrc/lang/php/phpversion.mk 2014/04/04 03:04:59 1.59
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: phpversion.mk,v 1.58 2014/03/09 14:09:20 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.59 2014/04/04 03:04:59 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.26 85PHP54_VERSION= 5.4.26
86PHP55_VERSION= 5.5.10 86PHP55_VERSION= 5.5.11
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.11 -r1.12 pkgsrc/lang/php55/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php55/Attic/Makefile 2014/03/29 22:10:15 1.11
+++ pkgsrc/lang/php55/Attic/Makefile 2014/04/04 03:04:59 1.12
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.11 2014/03/29 22:10:15 he Exp $ 1# $NetBSD: Makefile,v 1.12 2014/04/04 03:04:59 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= 2 
8CATEGORIES= lang 7CATEGORIES= lang
9 8
10HOMEPAGE= http://www.php.net/ 9HOMEPAGE= http://www.php.net/
11COMMENT= PHP Hypertext Preprocessor version 5.5 10COMMENT= PHP Hypertext Preprocessor version 5.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
18PHP_CHECK_INSTALLED= No 17PHP_CHECK_INSTALLED= No
19 18
20PHP_VERSIONS_ACCEPTED= 55 19PHP_VERSIONS_ACCEPTED= 55
cvs diff -r1.17 -r1.18 pkgsrc/lang/php55/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php55/Attic/distinfo 2014/03/29 22:10:15 1.17
+++ pkgsrc/lang/php55/Attic/distinfo 2014/04/04 03:04:59 1.18
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1$NetBSD: distinfo,v 1.17 2014/03/29 22:10:15 he Exp $ 1$NetBSD: distinfo,v 1.18 2014/04/04 03:04:59 taca Exp $
2 2
3SHA1 (php-5.5.10.tar.bz2) = 833cf2a7f5428e95b92c28b6440211f9bd0c7937 3SHA1 (php-5.5.11.tar.bz2) = 58d660e5455b3f2abdfe3205182ffe3a58b5d1cd
4RMD160 (php-5.5.10.tar.bz2) = 9f3a5a4521304bb9e9aa2846f0834a7a28d1f704 4RMD160 (php-5.5.11.tar.bz2) = 9666e7e595ffa8cc8db87534d75fb05efda495ad
5Size (php-5.5.10.tar.bz2) = 13102742 bytes 5Size (php-5.5.11.tar.bz2) = 13207627 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) = 8d8af34ce99d91f8086079963b31b145caab66d3
10SHA1 (patch-ext_fileinfo_data__file.c) = 4f87518145f3288fc1161f397d146093b335dd70 
11SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2 10SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2
12SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc 11SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
13SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b 12SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b
14SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f 13SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f
15SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 14SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
16SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 15SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
17SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba 16SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba
18SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c 17SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
19SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4 18SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
20SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937 19SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937
21SHA1 (patch-php.ini-development) = 00245ed6a09f9faa9412e0749b087e2f0e01b33a 20SHA1 (patch-php.ini-development) = 4fc40f0af5f6e58b614794e066a5738694dc8ef8
22SHA1 (patch-php.ini-production) = 89ae95ddb864fc55535c16210d9630c4b77ec54a 21SHA1 (patch-php.ini-production) = 47c1b14ee78fbcaa084a58d2c0c3e843104072be
23SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d 22SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
24SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9 23SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9
25SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593 24SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593
File Deleted: pkgsrc/lang/php55/patches/Attic/patch-ext_fileinfo_data__file.c
cvs diff -r1.3 -r1.4 pkgsrc/lang/php55/patches/Attic/patch-php.ini-development (expand / switch to unified diff)

--- pkgsrc/lang/php55/patches/Attic/patch-php.ini-development 2014/01/11 17:05:09 1.3
+++ pkgsrc/lang/php55/patches/Attic/patch-php.ini-development 2014/04/04 03:05:00 1.4
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-php.ini-development,v 1.3 2014/01/11 17:05:09 taca Exp $ 1$NetBSD: patch-php.ini-development,v 1.4 2014/04/04 03:05:00 taca Exp $
2 2
3--- php.ini-development.orig 2014-01-08 10:15:20.000000000 +0000 3--- php.ini-development.orig 2014-04-01 12:32:03.000000000 +0000
4+++ php.ini-development 4+++ php.ini-development
5@@ -703,7 +703,7 @@ default_mimetype = "text/html" 5@@ -693,7 +693,7 @@ default_mimetype = "text/html"
6 ;;;;;;;;;;;;;;;;;;;;;;;;; 6 ;;;;;;;;;;;;;;;;;;;;;;;;;
7  7
8 ; UNIX: "/path1:/path2" 8 ; UNIX: "/path1:/path2"
9-;include_path = ".:/php/includes" 9-;include_path = ".:/php/includes"
10+include_path = ".:@PREFIX@/lib/php" 10+include_path = ".:@PREFIX@/lib/php"
11 ; 11 ;
12 ; Windows: "\path1;\path2" 12 ; Windows: "\path1;\path2"
13 ;include_path = ".;c:\php\includes" 13 ;include_path = ".;c:\php\includes"
14@@ -724,8 +724,8 @@ doc_root = 14@@ -714,8 +714,8 @@ doc_root =
15 ; http://php.net/user-dir 15 ; http://php.net/user-dir
16 user_dir = 16 user_dir =
17  17
18-; Directory in which the loadable extensions (modules) reside. 18-; Directory in which the loadable extensions (modules) reside.
19-; http://php.net/extension-dir 19-; http://php.net/extension-dir
20+; Directory in which the loadable extensions (modules) reside. If not 20+; Directory in which the loadable extensions (modules) reside. If not
21+; defined, then use the extension directory specified at compile-time. 21+; defined, then use the extension directory specified at compile-time.
22 ; extension_dir = "./" 22 ; extension_dir = "./"
23 ; On windows: 23 ; On windows:
24 ; extension_dir = "ext" 24 ; extension_dir = "ext"
25@@ -798,7 +798,7 @@ file_uploads = On 25@@ -788,7 +788,7 @@ file_uploads = On
26 ; Temporary directory for HTTP uploaded files (will use system default if not 26 ; Temporary directory for HTTP uploaded files (will use system default if not
27 ; specified). 27 ; specified).
28 ; http://php.net/upload-tmp-dir 28 ; http://php.net/upload-tmp-dir
29-;upload_tmp_dir = 29-;upload_tmp_dir =
30+upload_tmp_dir = /tmp 30+upload_tmp_dir = /tmp
31  31
32 ; Maximum allowed size for uploaded files. 32 ; Maximum allowed size for uploaded files.
33 ; http://php.net/upload-max-filesize 33 ; http://php.net/upload-max-filesize
cvs diff -r1.3 -r1.4 pkgsrc/lang/php55/patches/Attic/patch-php.ini-production (expand / switch to unified diff)

--- pkgsrc/lang/php55/patches/Attic/patch-php.ini-production 2014/01/11 17:05:09 1.3
+++ pkgsrc/lang/php55/patches/Attic/patch-php.ini-production 2014/04/04 03:05:00 1.4
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-php.ini-production,v 1.3 2014/01/11 17:05:09 taca Exp $ 1$NetBSD: patch-php.ini-production,v 1.4 2014/04/04 03:05:00 taca Exp $
2 2
3--- php.ini-production.orig 2014-01-08 10:15:20.000000000 +0000 3--- php.ini-production.orig 2014-04-01 12:32:03.000000000 +0000
4+++ php.ini-production 4+++ php.ini-production
5@@ -703,7 +703,7 @@ default_mimetype = "text/html" 5@@ -693,7 +693,7 @@ default_mimetype = "text/html"
6 ;;;;;;;;;;;;;;;;;;;;;;;;; 6 ;;;;;;;;;;;;;;;;;;;;;;;;;
7  7
8 ; UNIX: "/path1:/path2" 8 ; UNIX: "/path1:/path2"
9-;include_path = ".:/php/includes" 9-;include_path = ".:/php/includes"
10+include_path = ".:@PREFIX@/lib/php" 10+include_path = ".:@PREFIX@/lib/php"
11 ; 11 ;
12 ; Windows: "\path1;\path2" 12 ; Windows: "\path1;\path2"
13 ;include_path = ".;c:\php\includes" 13 ;include_path = ".;c:\php\includes"
14@@ -724,8 +724,8 @@ doc_root = 14@@ -714,8 +714,8 @@ doc_root =
15 ; http://php.net/user-dir 15 ; http://php.net/user-dir
16 user_dir = 16 user_dir =
17  17
18-; Directory in which the loadable extensions (modules) reside. 18-; Directory in which the loadable extensions (modules) reside.
19-; http://php.net/extension-dir 19-; http://php.net/extension-dir
20+; Directory in which the loadable extensions (modules) reside. If not 20+; Directory in which the loadable extensions (modules) reside. If not
21+; defined, then use the extension directory specified at compile-time. 21+; defined, then use the extension directory specified at compile-time.
22 ; extension_dir = "./" 22 ; extension_dir = "./"
23 ; On windows: 23 ; On windows:
24 ; extension_dir = "ext" 24 ; extension_dir = "ext"
25@@ -798,7 +798,7 @@ file_uploads = On 25@@ -788,7 +788,7 @@ file_uploads = On
26 ; Temporary directory for HTTP uploaded files (will use system default if not 26 ; Temporary directory for HTTP uploaded files (will use system default if not
27 ; specified). 27 ; specified).
28 ; http://php.net/upload-tmp-dir 28 ; http://php.net/upload-tmp-dir
29-;upload_tmp_dir = 29-;upload_tmp_dir =
30+upload_tmp_dir = /tmp 30+upload_tmp_dir = /tmp
31  31
32 ; Maximum allowed size for uploaded files. 32 ; Maximum allowed size for uploaded files.
33 ; http://php.net/upload-max-filesize 33 ; http://php.net/upload-max-filesize