diff --git a/centmin.sh b/centmin.sh index a58c03ad4..011ca5054 100755 --- a/centmin.sh +++ b/centmin.sh @@ -295,6 +295,7 @@ PHP_PGO='n' # Profile Guided Optimization https://software.int PHP_PGO_CENTOSSIX='n' # CentOS 6 may need GCC >4.4.7 fpr PGO so use devtoolset-4 GCC 5.2 NGINX_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 even for CentOS 7 nginx compiles GENERAL_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 whereever possible/coded +CRYPTO_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 for libressl or openssl compiles # When set to =y, will disable those listed installed services # by default. The service is still installed but disabled @@ -523,7 +524,7 @@ PCRE_SOURCEINSTALL='n' PCRE_VERSION='8.39' # PCRE version # PHP and Cache/Acceleration -IMAGICKPHP_VER='3.4.3RC1' # PHP extension for imagick +IMAGICKPHP_VER='3.4.3RC2' # PHP extension for imagick MAILPARSEPHP_VER='2.1.6' # https://pecl.php.net/package/mailparse MAILPARSEPHP_COMPATVER='3.0.1' # For PHP 7 MEMCACHED_INSTALL='y' # Install Memcached @@ -535,8 +536,8 @@ LIBMEMCACHED_YUM='y' # switch to YUM install instead of source compile LIBMEMCACHED_VER='1.0.18' # libmemcached version for source compile TWEMPERF_VER='0.1.1' PHPREDIS='y' # redis PHP extension install -REDISPHP_VER='2.2.8' # redis PHP version for PHP <7.x -REDISPHPSEVEN_VER='3.0.0' # redis PHP version for PHP =>7.x +REDISPHP_VER='3.1.1RC2' # redis PHP version for PHP <7.x +REDISPHPSEVEN_VER='3.1.1RC2' # redis PHP version for PHP =>7.x REDISPHP_GIT='n' # pull php 7 redis extension from git or pecl downloads PHPMONGODB='n' # MongoDB PHP extension install MONGODBPHP_VER='1.1.8' # MongoDB PHP version diff --git a/config/mysql/my-mdb-4gb.cnf b/config/mysql/my-mdb-4gb.cnf index 9bd78a7dd..33a86330b 100644 --- a/config/mysql/my-mdb-4gb.cnf +++ b/config/mysql/my-mdb-4gb.cnf @@ -63,7 +63,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # mariadb settings userstat = 0 @@ -108,7 +108,7 @@ innodb_write_io_threads = 2 [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb-min.cnf b/config/mysql/my-mdb-min.cnf index 87f28ba95..89bdcb267 100644 --- a/config/mysql/my-mdb-min.cnf +++ b/config/mysql/my-mdb-min.cnf @@ -63,7 +63,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # mariadb settings userstat = 0 @@ -108,7 +108,7 @@ innodb_write_io_threads = 2 [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb.cnf b/config/mysql/my-mdb.cnf index 564f4da4f..ec94de917 100644 --- a/config/mysql/my-mdb.cnf +++ b/config/mysql/my-mdb.cnf @@ -63,7 +63,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # mariadb settings userstat = 0 @@ -108,7 +108,7 @@ innodb_write_io_threads = 2 [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb10-16gb.cnf b/config/mysql/my-mdb10-16gb.cnf index 8e66d18b1..c51592e25 100644 --- a/config/mysql/my-mdb10-16gb.cnf +++ b/config/mysql/my-mdb10-16gb.cnf @@ -65,7 +65,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # innodb settings innodb_large_prefix=1 @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb10-32gb.cnf b/config/mysql/my-mdb10-32gb.cnf index 0587be6e8..80eec25fa 100644 --- a/config/mysql/my-mdb10-32gb.cnf +++ b/config/mysql/my-mdb10-32gb.cnf @@ -65,7 +65,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # innodb settings innodb_large_prefix=1 @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb10-4gb.cnf b/config/mysql/my-mdb10-4gb.cnf index ebc5038e9..af10289d2 100644 --- a/config/mysql/my-mdb10-4gb.cnf +++ b/config/mysql/my-mdb10-4gb.cnf @@ -65,7 +65,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # innodb settings innodb_large_prefix=1 @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb10-64gb-8c.cnf b/config/mysql/my-mdb10-64gb-8c.cnf index 9e2a33a01..f04c74d68 100644 --- a/config/mysql/my-mdb10-64gb-8c.cnf +++ b/config/mysql/my-mdb10-64gb-8c.cnf @@ -65,7 +65,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # innodb settings innodb_large_prefix=1 @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb10-64gb.cnf b/config/mysql/my-mdb10-64gb.cnf index a016518fa..26c3ae101 100644 --- a/config/mysql/my-mdb10-64gb.cnf +++ b/config/mysql/my-mdb10-64gb.cnf @@ -65,7 +65,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # innodb settings innodb_large_prefix=1 @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb10-8gb.cnf b/config/mysql/my-mdb10-8gb.cnf index e12f30a50..bd745df01 100644 --- a/config/mysql/my-mdb10-8gb.cnf +++ b/config/mysql/my-mdb10-8gb.cnf @@ -65,7 +65,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # innodb settings innodb_large_prefix=1 @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb10-min.cnf b/config/mysql/my-mdb10-min.cnf index 33fa10071..723ea3fa6 100644 --- a/config/mysql/my-mdb10-min.cnf +++ b/config/mysql/my-mdb10-min.cnf @@ -65,7 +65,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # innodb settings innodb_large_prefix=1 @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb10.cnf b/config/mysql/my-mdb10.cnf index 45f1729d6..181b6c4bf 100644 --- a/config/mysql/my-mdb10.cnf +++ b/config/mysql/my-mdb10.cnf @@ -65,7 +65,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # innodb settings innodb_large_prefix=1 @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb55-4gb.cnf b/config/mysql/my-mdb55-4gb.cnf index b075e3b6f..9a8f8bf81 100644 --- a/config/mysql/my-mdb55-4gb.cnf +++ b/config/mysql/my-mdb55-4gb.cnf @@ -63,7 +63,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # innodb settings #innodb_extra_rsegments = 4 @@ -122,7 +122,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb55-min.cnf b/config/mysql/my-mdb55-min.cnf index b9123435c..fc15cce6f 100644 --- a/config/mysql/my-mdb55-min.cnf +++ b/config/mysql/my-mdb55-min.cnf @@ -63,7 +63,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # innodb settings #innodb_extra_rsegments = 4 @@ -122,7 +122,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my-mdb55.cnf b/config/mysql/my-mdb55.cnf index 871bf090e..49600374d 100644 --- a/config/mysql/my-mdb55.cnf +++ b/config/mysql/my-mdb55.cnf @@ -63,7 +63,7 @@ log_warnings=1 slow_query_log=0 long_query_time=1 slow_query_log_file=/var/lib/mysql/slowq.log -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log # innodb settings #innodb_extra_rsegments = 4 @@ -122,7 +122,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache [mysqld_safe] socket=/var/lib/mysql/mysql.sock -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log #nice = -5 open-files-limit = 8192 diff --git a/config/mysql/my.cnf b/config/mysql/my.cnf index 9952bb6d3..e57e3fdf2 100644 --- a/config/mysql/my.cnf +++ b/config/mysql/my.cnf @@ -39,7 +39,7 @@ query_cache_type = 1 default-storage-engine = InnoDB [mysqld_safe] -log-error=/var/log/mysqld.log +#log-error=/var/log/mysqld.log pid-file=/var/run/mysqld/mysqld.pid open-files-limit = 8192 diff --git a/example/custom_config.inc b/example/custom_config.inc index d68093121..f90106b6e 100644 --- a/example/custom_config.inc +++ b/example/custom_config.inc @@ -25,6 +25,7 @@ PHP_PGO='n' # Profile Guided Optimization https://software.int PHP_PGO_CENTOSSIX='n' # CentOS 6 may need GCC >4.4.7 fpr PGO so use devtoolset-4 GCC 5.2 NGINX_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 even for CentOS 7 nginx compiles GENERAL_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 whereever possible/coded +CRYPTO_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 for libressl or openssl compiles # Nginx Dynamic Module Switches NGXDYNAMIC_NJS='n' @@ -210,7 +211,7 @@ PCRE_SOURCEINSTALL='n' PCRE_VERSION='8.39' # PCRE version # PHP and Cache/Acceleration -IMAGICKPHP_VER='3.4.3RC1' # PHP extension for imagick +IMAGICKPHP_VER='3.4.3RC2' # PHP extension for imagick MAILPARSEPHP_VER='2.1.6' # https://pecl.php.net/package/mailparse MAILPARSEPHP_COMPATVER='3.0.1' # For PHP 7 MEMCACHED_INSTALL='y' # Install Memcached @@ -222,8 +223,8 @@ LIBMEMCACHED_YUM='y' # switch to YUM install instead of source compile LIBMEMCACHED_VER='1.0.18' # libmemcached version for source compile TWEMPERF_VER='0.1.1' PHPREDIS='y' # redis PHP extension install -REDISPHP_VER='2.2.8' # redis PHP version -REDISPHPSEVEN_VER='3.0.0' # redis PHP version for PHP =>7.x +REDISPHP_VER='3.1.1RC2' # redis PHP version +REDISPHPSEVEN_VER='3.1.1RC2' # redis PHP version for PHP =>7.x REDISPHP_GIT='n' # pull php 7 redis extension from git or pecl downloads PHPMONGODB='n' # MongoDB PHP extension install MONGODBPHP_VER='1.1.8' # MongoDB PHP version diff --git a/inc/cpcheck.inc b/inc/cpcheck.inc index 294ee905d..1e78d4824 100644 --- a/inc/cpcheck.inc +++ b/inc/cpcheck.inc @@ -404,13 +404,13 @@ selinxcheck() { yum -q -y install libselinux-utils fi - if [[ -z $(sestatus | grep disabled) && -f /etc/selinux/config ]]; then + if [[ -z "$(sestatus | grep disabled)" && -f /etc/selinux/config ]]; then echo "---------------------------------------------------------------" echo "SELINUX linux detected" echo "---------------------------------------------------------------" echo "disabling SELINUX..." echo "will require a server reboot before running initial install" - sleep 3 + # sleep 3 sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/selinux/config && setenforce 0 sed -i 's/SELINUX=permissive/SELINUX=disabled/g' /etc/selinux/config && setenforce 0 echo @@ -418,7 +418,22 @@ selinxcheck() { echo "on reboot you can find the centmin.sh file located at:" echo "echo $(pwd)" echo "---------------------------------------------------------------" - exit 0 + # exit 0 + elif [[ -z "$(sestatus | grep disabled)" && -f /etc/sysconfig/selinux ]]; then + echo "---------------------------------------------------------------" + echo "SELINUX linux detected" + echo "---------------------------------------------------------------" + echo "disabling SELINUX..." + echo "will require a server reboot before running initial install" + # sleep 3 + sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/sysconfig/selinux && setenforce 0 + sed -i 's/SELINUX=permissive/SELINUX=disabled/g' /etc/sysconfig/selinux && setenforce 0 + echo + echo "SELINUX disabled, please reboot server and rerun install" + echo "on reboot you can find the centmin.sh file located at:" + echo "echo $(pwd)" + echo "---------------------------------------------------------------" + # exit 0 fi } diff --git a/inc/downloads_centosseven.inc b/inc/downloads_centosseven.inc index 9845b9676..252faf721 100644 --- a/inc/downloads_centosseven.inc +++ b/inc/downloads_centosseven.inc @@ -325,6 +325,7 @@ rpm -Uvh ${CENTOSSEVENPERCONALRELEASEFILE} fi + if [[ "$(uname -m)" = 'x86_64' ]]; then cd $DIR_TMP if [ -s "${CENTOSSEVENVARNISHFILE}" ]; then @@ -367,6 +368,7 @@ rpm --nosignature -i ${CENTOSSEVENVARNISHFILE} fi fi + fi # 64bit only #### # axivo centos 6.x 64bit only diff --git a/inc/downloads_centossix.inc b/inc/downloads_centossix.inc index dd4674c7f..3271de00f 100644 --- a/inc/downloads_centossix.inc +++ b/inc/downloads_centossix.inc @@ -325,6 +325,7 @@ rpm -Uvh ${CENTOSSIXPERCONALRELEASEFILE} fi + if [[ "$(uname -m)" = 'x86_64' ]]; then cd $DIR_TMP if [ -s "${CENTOSSIXVARNISHFILE}" ]; then @@ -366,6 +367,7 @@ rpm --nosignature -i ${CENTOSSIXVARNISHFILE} fi fi + fi # 64bit only #### # axivo centos 6.x 64bit only diff --git a/inc/openssl_install.inc b/inc/openssl_install.inc index 7a8c14332..90607d967 100644 --- a/inc/openssl_install.inc +++ b/inc/openssl_install.inc @@ -123,6 +123,64 @@ fi # CLOUDFLARE_PATCHSSL } 2>&1 | tee "${CENTMINLOGDIR}/patch_opensslpatches_${DT}.log" } +crypto_gcc() { + if [[ "$CRYPTO_DEVTOOLSETGCC" = [yY] ]]; then + if [[ ! -f /opt/rh/devtoolset-4/root/usr/bin/gcc || ! -f /opt/rh/devtoolset-4/root/usr/bin/g++ ]]; then + scl_install + source /opt/rh/devtoolset-4/enable + which gcc + which g++ + unset CC + unset CXX + export CC="ccache /opt/rh/devtoolset-4/root/usr/bin/gcc" + export CXX="ccache /opt/rh/devtoolset-4/root/usr/bin/g++" + elif [[ -f /opt/rh/devtoolset-4/root/usr/bin/gcc && -f /opt/rh/devtoolset-4/root/usr/bin/g++ ]]; then + source /opt/rh/devtoolset-4/enable + scl_install + which gcc + which g++ + unset CC + unset CXX + export CC="ccache /opt/rh/devtoolset-4/root/usr/bin/gcc" + export CXX="ccache /opt/rh/devtoolset-4/root/usr/bin/g++" + fi + fi + if [[ "$CRYPTO_DEVTOOLSETGCC" = [yY] ]]; then + # intel specific + CPUVENDOR=$(cat /proc/cpuinfo | awk '/vendor_id/ {print $3}' | sort -u | head -n1) + SSECHECK=$(gcc -c -Q -march=native --help=target | awk '/ -msse/ {print $2}' | head -n1) + CPU_MARCH=$(gcc -c -Q -march=native --help=target | awk '/ -march/ {print $2}' | head -n1 ) + CPUMODELNO=$(grep -v 'model name' /proc/cpuinfo | awk -F ": " '/model/ {print $2}' | uniq) + SSEFOURTWOCHECK=$(grep -o sse4_2 /proc/cpuinfo | sort -u | wc -l) + MARCHCHECK=$(gcc -c -Q -march=native --help=target | awk '/ -march=/ {print $2}' | head -n1) + gcc --version | tee ${CENTMINLOGDIR}/gcc_crypto_native.log + gcc -c -Q -march=native --help=target | egrep '\[enabled\]|mtune|march|mfpmath' | tee -a ${CENTMINLOGDIR}/gcc_crypto_native.log + + if [[ "$(uname -m)" = 'x86_64' && "$CPUVENDOR" = 'GenuineIntel' && "$SSECHECK" = '[enabled]' ]]; then + CCM=64 + CRYPTOGCC_OPT="-m${CCM} -march=native" + # if only 1 cpu thread use -O2 to keep compile times sane + if [[ "$CPUS" = '1' ]]; then + export CFLAGS="-O2 $CRYPTOGCC_OPT -pipe" + else + export CFLAGS="-O3 $CRYPTOGCC_OPT -pipe" + fi + export CXXFLAGS="$CFLAGS" + fi + fi +} + +crypto_gccunset() { +if [[ "$CRYPTO_DEVTOOLSETGCC" = [yY] ]]; then + unset CC + unset CXX + unset CFLAGS + unset CXXFLAGS + export CC="ccache /usr/bin/gcc" + export CXX="ccache /usr/bin/g++" +fi +} + installopenssl() { if [[ "$ORESTY_LUANGINX" = [yY] ]]; then # lua nginx 0.10.7 and lower not compatible with openssl 1.1.x branch @@ -179,7 +237,8 @@ installopenssl() { export CCACHE_CPP2=yes CLANG_CFLAGOPT="" CFLAGS="" - fi + fi + crypto_gcc ./configure --prefix=/opt/libressl # make${MAKETHREADS} check make${MAKETHREADS} @@ -201,7 +260,8 @@ installopenssl() { export CXX="ccache g++" CLANG_CFLAGOPT="" CFLAGS="" - fi + fi + crypto_gccunset libresslinstallendtime=$(TZ=UTC date +%s.%N) LIBRESSLINSTALLTIME=$(echo "scale=2;$libresslinstallendtime - $libresslinstallstarttime"|bc ) @@ -239,17 +299,18 @@ installopenssl() { make clean fi opensslpatches + crypto_gcc if [[ "$(uname -m)" = 'x86_64' ]]; then if [[ "$DETECTOPENSSL_ONEZERO" = '1.1' ]]; then # openssl 1.1.0 unsupported flag enable-tlsext - ./config --prefix=$STATICLIBSSL shared enable-ec_nistp_64_gcc_128 + ./config -Wl,--enable-new-dtags,-rpath,'$(LIBRPATH)' --prefix=$STATICLIBSSL shared enable-ec_nistp_64_gcc_128 else ./config --prefix=$STATICLIBSSL shared enable-tlsext enable-ec_nistp_64_gcc_128 fi else if [[ "$DETECTOPENSSL_ONEZERO" = '1.1' ]]; then # openssl 1.1.0 unsupported flag enable-tlsext - ./config --prefix=$STATICLIBSSL shared + ./config -Wl,--enable-new-dtags,-rpath,'$(LIBRPATH)' --prefix=$STATICLIBSSL shared else ./config --prefix=$STATICLIBSSL shared enable-tlsext fi @@ -266,6 +327,7 @@ installopenssl() { else rm -rf "${STATICLIBSSL}/lib64" fi + crypto_gccunset opensslinstallendtime=$(TZ=UTC date +%s.%N) OPENSSLINSTALLTIME=$(echo "scale=2;$opensslinstallendtime - $opensslinstallstarttime"|bc ) diff --git a/inc/php_upgrade.inc b/inc/php_upgrade.inc index 7256dbfca..811306ca5 100644 --- a/inc/php_upgrade.inc +++ b/inc/php_upgrade.inc @@ -701,6 +701,10 @@ if [[ "$IGBINARY_INSTALL" = [yY] ]]; then if [[ -f "${CONFIGSCANDIR}/igbinary.ini" && ! -f "$PHPEXTDIR_AUTODETECT/igbinary.so" ]]; then cecho "Reinstalling detected igbinary extension" $boldyellow funct_igbinaryinstall + elif [[ -f "${CONFIGSCANDIR}/igbinary.ini" && "$(php --ri igbinary | awk '/version/ {print $4}' | cut -c1)" -lt '2' ]]; then + # if igbinary version less than 2.x reinstall igbinary + cecho "Reinstalling detected igbinary extension" $boldyellow + funct_igbinaryinstall fi fi diff --git a/tools/imagemagick-update.sh b/tools/imagemagick-update.sh index e910bd49a..67f3d3e92 100755 --- a/tools/imagemagick-update.sh +++ b/tools/imagemagick-update.sh @@ -2,7 +2,7 @@ ###################################################### # standalone imagemagick + imagick updater ###################################################### -IMAGICKPHP_VER='3.4.3RC1' # PHP extension for imagick +IMAGICKPHP_VER='3.4.3RC2' # PHP extension for imagick PHP_INSTALL='y' PHPIMAGICK='y' REMIREPO_DISABLE='n' diff --git a/tools/nginxupdate.sh b/tools/nginxupdate.sh index 9f69d5493..9ca8cd34f 100755 --- a/tools/nginxupdate.sh +++ b/tools/nginxupdate.sh @@ -136,6 +136,11 @@ CLANG_PHP='n' # PHP CLANG_APC='n' # APC Cache CLANG_MEMCACHED='n' # Memcached menu option 10 routine GCCINTEL_PHP='y' # enable PHP-FPM GCC compiler with Intel cpu optimizations +PHP_PGO='n' # Profile Guided Optimization https://software.intel.com/en-us/blogs/2015/10/09/pgo-let-it-go-php +PHP_PGO_CENTOSSIX='n' # CentOS 6 may need GCC >4.4.7 fpr PGO so use devtoolset-4 GCC 5.2 +NGINX_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 even for CentOS 7 nginx compiles +GENERAL_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 whereever possible/coded +CRYPTO_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 for libressl or openssl compiles # When set to =y, will disable those listed installed services # by default. The service is still installed but disabled