diff --git a/addons/customcurl.sh b/addons/customcurl.sh index ec3ce2cdd..346246550 100755 --- a/addons/customcurl.sh +++ b/addons/customcurl.sh @@ -16,7 +16,7 @@ DIR_TMP='/svr-setup' # use at own risk as it can break the system # info at http://mirror.city-fan.org/ftp/contrib/sysutils/Mirroring/ CUSTOM_CURLRPM=y -CUSTOM_CURLRPMVER='7.46' # custom curl/libcurl version +CUSTOM_CURLRPMVER='7.46.0-2.0' # custom curl/libcurl version CUSTOM_CURLLIBSSHVER='1.6.0-2.0' # libssh2 version CUSTOM_CURLRPMCARESVER='1.10.0-5.0' # c-ares version CUSTOM_CURLRPMSYSURL='http://mirror.city-fan.org/ftp/contrib/sysutils/Mirroring' @@ -83,14 +83,14 @@ if [[ "$CENTOS_SIX" = '6' && "$(uname -m)" != 'x86_64' ]]; then # el6 32bit yum -y install libmetalink libssh2-devel nss-devel c-ares cd ${DIR_TMP} - if [[ ! -f "curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm + if [[ ! -f "curl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/curl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm fi - if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm + if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm fi - if [[ ! -f "libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm + if [[ ! -f "libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm fi if [[ ! -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm" ]]; then wget -cnv ${CUSTOM_CURLRPMLIBURL}/libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm @@ -109,7 +109,7 @@ if [[ "$CENTOS_SIX" = '6' && "$(uname -m)" != 'x86_64' ]]; then fi # only process with custom curl rpm update if the rpm files exist - if [[ -f "curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm" && -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm" && -f "libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm" && -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm" && -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm" && -f "c-ares-${CUSTOM_CURLRPMCARESVER}.cf.rhel6.i686.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.i686.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.i686.rpm" ]]; then + if [[ -f "curl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm" && -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm" && -f "libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm" && -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm" && -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm" && -f "c-ares-${CUSTOM_CURLRPMCARESVER}.cf.rhel6.i686.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.i686.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.i686.rpm" ]]; then rpm --nodeps -e curl rpm --nodeps -e libcurl @@ -121,9 +121,9 @@ if [[ "$CENTOS_SIX" = '6' && "$(uname -m)" != 'x86_64' ]]; then rpm -Uvh c-ares-${CUSTOM_CURLRPMCARESVER}.cf.rhel6.i686.rpm rpm -Uvh libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm rpm -Uvh libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm - rpm -Uvh libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm - rpm -Uvh libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm - rpm -Uvh curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm + rpm -Uvh libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm + rpm -Uvh libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm + rpm -Uvh curl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm rpm -Uvh libcurl7155-7.15.5-17.cf.rhel6.i686.rpm rpm -Uvh libcurl7112-7.11.2-25.cf.rhel6.i686.rpm @@ -147,14 +147,14 @@ elif [[ "$CENTOS_SIX" = '6' && "$(uname -m)" = 'x86_64' ]]; then if [[ ! -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm" ]]; then wget -cnv ${CUSTOM_CURLRPMLIBURL}/libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm fi - if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm + if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm fi - if [[ ! -f "libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm + if [[ ! -f "libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm fi - if [[ ! -f "curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm + if [[ ! -f "curl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/curl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm fi if [[ ! -f "libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm" ]]; then wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm @@ -164,7 +164,7 @@ elif [[ "$CENTOS_SIX" = '6' && "$(uname -m)" = 'x86_64' ]]; then fi # only process with custom curl rpm update if the rpm files exist - if [[ -f "c-ares-${CUSTOM_CURLRPMCARESVER}.cf.rhel6.x86_64.rpm" && -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm" && -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm" && -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm" && -f "libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm" && -f "curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm" && -f "libcurl7112-7.11.2-25.cf.rhel6.x86_64.rpm" ]]; then + if [[ -f "c-ares-${CUSTOM_CURLRPMCARESVER}.cf.rhel6.x86_64.rpm" && -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm" && -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm" && -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm" && -f "libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm" && -f "curl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm" && -f "libcurl7112-7.11.2-25.cf.rhel6.x86_64.rpm" ]]; then rpm --nodeps -e curl rpm --nodeps -e libcurl @@ -176,9 +176,9 @@ elif [[ "$CENTOS_SIX" = '6' && "$(uname -m)" = 'x86_64' ]]; then rpm -Uvh c-ares-${CUSTOM_CURLRPMCARESVER}.cf.rhel6.x86_64.rpm rpm -Uvh libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm rpm -Uvh libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm - rpm -Uvh libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm - rpm -Uvh libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm - rpm -Uvh curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm + rpm -Uvh libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm + rpm -Uvh libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm + rpm -Uvh curl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm rpm -Uvh libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm rpm -Uvh libcurl7112-7.11.2-25.cf.rhel6.x86_64.rpm @@ -196,14 +196,14 @@ elif [[ "$CENTOS_SEVEN" = '7' && "$(uname -m)" = 'x86_64' ]]; then # if [[ ! -f "libmetalink-0.1.2-4.el7.x86_64.rpm" ]]; then # wget -cnv ftp://ftp.sunet.se/pub/Linux/distributions/fedora/epel/7/x86_64/libmetalink-0.1.2-4.el7.x86_64.rpm # fi - if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm + if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/curl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm fi - if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm + if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm fi - if [[ ! -f "libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm + if [[ ! -f "libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm fi if [[ ! -f "libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm" ]]; then wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm @@ -219,7 +219,7 @@ elif [[ "$CENTOS_SEVEN" = '7' && "$(uname -m)" = 'x86_64' ]]; then fi # only process with custom curl rpm update if the rpm files exist - if [[ -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm" && -f "libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm" && -f "curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm" && -f "libcurl7112-7.11.2-25.cf.rhel6.x86_64.rpm" && -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel7.x86_64.rpm" && -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel7.x86_64.rpm" ]]; then + if [[ -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm" && -f "libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm" && -f "curl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm" && -f "libcurl7112-7.11.2-25.cf.rhel6.x86_64.rpm" && -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel7.x86_64.rpm" && -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel7.x86_64.rpm" ]]; then rpm --nodeps -e curl rpm --nodeps -e libcurl @@ -230,9 +230,9 @@ elif [[ "$CENTOS_SEVEN" = '7' && "$(uname -m)" = 'x86_64' ]]; then # rpm -ivh libmetalink-0.1.2-4.el7.x86_64.rpm rpm -Uvh libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel7.x86_64.rpm rpm -Uvh libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel7.x86_64.rpm - rpm -Uvh libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm - rpm -Uvh libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm - rpm -Uvh curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm + rpm -Uvh libcurl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm + rpm -Uvh libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm + rpm -Uvh curl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm rpm -Uvh libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm rpm -Uvh libcurl7112-7.11.2-25.cf.rhel6.x86_64.rpm diff --git a/centmin.sh b/centmin.sh index ec5140f51..4849298f4 100755 --- a/centmin.sh +++ b/centmin.sh @@ -451,7 +451,7 @@ ATRPMSREPO_DISABLE=y # use at own risk as it can break the system # info at http://mirror.city-fan.org/ftp/contrib/sysutils/Mirroring/ CUSTOM_CURLRPM=n -CUSTOM_CURLRPMVER='7.46' # custom curl/libcurl version +CUSTOM_CURLRPMVER='7.46.0-2.0' # custom curl/libcurl version CUSTOM_CURLLIBSSHVER='1.6.0-2.0' # libssh2 version CUSTOM_CURLRPMCARESVER='1.10.0-5.0' # c-ares version CUSTOM_CURLRPMSYSURL='http://mirror.city-fan.org/ftp/contrib/sysutils/Mirroring' diff --git a/downloads/curlrpms.zip b/downloads/curlrpms.zip index 0ed610809..a9a8cb98f 100644 Binary files a/downloads/curlrpms.zip and b/downloads/curlrpms.zip differ diff --git a/inc/customrpms.inc b/inc/customrpms.inc index 7b72e0d9d..548126c64 100644 --- a/inc/customrpms.inc +++ b/inc/customrpms.inc @@ -18,14 +18,14 @@ if [[ "$CENTOS_SIX" = '6' && "$(uname -m)" != 'x86_64' ]]; then # el6 32bit yum -y install libmetalink libssh2-devel nss-devel c-ares cd ${DIR_TMP} - if [[ ! -f "curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm + if [[ ! -f "curl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/curl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm fi - if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm + if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm fi - if [[ ! -f "libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm + if [[ ! -f "libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm fi if [[ ! -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm" ]]; then wget -cnv ${CUSTOM_CURLRPMLIBURL}/libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm @@ -44,7 +44,7 @@ if [[ "$CENTOS_SIX" = '6' && "$(uname -m)" != 'x86_64' ]]; then fi # only process with custom curl rpm update if the rpm files exist - if [[ -f "curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm" && -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm" && -f "libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm" && -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm" && -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm" && -f "c-ares-${CUSTOM_CURLRPMCARESVER}.cf.rhel6.i686.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.i686.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.i686.rpm" ]]; then + if [[ -f "curl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm" && -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm" && -f "libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm" && -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm" && -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm" && -f "c-ares-${CUSTOM_CURLRPMCARESVER}.cf.rhel6.i686.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.i686.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.i686.rpm" ]]; then rpm --nodeps -e curl rpm --nodeps -e libcurl @@ -56,9 +56,9 @@ if [[ "$CENTOS_SIX" = '6' && "$(uname -m)" != 'x86_64' ]]; then rpm -Uvh c-ares-${CUSTOM_CURLRPMCARESVER}.cf.rhel6.i686.rpm rpm -Uvh libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm rpm -Uvh libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.i686.rpm - rpm -Uvh libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm - rpm -Uvh libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm - rpm -Uvh curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.i686.rpm + rpm -Uvh libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm + rpm -Uvh libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm + rpm -Uvh curl-${CUSTOM_CURLRPMVER}.cf.rhel6.i686.rpm rpm -Uvh libcurl7155-7.15.5-17.cf.rhel6.i686.rpm rpm -Uvh libcurl7112-7.11.2-25.cf.rhel6.i686.rpm @@ -82,14 +82,14 @@ elif [[ "$CENTOS_SIX" = '6' && "$(uname -m)" = 'x86_64' ]]; then if [[ ! -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm" ]]; then wget -cnv ${CUSTOM_CURLRPMLIBURL}/libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm fi - if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm + if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm fi - if [[ ! -f "libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm + if [[ ! -f "libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm fi - if [[ ! -f "curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm + if [[ ! -f "curl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/curl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm fi if [[ ! -f "libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm" ]]; then wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm @@ -99,7 +99,7 @@ elif [[ "$CENTOS_SIX" = '6' && "$(uname -m)" = 'x86_64' ]]; then fi # only process with custom curl rpm update if the rpm files exist - if [[ -f "c-ares-${CUSTOM_CURLRPMCARESVER}.cf.rhel6.x86_64.rpm" && -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm" && -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm" && -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm" && -f "libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm" && -f "curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm" && -f "libcurl7112-7.11.2-25.cf.rhel6.x86_64.rpm" ]]; then + if [[ -f "c-ares-${CUSTOM_CURLRPMCARESVER}.cf.rhel6.x86_64.rpm" && -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm" && -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm" && -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm" && -f "libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm" && -f "curl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm" && -f "libcurl7112-7.11.2-25.cf.rhel6.x86_64.rpm" ]]; then rpm --nodeps -e curl rpm --nodeps -e libcurl @@ -111,9 +111,9 @@ elif [[ "$CENTOS_SIX" = '6' && "$(uname -m)" = 'x86_64' ]]; then rpm -Uvh c-ares-${CUSTOM_CURLRPMCARESVER}.cf.rhel6.x86_64.rpm rpm -Uvh libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm rpm -Uvh libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel6.x86_64.rpm - rpm -Uvh libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm - rpm -Uvh libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm - rpm -Uvh curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel6.x86_64.rpm + rpm -Uvh libcurl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm + rpm -Uvh libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm + rpm -Uvh curl-${CUSTOM_CURLRPMVER}.cf.rhel6.x86_64.rpm rpm -Uvh libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm rpm -Uvh libcurl7112-7.11.2-25.cf.rhel6.x86_64.rpm @@ -131,14 +131,14 @@ elif [[ "$CENTOS_SEVEN" = '7' && "$(uname -m)" = 'x86_64' ]]; then # if [[ ! -f "libmetalink-0.1.2-4.el7.x86_64.rpm" ]]; then # wget -cnv ftp://ftp.sunet.se/pub/Linux/distributions/fedora/epel/7/x86_64/libmetalink-0.1.2-4.el7.x86_64.rpm # fi - if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm + if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/curl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm fi - if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm + if [[ ! -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm fi - if [[ ! -f "libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm" ]]; then - wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm + if [[ ! -f "libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm" ]]; then + wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm fi if [[ ! -f "libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm" ]]; then wget -cnv ${CUSTOM_CURLRPMSYSURL}/libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm @@ -154,7 +154,7 @@ elif [[ "$CENTOS_SEVEN" = '7' && "$(uname -m)" = 'x86_64' ]]; then fi # only process with custom curl rpm update if the rpm files exist - if [[ -f "libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm" && -f "libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm" && -f "curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm" && -f "libcurl7112-7.11.2-25.cf.rhel6.x86_64.rpm" && -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel7.x86_64.rpm" && -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel7.x86_64.rpm" ]]; then + if [[ -f "libcurl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm" && -f "libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm" && -f "curl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm" && -f "libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm" && -f "libcurl7112-7.11.2-25.cf.rhel6.x86_64.rpm" && -f "libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel7.x86_64.rpm" && -f "libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel7.x86_64.rpm" ]]; then rpm --nodeps -e curl rpm --nodeps -e libcurl @@ -165,9 +165,9 @@ elif [[ "$CENTOS_SEVEN" = '7' && "$(uname -m)" = 'x86_64' ]]; then # rpm -ivh libmetalink-0.1.2-4.el7.x86_64.rpm rpm -Uvh libssh2-${CUSTOM_CURLLIBSSHVER}.cf.rhel7.x86_64.rpm rpm -Uvh libssh2-devel-${CUSTOM_CURLLIBSSHVER}.cf.rhel7.x86_64.rpm - rpm -Uvh libcurl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm - rpm -Uvh libcurl-devel-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm - rpm -Uvh curl-${CUSTOM_CURLRPMVER}.0-1.0.cf.rhel7.x86_64.rpm + rpm -Uvh libcurl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm + rpm -Uvh libcurl-devel-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm + rpm -Uvh curl-${CUSTOM_CURLRPMVER}.cf.rhel7.x86_64.rpm rpm -Uvh libcurl7155-7.15.5-17.cf.rhel6.x86_64.rpm rpm -Uvh libcurl7112-7.11.2-25.cf.rhel6.x86_64.rpm