[fix] Update

include/check_download.sh

@@ -108,9 +108,9 @@ checkDownload() {
       1)
         # MySQL 8.0
         if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
-          DOWN_ADDR_MYSQL=http://mirrors.aliyun.com/mysql/MySQL-8.0
-          DOWN_ADDR_MYSQL_BK=http://mirrors.tuna.tsinghua.edu.cn/mysql/downloads/MySQL-8.0
-          DOWN_ADDR_MYSQL_BK2=http://repo.huaweicloud.com/mysql/Downloads/MySQL-8.0
+          DOWN_ADDR_MYSQL=https://cdn.mysql.com/Downloads/MySQL-8.0
+          DOWN_ADDR_MYSQL_BK=http://repo.huaweicloud.com/mysql/Downloads/MySQL-8.0
+          DOWN_ADDR_MYSQL_BK2=http://mirrors.tuna.tsinghua.edu.cn/mysql/downloads/MySQL-8.0
         else
           DOWN_ADDR_MYSQL=https://cdn.mysql.com/Downloads/MySQL-8.0
           DOWN_ADDR_MYSQL_BK=https://mirrors.dotsrc.org/mysql/Downloads/MySQL-8.0
@@ -143,9 +143,9 @@ checkDownload() {
       2)
         # MySQL 5.7
         if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
-          DOWN_ADDR_MYSQL=http://mirrors.aliyun.com/mysql/MySQL-5.7
-          DOWN_ADDR_MYSQL_BK=http://mirrors.tuna.tsinghua.edu.cn/mysql/downloads/MySQL-5.7
-          DOWN_ADDR_MYSQL_BK2=http://repo.huaweicloud.com/mysql/Downloads/MySQL-5.7
+          DOWN_ADDR_MYSQL=https://cdn.mysql.com/Downloads/MySQL-5.7
+          DOWN_ADDR_MYSQL_BK=http://repo.huaweicloud.com/mysql/Downloads/MySQL-5.7
+          DOWN_ADDR_MYSQL_BK2=http://mirrors.tuna.tsinghua.edu.cn/mysql/downloads/MySQL-5.7
         else
           DOWN_ADDR_MYSQL=https://cdn.mysql.com/Downloads/MySQL-5.7
           DOWN_ADDR_MYSQL_BK=https://mirrors.dotsrc.org/mysql/Downloads/MySQL-5.7

include/check_os.sh

@@ -72,6 +72,10 @@ elif [ -e "/etc/rocky-release" ]; then
   Family=rhel
   Platform=Rocky
   grep -Eqi "release 9." /etc/rocky-release && RHEL_ver=9
+elif [ -e "/etc/oracle-release" ]; then
+  Family=rhel
+  Platform=Oracle
+  grep -Eqi "release 9." /etc/oracle-release && RHEL_ver=9
 else
   command -v lsb_release >/dev/null 2>&1 || { echo "${CFAILURE}${PM} source failed! ${CEND}"; kill -9 $$; exit 1; }
 fi

include/check_sw.sh

@@ -122,6 +122,7 @@ installDepsUbuntu() {
   apt-get -y autoremove
   apt-get -yf install
   export DEBIAN_FRONTEND=noninteractive
+  [[ "${Ubuntu_ver}" =~ ^22$ ]] && apt-get -y --allow-downgrades install libicu70=70.1-2 libglib2.0-0=2.72.1-1 libxml2-dev
 
   # critical security updates
   grep security /etc/apt/sources.list > /tmp/security.sources.list

include/openssl.sh

@@ -66,31 +66,31 @@ elif openssl version | grep -Eqi 'OpenSSL 1.1.*'; then
 elif openssl version | grep -Eqi 'OpenSSL 3.*'; then
   php5_with_openssl="--with-openssl=${openssl_install_dir}"
   php70_with_openssl="--with-openssl=${openssl_install_dir}"
-  php71_with_openssl="--with-openssl=${openssl_install_dir}"
-  php72_with_openssl="--with-openssl=${openssl_install_dir}"
-  php73_with_openssl="--with-openssl=${openssl_install_dir}"
-  php74_with_openssl="--with-openssl=${openssl_install_dir} --with-openssl-dir=${openssl_install_dir}"
-  php80_with_openssl="--with-openssl=${openssl_install_dir} --with-openssl-dir=${openssl_install_dir}"
+  php71_with_openssl="--with-openssl"
+  php72_with_openssl="--with-openssl"
+  php73_with_openssl="--with-openssl"
+  php74_with_openssl="--with-openssl"
+  php80_with_openssl="--with-openssl"
   php81_with_openssl="--with-openssl"
 
   php5_with_ssl="--with-ssl=${openssl_install_dir}"
   php70_with_ssl="--with-ssl=${openssl_install_dir}"
-  php71_with_ssl="--with-ssl=${openssl_install_dir}"
-  php72_with_ssl="--with-ssl=${openssl_install_dir}"
-  php73_with_ssl="--with-ssl=${openssl_install_dir}"
-  php74_with_ssl="--with-ssl=${openssl_install_dir}"
-  php80_with_ssl="--with-ssl=${openssl_install_dir}"
+  php71_with_ssl="--with-ssl"
+  php72_with_ssl="--with-ssl"
+  php73_with_ssl="--with-ssl"
+  php74_with_ssl="--with-ssl"
+  php80_with_ssl="--with-ssl"
   php81_with_ssl="--with-ssl"
 
   php5_with_curl="--with-curl=${curl_install_dir}"
   php70_with_curl="--with-curl=${curl_install_dir}"
-  php71_with_curl="--with-curl=${curl_install_dir}"
-  php72_with_curl="--with-curl=${curl_install_dir}"
-  php73_with_curl="--with-curl=${curl_install_dir}"
-  php74_with_curl="--with-curl=${curl_install_dir}"
-  php80_with_curl="--with-curl=${curl_install_dir}"
+  php71_with_curl="--with-curl"
+  php72_with_curl="--with-curl"
+  php73_with_curl="--with-curl"
+  php74_with_curl="--with-curl"
+  php80_with_curl="--with-curl"
   php81_with_curl="--with-curl"
-  [[ ${php_option} =~ ^[1-9]$|^10$ ]] || [[ "${mphp_ver}" =~ ^5[3-6]$|^7[0-4]$|^80$ ]] && with_old_openssl_flag=y
+  [[ ${php_option} =~ ^[1-5]$ ]] || [[ "${mphp_ver}" =~ ^5[3-6]$|^70$ ]] && with_old_openssl_flag=y
 else
   php5_with_openssl="--with-openssl=${openssl_install_dir}"
   php70_with_openssl="--with-openssl=${openssl_install_dir}"

include/php-7.1.sh

@@ -88,6 +88,10 @@ Install_PHP71() {
 
   tar xzf php-${php71_ver}.tar.gz
   pushd php-${php71_ver} > /dev/null
+  if [ -e ext/openssl/openssl.c ] && ! grep -Eqi '^#ifdef RSA_SSLV23_PADDING' ext/openssl/openssl.c; then
+    sed -i '/OPENSSL_SSLV23_PADDING/i#ifdef RSA_SSLV23_PADDING' ext/openssl/openssl.c
+    sed -i '/OPENSSL_SSLV23_PADDING/a#endif' ext/openssl/openssl.c
+  fi
   make clean
   [ ! -d "${php_install_dir}" ] && mkdir -p ${php_install_dir}
   [ "${phpcache_option}" == '1' ] && phpcache_arg='--enable-opcache' || phpcache_arg='--disable-opcache'

include/php-7.2.sh

@@ -82,6 +82,10 @@ Install_PHP72() {
 
   tar xzf php-${php72_ver}.tar.gz
   pushd php-${php72_ver} > /dev/null
+  if [ -e ext/openssl/openssl.c ] && ! grep -Eqi '^#ifdef RSA_SSLV23_PADDING' ext/openssl/openssl.c; then
+    sed -i '/OPENSSL_SSLV23_PADDING/i#ifdef RSA_SSLV23_PADDING' ext/openssl/openssl.c
+    sed -i '/OPENSSL_SSLV23_PADDING/a#endif' ext/openssl/openssl.c
+  fi
   make clean
   [ ! -d "${php_install_dir}" ] && mkdir -p ${php_install_dir}
   [ "${phpcache_option}" == '1' ] && phpcache_arg='--enable-opcache' || phpcache_arg='--disable-opcache'

include/php-7.3.sh

@@ -82,6 +82,10 @@ Install_PHP73() {
 
   tar xzf php-${php73_ver}.tar.gz
   pushd php-${php73_ver} > /dev/null
+  if [ -e ext/openssl/openssl.c ] && ! grep -Eqi '^#ifdef RSA_SSLV23_PADDING' ext/openssl/openssl.c; then
+    sed -i '/OPENSSL_SSLV23_PADDING/i#ifdef RSA_SSLV23_PADDING' ext/openssl/openssl.c
+    sed -i '/OPENSSL_SSLV23_PADDING/a#endif' ext/openssl/openssl.c
+  fi
   make clean
   [ ! -d "${php_install_dir}" ] && mkdir -p ${php_install_dir}
   [ "${phpcache_option}" == '1' ] && phpcache_arg='--enable-opcache' || phpcache_arg='--disable-opcache'

include/php-7.4.sh

@@ -91,6 +91,10 @@ Install_PHP74() {
 
   tar xzf php-${php74_ver}.tar.gz
   pushd php-${php74_ver} > /dev/null
+  if [ -e ext/openssl/openssl.c ] && ! grep -Eqi '^#ifdef RSA_SSLV23_PADDING' ext/openssl/openssl.c; then
+    sed -i '/OPENSSL_SSLV23_PADDING/i#ifdef RSA_SSLV23_PADDING' ext/openssl/openssl.c
+    sed -i '/OPENSSL_SSLV23_PADDING/a#endif' ext/openssl/openssl.c
+  fi
   make clean
   export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/:$PKG_CONFIG_PATH
   [ ! -d "${php_install_dir}" ] && mkdir -p ${php_install_dir}

include/php-8.0.sh

@@ -91,6 +91,10 @@ Install_PHP80() {
 
   tar xzf php-${php80_ver}.tar.gz
   pushd php-${php80_ver} > /dev/null
+  if [ -e ext/openssl/openssl.c ] && ! grep -Eqi '^#ifdef RSA_SSLV23_PADDING' ext/openssl/openssl.c; then
+    sed -i '/OPENSSL_SSLV23_PADDING/i#ifdef RSA_SSLV23_PADDING' ext/openssl/openssl.c
+    sed -i '/OPENSSL_SSLV23_PADDING/a#endif' ext/openssl/openssl.c
+  fi
   make clean
   export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/:$PKG_CONFIG_PATH
   [ ! -d "${php_install_dir}" ] && mkdir -p ${php_install_dir}

include/upgrade_php.sh

@@ -43,6 +43,10 @@ Upgrade_PHP() {
     src_url=http://mirrors.linuxeye.com/oneinstack/src/fpm-race-condition.patch && Download_src
     patch -d php-${NEW_php_ver} -p0 < fpm-race-condition.patch
     pushd php-${NEW_php_ver}
+    if [[ "${OLD_php_ver%.*}" =~ ^7.[1-4]$|^8.[0-1]$ ]] && [ -e ext/openssl/openssl.c ] && ! grep -Eqi '^#ifdef RSA_SSLV23_PADDING' ext/openssl/openssl.c; then
+      sed -i '/OPENSSL_SSLV23_PADDING/i#ifdef RSA_SSLV23_PADDING' ext/openssl/openssl.c
+      sed -i '/OPENSSL_SSLV23_PADDING/a#endif' ext/openssl/openssl.c
+    fi
     make clean
     export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/:$PKG_CONFIG_PATH
     ${php_install_dir}/bin/php -i |grep 'Configure Command' | awk -F'=>' '{print $2}' | bash

versions.txt

@@ -6,8 +6,8 @@ openresty_ver=1.21.4.1
 openssl11_ver=1.1.1q
 openssl_ver=1.0.2u
 
-tomcat10_ver=10.0.23
-tomcat9_ver=9.0.65
+tomcat10_ver=10.0.26
+tomcat9_ver=9.0.67
 tomcat8_ver=8.5.82
 tomcat7_ver=7.0.109
 
@@ -18,18 +18,18 @@ apr_util_ver=1.6.1
 nghttp2_ver=1.42.0
 
 # DB
-mysql80_ver=8.0.29
-mysql57_ver=5.7.38
-mysql56_ver=5.6.50
+mysql80_ver=8.0.31
+mysql57_ver=5.7.40
+mysql56_ver=5.6.51
 mysql55_ver=5.5.62
 
-mariadb106_ver=10.6.9
+mariadb106_ver=10.6.10
 mariadb105_ver=10.5.17
 mariadb104_ver=10.4.26
 mariadb55_ver=5.5.68
 
 percona80_ver=8.0.29-21
-percona57_ver=5.7.38-41
+percona57_ver=5.7.39-42
 percona56_ver=5.6.51-91.0
 percona55_ver=5.5.62-38.14
 
@@ -46,15 +46,15 @@ php70_ver=7.0.33
 php71_ver=7.1.33
 php72_ver=7.2.34
 php73_ver=7.3.33
-php74_ver=7.4.30
-php80_ver=8.0.22
-php81_ver=8.1.9
+php74_ver=7.4.32
+php80_ver=8.0.24
+php81_ver=8.1.11
 
 # Nodejs
-nodejs_ver=16.16.0
+nodejs_ver=16.17.1
 
 libiconv_ver=1.16
-curl_ver=7.84.0
+curl_ver=7.85.0
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
@@ -63,7 +63,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.1.0-46
+imagemagick_ver=7.1.0-50
 imagick_ver=3.5.1
 imagick_oldver=3.4.4
 graphicsmagick_ver=1.3.36
@@ -93,7 +93,7 @@ pecl_redis_ver=5.3.7
 pecl_redis_oldver=4.3.0
 
 # Memcached
-memcached_ver=1.6.16
+memcached_ver=1.6.17
 libmemcached_ver=1.0.18
 pecl_memcached_ver=3.1.5
 pecl_memcached_oldver=2.2.0