Pullup ticket #4748 - requested by taca

lang/php55: security update

Revisions pulled up:
- lang/php/phpversion.mk                                        1.100
- lang/php55/distinfo                                           1.41
- lang/php55/patches/patch-ext_phar_Makefile.frag               1.3

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Jun 12 00:44:32 UTC 2015

   Modified Files:
   	pkgsrc/lang/php: phpversion.mk
   	pkgsrc/lang/php55: distinfo
   	pkgsrc/lang/php55/patches: patch-ext_phar_Makefile.frag

   Log Message:
   Update php55 to 5.5.26.

   11 Jun 2015, PHP 5.5.26

   - Core:
     . Fixed bug #69566 (Conditional jump or move depends on uninitialised value
       in extension trait). (jbboehr at gmail dot com)
     . Fixed bug #66048 (temp. directory is cached during multiple requests).
       (Julien)
     . Fixed bug #69628 (complex GLOB_BRACE fails on Windows).
       (Christoph M. Becker)
     . Fixed bug #69646 (OS command injection vulnerability in escapeshellarg).
       (Anatol Belski)
     . Fixed bug #69719 (Incorrect handling of paths with NULs). (Stas)

   - FTP:
     . Improved fix for bug #69545 (Integer overflow in ftp_genlist()
       resulting in heap overflow). (Max Spelsberg)

   - GD:
     . Fixed bug #69479 (GD fails to build with newer libvpx). (Remi)

   - Iconv:
     . Fixed bug #48147 (iconv with //IGNORE cuts the string). (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)

   - MCrypt:
     . Added file descriptor caching to mcrypt_create_iv() (Leigh)

   - Opcache
     . Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF).
       (Laruence, Dmitry)

   - PCRE:
     . Upgraded pcrelib to 8.37. (CVE-2015-2325, CVE-2015-2326)

   - Phar:
     . Fixed bug #69680 (phar symlink in binary directory broken).
       (Matteo Bernardini, Remi)

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

3 files changed, 9 insertions, 18 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 04a9df2b181..e32ac511ffa 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.93.2.6 2015/05/19 18:01:25 tron Exp $
+# $NetBSD: phpversion.mk,v 1.93.2.7 2015/06/13 10:46:49 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
@@ -82,7 +82,7 @@ PHPVERSION_MK=	defined
 
 # Define each PHP's version.
 PHP54_VERSION=	5.4.41
-PHP55_VERSION=	5.5.25
+PHP55_VERSION=	5.5.26
 PHP56_VERSION=	5.6.9
 
 # Define initial release of major version.
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
index 87943aaaa1c..269db3a19fd 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.38.2.2 2015/05/19 17:57:02 tron Exp $
+$NetBSD: distinfo,v 1.38.2.3 2015/06/13 10:46:49 tron Exp $
 
-SHA1 (php-5.5.25.tar.bz2) = 89a7c0de86db9e06106f5bc091b13aa0c0e06952
-RMD160 (php-5.5.25.tar.bz2) = c48a7598875595404c0143fde782f82452b24f63
-Size (php-5.5.25.tar.bz2) = 13422002 bytes
+SHA1 (php-5.5.26.tar.bz2) = f2f80ef51d38b39c4ef060942e2ddcfffec9927a
+RMD160 (php-5.5.26.tar.bz2) = abfc8d5fa0615e22d4510bd025195cb9e88c2e77
+Size (php-5.5.26.tar.bz2) = 13671379 bytes
 SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
 SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2
 SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2
@@ -13,7 +13,7 @@ SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b
 SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f
 SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
 SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
-SHA1 (patch-ext_phar_Makefile.frag) = f8e3f7b7c3e93765d019e5614a884df6185d0436
+SHA1 (patch-ext_phar_Makefile.frag) = f465bb5acd4bb87bb403baa98b61ac707800fd30
 SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941
 SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
diff --git a/lang/php55/patches/patch-ext_phar_Makefile.frag b/lang/php55/patches/patch-ext_phar_Makefile.frag
index 97b5ab878e0..bdef0355570 100644
--- a/lang/php55/patches/patch-ext_phar_Makefile.frag
+++ b/lang/php55/patches/patch-ext_phar_Makefile.frag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ext_phar_Makefile.frag,v 1.2 2014/12/19 16:10:38 taca Exp $
+$NetBSD: patch-ext_phar_Makefile.frag,v 1.2.4.1 2015/06/13 10:46:49 tron Exp $
 
---- ext/phar/Makefile.frag.orig	2014-12-17 09:39:40.000000000 +0000
+--- ext/phar/Makefile.frag.orig	2015-06-10 12:26:49.000000000 +0000
 +++ ext/phar/Makefile.frag
 @@ -18,7 +18,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
  	else \
@@ -11,12 +11,3 @@ $NetBSD: patch-ext_phar_Makefile.frag,v 1.2 2014/12/19 16:10:38 taca Exp $
  
  $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
  	-@test -d $(builddir)/phar || mkdir $(builddir)/phar
-@@ -39,7 +39,7 @@ install-pharcmd: pharcmd
- 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
- 	$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
- 	-@rm -f $(INSTALL_ROOT)$(bindir)/phar
--	$(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
-+	$(LN_S) -f phar.phar $(INSTALL_ROOT)$(bindir)/phar
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
- 	@$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1
- 	@$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1