[Midnightbsd-cvs] mports [23701] trunk/lang/php70: update php 7.0.31
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Jul 26 22:37:29 EDT 2018
Revision: 23701
http://svnweb.midnightbsd.org/mports/?rev=23701
Author: laffer1
Date: 2018-07-26 22:37:29 -0400 (Thu, 26 Jul 2018)
Log Message:
-----------
update php 7.0.31
Modified Paths:
--------------
trunk/lang/php70/Makefile
trunk/lang/php70/distinfo
trunk/lang/php70/files/patch-configure.in
trunk/lang/php70/files/php-fpm.in
Added Paths:
-----------
trunk/lang/php70/files/patch-Zend_zend__hash.c
trunk/lang/php70/files/patch-Zend_zend__hash.h
Modified: trunk/lang/php70/Makefile
===================================================================
--- trunk/lang/php70/Makefile 2018-07-27 02:02:00 UTC (rev 23700)
+++ trunk/lang/php70/Makefile 2018-07-27 02:37:29 UTC (rev 23701)
@@ -3,7 +3,7 @@
# $MidnightBSD$
PORTNAME= php70
-PORTVERSION= 7.0.30
+PORTVERSION= 7.0.31
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
@@ -14,8 +14,7 @@
LICENSE= php
-USES+= tar:xz cpe
-USE_GCC= 4.8
+USES+= autoreconf:build tar:xz cpe
CPE_PRODUCT= php
NO_OPTIONS_SORT=yes
.if !defined(PKGNAMESUFFIX)
Modified: trunk/lang/php70/distinfo
===================================================================
--- trunk/lang/php70/distinfo 2018-07-27 02:02:00 UTC (rev 23700)
+++ trunk/lang/php70/distinfo 2018-07-27 02:37:29 UTC (rev 23701)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524946057
-SHA256 (php-7.0.30.tar.xz) = c90892fb68ab9b8476519658d3f78f6388f2609ae1309bdc2a2e1cc9f92dd686
-SIZE (php-7.0.30.tar.xz) = 12030228
+TIMESTAMP = 1532658878
+SHA256 (php-7.0.31.tar.xz) = 68f57b3f4587071fb54a620cb83a1cfb3f0bd4ee071e0ce3bf7046a5f2d2f3cf
+SIZE (php-7.0.31.tar.xz) = 12029516
Added: trunk/lang/php70/files/patch-Zend_zend__hash.c
===================================================================
--- trunk/lang/php70/files/patch-Zend_zend__hash.c (rev 0)
+++ trunk/lang/php70/files/patch-Zend_zend__hash.c 2018-07-27 02:37:29 UTC (rev 23701)
@@ -0,0 +1,11 @@
+--- Zend/zend_hash.c.orig 2017-12-13 20:20:30 UTC
++++ Zend/zend_hash.c
+@@ -1573,7 +1573,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_ap
+ }
+
+
+-ZEND_API void ZEND_FASTCALL zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int num_args, ...)
++ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int num_args, ...)
+ {
+ uint32_t idx;
+ Bucket *p;
Property changes on: trunk/lang/php70/files/patch-Zend_zend__hash.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/lang/php70/files/patch-Zend_zend__hash.h
===================================================================
--- trunk/lang/php70/files/patch-Zend_zend__hash.h (rev 0)
+++ trunk/lang/php70/files/patch-Zend_zend__hash.h 2018-07-27 02:37:29 UTC (rev 23701)
@@ -0,0 +1,11 @@
+--- Zend/zend_hash.h.orig 2017-12-13 20:20:24 UTC
++++ Zend/zend_hash.h
+@@ -131,7 +131,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_gr
+ ZEND_API void ZEND_FASTCALL zend_hash_graceful_reverse_destroy(HashTable *ht);
+ ZEND_API void ZEND_FASTCALL zend_hash_apply(HashTable *ht, apply_func_t apply_func);
+ ZEND_API void ZEND_FASTCALL zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t apply_func, void *);
+-ZEND_API void ZEND_FASTCALL zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...);
++ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...);
+
+ /* This function should be used with special care (in other words,
+ * it should usually not be used). When used with the ZEND_HASH_APPLY_STOP
Property changes on: trunk/lang/php70/files/patch-Zend_zend__hash.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/lang/php70/files/patch-configure.in
===================================================================
--- trunk/lang/php70/files/patch-configure.in 2018-07-27 02:02:00 UTC (rev 23700)
+++ trunk/lang/php70/files/patch-configure.in 2018-07-27 02:37:29 UTC (rev 23701)
@@ -1,6 +1,14 @@
---- configure.in.orig 2016-07-20 13:11:23 UTC
+--- configure.in.orig 2018-01-02 08:50:07 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/php70/files/php-fpm.in
===================================================================
--- trunk/lang/php70/files/php-fpm.in 2018-07-27 02:02:00 UTC (rev 23700)
+++ trunk/lang/php70/files/php-fpm.in 2018-07-27 02:37:29 UTC (rev 23701)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: head/lang/php70/files/php-fpm.in 412802 2016-04-09 08:19:15Z ganbold $
+# $FreeBSD: head/lang/php70/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"
More information about the Midnightbsd-cvs
mailing list