svn commit: r405780 - in branches/2016Q1: databases/php56-dba/files lang/php55 lang/php56

[Martin Wilke]

Author: miwi
Date: Mon Jan 11 12:25:02 2016
New Revision: 405780
URL: https://svnweb.freebsd.org/changeset/ports/405780

Log:
  MFH: r405778
  
  - Update lang/php55 to 5.5.31
  - Update lang/php56 to 5.6.17
  
  Security:	6b771fe2-b84e-11e5-92f9-485d605f4717
  Approved by:    ports-secteam (blanked)

Modified:
  branches/2016Q1/databases/php56-dba/files/patch-config.m4
  branches/2016Q1/lang/php55/Makefile
  branches/2016Q1/lang/php55/distinfo
  branches/2016Q1/lang/php56/Makefile
  branches/2016Q1/lang/php56/distinfo
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/databases/php56-dba/files/patch-config.m4
==============================================================================
--- branches/2016Q1/databases/php56-dba/files/patch-config.m4	Mon Jan 11 12:16:43 2016	(r405779)
+++ branches/2016Q1/databases/php56-dba/files/patch-config.m4	Mon Jan 11 12:25:02 2016	(r405780)
@@ -1,8 +1,8 @@
---- config.m4.orig	2012-11-21 06:12:20.000000000 +0100
-+++ config.m4	2012-12-12 10:18:42.000000000 +0100
-@@ -320,6 +320,38 @@
+--- config.m4.orig	2016-01-06 15:14:47 UTC
++++ config.m4
+@@ -324,6 +324,38 @@ if test "$PHP_DB4" != "no"; then
        THIS_PREFIX=$i
-       THIS_INCLUDE=$i/db4/db.h
+       THIS_INCLUDE=$i/include/db5.3/db.h
        break
 +    elif test -f "$i/include/db5/db.h"; then
 +      THIS_PREFIX=$i
@@ -39,12 +39,12 @@
      elif test -f "$i/include/db5.1/db.h"; then
        THIS_PREFIX=$i
        THIS_INCLUDE=$i/include/db5.1/db.h
-@@ -362,7 +394,7 @@
+@@ -366,7 +398,7 @@ if test "$PHP_DB4" != "no"; then
        break
      fi
    done
--  PHP_DBA_DB_CHECK(4, db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
-+  PHP_DBA_DB_CHECK(4, db-5 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+-  PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
++  PHP_DBA_DB_CHECK(4, db-5 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
  fi
  PHP_DBA_STD_RESULT(db4,Berkeley DB4)
  

Modified: branches/2016Q1/lang/php55/Makefile
==============================================================================
--- branches/2016Q1/lang/php55/Makefile	Mon Jan 11 12:16:43 2016	(r405779)
+++ branches/2016Q1/lang/php55/Makefile	Mon Jan 11 12:25:02 2016	(r405780)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	php55
-PORTVERSION=	5.5.30
+PORTVERSION=	5.5.31
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions

Modified: branches/2016Q1/lang/php55/distinfo
==============================================================================
--- branches/2016Q1/lang/php55/distinfo	Mon Jan 11 12:16:43 2016	(r405779)
+++ branches/2016Q1/lang/php55/distinfo	Mon Jan 11 12:25:02 2016	(r405780)
@@ -1,4 +1,2 @@
-SHA256 (php-5.5.30.tar.bz2) = e7332a713cecdd1cb44a1b1336739885c9789f633f0f51236b25e48ab03c3b29
-SIZE (php-5.5.30.tar.bz2) = 13699702
-SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4
-SIZE (php-5.5.x-mail-header.patch) = 3379
+SHA256 (php-5.5.31.tar.bz2) = fb4a382b9a9dceb749b7ef047d8251320bc8d371c843714e5b4f4b70d61ba277
+SIZE (php-5.5.31.tar.bz2) = 13659002

Modified: branches/2016Q1/lang/php56/Makefile
==============================================================================
--- branches/2016Q1/lang/php56/Makefile	Mon Jan 11 12:16:43 2016	(r405779)
+++ branches/2016Q1/lang/php56/Makefile	Mon Jan 11 12:25:02 2016	(r405780)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	php56
-PORTVERSION=	5.6.16
+PORTVERSION=	5.6.17
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions

Modified: branches/2016Q1/lang/php56/distinfo
==============================================================================
--- branches/2016Q1/lang/php56/distinfo	Mon Jan 11 12:16:43 2016	(r405779)
+++ branches/2016Q1/lang/php56/distinfo	Mon Jan 11 12:25:02 2016	(r405780)
@@ -1,4 +1,2 @@
-SHA256 (php-5.6.16.tar.bz2) = 4fe6f40964c1bfaba05fc144ba20a2cdad33e11685f4f101ea5a48b98bbcd2ae
-SIZE (php-5.6.16.tar.bz2) = 14066209
-SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4
-SIZE (php-5.5.x-mail-header.patch) = 3379
+SHA256 (php-5.6.17.tar.bz2) = 77b45f56a1e63e75bb22b42cfb8b438ec4083c59ce774b4d7c1685544b7add3b
+SIZE (php-5.6.17.tar.bz2) = 14072840