Update version and del tmux source

include/check_download.sh

@@ -835,10 +835,6 @@ checkDownload() {
   # others
   if [ "${downloadDepsSrc}" == '1' ]; then
     if [ "${PM}" == 'yum' ]; then
-      echo "Download tmux for CentOS..."
-      src_url=${mirrorLink}/libevent-${libevent_ver}.tar.gz && Download_src
-      src_url=${mirrorLink}/tmux-${tmux_ver}.tar.gz && Download_src
-
       echo "Download htop for CentOS..."
       src_url=http://hisham.hm/htop/releases/${htop_ver}/htop-${htop_ver}.tar.gz && Download_src
     fi

include/check_sw.sh

@@ -77,7 +77,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 freetype freetype-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 zip unzip ntpdate sqlite-devel sysstat patch bc expect expat-devel rsync rsyslog git lsof lrzsz psmisc wget which libatomic"
+  pkgList="deltarpm gcc gcc-c++ make cmake autoconf libjpeg libjpeg-devel libjpeg-turbo libjpeg-turbo-devel libpng libpng-devel freetype freetype-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 zip unzip ntpdate sqlite-devel sysstat patch bc expect expat-devel rsync rsyslog git lsof lrzsz psmisc wget which libatomic tmux"
   for Package in ${pkgList}; do
     yum -y install ${Package}
   done
@@ -154,31 +154,6 @@ installDepsBySrc() {
       rm -rf bison-${bison_ver}
     fi
   elif [ "${OS}" == 'CentOS' ]; then
-    # Install tmux
-    if ! command -v tmux >/dev/null 2>&1; then
-      # Install libevent first
-      tar xzf libevent-${libevent_ver}.tar.gz
-      pushd libevent-${libevent_ver} > /dev/null
-      ./configure
-      make -j ${THREAD} && make install
-      popd > /dev/null
-      rm -rf libevent-${libevent_ver}
-
-      tar xzf tmux-${tmux_ver}.tar.gz
-      pushd tmux-${tmux_ver} > /dev/null
-      CFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib" ./configure
-      make -j ${THREAD} && make install
-      unset LDFLAGS
-      popd > /dev/null
-      rm -rf tmux-${tmux_ver}
-
-      if [ "${OS_BIT}" == "64" ]; then
-        ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib64/libevent-2.0.so.5
-      else
-        ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib/libevent-2.0.so.5
-      fi
-    fi
-
     # install htop
     if ! command -v htop >/dev/null 2>&1; then
       tar xzf htop-${htop_ver}.tar.gz

include/memcached.sh

@@ -17,8 +17,7 @@ Install_memcached_server() {
   tar xzf memcached-${memcached_ver}.tar.gz
   pushd memcached-${memcached_ver} > /dev/null
   [ ! -d "${memcached_install_dir}" ] && mkdir -p ${memcached_install_dir}
-  [ "${PM}" == 'yum' ] && libevent_arg='--with-libevent=/usr/local'
-  ./configure --prefix=${memcached_install_dir} ${libevent_arg}
+  ./configure --prefix=${memcached_install_dir}
   make -j ${THREAD} && make install
   popd > /dev/null
   if [ -f "${memcached_install_dir}/bin/memcached" ]; then

include/ngx_lua_waf.sh

@@ -13,9 +13,9 @@ Nginx_lua_waf() {
   [ ! -e "${nginx_install_dir}/sbin/nginx" ] && echo "${CWARNING}Nginx is not installed on your system! ${CEND}" && exit 1
   if [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ]; then
     [ -e "/usr/local/lib/libluajit-5.1.so.2.0.5" ] && find /usr/local -name *luajit* | xargs rm -rf
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20190329.tar.gz && Download_src
-    tar xzf luajit2-2.1-20190329.tar.gz
-    pushd luajit2-2.1-20190329
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20190507.tar.gz && Download_src
+    tar xzf luajit2-2.1-20190507.tar.gz
+    pushd luajit2-2.1-20190507
     make && make install
     [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ] && { echo "${CFAILURE}LuaJIT install failed! ${CEND}"; kill -9 $$; }
     popd > /dev/null
@@ -74,9 +74,9 @@ Tengine_lua_waf() {
   [ ! -e "${tengine_install_dir}/sbin/nginx" ] && echo "${CWARNING}Tengine is not installed on your system! ${CEND}" && exit 1
   if [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ]; then
     [ -e "/usr/local/lib/libluajit-5.1.so.2.0.5" ] && find /usr/local -name *luajit* | xargs rm -rf
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20190329.tar.gz && Download_src
-    tar xzf luajit2-2.1-20190329.tar.gz
-    pushd luajit2-2.1-20190329
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20190507.tar.gz && Download_src
+    tar xzf luajit2-2.1-20190507.tar.gz
+    pushd luajit2-2.1-20190507
     make && make install
     [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ] && { echo "${CFAILURE}LuaJIT install failed! ${CEND}"; kill -9 $$; }
     popd > /dev/null

include/openresty.sh

@@ -15,20 +15,18 @@ Install_OpenResty() {
 
   tar xzf pcre-${pcre_ver}.tar.gz
   tar xzf openresty-${openresty_ver}.tar.gz
-  tar xzf openssl-${openssl_ver}.tar.gz
-  [ "${Fedora_ver}" == '28' ] && patch -d openresty-${openresty_ver}/bundle/nginx-${openresty_ver%.*} -p1 < 0001-unix-ngx_user-Apply-fix-for-really-old-bug-in-glibc-.patch
-  patch -d openresty-${openresty_ver}/bundle/nginx-${openresty_ver%.*} -p0 < nginx-auto-cc-gcc.patch
+  tar xzf openssl-${openssl11_ver}.tar.gz
   pushd openresty-${openresty_ver} > /dev/null
 
   # close debug
   sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' bundle/nginx-${openresty_ver%.*}/auto/cc/gcc # close debug
 
   [ ! -d "${openresty_install_dir}" ] && mkdir -p ${openresty_install_dir}
-  ./configure --prefix=${openresty_install_dir} --user=${run_user} --group=${run_user} --with-http_stub_status_module --with-http_v2_module --with-http_ssl_module --with-http_gzip_static_module --with-http_realip_module --with-http_flv_module --with-http_mp4_module --with-openssl=../openssl-${openssl_ver} --with-pcre=../pcre-${pcre_ver} --with-pcre-jit --with-ld-opt='-ljemalloc' ${nginx_modules_options}
+  ./configure --prefix=${openresty_install_dir} --user=${run_user} --group=${run_user} --with-http_stub_status_module --with-http_v2_module --with-http_ssl_module --with-http_gzip_static_module --with-http_realip_module --with-http_flv_module --with-http_mp4_module --with-openssl=../openssl-${openssl11_ver} --with-pcre=../pcre-${pcre_ver} --with-pcre-jit --with-ld-opt='-ljemalloc' ${nginx_modules_options}
   make -j ${THREAD} && make install
   if [ -e "${openresty_install_dir}/nginx/conf/nginx.conf" ]; then
     popd > /dev/null
-    rm -rf pcre-${pcre_ver} openssl-${openssl_ver} openresty-${openresty_ver}
+    rm -rf pcre-${pcre_ver} openssl-${openssl11_ver} openresty-${openresty_ver}
     echo "${CSUCCESS}OpenResty installed successfully! ${CEND}"
   else
     rm -rf ${openresty_install_dir}

include/upgrade_memcached.sh

@@ -42,8 +42,7 @@ Upgrade_Memcached() {
     tar xzf memcached-${NEW_memcached_ver}.tar.gz
     pushd memcached-${NEW_memcached_ver}
     make clean
-    [ "${PM}" == 'yum' ] && libevent_arg='--with-libevent=/usr/local'
-    ./configure --prefix=${memcached_install_dir} ${libevent_arg}
+    ./configure --prefix=${memcached_install_dir}
     make -j ${THREAD}
 
     if [ -e "memcached" ]; then

include/upgrade_web.sh

@@ -151,9 +151,9 @@ Upgrade_OpenResty() {
     if [ "${NEW_openresy_ver}" != "${OLD_openresy_ver}" ]; then
       [ ! -e "openresty-${NEW_openresy_ver}.tar.gz" ] && wget --no-check-certificate -c https://openresty.org/download/openresty-${NEW_openresy_ver}.tar.gz > /dev/null 2>&1
       if [ -e "openresty-${NEW_openresy_ver}.tar.gz" ]; then
-        src_url=https://www.openssl.org/source/openssl-${openssl_ver}.tar.gz && Download_src
+        src_url=https://www.openssl.org/source/openssl-${openssl11_ver}.tar.gz && Download_src
         src_url=http://mirrors.linuxeye.com/oneinstack/src/pcre-${pcre_ver}.tar.gz && Download_src
-        tar xzf openssl-${openssl_ver}.tar.gz
+        tar xzf openssl-${openssl11_ver}.tar.gz
         tar xzf pcre-${pcre_ver}.tar.gz
         echo "Download [${CMSG}openresty-${NEW_openresy_ver}.tar.gz${CEND}] successfully! "
         break
@@ -173,13 +173,11 @@ Upgrade_OpenResty() {
       char=`get_char`
     fi
     tar xzf openresty-${NEW_openresy_ver}.tar.gz
-    [ "${Fedora_ver}" == '28' ] && patch -d openresty-${openresty_ver}/bundle/nginx-${NEW_openresy_ver%.*} -p1 < 0001-unix-ngx_user-Apply-fix-for-really-old-bug-in-glibc-.patch
-    patch -d openresty-${openresty_ver}/bundle/nginx-${NEW_openresy_ver%.*} -p0 < nginx-auto-cc-gcc.patch
     pushd openresty-${NEW_openresy_ver}
     make clean
     sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' bundle/nginx-${NEW_openresy_ver%.*}/auto/cc/gcc # close debug
     ${openresty_install_dir}/nginx/sbin/nginx -V &> $$
-    ./configure --prefix=${openresty_install_dir} --user=${run_user} --group=${run_user} --with-http_stub_status_module --with-http_v2_module --with-http_ssl_module --with-http_gzip_static_module --with-http_realip_module --with-http_flv_module --with-http_mp4_module --with-openssl=../openssl-${openssl_ver} --with-pcre=../pcre-${pcre_ver} --with-pcre-jit --with-ld-opt='-ljemalloc' ${nginx_modules_options}
+    ./configure --prefix=${openresty_install_dir} --user=${run_user} --group=${run_user} --with-http_stub_status_module --with-http_v2_module --with-http_ssl_module --with-http_gzip_static_module --with-http_realip_module --with-http_flv_module --with-http_mp4_module --with-openssl=../openssl-${openssl11_ver} --with-pcre=../pcre-${pcre_ver} --with-pcre-jit --with-ld-opt='-ljemalloc' ${nginx_modules_options}
     make -j ${THREAD}
     if [ -f "build/nginx-${openresty_ver_tmp}/objs/nginx" ]; then
       /bin/mv ${openresty_install_dir}/nginx/sbin/nginx{,`date +%m%d`}

install.sh

@@ -804,7 +804,7 @@ fi
 # Database
 case "${db_option}" in
   1)
-    [ "${OS}" == 'CentOS' -a "${CentOS_ver}" != '7' ] && dbinstallmethod=1
+    [ "${OS}" == 'CentOS' -a "${CentOS_ver}" != '7' ] && dbinstallmethod=1 && checkDownload
     . include/mysql-8.0.sh
     Install_MySQL80 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;

src/0001-unix-ngx_user-Apply-fix-for-really-old-bug-in-glibc-.patch

@@ -1,30 +0,0 @@
-From f446736d4f4c5f7ae81bb8bf84fda7ce3c9d49a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
-Date: Wed, 24 Jan 2018 12:37:48 +0100
-Subject: [PATCH] unix/ngx_user: Apply fix for really old bug in glibc libcrypt
- if needed
-
----
- src/os/unix/ngx_user.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c
-index 7ebe2b57..d0fe9238 100644
---- a/src/os/unix/ngx_user.c
-+++ b/src/os/unix/ngx_user.c
-@@ -21,8 +21,10 @@ ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
-     struct crypt_data   cd;
- 
-     cd.initialized = 0;
--#ifdef __GLIBC__
--    /* work around the glibc bug */
-+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
-+    (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
-+    /* work around glibc-2.2.5 bug,
-+     * has been fixed at some time in glibc-2.3.X */
-     cd.current_salt[0] = ~salt[0];
- #endif
- 
--- 
-2.16.1
-

src/nginx-auto-cc-gcc.patch

@@ -1,13 +0,0 @@
---- auto/cc/gcc.orig	2007-03-22 08:34:53.000000000 -0600
-+++ auto/cc/gcc	2007-03-22 08:58:47.000000000 -0600
-@@ -172,7 +172,9 @@
- 
- 
- # stop on warning
--CFLAGS="$CFLAGS -Werror"
-+# This combined with Fedora's FORTIFY_SOURCE=2 option causes it nginx
-+# to not compile.
-+#CFLAGS="$CFLAGS -Werror"
- 
- # debug
- CFLAGS="$CFLAGS -g"

versions.txt

@@ -2,19 +2,19 @@
 # Web
 nginx_ver=1.16.0
 tengine_ver=2.3.0
-openresty_ver=1.13.6.2
+openresty_ver=1.15.8.1
 openssl11_ver=1.1.1b
 openssl_ver=1.0.2r
 
-tomcat9_ver=9.0.19
-tomcat8_ver=8.5.40
+tomcat9_ver=9.0.20
+tomcat8_ver=8.5.41
 tomcat7_ver=7.0.94
 tomcat6_ver=6.0.53
 
 apache24_ver=2.4.39
 apache22_ver=2.2.34
-pcre_ver=8.42
-apr_ver=1.6.5
+pcre_ver=8.43
+apr_ver=1.7.0
 apr_util_ver=1.6.1
 nghttp2_ver=1.38.0
 
@@ -24,19 +24,19 @@ mysql57_ver=5.7.26
 mysql56_ver=5.6.44
 mysql55_ver=5.5.62
 
-mariadb103_ver=10.3.14
-mariadb102_ver=10.2.23
-mariadb101_ver=10.1.38
-mariadb55_ver=5.5.63
+mariadb103_ver=10.3.15
+mariadb102_ver=10.2.24
+mariadb101_ver=10.1.40
+mariadb55_ver=5.5.64
 
-percona80_ver=8.0.15-5
+percona80_ver=8.0.15-6
 percona57_ver=5.7.25-28
 percona56_ver=5.6.43-84.3
 percona55_ver=5.5.62-38.14
 
 alisql_ver=5.6.32-9
 
-pgsql_ver=11.2
+pgsql_ver=11.3
 
 mongodb_ver=4.0.9
 
@@ -63,7 +63,7 @@ mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
 libsodium_ver=1.0.17
 argon2_ver=20171227
-imagemagick_ver=6.9.10-42
+imagemagick_ver=6.9.10-45
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.31
 gmagick_ver=2.0.5RC1
@@ -85,7 +85,7 @@ xdebug_oldver=2.5.5
 pureftpd_ver=1.0.49
 
 # Redis
-redis_ver=5.0.4
+redis_ver=5.0.5
 pecl_redis_ver=4.3.0
 
 # Memcached
@@ -104,15 +104,13 @@ phpmyadmin_ver=4.8.5
 phpmyadmin_oldver=4.4.15.10
 
 # jemalloc
-jemalloc_ver=5.1.0
+jemalloc_ver=5.2.0
 
 # boost
 boost_ver=1.68.0
 boost_oldver=1.59.0
 
 # Others
-libevent_ver=2.0.22-stable
-tmux_ver=2.8
 htop_ver=2.2.0
 bison_ver=2.7.1
 python_ver=3.6.8