svn commit: r415973 - in branches/2016Q2/lang: php55 php56 php70

Jason Unovitch junovitch at FreeBSD.org
Sat May 28 01:48:24 UTC 2016 

Author: junovitch
Date: Sat May 28 01:48:22 2016
New Revision: 415973
URL: https://svnweb.freebsd.org/changeset/ports/415973

Log:
  MFH: r415304 r415818 r415970 r415971 r415972
  
  - Really fix ZTS build with pthreads, required by threaded apache24
  - Bump PORTREVISION due to dependency on thread library
  
  Approved by:	miwi (mentor)
  
  Simplify plist by using @sample
  
  lang/php70: update 7.0.6 -> 7.0.7
  
  Approved by:	ports-secteam (with hat)
  Security:	CVE-2013-7456
  Security:	CVE-2016-5093
  Security:	https://vuxml.FreeBSD.org/freebsd/6b110175-246d-11e6-8dd3-002590263bf5.html
  
  lang/php56: update 5.6.21 -> 5.6.22 [1] plus minor fixup
  
  - Fix MAILHEAD patch to match the new version of the patch. The distinfo
    currently matches the php-5.5.x-mail-header.patch.old patch. [2]
  
  PR:		209779 [1]
  PR:		208072 [2]
  Reported by:	Fabiano Sidler <fabianosidler at swissonline.ch> [1]
  Reported by:	Vladislav V. Prodan <admin at support.od.ua> [2]
  Approved by:	ports-secteam (with hat)
  Security:	CVE-2013-7456
  Security:	CVE-2016-5093
  Security:	CVE-2016-5094
  Security:	CVE-2016-5096
  Security:	https://vuxml.FreeBSD.org/freebsd/6b110175-246d-11e6-8dd3-002590263bf5.html
  
  lang/php55: update 5.5.35 -> 5.5.36 [1] plus minor fixups
  
  - Fix MAILHEAD patch to match the new version of the patch. The distinfo
    currently matches the php-5.5.x-mail-header.patch.old patch. [2]
  - Fix regression from r415818's conversion to @sample by installing
    the default php-fpm.conf under ${LOCALBASE}/etc and not ${LOCALBASE}
  
  PR:		209779 [1]
  PR:		208073 [2]
  Reported by:	Fabiano Sidler <fabianosidler at swissonline.ch> [1]
  Submitted by:	Paulo Henrique <paulo.oliveira at protonmail.ch> [2]
  Approved by:	ports-secteam (with hat)
  Security:	CVE-2013-7456
  Security:	CVE-2016-4343
  Security:	CVE-2016-5093
  Security:	CVE-2016-5094
  Security:	CVE-2016-5096
  Security:	https://vuxml.FreeBSD.org/freebsd/6b110175-246d-11e6-8dd3-002590263bf5.html

Modified:
  branches/2016Q2/lang/php55/Makefile
  branches/2016Q2/lang/php55/distinfo
  branches/2016Q2/lang/php55/pkg-plist
  branches/2016Q2/lang/php56/Makefile
  branches/2016Q2/lang/php56/distinfo
  branches/2016Q2/lang/php56/pkg-plist
  branches/2016Q2/lang/php70/Makefile
  branches/2016Q2/lang/php70/distinfo
  branches/2016Q2/lang/php70/pkg-plist
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/lang/php55/Makefile
==============================================================================
--- branches/2016Q2/lang/php55/Makefile	Sat May 28 01:42:04 2016	(r415972)
+++ branches/2016Q2/lang/php55/Makefile	Sat May 28 01:48:22 2016	(r415973)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	php55
-PORTVERSION=	5.5.35
+PORTVERSION=	5.5.36
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions

Modified: branches/2016Q2/lang/php55/distinfo
==============================================================================
--- branches/2016Q2/lang/php55/distinfo	Sat May 28 01:42:04 2016	(r415972)
+++ branches/2016Q2/lang/php55/distinfo	Sat May 28 01:48:22 2016	(r415973)
@@ -1,4 +1,5 @@
-SHA256 (php-5.5.35.tar.bz2) = 2d648dd648e820fd64693ce72f9bf07064d147220e594e39fb9f6310238258d7
-SIZE (php-5.5.35.tar.bz2) = 13690152
-SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4
-SIZE (php-5.5.x-mail-header.patch) = 3379
+TIMESTAMP = 1464391586
+SHA256 (php-5.5.36.tar.bz2) = 2484edfaa3de606d74f927b55c5206f51b1ae24ea8e428aa9fc15474c7bb71bb
+SIZE (php-5.5.36.tar.bz2) = 13686345
+SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed
+SIZE (php-5.5.x-mail-header.patch) = 4426

Modified: branches/2016Q2/lang/php55/pkg-plist
==============================================================================
--- branches/2016Q2/lang/php55/pkg-plist	Sat May 28 01:42:04 2016	(r415972)
+++ branches/2016Q2/lang/php55/pkg-plist	Sat May 28 01:48:22 2016	(r415973)
@@ -6,9 +6,7 @@ bin/phpize
 etc/php.conf
 etc/php.ini-development
 etc/php.ini-production
-%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi
-%%FPM%%etc/php-fpm.conf.default
-%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
+%%FPM%%@sample etc/php-fpm.conf.default etc/php-fpm.conf
 include/php/TSRM/TSRM.h
 include/php/TSRM/readdir.h
 include/php/TSRM/tsrm_config.h

Modified: branches/2016Q2/lang/php56/Makefile
==============================================================================
--- branches/2016Q2/lang/php56/Makefile	Sat May 28 01:42:04 2016	(r415972)
+++ branches/2016Q2/lang/php56/Makefile	Sat May 28 01:48:22 2016	(r415973)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	php56
-PORTVERSION=	5.6.21
+PORTVERSION=	5.6.22
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions

Modified: branches/2016Q2/lang/php56/distinfo
==============================================================================
--- branches/2016Q2/lang/php56/distinfo	Sat May 28 01:42:04 2016	(r415972)
+++ branches/2016Q2/lang/php56/distinfo	Sat May 28 01:48:22 2016	(r415973)
@@ -1,4 +1,5 @@
-SHA256 (php-5.6.21.tar.bz2) = b4ed7ab574b689fd6d6494fde954826c06efc85c505e017b8d776c7c7f479590
-SIZE (php-5.6.21.tar.bz2) = 14165919
-SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4
-SIZE (php-5.5.x-mail-header.patch) = 3379
+TIMESTAMP = 1464391783
+SHA256 (php-5.6.22.tar.bz2) = 90da8a80cc52fa699cf2bfa4c6fa737c772df7c92b81ef483460aa3b1e9f88c6
+SIZE (php-5.6.22.tar.bz2) = 14170522
+SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed
+SIZE (php-5.5.x-mail-header.patch) = 4426

Modified: branches/2016Q2/lang/php56/pkg-plist
==============================================================================
--- branches/2016Q2/lang/php56/pkg-plist	Sat May 28 01:42:04 2016	(r415972)
+++ branches/2016Q2/lang/php56/pkg-plist	Sat May 28 01:48:22 2016	(r415973)
@@ -7,9 +7,7 @@ bin/phpize
 etc/php.conf
 etc/php.ini-development
 etc/php.ini-production
-%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi
-%%FPM%%etc/php-fpm.conf.default
-%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
+%%FPM%%@sample etc/php-fpm.conf.default etc/php-fpm.conf
 include/php/TSRM/TSRM.h
 include/php/TSRM/readdir.h
 include/php/TSRM/tsrm_config.h

Modified: branches/2016Q2/lang/php70/Makefile
==============================================================================
--- branches/2016Q2/lang/php70/Makefile	Sat May 28 01:42:04 2016	(r415972)
+++ branches/2016Q2/lang/php70/Makefile	Sat May 28 01:48:22 2016	(r415973)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	php70
-PORTVERSION=	7.0.6
+PORTVERSION=	7.0.7
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
@@ -144,6 +144,7 @@ CONFIGURE_ARGS+=--enable-debug
 
 .if ${PORT_OPTIONS:MZTS}
 CONFIGURE_ARGS+=--enable-maintainer-zts
+CONFIGURE_ENV+=	pthreads_working="yes"
 USES=	localhost
 .endif
 

Modified: branches/2016Q2/lang/php70/distinfo
==============================================================================
--- branches/2016Q2/lang/php70/distinfo	Sat May 28 01:42:04 2016	(r415972)
+++ branches/2016Q2/lang/php70/distinfo	Sat May 28 01:48:22 2016	(r415973)
@@ -1,2 +1,3 @@
-SHA256 (php-7.0.6.tar.bz2) = 14ddf192a9965c858c1e742a61456be2f34a4db87556172c0d76f08de96329b7
-SIZE (php-7.0.6.tar.bz2) = 14102594
+TIMESTAMP = 1464392035
+SHA256 (php-7.0.7.tar.bz2) = 474f2925c4782b94016e3afbb17b14ff9cc6f4fdb6f6e231b36a378bb18a3d1a
+SIZE (php-7.0.7.tar.bz2) = 14106181

Modified: branches/2016Q2/lang/php70/pkg-plist
==============================================================================
--- branches/2016Q2/lang/php70/pkg-plist	Sat May 28 01:42:04 2016	(r415972)
+++ branches/2016Q2/lang/php70/pkg-plist	Sat May 28 01:48:22 2016	(r415973)
@@ -7,12 +7,8 @@ bin/phpize
 etc/php.conf
 etc/php.ini-development
 etc/php.ini-production
-%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi
-%%FPM%%etc/php-fpm.conf.default
-%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
-%%FPM%%@unexec if cmp -s %D/etc/php-fpm.d/www.conf %D/etc/php-fpm.d/www.conf.default; then rm -f %D/etc/php-fpm.d/www.conf; fi
-%%FPM%%etc/php-fpm.d/www.conf.default
-%%FPM%%@exec cp -n %D/%F %B/www.conf
+%%FPM%%@sample etc/php-fpm.conf.default etc/php-fpm.conf
+%%FPM%%@sample etc/php-fpm.d/www.conf.default etc/php-fpm.d/www.conf
 include/php/TSRM/TSRM.h
 include/php/TSRM/readdir.h
 include/php/TSRM/tsrm_config.h

More information about the svn-ports-branches mailing list