Fix openssl dir

include/GraphicsMagick.sh

@@ -21,8 +21,8 @@ Install_GraphicsMagick() {
 
 Install_php-gmagick() {
   pushd ${oneinstack_dir}/src
-  phpExtensionDir=`${php_install_dir}/bin/php-config --extension-dir`
   if [ -e "${php_install_dir}/bin/phpize" ]; then
+    phpExtensionDir=`${php_install_dir}/bin/php-config --extension-dir`
     if [ "`${php_install_dir}/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1}'`" == '7' ]; then
       tar xzf gmagick-${gmagick_for_php7_version}.tgz 
       pushd gmagick-${gmagick_for_php7_version} 

include/ImageMagick.sh

@@ -21,8 +21,8 @@ Install_ImageMagick() {
 
 Install_php-imagick() {
   pushd ${oneinstack_dir}/src
-  phpExtensionDir=`${php_install_dir}/bin/php-config --extension-dir`
   if [ -e "${php_install_dir}/bin/phpize" ]; then
+    phpExtensionDir=`${php_install_dir}/bin/php-config --extension-dir`
     if [ "`${php_install_dir}/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1"."$2}'`" == '5.3' ]; then
       tar xzf imagick-${imagick_for_php53_version}.tgz
       pushd imagick-${imagick_for_php53_version}

include/apache-2.4.sh

@@ -24,12 +24,12 @@ Install_Apache24() {
 
   # 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 nghttp2

include/init_CentOS.sh

@@ -88,13 +88,11 @@ net.ipv4.tcp_timestamps = 1
 net.ipv4.tcp_fin_timeout = 20
 net.ipv4.tcp_synack_retries = 2
 net.ipv4.tcp_syn_retries = 2
-net.ipv4.tcp_tw_recycle = 1
 net.ipv4.tcp_syncookies = 1
 #net.ipv4.tcp_tw_len = 1
 net.ipv4.tcp_tw_reuse = 1
 net.ipv4.tcp_mem = 94500000 915000000 927000000
 net.ipv4.tcp_max_orphans = 3276800
-net.ipv4.tcp_tw_recycle = 1
 net.ipv4.ip_local_port_range = 1024 65000
 net.nf_conntrack_max = 6553500
 net.netfilter.nf_conntrack_max = 6553500

include/init_Debian.sh

@@ -67,7 +67,6 @@ fs.inotify.max_user_instances = 8192
 net.ipv4.tcp_syncookies = 1
 net.ipv4.tcp_fin_timeout = 30
 net.ipv4.tcp_tw_reuse = 1
-net.ipv4.tcp_tw_recycle = 1
 net.ipv4.ip_local_port_range = 1024 65000
 net.ipv4.tcp_max_syn_backlog = 65536
 net.ipv4.tcp_max_tw_buckets = 6000

include/init_Ubuntu.sh

@@ -69,7 +69,6 @@ fs.inotify.max_user_instances = 8192
 net.ipv4.tcp_syncookies = 1
 net.ipv4.tcp_fin_timeout = 30
 net.ipv4.tcp_tw_reuse = 1
-net.ipv4.tcp_tw_recycle = 1
 net.ipv4.ip_local_port_range = 1024 65000
 net.ipv4.tcp_max_syn_backlog = 65536
 net.ipv4.tcp_max_tw_buckets = 6000

include/memcached.sh

@@ -43,8 +43,8 @@ Install_memcached() {
 
 Install_php-memcache() {
   pushd ${oneinstack_dir}/src
-  phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
   if [ -e "${php_install_dir}/bin/phpize" ]; then
+    phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
     # php memcache extension
     if [ "$(${php_install_dir}/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1}')" == '7' ]; then
       #git clone https://github.com/websupport-sk/pecl-memcache.git
@@ -72,8 +72,8 @@ Install_php-memcache() {
 
 Install_php-memcached() {
   pushd ${oneinstack_dir}/src
-  phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
   if [ -e "${php_install_dir}/bin/phpize" ]; then
+    phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
     # php memcached extension
     tar xzf libmemcached-${libmemcached_version}.tar.gz
     pushd libmemcached-${libmemcached_version}

include/php-5.3.sh

@@ -24,7 +24,7 @@ Install_PHP53() {
     if [ ! -e '/usr/local/openssl100s/lib/libcrypto.a' ]; then
       tar xzf openssl-1.0.0s.tar.gz
       pushd openssl-1.0.0s
-      ./config --prefix=/usr/local/openssl100s -fPIC shared zlib
+      CFLAGS=-fPIC ./config --prefix=/usr/local/openssl100s shared zlib
       make -j ${THREAD} && make install
       popd 
       rm -rf openssl-1.0.0s

include/redis.sh

@@ -57,8 +57,8 @@ Install_redis-server() {
 
 Install_php-redis() {
   pushd ${oneinstack_dir}/src
-  phpExtensionDir=`${php_install_dir}/bin/php-config --extension-dir`
   if [ -e "${php_install_dir}/bin/phpize" ]; then
+    phpExtensionDir=`${php_install_dir}/bin/php-config --extension-dir`
     if [ "`${php_install_dir}/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1}'`" == '7' ]; then
       tar xzf redis-${redis_pecl_for_php7_version}.tgz
       pushd redis-${redis_pecl_for_php7_version}

include/tomcat-6.sh

@@ -19,7 +19,7 @@ Install_Tomcat6() {
   if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
     tar xzf openssl-${openssl_version}.tar.gz
     pushd openssl-${openssl_version}
-    ./config --prefix=${openssl_install_dir} -fPIC shared zlib
+    CFLAGS=-fPIC ./config --prefix=${openssl_install_dir} shared zlib
     make -j ${THREAD} && make install
     popd
     rm -rf openssl-${openssl_version}

include/tomcat-7.sh

@@ -19,7 +19,7 @@ Install_Tomcat7() {
   if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
     tar xzf openssl-${openssl_version}.tar.gz
     pushd openssl-${openssl_version}
-    ./config --prefix=${openssl_install_dir} -fPIC shared zlib
+    CFLAGS=-fPIC ./config --prefix=${openssl_install_dir} shared zlib
     make -j ${THREAD} && make install
     popd
     rm -rf openssl-${openssl_version}

include/tomcat-8.sh

@@ -19,7 +19,7 @@ Install_Tomcat8() {
   if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
     tar xzf openssl-${openssl_version}.tar.gz
     pushd openssl-${openssl_version}
-    ./config --prefix=${openssl_install_dir} -fPIC shared zlib
+    CFLAGS=-fPIC ./config --prefix=${openssl_install_dir} shared zlib
     make -j ${THREAD} && make install
     popd
     rm -rf openssl-${openssl_version}

versions.txt

@@ -10,7 +10,7 @@ tomcat7_version=7.0.73
 tomcat6_version=6.0.48
 
 apache24_version=2.4.25
-apache22_version=2.2.31
+apache22_version=2.2.32
 pcre_version=8.39
 apr_version=1.5.2
 apr_util_version=1.5.4
@@ -37,9 +37,9 @@ jdk17_version=1.7.0_80
 jdk16_version=1.6.0_45
 
 # PHP
-php71_version=7.1.0
-php70_version=7.0.14
-php56_version=5.6.29
+php71_version=7.1.1
+php70_version=7.0.15
+php56_version=5.6.30
 php55_version=5.5.38
 php54_version=5.4.45
 php53_version=5.3.29