Update versions.txt

include/mphp.sh

@@ -13,7 +13,6 @@ Install_MPHP() {
     if [ -e "${php_install_dir}${mphp_ver}/bin/phpize" ]; then
       echo "${CWARNING}PHP${mphp_ver} already installed! ${CEND}"
     else
-      service php-fpm stop
       [ -e "/lib/systemd/system/php-fpm.service" ] && /bin/mv /lib/systemd/system/php-fpm.service{,_bk}
       [ -e "/etc/init.d/php-fpm" ] && /bin/mv /etc/init.d/php-fpm{,_bk}
       php_install_dir=${php_install_dir}${mphp_ver}
@@ -57,7 +56,7 @@ Install_MPHP() {
         [ -e "/lib/systemd/system/php-fpm.service" ] && /bin/mv /lib/systemd/system/php-fpm.service /lib/systemd/system/php${mphp_ver}-fpm.service
         [ -e "/etc/init.d/php-fpm" ] && /bin/mv /etc/init.d/php-fpm /etc/init.d/php${mphp_ver}-fpm
         [ -e "/lib/systemd/system/php-fpm.service_bk" ] && /bin/mv /lib/systemd/system/php-fpm.service{_bk,}
-        [ -e "/etc/init.d/php-fpm_bk" ] && /bin/mv /etc/init.d/php-fpm /etc/init.d/php-fpm{_bk,}
+        [ -e "/etc/init.d/php-fpm_bk" ] && /bin/mv /etc/init.d/php-fpm{_bk,}
         if [ -e /bin/systemctl ]; then
           systemctl enable php${mphp_ver}-fpm
           systemctl enable php-fpm

include/ngx_lua_waf.sh

@@ -13,17 +13,17 @@ Nginx_lua_waf() {
   [ ! -e "${nginx_install_dir}/sbin/nginx" ] && echo "${CWARNING}Nginx is not installed on your system! ${CEND}" && exit 1
   if [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ]; then
     [ -e "/usr/local/lib/libluajit-5.1.so.2.0.5" ] && find /usr/local -name *luajit* | xargs rm -rf
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/LuaJIT-2.1.0-beta3.tar.gz && Download_src
-    tar xzf LuaJIT-2.1.0-beta3.tar.gz
-    pushd LuaJIT-2.1.0-beta3
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20190115.tar.gz && Download_src
+    tar xzf luajit2-2.1-20190115.tar.gz
+    pushd luajit2-2.1-20190115
     make && make install
     [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ] && { echo "${CFAILURE}LuaJIT install failed! ${CEND}"; kill -9 $$; }
     popd > /dev/null
   fi
   if [ ! -e "/usr/local/lib/lua/5.1/cjson.so" ]; then
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/lua-cjson-2.1.0.6.tar.gz && Download_src
-    tar xzf lua-cjson-2.1.0.6.tar.gz
-    pushd lua-cjson-2.1.0.6
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/lua-cjson-2.1.0.7rc2.tar.gz && Download_src
+    tar xzf lua-cjson-2.1.0.7rc2.tar.gz
+    pushd lua-cjson-2.1.0.7rc2
     sed -i 's@^LUA_INCLUDE_DIR.*@&/luajit-2.1@' Makefile
     make && make install
     [ ! -e "/usr/local/lib/lua/5.1/cjson.so" ] && { echo "${CFAILURE}lua-cjson install failed! ${CEND}"; kill -9 $$; }
@@ -76,17 +76,17 @@ Tengine_lua_waf() {
   [ ! -e "${tengine_install_dir}/sbin/nginx" ] && echo "${CWARNING}Tengine is not installed on your system! ${CEND}" && exit 1
   if [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ]; then
     [ -e "/usr/local/lib/libluajit-5.1.so.2.0.5" ] && find /usr/local -name *luajit* | xargs rm -rf
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/LuaJIT-2.1.0-beta3.tar.gz && Download_src
-    tar xzf LuaJIT-2.1.0-beta3.tar.gz
-    pushd LuaJIT-2.1.0-beta3
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20190115.tar.gz && Download_src
+    tar xzf luajit2-2.1-20190115.tar.gz
+    pushd luajit2-2.1-20190115
     make && make install
     [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ] && { echo "${CFAILURE}LuaJIT install failed! ${CEND}"; kill -9 $$; }
     popd > /dev/null
   fi
   if [ ! -e "/usr/local/lib/lua/5.1/cjson.so" ]; then
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/lua-cjson-2.1.0.6.tar.gz && Download_src
-    tar xzf lua-cjson-2.1.0.6.tar.gz
-    pushd lua-cjson-2.1.0.6
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/lua-cjson-2.1.0.7rc2.tar.gz && Download_src
+    tar xzf lua-cjson-2.1.0.7rc2.tar.gz
+    pushd lua-cjson-2.1.0.7rc2
     sed -i 's@^LUA_INCLUDE_DIR.*@&/luajit-2.1@' Makefile
     make && make install
     [ ! -e "/usr/local/lib/lua/5.1/cjson.so" ] && { echo "${CFAILURE}lua-cjson install failed! ${CEND}"; kill -9 $$; }

include/pecl_xdebug.sh

@@ -11,6 +11,7 @@
 Install_pecl_xdebug() {
   if [ -e "${php_install_dir}/bin/phpize" ]; then
     pushd ${oneinstack_dir}/src > /dev/null
+    phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
     PHP_detail_ver=$(${php_install_dir}/bin/php-config --version)
     PHP_main_ver=${PHP_detail_ver%.*}
     if [[ "${PHP_main_ver}" =~ ^5.[5-6]$|^7.[0-2]$ ]]; then

install.sh

@@ -789,7 +789,7 @@ if [[ ${nginx_option} =~ ^[1-3]$ ]] || [[ "${db_option}" =~ ^[1-9]$|^1[0-3]$ ]];
 fi
 
 # openSSL
-if [[ ${tomcat_option} =~ ^[1-4]$ ]] || [[ ${apache_option} =~ ^[1-2]$ ]] || [[ ${php_option} =~ ^[1-8]$ ]]; then
+if [[ ${tomcat_option} =~ ^[1-4]$ ]] || [[ ${apache_option} =~ ^[1-2]$ ]] || [[ ${php_option} =~ ^[1-8]$ ]] || [[ "${mphp_ver}" =~ ^5[3-6]$|^7[0-3]$ ]]; then
   . include/openssl.sh
   Install_openSSL | tee -a ${oneinstack_dir}/install.log
 fi

versions.txt

@@ -6,39 +6,39 @@ openresty_ver=1.13.6.2
 openssl11_ver=1.1.1a
 openssl_ver=1.0.2q
 
-tomcat9_ver=9.0.14
+tomcat9_ver=9.0.16
 tomcat8_ver=8.5.37
 tomcat7_ver=7.0.92
 tomcat6_ver=6.0.53
 
-apache24_ver=2.4.37
+apache24_ver=2.4.38
 apache22_ver=2.2.34
 pcre_ver=8.42
 apr_ver=1.6.5
 apr_util_ver=1.6.1
-nghttp2_ver=1.35.1
+nghttp2_ver=1.36.0
 
 # DB
-mysql80_ver=8.0.14
+mysql80_ver=8.0.15
 mysql57_ver=5.7.25
 mysql56_ver=5.6.43
 mysql55_ver=5.5.62
 
 mariadb103_ver=10.3.12
 mariadb102_ver=10.2.21
-mariadb101_ver=10.1.37
-mariadb55_ver=5.5.62
+mariadb101_ver=10.1.38
+mariadb55_ver=5.5.63
 
 percona80_ver=8.0.13-4
 percona57_ver=5.7.24-27
-percona56_ver=5.6.42-84.2
+percona56_ver=5.6.43-84.3
 percona55_ver=5.5.62-38.14
 
 alisql_ver=5.6.32-9
 
 pgsql_ver=11.1
 
-mongodb_ver=4.0.5
+mongodb_ver=4.0.6
 
 # JDK
 jdk110_ver=11.0.2
@@ -47,8 +47,8 @@ jdk17_ver=1.7.0_80
 jdk16_ver=1.6.0_45
 
 # PHP
-php73_ver=7.3.1
-php72_ver=7.2.14
+php73_ver=7.3.2
+php72_ver=7.2.15
 php71_ver=7.1.26
 php70_ver=7.0.33
 php56_ver=5.6.40
@@ -57,13 +57,13 @@ php54_ver=5.4.45
 php53_ver=5.3.29
 
 libiconv_ver=1.15
-curl_ver=7.63.0
+curl_ver=7.64.0
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
 libsodium_ver=1.0.17
 argon2_ver=20171227
-imagemagick_ver=6.9.10-24
+imagemagick_ver=6.9.10-27
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.30
 gmagick_ver=2.0.5RC1
@@ -74,7 +74,7 @@ apcu_ver=5.1.16
 apcu_oldver=4.0.11
 eaccelerator_ver=0.9.6.1
 phalcon_ver=3.4.2
-swoole_ver=4.2.12
+swoole_ver=4.2.13
 swoole_oldver=1.10.5
 xdebug_ver=2.6.1
 xdebug_oldver=2.5.5
@@ -98,7 +98,7 @@ pecl_mongodb_ver=1.5.3
 pecl_mongo_ver=1.6.16
 
 # phpMyadmin
-phpmyadmin_ver=4.8.4
+phpmyadmin_ver=4.8.5
 phpmyadmin_oldver=4.4.15.10
 
 # jemalloc