lj2007331@gmail.com 5 tahun lalu
induk
melakukan
52c1185aea

+ 1 - 1
backup_setup.sh

@@ -184,7 +184,7 @@ fi
 
 
 if [ -n "`echo ${desc_bk} | grep -w 3`" ]; then
 if [ -n "`echo ${desc_bk} | grep -w 3`" ]; then
   if [ ! -e "/usr/local/bin/ossutil" ]; then
   if [ ! -e "/usr/local/bin/ossutil" ]; then
-    wget -qc http://gosspublic.alicdn.com/ossutil/1.6.9/ossutil${OS_BIT} -O /usr/local/bin/ossutil
+    wget -qc http://gosspublic.alicdn.com/ossutil/1.6.10/ossutil${OS_BIT} -O /usr/local/bin/ossutil
     chmod +x /usr/local/bin/ossutil
     chmod +x /usr/local/bin/ossutil
   fi
   fi
   while :; do echo
   while :; do echo

+ 1 - 0
include/check_download.sh

@@ -674,6 +674,7 @@ checkDownload() {
       src_url=https://secure.php.net/distributions/php-${php74_ver}.tar.gz && Download_src
       src_url=https://secure.php.net/distributions/php-${php74_ver}.tar.gz && Download_src
       src_url=http://mirrors.linuxeye.com/oneinstack/src/argon2-${argon2_ver}.tar.gz && Download_src
       src_url=http://mirrors.linuxeye.com/oneinstack/src/argon2-${argon2_ver}.tar.gz && Download_src
       src_url=http://mirrors.linuxeye.com/oneinstack/src/libsodium-${libsodium_ver}.tar.gz && Download_src
       src_url=http://mirrors.linuxeye.com/oneinstack/src/libsodium-${libsodium_ver}.tar.gz && Download_src
+      src_url=http://mirrors.linuxeye.com/oneinstack/src/libzip-${libzip_ver}.tar.gz && Download_src
       ;;
       ;;
   esac
   esac
 
 

+ 6 - 6
include/ngx_lua_waf.sh

@@ -13,9 +13,9 @@ Nginx_lua_waf() {
   [ ! -e "${nginx_install_dir}/sbin/nginx" ] && echo "${CWARNING}Nginx is not installed on your system! ${CEND}" && exit 1
   [ ! -e "${nginx_install_dir}/sbin/nginx" ] && echo "${CWARNING}Nginx is not installed on your system! ${CEND}" && exit 1
   if [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ]; then
   if [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ]; then
     [ -e "/usr/local/lib/libluajit-5.1.so.2.0.5" ] && find /usr/local -name *luajit* | xargs rm -rf
     [ -e "/usr/local/lib/libluajit-5.1.so.2.0.5" ] && find /usr/local -name *luajit* | xargs rm -rf
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20190912.tar.gz && Download_src
-    tar xzf luajit2-2.1-20190912.tar.gz
-    pushd luajit2-2.1-20190912
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20200102.tar.gz && Download_src
+    tar xzf luajit2-2.1-20200102.tar.gz
+    pushd luajit2-2.1-20200102
     make && make install
     make && make install
     [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ] && { echo "${CFAILURE}LuaJIT install failed! ${CEND}"; kill -9 $$; }
     [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ] && { echo "${CFAILURE}LuaJIT install failed! ${CEND}"; kill -9 $$; }
     popd > /dev/null
     popd > /dev/null
@@ -74,9 +74,9 @@ Tengine_lua_waf() {
   [ ! -e "${tengine_install_dir}/sbin/nginx" ] && echo "${CWARNING}Tengine is not installed on your system! ${CEND}" && exit 1
   [ ! -e "${tengine_install_dir}/sbin/nginx" ] && echo "${CWARNING}Tengine is not installed on your system! ${CEND}" && exit 1
   if [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ]; then
   if [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ]; then
     [ -e "/usr/local/lib/libluajit-5.1.so.2.0.5" ] && find /usr/local -name *luajit* | xargs rm -rf
     [ -e "/usr/local/lib/libluajit-5.1.so.2.0.5" ] && find /usr/local -name *luajit* | xargs rm -rf
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20190912.tar.gz && Download_src
-    tar xzf luajit2-2.1-20190912.tar.gz
-    pushd luajit2-2.1-20190912
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20200102.tar.gz && Download_src
+    tar xzf luajit2-2.1-20200102.tar.gz
+    pushd luajit2-2.1-20200102
     make && make install
     make && make install
     [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ] && { echo "${CFAILURE}LuaJIT install failed! ${CEND}"; kill -9 $$; }
     [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ] && { echo "${CFAILURE}LuaJIT install failed! ${CEND}"; kill -9 $$; }
     popd > /dev/null
     popd > /dev/null

+ 1 - 1
include/pecl_yaf.sh

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

+ 1 - 1
include/percona-5.5.sh

@@ -18,7 +18,7 @@ Install_Percona55() {
 
 
   if [ "${dbinstallmethod}" == "1" ]; then
   if [ "${dbinstallmethod}" == "1" ]; then
     perconaVerStr1=$(echo ${percona55_ver} | sed "s@-@-rel@")
     perconaVerStr1=$(echo ${percona55_ver} | sed "s@-@-rel@")
-    tar xzf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
+    tar xzf ./Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
     mv Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
     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@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-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe

+ 1 - 1
include/percona-5.6.sh

@@ -18,7 +18,7 @@ Install_Percona56() {
 
 
   if [ "${dbinstallmethod}" == "1" ]; then
   if [ "${dbinstallmethod}" == "1" ]; then
     perconaVerStr1=$(echo ${percona56_ver} | sed "s@-@-rel@")
     perconaVerStr1=$(echo ${percona56_ver} | sed "s@-@-rel@")
-    tar xzf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
+    tar xzf ./Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
     mv Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
     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@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-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe

+ 1 - 1
include/percona-5.7.sh

@@ -17,7 +17,7 @@ Install_Percona57() {
   mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
   mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
 
 
   if [ "${dbinstallmethod}" == "1" ]; then
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar xzf Percona-Server-${percona57_ver}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
+    tar xzf ./Percona-Server-${percona57_ver}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
     mv Percona-Server-${percona57_ver}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
     mv Percona-Server-${percona57_ver}-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@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
     sed -i "s@/usr/local/Percona-Server-${percona57_ver}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe

+ 1 - 1
include/percona-8.0.sh

@@ -17,7 +17,7 @@ Install_Percona80() {
   mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
   mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
 
 
   if [ "${dbinstallmethod}" == "1" ]; then
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar xzf Percona-Server-${percona80_ver}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
+    tar xzf ./Percona-Server-${percona80_ver}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
     mv Percona-Server-${percona80_ver}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
     mv Percona-Server-${percona80_ver}-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@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-${percona80_ver}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/Percona-Server-${percona80_ver}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe

+ 11 - 2
include/php-7.4.sh

@@ -63,6 +63,15 @@ Install_PHP74() {
     rm -rf libsodium-${libsodium_ver}
     rm -rf libsodium-${libsodium_ver}
   fi
   fi
 
 
+  if [ ! -e "/usr/local/lib/libzip.la" ]; then
+    tar xzf libzip-${libzip_ver}.tar.gz
+    pushd libzip-${libzip_ver} > /dev/null
+    ./configure
+    make -j ${THREAD} && make install
+    popd > /dev/null
+    rm -rf libzip-${libzip_ver}
+  fi
+
   if [ ! -e "/usr/local/include/mhash.h" -a ! -e "/usr/include/mhash.h" ]; then
   if [ ! -e "/usr/local/include/mhash.h" -a ! -e "/usr/include/mhash.h" ]; then
     tar xzf mhash-${mhash_ver}.tar.gz
     tar xzf mhash-${mhash_ver}.tar.gz
     pushd mhash-${mhash_ver} > /dev/null
     pushd mhash-${mhash_ver} > /dev/null
@@ -103,7 +112,7 @@ Install_PHP74() {
     --enable-sysvsem --enable-inline-optimization --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-sysvsem --enable-inline-optimization --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
     --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
-    --with-gettext --with-zip --without-libzip --enable-soap --disable-debug ${php_modules_options}
+    --with-gettext --with-zip=/usr/local --enable-soap --disable-debug ${php_modules_options}
   else
   else
     ./configure --prefix=${php_install_dir} --with-config-file-path=${php_install_dir}/etc \
     ./configure --prefix=${php_install_dir} --with-config-file-path=${php_install_dir}/etc \
     --with-config-file-scan-dir=${php_install_dir}/etc/php.d \
     --with-config-file-scan-dir=${php_install_dir}/etc/php.d \
@@ -114,7 +123,7 @@ Install_PHP74() {
     --enable-sysvsem --enable-inline-optimization --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-sysvsem --enable-inline-optimization --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
     --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
-    --with-gettext --with-zip --without-libzip --enable-soap --disable-debug ${php_modules_options}
+    --with-gettext --with-zip=/usr/local --enable-soap --disable-debug ${php_modules_options}
   fi
   fi
   make ZEND_EXTRA_LIBS='-liconv' -j ${THREAD}
   make ZEND_EXTRA_LIBS='-liconv' -j ${THREAD}
   make install
   make install

+ 1 - 1
include/upgrade_db.sh

@@ -114,7 +114,7 @@ Upgrade_DB() {
       ${mariadb_install_dir}/bin/mysql_upgrade -uroot -p${dbrootpwd} >/dev/null 2>&1
       ${mariadb_install_dir}/bin/mysql_upgrade -uroot -p${dbrootpwd} >/dev/null 2>&1
       [ $? -eq 0 ] &&  echo "You have ${CMSG}successfully${CEND} upgrade from ${CMSG}${OLD_db_ver}${CEND} to ${CMSG}${NEW_db_ver}${CEND}"
       [ $? -eq 0 ] &&  echo "You have ${CMSG}successfully${CEND} upgrade from ${CMSG}${OLD_db_ver}${CEND} to ${CMSG}${NEW_db_ver}${CEND}"
     elif [ "${DB}" == 'Percona' ]; then
     elif [ "${DB}" == 'Percona' ]; then
-      tar xzf ${DB_filename}.tar.gz
+      tar xzf ./${DB_filename}.tar.gz
       service mysqld stop
       service mysqld stop
       mv ${percona_install_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
       mv ${percona_install_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
       mv ${percona_data_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
       mv ${percona_data_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}

+ 22 - 21
versions.txt

@@ -6,8 +6,8 @@ openresty_ver=1.15.8.2
 openssl11_ver=1.1.1d
 openssl11_ver=1.1.1d
 openssl_ver=1.0.2t
 openssl_ver=1.0.2t
 
 
-tomcat9_ver=9.0.30
-tomcat8_ver=8.5.50
+tomcat9_ver=9.0.31
+tomcat8_ver=8.5.51
 tomcat7_ver=7.0.99
 tomcat7_ver=7.0.99
 tomcat6_ver=6.0.53
 tomcat6_ver=6.0.53
 
 
@@ -24,19 +24,19 @@ mysql57_ver=5.7.29
 mysql56_ver=5.6.47
 mysql56_ver=5.6.47
 mysql55_ver=5.5.62
 mysql55_ver=5.5.62
 
 
-mariadb104_ver=10.4.11
-mariadb103_ver=10.3.21
-mariadb102_ver=10.2.30
-mariadb55_ver=5.5.66
+mariadb104_ver=10.4.12
+mariadb103_ver=10.3.22
+mariadb102_ver=10.2.31
+mariadb55_ver=5.5.67
 
 
 percona80_ver=8.0.18-9
 percona80_ver=8.0.18-9
-percona57_ver=5.7.28-31
-percona56_ver=5.6.46-86.2
+percona57_ver=5.7.29-32
+percona56_ver=5.6.47-87.0
 percona55_ver=5.5.62-38.14
 percona55_ver=5.5.62-38.14
 
 
 alisql_ver=5.6.32-9
 alisql_ver=5.6.32-9
 
 
-pgsql_ver=12.1
+pgsql_ver=12.2
 
 
 mongodb_ver=4.0.13
 mongodb_ver=4.0.13
 
 
@@ -53,22 +53,23 @@ php55_ver=5.5.38
 php56_ver=5.6.40
 php56_ver=5.6.40
 php70_ver=7.0.33
 php70_ver=7.0.33
 php71_ver=7.1.33
 php71_ver=7.1.33
-php72_ver=7.2.26
-php73_ver=7.3.13
-php74_ver=7.4.1
+php72_ver=7.2.27
+php73_ver=7.3.14
+php74_ver=7.4.2
 
 
 libiconv_ver=1.15
 libiconv_ver=1.15
-curl_ver=7.67.0
+curl_ver=7.68.0
 libmcrypt_ver=2.5.8
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
 mhash_ver=0.9.9.9
 freetype_ver=2.10.1
 freetype_ver=2.10.1
 icu4c_ver=63_1
 icu4c_ver=63_1
 libsodium_ver=1.0.18
 libsodium_ver=1.0.18
+libzip_ver=1.2.0
 argon2_ver=20171227
 argon2_ver=20171227
-imagemagick_ver=7.0.9-14
+imagemagick_ver=7.0.9-22
 imagick_ver=3.4.4
 imagick_ver=3.4.4
-graphicsmagick_ver=1.3.33
+graphicsmagick_ver=1.3.34
 gmagick_ver=2.0.5RC1
 gmagick_ver=2.0.5RC1
 gmagick_oldver=1.1.7RC3
 gmagick_oldver=1.1.7RC3
 zendopcache_ver=7.0.5
 zendopcache_ver=7.0.5
@@ -77,11 +78,11 @@ apcu_ver=5.1.18
 apcu_oldver=4.0.11
 apcu_oldver=4.0.11
 eaccelerator_ver=0.9.6.1
 eaccelerator_ver=0.9.6.1
 phalcon_ver=3.4.5
 phalcon_ver=3.4.5
-yaf_ver=3.0.8
-yar_ver=2.0.5
-swoole_ver=4.4.14
+yaf_ver=3.0.9
+yar_ver=2.0.7
+swoole_ver=4.4.15
 swoole_oldver=1.10.5
 swoole_oldver=1.10.5
-xdebug_ver=2.7.2
+xdebug_ver=2.9.2
 xdebug_oldver=2.5.5
 xdebug_oldver=2.5.5
 
 
 # Ftp
 # Ftp
@@ -93,7 +94,7 @@ pecl_redis_ver=5.1.0
 pecl_redis_oldver=4.3.0
 pecl_redis_oldver=4.3.0
 
 
 # Memcached
 # Memcached
-memcached_ver=1.5.20
+memcached_ver=1.5.22
 libmemcached_ver=1.0.18
 libmemcached_ver=1.0.18
 pecl_memcached_ver=3.1.5
 pecl_memcached_ver=3.1.5
 pecl_memcached_oldver=2.2.0
 pecl_memcached_oldver=2.2.0
@@ -101,7 +102,7 @@ pecl_memcache_ver=4.0.5.2
 pecl_memcache_oldver=3.0.8
 pecl_memcache_oldver=3.0.8
 
 
 # MongoDB
 # MongoDB
-pecl_mongodb_ver=1.6.1
+pecl_mongodb_ver=1.7.2
 pecl_mongo_ver=1.6.16
 pecl_mongo_ver=1.6.16
 
 
 # phpMyadmin
 # phpMyadmin