[feat] Update versions.txt and fix mphp_ver

f2ex · Oct 16, 2020 · 6c2d5d9 · 6c2d5d9
1 parent 5b37891
commit 6c2d5d9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 27 deletions.
diff --git a/include/ngx_lua_waf.sh b/include/ngx_lua_waf.sh
@@ -21,9 +21,9 @@ Nginx_lua_waf() {
  popd > /dev/null
  fi
  if [ ! -e "/usr/local/lib/lua/5.1/cjson.so" ]; then
- src_url=https://mirrors.linuxeye.com/oneinstack/src/lua-cjson-2.1.0.7.tar.gz && Download_src
- tar xzf lua-cjson-2.1.0.7.tar.gz
- pushd lua-cjson-2.1.0.7
+ src_url=https://mirrors.linuxeye.com/oneinstack/src/lua-cjson-2.1.0.8.tar.gz && Download_src
+ tar xzf lua-cjson-2.1.0.8.tar.gz
+ pushd lua-cjson-2.1.0.8
  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 $$; }
@@ -38,18 +38,18 @@ Nginx_lua_waf() {
  src_url=https://www.openssl.org/source/openssl-${openssl11_ver}.tar.gz && Download_src
  src_url=https://mirrors.linuxeye.com/oneinstack/src/pcre-${pcre_ver}.tar.gz && Download_src
  src_url=https://mirrors.linuxeye.com/oneinstack/src/ngx_devel_kit.tar.gz && Download_src
- src_url=https://mirrors.linuxeye.com/oneinstack/src/lua-nginx-module.tar.gz && Download_src
+ src_url=https://mirrors.linuxeye.com/oneinstack/src/lua-nginx-module-${lua_nginx_module_ver}.tar.gz && Download_src
  tar xzf nginx-${nginx_ver}.tar.gz
  tar xzf openssl-${openssl11_ver}.tar.gz
  tar xzf pcre-${pcre_ver}.tar.gz
  tar xzf ngx_devel_kit.tar.gz
- tar xzf lua-nginx-module.tar.gz
+ tar xzf lua-nginx-module-${lua_nginx_module_ver}.tar.gz
  pushd nginx-${nginx_ver}
  make clean
  sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' auto/cc/gcc # close debug
  export LUAJIT_LIB=/usr/local/lib
  export LUAJIT_INC=/usr/local/include/luajit-2.1
- ./configure ${nginx_configure_args} --with-ld-opt="-Wl,-rpath,/usr/local/lib" --add-module=../lua-nginx-module --add-module=../ngx_devel_kit
+ ./configure ${nginx_configure_args} --with-ld-opt="-Wl,-rpath,/usr/local/lib" --add-module=../lua-nginx-module-${lua_nginx_module_ver} --add-module=../ngx_devel_kit
  make -j ${THREAD}
  if [ -f "objs/nginx" ]; then
  /bin/mv ${nginx_install_dir}/sbin/nginx{,`date +%m%d`}
@@ -82,9 +82,9 @@ Tengine_lua_waf() {
  popd > /dev/null
  fi
  if [ ! -e "/usr/local/lib/lua/5.1/cjson.so" ]; then
- src_url=https://mirrors.linuxeye.com/oneinstack/src/lua-cjson-2.1.0.7.tar.gz && Download_src
- tar xzf lua-cjson-2.1.0.7.tar.gz
- pushd lua-cjson-2.1.0.7
+ src_url=https://mirrors.linuxeye.com/oneinstack/src/lua-cjson-2.1.0.8.tar.gz && Download_src
+ tar xzf lua-cjson-2.1.0.8.tar.gz
+ pushd lua-cjson-2.1.0.8
  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 $$; }

diff --git a/install.sh b/install.sh
@@ -50,7 +50,7 @@ Show_Help() {
  --apache_mode_option [1-2] Apache2.4 mode, 1(default): php-fpm, 2: mod_php
  --apache_mpm_option [1-3] Apache2.4 MPM, 1(default): event, 2: prefork, 3: worker
  --php_option [1-9] Install PHP version
- --mphp_ver [53~73] Install another PHP version (PATH: ${php_install_dir}\${mphp_ver})
+ --mphp_ver [53~74] Install another PHP version (PATH: ${php_install_dir}\${mphp_ver})
  --mphp_addons Only install another PHP addons
  --phpcache_option [1-4] Install PHP opcode cache, default: 1 opcache
  --php_extensions [ext name] Install PHP extensions, include zendguardloader,ioncube,
@@ -112,7 +112,7 @@ while :; do
  ;;
  --mphp_ver)
  mphp_ver=$2; mphp_flag=y; shift 2
- [[ ! "${mphp_ver}" =~ ^5[3-6]$|^7[0-3]$ ]] && { echo "${CWARNING}mphp_ver input error! Please only input number 53~73${CEND}"; exit 1; }
+ [[ ! "${mphp_ver}" =~ ^5[3-6]$|^7[0-4]$ ]] && { echo "${CWARNING}mphp_ver input error! Please only input number 53~74${CEND}"; exit 1; }
  ;;
  --mphp_addons)
  mphp_addons_flag=y; shift 1

diff --git a/versions.txt b/versions.txt
@@ -3,12 +3,12 @@
 nginx_ver=1.18.0
 tengine_ver=2.3.2
 openresty_ver=1.17.8.2
-openssl11_ver=1.1.1g
+openssl11_ver=1.1.1h
 openssl_ver=1.0.2u
 
-tomcat9_ver=9.0.38
-tomcat8_ver=8.5.58
-tomcat7_ver=7.0.105
+tomcat9_ver=9.0.39
+tomcat8_ver=8.5.59
+tomcat7_ver=7.0.106
 tomcat6_ver=6.0.53
 
 apache24_ver=2.4.46
@@ -24,19 +24,19 @@ mysql57_ver=5.7.31
 mysql56_ver=5.6.49
 mysql55_ver=5.5.62
 
-mariadb105_ver=10.5.5
-mariadb104_ver=10.4.14
-mariadb103_ver=10.3.24
+mariadb105_ver=10.5.6
+mariadb104_ver=10.4.15
+mariadb103_ver=10.3.25
 mariadb55_ver=5.5.68
 
-percona80_ver=8.0.20-11
+percona80_ver=8.0.21-12
 percona57_ver=5.7.31-34
 percona56_ver=5.6.49-89.0
 percona55_ver=5.5.62-38.14
 
 alisql_ver=5.6.32-9
 
-pgsql_ver=12.3
+pgsql_ver=12.4
 
 mongodb_ver=4.0.16
 
@@ -53,12 +53,12 @@ php55_ver=5.5.38
 php56_ver=5.6.40
 php70_ver=7.0.33
 php71_ver=7.1.33
-php72_ver=7.2.33
-php73_ver=7.3.22
-php74_ver=7.4.10
+php72_ver=7.2.34
+php73_ver=7.3.23
+php74_ver=7.4.11
 
 libiconv_ver=1.16
-curl_ver=7.72.0
+curl_ver=7.73.0
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
@@ -67,9 +67,9 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.0.10-30
+imagemagick_ver=7.0.10-34
 imagick_ver=3.4.4
-graphicsmagick_ver=1.3.34
+graphicsmagick_ver=1.3.35
 gmagick_ver=2.0.5RC1
 gmagick_oldver=1.1.7RC3
 zendopcache_ver=7.0.5
@@ -108,7 +108,7 @@ pecl_mongodb_ver=1.7.5
 pecl_mongo_ver=1.6.16
 
 # phpMyadmin
-phpmyadmin_ver=4.9.5
+phpmyadmin_ver=4.9.7
 phpmyadmin_oldver=4.4.15.10
 
 # jemalloc
@@ -120,6 +120,7 @@ boost_percona_ver=1.70.0
 boost_oldver=1.59.0
 
 # Others
+lua_nginx_module_ver=0.10.15
 htop_ver=2.2.0
 bison_ver=2.7.1
 python_ver=3.6.11