Explicitly declare OpenSSL condition and URL in the definition files (a0ace79c) · Commits · mirror / rbenv / ruby-build mirror

bin/ruby-build

+30 −32

Original line number	Diff line number	Diff line
		@@ -516,11 +516,12 @@ verify_gcc() {
		echo "$gcc"
		}

		build_package_replace_osx_openssl() {
		# Check for broken OpenSSL build shipped with OSX.
		if [ "$(uname -s)" = "Darwin" ] &&
		has_broken_mac_openssl() {
		[ "$(uname -s)" = "Darwin" ] &&
		[ "$(openssl version 2>/dev/null \|\| true)" = "OpenSSL 0.9.8r 8 Feb 2011" ]
		then
		}

		build_package_mac_openssl() {
		# Install to a subdirectory since we don't want shims for bin/openssl.
		OPENSSL_PREFIX_PATH="${PREFIX_PATH}/openssl"

		@@ -547,12 +548,9 @@ build_package_replace_osx_openssl() {
		# gives precedence to the last -j option, so we can override that.
		package_option openssl make -j 1

		install_package "openssl-1.0.1c" "https://www.openssl.org/source/openssl-1.0.1c.tar.gz#ae412727c8c15b67880aef7bd2999b2e" standard install_cacerts_from_keychain
		fi
		}
		build_package_standard "$@"

		# Extract root certs from the system keychain if .pem format and rehash.
		build_package_install_cacerts_from_keychain() {
		security find-certificate -a -p /Library/Keychains/System.keychain > "$OPENSSLDIR/cacert.pem"
		c_rehash "$OPENSSLDIR" >&4 2>&1
		}

+5 −1

Original line number	Diff line number	Diff line
		install_git "ruby-2.0.0-dev" "https://github.com/ruby/ruby.git" "trunk" replace_osx_openssl autoconf standard verify_openssl
		if has_broken_mac_openssl; then
		install_package "openssl-1.0.1c" "https://www.openssl.org/source/openssl-1.0.1c.tar.gz#ae412727c8c15b67880aef7bd2999b2e" mac_openssl
		fi

		install_git "ruby-2.0.0-dev" "https://github.com/ruby/ruby.git" "trunk" autoconf standard verify_openssl

+5 −1

Original line number	Diff line number	Diff line
		if has_broken_mac_openssl; then
		install_package "openssl-1.0.1c" "https://www.openssl.org/source/openssl-1.0.1c.tar.gz#ae412727c8c15b67880aef7bd2999b2e" mac_openssl
		fi

		install_package "yaml-0.1.4" "http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz#36c852831d02cf90508c29852361d01b"
		install_package "ruby-2.0.0-preview1" "http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-preview1.tar.gz#c7d73f3ddb6d25e7733626ddbad04158" replace_osx_openssl standard verify_openssl
		install_package "ruby-2.0.0-preview1" "http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-preview1.tar.gz#c7d73f3ddb6d25e7733626ddbad04158" standard verify_openssl

+5 −1

Original line number	Diff line number	Diff line
		install_package "ruby-2.0.0-preview2" "http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-preview2.tar.gz#eaddcbf63dc775708de45c7a81ab54b9" replace_osx_openssl standard verify_openssl
		if has_broken_mac_openssl; then
		install_package "openssl-1.0.1c" "https://www.openssl.org/source/openssl-1.0.1c.tar.gz#ae412727c8c15b67880aef7bd2999b2e" mac_openssl
		fi

		install_package "ruby-2.0.0-preview2" "http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-preview2.tar.gz#eaddcbf63dc775708de45c7a81ab54b9" standard verify_openssl

+5 −1

Original line number	Diff line number	Diff line
		install_package "ruby-2.0.0-rc1" "http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-rc1.tar.gz#7d587dde85e0edf7a2e4f6783e6c0e2e" replace_osx_openssl standard verify_openssl
		if has_broken_mac_openssl; then
		install_package "openssl-1.0.1c" "https://www.openssl.org/source/openssl-1.0.1c.tar.gz#ae412727c8c15b67880aef7bd2999b2e" mac_openssl
		fi

		install_package "ruby-2.0.0-rc1" "http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-rc1.tar.gz#7d587dde85e0edf7a2e4f6783e6c0e2e" standard verify_openssl