From e31f7315dd2897d02114d2c06451fd1556ba77d2 Mon Sep 17 00:00:00 2001 From: "lj2007331@gmail.com" Date: Thu, 28 Nov 2019 09:22:08 +0800 Subject: [PATCH] release V2.2 --- include/check_download.sh | 16 ++++++++-------- include/check_os.sh | 2 ++ include/check_sw.sh | 2 +- include/upgrade_db.sh | 1 + include/upgrade_php.sh | 1 + include/upgrade_web.sh | 1 + versions.txt | 22 +++++++++++----------- 7 files changed, 25 insertions(+), 20 deletions(-) diff --git a/include/check_download.sh b/include/check_download.sh index 3c3b0a49..94c1d934 100644 --- a/include/check_download.sh +++ b/include/check_download.sh @@ -440,10 +440,10 @@ checkDownload() { fi # start download src_url=${DOWN_ADDR_PERCONA}/${FILE_NAME} && Download_src - src_url=${DOWN_ADDR_PERCONA}/${FILE_NAME}.md5sum && Download_src + src_url=${mirrorLink}/${FILE_NAME}.md5sum && Download_src # verifying download PERCONA_TAR_MD5=$(awk '{print $1}' ${FILE_NAME}.md5sum) - [ -z "${PERCONA_TAR_MD5}" ] && PERCONA_TAR_MD5=$(curl -s ${DOWN_ADDR_PERCONA}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}') + [ -z "${PERCONA_TAR_MD5}" ] && PERCONA_TAR_MD5=$(curl -s ${mirrorLink}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}') tryDlCount=0 while [ "$(md5sum ${FILE_NAME} | awk '{print $1}')" != "${PERCONA_TAR_MD5}" ]; do wget -c --no-check-certificate ${DOWN_ADDR_PERCONA}/${FILE_NAME}; sleep 1 @@ -472,10 +472,10 @@ checkDownload() { fi # start download src_url=${DOWN_ADDR_PERCONA}/${FILE_NAME} && Download_src - src_url=${DOWN_ADDR_PERCONA}/${FILE_NAME}.md5sum && Download_src + src_url=${mirrorLink}/${FILE_NAME}.md5sum && Download_src # verifying download PERCONA_TAR_MD5=$(awk '{print $1}' ${FILE_NAME}.md5sum) - [ -z "${PERCONA_TAR_MD5}" ] && PERCONA_TAR_MD5=$(curl -s ${DOWN_ADDR_PERCONA}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}') + [ -z "${PERCONA_TAR_MD5}" ] && PERCONA_TAR_MD5=$(curl -s ${mirrorLink}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}') tryDlCount=0 while [ "$(md5sum ${FILE_NAME} | awk '{print $1}')" != "${PERCONA_TAR_MD5}" ]; do wget -c --no-check-certificate ${DOWN_ADDR_PERCONA}/${FILE_NAME}; sleep 1 @@ -505,10 +505,10 @@ checkDownload() { fi # start download src_url=${DOWN_ADDR_PERCONA}/${FILE_NAME} && Download_src - src_url=${DOWN_ADDR_PERCONA}/${FILE_NAME}.md5sum && Download_src + src_url=${mirrorLink}/${FILE_NAME}.md5sum && Download_src # verifying download PERCONA_TAR_MD5=$(awk '{print $1}' ${FILE_NAME}.md5sum) - [ -z "${PERCONA_TAR_MD5}" ] && PERCONA_TAR_MD5=$(curl -s ${DOWN_ADDR_PERCONA}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}') + [ -z "${PERCONA_TAR_MD5}" ] && PERCONA_TAR_MD5=$(curl -s ${mirrorLink}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}') tryDlCount=0 while [ "$(md5sum ${FILE_NAME} | awk '{print $1}')" != "${PERCONA_TAR_MD5}" ]; do wget -c --no-check-certificate ${DOWN_ADDR_PERCONA}/${FILE_NAME}; sleep 1 @@ -538,10 +538,10 @@ checkDownload() { fi # start download src_url=${DOWN_ADDR_PERCONA}/${FILE_NAME} && Download_src - src_url=${DOWN_ADDR_PERCONA}/${FILE_NAME}.md5sum && Download_src + src_url=${mirrorLink}/${FILE_NAME}.md5sum && Download_src # verifying download PERCONA_TAR_MD5=$(awk '{print $1}' ${FILE_NAME}.md5sum) - [ -z "${PERCONA_TAR_MD5}" ] && PERCONA_TAR_MD5=$(curl -s ${DOWN_ADDR_PERCONA}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}') + [ -z "${PERCONA_TAR_MD5}" ] && PERCONA_TAR_MD5=$(curl -s ${mirrorLink}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}') tryDlCount=0 while [ "$(md5sum ${FILE_NAME} | awk '{print $1}')" != "${PERCONA_TAR_MD5}" ]; do wget -c --no-check-certificate ${DOWN_ADDR_PERCONA}/${FILE_NAME}; sleep 1 diff --git a/include/check_os.sh b/include/check_os.sh index 14d78d73..c6e92556 100644 --- a/include/check_os.sh +++ b/include/check_os.sh @@ -108,6 +108,8 @@ elif [ ${Debian_ver} -ge 9 >/dev/null 2>&1 ] || [ ${Ubuntu_ver} -ge 14 >/dev/nul sslLibVer=ssl102 elif [ ${Fedora_ver} -ge 27 >/dev/null 2>&1 ]; then sslLibVer=ssl102 +elif [ "${CentOS_ver}" == '8' ]; then + sslLibVer=ssl1:111 else sslLibVer=unknown fi diff --git a/include/check_sw.sh b/include/check_sw.sh index 43fa5b07..f504c898 100644 --- a/include/check_sw.sh +++ b/include/check_sw.sh @@ -39,7 +39,7 @@ installDepsDebian() { # Install needed packages case "${Debian_ver}" in 8) - pkgList="debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg8 libjpeg62-turbo-dev libjpeg-dev libpng12-0 libpng12-dev libpng3 libxml2 libxml2-dev zlib1g zlib1g-dev libc6 libc6-dev libc-client2007e-dev libglib2.0-0 libglib2.0-dev bzip2 libzip-dev libbz2-1.0 libncurses5 libncurses5-dev libaio1 libaio-dev numactl libreadline-dev curl libcurl3-gnutls libcurl4-gnutls-dev libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libxslt-dev libicu-dev locales libcloog-ppl0 patch vim zip unzip tmux htop bc dc expect libexpat1-dev libonig-dev libtirpc-dev nss rsync git lsof lrzsz iptables rsyslog cron logrotate ntpdate libsqlite3-dev psmisc wget sysv-rc ca-certificates" + pkgList="debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg8 libjpeg62-turbo-dev libjpeg-dev libpng12-0 libpng12-dev libpng3 libgd-dev libxml2 libxml2-dev zlib1g zlib1g-dev libc6 libc6-dev libc-client2007e-dev libglib2.0-0 libglib2.0-dev bzip2 libzip-dev libbz2-1.0 libncurses5 libncurses5-dev libaio1 libaio-dev numactl libreadline-dev curl libcurl3-gnutls libcurl4-gnutls-dev libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libxslt-dev libicu-dev locales libcloog-ppl0 patch vim zip unzip tmux htop bc dc expect libexpat1-dev libonig-dev libtirpc-dev nss rsync git lsof lrzsz iptables rsyslog cron logrotate ntpdate libsqlite3-dev psmisc wget sysv-rc ca-certificates" ;; 9|10) pkgList="debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg62-turbo-dev libjpeg-dev libpng-dev libxml2 libxml2-dev zlib1g zlib1g-dev libc6 libc6-dev libc-client2007e-dev libglib2.0-0 libglib2.0-dev bzip2 libzip-dev libbz2-1.0 libncurses5 libncurses5-dev libaio1 libaio-dev numactl libreadline-dev curl libcurl3-gnutls libcurl4-gnutls-dev libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libicu-dev locales libcloog-ppl1 patch vim zip unzip tmux htop bc dc expect libexpat1-dev libonig-dev libtirpc-dev nss rsync git lsof lrzsz iptables rsyslog cron logrotate ntpdate libsqlite3-dev psmisc wget sysv-rc ca-certificates" diff --git a/include/upgrade_db.sh b/include/upgrade_db.sh index 812b98b1..f5cb40ce 100644 --- a/include/upgrade_db.sh +++ b/include/upgrade_db.sh @@ -85,6 +85,7 @@ Upgrade_DB() { break else echo "${CWARNING}input error! ${CEND}Please only input '${CMSG}${OLD_db_ver%.*}.xx${CEND}'" + [ "${db_flag}" == 'y' ] && exit fi done diff --git a/include/upgrade_php.sh b/include/upgrade_php.sh index 8b665d60..bdedaa96 100644 --- a/include/upgrade_php.sh +++ b/include/upgrade_php.sh @@ -29,6 +29,7 @@ Upgrade_PHP() { break else echo "${CWARNING}input error! ${CEND}Please only input '${CMSG}${OLD_php_ver%.*}.xx${CEND}'" + [ "${php_flag}" == 'y' ] && exit fi done diff --git a/include/upgrade_web.sh b/include/upgrade_web.sh index d0a238bd..495c2541 100644 --- a/include/upgrade_web.sh +++ b/include/upgrade_web.sh @@ -226,6 +226,7 @@ Upgrade_Apache() { fi else echo "${CWARNING}input error! ${CEND}Please only input '${CMSG}${OLD_apache_ver%.*}.xx${CEND}'" + [ "${apache_flag}" == 'y' ] && exit fi done diff --git a/versions.txt b/versions.txt index 2ae9df43..30d48312 100644 --- a/versions.txt +++ b/versions.txt @@ -6,8 +6,8 @@ openresty_ver=1.15.8.2 openssl11_ver=1.1.1d openssl_ver=1.0.2t -tomcat9_ver=9.0.27 -tomcat8_ver=8.5.47 +tomcat9_ver=9.0.29 +tomcat8_ver=8.5.49 tomcat7_ver=7.0.96 tomcat6_ver=6.0.53 @@ -29,9 +29,9 @@ mariadb103_ver=10.3.20 mariadb102_ver=10.2.29 mariadb55_ver=5.5.66 -percona80_ver=8.0.16-7 -percona57_ver=5.7.27-30 -percona56_ver=5.6.45-86.1 +percona80_ver=8.0.17-8 +percona57_ver=5.7.28-31 +percona56_ver=5.6.46-86.2 percona55_ver=5.5.62-38.14 alisql_ver=5.6.32-9 @@ -53,9 +53,9 @@ php55_ver=5.5.38 php56_ver=5.6.40 php70_ver=7.0.33 php71_ver=7.1.33 -php72_ver=7.2.24 -php73_ver=7.3.11 -php74_ver=7.4.0RC6 +php72_ver=7.2.25 +php73_ver=7.3.12 +php74_ver=7.4.0 libiconv_ver=1.15 curl_ver=7.67.0 @@ -66,7 +66,7 @@ freetype_ver=2.10.1 icu4c_ver=63_1 libsodium_ver=1.0.18 argon2_ver=20171227 -imagemagick_ver=7.0.9-4 +imagemagick_ver=7.0.9-6 imagick_ver=3.4.4 graphicsmagick_ver=1.3.33 gmagick_ver=2.0.5RC1 @@ -88,7 +88,7 @@ xdebug_oldver=2.5.5 pureftpd_ver=1.0.49 # Redis -redis_ver=5.0.6 +redis_ver=5.0.7 pecl_redis_ver=5.1.0 pecl_redis_oldver=4.3.0 @@ -105,7 +105,7 @@ pecl_mongodb_ver=1.6.0 pecl_mongo_ver=1.6.16 # phpMyadmin -phpmyadmin_ver=4.9.1 +phpmyadmin_ver=4.9.2 phpmyadmin_oldver=4.4.15.10 # jemalloc