Browse Source

Problem building php-5.3 with openssl

lj2007331 9 years ago
parent
commit
716752f260

+ 6 - 6
apps.conf

@@ -1,6 +1,6 @@
 # newest software version
 # Web
-nginx_version=1.9.14
+nginx_version=1.10.0
 tengine_version=2.1.1
 openresty_version=1.9.7.4
 
@@ -20,7 +20,7 @@ mysql_5_5_version=5.5.49
 
 mariadb_10_1_version=10.1.13
 mariadb_10_0_version=10.0.24
-mariadb_5_5_version=5.5.48
+mariadb_5_5_version=5.5.49
 
 percona_5_7_version=5.7.11-4
 percona_5_6_version=5.6.29-76.2
@@ -29,14 +29,14 @@ percona_5_5_version=5.5.48-37.8
 # JDK
 jdk_6_version=1.6.0_45
 jdk_7_version=1.7.0_80
-jdk_8_version=1.8.0_77
+jdk_8_version=1.8.0_92
 
 # PHP
 php_3_version=5.3.29
 php_4_version=5.4.45
-php_5_version=5.5.34
-php_6_version=5.6.20
-php_7_version=7.0.5
+php_5_version=5.5.35
+php_6_version=5.6.21
+php_7_version=7.0.6
 
 zendopcache_version=7.0.5
 xcache_version=3.2.0

+ 2 - 2
include/mariadb-10.0.sh

@@ -78,7 +78,7 @@ max_connections = 1000
 max_connect_errors = 6000
 open_files_limit = 65535
 table_open_cache = 128 
-max_allowed_packet = 4M
+max_allowed_packet = 500M
 binlog_cache_size = 1M
 max_heap_table_size = 8M
 tmp_table_size = 16M
@@ -137,7 +137,7 @@ wait_timeout = 28800
 
 [mysqldump]
 quick
-max_allowed_packet = 16M
+max_allowed_packet = 500M
 
 [myisamchk]
 key_buffer_size = 8M

+ 2 - 2
include/mariadb-10.1.sh

@@ -78,7 +78,7 @@ max_connections = 1000
 max_connect_errors = 6000
 open_files_limit = 65535
 table_open_cache = 128 
-max_allowed_packet = 4M
+max_allowed_packet = 500M
 binlog_cache_size = 1M
 max_heap_table_size = 8M
 tmp_table_size = 16M
@@ -137,7 +137,7 @@ wait_timeout = 28800
 
 [mysqldump]
 quick
-max_allowed_packet = 16M
+max_allowed_packet = 500M
 
 [myisamchk]
 key_buffer_size = 8M

+ 2 - 2
include/mariadb-5.5.sh

@@ -78,7 +78,7 @@ max_connections = 1000
 max_connect_errors = 6000
 open_files_limit = 65535
 table_open_cache = 128 
-max_allowed_packet = 4M
+max_allowed_packet = 500M
 binlog_cache_size = 1M
 max_heap_table_size = 8M
 tmp_table_size = 16M
@@ -138,7 +138,7 @@ wait_timeout = 28800
 
 [mysqldump]
 quick
-max_allowed_packet = 16M
+max_allowed_packet = 500M
 
 [myisamchk]
 key_buffer_size = 8M

+ 2 - 2
include/mysql-5.5.sh

@@ -94,7 +94,7 @@ max_connections = 1000
 max_connect_errors = 6000
 open_files_limit = 65535
 table_open_cache = 128 
-max_allowed_packet = 4M
+max_allowed_packet = 500M
 binlog_cache_size = 1M
 max_heap_table_size = 8M
 tmp_table_size = 16M
@@ -153,7 +153,7 @@ wait_timeout = 28800
 
 [mysqldump]
 quick
-max_allowed_packet = 16M
+max_allowed_packet = 500M
 
 [myisamchk]
 key_buffer_size = 8M

+ 2 - 2
include/mysql-5.6.sh

@@ -92,7 +92,7 @@ max_connections = 1000
 max_connect_errors = 6000
 open_files_limit = 65535
 table_open_cache = 128 
-max_allowed_packet = 4M
+max_allowed_packet = 500M
 binlog_cache_size = 1M
 max_heap_table_size = 8M
 tmp_table_size = 16M
@@ -152,7 +152,7 @@ wait_timeout = 28800
 
 [mysqldump]
 quick
-max_allowed_packet = 16M
+max_allowed_packet = 500M
 
 [myisamchk]
 key_buffer_size = 8M

+ 2 - 2
include/mysql-5.7.sh

@@ -106,7 +106,7 @@ max_connections = 1000
 max_connect_errors = 6000
 open_files_limit = 65535
 table_open_cache = 128 
-max_allowed_packet = 4M
+max_allowed_packet = 500M
 binlog_cache_size = 1M
 max_heap_table_size = 8M
 tmp_table_size = 16M
@@ -167,7 +167,7 @@ wait_timeout = 28800
 
 [mysqldump]
 quick
-max_allowed_packet = 16M
+max_allowed_packet = 500M
 
 [myisamchk]
 key_buffer_size = 8M

+ 2 - 2
include/percona-5.5.sh

@@ -93,7 +93,7 @@ max_connections = 1000
 max_connect_errors = 6000
 open_files_limit = 65535
 table_open_cache = 128 
-max_allowed_packet = 4M
+max_allowed_packet = 500M
 binlog_cache_size = 1M
 max_heap_table_size = 8M
 tmp_table_size = 16M
@@ -152,7 +152,7 @@ wait_timeout = 28800
 
 [mysqldump]
 quick
-max_allowed_packet = 16M
+max_allowed_packet = 500M
 
 [myisamchk]
 key_buffer_size = 8M

+ 2 - 2
include/percona-5.6.sh

@@ -92,7 +92,7 @@ max_connections = 1000
 max_connect_errors = 6000
 open_files_limit = 65535
 table_open_cache = 128 
-max_allowed_packet = 4M
+max_allowed_packet = 500M
 binlog_cache_size = 1M
 max_heap_table_size = 8M
 tmp_table_size = 16M
@@ -152,7 +152,7 @@ wait_timeout = 28800
 
 [mysqldump]
 quick
-max_allowed_packet = 16M
+max_allowed_packet = 500M
 
 [myisamchk]
 key_buffer_size = 8M

+ 2 - 2
include/percona-5.7.sh

@@ -106,7 +106,7 @@ max_connections = 1000
 max_connect_errors = 6000
 open_files_limit = 65535
 table_open_cache = 128 
-max_allowed_packet = 4M
+max_allowed_packet = 500M
 binlog_cache_size = 1M
 max_heap_table_size = 8M
 tmp_table_size = 16M
@@ -166,7 +166,7 @@ wait_timeout = 28800
 
 [mysqldump]
 quick
-max_allowed_packet = 16M
+max_allowed_packet = 500M
 
 [myisamchk]
 key_buffer_size = 8M

+ 35 - 4
include/php-5.3.sh

@@ -61,6 +61,37 @@ rm -rf mcrypt-$mcrypt_version
 id -u $run_user >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin $run_user 
 
+# Problem building php-5.3 with openssl
+if [ "$Debian_version" == '8' -o "$Ubuntu_version" == '16' ];then
+    if [ -e '/usr/local/openssl/lib/libcrypto.a' ];then 
+        OpenSSL_args='--with-openssl=/usr/local/openssl'
+    else
+        src_url=http://mirrors.linuxeye.com/oneinstack/src/openssl-1.0.0s.tar.gz && Download_src
+        tar xzf openssl-1.0.0s.tar.gz
+        cd openssl-1.0.0s
+        ./config --prefix=/usr/local/openssl -fPIC shared zlib
+        make && make install
+        cd ..
+        [ -e '/usr/local/openssl/lib/libcrypto.a' ] && { OpenSSL_args='--with-openssl=/usr/local/openssl'; rm -rf openssl-1.0.0s; } || OpenSSL_args='--with-openssl'
+    fi
+    if [ "$Ubuntu_version" == '16' ];then
+        if [ -e '/usr/local/curl/lib/libcurl.a' ];then
+            Curl_args='--with-curl=/usr/local/curl'
+        else
+            src_url=http://mirrors.linuxeye.com/oneinstack/src/curl-7.29.0.tar.gz && Download_src
+            tar xzf curl-7.29.0.tar.gz 
+            cd curl-7.29.0
+            LDFLAGS="-Wl,-rpath=/usr/local/openssl/lib" ./configure --prefix=/usr/local/curl --with-ssl=/usr/local/openssl
+            make && make install
+            cd ..
+            [ -e '/usr/local/curl/lib/libcurl.a' ] && { Curl_args='--with-curl=/usr/local/curl'; rm -rf curl-7.29.0; } || Curl_args='--with-curl'
+        fi
+    fi
+else
+    OpenSSL_args='--with-openssl'
+    Curl_args='--with-curl'
+fi
+
 tar xzf php-$php_3_version.tar.gz
 patch -d php-$php_3_version -p0 < fpm-race-condition.patch
 cd php-$php_3_version
@@ -75,8 +106,8 @@ if [[ $Apache_version =~ ^[1-2]$ ]] || [ -e "$apache_install_dir/bin/apxs" ];the
 --with-mysql=mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd \
 --with-iconv-dir=/usr/local --with-freetype-dir --with-jpeg-dir --with-png-dir --with-zlib \
 --with-libxml-dir=/usr --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
---enable-sysvsem --enable-inline-optimization --with-curl --enable-mbregex \
---enable-mbstring --with-mcrypt --with-gd --enable-gd-native-ttf --with-openssl \
+--enable-sysvsem --enable-inline-optimization $Curl_args --enable-mbregex \
+--enable-mbstring --with-mcrypt --with-gd --enable-gd-native-ttf $OpenSSL_args \
 --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
 --with-gettext --enable-zip --enable-soap --disable-ipv6 --disable-debug
 else
@@ -86,8 +117,8 @@ else
 --with-mysql=mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd \
 --with-iconv-dir=/usr/local --with-freetype-dir --with-jpeg-dir --with-png-dir --with-zlib \
 --with-libxml-dir=/usr --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
---enable-sysvsem --enable-inline-optimization --with-curl --enable-mbregex \
---enable-mbstring --with-mcrypt --with-gd --enable-gd-native-ttf --with-openssl \
+--enable-sysvsem --enable-inline-optimization $Curl_args --enable-mbregex \
+--enable-mbstring --with-mcrypt --with-gd --enable-gd-native-ttf $OpenSSL_args \
 --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
 --with-gettext --enable-zip --enable-soap --disable-ipv6 --disable-debug
 fi