Pullup ticket #4427 - requested by taca

lang/php55: security update

Revisions pulled up:
- lang/php/phpversion.mk                                        1.63
- lang/php55/Makefile.php                                       1.3
- lang/php55/distinfo                                           1.22

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sat May 31 04:26:40 UTC 2014

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

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

   29 May 2014, PHP 5.5.13

   - CLI server:
     . Fixed bug #67079 (Missing MIME types for XML/XSL files). (Anatol)

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

   - Curl:
     . Fixed bug #64247 (CURLOPT_INFILE doesn't allow reset). (Mike)

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

   - GD:
     . Fixed bug #67248 (imageaffinematrixget missing check of parameters). (Stas)

   - PCRE:
     . Fixed bug #67238 (Ungreedy and min/max quantifier bug, applied patch
       from the upstream). (Anatol)

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

3 files changed, 8 insertions, 10 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 3b1109d50b3..53430605186 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.58.2.1 2014/06/01 13:20:22 spz Exp $
+# $NetBSD: phpversion.mk,v 1.58.2.2 2014/06/02 15:33:45 tron Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -83,7 +83,7 @@ PHPVERSION_MK=	defined
 # Define each PHP's version.
 PHP53_VERSION=	5.3.28
 PHP54_VERSION=	5.4.28
-PHP55_VERSION=	5.5.12
+PHP55_VERSION=	5.5.13
 
 # Define initial release of major version.
 PHP53_RELDATE=	20090630
diff --git a/lang/php55/Makefile.php b/lang/php55/Makefile.php
index 36fb3d923ee..62048dd760f 100644
--- a/lang/php55/Makefile.php
+++ b/lang/php55/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.2 2013/08/31 12:31:10 adam Exp $
+# $NetBSD: Makefile.php,v 1.2.6.1 2014/06/02 15:33:45 tron Exp $
 # used by lang/php55/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -41,9 +41,7 @@ CONFIGURE_ARGS+=	--enable-xml
 CONFIGURE_ARGS+=	--with-libxml-dir=${PREFIX}
 .include "../../textproc/libxml2/buildlink3.mk"
 
-# Note: This expression is the same as ${PKGBASE}, but the latter is
-# not defined yet, so we cannot use it here.
-PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
+PKG_OPTIONS_VAR=	PKG_OPTIONS.${PHP_PKG_PREFIX}
 PKG_SUPPORTED_OPTIONS+=	inet6 ssl maintainer-zts readline
 PKG_SUGGESTED_OPTIONS+=	inet6 ssl
 
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
index 9875b6f834c..52eeaecf587 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17.2.1 2014/06/01 13:20:22 spz Exp $
+$NetBSD: distinfo,v 1.17.2.2 2014/06/02 15:33:45 tron Exp $
 
-SHA1 (php-5.5.12.tar.bz2) = eaa0b27368f98af2fa9aa6f08d7ea23bdb53c748
-RMD160 (php-5.5.12.tar.bz2) = c09c98e85c503cf030b0f215fcab0986945ce7ba
-Size (php-5.5.12.tar.bz2) = 13251734 bytes
+SHA1 (php-5.5.13.tar.bz2) = b16ff3218d2cc79a5acac577f7560dbb80f205d1
+RMD160 (php-5.5.13.tar.bz2) = 806623a7d78ad1c7efcdd953bfea58075e559aae
+Size (php-5.5.13.tar.bz2) = 13274145 bytes
 SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
 SHA1 (patch-aclocal.m4) = 14ae2898e1d68b552e76a7e4ee7006f1aee1f932
 SHA1 (patch-build_libtool.m4) = 6ee935c55cc01704c6e9edb4e383b2ddb7c746e7