From ad2ce68a49806df51679681aeda15d25b612667d Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Wed, 15 Jul 2020 17:28:18 +0800
Subject: [PATCH] up

---
 plugins/php/versions/70/yac.sh   |  3 +-
 plugins/php/versions/71/yac.sh   |  2 +-
 plugins/php/versions/72/yac.sh   |  2 +-
 plugins/php/versions/73/yac.sh   | 98 ++++++++++++++++++++++++++++++++
 plugins/php/versions/74/yac.sh   | 98 ++++++++++++++++++++++++++++++++
 plugins/php/versions/phplib.conf |  4 +-
 6 files changed, 202 insertions(+), 5 deletions(-)
 create mode 100755 plugins/php/versions/73/yac.sh
 create mode 100755 plugins/php/versions/74/yac.sh

diff --git a/plugins/php/versions/70/yac.sh b/plugins/php/versions/70/yac.sh
index 57f232a23..19a716ff7 100755
--- a/plugins/php/versions/70/yac.sh
+++ b/plugins/php/versions/70/yac.sh
@@ -12,13 +12,12 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source/php
 
 
-
 actionType=$1
 version=$2
 sysName=`uname`
 
 LIBNAME=yac
-LIBV=2.0.2
+LIBV=2.2.1
 extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20151012/${LIBNAME}.so
 
 if [ "$sysName" == "Darwin" ];then
diff --git a/plugins/php/versions/71/yac.sh b/plugins/php/versions/71/yac.sh
index 58eb76c0e..323fe83e1 100755
--- a/plugins/php/versions/71/yac.sh
+++ b/plugins/php/versions/71/yac.sh
@@ -16,7 +16,7 @@ actionType=$1
 version=$2
 
 LIBNAME=yac
-LIBV=2.0.2
+LIBV=2.2.1
 extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20160303/${LIBNAME}.so
 
 sysName=`uname`
diff --git a/plugins/php/versions/72/yac.sh b/plugins/php/versions/72/yac.sh
index b2ec59520..9d250c2e0 100755
--- a/plugins/php/versions/72/yac.sh
+++ b/plugins/php/versions/72/yac.sh
@@ -17,7 +17,7 @@ actionType=$1
 version=$2
 
 LIBNAME=yac
-LIBV=2.0.2
+LIBV=2.2.1
 extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20170718/${LIBNAME}.so
 sysName=`uname`
 if [ "$sysName" == "Darwin" ];then
diff --git a/plugins/php/versions/73/yac.sh b/plugins/php/versions/73/yac.sh
new file mode 100755
index 000000000..7028a249a
--- /dev/null
+++ b/plugins/php/versions/73/yac.sh
@@ -0,0 +1,98 @@
+#!/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")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sourcePath=${serverPath}/source/php
+
+
+
+actionType=$1
+version=$2
+
+LIBNAME=yac
+LIBV=2.2.1
+extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20180731/${LIBNAME}.so
+sysName=`uname`
+if [ "$sysName" == "Darwin" ];then
+	BAK='_bak'
+else
+	BAK=''
+fi
+
+
+Install_lib()
+{
+	isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"`
+	if [ "$isInstall" != "" ];then
+		echo "php-$version 已安装${LIBNAME},请选择其它版本!"
+		return
+	fi
+	
+	if [ ! -f "$extFile" ];then
+
+		php_lib=$sourcePath/php_lib
+		mkdir -p $php_lib
+
+		if [ ! -f $php_lib/${LIBNAME}-${LIBV} ];then
+			wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz
+			cd $php_lib
+			tar xvf ${LIBNAME}-${LIBV}.tgz
+		fi 
+		cd $php_lib/${LIBNAME}-${LIBV}
+
+		$serverPath/php/$version/bin/phpize
+		./configure --with-php-config=$serverPath/php/$version/bin/php-config
+		make && make install && make clean
+		cd ..
+	fi
+	
+	if [ ! -f "$extFile" ];then
+		echo "ERROR!"
+		return;
+	fi
+	
+	echo  "" >> $serverPath/php/$version/etc/php.ini
+	echo  "[${LIBNAME}]" >> $serverPath/php/$version/etc/php.ini
+	echo  "extension=${LIBNAME}.so" >> $serverPath/php/$version/etc/php.ini
+	echo  "${LIBNAME}.use_namespace=1" >> $serverPath/php/$version/etc/php.ini
+	
+	$serverPath/php/init.d/php$version reload
+	echo '==========================================================='
+	echo 'successful!'
+}
+
+Uninstall_lib()
+{
+	if [ ! -f "$serverPath/php/$version/bin/php-config" ];then
+		echo "php$version 未安装,请选择其它版本!"
+		return
+	fi
+
+	if [ ! -f "$extFile" ];then
+		echo "php$version 未安装yaf,请选择其它版本!"
+		return
+	fi
+	
+	echo $serverPath/php/$version/etc/php.ini
+	sed -i $BAK "/${LIBNAME}.so/d" $serverPath/php/$version/etc/php.ini
+	sed -i $BAK "/\[${LIBNAME}\]/d"  $serverPath/php/$version/etc/php.ini
+		
+	rm -f $extFile
+	$serverPath/php/init.d/php$version reload
+	echo '==============================================='
+	echo 'successful!'
+}
+
+
+if [ "$actionType" == 'install' ];then
+	Install_lib
+elif [ "$actionType" == 'uninstall' ];then
+	Uninstall_lib
+fi
\ No newline at end of file
diff --git a/plugins/php/versions/74/yac.sh b/plugins/php/versions/74/yac.sh
new file mode 100755
index 000000000..c20d6f33d
--- /dev/null
+++ b/plugins/php/versions/74/yac.sh
@@ -0,0 +1,98 @@
+#!/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")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sourcePath=${serverPath}/source/php
+
+
+
+actionType=$1
+version=$2
+
+LIBNAME=yac
+LIBV=2.2.1
+extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20190902/${LIBNAME}.so
+sysName=`uname`
+if [ "$sysName" == "Darwin" ];then
+	BAK='_bak'
+else
+	BAK=''
+fi
+
+
+Install_lib()
+{
+	isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"`
+	if [ "$isInstall" != "" ];then
+		echo "php-$version 已安装${LIBNAME},请选择其它版本!"
+		return
+	fi
+	
+	if [ ! -f "$extFile" ];then
+
+		php_lib=$sourcePath/php_lib
+		mkdir -p $php_lib
+
+		if [ ! -f $php_lib/${LIBNAME}-${LIBV} ];then
+			wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz
+			cd $php_lib
+			tar xvf ${LIBNAME}-${LIBV}.tgz
+		fi 
+		cd $php_lib/${LIBNAME}-${LIBV}
+
+		$serverPath/php/$version/bin/phpize
+		./configure --with-php-config=$serverPath/php/$version/bin/php-config
+		make && make install && make clean
+		cd ..
+	fi
+	
+	if [ ! -f "$extFile" ];then
+		echo "ERROR!"
+		return;
+	fi
+	
+	echo  "" >> $serverPath/php/$version/etc/php.ini
+	echo  "[${LIBNAME}]" >> $serverPath/php/$version/etc/php.ini
+	echo  "extension=${LIBNAME}.so" >> $serverPath/php/$version/etc/php.ini
+	echo  "${LIBNAME}.use_namespace=1" >> $serverPath/php/$version/etc/php.ini
+	
+	$serverPath/php/init.d/php$version reload
+	echo '==========================================================='
+	echo 'successful!'
+}
+
+Uninstall_lib()
+{
+	if [ ! -f "$serverPath/php/$version/bin/php-config" ];then
+		echo "php$version 未安装,请选择其它版本!"
+		return
+	fi
+
+	if [ ! -f "$extFile" ];then
+		echo "php$version 未安装yaf,请选择其它版本!"
+		return
+	fi
+	
+	echo $serverPath/php/$version/etc/php.ini
+	sed -i $BAK "/${LIBNAME}.so/d" $serverPath/php/$version/etc/php.ini
+	sed -i $BAK "/\[${LIBNAME}\]/d"  $serverPath/php/$version/etc/php.ini
+		
+	rm -f $extFile
+	$serverPath/php/init.d/php$version reload
+	echo '==============================================='
+	echo 'successful!'
+}
+
+
+if [ "$actionType" == 'install' ];then
+	Install_lib
+elif [ "$actionType" == 'uninstall' ];then
+	Uninstall_lib
+fi
\ No newline at end of file
diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index ff03e17f2..17dfd7800 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -279,7 +279,9 @@
         "versions": [
             "70",
             "71",
-            "72"
+            "72",
+            "74",
+            "74"
         ],
         "type": "缓存器",
         "msg": "高性能无锁共享内存Cache",