Fix for ubuntu 11.10 ruby build

hamakn · Apr 17, 2012 · 6541a1b · 6541a1b
1 parent 4824a4b
commit 6541a1b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/dev_setup/cookbooks/ruby/libraries/ruby_install.rb b/dev_setup/cookbooks/ruby/libraries/ruby_install.rb
@@ -4,7 +4,7 @@ def cf_ruby_install(ruby_version, ruby_source, ruby_path)
     bundler_version = node[:rubygems][:bundler][:version]
     rake_version = node[:rubygems][:rake][:version]
 
-    %w[ build-essential libssl-dev zlib1g-dev libreadline5-dev libxml2-dev libpq-dev].each do |pkg|
+    %w[ build-essential libssl-dev zlib1g-dev libreadline-dev libxml2-dev libpq-dev].each do |pkg|
       package pkg
     end
 
@@ -27,6 +27,7 @@ def cf_ruby_install(ruby_version, ruby_source, ruby_path)
       user node[:deployment][:user]
       code <<-EOH
       tar xzf ruby-#{ruby_version}.tar.gz
+      patch ruby-#{ruby_version}/ext/openssl/ossl_ssl.c < /srv/vcap/dev_setup/cookbooks/ruby/patch/ossl_ssl.c.patch
       cd ruby-#{ruby_version}
       ./configure --disable-pthread --prefix=#{ruby_path}
       make

diff --git a/dev_setup/cookbooks/ruby/patch/ossl_ssl.c.patch b/dev_setup/cookbooks/ruby/patch/ossl_ssl.c.patch
@@ -0,0 +1,8 @@
+110,112c110,112
+<     OSSL_SSL_METHOD_ENTRY(SSLv2),
+<     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
+<     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
+---
+> //    OSSL_SSL_METHOD_ENTRY(SSLv2),
+> //    OSSL_SSL_METHOD_ENTRY(SSLv2_server),
+> //    OSSL_SSL_METHOD_ENTRY(SSLv2_client),