Mon Jun 2 15:51:10 2014 UTC ()
Pullup ticket #4428 - requested by taca
lang/php54: security update

Revisions pulled up:
- lang/php/phpversion.mk                                        1.64
- lang/php54/Makefile.php                                       1.8
- lang/php54/distinfo                                           1.40

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sat May 31 04:28:57 UTC 2014

   Modified Files:
   	pkgsrc/lang/php: phpversion.mk
   	pkgsrc/lang/php54: Makefile.php distinfo

   Log Message:
   Update php54 to 5.4.29, contains fix for CVE-2014-0237 and CVE-2014-0238.

   29 May 2014, PHP 5.4.29

   - COM:
     . Fixed bug #66431 (Special Character via COM Interface (CP_UTF8)). (Anatol)

   - Core:
     . Fixed bug #65701 (copy() doesn't work when destination filename is created
       by tempnam()). (Boro Sitnikovski)
     . Fixed bug #67072 (Echoing unserialized "SplFileObject" crash). (Anatol)
     . Fixed bug #67245 (usage of memcpy() with overlapping src and dst in
       zend_exceptions.c). (Bob)
     . Fixed bug #67247 (spl_fixedarray_resize integer overflow). (Stas)
     . Fixed bug #67249 (printf out-of-bounds read). (Stas)
     . Fixed bug #67250 (iptcparse out-of-bounds read). (Stas)
     . Fixed bug #67252 (convert_uudecode out-of-bounds read). (Stas)

   - Date:
     . Fixed bug #67118 (DateTime constructor crash with invalid data). (Anatol)
     . Fixed bug #67251 (date_parse_from_format out-of-bounds read). (Stas)
     . Fixed bug #67253 (timelib_meridian_with_check out-of-bounds read). (Stas)

   - DOM:
     . Fixed bug #67081 (DOMDocumentType->internalSubset returns entire DOCTYPE tag,
       not only the subset). (Anatol)

    - Fileinfo:
      . Fixed bug #66307 (Fileinfo crashes with powerpoint files). (Anatol)
      . Fixed bug #67327 (fileinfo: CDF infinite loop in nelements DoS).
        (CVE-2014-0238)
      . Fixed bug #67328 (fileinfo: fileinfo: numerous file_printf calls resulting in
        performance degradation). (CVE-2014-0237)

   - FPM:
     . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor).
       (Julio Pintos)

   - Phar:
     . Fix bug #64498 ($phar->buildFromDirectory can't compress file with an accent
       in its name). (PR #588)


(tron)
diff -r1.58.2.2 -r1.58.2.3 pkgsrc/lang/php/phpversion.mk
diff -r1.6.6.1 -r1.6.6.2 pkgsrc/lang/php54/Makefile.php
diff -r1.36.2.1 -r1.36.2.2 pkgsrc/lang/php54/distinfo
cvs diff -r1.58.2.2 -r1.58.2.3 pkgsrc/lang/php/phpversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2014/06/02 15:33:45 1.58.2.2
+++ pkgsrc/lang/php/phpversion.mk 2014/06/02 15:51:10 1.58.2.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: phpversion.mk,v 1.58.2.2 2014/06/02 15:33:45 tron Exp $ 1# $NetBSD: phpversion.mk,v 1.58.2.3 2014/06/02 15:51:10 tron 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.28 85PHP54_VERSION= 5.4.29
86PHP55_VERSION= 5.5.13 86PHP55_VERSION= 5.5.13
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.6.6.1 -r1.6.6.2 pkgsrc/lang/php54/Attic/Makefile.php (expand / switch to unified diff)

--- pkgsrc/lang/php54/Attic/Makefile.php 2014/06/01 13:20:22 1.6.6.1
+++ pkgsrc/lang/php54/Attic/Makefile.php 2014/06/02 15:51:10 1.6.6.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.php,v 1.6.6.1 2014/06/01 13:20:22 spz Exp $ 1# $NetBSD: Makefile.php,v 1.6.6.2 2014/06/02 15:51:10 tron Exp $
2# used by lang/php54/Makefile 2# used by lang/php54/Makefile
3# used by www/ap-php/Makefile 3# used by www/ap-php/Makefile
4# used by www/php-fpm/Makefile 4# used by www/php-fpm/Makefile
5 5
6.include "../../lang/php54/Makefile.common" 6.include "../../lang/php54/Makefile.common"
7 7
8DISTINFO_FILE= ${.CURDIR}/../../lang/php54/distinfo 8DISTINFO_FILE= ${.CURDIR}/../../lang/php54/distinfo
9PATCHDIR= ${.CURDIR}/../../lang/php54/patches 9PATCHDIR= ${.CURDIR}/../../lang/php54/patches
10 10
11USE_LIBTOOL= YES 11USE_LIBTOOL= YES
12USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
13GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
14BUILD_DEFS+= VARBASE 14BUILD_DEFS+= VARBASE
@@ -32,29 +32,27 @@ CONFIGURE_ARGS+= --without-pear @@ -32,29 +32,27 @@ CONFIGURE_ARGS+= --without-pear
32#CONFIGURE_ARGS+= --without-intl 32#CONFIGURE_ARGS+= --without-intl
33 33
34CONFIGURE_ARGS+= --disable-posix 34CONFIGURE_ARGS+= --disable-posix
35CONFIGURE_ARGS+= --disable-dom 35CONFIGURE_ARGS+= --disable-dom
36CONFIGURE_ARGS+= --disable-pdo 36CONFIGURE_ARGS+= --disable-pdo
37CONFIGURE_ARGS+= --disable-json 37CONFIGURE_ARGS+= --disable-json
38 38
39CONFIGURE_ARGS+= --enable-cgi 39CONFIGURE_ARGS+= --enable-cgi
40CONFIGURE_ARGS+= --enable-xml 40CONFIGURE_ARGS+= --enable-xml
41CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} 41CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
42 42
43.include "../../textproc/libxml2/buildlink3.mk" 43.include "../../textproc/libxml2/buildlink3.mk"
44 44
45# Note: This expression is the same as ${PKGBASE}, but the latter is 45PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
46# not defined yet, so we cannot use it here. 
47PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} 
48PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline 46PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline
49PKG_SUGGESTED_OPTIONS+= inet6 ssl 47PKG_SUGGESTED_OPTIONS+= inet6 ssl
50 48
51.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" 49.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
52PKG_SUPPORTED_OPTIONS+= dtrace 50PKG_SUPPORTED_OPTIONS+= dtrace
53.endif 51.endif
54 52
55.include "../../mk/bsd.options.mk" 53.include "../../mk/bsd.options.mk"
56 54
57.if !empty(PKG_OPTIONS:Minet6) 55.if !empty(PKG_OPTIONS:Minet6)
58CONFIGURE_ARGS+= --enable-ipv6 56CONFIGURE_ARGS+= --enable-ipv6
59.else 57.else
60CONFIGURE_ARGS+= --disable-ipv6 58CONFIGURE_ARGS+= --disable-ipv6
cvs diff -r1.36.2.1 -r1.36.2.2 pkgsrc/lang/php54/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php54/Attic/distinfo 2014/06/01 13:20:22 1.36.2.1
+++ pkgsrc/lang/php54/Attic/distinfo 2014/06/02 15:51:10 1.36.2.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.36.2.1 2014/06/01 13:20:22 spz Exp $ 1$NetBSD: distinfo,v 1.36.2.2 2014/06/02 15:51:10 tron Exp $
2 2
3SHA1 (php-5.4.28.tar.bz2) = 857d458b0daf89f36f8d652c5d8bd5fe509bc691 3SHA1 (php-5.4.29.tar.bz2) = 199cfe6ba44732d737e03e5321ea9399823759d7
4RMD160 (php-5.4.28.tar.bz2) = 22f3ac1c56b104a9fa615a26aa90b5591dea29ef 4RMD160 (php-5.4.29.tar.bz2) = 38e3d70fe04cf458f4615355857ded9a90df67e4
5Size (php-5.4.28.tar.bz2) = 12266216 bytes 5Size (php-5.4.29.tar.bz2) = 12293765 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) = 7d14d78b6bb1b70d8467afb7baf54e51f313542c 9SHA1 (patch-configure) = 7d14d78b6bb1b70d8467afb7baf54e51f313542c
10SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891 10SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
11SHA1 (patch-ext_gd_libgd_gdxpm.c) = 9a175417fad9ac23037a24122f8d1258b9eebbcb 11SHA1 (patch-ext_gd_libgd_gdxpm.c) = 9a175417fad9ac23037a24122f8d1258b9eebbcb
12SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc 12SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
13SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b 13SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b
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_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841 18SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841