[fix] Update

include/check_download.sh

@@ -132,8 +132,8 @@ checkDownload() {
           DOWN_ADDR_MYSQL_BK=http://mirrors.tuna.tsinghua.edu.cn/mysql/Downloads/MySQL-8.0
           DOWN_ADDR_MYSQL_BK2=http://mirrors.huaweicloud.com/repository/toolkit/mysql/Downloads/MySQL-8.0
         else
-          DOWN_ADDR_MYSQL=http://cdn.mysql.com/Downloads/MySQL-8.0
-          DOWN_ADDR_MYSQL_BK=http://mysql.he.net/Downloads/MySQL-8.0
+          DOWN_ADDR_MYSQL=https://cdn.mysql.com/Downloads/MySQL-8.0
+          DOWN_ADDR_MYSQL_BK=https://mirrors.dotsrc.org/mysql/Downloads/MySQL-8.0
         fi
 
         if [ "${dbinstallmethod}" == '1' ]; then
@@ -167,8 +167,8 @@ checkDownload() {
           DOWN_ADDR_MYSQL_BK=http://mirrors.tuna.tsinghua.edu.cn/mysql/Downloads/MySQL-5.7
           DOWN_ADDR_MYSQL_BK2=http://mirrors.huaweicloud.com/repository/toolkit/mysql/Downloads/MySQL-5.7
         else
-          DOWN_ADDR_MYSQL=http://cdn.mysql.com/Downloads/MySQL-5.7
-          DOWN_ADDR_MYSQL_BK=http://mysql.he.net/Downloads/MySQL-5.7
+          DOWN_ADDR_MYSQL=https://cdn.mysql.com/Downloads/MySQL-5.7
+          DOWN_ADDR_MYSQL_BK=https://mirrors.dotsrc.org/mysql/Downloads/MySQL-5.7
         fi
 
         if [ "${dbinstallmethod}" == '1' ]; then
@@ -202,8 +202,8 @@ checkDownload() {
           DOWN_ADDR_MYSQL_BK=http://mirrors.tuna.tsinghua.edu.cn/mysql/Downloads/MySQL-5.6
           DOWN_ADDR_MYSQL_BK2=http://mirrors.huaweicloud.com/repository/toolkit/mysql/Downloads/MySQL-5.6
         else
-          DOWN_ADDR_MYSQL=http://cdn.mysql.com/Downloads/MySQL-5.6
-          DOWN_ADDR_MYSQL_BK=http://mysql.he.net/Downloads/MySQL-5.6
+          DOWN_ADDR_MYSQL=https://cdn.mysql.com/Downloads/MySQL-5.6
+          DOWN_ADDR_MYSQL_BK=https://mirrors.dotsrc.org/mysql/Downloads/MySQL-5.6
         fi
 
         if [ "${dbinstallmethod}" == '1' ]; then
@@ -237,8 +237,8 @@ checkDownload() {
           DOWN_ADDR_MYSQL_BK=http://mirrors.tuna.tsinghua.edu.cn/mysql/Downloads/MySQL-5.5
           DOWN_ADDR_MYSQL_BK2=http://mirrors.huaweicloud.com/repository/toolkit/mysql/Downloads/MySQL-5.5
         else
-          DOWN_ADDR_MYSQL=http://cdn.mysql.com/Downloads/MySQL-5.5
-          DOWN_ADDR_MYSQL_BK=http://mysql.he.net/Downloads/MySQL-5.5
+          DOWN_ADDR_MYSQL=https://cdn.mysql.com/Downloads/MySQL-5.5
+          DOWN_ADDR_MYSQL_BK=https://mirrors.dotsrc.org/mysql/Downloads/MySQL-5.5
         fi
 
         if [ "${dbinstallmethod}" == '1' ]; then

include/check_os.sh

@@ -40,11 +40,13 @@ command -v lsb_release >/dev/null 2>&1 || { echo "${CFAILURE}${PM} source failed
 
 # Get OS Version
 OS=$(lsb_release -is)
-if [[ "${OS}" =~ ^CentOS$|^CentOSStream$|^RedHat$|^Rocky$|^Fedora$|^Amazon$|^Alibaba$|^Aliyun$|^EulerOS$|^openEuler$ ]]; then
+if [[ "${OS}" =~ ^CentOS$|^CentOSStream$|^RedHat$|^Rocky$|^Fedora$|^Amazon$|^AlibabaCloud\(AliyunLinux\)$|^EulerOS$|^openEuler$ ]]; then
   LikeOS=CentOS
   CentOS_ver=$(lsb_release -rs | awk -F. '{print $1}' | awk '{print $1}')
   [[ "${OS}" =~ ^Fedora$ ]] && [ ${CentOS_ver} -ge 19 >/dev/null 2>&1 ] && { CentOS_ver=7; Fedora_ver=$(lsb_release -rs); }
-  [[ "${OS}" =~ ^Amazon$|^Alibaba$|^Aliyun$|^EulerOS$|^openEuler$ ]] && CentOS_ver=7
+  [[ "${OS}" =~ ^Amazon$|^EulerOS$|^openEuler$ ]] && CentOS_ver=7
+  [[ "${OS}" =~ ^AlibabaCloud\(AliyunLinux\)$ ]] && [[ "${CentOS_ver}" =~ ^2$ ]] && CentOS_ver=7
+  [[ "${OS}" =~ ^AlibabaCloud\(AliyunLinux\)$ ]] && [[ "${CentOS_ver}" =~ ^3$ ]] && CentOS_ver=8
 elif [[ "${OS}" =~ ^Debian$|^Deepin$|^Uos$|^Kali$ ]]; then
   LikeOS=Debian
   Debian_ver=$(lsb_release -rs | awk -F. '{print $1}' | awk '{print $1}')

include/mariadb-10.5.sh

@@ -139,12 +139,10 @@ innodb_open_files = 500
 innodb_buffer_pool_size = 64M
 innodb_write_io_threads = 4
 innodb_read_io_threads = 4
-innodb_thread_concurrency = 0
 innodb_purge_threads = 1
 innodb_flush_log_at_trx_commit = 2
 innodb_log_buffer_size = 2M
 innodb_log_file_size = 32M
-innodb_log_files_in_group = 3
 innodb_max_dirty_pages_pct = 90
 innodb_lock_wait_timeout = 120
 

include/mariadb-10.6.sh

@@ -139,12 +139,10 @@ innodb_open_files = 500
 innodb_buffer_pool_size = 64M
 innodb_write_io_threads = 4
 innodb_read_io_threads = 4
-innodb_thread_concurrency = 0
 innodb_purge_threads = 1
 innodb_flush_log_at_trx_commit = 2
 innodb_log_buffer_size = 2M
 innodb_log_file_size = 32M
-innodb_log_files_in_group = 3
 innodb_max_dirty_pages_pct = 90
 innodb_lock_wait_timeout = 120
 

include/pecl_fileinfo.sh

@@ -18,6 +18,7 @@ Install_pecl_fileinfo() {
     pushd php-${PHP_detail_ver}/ext/fileinfo > /dev/null
     ${php_install_dir}/bin/phpize
     ./configure --with-php-config=${php_install_dir}/bin/php-config
+    [ "${php_option}" == '10' ] && sed -i 's@^CFLAGS = -g -O2@CFLAGS = -std=c99 -g -O2@' Makefile
     make -j ${THREAD} && make install
     popd > /dev/null
     if [ -f "${phpExtensionDir}/fileinfo.so" ]; then

include/upgrade_db.sh

@@ -58,8 +58,8 @@ Upgrade_DB() {
     [ "${db_flag}" != 'y' ] && read -e -p "Please input upgrade ${DB} Version(example: ${OLD_db_ver}): " NEW_db_ver
     if [ `echo ${NEW_db_ver} | awk -F. '{print $1"."$2}'` == `echo ${OLD_db_ver} | awk -F. '{print $1"."$2}'` ]; then
       if [ "${DB}" == 'MariaDB' ]; then
-        DB_filename=mariadb-${NEW_db_ver}-linux-${SYS_BIT_b}
-        DB_URL=${DOWN_ADDR}/mariadb-${NEW_db_ver}/bintar-linux-${SYS_BIT_a}/${DB_filename}.tar.gz
+        DB_filename=mariadb-${NEW_db_ver}-linux-systemd-${SYS_BIT_b}
+        DB_URL=${DOWN_ADDR}/mariadb-${NEW_db_ver}/bintar-linux-systemd-${SYS_BIT_a}/${DB_filename}.tar.gz
       elif [ "${DB}" == 'Percona' ]; then
         if [[ "`echo ${NEW_db_ver} | awk -F. '{print $1"."$2}'`" =~ ^5.[5-6]$ ]]; then
           perconaVerStr1=$(echo ${NEW_db_ver} | sed "s@-@-rel@")

versions.txt

@@ -2,12 +2,12 @@
 # Web
 nginx_ver=1.20.1
 tengine_ver=2.3.3
-openresty_ver=1.19.3.2
+openresty_ver=1.19.9.1
 openssl11_ver=1.1.1k
 openssl_ver=1.0.2u
 
-tomcat10_ver=10.0.8
-tomcat9_ver=9.0.50
+tomcat10_ver=10.0.10
+tomcat9_ver=9.0.52
 tomcat8_ver=8.5.69
 tomcat7_ver=7.0.109
 
@@ -18,14 +18,14 @@ apr_util_ver=1.6.1
 nghttp2_ver=1.42.0
 
 # DB
-mysql80_ver=8.0.25
-mysql57_ver=5.7.34
+mysql80_ver=8.0.26
+mysql57_ver=5.7.35
 mysql56_ver=5.6.50
 mysql55_ver=5.5.62
 
-mariadb106_ver=10.6.3
-mariadb105_ver=10.5.11
-mariadb104_ver=10.4.20
+mariadb106_ver=10.6.4
+mariadb105_ver=10.5.12
+mariadb104_ver=10.4.21
 mariadb55_ver=5.5.68
 
 percona80_ver=8.0.25-15
@@ -35,11 +35,11 @@ percona55_ver=5.5.62-38.14
 
 pgsql_ver=12.7
 
-mongodb_ver=4.0.16
+mongodb_ver=4.0.26
 
 # JDK
-jdk110_ver=11.0.10
-jdk18_ver=1.8.0_291
+jdk110_ver=11.0.12
+jdk18_ver=1.8.0_301
 jdk17_ver=1.7.0_80
 jdk16_ver=1.6.0_45
 
@@ -52,8 +52,8 @@ php70_ver=7.0.33
 php71_ver=7.1.33
 php72_ver=7.2.34
 php73_ver=7.3.29
-php74_ver=7.4.21
-php80_ver=8.0.8
+php74_ver=7.4.22
+php80_ver=8.0.9
 
 # Nodejs
 node_ver=14.17.1
@@ -68,7 +68,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.1.0-2
+imagemagick_ver=7.1.0-4
 imagick_ver=3.5.0
 imagick_oldver=3.4.4
 graphicsmagick_ver=1.3.36
@@ -92,13 +92,13 @@ xdebug_oldver=2.9.8
 pureftpd_ver=1.0.49
 
 # Redis
-redis_ver=6.2.4
+redis_ver=6.2.5
 redis_oldver=5.0.9
 pecl_redis_ver=5.3.4
 pecl_redis_oldver=4.3.0
 
 # Memcached
-memcached_ver=1.6.9
+memcached_ver=1.6.10
 libmemcached_ver=1.0.18
 pecl_memcached_ver=3.1.5
 pecl_memcached_oldver=2.2.0
@@ -130,5 +130,5 @@ lua_resty_lrucache_ver=0.11
 lua_cjson_ver=2.1.0.8
 python_ver=3.6.13
 setuptools_ver=57.0.0
-pip_ver=21.1.2
+pip_ver=21.2.3
 fail2ban_ver=0.11.2