Explorar o código

Merge pull request #102 from kaneawk/patch-2

check_download: Fix Percona 5.7 build
lj2007331 %!s(int64=7) %!d(string=hai) anos
pai
achega
cfc0725d74
Modificáronse 2 ficheiros con 14 adicións e 14 borrados
  1. 1 1
      include/check_download.sh
  2. 13 13
      versions.txt

+ 1 - 1
include/check_download.sh

@@ -94,7 +94,7 @@ checkDownload() {
   fi
 
   if [ "${DB_yn}" == 'y' ]; then
-    if [[ "${DB_version}" =~ ^[1,4,7]$ ]] && [ "${dbInstallMethods}" == "2" ]; then
+    if [[ "${DB_version}" =~ ^[1,4,8]$ ]] && [ "${dbInstallMethods}" == "2" ]; then
       echo "Download boost..."
       [ "${IPADDR_COUNTRY}"x == "CN"x ] && DOWN_ADDR_BOOST=${mirrorLink} || DOWN_ADDR_BOOST=http://downloads.sourceforge.net/project/boost/boost/${boost_version}
       boostVersion2=$(echo ${boost_version} | awk -F. '{print $1}')_$(echo ${boost_version} | awk -F. '{print $2}')_$(echo ${boost_version} | awk -F. '{print $3}')

+ 13 - 13
versions.txt

@@ -1,7 +1,7 @@
 # newest software version
 # Web
-nginx_version=1.12.1
-tengine_version=2.1.1
+nginx_version=1.12.2
+tengine_version=2.2.1
 openresty_version=1.11.2.5
 openssl_version=1.0.2l
 
@@ -9,7 +9,7 @@ tomcat8_version=8.5.23
 tomcat7_version=7.0.82
 tomcat6_version=6.0.53
 
-apache24_version=2.4.28
+apache24_version=2.4.29
 apache22_version=2.2.34
 pcre_version=8.41
 apr_version=1.6.2
@@ -17,14 +17,14 @@ apr_util_version=1.6.0
 nghttp2_version=1.24.0
 
 # DB
-mysql57_version=5.7.19
-mysql56_version=5.6.37
-mysql55_version=5.5.57
+mysql57_version=5.7.20
+mysql56_version=5.6.38
+mysql55_version=5.5.58
 
-mariadb102_version=10.2.9
+mariadb102_version=10.2.10
 mariadb101_version=10.1.28
-mariadb100_version=10.0.32
-mariadb55_version=5.5.57
+mariadb100_version=10.0.33
+mariadb55_version=5.5.58
 
 percona57_version=5.7.19-17
 percona56_version=5.6.37-82.2
@@ -38,15 +38,15 @@ jdk17_version=1.7.0_80
 jdk16_version=1.6.0_45
 
 # PHP
-php71_version=7.1.10
-php70_version=7.0.24
-php56_version=5.6.31
+php71_version=7.1.11
+php70_version=7.0.25
+php56_version=5.6.32
 php55_version=5.5.38
 php54_version=5.4.45
 php53_version=5.3.29
 
 libiconv_version=1.15
-curl_version=7.56.0
+curl_version=7.56.1
 libmcrypt_version=2.5.8
 mcrypt_version=2.6.8
 mhash_version=0.9.9.9