Skip to content

Commit

Permalink
Merge branch '123.08stable'
Browse files Browse the repository at this point in the history
  • Loading branch information
@centminmod
centminmod committed Dec 7, 2015
2 parents ef91b77 + 02cc2b8 commit b29a489
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 62 deletions.
62 changes: 31 additions & 31 deletions addons/customcurl.sh
View file
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion centmin.sh
View file
Expand Up @@ -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'
Expand Down
Binary file modified downloads/curlrpms.zip
View file
Binary file not shown.

0 comments on commit b29a489

Please sign in to comment.