[feat] Update version and tomcat

README.md

@@ -9,7 +9,7 @@ Script properties:
 - Providing a plurality of database versions (MySQL-8.0, MySQL-5.7, MySQL-5.6, MySQL-5.5, MariaDB-10.5, MariaDB-10.4, MariaDB-10.3, MariaDB-5.5, Percona-8.0, Percona-5.7, Percona-5.6, Percona-5.5, PostgreSQL, MongoDB)
 - Providing multiple PHP versions (PHP-8.0, PHP-7.4, PHP-7.3, PHP-7.2, PHP-7.1, PHP-7.0, PHP-5.6, PHP-5.5, PHP-5.4, PHP-5.3)
 - Provide Nginx, Tengine, OpenResty, Apache and ngx_lua_waf
-- Providing a plurality of Tomcat version (Tomcat-9, Tomcat-8, Tomcat-7, Tomcat-6)
+- Providing a plurality of Tomcat version (Tomcat-10, Tomcat-9, Tomcat-8, Tomcat-7)
 - Providing a plurality of JDK version (JDK-11.0, JDK-1.8, JDK-1.7, JDK-1.6)
 - According to their needs to install PHP Cache Accelerator provides ZendOPcache, xcache, apcu, eAccelerator. And php extensions,include ZendGuardLoader,ionCube,SourceGuardian,imagick,gmagick,fileinfo,imap,ldap,calendar,phalcon,yaf,yar,redis,memcached,memcache,mongodb,swoole,xdebug
 - Installation Pureftpd, phpMyAdmin according to their needs

include/check_download.sh

@@ -70,24 +70,23 @@ checkDownload() {
   # tomcat
   case "${tomcat_option}" in
     1)
+      echo "Download tomcat 10..."
+      src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat10_ver}/apache-tomcat-${tomcat10_ver}.tar.gz && Download_src
+      ;;
+    2)
       echo "Download tomcat 9..."
       src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat9_ver}/apache-tomcat-${tomcat9_ver}.tar.gz && Download_src
       ;;
-    2)
+    3)
       echo "Download tomcat 8..."
       src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat8_ver}/apache-tomcat-${tomcat8_ver}.tar.gz && Download_src
       src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat8_ver}/catalina-jmx-remote.jar && Download_src
       ;;
-    3)
+    4)
       echo "Download tomcat 7..."
       src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat7_ver}/apache-tomcat-${tomcat7_ver}.tar.gz && Download_src
       src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat7_ver}/catalina-jmx-remote.jar && Download_src
       ;;
-    4)
-      echo "Download tomcat 6..."
-      src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat6_ver}/apache-tomcat-${tomcat6_ver}.tar.gz && Download_src
-      src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat6_ver}/catalina-jmx-remote.jar && Download_src
-      ;;
   esac
 
   # jdk
@@ -721,22 +720,10 @@ checkDownload() {
     fi
   fi
 
-  # others
-  if [ "${downloadDepsSrc}" == '1' ]; then
-    if [ "${PM}" == 'yum' ]; then
-      echo "Download htop for CentOS..."
-      src_url=${mirrorLink}/htop-${htop_ver}.tar.gz && Download_src
-    fi
-
-    if [ "${CentOS_ver}" == '6' ]; then
-      echo "Download autoconf rpm for CentOS6..."
-      src_url=${mirrorLink}/autoconf-2.69-12.2.noarch.rpm && Download_src
-    fi
-
-    if [[ "${Ubuntu_ver}" =~ ^14$|^15$ ]]; then
-      echo "Download bison for Ubuntu..."
-      src_url=http://ftp.gnu.org/gnu/bison/bison-${bison_ver}.tar.gz && Download_src
-    fi
+  # autoconf for CentOS6
+  if [ "${downloadDepsSrc}" == '1' ] && [ "${CentOS_ver}" == '6' ]; then
+    echo "Download autoconf rpm for CentOS6..."
+    src_url=${mirrorLink}/autoconf-2.69-12.2.noarch.rpm && Download_src
   fi
 
   popd > /dev/null

include/check_os.sh

@@ -37,9 +37,9 @@ elif [ -n "$(grep 'Amazon Linux' /etc/issue)" -o -n "$(grep 'Amazon Linux' /etc/
 elif [ -n "$(grep 'bian' /etc/issue)" -o "$(lsb_release -is 2>/dev/null)" == "Debian" ]; then
   OS=Debian
   Debian_ver=$(lsb_release -sr | awk -F. '{print $1}')
-elif [ -n "$(grep 'Deepin' /etc/issue)" -o "$(lsb_release -is 2>/dev/null)" == "Deepin" ]; then
+elif [ -n "$(grep 'Deepin 20' /etc/issue)" -o "$(lsb_release -is 2>/dev/null)" == "Deepin" ]; then
   OS=Debian
-  Debian_ver=8
+  Debian_ver=10
 elif [ -n "$(grep -w 'Kali' /etc/issue)" -o "$(lsb_release -is 2>/dev/null)" == "Kali" ]; then
   OS=Debian
   if [ -n "$(grep 'VERSION="2016.*"' /etc/os-release)" ]; then
@@ -59,8 +59,8 @@ elif [ -n "$(grep 'elementary' /etc/issue)" -o "$(lsb_release -is 2>/dev/null)"
 fi
 
 # Check OS Version
-if [ ${CentOS_ver} -lt 6 >/dev/null 2>&1 ] || [ ${Debian_ver} -lt 8 >/dev/null 2>&1 ] || [ ${Ubuntu_ver} -lt 14 >/dev/null 2>&1 ]; then
-  echo "${CFAILURE}Does not support this OS, Please install CentOS 6+,Debian 8+,Ubuntu 14+ ${CEND}"
+if [ ${CentOS_ver} -lt 6 >/dev/null 2>&1 ] || [ ${Debian_ver} -lt 8 >/dev/null 2>&1 ] || [ ${Ubuntu_ver} -lt 16 >/dev/null 2>&1 ]; then
+  echo "${CFAILURE}Does not support this OS, Please install CentOS 6+,Debian 8+,Ubuntu 16+ ${CEND}"
   kill -9 $$
 fi
 
@@ -107,15 +107,15 @@ fi
 THREAD=$(grep 'processor' /proc/cpuinfo | sort -u | wc -l)
 
 # Percona binary: https://www.percona.com/doc/percona-server/5.7/installation.html#installing-percona-server-from-a-binary-tarball
-if [ ${Debian_ver} -lt 9 >/dev/null 2>&1 ] || [ ${Ubuntu_ver} -lt 14 >/dev/null 2>&1 ]; then
+if [ ${Debian_ver} -lt 9 >/dev/null 2>&1 ]; then
   sslLibVer=ssl100
 elif [[ "${CentOS_ver}" =~ ^[6-7]$ ]] && [ "$(lsb_release -is)" != 'Fedora' ]; then
   sslLibVer=ssl101
-elif [ ${Debian_ver} -ge 9 >/dev/null 2>&1 ] || [ ${Ubuntu_ver} -ge 14 >/dev/null 2>&1 ]; then
+elif [ ${Debian_ver} -ge 9 >/dev/null 2>&1 ] || [ ${Ubuntu_ver} -ge 16 >/dev/null 2>&1 ]; then
   sslLibVer=ssl102
 elif [ ${Fedora_ver} -ge 27 >/dev/null 2>&1 ]; then
   sslLibVer=ssl102
-elif [ "${CentOS_ver}" == '8' ]; then 
+elif [ "${CentOS_ver}" == '8' ]; then
   sslLibVer=ssl1:111
 else
   sslLibVer=unknown

include/check_sw.sh

@@ -127,39 +127,13 @@ installDepsUbuntu() {
   for Package in ${pkgList}; do
     apt-get --no-install-recommends -y install ${Package}
   done
-
-  if [[ "${Ubuntu_ver}" =~ ^14$|^15$ ]]; then
-    apt-get -y remove bison
-  fi
 }
 
 installDepsBySrc() {
   pushd ${oneinstack_dir}/src > /dev/null
-  if [ "${OS}" == 'Ubuntu' ]; then
-    if [[ "${Ubuntu_ver}" =~ ^14$|^15$ ]]; then
-      # Install bison on ubt 14.x 15.x
-      tar xzf bison-${bison_ver}.tar.gz
-      pushd bison-${bison_ver} > /dev/null
-      ./configure
-      make -j ${THREAD} && make install
-      popd > /dev/null
-      rm -rf bison-${bison_ver}
-    fi
-  elif [ "${OS}" == 'CentOS' ]; then
-    # install htop
-    if ! command -v htop >/dev/null 2>&1; then
-      tar xzf htop-${htop_ver}.tar.gz
-      pushd htop-${htop_ver} > /dev/null
-      ./configure
-      make -j ${THREAD} && make install
-      popd > /dev/null
-      rm -rf htop-${htop_ver}
-    fi
-
+  if [ "${OS}" == 'CentOS' ] && [ "${CentOS_ver}" == '6' ]; then
     # upgrade autoconf for CentOS6
-    [ "${CentOS_ver}" == '6' ] && rpm -Uvh autoconf-2.69-12.2.noarch.rpm
-  else
-    echo "No need to install software from source packages."
+    rpm -Uvh autoconf-2.69-12.2.noarch.rpm
   fi
 
   if ! command -v icu-config > /dev/null 2>&1 || icu-config --version | grep '^3.' || [ "${Ubuntu_ver}" == "20" ]; then

include/pecl_phalcon.sh

@@ -14,7 +14,7 @@ Install_pecl_phalcon() {
     PHP_detail_ver=$(${php_install_dir}/bin/php-config --version)
     PHP_main_ver=${PHP_detail_ver%.*}
     phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
-    if [[ "${PHP_main_ver}" =~ ^7.[2-4]$ ]]; then
+    if [[ "${PHP_main_ver}" =~ ^7.[2-4]$|^8.0$ ]]; then
       src_url=https://pecl.php.net/get/phalcon-${phalcon_ver}.tgz && Download_src
       tar xzf phalcon-${phalcon_ver}.tgz
       pushd phalcon-${phalcon_ver} > /dev/null

include/pecl_yaf.sh

@@ -13,7 +13,7 @@ Install_pecl_yaf() {
     pushd ${oneinstack_dir}/src > /dev/null
     PHP_detail_ver=$(${php_install_dir}/bin/php-config --version)
     PHP_main_ver=${PHP_detail_ver%.*}
-    if [[ "${PHP_main_ver}" =~ ^7.[0-3]$ ]]; then
+    if [[ "${PHP_main_ver}" =~ ^7.[0-4]$|^8.0$ ]]; then
       phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
       src_url=https://pecl.php.net/get/yaf-${yaf_ver}.tgz && Download_src
       tar xzf yaf-${yaf_ver}.tgz

include/pecl_yar.sh

@@ -13,7 +13,7 @@ Install_pecl_yar() {
     pushd ${oneinstack_dir}/src > /dev/null
     PHP_detail_ver=$(${php_install_dir}/bin/php-config --version)
     PHP_main_ver=${PHP_detail_ver%.*}
-    if [[ "${PHP_main_ver}" =~ ^7.[0-3]$ ]]; then
+    if [[ "${PHP_main_ver}" =~ ^7.[0-4]$|^8.0$ ]]; then
       phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
       src_url=https://pecl.php.net/get/yar-${yar_ver}.tgz && Download_src
       tar xzf yar-${yar_ver}.tgz

include/tomcat-6.sh → include/tomcat-10.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/oneinstack/oneinstack
 
-Install_Tomcat6() {
+Install_Tomcat10() {
   pushd ${oneinstack_dir}/src > /dev/null
   . /etc/profile
   id -g ${run_group} >/dev/null 2>&1
@@ -26,9 +26,9 @@ Install_Tomcat6() {
     rm -rf apr-${apr_ver}
   fi
 
-  tar xzf apache-tomcat-${tomcat6_ver}.tar.gz
+  tar xzf apache-tomcat-${tomcat10_ver}.tar.gz
   [ ! -d "${tomcat_install_dir}" ] && mkdir -p ${tomcat_install_dir}
-  /bin/cp -R apache-tomcat-${tomcat6_ver}/* ${tomcat_install_dir}
+  /bin/cp -R apache-tomcat-${tomcat10_ver}/* ${tomcat_install_dir}
   rm -rf ${tomcat_install_dir}/webapps/{docs,examples,host-manager,manager,ROOT/*}
 
   if [ ! -e "${tomcat_install_dir}/conf/server.xml" ]; then
@@ -37,12 +37,11 @@ Install_Tomcat6() {
     kill -9 $$
   fi
 
-  /bin/cp catalina-jmx-remote.jar ${tomcat_install_dir}/lib
   #[ ! -d "${tomcat_install_dir}/lib/catalina" ] && mkdir ${tomcat_install_dir}/lib/catalina
   #pushd ${tomcat_install_dir}/lib/catalina
   #jar xf ../catalina.jar
   #sed -i 's@^server.info=.*@server.info=Tomcat@' org/apache/catalina/util/ServerInfo.properties
-  #sed -i 's@^server.number=.*@server.number=6@' org/apache/catalina/util/ServerInfo.properties
+  #sed -i 's@^server.number=.*@server.number=10@' org/apache/catalina/util/ServerInfo.properties
   #sed -i "s@^server.built=.*@server.built=$(date)@" org/apache/catalina/util/ServerInfo.properties
   #jar cf ../catalina.jar ./*
   #popd
@@ -71,7 +70,7 @@ EOF
     popd # goto ${oneinstack_dir}/src
     /bin/cp ${oneinstack_dir}/config/server.xml ${tomcat_install_dir}/conf
     sed -i "s@/usr/local/tomcat@${tomcat_install_dir}@g" ${tomcat_install_dir}/conf/server.xml
-    sed -i /ThreadLocalLeakPreventionListener/d ${tomcat_install_dir}/conf/server.xml
+
     if [ ! -e "${nginx_install_dir}/sbin/nginx" -a ! -e "${tengine_install_dir}/sbin/nginx" -a ! -e "${openresty_install_dir}/nginx/sbin/nginx" -a ! -e "${apache_install_dir}/bin/httpd" ]; then
       if [ "${PM}" == 'yum' ]; then
         if [ -n "`grep 'dport 80 ' /etc/sysconfig/iptables`" ] && [ -z "$(grep -w '8080' /etc/sysconfig/iptables)" ]; then
@@ -138,7 +137,7 @@ EOF
     [ "${PM}" == 'yum' ] && { chkconfig --add tomcat; chkconfig tomcat on; }
     [ "${PM}" == 'apt-get' ] && update-rc.d tomcat defaults
     echo "${CSUCCESS}Tomcat installed successfully! ${CEND}"
-    rm -rf apache-tomcat-${tomcat6_ver}
+    rm -rf apache-tomcat-${tomcat10_ver}
   else
     popd > /dev/null
     echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}" && lsb_release -a

include/upgrade_web.sh

@@ -287,7 +287,7 @@ Upgrade_Tomcat() {
   OLD_tomcat_ver="`${tomcat_install_dir}/bin/version.sh | awk '/Server number/{print $3}' | awk -F. '{print $1"."$2"."$3}'`"
   Tomcat_flag="`echo ${OLD_tomcat_ver} | awk -F. '{print $1}'`"
   Latest_tomcat_ver=`curl --connect-timeout 2 -m 3 -s https://tomcat.apache.org/download-${Tomcat_flag}0.cgi | grep "README" | head -1 | grep -oE "[6-9]\.[0-9]\.[0-9]+"`
-  Latest_tomcat_ver=${Latest_tomcat_ver:-${tomcat9_ver}}
+  Latest_tomcat_ver=${Latest_tomcat_ver:-${tomcat10_ver}}
   echo
   echo "Current Tomcat Version: ${CMSG}${OLD_tomcat_ver}${CEND}"
   while :; do echo
@@ -297,9 +297,11 @@ Upgrade_Tomcat() {
       rm -f catalina-jmx-remote.jar
       echo "Download tomcat-${NEW_tomcat_ver}..."
       src_url=http://mirrors.linuxeye.com/apache/tomcat/v${NEW_tomcat_ver}/apache-tomcat-${NEW_tomcat_ver}.tar.gz && Download_src
-      src_url=http://mirrors.linuxeye.com/apache/tomcat/v${NEW_tomcat_ver}/catalina-jmx-remote.jar && Download_src
       [ ! -e "apache-tomcat-${NEW_tomcat_ver}.tar.gz" ] && wget --no-check-certificate -c https://archive.apache.org/dist/tomcat-${OLD_tomcat_ver}/v${NEW_tomcat_ver}/bin/apache-tomcat-${NEW_tomcat_ver}.tar.gz > /dev/null 2>&1
-      [ ! -e "catalina-jmx-remote.jar" ] && wget --no-check-certificate -c https://archive.apache.org/dist/tomcat-${OLD_tomcat_ver}/v${NEW_tomcat_ver}/bin/extras/catalina-jmx-remote.jar > /dev/null 2>&1
+      if [ -e "${tomcat_install_dir}/lib/catalina-jmx-remote.jar" ]; then
+        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${NEW_tomcat_ver}/catalina-jmx-remote.jar && Download_src
+        [ ! -e "catalina-jmx-remote.jar" ] && wget --no-check-certificate -c https://archive.apache.org/dist/tomcat-${OLD_tomcat_ver}/v${NEW_tomcat_ver}/bin/extras/catalina-jmx-remote.jar > /dev/null 2>&1
+      fi
       if [ -e "apache-tomcat-${NEW_tomcat_ver}.tar.gz" ]; then
         echo "Download [${CMSG}apache-tomcat-${NEW_tomcat_ver}.tar.gz${CEND}] successfully! "
         break
@@ -320,6 +322,7 @@ Upgrade_Tomcat() {
     tar xzf apache-tomcat-${NEW_tomcat_ver}.tar.gz
     /bin/mv apache-tomcat-${NEW_tomcat_ver}/conf/server.xml{,_bk}
     /bin/cp ${tomcat_install_dir}/conf/{server.xml,jmxremote.access,jmxremote.password,tomcat-users.xml} apache-tomcat-${NEW_tomcat_ver}/conf/
+    [ -e "${tomcat_install_dir}/lib/catalina-jmx-remote.jar" ] && /bin/cp catalina-jmx-remote.jar apache-tomcat-${NEW_tomcat_ver}/lib
     /bin/cp ${tomcat_install_dir}/bin/setenv.sh apache-tomcat-${NEW_tomcat_ver}/bin/
     /bin/cp -R ${tomcat_install_dir}/conf/vhost apache-tomcat-${NEW_tomcat_ver}/conf/
     chmod +x apache-tomcat-${NEW_tomcat_ver}/bin/*.sh

install.sh

@@ -308,10 +308,10 @@ if [ ${ARG_NUM} == 0 ]; then
         # Tomcat
         while :; do echo
           echo 'Please select tomcat server:'
-          echo -e "\t${CMSG}1${CEND}. Install Tomcat-9"
-          echo -e "\t${CMSG}2${CEND}. Install Tomcat-8"
-          echo -e "\t${CMSG}3${CEND}. Install Tomcat-7"
-          echo -e "\t${CMSG}4${CEND}. Install Tomcat-6"
+          echo -e "\t${CMSG}1${CEND}. Install Tomcat-10"
+          echo -e "\t${CMSG}2${CEND}. Install Tomcat-9"
+          echo -e "\t${CMSG}3${CEND}. Install Tomcat-8"
+          echo -e "\t${CMSG}4${CEND}. Install Tomcat-7"
           echo -e "\t${CMSG}5${CEND}. Do not install"
           read -e -p "Please input a number:(Default 5 press Enter) " tomcat_option
           tomcat_option=${tomcat_option:-5}
@@ -319,7 +319,7 @@ if [ ${ARG_NUM} == 0 ]; then
             echo "${CWARNING}input error! Please only input number 1~5${CEND}"
           else
             [ "${tomcat_option}" != '5' -a -e "$tomcat_install_dir/conf/server.xml" ] && { echo "${CWARNING}Tomcat already installed! ${CEND}" ; unset tomcat_option; }
-            if [ "${tomcat_option}" == '1' ]; then
+            if [[ "${tomcat_option}" =~ ^[1-2]$ ]]; then
               while :; do echo
                 echo 'Please select JDK version:'
                 echo -e "\t${CMSG}1${CEND}. Install JDK-11.0"
@@ -332,7 +332,7 @@ if [ ${ARG_NUM} == 0 ]; then
                   break
                 fi
               done
-            elif [ "${tomcat_option}" == '2' ]; then
+            elif [ "${tomcat_option}" == '3' ]; then
               while :; do echo
                 echo 'Please select JDK version:'
                 echo -e "\t${CMSG}1${CEND}. Install JDK-11.0"
@@ -346,7 +346,7 @@ if [ ${ARG_NUM} == 0 ]; then
                   break
                 fi
               done
-            elif [ "${tomcat_option}" == '3' ]; then
+            elif [ "${tomcat_option}" == '4' ]; then
               while :; do echo
                 echo 'Please select JDK version:'
                 echo -e "\t${CMSG}2${CEND}. Install JDK-1.8"
@@ -360,19 +360,6 @@ if [ ${ARG_NUM} == 0 ]; then
                   break
                 fi
               done
-            elif [ "${tomcat_option}" == '4' ]; then
-              while :; do echo
-                echo 'Please select JDK version:'
-                echo -e "\t${CMSG}3${CEND}. Install JDK-1.7"
-                echo -e "\t${CMSG}4${CEND}. Install JDK-1.6"
-                read -e -p "Please input a number:(Default 4 press Enter) " jdk_option
-                jdk_option=${jdk_option:-4}
-                if [[ ! ${jdk_option} =~ ^[3-4]$ ]]; then
-                  echo "${CWARNING}input error! Please only input number 3~4${CEND}"
-                else
-                  break
-                fi
-              done
             fi
             break
           fi
@@ -1070,21 +1057,21 @@ esac
 
 case "${tomcat_option}" in
   1)
+    . include/tomcat-10.sh
+    Install_Tomcat10 2>&1 | tee -a ${oneinstack_dir}/install.log
+    ;;
+  2)
     . include/tomcat-9.sh
     Install_Tomcat9 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
-  2)
+  3)
     . include/tomcat-8.sh
     Install_Tomcat8 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
-  3)
+  4)
     . include/tomcat-7.sh
     Install_Tomcat7 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
-  4)
-    . include/tomcat-6.sh
-    Install_Tomcat6 2>&1 | tee -a ${oneinstack_dir}/install.log
-    ;;
 esac
 
 # Pure-FTPd

versions.txt

@@ -6,10 +6,10 @@ openresty_ver=1.19.3.1
 openssl11_ver=1.1.1k
 openssl_ver=1.0.2u
 
-tomcat9_ver=9.0.44
-tomcat8_ver=8.5.64
-tomcat7_ver=7.0.108
-tomcat6_ver=6.0.53
+tomcat10_ver=10.0.6
+tomcat9_ver=9.0.46
+tomcat8_ver=8.5.66
+tomcat7_ver=7.0.109
 
 apache_ver=2.4.46
 pcre_ver=8.44
@@ -28,18 +28,18 @@ mariadb104_ver=10.4.18
 mariadb103_ver=10.3.28
 mariadb55_ver=5.5.68
 
-percona80_ver=8.0.22-13
+percona80_ver=8.0.23-14
 percona57_ver=5.7.33-36
 percona56_ver=5.6.51-91.0
 percona55_ver=5.5.62-38.14
 
-pgsql_ver=12.6
+pgsql_ver=12.7
 
 mongodb_ver=4.0.16
 
 # JDK
 jdk110_ver=11.0.10
-jdk18_ver=1.8.0_281
+jdk18_ver=1.8.0_291
 jdk17_ver=1.7.0_80
 jdk16_ver=1.6.0_45
 
@@ -56,7 +56,7 @@ php74_ver=7.4.19
 php80_ver=8.0.6
 
 libiconv_ver=1.16
-curl_ver=7.75.0
+curl_ver=7.76.1
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
@@ -65,7 +65,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.0.11-11
+imagemagick_ver=7.0.11-12
 imagick_ver=3.4.4
 graphicsmagick_ver=1.3.36
 gmagick_ver=2.0.5RC1
@@ -75,11 +75,11 @@ xcache_ver=3.2.0
 apcu_ver=5.1.20
 apcu_oldver=4.0.11
 eaccelerator_ver=0.9.6.1
-phalcon_ver=4.0.4
+phalcon_ver=4.1.2
 phalcon_oldver=3.4.5
-yaf_ver=3.0.9
-yar_ver=2.0.7
-swoole_ver=4.6.4
+yaf_ver=3.3.2
+yar_ver=2.2.0
+swoole_ver=4.6.7
 swoole_oldver=4.5.2
 xdebug_ver=2.9.5
 xdebug_oldver=2.5.5
@@ -102,7 +102,7 @@ pecl_memcache_ver=4.0.5.2
 pecl_memcache_oldver=3.0.8
 
 # MongoDB
-pecl_mongodb_ver=1.9.0
+pecl_mongodb_ver=1.9.1
 pecl_mongo_ver=1.6.16
 
 # phpMyadmin
@@ -114,16 +114,14 @@ jemalloc_ver=5.2.1
 
 # boost
 boost_ver=1.73.0
-boost_percona_ver=1.72.0
+boost_percona_ver=1.73.0
 boost_oldver=1.59.0
 
 # Others
 lua_nginx_module_ver=0.10.19
-luajit2_ver=2.1-20201229
+luajit2_ver=2.1-20210510
 lua_resty_core_ver=0.1.21
 lua_resty_lrucache_ver=0.10
-htop_ver=3.0.2
-bison_ver=2.7.1
 python_ver=3.6.13
 setuptools_ver=54.2.0
 pip_ver=21.0.1

vhost.sh

@@ -136,6 +136,9 @@ Choose_ENV() {
   elif [ -e "${php_install_dir}/bin/phpize" -a ! -e "${tomcat_install_dir}/conf/server.xml" ]; then
     Number=10
     NGX_FLAG=php
+  elif [ ! -e "${php_install_dir}/bin/phpize" -a -e "${tomcat_install_dir}/conf/server.xml" ]; then
+    Number=01
+    NGX_FLAG=java
   else
     Number=00
     NGX_FLAG=php