Fix include/tomcat-*.sh

include/check_download.sh

@@ -40,6 +40,7 @@ checkDownload() {
       echo "Download apache 2.4..."
       src_url=http://archive.apache.org/dist/apr/apr-${apr_version}.tar.gz && Download_src
       src_url=http://archive.apache.org/dist/apr/apr-util-${apr_util_version}.tar.gz && Download_src
+      src_url=http://mirrors.linuxeye.com/apache/httpd/nghttp2-${nghttp2_version}.tar.gz && Download_src
       src_url=http://mirrors.linuxeye.com/apache/httpd/httpd-${apache24_version}.tar.gz && Download_src
     fi
     if [ "${Apache_version}" == '2' ]; then

include/tomcat-6.sh

@@ -17,22 +17,22 @@ Install_Tomcat6() {
 
   # install openssl-1.0.2
   if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
-    tar xzf ${openssl_version}.tar.gz
-    pushd ${openssl_version}
+    tar xzf openssl-${openssl_version}.tar.gz
+    pushd openssl-${openssl_version}
     ./config --prefix=${openssl_install_dir} -fPIC shared zlib
     make -j ${THREAD} && make install
     popd
-    rm -rf ${openssl_version}
+    rm -rf openssl-${openssl_version}
   fi
 
   # install apr
   if [ ! -e "/usr/local/apr/bin/apr-1-config" ]; then
-    tar xzf ${apr_version}.tar.gz
-    pushd ${apr_version}
+    tar xzf apr-${apr_version}.tar.gz
+    pushd apr-${apr_version}
     ./configure
     make -j ${THREAD} && make install
     popd
-    rm -rf ${openssl_version}
+    rm -rf apr-${apr_version} 
   fi
 
   tar xzf apache-tomcat-${tomcat6_version}.tar.gz

include/tomcat-7.sh

@@ -17,22 +17,22 @@ Install_Tomcat7() {
 
   # install openssl-1.0.2
   if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
-    tar xzf ${openssl_version}.tar.gz
-    pushd ${openssl_version}
+    tar xzf openssl-${openssl_version}.tar.gz
+    pushd openssl-${openssl_version}
     ./config --prefix=${openssl_install_dir} -fPIC shared zlib
     make -j ${THREAD} && make install
     popd
-    rm -rf ${openssl_version}
-  fi  
+    rm -rf openssl-${openssl_version}
+  fi
 
   # install apr
   if [ ! -e "/usr/local/apr/bin/apr-1-config" ]; then
-    tar xzf ${apr_version}.tar.gz
-    pushd ${apr_version}
+    tar xzf apr-${apr_version}.tar.gz
+    pushd apr-${apr_version}
     ./configure
     make -j ${THREAD} && make install
     popd
-    rm -rf ${openssl_version}
+    rm -rf apr-${apr_version} 
   fi
 
   tar xzf apache-tomcat-${tomcat7_version}.tar.gz

include/tomcat-8.sh

@@ -17,22 +17,22 @@ Install_Tomcat8() {
 
   # install openssl-1.0.2
   if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
-    tar xzf ${openssl_version}.tar.gz
-    pushd ${openssl_version}
+    tar xzf openssl-${openssl_version}.tar.gz
+    pushd openssl-${openssl_version}
     ./config --prefix=${openssl_install_dir} -fPIC shared zlib
     make -j ${THREAD} && make install
     popd
-    rm -rf ${openssl_version}
-  fi  
+    rm -rf openssl-${openssl_version}
+  fi
 
   # install apr
   if [ ! -e "/usr/local/apr/bin/apr-1-config" ]; then
-    tar xzf ${apr_version}.tar.gz
-    pushd ${apr_version}
+    tar xzf apr-${apr_version}.tar.gz
+    pushd apr-${apr_version}
     ./configure
     make -j ${THREAD} && make install
     popd
-    rm -rf ${openssl_version}
+    rm -rf apr-${apr_version} 
   fi
 
   tar xzf apache-tomcat-${tomcat8_version}.tar.gz

versions.txt

@@ -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.7
-ImageMagick_version=6.9.7-2
+ImageMagick_version=6.9.7-3
 imagick_version=3.4.3RC1
 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.0
+curl_version=7.52.1
 libmcrypt_version=2.5.8
 mcrypt_version=2.6.8
 mhash_version=0.9.9.9
@@ -70,7 +70,7 @@ redis_pecl_for_php7_version=3.1.0
 redis_pecl_version=2.2.8
 
 # Memcached
-memcached_version=1.4.33
+memcached_version=1.4.34
 libmemcached_version=1.0.18
 memcached_pecl_version=2.2.0
 memcache_pecl_version=3.0.8