From 7df6f6d89b610607db97089551d2bf20de0b68a3 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Fri, 29 Nov 2019 15:52:49 +0800
Subject: [PATCH] up

---
 plugins/php/info.json              |  4 +-
 plugins/php/versions/71/install.sh |  2 +-
 plugins/php/versions/72/install.sh |  2 +-
 plugins/php/versions/73/install.sh |  2 +-
 plugins/php/versions/74/install.sh | 86 ++++++++++++++++++++++++++++++
 5 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100755 plugins/php/versions/74/install.sh

diff --git a/plugins/php/info.json b/plugins/php/info.json
index 212a91448..8d5fcdad9 100755
--- a/plugins/php/info.json
+++ b/plugins/php/info.json
@@ -5,8 +5,8 @@
 	"name": "php",
 	"title": "PHP",
 	"coexist": true,
-	"versions": ["53","54","55","56","70","71","72","73"],
-	"updates": ["5.3.17","5.4.45","5.6.36","7.0.30","7.1.29","7.2.18","7.3.5"],
+	"versions": ["53","54","55","56","70","71","72","73","74"],
+	"updates": ["5.3.17","5.4.45","5.6.36","7.0.30","7.1.33","7.2.25","7.3.12","7.4.0"],
 	"tip": "soft",
 	"checks": "server/php/VERSION/bin/php",
 	"path": "server/php/VERSION",
diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh
index b0693356e..4068d5b4d 100755
--- a/plugins/php/versions/71/install.sh
+++ b/plugins/php/versions/71/install.sh
@@ -10,7 +10,7 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
-version=7.1.29
+version=7.1.33
 Install_php()
 {
 #------------------------ install start ------------------------------------#
diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh
index 91532a28f..09aa31790 100755
--- a/plugins/php/versions/72/install.sh
+++ b/plugins/php/versions/72/install.sh
@@ -11,7 +11,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
 
-version=7.2.18
+version=7.2.25
 Install_php()
 {
 #------------------------ install start ------------------------------------#
diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh
index 4cb010465..8a1a0b1fa 100755
--- a/plugins/php/versions/73/install.sh
+++ b/plugins/php/versions/73/install.sh
@@ -11,7 +11,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
 
-version=7.3.5
+version=7.3.12
 Install_php()
 {
 #------------------------ install start ------------------------------------#
diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh
new file mode 100755
index 000000000..43a2eb600
--- /dev/null
+++ b/plugins/php/versions/74/install.sh
@@ -0,0 +1,86 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sourcePath=${serverPath}/source
+sysName=`uname`
+install_tmp=${rootPath}/tmp/mw_install.pl
+
+
+version=7.4.0
+Install_php()
+{
+#------------------------ install start ------------------------------------#
+echo "安装php-${version} ..." > $install_tmp
+mkdir -p $sourcePath/php
+mkdir -p $serverPath/php
+
+if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then
+	wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz http://au1.php.net/distributions/php-${version}.tar.xz
+fi
+
+if [ ! -d $sourcePath/php/php-${version} ];then
+	cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz
+fi
+
+
+OPTIONS=''
+if [ $sysName == 'Darwin' ]; then
+	OPTIONS='--without-iconv'
+	OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl"
+	OPTIONS="${OPTIONS} --enable-zip"
+else
+	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
+	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
+	OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf"
+	OPTIONS="${OPTIONS} --with-curl"
+	OPTIONS="${OPTIONS} --with-libzip=${serverPath}/lib/libzip"
+fi
+
+
+# 
+# 
+cd $sourcePath/php/php-${version} && ./configure \
+--prefix=$serverPath/php/74 \
+--exec-prefix=$serverPath/php/74 \
+--with-config-file-path=$serverPath/php/74/etc \
+--enable-mysqlnd \
+--with-mysqli=mysqlnd \
+--with-pdo-mysql=mysqlnd \
+--enable-mbstring \
+--with-zlib-dir=$serverPath/lib/zlib \
+--enable-ftp \
+--enable-sockets \
+--enable-simplexml \
+--enable-intl \
+--enable-wddx \
+--enable-soap \
+--enable-posix \
+--enable-sysvmsg \
+--enable-sysvsem \
+--enable-sysvshm \
+--disable-fileinfo \
+$OPTIONS \
+--enable-fpm \
+&& make && make install && make clean
+
+#------------------------ install end ------------------------------------#
+}
+
+Uninstall_php()
+{
+	$serverPath/php/init.d/php74 stop
+	rm -rf $serverPath/php/74
+	echo "卸载php-${version}..." > $install_tmp
+}
+
+action=${1}
+if [ "${1}" == 'install' ];then
+	Install_php
+else
+	Uninstall_php
+fi