[feat] Add MariaDB-10.6 and del MariaDB-10.3

include/ImageMagick.sh

@@ -38,9 +38,16 @@ Uninstall_ImageMagick() {
 Install_pecl_imagick() {
   if [ -e "${php_install_dir}/bin/phpize" ]; then
     pushd ${oneinstack_dir}/src > /dev/null
+    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`
-    tar xzf imagick-${imagick_ver}.tgz
-    pushd imagick-${imagick_ver} > /dev/null
+    if [[ "${PHP_main_ver}" =~ ^5.3$ ]]; then
+      tar xzf imagick-${imagick_oldver}.tgz
+      pushd imagick-${imagick_oldver} > /dev/null
+    else
+      tar xzf imagick-${imagick_ver}.tgz
+      pushd imagick-${imagick_ver} > /dev/null
+    fi
     export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
     ${php_install_dir}/bin/phpize
     ./configure --with-php-config=${php_install_dir}/bin/php-config --with-imagick=${imagick_install_dir}
@@ -49,7 +56,7 @@ Install_pecl_imagick() {
     if [ -f "${phpExtensionDir}/imagick.so" ]; then
       echo 'extension=imagick.so' > ${php_install_dir}/etc/php.d/03-imagick.ini
       echo "${CSUCCESS}PHP imagick module installed successfully! ${CEND}"
-      rm -rf imagick-${imagick_ver}
+      rm -rf imagick-${imagick_ver} imagick-${imagick_oldver}
     else
       echo "${CFAILURE}PHP imagick module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi

include/check_download.sh

@@ -269,13 +269,13 @@ checkDownload() {
       [5-8])
 	case "${db_option}" in
           5)
-            mariadb_ver=${mariadb105_ver}
+            mariadb_ver=${mariadb106_ver}
 	    ;;
           6)
-            mariadb_ver=${mariadb104_ver}
+            mariadb_ver=${mariadb105_ver}
 	    ;;
           7)
-            mariadb_ver=${mariadb103_ver}
+            mariadb_ver=${mariadb104_ver}
 	    ;;
           8)
             mariadb_ver=${mariadb55_ver}
@@ -284,13 +284,13 @@ checkDownload() {
 
         if [ "${dbinstallmethod}" == '1' ]; then
           echo "Download MariaDB ${mariadb_ver} binary package..."
-          FILE_NAME=mariadb-${mariadb_ver}-linux-${SYS_BIT_b}.tar.gz
+          FILE_NAME=mariadb-${mariadb_ver}-linux-systemd-${SYS_BIT_b}.tar.gz
           if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
-            DOWN_ADDR_MARIADB=http://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb_ver}/bintar-linux-${SYS_BIT_a}
-            DOWN_ADDR_MARIADB_BK=http://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb_ver}/bintar-linux-${SYS_BIT_a}
+            DOWN_ADDR_MARIADB=http://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb_ver}/bintar-linux-systemd-${SYS_BIT_a}
+            DOWN_ADDR_MARIADB_BK=http://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb_ver}/bintar-linux-systemd-${SYS_BIT_a}
           else
-            DOWN_ADDR_MARIADB=http://ftp.osuosl.org/pub/mariadb/mariadb-${mariadb_ver}/bintar-linux-${SYS_BIT_a}
-            DOWN_ADDR_MARIADB_BK=http://mirror.nodesdirect.com/mariadb/mariadb-${mariadb_ver}/bintar-linux-${SYS_BIT_a}
+            DOWN_ADDR_MARIADB=http://ftp.osuosl.org/pub/mariadb/mariadb-${mariadb_ver}/bintar-linux-systemd-${SYS_BIT_a}
+            DOWN_ADDR_MARIADB_BK=http://mirror.nodesdirect.com/mariadb/mariadb-${mariadb_ver}/bintar-linux-systemd-${SYS_BIT_a}
           fi
         elif [ "${dbinstallmethod}" == '2' ]; then
           echo "Download MariaDB ${mariadb_ver} source package..."
@@ -627,7 +627,11 @@ checkDownload() {
     echo "Download ImageMagick..."
     src_url=${mirrorLink}/ImageMagick-${imagemagick_ver}.tar.gz && Download_src
     echo "Download imagick..."
-    src_url=https://pecl.php.net/get/imagick-${imagick_ver}.tgz && Download_src
+    if [[ "${php_option}" =~ ^1$ ]]; then
+      src_url=https://pecl.php.net/get/imagick-${imagick_oldver}.tgz && Download_src
+    else
+      src_url=https://pecl.php.net/get/imagick-${imagick_ver}.tgz && Download_src
+    fi
   fi
 
   # graphicsmagick

include/mariadb-10.4.sh

@@ -17,8 +17,8 @@ Install_MariaDB104() {
   mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar zxf mariadb-${mariadb104_ver}-linux-${SYS_BIT_b}.tar.gz
-    mv mariadb-${mariadb104_ver}-linux-${SYS_BIT_b}/* ${mariadb_install_dir}
+    tar zxf mariadb-${mariadb104_ver}-linux-systemd-${SYS_BIT_b}.tar.gz
+    mv mariadb-${mariadb104_ver}-linux-systemd-${SYS_BIT_b}/* ${mariadb_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
@@ -52,7 +52,7 @@ Install_MariaDB104() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mariadb-${mariadb104_ver}-linux-${SYS_BIT_b}
+      rm -rf mariadb-${mariadb104_ver}-linux-systemd-${SYS_BIT_b}
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf mariadb-${mariadb104_ver} boost_${boostVersion2}
     fi
@@ -206,7 +206,7 @@ EOF
 
   ${mariadb_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'127.0.0.1' identified by \"${dbrootpwd}\" with grant option;"
   ${mariadb_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'localhost' identified by \"${dbrootpwd}\" with grant option;"
-  ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' where User not like 'mariadb.%';"
+  ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' and User not like 'mariadb.%';"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.db where User='';"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.proxies_priv where Host!='localhost';"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"

include/mariadb-10.5.sh

@@ -17,8 +17,8 @@ Install_MariaDB105() {
   mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar zxf mariadb-${mariadb105_ver}-linux-${SYS_BIT_b}.tar.gz
-    mv mariadb-${mariadb105_ver}-linux-${SYS_BIT_b}/* ${mariadb_install_dir}
+    tar zxf mariadb-${mariadb105_ver}-linux-systemd-${SYS_BIT_b}.tar.gz
+    mv mariadb-${mariadb105_ver}-linux-systemd-${SYS_BIT_b}/* ${mariadb_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
@@ -52,7 +52,7 @@ Install_MariaDB105() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mariadb-${mariadb105_ver}-linux-${SYS_BIT_b}
+      rm -rf mariadb-${mariadb105_ver}-linux-systemd-${SYS_BIT_b}
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf mariadb-${mariadb105_ver} boost_${boostVersion2}
     fi
@@ -206,7 +206,7 @@ EOF
 
   ${mariadb_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'127.0.0.1' identified by \"${dbrootpwd}\" with grant option;"
   ${mariadb_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'localhost' identified by \"${dbrootpwd}\" with grant option;"
-  ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' where User not like 'mariadb.%';"
+  ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' and User not like 'mariadb.%';"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.db where User='';"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.proxies_priv where Host!='localhost';"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"

include/mariadb-10.3.sh → include/mariadb-10.6.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/oneinstack/oneinstack
 
-Install_MariaDB103() {
+Install_MariaDB106() {
   pushd ${oneinstack_dir}/src > /dev/null
   id -u mysql >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
@@ -17,15 +17,15 @@ Install_MariaDB103() {
   mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar zxf mariadb-${mariadb103_ver}-linux-${SYS_BIT_b}.tar.gz
-    mv mariadb-${mariadb103_ver}-linux-${SYS_BIT_b}/* ${mariadb_install_dir}
+    tar zxf mariadb-${mariadb106_ver}-linux-systemd-${SYS_BIT_b}.tar.gz
+    mv mariadb-${mariadb106_ver}-linux-systemd-${SYS_BIT_b}/* ${mariadb_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
     boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
     tar xzf boost_${boostVersion2}.tar.gz
-    tar xzf mariadb-${mariadb103_ver}.tar.gz
-    pushd mariadb-${mariadb103_ver}
+    tar xzf mariadb-${mariadb106_ver}.tar.gz
+    pushd mariadb-${mariadb106_ver}
     cmake . -DCMAKE_INSTALL_PREFIX=${mariadb_install_dir} \
     -DMYSQL_DATADIR=${mariadb_data_dir} \
     -DDOWNLOAD_BOOST=1 \
@@ -52,9 +52,9 @@ Install_MariaDB103() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mariadb-${mariadb103_ver}-linux-${SYS_BIT_b}
+      rm -rf mariadb-${mariadb106_ver}-linux-systemd-${SYS_BIT_b}
     elif [ "${dbinstallmethod}" == "2" ]; then
-      rm -rf mariadb-${mariadb103_ver} boost_${boostVersion2}
+      rm -rf mariadb-${mariadb106_ver} boost_${boostVersion2}
     fi
   else
     rm -rf ${mariadb_install_dir}
@@ -75,6 +75,7 @@ Install_MariaDB103() {
 [client]
 port = 3306
 socket = /tmp/mysql.sock
+default-character-set = utf8mb4
 
 [mysqld]
 port = 3306
@@ -205,7 +206,7 @@ EOF
 
   ${mariadb_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'127.0.0.1' identified by \"${dbrootpwd}\" with grant option;"
   ${mariadb_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'localhost' identified by \"${dbrootpwd}\" with grant option;"
-  ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' where User not like 'mariadb.%';"
+  ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' and User not like 'mariadb.%';"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.db where User='';"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.proxies_priv where Host!='localhost';"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"

include/mariadb-5.5.sh

@@ -17,8 +17,8 @@ Install_MariaDB55() {
   mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar zxf mariadb-${mariadb55_ver}-linux-${SYS_BIT_b}.tar.gz
-    mv mariadb-${mariadb55_ver}-linux-${SYS_BIT_b}/* ${mariadb_install_dir}
+    tar zxf mariadb-${mariadb55_ver}-linux-systemd-${SYS_BIT_b}.tar.gz
+    mv mariadb-${mariadb55_ver}-linux-systemd-${SYS_BIT_b}/* ${mariadb_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
@@ -50,7 +50,7 @@ Install_MariaDB55() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mariadb-${mariadb55_ver}-linux-${SYS_BIT_b}
+      rm -rf mariadb-${mariadb55_ver}-linux-systemd-${SYS_BIT_b}
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf mariadb-${mariadb55_ver}
     fi
@@ -204,7 +204,7 @@ EOF
 
   ${mariadb_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'127.0.0.1' identified by \"${dbrootpwd}\" with grant option;"
   ${mariadb_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'localhost' identified by \"${dbrootpwd}\" with grant option;"
-  ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' where User not like 'mariadb.%';"
+  ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' and User not like 'mariadb.%';"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.db where User='';"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.proxies_priv where Host!='localhost';"
   ${mariadb_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"

include/mysql-5.5.sh

@@ -207,7 +207,7 @@ EOF
 
   ${mysql_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'127.0.0.1' identified by \"${dbrootpwd}\" with grant option;"
   ${mysql_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'localhost' identified by \"${dbrootpwd}\" with grant option;"
-  ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' where User not like 'mysql.%';"
+  ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' and User not like 'mysql.%';"
   ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.db where User='';"
   ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.proxies_priv where Host!='localhost';"
   ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"

include/mysql-5.6.sh

@@ -206,7 +206,7 @@ EOF
 
   ${mysql_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'127.0.0.1' identified by \"${dbrootpwd}\" with grant option;"
   ${mysql_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'localhost' identified by \"${dbrootpwd}\" with grant option;"
-  ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' where User not like 'mysql.%';"
+  ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' and User not like 'mysql.%';"
   ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.db where User='';"
   ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.proxies_priv where Host!='localhost';"
   ${mysql_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"

include/pecl_mongodb.sh

@@ -28,9 +28,15 @@ Install_pecl_mongodb() {
         echo "${CFAILURE}PHP mongo module install failed, Please contact the author! ${CEND}" && lsb_release -a
       fi
     else
-      src_url=https://pecl.php.net/get/mongodb-${pecl_mongodb_ver}.tgz && Download_src
-      tar xzf mongodb-${pecl_mongodb_ver}.tgz
-      pushd mongodb-${pecl_mongodb_ver} > /dev/null
+      if [[ "$(${php_install_dir}/bin/php-config --version | awk -F. '{print $1$2}')" =~ ^70$ ]]; then
+        src_url=https://pecl.php.net/get/mongodb-${pecl_mongodb_oldver}.tgz && Download_src
+        tar xzf mongodb-${pecl_mongodb_oldver}.tgz
+        pushd mongodb-${pecl_mongodb_oldver} > /dev/null
+      else
+        src_url=https://pecl.php.net/get/mongodb-${pecl_mongodb_ver}.tgz && Download_src
+        tar xzf mongodb-${pecl_mongodb_ver}.tgz
+        pushd mongodb-${pecl_mongodb_ver} > /dev/null
+      fi
       ${php_install_dir}/bin/phpize
       ./configure --with-php-config=${php_install_dir}/bin/php-config
       make -j ${THREAD} && make install
@@ -38,7 +44,7 @@ Install_pecl_mongodb() {
       if [ -f "${phpExtensionDir}/mongodb.so" ]; then
         echo 'extension=mongodb.so' > ${php_install_dir}/etc/php.d/07-mongodb.ini
         echo "${CSUCCESS}PHP mongodb module installed successfully! ${CEND}"
-        rm -rf mongodb-${pecl_mongodb_ver}
+        rm -rf mongodb-${pecl_mongodb_oldver} mongodb-${pecl_mongodb_ver}
       else
         echo "${CFAILURE}PHP mongodb module install failed, Please contact the author! ${CEND}" && lsb_release -a
       fi

include/pecl_xdebug.sh

@@ -14,15 +14,15 @@ Install_pecl_xdebug() {
     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-4]$ ]]; then
-      if [[ "${PHP_main_ver}" =~ ^7.[0-4]$ ]]; then
-        src_url=https://pecl.php.net/get/xdebug-${xdebug_ver}.tgz && Download_src
-        tar xzf xdebug-${xdebug_ver}.tgz
-        pushd xdebug-${xdebug_ver} > /dev/null
-      elif [[ "${PHP_main_ver}" =~ ^5.[5-6]$ ]]; then
+    if [[ "${PHP_main_ver}" =~ ^7.[0-4]$|^80$ ]]; then
+      if [[ "${PHP_main_ver}" =~ ^7.[0-1]$ ]]; then
         src_url=https://pecl.php.net/get/xdebug-${xdebug_oldver}.tgz && Download_src
         tar xzf xdebug-${xdebug_oldver}.tgz
         pushd xdebug-${xdebug_oldver} > /dev/null
+      else
+        src_url=https://pecl.php.net/get/xdebug-${xdebug_ver}.tgz && Download_src
+        tar xzf xdebug-${xdebug_ver}.tgz
+        pushd xdebug-${xdebug_ver} > /dev/null
       fi
       ${php_install_dir}/bin/phpize
       ./configure --with-php-config=${php_install_dir}/bin/php-config

include/percona-5.5.sh

@@ -208,7 +208,7 @@ EOF
 
   ${percona_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'127.0.0.1' identified by \"${dbrootpwd}\" with grant option;"
   ${percona_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'localhost' identified by \"${dbrootpwd}\" with grant option;"
-  ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' where User not like 'mysql.%';"
+  ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' and User not like 'mysql.%';"
   ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.db where User='';"
   ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.proxies_priv where Host!='localhost';"
   ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"

include/percona-5.6.sh

@@ -208,7 +208,7 @@ EOF
 
   ${percona_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'127.0.0.1' identified by \"${dbrootpwd}\" with grant option;"
   ${percona_install_dir}/bin/mysql -e "grant all privileges on *.* to root@'localhost' identified by \"${dbrootpwd}\" with grant option;"
-  ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' where User not like 'mysql.%';"
+  ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.user where Password='' and User not like 'mysql.%';"
   ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.db where User='';"
   ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "delete from mysql.proxies_priv where Host!='localhost';"
   ${percona_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "drop database test;"

install.sh

@@ -387,9 +387,9 @@ if [ ${ARG_NUM} == 0 ]; then
           echo -e "\t${CMSG} 2${CEND}. Install MySQL-5.7"
           echo -e "\t${CMSG} 3${CEND}. Install MySQL-5.6"
           echo -e "\t${CMSG} 4${CEND}. Install MySQL-5.5"
-          echo -e "\t${CMSG} 5${CEND}. Install MariaDB-10.5"
-          echo -e "\t${CMSG} 6${CEND}. Install MariaDB-10.4"
-          echo -e "\t${CMSG} 7${CEND}. Install MariaDB-10.3"
+          echo -e "\t${CMSG} 5${CEND}. Install MariaDB-10.6"
+          echo -e "\t${CMSG} 6${CEND}. Install MariaDB-10.5"
+          echo -e "\t${CMSG} 7${CEND}. Install MariaDB-10.4"
           echo -e "\t${CMSG} 8${CEND}. Install MariaDB-5.5"
           echo -e "\t${CMSG} 9${CEND}. Install Percona-8.0"
           echo -e "\t${CMSG}10${CEND}. Install Percona-5.7"
@@ -795,17 +795,17 @@ case "${db_option}" in
     Install_MySQL55 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   5)
+    . include/mariadb-10.6.sh
+    Install_MariaDB106 2>&1 | tee -a ${oneinstack_dir}/install.log
+    ;;
+  6)
     . include/mariadb-10.5.sh
     Install_MariaDB105 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
-  6)
+  7)
     . include/mariadb-10.4.sh
     Install_MariaDB104 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
-  7)
-    . include/mariadb-10.3.sh
-    Install_MariaDB103 2>&1 | tee -a ${oneinstack_dir}/install.log
-    ;;
   8)
     . include/mariadb-5.5.sh
     Install_MariaDB55 2>&1 | tee -a ${oneinstack_dir}/install.log

versions.txt

@@ -6,9 +6,9 @@ openresty_ver=1.19.3.2
 openssl11_ver=1.1.1k
 openssl_ver=1.0.2u
 
-tomcat10_ver=10.0.7
-tomcat9_ver=9.0.48
-tomcat8_ver=8.5.68
+tomcat10_ver=10.0.8
+tomcat9_ver=9.0.50
+tomcat8_ver=8.5.69
 tomcat7_ver=7.0.109
 
 apache_ver=2.4.48
@@ -23,12 +23,12 @@ mysql57_ver=5.7.34
 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
-mariadb103_ver=10.3.30
 mariadb55_ver=5.5.68
 
-percona80_ver=8.0.23-14
+percona80_ver=8.0.25-15
 percona57_ver=5.7.34-37
 percona56_ver=5.6.51-91.0
 percona55_ver=5.5.62-38.14
@@ -51,9 +51,9 @@ php56_ver=5.6.40
 php70_ver=7.0.33
 php71_ver=7.1.33
 php72_ver=7.2.34
-php73_ver=7.3.28
-php74_ver=7.4.20
-php80_ver=8.0.7
+php73_ver=7.3.29
+php74_ver=7.4.21
+php80_ver=8.0.8
 
 # Nodejs
 node_ver=14.17.1
@@ -69,9 +69,10 @@ libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
 imagemagick_ver=7.1.0-2
-imagick_ver=3.4.4
+imagick_ver=3.5.0
+imagick_oldver=3.4.4
 graphicsmagick_ver=1.3.36
-gmagick_ver=2.0.5RC1
+gmagick_ver=2.0.6RC1
 gmagick_oldver=1.1.7RC3
 zendopcache_ver=7.0.5
 xcache_ver=3.2.0
@@ -84,8 +85,8 @@ 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
+xdebug_ver=3.0.4
+xdebug_oldver=2.9.8
 
 # Ftp
 pureftpd_ver=1.0.49
@@ -105,7 +106,8 @@ pecl_memcache_ver=4.0.5.2
 pecl_memcache_oldver=3.0.8
 
 # MongoDB
-pecl_mongodb_ver=1.9.1
+pecl_mongodb_ver=1.10.0
+pecl_mongodb_oldver=1.9.2
 pecl_mongo_ver=1.6.16
 
 # phpMyadmin
@@ -121,10 +123,10 @@ boost_percona_ver=1.73.0
 boost_oldver=1.59.0
 
 # Others
-lua_nginx_module_ver=0.10.19
+lua_nginx_module_ver=0.10.20
 luajit2_ver=2.1-20210510
-lua_resty_core_ver=0.1.21
-lua_resty_lrucache_ver=0.10
+lua_resty_core_ver=0.1.22
+lua_resty_lrucache_ver=0.11
 lua_cjson_ver=2.1.0.8
 python_ver=3.6.13
 setuptools_ver=57.0.0