浏览代码

[fix] Update check_download.sh

lj2007331@gmail.com 3 年之前
父节点
当前提交
ef2fd0c234
共有 6 个文件被更改,包括 43 次插入22 次删除
  1. 3 0
      config/nginx.conf
  2. 3 0
      config/nginx_apache.conf
  3. 3 0
      config/nginx_tomcat.conf
  4. 6 6
      include/check_download.sh
  5. 16 16
      versions.txt
  6. 12 0
      vhost.sh

+ 3 - 0
config/nginx.conf

@@ -114,6 +114,9 @@ http {
     location ~ ^/(\.user.ini|\.ht|\.git|\.svn|\.project|LICENSE|README.md) {
       deny all;
     }
+    location /.well-known {
+      allow all;
+    }
   }
 ########################## vhost #############################
   include vhost/*.conf;

+ 3 - 0
config/nginx_apache.conf

@@ -119,6 +119,9 @@ http {
     location ~ ^/(\.user.ini|\.ht|\.git|\.svn|\.project|LICENSE|README.md) {
       deny all;
     }
+    location /.well-known {
+      allow all;
+    }
   }
 ########################## vhost #############################
   include vhost/*.conf;

+ 3 - 0
config/nginx_tomcat.conf

@@ -112,6 +112,9 @@ http {
     location ~ ^/(\.user.ini|\.ht|\.git|\.svn|\.project|LICENSE|README.md) {
       deny all;
     }
+    location /.well-known {
+      allow all;
+    }
   }
 ########################## vhost #############################
   include vhost/*.conf;

+ 6 - 6
include/check_download.sh

@@ -55,7 +55,7 @@ checkDownload() {
   # pcre
   if [[ "${nginx_option}" =~ ^[1-3]$ ]] || [ "${apache_flag}" == 'y' ]; then
     echo "Download pcre..."
-    src_url=https://ftp.pcre.org/pub/pcre/pcre-${pcre_ver}.tar.gz && Download_src
+    src_url=https://downloads.sourceforge.net/project/pcre/pcre-${pcre_ver}.tar.gz && Download_src
   fi
 
   # apache
@@ -119,7 +119,7 @@ checkDownload() {
       [[ "${db_option}" =~ ^[2,5,6,7]$|^10$ ]] && boost_ver=${boost_oldver}
       [[ "${db_option}" =~ ^9$ ]] && boost_ver=${boost_percona_ver}
       echo "Download boost..."
-      [ "${IPADDR_COUNTRY}"x == "CN"x ] && DOWN_ADDR_BOOST=${mirrorLink} || DOWN_ADDR_BOOST=http://downloads.sourceforge.net/project/boost/boost/${boost_ver}
+      [ "${IPADDR_COUNTRY}"x == "CN"x ] && DOWN_ADDR_BOOST=${mirrorLink} || DOWN_ADDR_BOOST=https://downloads.sourceforge.net/project/boost/boost/${boost_ver}
       boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1"_"$2"_"$3}')
       src_url=${DOWN_ADDR_BOOST}/boost_${boostVersion2}.tar.gz && Download_src
     fi
@@ -505,9 +505,9 @@ checkDownload() {
     echo "PHP common..."
     src_url=${mirrorLink}/libiconv-${libiconv_ver}.tar.gz && Download_src
     src_url=https://curl.haxx.se/download/curl-${curl_ver}.tar.gz && Download_src
-    src_url=http://downloads.sourceforge.net/project/mhash/mhash/${mhash_ver}/mhash-${mhash_ver}.tar.gz && Download_src
-    src_url=http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/${libmcrypt_ver}/libmcrypt-${libmcrypt_ver}.tar.gz && Download_src
-    src_url=http://downloads.sourceforge.net/project/mcrypt/MCrypt/${mcrypt_ver}/mcrypt-${mcrypt_ver}.tar.gz && Download_src
+    src_url=https://downloads.sourceforge.net/project/mhash/mhash/${mhash_ver}/mhash-${mhash_ver}.tar.gz && Download_src
+    src_url=https://downloads.sourceforge.net/project/mcrypt/Libmcrypt/${libmcrypt_ver}/libmcrypt-${libmcrypt_ver}.tar.gz && Download_src
+    src_url=https://downloads.sourceforge.net/project/mcrypt/MCrypt/${mcrypt_ver}/mcrypt-${mcrypt_ver}.tar.gz && Download_src
     src_url=${mirrorLink}/freetype-${freetype_ver}.tar.gz && Download_src
   fi
 
@@ -642,7 +642,7 @@ checkDownload() {
   # graphicsmagick
   if [ "${pecl_gmagick}" == '1' ]; then
     echo "Download graphicsmagick..."
-    src_url=http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${graphicsmagick_ver}/GraphicsMagick-${graphicsmagick_ver}.tar.gz && Download_src
+    src_url=https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${graphicsmagick_ver}/GraphicsMagick-${graphicsmagick_ver}.tar.gz && Download_src
     if [[ "${php_option}" =~ ^[1-4]$ ]]; then
       echo "Download gmagick for php..."
       src_url=https://pecl.php.net/get/gmagick-${gmagick_oldver}.tgz && Download_src

+ 16 - 16
versions.txt

@@ -1,14 +1,14 @@
 # newest software version
 # Web
-nginx_ver=1.20.1
+nginx_ver=1.20.2
 tengine_ver=2.3.3
 openresty_ver=1.19.9.1
 openssl11_ver=1.1.1k
 openssl_ver=1.0.2u
 
-tomcat10_ver=10.0.12
-tomcat9_ver=9.0.54
-tomcat8_ver=8.5.72
+tomcat10_ver=10.0.13
+tomcat9_ver=9.0.55
+tomcat8_ver=8.5.73
 tomcat7_ver=7.0.109
 
 apache_ver=2.4.51
@@ -18,17 +18,17 @@ apr_util_ver=1.6.1
 nghttp2_ver=1.42.0
 
 # DB
-mysql80_ver=8.0.26
-mysql57_ver=5.7.35
+mysql80_ver=8.0.27
+mysql57_ver=5.7.36
 mysql56_ver=5.6.50
 mysql55_ver=5.5.62
 
-mariadb106_ver=10.6.4
-mariadb105_ver=10.5.12
-mariadb104_ver=10.4.21
+mariadb106_ver=10.6.5
+mariadb105_ver=10.5.13
+mariadb104_ver=10.4.22
 mariadb55_ver=5.5.68
 
-percona80_ver=8.0.25-15
+percona80_ver=8.0.26-16
 percona57_ver=5.7.35-38
 percona56_ver=5.6.51-91.0
 percona55_ver=5.5.62-38.14
@@ -51,10 +51,10 @@ php56_ver=5.6.40
 php70_ver=7.0.33
 php71_ver=7.1.33
 php72_ver=7.2.34
-php73_ver=7.3.31
-php74_ver=7.4.24
-php80_ver=8.0.11
-php81_ver=8.1.0RC4
+php73_ver=7.3.33
+php74_ver=7.4.26
+php80_ver=8.0.13
+php81_ver=8.1.0RC6
 
 # Nodejs
 node_ver=14.18.1
@@ -69,7 +69,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.1.0-10
+imagemagick_ver=7.1.0-14
 imagick_ver=3.5.1
 imagick_oldver=3.4.4
 graphicsmagick_ver=1.3.36
@@ -107,7 +107,7 @@ pecl_memcache_ver=4.0.5.2
 pecl_memcache_oldver=3.0.8
 
 # MongoDB
-pecl_mongodb_ver=1.10.0
+pecl_mongodb_ver=1.11.0
 pecl_mongodb_oldver=1.9.2
 pecl_mongo_ver=1.6.16
 

+ 12 - 0
vhost.sh

@@ -604,6 +604,9 @@ server {
   location ~ /(\.user\.ini|\.ht|\.git|\.svn|\.project|LICENSE|README\.md) {
     deny all;
   }
+  location /.well-known {
+    allow all;
+  }
   ${NGX_CONF}
 }
 EOF
@@ -700,6 +703,9 @@ server {
   location ~ /(\.user\.ini|\.ht|\.git|\.svn|\.project|LICENSE|README\.md) {
     deny all;
   }
+  location /.well-known {
+    allow all;
+  }
 }
 EOF
 
@@ -799,6 +805,9 @@ server {
   location ~ /(\.user\.ini|\.ht|\.git|\.svn|\.project|LICENSE|README\.md) {
     deny all;
   }
+  location /.well-known {
+    allow all;
+  }
 }
 EOF
 
@@ -964,6 +973,9 @@ server {
   location ~ /(\.user\.ini|\.ht|\.git|\.svn|\.project|LICENSE|README\.md) {
     deny all;
   }
+  location /.well-known {
+    allow all;
+  }
 }
 EOF