Update versions.txt and delete gdrive

backup.sh

@@ -106,32 +106,6 @@ DB_S3_BK() {
   done
 }
 
-DB_GDRIVE_BK() {
-  # get the IP information
-  IPADDR=$(../include/get_ipaddr.py)
-  IPADDR=${IPADDR:-127.0.0.1}
-  Parent_root_id=$(/usr/local/bin/gdrive list --no-header -q "trashed = false and name = '${IPADDR}'" | awk '{print $1}' | head -1)
-  [ -z "${Parent_root_id}" ] && sleep 60 && Parent_root_id=$(/usr/local/bin/gdrive mkdir ${IPADDR} | awk '{print $2}')
-  sleep 60
-  Parent_sub_id=$(/usr/local/bin/gdrive list --no-header -q "'${Parent_root_id}' in parents and trashed = false and name = '`date +%F`'" | awk '{print $1}' | head -1)
-  [ -z "${Parent_sub_id}" ] && sleep 60 && Parent_sub_id=$(/usr/local/bin/gdrive mkdir -p ${Parent_root_id} `date +%F` | awk '{print $2}')
-  sleep 60
-  for D in `echo ${db_name} | tr ',' ' '`
-  do
-    ./db_bk.sh ${D}
-    DB_GREP="DB_${D}_`date +%Y%m%d`"
-    DB_FILE=`ls -lrt ${backup_dir} | grep ${DB_GREP} | tail -1 | awk '{print $NF}'`
-    /usr/local/bin/gdrive upload -p ${Parent_sub_id} ${backup_dir}/${DB_FILE}
-    sleep 120
-    if [ $? -eq 0 ]; then
-      Parent_expired_id=$(/usr/local/bin/gdrive list --no-header -q "'${Parent_root_id}' in parents and trashed = false and name = '`date +%F --date="${expired_days} days ago"`'" | awk '{print $1}' | head -1)
-      [ -n "${Parent_expired_id}" ] && sleep 60 && /usr/local/bin/gdrive delete -r ${Parent_expired_id} > /dev/null 2>&1
-      [ -z "`echo ${backup_destination} | grep -ow 'local'`" ] && rm -f ${backup_dir}/${DB_FILE}
-      sleep 60
-    fi
-  done
-}
-
 DB_DROPBOX_BK() {
   for D in `echo ${db_name} | tr ',' ' '`
   do
@@ -263,37 +237,6 @@ WEB_S3_BK() {
   done
 }
 
-WEB_GDRIVE_BK() {
-  # get the IP information
-  IPADDR=$(../include/get_ipaddr.py)
-  IPADDR=${IPADDR:-127.0.0.1}
-  Parent_root_id=$(/usr/local/bin/gdrive list --no-header -q "trashed = false and name = '${IPADDR}'" | awk '{print $1}' | head -1)
-  [ -z "${Parent_root_id}" ] && sleep 60 && Parent_root_id=$(/usr/local/bin/gdrive mkdir ${IPADDR} | awk '{print $2}')
-  sleep 60
-  Parent_sub_id=$(/usr/local/bin/gdrive list --no-header -q "'${Parent_root_id}' in parents and trashed = false and name = '`date +%F`'" | awk '{print $1}' | head -1)
-  [ -z "${Parent_sub_id}" ] && sleep 60 && Parent_sub_id=$(/usr/local/bin/gdrive mkdir -p ${Parent_root_id} `date +%F` | awk '{print $2}')
-  sleep 60
-  for W in `echo ${website_name} | tr ',' ' '`
-  do
-    [ ! -e "${wwwroot_dir}/${WebSite}" ] && { echo "[${wwwroot_dir}/${WebSite}] not exist"; break; }
-    [ ! -e "${backup_dir}" ] && mkdir -p ${backup_dir}
-    PUSH_FILE="${backup_dir}/Web_${W}_$(date +%Y%m%d_%H).tgz"
-    if [ ! -e "${PUSH_FILE}" ]; then
-      pushd ${wwwroot_dir} > /dev/null
-      tar czf ${PUSH_FILE} ./$W
-      popd > /dev/null
-    fi
-    /usr/local/bin/gdrive upload -p ${Parent_sub_id} ${PUSH_FILE}
-    sleep 120
-    if [ $? -eq 0 ]; then
-      Parent_expired_id=$(/usr/local/bin/gdrive list --no-header -q "'${Parent_root_id}' in parents and trashed = false and name = '`date +%F --date="${expired_days} days ago"`'" | awk '{print $1}' | head -1)
-      [ -n "${Parent_expired_id}" ] && sleep 60 && /usr/local/bin/gdrive delete -r ${Parent_expired_id} > /dev/null 2>&1
-      [ -z "`echo ${backup_destination} | grep -ow 'local'`" ] && rm -f ${PUSH_FILE}
-      sleep 60
-    fi
-  done
-}
-
 WEB_DROPBOX_BK() {
   for W in `echo ${website_name} | tr ',' ' '`
   do
@@ -345,10 +288,6 @@ do
     [ -n "`echo ${backup_content} | grep -ow db`" ] && DB_S3_BK
     [ -n "`echo ${backup_content} | grep -ow web`" ] && WEB_S3_BK
   fi
-  if [ "${DEST}" == 'gdrive' ]; then
-    [ -n "`echo ${backup_content} | grep -ow db`" ] && DB_GDRIVE_BK
-    [ -n "`echo ${backup_content} | grep -ow web`" ] && WEB_GDRIVE_BK
-  fi
   if [ "${DEST}" == 'dropbox' ]; then
     [ -n "`echo ${backup_content} | grep -ow db`" ] && DB_DROPBOX_BK
     [ -n "`echo ${backup_content} | grep -ow web`" ] && WEB_DROPBOX_BK

backup_setup.sh

@@ -39,12 +39,11 @@ while :; do echo
   echo -e "\t${CMSG}5${CEND}. UPYUN"
   echo -e "\t${CMSG}6${CEND}. QINIU"
   echo -e "\t${CMSG}7${CEND}. Amazon S3"
-  echo -e "\t${CMSG}8${CEND}. Google Drive"
-  echo -e "\t${CMSG}9${CEND}. Dropbox"
+  echo -e "\t${CMSG}8${CEND}. Dropbox"
   read -e -p "Please input numbers:(Default 1 press Enter) " desc_bk
   desc_bk=${desc_bk:-'1'}
   array_desc=(${desc_bk})
-  array_all=(1 2 3 4 5 6 7 8 9)
+  array_all=(1 2 3 4 5 6 7 8)
   for v in ${array_desc[@]}
   do
     [ -z "`echo ${array_all[@]} | grep -w ${v}`" ] && desc_flag=1
@@ -66,8 +65,7 @@ done
 [ -n "`echo ${desc_bk} | grep -w 5`" ] && sed -i 's@^backup_destination=.*@&,upyun@' ./options.conf
 [ -n "`echo ${desc_bk} | grep -w 6`" ] && sed -i 's@^backup_destination=.*@&,qiniu@' ./options.conf
 [ -n "`echo ${desc_bk} | grep -w 7`" ] && sed -i 's@^backup_destination=.*@&,s3@' ./options.conf
-[ -n "`echo ${desc_bk} | grep -w 8`" ] && sed -i 's@^backup_destination=.*@&,gdrive@' ./options.conf
-[ -n "`echo ${desc_bk} | grep -w 9`" ] && sed -i 's@^backup_destination=.*@&,dropbox@' ./options.conf
+[ -n "`echo ${desc_bk} | grep -w 8`" ] && sed -i 's@^backup_destination=.*@&,dropbox@' ./options.conf
 sed -i 's@^backup_destination=,@backup_destination=@' ./options.conf
 
 while :; do echo
@@ -519,22 +517,6 @@ if [ -n "`echo ${desc_bk} | grep -w 7`" ]; then
 fi
 
 if [ -n "`echo ${desc_bk} | grep -w 8`" ]; then
-  if [ ! -e "/usr/local/bin/gdrive" ]; then
-    if [ "${OS_BIT}" == '64' ]; then
-      wget -qc http://mirrors.linuxeye.com/oneinstack/src/gdrive-linux-x64 -O /usr/local/bin/gdrive
-    elif [ "${OS_BIT}" == '32' ]; then
-      wget -qc http://mirrors.linuxeye.com/oneinstack/src/gdrive-linux-386 -O /usr/local/bin/gdrive
-    fi
-    chmod +x /usr/local/bin/gdrive
-  fi
-  while :; do echo
-    if gdrive about; then
-      break
-    fi
-  done
-fi
-
-if [ -n "`echo ${desc_bk} | grep -w 9`" ]; then
   if [ ! -e "/usr/local/bin/dbxcli" ]; then
     if [ "${OS_BIT}" == '64' ]; then
       wget -qc http://mirrors.linuxeye.com/oneinstack/src/dbxcli-linux-amd64 -O /usr/local/bin/dbxcli

include/check_sw.sh

@@ -39,10 +39,10 @@ installDepsDebian() {
   # Install needed packages
   case "${Debian_ver}" in
     8)
-      pkgList="debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg8 libjpeg62-turbo-dev libjpeg-dev libpng12-0 libpng12-dev libpng3 libgd-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-gnutls libcurl4-gnutls-dev libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libxslt-dev libicu-dev locales libcloog-ppl0 patch vim zip unzip tmux htop bc dc expect libexpat1-dev libonig-dev libtirpc-dev nss rsync git lsof lrzsz iptables rsyslog cron logrotate ntpdate libsqlite3-dev psmisc wget sysv-rc ca-certificates"
+      pkgList="debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg8 libjpeg62-turbo-dev libjpeg-dev libpng12-0 libpng12-dev libpng3 libgd-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-gnutls libcurl4-gnutls-dev libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl net-tools libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libxslt-dev libicu-dev locales libcloog-ppl0 patch vim zip unzip tmux htop bc dc expect libexpat1-dev libonig-dev libtirpc-dev nss rsync git lsof lrzsz iptables rsyslog cron logrotate ntpdate libsqlite3-dev psmisc wget sysv-rc ca-certificates"
       ;;
     9|10)
-      pkgList="debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg62-turbo-dev libjpeg-dev libpng-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-gnutls libcurl4-gnutls-dev libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libicu-dev locales libcloog-ppl1 patch vim zip unzip tmux htop bc dc expect libexpat1-dev libonig-dev libtirpc-dev nss rsync git lsof lrzsz iptables rsyslog cron logrotate ntpdate libsqlite3-dev psmisc wget sysv-rc ca-certificates"
+      pkgList="debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg62-turbo-dev libjpeg-dev libpng-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-gnutls libcurl4-gnutls-dev libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl net-tools libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libicu-dev locales libcloog-ppl1 patch vim zip unzip tmux htop bc dc expect libexpat1-dev libonig-dev libtirpc-dev nss rsync git lsof lrzsz iptables rsyslog cron logrotate ntpdate libsqlite3-dev psmisc wget sysv-rc ca-certificates"
       ;;
     *)
       echo "${CFAILURE}Your system Debian ${Debian_ver} are not supported!${CEND}"
@@ -78,7 +78,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 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 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 ntpdate sqlite-devel sysstat patch bc expect expat-devel oniguruma oniguruma-devel libtirpc-devel nss rsync rsyslog git lsof lrzsz psmisc wget which libatomic tmux"
+  pkgList="deltarpm 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 ntpdate sqlite-devel sysstat patch bc expect expat-devel oniguruma oniguruma-devel libtirpc-devel nss rsync rsyslog git lsof lrzsz psmisc wget which libatomic tmux"
   for Package in ${pkgList}; do
     yum -y install ${Package}
   done
@@ -117,7 +117,7 @@ installDepsUbuntu() {
   apt-get -y upgrade -o Dir::Etc::SourceList=/tmp/security.sources.list
 
   # Install needed packages
-  pkgList="libperl-dev debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg8 libjpeg8-dev libpng-dev libpng12-0 libpng12-dev libpng3 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-gnutls libcurl4-gnutls-dev 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 libcloog-ppl1 bison patch vim zip unzip tmux htop bc dc expect libexpat1-dev iptables rsyslog libonig-dev libtirpc-dev nss rsync git lsof lrzsz ntpdate psmisc wget sysv-rc"
+  pkgList="libperl-dev debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg8 libjpeg8-dev libpng-dev libpng12-0 libpng12-dev libpng3 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-gnutls libcurl4-gnutls-dev libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl net-tools libssl-dev libtool libevent-dev re2c libsasl2-dev libxslt1-dev libicu-dev libsqlite3-dev libcloog-ppl1 bison patch vim zip unzip tmux htop bc dc expect libexpat1-dev iptables rsyslog libonig-dev libtirpc-dev nss rsync git lsof lrzsz ntpdate psmisc wget sysv-rc"
   export DEBIAN_FRONTEND=noninteractive
   for Package in ${pkgList}; do
     apt-get --no-install-recommends -y install ${Package}

include/pecl_phalcon.sh

@@ -13,23 +13,32 @@ Install_pecl_phalcon() {
     pushd ${oneinstack_dir}/src > /dev/null
     PHP_detail_ver=$(${php_install_dir}/bin/php-config --version)
     PHP_main_ver=${PHP_detail_ver%.*}
-    if [[ "${PHP_main_ver}" =~ ^5.[5-6]$|^7.[0-3]$ ]]; then
-      phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
-      src_url=http://mirrors.linuxeye.com/oneinstack/src/cphalcon-${phalcon_ver}.tar.gz && Download_src
-      tar xzf cphalcon-${phalcon_ver}.tar.gz
-      pushd cphalcon-${phalcon_ver}/build > /dev/null
+    phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
+    if [[ "${PHP_main_ver}" =~ ^7.[2-4]$ ]]; then
+      src_url=https://pecl.php.net/get/phalcon-${phalcon_ver}.tgz && Download_src
+      tar xzf phalcon-${phalcon_ver}.tgz
+      pushd phalcon-${phalcon_ver} > /dev/null
+      ${php_install_dir}/bin/phpize
+      echo "${CMSG}It may take a few minutes... ${CEND}"
+      ./configure --with-php-config=${php_install_dir}/bin/php-config
+      make -j ${THREAD} && make install
+      popd > /dev/null
+    elif [[ "${PHP_main_ver}" =~ ^5.[5-6]$|^7.[0-1]$ ]]; then
+      src_url=http://mirrors.linuxeye.com/oneinstack/src/cphalcon-${phalcon_oldver}.tar.gz && Download_src
+      tar xzf cphalcon-${phalcon_oldver}.tar.gz
+      pushd cphalcon-${phalcon_oldver}/build > /dev/null
       echo "${CMSG}It may take a few minutes... ${CEND}"
       ./install --phpize ${php_install_dir}/bin/phpize --php-config ${php_install_dir}/bin/php-config --arch ${OS_BIT}bits
       popd > /dev/null
-      if [ -f "${phpExtensionDir}/phalcon.so" ]; then
-        echo 'extension=phalcon.so' > ${php_install_dir}/etc/php.d/04-phalcon.ini
-        echo "${CSUCCESS}PHP phalcon module installed successfully! ${CEND}"
-        rm -rf cphalcon-${phalcon_ver}
-      else
-        echo "${CFAILURE}PHP phalcon module install failed, Please contact the author! ${CEND}" && lsb_release -a
-      fi
     else
-      echo "${CWARNING}Your php ${PHP_detail_ver} does not support phalcon! ${CEND}";
+      echo "${CWARNING}Your php ${PHP_detail_ver} does not support phalcon! ${CEND}"
+    fi
+    if [ -f "${phpExtensionDir}/phalcon.so" ]; then
+      echo 'extension=phalcon.so' > ${php_install_dir}/etc/php.d/04-phalcon.ini
+      echo "${CSUCCESS}PHP phalcon module installed successfully! ${CEND}"
+      rm -rf cphalcon-${phalcon_oldver} phalcon-${phalcon_ver}
+    else
+      echo "${CFAILURE}PHP phalcon module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

include/pecl_yaf.sh

@@ -15,8 +15,8 @@ Install_pecl_yaf() {
     PHP_main_ver=${PHP_detail_ver%.*}
     if [[ "${PHP_main_ver}" =~ ^7.[0-3]$ ]]; then
       phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
-      src_url=https://pecl.php.net/get/yaf-${yaf_ver}.tar.gz && Download_src
-      tar xzf yaf-${yaf_ver}.tar.gz
+      src_url=https://pecl.php.net/get/yaf-${yaf_ver}.tgz && Download_src
+      tar xzf yaf-${yaf_ver}.tgz
       pushd yaf-${yaf_ver} > /dev/null
       ${php_install_dir}/bin/phpize
       ./configure --with-php-config=${php_install_dir}/bin/php-config

versions.txt

@@ -8,7 +8,7 @@ openssl_ver=1.0.2t
 
 tomcat9_ver=9.0.31
 tomcat8_ver=8.5.51
-tomcat7_ver=7.0.99
+tomcat7_ver=7.0.100
 tomcat6_ver=6.0.53
 
 apache24_ver=2.4.41
@@ -53,9 +53,9 @@ php55_ver=5.5.38
 php56_ver=5.6.40
 php70_ver=7.0.33
 php71_ver=7.1.33
-php72_ver=7.2.27
-php73_ver=7.3.14
-php74_ver=7.4.2
+php72_ver=7.2.28
+php73_ver=7.3.15
+php74_ver=7.4.3
 
 libiconv_ver=1.15
 curl_ver=7.68.0
@@ -67,7 +67,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.0.9-22
+imagemagick_ver=7.0.9-27
 imagick_ver=3.4.4
 graphicsmagick_ver=1.3.34
 gmagick_ver=2.0.5RC1
@@ -77,10 +77,11 @@ xcache_ver=3.2.0
 apcu_ver=5.1.18
 apcu_oldver=4.0.11
 eaccelerator_ver=0.9.6.1
-phalcon_ver=3.4.5
+phalcon_ver=4.0.4
+phalcon_oldver=3.4.5
 yaf_ver=3.0.9
 yar_ver=2.0.7
-swoole_ver=4.4.15
+swoole_ver=4.4.16
 swoole_oldver=1.10.5
 xdebug_ver=2.9.2
 xdebug_oldver=2.5.5