Update versions.txt and Fix upgrade_web.sh

include/check_sw.sh

@@ -100,7 +100,7 @@ installDepsUbuntu() {
   apt-get -y upgrade -o Dir::Etc::SourceList=/tmp/security.sources.list
 
   # Install needed packages
-  pkgList="gcc g++ make cmake autoconf libjpeg8 libjpeg8-dev libpng12-0 libpng12-dev libpng3 libfreetype6 libfreetype6-dev libxml2 libxml2-dev zlib1g zlib1g-dev libc6 libc6-dev libc-client2007e-dev libglib2.0-0 libglib2.0-dev bzip2 libzip-dev libbz2-1.0 libncurses5 libncurses5-dev libaio1 libaio-dev numactl libreadline-dev curl libcurl3 libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev re2c libsasl2-dev libxslt1-dev libicu-dev libsqlite3-dev patch vim zip unzip tmux htop bc dc expect libexpat1-dev iptables rsyslog rsync git lsof lrzsz ntpdate psmisc wget sysv-rc"
+  pkgList="gcc g++ make cmake autoconf libjpeg8 libjpeg8-dev libpng12-0 libpng12-dev libpng3 libfreetype6 libfreetype6-dev libxml2 libxml2-dev zlib1g zlib1g-dev libc6 libc6-dev libc-client2007e-dev libglib2.0-0 libglib2.0-dev bzip2 libzip-dev libbz2-1.0 libncurses5 libncurses5-dev libaio1 libaio-dev numactl libreadline-dev curl libcurl3 libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev re2c libsasl2-dev libxslt1-dev libicu-dev libsqlite3-dev patch vim zip unzip tmux htop bc dc expect libexpat1-dev iptables rsyslog rsync git lsof lrzsz ntpdate psmisc wget sysv-rc build-essential"
   for Package in ${pkgList}; do
     apt-get -y install ${Package} --force-yes
   done

include/upgrade_web.sh

@@ -42,8 +42,8 @@ Upgrade_Nginx() {
     echo "Press Ctrl+c to cancel or Press any key to continue..."
     char=`get_char`
     tar xzf nginx-${NEW_nginx_ver}.tar.gz
-    [ "${Fedora_ver}" == '28' ] && patch -d nginx-${nginx_ver} -p1 < 0001-unix-ngx_user-Apply-fix-for-really-old-bug-in-glibc-.patch
-    patch -d nginx-${nginx_ver} -p0 < nginx-auto-cc-gcc.patch
+    [ "${Fedora_ver}" == '28' ] && patch -d nginx-${NEW_nginx_ver} -p1 < 0001-unix-ngx_user-Apply-fix-for-really-old-bug-in-glibc-.patch
+    patch -d nginx-${NEW_nginx_ver} -p0 < nginx-auto-cc-gcc.patch
     pushd nginx-${NEW_nginx_ver}
     make clean
     sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' auto/cc/gcc # close debug
@@ -51,6 +51,8 @@ Upgrade_Nginx() {
     nginx_configure_args_tmp=`cat $$ | grep 'configure arguments:' | awk -F: '{print $2}'`
     rm -rf $$
     nginx_configure_args=`echo ${nginx_configure_args_tmp} | sed "s@--with-openssl=../openssl-...... @--with-openssl=../openssl-${openssl_ver} @" | sed "s@--with-pcre=../pcre-.... @--with-pcre=../pcre-${pcre_ver} @"`
+    export LUAJIT_LIB=/usr/local/lib
+    export LUAJIT_INC=/usr/local/include/luajit-2.1
     ./configure ${nginx_configure_args}
     make -j ${THREAD}
     if [ -f "objs/nginx" ]; then
@@ -111,6 +113,8 @@ Upgrade_Tengine() {
     tengine_configure_args_tmp=`cat $$ | grep 'configure arguments:' | awk -F: '{print $2}'`
     rm -rf $$
     tengine_configure_args=`echo ${tengine_configure_args_tmp} | sed "s@--with-openssl=../openssl-...... @--with-openssl=../openssl-${openssl_ver} @" | sed "s@--with-pcre=../pcre-.... @--with-pcre=../pcre-${pcre_ver} @"`
+    export LUAJIT_LIB=/usr/local/lib
+    export LUAJIT_INC=/usr/local/include/luajit-2.1
     ./configure ${tengine_configure_args}
     make -j ${THREAD}
     if [ -f "objs/nginx" ]; then

versions.txt

@@ -5,17 +5,17 @@ tengine_ver=2.2.2
 openresty_ver=1.13.6.2
 openssl_ver=1.0.2p
 
-tomcat9_ver=9.0.10
-tomcat8_ver=8.5.32
+tomcat9_ver=9.0.11
+tomcat8_ver=8.5.33
 tomcat7_ver=7.0.90
 tomcat6_ver=6.0.53
 
-apache24_ver=2.4.33
+apache24_ver=2.4.34
 apache22_ver=2.2.34
 pcre_ver=8.42
 apr_ver=1.6.3
 apr_util_ver=1.6.1
-nghttp2_ver=1.32.0
+nghttp2_ver=1.32.1
 
 # DB
 mysql80_ver=8.0.12
@@ -30,14 +30,14 @@ mariadb100_ver=10.0.36
 mariadb55_ver=5.5.61
 
 percona57_ver=5.7.22-22
-percona56_ver=5.6.40-84.0
+percona56_ver=5.6.41-84.1
 percona55_ver=5.5.60-38.12
 
 alisql_ver=5.6.32-9
 
 pgsql_ver=10.5
 
-mongodb_ver=4.0.1
+mongodb_ver=4.0.2
 
 # JDK
 jdk10_ver=10.0.2
@@ -61,7 +61,7 @@ mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
 libsodium_ver=1.0.16
 argon2_ver=20171227
-imagemagick_ver=6.9.10-10
+imagemagick_ver=6.9.10-11
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.28
 gmagick_for_php7_ver=2.0.5RC1
@@ -93,7 +93,7 @@ mongodb_pecl_ver=1.5.2
 mongo_pecl_ver=1.6.16
 
 # phpMyadmin
-phpmyadmin_ver=4.8.2
+phpmyadmin_ver=4.8.3
 phpmyadmin_oldver=4.4.15.10
 
 # jemalloc