diff --git a/plugins/mysql/info.json b/plugins/mysql/info.json index a87adc262..6aa74c020 100755 --- a/plugins/mysql/info.json +++ b/plugins/mysql/info.json @@ -11,7 +11,7 @@ "path": "server/mysql/VERSION", "todo_versions":["5.6","5.7","8.0"], "versions":["5.5", "5.6", "5.7","8.0"], - "updates":["5.5.62","5.6.50", "5.7.32","8.0.30"], + "updates":["5.5.62","5.6.50", "5.7.32","8.0.34"], "shell":"install.sh", "checks":"server/mysql", "path":"server/mysql", @@ -19,4 +19,4 @@ "home":"https://dev.mysql.com/downloads/mysql", "date":"2017-11-24", "pid": "2" -} \ No newline at end of file +} diff --git a/plugins/mysql/versions/8.0/install.sh b/plugins/mysql/versions/8.0/install.sh index c199d5aa7..da67efa54 100755 --- a/plugins/mysql/versions/8.0/install.sh +++ b/plugins/mysql/versions/8.0/install.sh @@ -57,7 +57,7 @@ fi VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'` -VERSION=8.0.30 +VERSION=8.0.34 Install_mysql() { mkdir -p ${mysqlDir} @@ -109,11 +109,12 @@ Install_mysql() fi if [ ! -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz ];then - wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${VERSION}.tar.gz + #wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${VERSION}.tar.gz + wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${VERSION}.tar.gz fi #检测文件是否损坏. - md5_mysql_ok=313d625fcaa932bd87b48f0cf9b40f1c + md5_mysql_ok=c8cfab52fbde1cca55accb3113c235eb if [ -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz ];then md5_mysql=`md5sum ${mysqlDir}/mysql-boost-${VERSION}.tar.gz | awk '{print $1}'` if [ "${md5_mysql_ok}" == "${md5_mysql}" ]; then @@ -121,7 +122,7 @@ Install_mysql() else # 重新下载 rm -rf ${mysqlDir}/mysql-${VERSION} - wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${VERSION}.tar.gz + wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${VERSION}.tar.gz fi fi @@ -162,10 +163,10 @@ Install_mysql() add-apt-repository ppa:ubuntu-toolchain-r/test LIBTIRPC_VER=`pkg-config libtirpc --modversion` - if [ ! -f ${mysqlDir}/libtirpc_1.2.5.orig.tar.bz2 ];then - wget --no-check-certificate -O ${mysqlDir}/libtirpc_1.2.5.orig.tar.bz2 https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/libtirpc/1.2.5-1ubuntu0.1/libtirpc_1.2.5.orig.tar.bz2 - cd ${mysqlDir} && tar -jxvf libtirpc_1.2.5.orig.tar.bz2 - cd libtirpc-1.2.5 && ./configure + if [ ! -f ${mysqlDir}/libtirpc_1.3.3.orig.tar.bz2 ];then + wget --no-check-certificate -O ${mysqlDir}/libtirpc_1.3.3.orig.tar.bz2 https://downloads.sourceforge.net/libtirpc/libtirpc-1.3.3.tar.bz2 + cd ${mysqlDir} && tar -jxvf libtirpc_1.3.3.orig.tar.bz2 + cd libtirpc-1.3.3 && ./configure fi export PKG_CONFIG_PATH=/usr/lib/pkgconfig diff --git a/plugins/php/lib/openssl.sh b/plugins/php/lib/openssl.sh index 1d34d9dc8..537db02af 100644 --- a/plugins/php/lib/openssl.sh +++ b/plugins/php/lib/openssl.sh @@ -7,7 +7,7 @@ rootPath=$(dirname "$curPath") rootPath=$(dirname "$rootPath") rootPath=$(dirname "$rootPath") rootPath=$(dirname "$rootPath") - +opensslVersion="3.0.10" # echo $rootPath SERVER_ROOT=$rootPath/lib @@ -15,11 +15,11 @@ SOURCE_ROOT=$rootPath/source/lib if [ ! -d ${SERVER_ROOT}/openssl ];then cd ${SOURCE_ROOT} - if [ ! -f ${SOURCE_ROOT}/openssl-1.1.1p.tar.gz ];then - wget --no-check-certificate -O ${SOURCE_ROOT}/openssl-1.1.1p.tar.gz https://www.openssl.org/source/openssl-1.1.1p.tar.gz + if [ ! -f ${SOURCE_ROOT}/openssl-${opensslVersion}.tar.gz ];then + wget --no-check-certificate -O ${SOURCE_ROOT}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz fi - tar -zxvf openssl-1.1.1p.tar.gz - cd openssl-1.1.1p + tar -zxvf openssl-${opensslVersion}.tar.gz + cd openssl-${opensslVersion} ./config --prefix=${SERVER_ROOT}/openssl zlib-dynamic shared make && make install fi diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh index be8a475a3..e2b8957c4 100755 --- a/plugins/php/versions/82/install.sh +++ b/plugins/php/versions/82/install.sh @@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } -version=8.2.7 +version=8.2.8 PHP_VER=82 Install_php() { diff --git a/plugins/redis/info.json b/plugins/redis/info.json index 3dd3afe2f..0967b8f48 100755 --- a/plugins/redis/info.json +++ b/plugins/redis/info.json @@ -4,8 +4,8 @@ "name": "redis", "title": "Redis", "shell": "install.sh", - "versions":["4.0.11","5.0.8","6.0.4","6.2.7","7.0.4"], - "updates":["4.0.11","5.0.8","6.0.4","6.2.7","7.0.4"], + "versions":["4.0.11","5.0.8","6.0.4","6.2.7","7.0.12"], + "updates":["4.0.11","5.0.8","6.0.4","6.2.7","7.0.12"], "tip": "soft", "checks": "server/redis", "path": "server/redis", @@ -15,4 +15,4 @@ "home": "https://redis.io", "type": 0, "pid": "2" -} \ No newline at end of file +}