Browse Source

[feat] Update versions.txt

lj2007331@gmail.com 5 years ago
parent
commit
13ea92be84
7 changed files with 24 additions and 28 deletions
  1. 2 1
      include/check_download.sh
  2. 1 1
      include/check_sw.sh
  3. 4 5
      include/memcached.sh
  4. 1 5
      include/mysql-8.0.sh
  5. 2 2
      include/php-7.4.sh
  6. 1 1
      include/redis.sh
  7. 13 13
      versions.txt

+ 2 - 1
include/check_download.sh

@@ -822,7 +822,8 @@ checkDownload() {
     else
       echo "Download pecl_memcache for php 7.x..."
       # src_url=https://codeload.github.com/websupport-sk/pecl-memcache/zip/php7 && Download_src
-      src_url=${mirrorLink}/pecl-memcache-${pecl_memcache_ver}.tar.gz && Download_src
+      src_url=https://pecl.php.net/get/memcache-${pecl_memcache_ver}.tgz && Download_src
+    else
     fi
   fi
 

+ 1 - 1
include/check_sw.sh

@@ -78,7 +78,7 @@ installDepsCentOS() {
 
   echo "${CMSG}Installing dependencies packages...${CEND}"
   # Install needed packages
-  pkgList="deltarpm gcc gcc-c++ make cmake autoconf libjpeg libjpeg-devel libjpeg-turbo libjpeg-turbo-devel libpng libpng-devel libxml2 libxml2-devel zlib zlib-devel glibc glibc-devel krb5-devel libc-client libc-client-devel glib2 glib2-devel bzip2 bzip2-devel ncurses ncurses-devel libaio numactl numactl-libs readline-devel curl curl-devel e2fsprogs e2fsprogs-devel krb5-devel libidn libidn-devel openssl openssl-devel libxslt-devel libicu-devel libevent-devel libtool libtool-ltdl bison gd-devel vim-enhanced pcre-devel libmcrypt libmcrypt-devel mhash mhash-devel mcrypt zip unzip ntpdate sqlite-devel sysstat patch bc expect expat-devel oniguruma oniguruma-devel libtirpc-devel nss rsync rsyslog git lsof lrzsz psmisc wget which libatomic tmux"
+  pkgList="deltarpm gcc gcc-c++ make cmake autoconf libjpeg libjpeg-devel libjpeg-turbo libjpeg-turbo-devel libpng libpng-devel libxml2 libxml2-devel zlib zlib-devel libzip libzip-devel glibc glibc-devel krb5-devel libc-client libc-client-devel glib2 glib2-devel bzip2 bzip2-devel ncurses ncurses-devel libaio numactl numactl-libs readline-devel curl curl-devel e2fsprogs e2fsprogs-devel krb5-devel libidn libidn-devel openssl openssl-devel libxslt-devel libicu-devel libevent-devel libtool libtool-ltdl bison gd-devel vim-enhanced pcre-devel libmcrypt libmcrypt-devel mhash mhash-devel mcrypt zip unzip ntpdate sqlite-devel sysstat patch bc expect expat-devel oniguruma oniguruma-devel libtirpc-devel nss rsync rsyslog git lsof lrzsz psmisc wget which libatomic tmux"
   for Package in ${pkgList}; do
     yum -y install ${Package}
   done

+ 4 - 5
include/memcached.sh

@@ -47,11 +47,10 @@ Install_pecl_memcache() {
     phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
     PHP_detail_ver=$(${php_install_dir}/bin/php-config --version)
     PHP_main_ver=${PHP_detail_ver%.*}
-    if [[ "${PHP_main_ver}" =~ ^7.[0-3]$ ]]; then
+    if [ "$(${php_install_dir}/bin/php-config --version | awk -F. '{print $1}')" == '7' ]; then
       #git clone https://github.com/websupport-sk/pecl-memcache.git
-      #cd pecl-memcache
-      tar xzf pecl-memcache-${pecl_memcache_ver}.tar.gz
-      pushd pecl-memcache-${pecl_memcache_ver} > /dev/null
+      tar xzf memcache-${pecl_memcache_ver}.tar.gz
+      pushd memcache-${pecl_memcache_ver} > /dev/null
     else
       tar xzf memcache-${pecl_memcache_oldver}.tgz
       pushd memcache-${pecl_memcache_oldver} > /dev/null
@@ -63,7 +62,7 @@ Install_pecl_memcache() {
     if [ -f "${phpExtensionDir}/memcache.so" ]; then
       echo "extension=memcache.so" > ${php_install_dir}/etc/php.d/05-memcache.ini
       echo "${CSUCCESS}PHP memcache module installed successfully! ${CEND}"
-      rm -rf pecl-memcache-${pecl_memcache_ver} memcache-${pecl_memcache_oldver}
+      rm -rf memcache-${pecl_memcache_ver} memcache-${pecl_memcache_oldver}
     else
       echo "${CFAILURE}PHP memcache module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi

+ 1 - 5
include/mysql-8.0.sh

@@ -32,16 +32,12 @@ Install_MySQL80() {
     -DFORCE_INSOURCE_BUILD=1 \
     -DSYSCONFDIR=/etc \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
-    -DWITH_PARTITION_STORAGE_ENGINE=1 \
     -DWITH_FEDERATED_STORAGE_ENGINE=1 \
     -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
     -DWITH_MYISAM_STORAGE_ENGINE=1 \
-    -DWITH_EMBEDDED_SERVER=1 \
-    -DENABLE_DTRACE=0 \
     -DENABLED_LOCAL_INFILE=1 \
     -DFORCE_INSOURCE_BUILD=1 \
-    -DDEFAULT_CHARSET=utf8mb4 \
-    -DEXTRA_CHARSETS=all
+    -DDEFAULT_CHARSET=utf8mb4
     make -j ${THREAD}
     make install
     popd

+ 2 - 2
include/php-7.4.sh

@@ -103,7 +103,7 @@ Install_PHP74() {
     --enable-sysvsem --enable-inline-optimization --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
-    --with-gettext --with-zip --enable-soap --disable-debug ${php_modules_options}
+    --with-gettext --with-zip --without-libzip --enable-soap --disable-debug ${php_modules_options}
   else
     ./configure --prefix=${php_install_dir} --with-config-file-path=${php_install_dir}/etc \
     --with-config-file-scan-dir=${php_install_dir}/etc/php.d \
@@ -114,7 +114,7 @@ Install_PHP74() {
     --enable-sysvsem --enable-inline-optimization --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
-    --with-gettext --with-zip --enable-soap --disable-debug ${php_modules_options}
+    --with-gettext --with-zip --without-libzip --enable-soap --disable-debug ${php_modules_options}
   fi
   make ZEND_EXTRA_LIBS='-liconv' -j ${THREAD}
   make install

+ 1 - 1
include/redis.sh

@@ -61,7 +61,7 @@ Install_pecl_redis() {
   if [ -e "${php_install_dir}/bin/phpize" ]; then
     pushd ${oneinstack_dir}/src > /dev/null
     phpExtensionDir=`${php_install_dir}/bin/php-config --extension-dir`
-    if [ "`${php_install_dir}/bin/php-config --version | awk -F. '{print $1}'`" == '7' ]; then
+    if [ "$(${php_install_dir}/bin/php-config --version | awk -F. '{print $1}')" == '7' ]; then
       tar xzf redis-${pecl_redis_ver}.tgz
       pushd redis-${pecl_redis_ver} > /dev/null
     else

+ 13 - 13
versions.txt

@@ -19,9 +19,9 @@ apr_util_ver=1.6.1
 nghttp2_ver=1.40.0
 
 # DB
-mysql80_ver=8.0.18
-mysql57_ver=5.7.28
-mysql56_ver=5.6.46
+mysql80_ver=8.0.19
+mysql57_ver=5.7.29
+mysql56_ver=5.6.47
 mysql55_ver=5.5.62
 
 mariadb104_ver=10.4.11
@@ -41,8 +41,8 @@ pgsql_ver=12.1
 mongodb_ver=4.0.13
 
 # JDK
-jdk110_ver=11.0.5
-jdk18_ver=1.8.0_231
+jdk110_ver=11.0.6
+jdk18_ver=1.8.0_241
 jdk17_ver=1.7.0_80
 jdk16_ver=1.6.0_45
 
@@ -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-13
+imagemagick_ver=7.0.9-14
 imagick_ver=3.4.4
 graphicsmagick_ver=1.3.33
 gmagick_ver=2.0.5RC1
@@ -95,17 +95,17 @@ pecl_redis_oldver=4.3.0
 # Memcached
 memcached_ver=1.5.20
 libmemcached_ver=1.0.18
-pecl_memcached_ver=3.1.4
+pecl_memcached_ver=3.1.5
 pecl_memcached_oldver=2.2.0
-pecl_memcache_ver=4.0.4
+pecl_memcache_ver=4.0.5.2
 pecl_memcache_oldver=3.0.8
 
 # MongoDB
-pecl_mongodb_ver=1.6.0
+pecl_mongodb_ver=1.6.1
 pecl_mongo_ver=1.6.16
 
 # phpMyadmin
-phpmyadmin_ver=4.9.3
+phpmyadmin_ver=4.9.4
 phpmyadmin_oldver=4.4.15.10
 
 # jemalloc
@@ -119,7 +119,7 @@ boost_oldver=1.59.0
 # Others
 htop_ver=2.2.0
 bison_ver=2.7.1
-python_ver=3.6.9
-setuptools_ver=41.5.1
+python_ver=3.6.10
+setuptools_ver=45.0.0
 pip_ver=19.3.1
-fail2ban_ver=0.10.4
+fail2ban_ver=0.11.1