Browse Source

Update version

lj2007331@gmail.com 5 years ago
parent
commit
913c215ce9
4 changed files with 20 additions and 15 deletions
  1. 6 2
      include/check_download.sh
  2. 2 1
      include/check_sw.sh
  3. 2 2
      install.sh
  4. 10 10
      versions.txt

+ 6 - 2
include/check_download.sh

@@ -30,11 +30,15 @@ checkDownload() {
     src_url=${mirrorLink}/jemalloc-${jemalloc_ver}.tar.bz2 && Download_src
   fi
 
+  # openssl1.1
+  if [[ ${nginx_option} =~ ^[1-3]$ ]]; then
+      echo "Download openSSL1.1..."
+      src_url=https://www.openssl.org/source/openssl-${openssl11_ver}.tar.gz && Download_src
+  fi
+
   # nginx/tengine/openresty
   case "${nginx_option}" in
     1)
-      echo "Download openSSL1.1..."
-      src_url=https://www.openssl.org/source/openssl-${openssl11_ver}.tar.gz && Download_src
       echo "Download nginx..."
       src_url=http://nginx.org/download/nginx-${nginx_ver}.tar.gz && Download_src
       ;;

+ 2 - 1
include/check_sw.sh

@@ -62,9 +62,10 @@ installDepsCentOS() {
   if [ "${CentOS_ver}" == '8' ]; then
     dnf -y --enablerepo=PowerTools install chrony oniguruma-devel rpcgen
     systemctl enable chronyd
+    systemctl stop firewalld && systemctl mask firewalld.service
   elif [ "${CentOS_ver}" == '7' ]; then
     yum -y groupremove "Basic Web Server" "MySQL Database server" "MySQL Database client"
-    systemctl mask firewalld.service
+    systemctl stop firewalld && systemctl mask firewalld.service
   elif [ "${CentOS_ver}" == '6' ]; then
     yum -y groupremove "FTP Server" "PostgreSQL Database client" "PostgreSQL Database server" "MySQL Database server" "MySQL Database client" "Web Server"
   fi

+ 2 - 2
install.sh

@@ -36,8 +36,8 @@ xcachepwd=`< /dev/urandom tr -dc A-Za-z0-9 | head -c8`
 dbinstallmethod=1
 
 version() {
-  echo "version: 2.1"
-  echo "updated date: 2019-09-28"
+  echo "version: 2.2"
+  echo "updated date: 2019-11-28"
 }
 
 Show_Help() {

+ 10 - 10
versions.txt

@@ -6,9 +6,9 @@ openresty_ver=1.15.8.2
 openssl11_ver=1.1.1d
 openssl_ver=1.0.2t
 
-tomcat9_ver=9.0.29
-tomcat8_ver=8.5.49
-tomcat7_ver=7.0.96
+tomcat9_ver=9.0.30
+tomcat8_ver=8.5.50
+tomcat7_ver=7.0.99
 tomcat6_ver=6.0.53
 
 apache24_ver=2.4.41
@@ -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.25
-php73_ver=7.3.12
-php74_ver=7.4.0
+php72_ver=7.2.26
+php73_ver=7.3.13
+php74_ver=7.4.1
 
 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-8
+imagemagick_ver=7.0.9-13
 imagick_ver=3.4.4
 graphicsmagick_ver=1.3.33
 gmagick_ver=2.0.5RC1
@@ -76,10 +76,10 @@ xcache_ver=3.2.0
 apcu_ver=5.1.18
 apcu_oldver=4.0.11
 eaccelerator_ver=0.9.6.1
-phalcon_ver=3.4.3
+phalcon_ver=3.4.5
 yaf_ver=3.0.8
 yar_ver=2.0.5
-swoole_ver=4.4.12
+swoole_ver=4.4.14
 swoole_oldver=1.10.5
 xdebug_ver=2.7.2
 xdebug_oldver=2.5.5
@@ -105,7 +105,7 @@ pecl_mongodb_ver=1.6.0
 pecl_mongo_ver=1.6.16
 
 # phpMyadmin
-phpmyadmin_ver=4.9.2
+phpmyadmin_ver=4.9.3
 phpmyadmin_oldver=4.4.15.10
 
 # jemalloc