change boost

include/boost.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-# Author:  Alpha Eva <kaneawk AT gmail.com>
-#
-# Notes: OneinStack for CentOS/RadHat 6+ Debian 6+ and Ubuntu 12+
-#
-# Project home page:
-#       https://oneinstack.com
-#       https://github.com/lj2007331/oneinstack
-
-installBoost() {
-  pushd ${oneinstack_dir}/src > /dev/null
-  if [ ! -e "/usr/local/lib/libboost_system.so" ]; then
-    boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1}')_$(echo ${boost_ver} | awk -F. '{print $2}')_$(echo ${boost_ver} | awk -F. '{print $3}')
-    tar xzf boost_${boostVersion2}.tar.gz
-    pushd boost_${boostVersion2}
-    ./bootstrap.sh
-    ./bjam --prefix=/usr/local
-    ./b2 install
-    popd
-  fi
-  if [ -e "/usr/local/lib/libboost_system.so" ]; then
-    [ -z "`grep /usr/local/lib /etc/ld.so.conf.d/*.conf`" ] && echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
-    ldconfig
-    echo "${CSUCCESS}Boost installed successfully! ${CEND}"
-    rm -rf boost_${boostVersion2}
-  else
-    echo "${CFAILURE}Boost installed failed, Please contact the author! ${CEND}"
-  fi
-  popd
-}
-
-installBoostold() {
-  boost_ver=${boost_oldver}
-  installBoost
-}

include/check_download.sh

@@ -108,7 +108,7 @@ checkDownload() {
       [[ "${db_option}" =~ ^[2,5,6,9]$ ]] && boost_ver=${boost_oldver} 
       echo "Download boost..."
       [ "${IPADDR_COUNTRY}"x == "CN"x ] && DOWN_ADDR_BOOST=${mirrorLink} || DOWN_ADDR_BOOST=http://downloads.sourceforge.net/project/boost/boost/${boost_ver}
-      boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1}')_$(echo ${boost_ver} | awk -F. '{print $2}')_$(echo ${boost_ver} | awk -F. '{print $3}')
+      boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1"_"$2"_"$3}')
       src_url=${DOWN_ADDR_BOOST}/boost_${boostVersion2}.tar.gz && Download_src
     fi
 

include/mariadb-10.1.sh

@@ -22,10 +22,14 @@ Install_MariaDB101() {
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
+    boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
+    tar xzf boost_${boostVersion2}.tar.gz
     tar xzf mariadb-${mariadb101_ver}.tar.gz
     pushd mariadb-${mariadb101_ver}
     cmake . -DCMAKE_INSTALL_PREFIX=${mariadb_install_dir} \
     -DMYSQL_DATADIR=${mariadb_data_dir} \
+    -DDOWNLOAD_BOOST=1 \
+    -DWITH_BOOST=../boost_${boostVersion2} \
     -DSYSCONFDIR=/etc \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
@@ -50,7 +54,7 @@ Install_MariaDB101() {
     if [ "${dbinstallmethod}" == "1" ]; then
       rm -rf mariadb-${mariadb101_ver}-*-${SYS_BIT_b}
     elif [ "${dbinstallmethod}" == "2" ]; then
-      rm -rf mariadb-${mariadb101_ver}
+      rm -rf mariadb-${mariadb101_ver} boost_${boostVersion2}
     fi
   else
     rm -rf ${mariadb_install_dir}

include/mariadb-10.2.sh

@@ -22,10 +22,14 @@ Install_MariaDB102() {
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
+    boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
+    tar xzf boost_${boostVersion2}.tar.gz
     tar xzf mariadb-${mariadb102_ver}.tar.gz
     pushd mariadb-${mariadb102_ver}
     cmake . -DCMAKE_INSTALL_PREFIX=${mariadb_install_dir} \
     -DMYSQL_DATADIR=${mariadb_data_dir} \
+    -DDOWNLOAD_BOOST=1 \
+    -DWITH_BOOST=../boost_${boostVersion2} \
     -DSYSCONFDIR=/etc \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
@@ -50,7 +54,7 @@ Install_MariaDB102() {
     if [ "${dbinstallmethod}" == "1" ]; then
       rm -rf mariadb-${mariadb102_ver}-*-${SYS_BIT_b}
     elif [ "${dbinstallmethod}" == "2" ]; then
-      rm -rf mariadb-${mariadb102_ver}
+      rm -rf mariadb-${mariadb102_ver} boost_${boostVersion2}
     fi
   else
     rm -rf ${mariadb_install_dir}

include/mariadb-10.3.sh

@@ -22,10 +22,14 @@ Install_MariaDB103() {
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
+    boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
+    tar xzf boost_${boostVersion2}.tar.gz
     tar xzf mariadb-${mariadb103_ver}.tar.gz
     pushd mariadb-${mariadb103_ver}
     cmake . -DCMAKE_INSTALL_PREFIX=${mariadb_install_dir} \
     -DMYSQL_DATADIR=${mariadb_data_dir} \
+    -DDOWNLOAD_BOOST=1 \
+    -DWITH_BOOST=../boost_${boostVersion2} \
     -DSYSCONFDIR=/etc \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
@@ -50,7 +54,7 @@ Install_MariaDB103() {
     if [ "${dbinstallmethod}" == "1" ]; then
       rm -rf mariadb-${mariadb103_ver}-*-${SYS_BIT_b}
     elif [ "${dbinstallmethod}" == "2" ]; then
-      rm -rf mariadb-${mariadb103_ver}
+      rm -rf mariadb-${mariadb103_ver} boost_${boostVersion2}
     fi
   else
     rm -rf ${mariadb_install_dir}

include/mysql-5.7.sh

@@ -22,10 +22,14 @@ Install_MySQL57() {
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mysql_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mysql_install_dir}@g" ${mysql_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
+    boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
+    tar xzf boost_${boostVersion2}.tar.gz
     tar xzf mysql-${mysql57_ver}.tar.gz
     pushd mysql-${mysql57_ver}
     cmake . -DCMAKE_INSTALL_PREFIX=${mysql_install_dir} \
     -DMYSQL_DATADIR=${mysql_data_dir} \
+    -DDOWNLOAD_BOOST=1 \
+    -DWITH_BOOST=../boost_${boostVersion2} \
     -DSYSCONFDIR=/etc \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
@@ -50,7 +54,7 @@ Install_MySQL57() {
     if [ "${dbinstallmethod}" == "1" ]; then
       rm -rf mysql-${mysql57_ver}-*-${SYS_BIT_b}
     elif [ "${dbinstallmethod}" == "2" ]; then
-      rm -rf mysql-${mysql57_ver}
+      rm -rf mysql-${mysql57_ver} boost_${boostVersion2}
     fi
   else
     rm -rf ${mysql_install_dir}

include/mysql-8.0.sh

@@ -21,10 +21,14 @@ Install_MySQL80() {
     mv mysql-${mysql80_ver}-linux-glibc2.12-${SYS_BIT_b}/* ${mysql_install_dir}
     sed -i "s@/usr/local/mysql@${mysql_install_dir}@g" ${mysql_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
+    boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1"_"$2"_"$3}')
+    tar xzf boost_${boostVersion2}.tar.gz
     tar xzf mysql-${mysql80_ver}.tar.gz
     pushd mysql-${mysql80_ver}
     cmake . -DCMAKE_INSTALL_PREFIX=${mysql_install_dir} \
     -DMYSQL_DATADIR=${mysql_data_dir} \
+    -DDOWNLOAD_BOOST=1 \
+    -DWITH_BOOST=../boost_${boostVersion2} \
     -DSYSCONFDIR=/etc \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
@@ -48,7 +52,7 @@ Install_MySQL80() {
     if [ "${dbinstallmethod}" == "1" ]; then
       rm -rf mysql-${mysql80_ver}-*-${SYS_BIT_b}
     elif [ "${dbinstallmethod}" == "2" ]; then
-      rm -rf mysql-${mysql80_ver}
+      rm -rf mysql-${mysql80_ver} boost_${boostVersion2}
     fi
   else
     rm -rf ${mysql_install_dir}

include/percona-5.7.sh

@@ -22,10 +22,14 @@ Install_Percona57() {
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/Percona-Server-${percona57_ver}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
+    boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
+    tar xzf boost_${boostVersion2}.tar.gz
     tar xzf percona-server-${percona57_ver}.tar.gz
     pushd percona-server-${percona57_ver}
     cmake . -DCMAKE_INSTALL_PREFIX=${percona_install_dir} \
     -DMYSQL_DATADIR=${percona_data_dir} \
+    -DDOWNLOAD_BOOST=1 \
+    -DWITH_BOOST=../boost_${boostVersion2} \
     -DSYSCONFDIR=/etc \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \

install.sh

@@ -716,18 +716,10 @@ fi
 case "${db_option}" in
   1)
     [ "${OS}" == 'CentOS' -a "${CentOS_ver}" != '7' ] && dbinstallmethod=1
-    if [ "${dbinstallmethod}" == "2" ]; then
-      . include/boost.sh
-      installBoost 2>&1 | tee -a ${oneinstack_dir}/install.log
-    fi
     . include/mysql-8.0.sh
     Install_MySQL80 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   2)
-    if [ "${dbinstallmethod}" == "2" ]; then
-      . include/boost.sh
-      installBoostold 2>&1 | tee -a ${oneinstack_dir}/install.log
-    fi
     . include/mysql-5.7.sh
     Install_MySQL57 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
@@ -740,26 +732,14 @@ case "${db_option}" in
     Install_MySQL55 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   5)
-    if [ "${dbinstallmethod}" == "2" ]; then
-      . include/boost.sh
-      installBoostold 2>&1 | tee -a ${oneinstack_dir}/install.log
-    fi
     . include/mariadb-10.3.sh
     Install_MariaDB103 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   6)
-    if [ "${dbinstallmethod}" == "2" ]; then
-      . include/boost.sh
-      installBoostold 2>&1 | tee -a ${oneinstack_dir}/install.log
-    fi
     . include/mariadb-10.2.sh
     Install_MariaDB102 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   7)
-    if [ "${dbinstallmethod}" == "2" ]; then
-      . include/boost.sh
-      installBoostold 2>&1 | tee -a ${oneinstack_dir}/install.log
-    fi
     . include/mariadb-10.1.sh
     Install_MariaDB101 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
@@ -772,10 +752,6 @@ case "${db_option}" in
     Install_MariaDB55 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   10)
-    if [ "${dbinstallmethod}" == "2" ]; then
-      . include/boost.sh
-      installBoostold 2>&1 | tee -a ${oneinstack_dir}/install.log
-    fi
     . include/percona-5.7.sh
     Install_Percona57 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;

uninstall.sh

@@ -115,7 +115,7 @@ Uninstall_MySQL() {
   # uninstall mysql,mariadb,percona,alisql
   if [ -d "${db_install_dir}/support-files" ]; then
     service mysqld stop > /dev/null 2>&1
-    rm -rf ${db_install_dir} /etc/init.d/mysqld /etc/my.cnf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf /usr/local/lib/libboost* /usr/local/include/boost
+    rm -rf ${db_install_dir} /etc/init.d/mysqld /etc/my.cnf /etc/ld.so.conf.d/{mysql,mariadb,percona,alisql}*.conf
     id -u mysql >/dev/null 2>&1 ; [ $? -eq 0 ] && userdel mysql
     [ -e "${db_data_dir}" ] && /bin/mv ${db_data_dir}{,$(date +%Y%m%d%H)}
     sed -i 's@^dbrootpwd=.*@dbrootpwd=@' ./options.conf

versions.txt

@@ -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.9-49
+imagemagick_ver=6.9.9-50
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.28
 gmagick_for_php7_ver=2.0.5RC1
@@ -71,7 +71,7 @@ xcache_ver=3.2.0
 apcu_ver=4.0.11
 apcu_for_php7_ver=5.1.11
 eaccelerator_ver=0.9.6.1
-swoole_ver=2.1.3
+swoole_ver=2.2.0
 xdebug_ver=2.6.0
 
 # Ftp
@@ -89,7 +89,7 @@ memcached_pecl_php7_ver=3.0.4
 memcache_pecl_ver=3.0.8
 
 # MongoDB
-mongodb_pecl_ver=1.4.3
+mongodb_pecl_ver=1.4.4
 mongo_pecl_ver=1.6.16
 
 # phpMyadmin