[tarantool-patches] Re: [PATCH v1 1/2] Reinstall curl to 7.65.0 version on OSX

[tarantool-patches] Re: [PATCH v1 1/2] Reinstall curl to 7.65.0 version on OSX

[Alexander Turenko]

Don't get why do you install 'curl-openssl', while before we install
'curl' brew package. Please, elaborate this point.

WBR, Alexander Turenko.

On Wed, Jul 03, 2019 at 04:01:50PM +0300, Alexander V. Tikhonov wrote:
> At OSX images brew now contains curl-7.65.1 which affected
> by curl/curl#3995 (this problem leads to segfaults). The next
> version is not released yet. The current commit downgrades the
> curl version to 7.65.0.
> 
> Close #4288
> ---
> 
> Github: https://github.com/tarantool/tarantool/tree/avtikhon/curl-downgrade
> Issue: https://github.com/tarantool/tarantool/issues/4288
> 
>  .travis.mk     | 17 +++++++++++++++++
>  cmake/os.cmake |  7 ++++++-
>  2 files changed, 23 insertions(+), 1 deletion(-)
> 
> diff --git a/.travis.mk b/.travis.mk
> index 6d0c42207..8ad4b0566 100644
> --- a/.travis.mk
> +++ b/.travis.mk
> @@ -51,6 +51,23 @@ deps_osx:
>  	brew update
>  	brew install openssl readline curl icu4c --force
>  	python2 -V || brew install python2 --force
> +	###################################################
> +	# Temporary workaround to curl version from
> +	# issue #4288 to downgrade from 7.65.1 to 7.65.0:
> +	# TODO: remove the workaround after 7.65.2 released
> +	# Warning message from brew installer:
> +	#   curl-openssl is keg-only, which means it was not symlinked into /usr/local,
> +	#   because macOS already provides this software and installing another version in
> +	#   parallel can cause all kinds of trouble.
> +	export PATH="/usr/local/opt/curl-openssl/bin:${PATH}"
> +	export LDFLAGS="-L/usr/local/opt/curl-openssl/lib"
> +	export CPPFLAGS="-I/usr/local/opt/curl-openssl/include"
> +	echo "Curl version before its downgrade:"
> +	curl -V
> +	brew reinstall https://raw.githubusercontent.com/Homebrew/homebrew-core/e47f3e2682fa3d8a6ee58ded40718a1326e08a6d/Formula/curl-openssl.rb
> +	echo "Curl version after its downgrade:"
> +	curl -V
> +	###################################################
>  	curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python
>  	pip install -r test-run/requirements.txt
>  
> diff --git a/cmake/os.cmake b/cmake/os.cmake
> index ea581108b..d04682f80 100644
> --- a/cmake/os.cmake
> +++ b/cmake/os.cmake
> @@ -95,7 +95,12 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
>          endif()
>  
>          # Detecting CURL
> -        execute_process(COMMAND ${HOMEBREW_EXECUTABLE} --prefix curl
> +        if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
> +            set(CURL_NAME "curl-openssl")
> +        else()
> +            set(CURL_NAME "curl")
> +        endif()
> +        execute_process(COMMAND ${HOMEBREW_EXECUTABLE} --prefix ${CURL_NAME}
>              OUTPUT_VARIABLE HOMEBREW_CURL
>              OUTPUT_STRIP_TRAILING_WHITESPACE)
>          if (DEFINED HOMEBREW_CURL)
> -- 
> 2.17.1
>