Fix SS

include/alisql-5.6.sh

@@ -20,24 +20,24 @@ Install_AliSQL56() {
   tar xvf alisql-${alisql56_version}.tar.gz
   pushd alisql-${alisql56_version}
   cmake . -DCMAKE_INSTALL_PREFIX=${alisql_install_dir} \
-  -DMYSQL_DATADIR=${alisql_data_dir} \
-  -DSYSCONFDIR=/etc \
+  -DCMAKE_BUILD_TYPE="Release" \
+  -DWITH_EMBEDDED_SERVER=0 \
+  -DWITH_EXTRA_CHARSETS=all \
+  -DWITH_MYISAM_STORAGE_ENGINE=1 \
   -DWITH_INNOBASE_STORAGE_ENGINE=1 \
   -DWITH_PARTITION_STORAGE_ENGINE=1 \
-  -DWITH_FEDERATED_STORAGE_ENGINE=1 \
+  -DWITH_CSV_STORAGE_ENGINE=1 \
+  -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
   -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
-  -DWITH_MYISAM_STORAGE_ENGINE=1 \
-  -DWITH_EMBEDDED_SERVER=1 \
-  -DENABLE_DTRACE=0 \
-  -DENABLED_LOCAL_INFILE=1 \
-  -DDEFAULT_CHARSET=utf8mb4 \
-  -DDEFAULT_COLLATION=utf8mb4_general_ci \
-  -DEXTRA_CHARSETS=all
+  -DWITH_FEDERATED_STORAGE_ENGINE=1 \
+  -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
+  -DWITH_TOKUDB_STORAGE_ENGINE=1
   make -j ${THREAD}
   make install
   popd
 
   if [ -d "${alisql_install_dir}/support-files" ]; then
+    echo never > /sys/kernel/mm/transparent_hugepage/enabled
     echo "${CSUCCESS}AliSQL installed successfully! ${CEND}"
     rm -rf alisql-${alisql56_version}
   else
@@ -46,8 +46,8 @@ Install_AliSQL56() {
     echo "${CFAILURE}AliSQL install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi
-
   /bin/cp ${alisql_install_dir}/support-files/mysql.server /etc/init.d/mysqld
+  [ -z "`grep transparent_hugepage /etc/init.d/mysqld`" ] && sed -i "s@^basedir=.*@echo never > /sys/kernel/mm/transparent_hugepage/enabled\n&@" /etc/init.d/mysqld 
   sed -i "s@^basedir=.*@basedir=${alisql_install_dir}@" /etc/init.d/mysqld
   sed -i "s@^datadir=.*@datadir=${alisql_data_dir}@" /etc/init.d/mysqld
   chmod +x /etc/init.d/mysqld

include/check_download.sh

@@ -110,7 +110,7 @@ checkDownload() {
             if [ "$(../include/check_port.py mirrors.tuna.tsinghua.edu.cn 443)" == "True" ]; then
               DOWN_ADDR_MYSQL=https://mirrors.tuna.tsinghua.edu.cn/mysql/downloads/MySQL-5.7
             else
-              DOWN_ADDR_MYSQL=http://mirrors.sohu.com/mysql/MySQL-5.7
+              DOWN_ADDR_MYSQL=http://mirrors.ustc.edu.cn/mysql-ftp/Downloads/MySQL-5.7
               DOWN_ADDR_MYSQL_BK=${DOWN_ADDR_MYSQL}
             fi
           else
@@ -157,7 +157,7 @@ checkDownload() {
             if [ "$(../include/check_port.py mirrors.tuna.tsinghua.edu.cn 443)" == "True" ]; then
               DOWN_ADDR_MYSQL=https://mirrors.tuna.tsinghua.edu.cn/mysql/downloads/MySQL-5.6
             else
-              DOWN_ADDR_MYSQL=http://mirrors.sohu.com/mysql/MySQL-5.6
+              DOWN_ADDR_MYSQL=http://mirrors.ustc.edu.cn/mysql-ftp/Downloads/MySQL-5.6
               DOWN_ADDR_MYSQL_BK=${DOWN_ADDR_MYSQL}
             fi
           else
@@ -202,7 +202,7 @@ checkDownload() {
             if [ "$(../include/check_port.py mirrors.tuna.tsinghua.edu.cn 443)" == "True" ]; then
               DOWN_ADDR_MYSQL=https://mirrors.tuna.tsinghua.edu.cn/mysql/downloads/MySQL-5.5
             else
-              DOWN_ADDR_MYSQL=http://mirrors.sohu.com/mysql/MySQL-5.5
+              DOWN_ADDR_MYSQL=http://mirrors.ustc.edu.cn/mysql-ftp/Downloads/MySQL-5.5
               DOWN_ADDR_MYSQL_BK=${DOWN_ADDR_MYSQL}
             fi
           else

include/percona-5.5.sh

@@ -22,7 +22,7 @@ Install_Percona55() {
     tar xvf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
     mv Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
     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-${percona56_version}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe 
+    sed -i "s@/usr/local/Percona-Server-${percona55_version}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe 
   elif [ "${dbInstallMethods}" == "2" ]; then
     tar xvf percona-server-${percona55_version}.tar.gz
     pushd percona-server-${percona55_version}

init.d/Redis-server-init

@@ -45,13 +45,25 @@ case "$1" in
     fi
     rm -f $PIDFILE
     ;;
+  status)
+    if [ ! -r $PIDFILE ] ; then
+      echo "redis-server is stopped"
+      exit 0
+    fi
 
+    PID=`cat $PIDFILE`
+    if ps -p $PID | grep -q $PID; then
+      echo "redis-server (pid $PID) is running..."
+    else
+      echo "redis-server dead but pid file exists"
+    fi
+    ;;
   restart|force-reload)
     ${0} stop
     ${0} start
     ;;
   *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|status|force-reload}" >&2
     exit 1
     ;;
 esac

install.sh

@@ -488,7 +488,7 @@ checkDownload 2>&1 | tee -a ${oneinstack_dir}/install.log
 installDepsBySrc 2>&1 | tee -a ${oneinstack_dir}/install.log
 
 # Jemalloc
-if [[ $Nginx_version =~ ^[1-3]$ ]] || [ "$DB_yn" == 'y' -a "$DB_version" != '10' ]; then
+if [[ $Nginx_version =~ ^[1-3]$ ]] || [ "$DB_yn" == 'y' ]; then
   . include/jemalloc.sh
   Install_Jemalloc | tee -a $oneinstack_dir/install.log
 fi

ss.sh

@@ -107,7 +107,7 @@ Def_parameter() {
     done
     AddUser_SS
     Iptables_set
-    pkgList="wget unzip openssl-devel gcc swig autoconf libtool libevent automake make curl curl-devel zlib-devel perl perl-devel cpio expat-devel gettext-devel git asciidoc xmlto pcre-devel"
+    pkgList="wget unzip openssl-devel gcc swig autoconf libtool libevent automake make curl curl-devel zlib-devel perl perl-devel cpio expat-devel gettext-devel git asciidoc xmlto pcre-devel mbedtls-devel udns-devel libev-devel"
     for Package in ${pkgList}; do
       yum -y install ${Package}
     done
@@ -116,7 +116,7 @@ Def_parameter() {
     AddUser_SS
     Iptables_set
     apt-get -y update
-    pkgList="curl wget unzip gcc swig automake make perl cpio git"
+    pkgList="curl wget unzip gcc swig automake make perl cpio git libmbedtls-dev libudns-dev libev-dev"
     for Package in ${pkgList}; do
       apt-get -y install $Package
     done
@@ -143,8 +143,15 @@ Install_SS-python() {
 }
 
 Install_SS-libev() {
-  git clone https://github.com/shadowsocks/shadowsocks-libev.git
-  pushd shadowsocks-libev
+  src_url=http://mirrors.linuxeye.com/oneinstack/src/shadowsocks-libev-3.0.4.tar.gz && Download_src
+  src_url=http://mirrors.linuxeye.com/oneinstack/src/libsodium-1.0.12.tar.gz && Download_src
+  tar xzf shadowsocks-libev-3.0.4.tar.gz
+  tar xzf libsodium-1.0.12.tar.gz
+  pushd libsodium-1.0.12
+  ./configure
+  make -j ${THREAD} && make install
+  popd
+  pushd shadowsocks-libev-3.0.4
   ./configure
   make -j ${THREAD} && make install
   popd
@@ -187,7 +194,7 @@ Uninstall_SS() {
         echo "${CFAILURE}SS-libev uninstall failed! ${CEND}"
       fi
     elif [ "${SS_version}" == '2' ]; then
-      pip uninstall -y shadowsocks
+      ${python_install_dir}/bin/pip uninstall -y shadowsocks
       if [ $? -eq 0 ]; then
         echo "${CSUCCESS}SS-python uninstall successful! ${CEND}"
       else

versions.txt

@@ -5,9 +5,9 @@ tengine_version=2.1.2
 openresty_version=1.11.2.2
 openssl_version=1.0.2k
 
-tomcat8_version=8.0.41
-tomcat7_version=7.0.75
-tomcat6_version=6.0.48
+tomcat8_version=8.0.42
+tomcat7_version=7.0.76
+tomcat6_version=6.0.51
 
 apache24_version=2.4.25
 apache22_version=2.2.32
@@ -21,7 +21,7 @@ mysql57_version=5.7.17
 mysql56_version=5.6.35
 mysql55_version=5.5.54
 
-mariadb101_version=10.1.21
+mariadb101_version=10.1.22
 mariadb100_version=10.0.30
 mariadb55_version=5.5.54
 
@@ -37,8 +37,8 @@ jdk17_version=1.7.0_80
 jdk16_version=1.6.0_45
 
 # PHP
-php71_version=7.1.2
-php70_version=7.0.16
+php71_version=7.1.3
+php70_version=7.0.17
 php56_version=5.6.30
 php55_version=5.5.38
 php54_version=5.4.45
@@ -48,14 +48,14 @@ zendopcache_version=7.0.5
 xcache_version=3.2.0
 apcu_version=4.0.11
 apcu_for_php7_version=5.1.8
-ImageMagick_version=6.9.7-10
+ImageMagick_version=6.9.8-0
 imagick_version=3.4.3
 imagick_for_php53_version=3.3.0
 GraphicsMagick_version=1.3.25
 gmagick_for_php7_version=2.0.4RC1
 gmagick_version=1.1.7RC3
 libiconv_version=1.14
-curl_version=7.52.1
+curl_version=7.53.1
 libmcrypt_version=2.5.8
 mcrypt_version=2.6.8
 mhash_version=0.9.9.9