svn commit: r414514 - in branches/2016Q2/lang/php70: . files

[Jason Unovitch]

Author: junovitch
Date: Tue May  3 03:17:15 2016
New Revision: 414514
URL: https://svnweb.freebsd.org/changeset/ports/414514

Log:
  MFH: r412802 r412806 r413401 r414509
  
  Add configtest support for php-fpm rc script.
  
  PR:		208325
  Submitted by:	ganbold
  Approved by:	miwi
  Sponsored by:	A-Team Systems
  
  Bump PORTREVISION.
  
  Suggested by:	mat
  
  - Restore ?= which was removed in r412806
  
  Approved by:	portmgr (blanket)
  
  lang/php70: update 7.0.5 -> 7.0.6
  
  Changelog:	http://www.php.net/ChangeLog-7.php#7.0.6
  
  Security:	CVE-2016-3074
  Security:	https://vuxml.FreeBSD.org/freebsd/5764c634-10d2-11e6-94fa-002590263bf5.html
  Approved by:	ports-secteam (with hat)

Modified:
  branches/2016Q2/lang/php70/Makefile
  branches/2016Q2/lang/php70/distinfo
  branches/2016Q2/lang/php70/files/php-fpm.in
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/lang/php70/Makefile
==============================================================================
--- branches/2016Q2/lang/php70/Makefile	Tue May  3 03:15:24 2016	(r414513)
+++ branches/2016Q2/lang/php70/Makefile	Tue May  3 03:17:15 2016	(r414514)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	php70
-PORTVERSION=	7.0.5
+PORTVERSION=	7.0.6
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions

Modified: branches/2016Q2/lang/php70/distinfo
==============================================================================
--- branches/2016Q2/lang/php70/distinfo	Tue May  3 03:15:24 2016	(r414513)
+++ branches/2016Q2/lang/php70/distinfo	Tue May  3 03:17:15 2016	(r414514)
@@ -1,2 +1,2 @@
-SHA256 (php-7.0.5.tar.bz2) = 2c09af7fe64537ea795f098b9b542ead407ef83f7cdc65b3787115ccbbb51de9
-SIZE (php-7.0.5.tar.bz2) = 14086522
+SHA256 (php-7.0.6.tar.bz2) = 14ddf192a9965c858c1e742a61456be2f34a4db87556172c0d76f08de96329b7
+SIZE (php-7.0.6.tar.bz2) = 14102594

Modified: branches/2016Q2/lang/php70/files/php-fpm.in
==============================================================================
--- branches/2016Q2/lang/php70/files/php-fpm.in	Tue May  3 03:15:24 2016	(r414513)
+++ branches/2016Q2/lang/php70/files/php-fpm.in	Tue May  3 03:17:15 2016	(r414514)
@@ -17,11 +17,16 @@
 name="php_fpm"
 rcvar=php_fpm_enable
 
+start_precmd="php_fpm_checkconfig"
+restart_precmd="php_fpm_checkconfig"
+reload_precmd="php_fpm_checkconfig"
+configtest_cmd="php_fpm_checkconfig"
+
 load_rc_config "$name"
 
 : ${php_fpm_enable="NO"}
 
-extra_commands="reload logrotate"
+extra_commands="reload configtest logrotate"
 
 command="%%PREFIX%%/sbin/php-fpm"
 pidfile="/var/run/php-fpm.pid"
@@ -40,4 +45,10 @@ php_fpm_logrotate() {
         kill -USR1 $rc_pid
 }
 
+php_fpm_checkconfig()
+{
+        echo "Performing sanity check on php-fpm configuration:"
+        eval ${command} -t
+}
+
 run_rc_command "$1"