From 5bb39266ec5442c46e539faeb291f2c9c0e60884 Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Fri, 12 Jun 2015 04:51:01 +0000
Subject: Update php54 to 5.4.42.

11 Jun 2015 PHP 5.4.42

- Core:
  . Imroved fix for bug #69545 (Integer overflow in ftp_genlist() resulting in
    heap overflow). (Max Spelsberg)
  . Fixed bug #69646 (OS command injection vulnerability in escapeshellarg).
    (Anatol Belski)
  . Fixed bug #69719 (Incorrect handling of paths with NULs). (Stas)

- Litespeed SAPI:
  . Fixed bug #68812 (Unchecked return value). (George Wang)

- Mail:
  . Fixed bug #68776 (mail() does not have mail header injection prevention for
    additional headers). (Yasuo)

- Postgres:
  . Fixed bug #69667 (segfault in php_pgsql_meta_data). (Remi)

- Sqlite3:
  . Upgrade bundled sqlite to 3.8.10.2. (CVE-2015-3414, CVE-2015-3415,
    CVE-2015-3416) (Kaplan)
---
 lang/php/phpversion.mk | 4 ++--
 lang/php54/distinfo    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 69d2726224a..e1b8d3b11a7 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.101 2015/06/12 00:47:03 taca Exp $
+# $NetBSD: phpversion.mk,v 1.102 2015/06/12 04:51:01 taca 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
@@ -81,7 +81,7 @@
 PHPVERSION_MK=	defined
 
 # Define each PHP's version.
-PHP54_VERSION=	5.4.41
+PHP54_VERSION=	5.4.42
 PHP55_VERSION=	5.5.26
 PHP56_VERSION=	5.6.10
 
diff --git a/lang/php54/distinfo b/lang/php54/distinfo
index a135b4e1d38..aafb3da854b 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.57 2015/05/16 11:16:40 taca Exp $
+$NetBSD: distinfo,v 1.58 2015/06/12 04:51:01 taca Exp $
 
-SHA1 (php-5.4.41.tar.bz2) = 78f88f6211686f273e9abdfe0910abf7735a3f37
-RMD160 (php-5.4.41.tar.bz2) = f14dea2befc58fb4bc7a28d275e8655005085727
-Size (php-5.4.41.tar.bz2) = 12487089 bytes
+SHA1 (php-5.4.42.tar.bz2) = fa7d35d9766ebd055ac7ccdda1d86c53425ea0bc
+RMD160 (php-5.4.42.tar.bz2) = 5b91d856f8637abe1cdbb37adc2f43e3ceef8317
+Size (php-5.4.42.tar.bz2) = 12708394 bytes
 SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00
 SHA1 (patch-aclocal.m4) = 699086785fcd3d3834cc6016479dbdae6518e522
 SHA1 (patch-build_libtool.m4) = d81527abea3bd97e220f00a5d5296d8b1bfe2659
-- 
cgit v1.2.3