diff --git a/README.md b/README.md index f8588b2..bd27791 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ | httpd | 2.4.57 | | apr | 1.7.4 | | apr-util | 1.6.3 | -| nghttp2 | 1.52.0 | +| nghttp2 | 1.53.0 | | openssl | 1.1.1t | | mod_wsgi | 4.9.4 | | mod_security2 | 2.9.6 | @@ -63,11 +63,11 @@ | Database | Version | |-------------------------------|-----------------------------------------------------------| | MySQL | 5.7.42, 8.0.33 | -| MariaDB | 10.3.38, 10.4.28, 10.5.19, 10.6.12, 10.7.8 | +| MariaDB | 10.3.39, 10.4.29, 10.5.20, 10.6.13, 10.11.3 | | PHP & Additional extensions | Version | |-------------------------------|-----------------------------------------------------------| -| PHP | 7.4.33, 8.0.28, 8.1.18 | +| PHP | 7.4.33, 8.0.28, 8.1.19 | | ionCube Loader | 12.0.2 | | PDFlib | 10.0.0 | | APCu extension | 5.1.21 | diff --git a/include/config.sh b/include/config.sh index 7e6f283..4192dcd 100644 --- a/include/config.sh +++ b/include/config.sh @@ -34,8 +34,8 @@ parallel_compile=1 ##Software version #nghttp2 -nghttp2_filename="nghttp2-1.52.0" -nghttp2_filename_url="https://github.com/nghttp2/nghttp2/releases/download/v1.52.0/nghttp2-1.52.0.tar.gz" +nghttp2_filename="nghttp2-1.53.0" +nghttp2_filename_url="https://github.com/nghttp2/nghttp2/releases/download/v1.53.0/nghttp2-1.53.0.tar.gz" #openssl openssl_filename="openssl-1.1.1t" openssl_filename_url="https://www.openssl.org/source/openssl-1.1.1t.tar.gz" @@ -47,15 +47,15 @@ mysql5_7_filename="mysql-5.7.42" #mysql8.0 mysql8_0_filename="mysql-8.0.33" #mariadb10.3 -mariadb10_3_filename="mariadb-10.3.38" +mariadb10_3_filename="mariadb-10.3.39" #mariadb10.4 -mariadb10_4_filename="mariadb-10.4.28" +mariadb10_4_filename="mariadb-10.4.29" #mariadb10.5 -mariadb10_5_filename="mariadb-10.5.19" +mariadb10_5_filename="mariadb-10.5.20" #mariadb10.6 -mariadb10_6_filename="mariadb-10.6.12" -#mariadb10.7 -mariadb10_7_filename="mariadb-10.7.8" +mariadb10_6_filename="mariadb-10.6.13" +#mariadb10.11 +mariadb10_11_filename="mariadb-10.11.3" #php7.4 php7_4_filename="php-7.4.33" php7_4_filename_url="https://www.php.net/distributions/php-7.4.33.tar.gz" @@ -63,8 +63,8 @@ php7_4_filename_url="https://www.php.net/distributions/php-7.4.33.tar.gz" php8_0_filename="php-8.0.28" php8_0_filename_url="https://www.php.net/distributions/php-8.0.28.tar.gz" #php8.1 -php8_1_filename="php-8.1.18" -php8_1_filename_url="https://www.php.net/distributions/php-8.1.18.tar.gz" +php8_1_filename="php-8.1.19" +php8_1_filename_url="https://www.php.net/distributions/php-8.1.19.tar.gz" #phpMyAdmin phpmyadmin_filename="phpMyAdmin-5.2.1-all-languages" phpmyadmin_filename_url="https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.gz" @@ -219,7 +219,7 @@ ${mariadb10_3_filename} ${mariadb10_4_filename} ${mariadb10_5_filename} ${mariadb10_6_filename} -${mariadb10_7_filename} +${mariadb10_11_filename} do_not_install ) diff --git a/include/mysql.sh b/include/mysql.sh index 3bc832e..0796a26 100644 --- a/include/mysql.sh +++ b/include/mysql.sh @@ -19,11 +19,11 @@ mysql_preinstall_settings(){ mysql_arr=(${mysql_arr[@]#${mariadb10_4_filename}}) mysql_arr=(${mysql_arr[@]#${mariadb10_5_filename}}) mysql_arr=(${mysql_arr[@]#${mariadb10_6_filename}}) - mysql_arr=(${mysql_arr[@]#${mariadb10_7_filename}}) + mysql_arr=(${mysql_arr[@]#${mariadb10_11_filename}}) fi - # mariadb 10.6, 10.7 not support 32 bit + # mariadb 10.6, 10.11 not support 32 bit is_64bit || mysql_arr=(${mysql_arr[@]#${mariadb10_6_filename}}) - is_64bit || mysql_arr=(${mysql_arr[@]#${mariadb10_7_filename}}) + is_64bit || mysql_arr=(${mysql_arr[@]#${mariadb10_11_filename}}) display_menu mysql 1 if [ "${mysql}" != "do_not_install" ];then @@ -343,7 +343,7 @@ install_mariadb(){ glibc_flag=linux-glibc_214 if [[ "${mysql}" == "${mariadb10_5_filename}" || \ "${mysql}" == "${mariadb10_6_filename}" || \ - "${mysql}" == "${mariadb10_7_filename}" ]]; then + "${mysql}" == "${mariadb10_11_filename}" ]]; then glibc_flag=linux-systemd fi fi diff --git a/include/upgrade_db.sh b/include/upgrade_db.sh index e6578b1..af10b31 100644 --- a/include/upgrade_db.sh +++ b/include/upgrade_db.sh @@ -65,7 +65,9 @@ upgrade_db(){ elif [ "${mariadb_ver}" == "10.6" ]; then latest_mariadb="$(curl -4s https://mariadb.org/download/ | grep "Latest releases" | grep -oE "10.6.[0-9.]+" | head -1)" elif [ "${mariadb_ver}" == "10.7" ]; then - latest_mariadb="$(curl -4s https://mariadb.org/download/ | grep "Latest releases" | grep -oE "10.7.[0-9.]+" | head -1)" + latest_mariadb="10.7.8" + elif [ "${mariadb_ver}" == "10.11" ]; then + latest_mariadb="$(curl -4s https://mariadb.org/download/ | grep "Latest releases" | grep -oE "10.11.[0-9.]+" | head -1)" else _error "There is no update available for ${db_name} ${installed_mariadb}" fi @@ -169,7 +171,7 @@ upgrade_db(){ glibc_flag=linux else glibc_flag=linux-glibc_214 - if [[ "${mariadb_ver}" == "10.5" || "${mariadb_ver}" == "10.6" || "${mariadb_ver}" == "10.7" ]]; then + if [[ "${mariadb_ver}" == "10.5" || "${mariadb_ver}" == "10.6" || "${mariadb_ver}" == "10.7" || "${mariadb_ver}" == "10.11" ]]; then glibc_flag=linux-systemd fi fi diff --git a/lamp.sh b/lamp.sh index 2373881..a6ef9be 100644 --- a/lamp.sh +++ b/lamp.sh @@ -152,11 +152,11 @@ process(){ "${mysql}" == "${mariadb10_4_filename}" || \ "${mysql}" == "${mariadb10_5_filename}" || \ "${mysql}" == "${mariadb10_6_filename}" || \ - "${mysql}" == "${mariadb10_7_filename}" ]] \ + "${mysql}" == "${mariadb10_11_filename}" ]] \ && version_lt $(get_libc_version) 2.14; then _error "Option --db_option input error, ${mysql} is not be supported in your OS, please input a correct number" fi - if ! is_64bit && [[ "${mysql}" == "${mariadb10_6_filename}" || "${mysql}" == "${mariadb10_7_filename}" ]]; then + if ! is_64bit && [[ "${mysql}" == "${mariadb10_6_filename}" || "${mysql}" == "${mariadb10_11_filename}" ]]; then _error "Option --db_option input error, ${mysql} is not be supported in your OS, please input a correct number" fi ;;