Add php-7.3 --without-libzip

include/check_download.sh

@@ -661,7 +661,6 @@ checkDownload() {
         src_url=http://www.php.net/distributions/php-${php73_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=https://libzip.org/download/libzip-${libzip_ver}.tar.gz && Download_src
         ;;
     esac
   fi

include/check_sw.sh

@@ -51,7 +51,7 @@ installDepsCentOS() {
   # Uninstall the conflicting packages
   echo "${CMSG}Removing the conflicting packages...${CEND}"
   if [ "${CentOS_ver}" == '7' ]; then
-    yum -y groupremove "Basic Web Server" "MySQL Database server" "MySQL Database client" "File and Print Server"
+    yum -y groupremove "Basic Web Server" "MySQL Database server" "MySQL Database client"
     systemctl mask firewalld.service
     if [ "${iptables_yn}" == 'y' ]; then
       yum -y install iptables-services
@@ -60,7 +60,7 @@ installDepsCentOS() {
   elif [ "${CentOS_ver}" == '6' ]; then
     yum -y groupremove "FTP Server" "PostgreSQL Database client" "PostgreSQL Database server" "MySQL Database server" "MySQL Database client" "Web Server"
   elif [ "${CentOS_ver}" == '5' ]; then
-    yum -y groupremove "FTP Server" "PostgreSQL Database" "News Server" "MySQL Database" "Web Server"
+    yum -y groupremove "FTP Server" "PostgreSQL Database" "MySQL Database" "Web Server"
   fi
 
   echo "${CMSG}Installing dependencies packages...${CEND}"
@@ -120,29 +120,29 @@ installDepsBySrc() {
     if [[ "${Ubuntu_ver}" =~ ^14$|^15$ ]]; then
       # Install bison on ubt 14.x 15.x
       tar xzf bison-${bison_ver}.tar.gz
-      pushd bison-${bison_ver}
+      pushd bison-${bison_ver} > /dev/null
       ./configure
       make -j ${THREAD} && make install
-      popd
+      popd > /dev/null
       rm -rf bison-${bison_ver}
     fi
   elif [ "${OS}" == 'CentOS' ]; then
     # Install tmux
-    if [ ! -e "$(which tmux)" ]; then
+    if ! command -v tmux >/dev/null 2>&1; then
       # Install libevent first
       tar xzf libevent-${libevent_ver}.tar.gz
-      pushd libevent-${libevent_ver}
+      pushd libevent-${libevent_ver} > /dev/null
       ./configure
       make -j ${THREAD} && make install
-      popd
+      popd > /dev/null
       rm -rf libevent-${libevent_ver}
 
       tar xzf tmux-${tmux_ver}.tar.gz
-      pushd tmux-${tmux_ver}
+      pushd tmux-${tmux_ver} > /dev/null
       CFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib" ./configure
       make -j ${THREAD} && make install
       unset LDFLAGS
-      popd
+      popd > /dev/null
       rm -rf tmux-${tmux_ver}
 
       if [ "${OS_BIT}" == "64" ]; then
@@ -153,17 +153,17 @@ installDepsBySrc() {
     fi
 
     # install htop
-    if [ ! -e "$(which htop)" ]; then
+    if ! command -v htop >/dev/null 2>&1; then
       tar xzf htop-${htop_ver}.tar.gz
-      pushd htop-${htop_ver}
+      pushd htop-${htop_ver} > /dev/null
       ./configure
       make -j ${THREAD} && make install
-      popd
+      popd > /dev/null
       rm -rf htop-${htop_ver}
     fi
   else
     echo "No need to install software from source packages."
   fi
   echo 'already initialize' > ~/.oneinstack
-  popd
+  popd > /dev/null
 }

include/php-7.3.sh

@@ -43,16 +43,6 @@ Install_PHP73() {
     rm -rf argon2-${argon2_ver}
   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
-    /bin/cp /usr/local/lib/libzip/include/zipconf.h /usr/local/include/zipconf.h
-    popd > /dev/null
-    rm -rf libzip-${libzip_ver}
-  fi
-
   if [ ! -e "/usr/local/lib/libsodium.la" ]; then
     tar xzf libsodium-${libsodium_ver}.tar.gz
     pushd libsodium-${libsodium_ver} > /dev/null
@@ -102,7 +92,7 @@ Install_PHP73() {
     --enable-sysvsem --enable-inline-optimization --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --with-gd --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
-    --with-gettext --enable-zip --enable-soap --disable-debug $php_modules_options
+    --with-gettext --enable-zip --without-libzip --enable-soap --disable-debug $php_modules_options
   else
     ./configure --prefix=${php_install_dir} --with-config-file-path=${php_install_dir}/etc \
     --with-config-file-scan-dir=${php_install_dir}/etc/php.d \
@@ -113,7 +103,7 @@ Install_PHP73() {
     --enable-sysvsem --enable-inline-optimization --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --with-gd --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
-    --with-gettext --enable-zip --enable-soap --disable-debug $php_modules_options
+    --with-gettext --enable-zip --without-libzip --enable-soap --disable-debug $php_modules_options
   fi
   make ZEND_EXTRA_LIBS='-liconv' -j ${THREAD}
   make install

versions.txt

@@ -6,7 +6,7 @@ openresty_ver=1.13.6.2
 openssl11_ver=1.1.1a
 openssl_ver=1.0.2q
 
-tomcat9_ver=9.0.13
+tomcat9_ver=9.0.14
 tomcat8_ver=8.5.35
 tomcat7_ver=7.0.92
 tomcat6_ver=6.0.53
@@ -16,7 +16,7 @@ apache22_ver=2.2.34
 pcre_ver=8.42
 apr_ver=1.6.5
 apr_util_ver=1.6.1
-nghttp2_ver=1.34.0
+nghttp2_ver=1.35.1
 
 # DB
 mysql80_ver=8.0.13
@@ -63,7 +63,6 @@ mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
 libsodium_ver=1.0.16
 argon2_ver=20171227
-libzip_ver=1.3.2
 imagemagick_ver=6.9.10-16
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.30