Browse Source

feat: Update

lj2007331@gmail.com 2 years ago
parent
commit
ea3596a617
6 changed files with 36 additions and 34 deletions
  1. 5 7
      include/check_download.sh
  2. 1 1
      include/check_sw.sh
  3. 3 0
      include/memcached.sh
  4. 1 0
      include/upgrade_oneinstack.sh
  5. 1 1
      install.sh
  6. 25 25
      versions.txt

+ 5 - 7
include/check_download.sh

@@ -637,10 +637,6 @@ checkDownload() {
   if [ "${redis_flag}" == 'y' ]; then
     echo "Download redis-server..."
     src_url=http://download.redis.io/releases/redis-${redis_ver}.tar.gz && Download_src
-    if [ "${PM}" == 'yum' ]; then
-      echo "Download start-stop-daemon.c for RHEL..."
-      src_url=${mirrorLink}/start-stop-daemon.c && Download_src
-    fi
   fi
 
   # pecl_redis
@@ -677,11 +673,13 @@ checkDownload() {
   # memcached-server pecl_memcached pecl_memcache
   if [ "${pecl_memcache}" == '1' ]; then
     if [[ "${php_option}" =~ ^[1-4]$ ]]; then
-      echo "Download pecl_memcache for php..."
+      echo "Download pecl_memcache for php 5.x..."
+      src_url=https://pecl.php.net/get/memcache-3.0.8.tgz && Download_src
+    elif [[ "${php_option}" =~ ^[5-9]$ ]]; then
+      echo "Download pecl_memcache for php 7.x..."
       src_url=https://pecl.php.net/get/memcache-${pecl_memcache_oldver}.tgz && Download_src
     else
-      echo "Download pecl_memcache for php 7.x..."
-      # src_url=https://codeload.github.com/websupport-sk/pecl-memcache/zip/php7 && Download_src
+      echo "Download pecl_memcache for php 8.x..."
       src_url=https://pecl.php.net/get/memcache-${pecl_memcache_ver}.tgz && Download_src
     fi
   fi

+ 1 - 1
include/check_sw.sh

@@ -87,7 +87,7 @@ installDepsRHEL() {
 
   echo "${CMSG}Installing dependencies packages...${CEND}"
   # Install needed packages
-  pkgList="perl-FindBin deltarpm drpm 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 net-tools 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 chrony oniguruma-devel rpcgen sqlite-devel sysstat patch bc expect expat-devel perl-devel oniguruma oniguruma-devel libtirpc-devel nss libnsl rsync rsyslog git lsof lrzsz psmisc wget which libatomic tmux chkconfig firewalld"
+  pkgList="perl-FindBin deltarpm drpm 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 ncurses-compat-libs libaio numactl numactl-libs readline-devel curl curl-devel e2fsprogs e2fsprogs-devel krb5-devel libidn libidn-devel openssl openssl-devel net-tools 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 chrony oniguruma-devel rpcgen sqlite-devel sysstat patch bc expect expat-devel perl-devel oniguruma oniguruma-devel libtirpc-devel nss libnsl rsync rsyslog git lsof lrzsz psmisc wget which libatomic tmux chkconfig firewalld"
   for Package in ${pkgList}; do
     yum -y install ${Package}
   done

+ 3 - 0
include/memcached.sh

@@ -43,6 +43,9 @@ Install_pecl_memcache() {
     PHP_detail_ver=$(${php_install_dir}/bin/php-config --version)
     PHP_main_ver=${PHP_detail_ver%.*}
     if [ "$(${php_install_dir}/bin/php-config --version | awk -F. '{print $1}')" == '5' ]; then
+      tar xzf memcache-3.0.8.tgz
+      pushd memcache-3.0.8 > /dev/null
+    elif [ "$(${php_install_dir}/bin/php-config --version | awk -F. '{print $1}')" == '7' ]; then
       tar xzf memcache-${pecl_memcache_oldver}.tgz
       pushd memcache-${pecl_memcache_oldver} > /dev/null
     else

+ 1 - 0
include/upgrade_oneinstack.sh

@@ -53,6 +53,7 @@ Upgrade_OneinStack() {
       [ -e "/usr/local/php74/etc/php.ini" ] && sed -i 's@^cgi.fix_pathinfo=0@;&@' /usr/local/php74/etc/php.ini 2>/dev/null
       [ -e "/usr/local/php80/etc/php.ini" ] && sed -i 's@^cgi.fix_pathinfo=0@;&@' /usr/local/php80/etc/php.ini 2>/dev/null
       [ -e "/usr/local/php81/etc/php.ini" ] && sed -i 's@^cgi.fix_pathinfo=0@;&@' /usr/local/php81/etc/php.ini 2>/dev/null
+      [ -e "/usr/local/php82/etc/php.ini" ] && sed -i 's@^cgi.fix_pathinfo=0@;&@' /usr/local/php82/etc/php.ini 2>/dev/null
     fi
     [ -e "/lib/systemd/system/php-fpm.service" ] && { sed -i 's@^PrivateTmp.*@#&@g' /lib/systemd/system/php-fpm.service; systemctl daemon-reload; }
     echo

+ 1 - 1
install.sh

@@ -37,7 +37,7 @@ dbinstallmethod=1
 
 version() {
   echo "version: 2.6"
-  echo "updated date: 2022-11-22"
+  echo "updated date: 2023-02-04"
 }
 
 Show_Help() {

+ 25 - 25
versions.txt

@@ -6,20 +6,20 @@ openresty_ver=1.21.4.1
 openssl11_ver=1.1.1s
 openssl_ver=1.0.2u
 
-tomcat10_ver=10.0.27
-tomcat9_ver=9.0.70
-tomcat8_ver=8.5.84
+tomcat10_ver=10.1.6
+tomcat9_ver=9.0.72
+tomcat8_ver=8.5.86
 tomcat7_ver=7.0.109
 
-apache_ver=2.4.54
+apache_ver=2.4.55
 pcre_ver=8.45
 apr_ver=1.7.0
 apr_util_ver=1.6.1
 nghttp2_ver=1.42.0
 
 # DB
-mysql80_ver=8.0.31
-mysql57_ver=5.7.40
+mysql80_ver=8.0.32
+mysql57_ver=5.7.41
 mysql56_ver=5.6.51
 mysql55_ver=5.5.62
 
@@ -28,7 +28,7 @@ mariadb105_ver=10.5.18
 mariadb104_ver=10.4.27
 mariadb55_ver=5.5.68
 
-percona80_ver=8.0.30-22
+percona80_ver=8.0.31-23
 percona57_ver=5.7.40-43
 percona56_ver=5.6.51-91.0
 percona55_ver=5.5.62-38.14
@@ -46,16 +46,16 @@ php70_ver=7.0.33
 php71_ver=7.1.33
 php72_ver=7.2.34
 php73_ver=7.3.33
-php74_ver=7.4.32
-php80_ver=8.0.25
-php81_ver=8.1.12
-php82_ver=8.2.0
+php74_ver=7.4.33
+php80_ver=8.0.28
+php81_ver=8.1.16
+php82_ver=8.2.3
 
 # Nodejs
-nodejs_ver=18.12.1
+nodejs_ver=18.14.2
 
 libiconv_ver=1.16
-curl_ver=7.86.0
+curl_ver=7.88.1
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
@@ -64,7 +64,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.1.0-55
+imagemagick_ver=7.1.0-62
 imagick_ver=3.7.0
 imagick_oldver=3.4.4
 graphicsmagick_ver=1.3.36
@@ -88,30 +88,30 @@ xdebug_oldver=2.9.8
 pureftpd_ver=1.0.51
 
 # Redis
-redis_ver=7.0.6
+redis_ver=7.0.8
 redis_oldver=5.0.14
 pecl_redis_ver=5.3.7
 pecl_redis_oldver=4.3.0
 
 # Memcached
-memcached_ver=1.6.17
+memcached_ver=1.6.18
 libmemcached_ver=1.0.18
 pecl_memcached_ver=3.2.0
 pecl_memcached_oldver=2.2.0
-pecl_memcache_ver=4.0.5.2
-pecl_memcache_oldver=3.0.8
+pecl_memcache_ver=8.0
+pecl_memcache_oldver=4.0.5.2
 
 # MongoDB
-pecl_mongodb_ver=1.13.0
+pecl_mongodb_ver=1.15.0
 pecl_mongodb_oldver=1.9.2
 pecl_mongo_ver=1.6.16
 
 # phpMyadmin
-phpmyadmin_ver=5.2.0
+phpmyadmin_ver=5.2.1
 phpmyadmin_oldver=4.4.15.10
 
 # jemalloc
-jemalloc_ver=5.2.1
+jemalloc_ver=5.3.0
 
 # boost
 boost_ver=1.77.0
@@ -119,11 +119,11 @@ boost_percona_ver=1.73.0
 boost_oldver=1.59.0
 
 # Others
-lua_nginx_module_ver=0.10.22
-luajit2_ver=2.1-20220915
-lua_resty_core_ver=0.1.24
+lua_nginx_module_ver=0.10.23
+luajit2_ver=2.1-20230119
+lua_resty_core_ver=0.1.25
 lua_resty_lrucache_ver=0.13
-lua_cjson_ver=2.1.0.10
+lua_cjson_ver=2.1.0.12
 python_ver=3.6.15
 setuptools_ver=61.2.0
 pip_ver=22.0.4