Update nginx(openssl ver)

include/jdk-10.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-# Author:  yeho <lj2007331 AT gmail.com>
-# BLOG:  https://blog.linuxeye.cn
-#
-# Notes: OneinStack for CentOS/RedHat 6+ Debian 7+ and Ubuntu 12+
-#
-# Project home page:
-#       https://oneinstack.com
-#       https://github.com/lj2007331/oneinstack
-
-Install-JDK10() {
-  pushd ${oneinstack_dir}/src > /dev/null
-  JDK_FILE="jdk-${jdk10_ver}_linux-${SYS_BIT_j}_bin.tar.gz"
-  JAVA_dir=/usr/java
-  JDK_NAME="jdk-${jdk10_ver}"
-  JDK_PATH=${JAVA_dir}/${JDK_NAME}
-  [ "${PM}" == 'yum' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`
-  [ ! -e ${JAVA_dir} ] && mkdir -p ${JAVA_dir}
-  tar xzf ${JDK_FILE} -C ${JAVA_dir}
-  if [ -d "${JDK_PATH}" ]; then
-    [ -z "`grep ^'export JAVA_HOME=' /etc/profile`" ] && { [ -z "`grep ^'export PATH=' /etc/profile`" ] && echo  "export JAVA_HOME=${JDK_PATH}" >> /etc/profile || sed -i "s@^export PATH=@export JAVA_HOME=${JDK_PATH}\nexport PATH=@" /etc/profile; } || sed -i "s@^export JAVA_HOME=.*@export JAVA_HOME=${JDK_PATH}@" /etc/profile
-    [ -z "`grep ^'export CLASSPATH=' /etc/profile`" ] && sed -i "s@export JAVA_HOME=\(.*\)@export JAVA_HOME=\1\nexport CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib@" /etc/profile
-    [ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
-    [ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
-    . /etc/profile
-    echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
-  else
-    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}"
-    kill -9 $$
-  fi
-  popd
-}

include/nginx.sh

@@ -15,7 +15,7 @@ Install_Nginx() {
 
   tar xzf pcre-${pcre_ver}.tar.gz
   tar xzf nginx-${nginx_ver}.tar.gz
-  tar xzf openssl-${openssl_ver}.tar.gz
+  tar xzf openssl-${openssl11_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
   pushd nginx-${nginx_ver}
@@ -28,12 +28,12 @@ Install_Nginx() {
   sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' auto/cc/gcc
 
   [ ! -d "${nginx_install_dir}" ] && mkdir -p ${nginx_install_dir}
-  ./configure --prefix=${nginx_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=${nginx_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 "${nginx_install_dir}/conf/nginx.conf" ]; then
     popd
     rm -rf pcre-${pcre_ver}
-    rm -rf openssl-${openssl_ver}
+    rm -rf openssl-${openssl11_ver}
     rm -rf nginx-${nginx_ver}
     echo "${CSUCCESS}Nginx installed successfully! ${CEND}"
   else

include/upgrade_web.sh

@@ -23,9 +23,9 @@ Upgrade_Nginx() {
     if [ "${NEW_nginx_ver}" != "${OLD_nginx_ver}" ]; then
       [ ! -e "nginx-${NEW_nginx_ver}.tar.gz" ] && wget --no-check-certificate -c http://nginx.org/download/nginx-${NEW_nginx_ver}.tar.gz > /dev/null 2>&1
       if [ -e "nginx-${NEW_nginx_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}nginx-${NEW_nginx_ver}.tar.gz${CEND}] successfully! "
         break
@@ -50,7 +50,7 @@ Upgrade_Nginx() {
     ${nginx_install_dir}/sbin/nginx -V &> $$
     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} @"`
+    nginx_configure_args=`echo ${nginx_configure_args_tmp} | sed "s@--with-openssl=../openssl-...... @--with-openssl=../openssl-${openssl11_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}

install.sh

@@ -664,8 +664,8 @@ IPADDR_COUNTRY=$(./include/get_ipaddr_state.py $PUBLIC_IPADDR)
 # Check download source packages
 . ./include/check_download.sh
 downloadDepsSrc=1
-[ "${PM}" == 'yum' ] && yum -y -q install wget
-[ "${PM}" == 'apt' ] && apt-get -y -q install wget
+[ "${PM}" == 'yum' ] && yum -y -q install wget gcc
+[ "${PM}" == 'apt' ] && apt-get -y -q install wget gcc
 checkDownload 2>&1 | tee -a ${oneinstack_dir}/install.log
 
 # del openssl for jcloud

versions.txt

@@ -1,12 +1,13 @@
 # newest software version
 # Web
-nginx_ver=1.14.0
+nginx_ver=1.14.1
 tengine_ver=2.2.2
 openresty_ver=1.13.6.2
+openssl11_ver=1.1.1
 openssl_ver=1.0.2p
 
-tomcat9_ver=9.0.12
-tomcat8_ver=8.5.34
+tomcat9_ver=9.0.13
+tomcat8_ver=8.5.35
 tomcat7_ver=7.0.91
 tomcat6_ver=6.0.53
 
@@ -25,9 +26,9 @@ mysql55_ver=5.5.62
 
 mariadb103_ver=10.3.10
 mariadb102_ver=10.2.18
-mariadb101_ver=10.1.36
-mariadb100_ver=10.0.36
-mariadb55_ver=5.5.61
+mariadb101_ver=10.1.37
+mariadb100_ver=10.0.37
+mariadb55_ver=5.5.62
 
 percona57_ver=5.7.23-23
 percona56_ver=5.6.41-84.1
@@ -35,9 +36,9 @@ percona55_ver=5.5.61-38.13
 
 alisql_ver=5.6.32-9
 
-pgsql_ver=11.0
+pgsql_ver=11.1
 
-mongodb_ver=4.0.3
+mongodb_ver=4.0.4
 
 # JDK
 jdk110_ver=11.0.1
@@ -46,8 +47,8 @@ jdk17_ver=1.7.0_80
 jdk16_ver=1.6.0_45
 
 # PHP
-php72_ver=7.2.11
-php71_ver=7.1.23
+php72_ver=7.2.12
+php71_ver=7.1.24
 php70_ver=7.0.32
 php56_ver=5.6.38
 php55_ver=5.5.38
@@ -61,7 +62,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-12
+imagemagick_ver=6.9.10-14
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.30
 gmagick_for_php7_ver=2.0.5RC1
@@ -71,7 +72,7 @@ xcache_ver=3.2.0
 apcu_ver=4.0.11
 apcu_for_php7_ver=5.1.12
 eaccelerator_ver=0.9.6.1
-swoole_ver=4.2.5
+swoole_ver=4.2.6
 xdebug_ver=2.6.1
 
 # Ftp
@@ -82,7 +83,7 @@ redis_ver=5.0.0
 redis_pecl_ver=4.1.1
 
 # Memcached
-memcached_ver=1.5.11
+memcached_ver=1.5.12
 libmemcached_ver=1.0.18
 memcached_pecl_ver=2.2.0
 memcached_pecl_php7_ver=3.0.4