From 902468907db728955cd52ffa2de31165cf31eb70 Mon Sep 17 00:00:00 2001 From: George Liu Date: Tue, 28 Mar 2017 05:52:19 +1000 Subject: [PATCH 1/4] remove yum -y update duplicate --- inc/yuminstall.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inc/yuminstall.inc b/inc/yuminstall.inc index 0a448989a..0d983c0f6 100644 --- a/inc/yuminstall.inc +++ b/inc/yuminstall.inc @@ -266,7 +266,8 @@ fi # remove /tmp/curlinstaller-yum rm -rf /tmp/curlinstaller-yum -yum -y update +# duplicate +# yum -y update } 2>&1 | tee ${CENTMINLOGDIR}/centminmod_yumtimes_${DT}.log From 1d472df9954d54662f529e24a985d65cc908fdc0 Mon Sep 17 00:00:00 2001 From: George Liu Date: Tue, 28 Mar 2017 11:23:48 +1000 Subject: [PATCH 2/4] don't clear on install --- centmin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/centmin.sh b/centmin.sh index b29c95fba..cbdd25f7d 100755 --- a/centmin.sh +++ b/centmin.sh @@ -1197,7 +1197,7 @@ fi ################################################################ # SCRIPT START # -clear +# clear cecho "**********************************************************************" $boldyellow cecho "* Centmin Mod Nginx, MariaDB MySQL, PHP & DNS Install script for CentOS" $boldgreen cecho "* Version: $SCRIPT_VERSION - Date: $SCRIPT_DATE" $boldgreen From 74eca8ab325fd41f8616ce73b34a600b8108b9e7 Mon Sep 17 00:00:00 2001 From: George Liu Date: Tue, 28 Mar 2017 22:07:01 +1000 Subject: [PATCH 3/4] fix clang binary detection path for centos 7 --- inc/apcinstall.inc | 2 +- inc/memcached_install.inc | 2 +- inc/nginx_configure.inc | 2 +- inc/openssl_install.inc | 2 +- inc/php_configure.inc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/apcinstall.inc b/inc/apcinstall.inc index d666004bd..97b3adcec 100644 --- a/inc/apcinstall.inc +++ b/inc/apcinstall.inc @@ -13,7 +13,7 @@ function funct_apcsourceinstall { echo "*************************************************" if [[ "$CLANG_APC" = [yY] ]]; then - if [[ ! -f /usr/bin/clang ]]; then + if [[ "$CENTOS_SIX" = '6' && ! -f /usr/bin/clang ]] || [[ "$CENTOS_SEVEN" = '7' && ! -f /bin/clang ]]; then yum -q -y install clang clang-devel fi export CC="ccache /usr/bin/clang -ferror-limit=0" diff --git a/inc/memcached_install.inc b/inc/memcached_install.inc index f812967d5..906ab5370 100644 --- a/inc/memcached_install.inc +++ b/inc/memcached_install.inc @@ -87,7 +87,7 @@ checkigbinary() { function funct_memcachedreinstall { if [[ "$CLANG_MEMCACHED" = [yY] ]]; then - if [[ ! -f /usr/bin/clang ]]; then + if [[ "$CENTOS_SIX" = '6' && ! -f /usr/bin/clang ]] || [[ "$CENTOS_SEVEN" = '7' && ! -f /bin/clang ]]; then yum -q -y install clang clang-devel fi # ccache compiler has some initial overhead for compiles but speeds up subsequent diff --git a/inc/nginx_configure.inc b/inc/nginx_configure.inc index 46ccc134e..48d4ec251 100644 --- a/inc/nginx_configure.inc +++ b/inc/nginx_configure.inc @@ -2014,7 +2014,7 @@ fi ngxgeoipmemtweak if [[ "$CLANG" = [yY] ]]; then - if [[ ! -f /usr/bin/clang ]]; then + if [[ "$CENTOS_SIX" = '6' && ! -f /usr/bin/clang ]] || [[ "$CENTOS_SEVEN" = '7' && ! -f /bin/clang ]]; then yum -q -y install clang clang-devel fi if [[ ! -f /opt/rh/devtoolset-4/root/usr/bin/gcc || ! -f /opt/rh/devtoolset-4/root/usr/bin/g++ ]] || [[ ! -f /opt/rh/devtoolset-6/root/usr/bin/gcc || ! -f /opt/rh/devtoolset-6/root/usr/bin/g++ ]]; then diff --git a/inc/openssl_install.inc b/inc/openssl_install.inc index ec75d3e5e..5e230e569 100644 --- a/inc/openssl_install.inc +++ b/inc/openssl_install.inc @@ -221,7 +221,7 @@ installopenssl() { bash autogen.sh fi if [[ "$CLANG" = [yY] ]]; then - if [[ ! -f /usr/bin/clang ]]; then + if [[ "$CENTOS_SIX" = '6' && ! -f /usr/bin/clang ]] || [[ "$CENTOS_SEVEN" = '7' && ! -f /bin/clang ]]; then yum -q -y install clang clang-devel fi # ccache compiler has some initial overhead for compiles but speeds up subsequent diff --git a/inc/php_configure.inc b/inc/php_configure.inc index 24f7f9aa6..d8f2f3cb6 100644 --- a/inc/php_configure.inc +++ b/inc/php_configure.inc @@ -295,7 +295,7 @@ if [[ "$(grep -c "processor" /proc/cpuinfo)" -lt '2' ]]; then fi if [[ "$CLANG_PHP" = [yY] ]]; then - if [[ ! -f /usr/bin/clang ]]; then + if [[ "$CENTOS_SIX" = '6' && ! -f /usr/bin/clang ]] || [[ "$CENTOS_SEVEN" = '7' && ! -f /bin/clang ]]; then yum -q -y install clang clang-devel fi if [[ "$GCCINTEL_PHP" = [yY] ]]; then From 5ff3773ec84741da39a39808d65fa2abfd3b65ea Mon Sep 17 00:00:00 2001 From: George Liu Date: Thu, 30 Mar 2017 05:39:19 +1000 Subject: [PATCH 4/4] update libressl pair.com mirror broken replace with http://mirrors.mit.edu/pub/OpenBSD/ --- inc/downloads.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/downloads.inc b/inc/downloads.inc index 6a4b33a4a..6bc1f8f5f 100644 --- a/inc/downloads.inc +++ b/inc/downloads.inc @@ -564,7 +564,7 @@ libresslgeolocation() { curl -sI --connect-timeout 5 --max-time 5 "$LIBRESSL_LINK" | grep 'HTTP\/' | grep '200' LIBRESSL_CURLCHECK=$? if [[ "$LIBRESSL_CURLCHECK" != '0' ]]; then - LIBRESSL_MIRRORURL="http://openbsd.mirrors.pair.com/LibreSSL" + LIBRESSL_MIRRORURL="http://mirrors.mit.edu/pub/OpenBSD/LibreSSL" LIBRESSL_LINK="${LIBRESSL_MIRRORURL}/libressl-${LIBRESSL_VERSION}.tar.gz" curl -sI --connect-timeout 5 --max-time 5 "$LIBRESSL_LINK" | grep 'HTTP\/' | grep '200' LIBRESSL_CURLCHECK=$? @@ -613,7 +613,7 @@ libresslgeolocation() { curl -sI --connect-timeout 5 --max-time 5 "$LIBRESSL_LINK" | grep 'HTTP\/' | grep '200' LIBRESSL_CURLCHECK=$? if [[ "$LIBRESSL_CURLCHECK" != '0' ]]; then - LIBRESSL_MIRRORURL="http://openbsd.mirrors.pair.com/LibreSSL" + LIBRESSL_MIRRORURL="http://mirrors.mit.edu/pub/OpenBSD/LibreSSL" LIBRESSL_LINK="${LIBRESSL_MIRRORURL}/libressl-${LIBRESSL_VERSION}.tar.gz" curl -sI --connect-timeout 5 --max-time 5 "$LIBRESSL_LINK" | grep 'HTTP\/' | grep '200' LIBRESSL_CURLCHECK=$?