[Midnightbsd-cvs] mports [23049] trunk/lang/php71: update php

[laffer1 at midnightbsd.org]

Revision: 23049
          http://svnweb.midnightbsd.org/mports/?rev=23049
Author:   laffer1
Date:     2018-03-04 20:22:36 -0500 (Sun, 04 Mar 2018)
Log Message:
-----------
update php

Modified Paths:
--------------
    trunk/lang/php71/Makefile
    trunk/lang/php71/distinfo
    trunk/lang/php71/files/patch-configure.in
    trunk/lang/php71/files/php-fpm.in

Modified: trunk/lang/php71/Makefile
===================================================================
--- trunk/lang/php71/Makefile	2018-03-05 00:19:08 UTC (rev 23048)
+++ trunk/lang/php71/Makefile	2018-03-05 01:22:36 UTC (rev 23049)
@@ -3,7 +3,7 @@
 # $MidnightBSD$
 
 PORTNAME=	php71
-PORTVERSION=	7.1.5
+PORTVERSION=	7.1.14
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions

Modified: trunk/lang/php71/distinfo
===================================================================
--- trunk/lang/php71/distinfo	2018-03-05 00:19:08 UTC (rev 23048)
+++ trunk/lang/php71/distinfo	2018-03-05 01:22:36 UTC (rev 23049)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1494835176
-SHA256 (php-7.1.5.tar.xz) = d149a3c396c45611f5dc6bf14be190f464897145a76a8e5851cf18ff7094f6ac
-SIZE (php-7.1.5.tar.xz) = 12797696
+TIMESTAMP = 1517567359
+SHA256 (php-7.1.14.tar.xz) = c09f0c1074f5689b492d79034adb84e6a6c6d08c6763c02282e6318d41156779
+SIZE (php-7.1.14.tar.xz) = 12198612
+SHA256 (php-7.1.x-mail-header.patch) = 8f173d89672f7ebfabfcc3c5d7f8dec1c4243aba665db4b4046e67c34d9d4dc7
+SIZE (php-7.1.x-mail-header.patch) = 4504

Modified: trunk/lang/php71/files/patch-configure.in
===================================================================
--- trunk/lang/php71/files/patch-configure.in	2018-03-05 00:19:08 UTC (rev 23048)
+++ trunk/lang/php71/files/patch-configure.in	2018-03-05 01:22:36 UTC (rev 23049)
@@ -1,6 +1,14 @@
---- configure.in.orig	2016-07-20 13:11:23 UTC
+--- configure.in.orig	2018-01-03 02:32:22 UTC
 +++ configure.in
-@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4)
+@@ -115,6 +115,7 @@ int zend_sprintf(char *buffer, const char *format, ...
+ #endif
+ 
+ #undef PTHREADS
++#include <ext/php_config.h>
+ ])
+ 
+ PHP_MAJOR_VERSION=7
+@@ -370,7 +371,6 @@ sinclude(TSRM/tsrm.m4)
  dnl .
  dnl -------------------------------------------------------------------------
  
@@ -8,7 +16,7 @@
  PHP_HELP_SEPARATOR([SAPI modules:])
  PHP_SHLIB_SUFFIX_NAMES
  PHP_BUILD_PROGRAM
-@@ -401,15 +400,9 @@ else
+@@ -401,15 +401,9 @@ else
    AC_MSG_RESULT([none])
  fi
  
@@ -24,7 +32,7 @@
  fi
  
  dnl Starting system checks.
-@@ -700,7 +693,7 @@ nanosleep \
+@@ -701,7 +695,7 @@ nanosleep \
  )
  
  dnl Some systems (like OpenSolaris) do not have nanosleep in libc
@@ -33,7 +41,7 @@
  
  dnl Check for getaddrinfo, should be a better way, but...
  dnl Also check for working getaddrinfo
-@@ -1251,7 +1244,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
+@@ -1252,7 +1246,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
  EXPANDED_DATADIR=$datadir
  EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
  EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@@ -42,7 +50,7 @@
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
-@@ -1460,7 +1453,7 @@ PHP_SUBST(all_targets)
+@@ -1461,7 +1455,7 @@ PHP_SUBST(all_targets)
  PHP_SUBST(install_targets)
  PHP_SUBST(install_binary_targets)
  

Modified: trunk/lang/php71/files/php-fpm.in
===================================================================
--- trunk/lang/php71/files/php-fpm.in	2018-03-05 00:19:08 UTC (rev 23048)
+++ trunk/lang/php71/files/php-fpm.in	2018-03-05 01:22:36 UTC (rev 23049)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/lang/php71/files/php-fpm.in 432324 2017-01-24 11:54:20Z tz $
+# $FreeBSD: head/lang/php71/files/php-fpm.in 444558 2017-06-28 09:40:58Z tz $
 #
 
 # PROVIDE: php-fpm
@@ -17,7 +17,7 @@
 name="php_fpm"
 rcvar=php_fpm_enable
 
-start_precmd="php_fpm_checkconfig"
+start_precmd="php_fpm_prestart"
 restart_precmd="php_fpm_checkconfig"
 reload_precmd="php_fpm_checkconfig"
 configtest_cmd="php_fpm_checkconfig"
@@ -25,6 +25,7 @@
 load_rc_config "$name"
 
 : ${php_fpm_enable="NO"}
+: ${php_fpm_umask=""}
 
 extra_commands="reload configtest logrotate"
 
@@ -51,4 +52,18 @@
         eval ${command} -t
 }
 
+php_fpm_prestart()
+{
+	php_fpm_checkconfig
+	checkconfig=$?
+	if [ $checkconfig -ne 0  ]; then
+		return $checkconfig
+	fi
+
+	if [ ! -z "$php_fpm_umask"  ]; then
+		echo "Setting umask to: ${php_fpm_umask}"
+		umask $php_fpm_umask
+	fi
+}
+
 run_rc_command "$1"