Tue Jul 14 22:08:13 2015 UTC ()
Pullup ticket #4772 - requested by taca
lang/php54: security update

Revisions pulled up:
- lang/php/phpversion.mk                                        1.103
- lang/php54/Makefile                                           1.30
- lang/php54/distinfo                                           1.61

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sat Jul 11 00:29:17 UTC 2015

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

   Log Message:
   Update php54 to 5.4.43.

   09 Jul 2015 PHP 5.4.43

   - Core:
     . Fixed bug #69768 (escapeshell*() doesn't cater to !). (cmb)
     . Fixed bug #69874 (Can't set empty additional_headers for mail()), regression
       from fix to bug #68776. (Yasuo)

   - Mysqlnd:
     . Fixed bug #69669 (mysqlnd is vulnerable to BACKRONYM) (CVE-2015-3152).
       (Andrey)

   - Phar:
     . Fixed bug #69958 (Segfault in Phar::convertToData on invalid file). (Stas)
     . Fixed bug #69923 (Buffer overflow and stack smashing error in
       phar_fix_filepath). (Stas)


(tron)
diff -r1.102 -r1.102.2.1 pkgsrc/lang/php/phpversion.mk
diff -r1.29 -r1.29.2.1 pkgsrc/lang/php54/Makefile
diff -r1.60 -r1.60.2.1 pkgsrc/lang/php54/distinfo
cvs diff -r1.102 -r1.102.2.1 pkgsrc/lang/php/phpversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2015/06/12 04:51:01 1.102
+++ pkgsrc/lang/php/phpversion.mk 2015/07/14 22:08:12 1.102.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: phpversion.mk,v 1.102 2015/06/12 04:51:01 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.102.2.1 2015/07/14 22:08:12 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: 54 55 56 13# Possible: 54 55 56
14# Default: 54 14# Default: 54
@@ -71,27 +71,27 @@ @@ -71,27 +71,27 @@
71# PHP_EXTENSION_DIR 71# PHP_EXTENSION_DIR
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.
84PHP54_VERSION= 5.4.42 84PHP54_VERSION= 5.4.43
85PHP55_VERSION= 5.5.26 85PHP55_VERSION= 5.5.26
86PHP56_VERSION= 5.6.10 86PHP56_VERSION= 5.6.10
87 87
88# Define initial release of major version. 88# Define initial release of major version.
89PHP54_RELDATE= 20120301 89PHP54_RELDATE= 20120301
90PHP55_RELDATE= 20130620 90PHP55_RELDATE= 20130620
91PHP56_RELDATE= 20140828 91PHP56_RELDATE= 20140828
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
cvs diff -r1.29 -r1.29.2.1 pkgsrc/lang/php54/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php54/Attic/Makefile 2015/06/28 15:34:16 1.29
+++ pkgsrc/lang/php54/Attic/Makefile 2015/07/14 22:08:12 1.29.2.1
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.29 2015/06/28 15:34:16 taca Exp $ 1# $NetBSD: Makefile,v 1.29.2.1 2015/07/14 22:08:12 tron 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_VERSION} 6PKGNAME= php-${PHP_VERSION}
7PKGREVISION= 1 
8CATEGORIES= lang 7CATEGORIES= lang
9 8
10HOMEPAGE= http://www.php.net/ 9HOMEPAGE= http://www.php.net/
11COMMENT= PHP Hypertext Preprocessor version 5.4 10COMMENT= PHP Hypertext Preprocessor version 5.4
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= 54 19PHP_VERSIONS_ACCEPTED= 54
cvs diff -r1.60 -r1.60.2.1 pkgsrc/lang/php54/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php54/Attic/distinfo 2015/06/28 15:34:16 1.60
+++ pkgsrc/lang/php54/Attic/distinfo 2015/07/14 22:08:12 1.60.2.1
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.60 2015/06/28 15:34:16 taca Exp $ 1$NetBSD: distinfo,v 1.60.2.1 2015/07/14 22:08:12 tron Exp $
2 2
3SHA1 (php-5.4.42.tar.bz2) = fa7d35d9766ebd055ac7ccdda1d86c53425ea0bc 3SHA1 (php-5.4.43.tar.bz2) = 2370ff60be9e058c94665e1b04ead80d23c37f1e
4RMD160 (php-5.4.42.tar.bz2) = 5b91d856f8637abe1cdbb37adc2f43e3ceef8317 4RMD160 (php-5.4.43.tar.bz2) = 87ab07db18d04f50972ea4197c6580882e5760a9
5Size (php-5.4.42.tar.bz2) = 12708394 bytes 5Size (php-5.4.43.tar.bz2) = 12708452 bytes
6SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00 6SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00
7SHA1 (patch-aclocal.m4) = 699086785fcd3d3834cc6016479dbdae6518e522 7SHA1 (patch-aclocal.m4) = 699086785fcd3d3834cc6016479dbdae6518e522
8SHA1 (patch-build_libtool.m4) = d81527abea3bd97e220f00a5d5296d8b1bfe2659 8SHA1 (patch-build_libtool.m4) = d81527abea3bd97e220f00a5d5296d8b1bfe2659
9SHA1 (patch-configure) = df6209127b1e23d17bc7128da3a44f3e44bbfd48 9SHA1 (patch-configure) = df6209127b1e23d17bc7128da3a44f3e44bbfd48
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_spl_spl__heap.c) = 99ad59876bfdee33271bf331090592efcff100a6 17SHA1 (patch-ext_spl_spl__heap.c) = 99ad59876bfdee33271bf331090592efcff100a6
18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = a95941231097914b884986bb5dc1e7247dbfefe2 18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = a95941231097914b884986bb5dc1e7247dbfefe2