Skip to content

Commit

Permalink
Make Linux version use the same CA root certs as the OS X version
Browse files Browse the repository at this point in the history
Closes GH-24.
  • Loading branch information
FooBarWidget committed Jan 30, 2015
1 parent c44c0f1 commit 64fbe48
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Upgrading to this version is strongly recommended because of the OpenSSL upgrade

* Added the following native extension gems: RedCloth, escape_utils, posix-spawn, nokogumbo, github-markdown, rugged, charlock_holmes, unf_ext.
* Upgraded to OpenSSL 1.0.1l.
* The Linux version and the OS X version now use the same CA root certificates. Closes GH-24.

## Version 20141224

Expand Down
6 changes: 3 additions & 3 deletions linux/internal/build-inside-mock
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ echo ORIG_RUBYOPT=\"$RUBYOPT\"
echo ORIG_RUBYLIB=\"$RUBYLIB\"
echo LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH:$ROOT/lib\"
echo SSL_CERT_FILE=\"$ROOT/lib/cert.pem\"
echo SSL_CERT_FILE=\"$ROOT/lib/ca-bundle.crt\"
echo RUBYOPT=\"-r$ROOT/lib/restore_environment\"
echo GEM_HOME=\"$ROOT/lib/ruby/gems/2.1.0\"
echo GEM_PATH=\"$ROOT/lib/ruby/gems/2.1.0\"
Expand Down Expand Up @@ -153,9 +153,9 @@ run cp $LIBDIR/libz.so.1 /tmp/ruby/lib/
run cp $LIBDIR/libtermcap.so.2 /tmp/ruby/lib/
run cp $USRLIBDIR/libreadline.so.5 /tmp/ruby/lib/
run cp $FFILIBDIR/libffi.so.6 /tmp/ruby/lib/
run cp /etc/pki/tls/cert.pem /tmp/ruby/lib/
run cp /system/ca-bundle.crt /tmp/ruby/lib/
run cp /system/restore_environment.rb /tmp/ruby/lib/
export SSL_CERT_FILE=/tmp/ruby/lib/cert.pem
export SSL_CERT_FILE=/tmp/ruby/lib/ca-bundle.crt

# Dump various information about the Ruby binaries.
RUBY_COMPAT_VERSION=`/tmp/ruby/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]'`
Expand Down

0 comments on commit 64fbe48

Please sign in to comment.