svn commit: r414515 - in branches/2016Q2/lang/php56: . files
Jason Unovitch
junovitch at FreeBSD.org
Tue May 3 03:18:42 UTC 2016
Author: junovitch
Date: Tue May 3 03:18:41 2016
New Revision: 414515
URL: https://svnweb.freebsd.org/changeset/ports/414515
Log:
MFH: r413091 r414510 r414512
Add configtest support for php-fpm rc script.
PR: 208324
Sponsored by: A-Team Systems
lang/php56: update 5.6.20 -> 5.6.21
Changelog: http://www.php.net/ChangeLog-5.php#5.6.21
PR: 209145
Reported by Christian Schwarz <me at cschwarz.com>
Security: CVE-2016-3074
Security: https://vuxml.FreeBSD.org/freebsd/5764c634-10d2-11e6-94fa-002590263bf5.html
lang/php56: Restore ?= which was removed in r413091
PR: 208324 (introduced regression)
Approved by: portmgr (blanket)
Approved by: ports-secteam (with hat)
Modified:
branches/2016Q2/lang/php56/Makefile
branches/2016Q2/lang/php56/distinfo
branches/2016Q2/lang/php56/files/php-fpm.in
Directory Properties:
branches/2016Q2/ (props changed)
Modified: branches/2016Q2/lang/php56/Makefile
==============================================================================
--- branches/2016Q2/lang/php56/Makefile Tue May 3 03:17:15 2016 (r414514)
+++ branches/2016Q2/lang/php56/Makefile Tue May 3 03:18:41 2016 (r414515)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= php56
-PORTVERSION= 5.6.20
+PORTVERSION= 5.6.21
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
Modified: branches/2016Q2/lang/php56/distinfo
==============================================================================
--- branches/2016Q2/lang/php56/distinfo Tue May 3 03:17:15 2016 (r414514)
+++ branches/2016Q2/lang/php56/distinfo Tue May 3 03:18:41 2016 (r414515)
@@ -1,4 +1,4 @@
-SHA256 (php-5.6.20.tar.bz2) = 5ac7bf7caec7a79b18cf458e786fd1609ad2da771224b80bc15cc6f01b22bf1f
-SIZE (php-5.6.20.tar.bz2) = 14162188
+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
Modified: branches/2016Q2/lang/php56/files/php-fpm.in
==============================================================================
--- branches/2016Q2/lang/php56/files/php-fpm.in Tue May 3 03:17:15 2016 (r414514)
+++ branches/2016Q2/lang/php56/files/php-fpm.in Tue May 3 03:18:41 2016 (r414515)
@@ -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"
More information about the svn-ports-all
mailing list