Permalink
Browse files

patches for latest 1.9.3 release (patch level 194)

  • Loading branch information...
skaes committed Apr 28, 2012
1 parent 51dc886 commit f07624d475656fa93ee11a84e609012a2e95a1aa
@@ -0,0 +1,24 @@
+diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
+index 920caa6..1f94d97 100644
+--- a/ext/openssl/extconf.rb
++++ b/ext/openssl/extconf.rb
+@@ -43,14 +43,11 @@ if $mingw
+ have_library("wsock32")
+ have_library("gdi32")
+ end
+-
+-result = pkg_config("openssl") && have_header("openssl/ssl.h")
+-
+-unless result
+- result = have_header("openssl/ssl.h")
+- result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")}
+- result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")}
+- unless result
++result = have_header("openssl/ssl.h")
++result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")}
++result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")}
++if !result
++ unless pkg_config("openssl") and have_header("openssl/ssl.h")
+ message "=== Checking for required stuff failed. ===\n"
+ message "Makefile wasn't created. Fix the errors above.\n"
+ exit 1
@@ -0,0 +1,13 @@
+diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
+index 17e2a73..cc81d8c 100644
+--- a/lib/drb/ssl.rb
++++ b/lib/drb/ssl.rb
+@@ -54,7 +54,7 @@ module DRb
+ return
+ end
+
+- rsa = OpenSSL::PKey::RSA.new(512){|p, n|
++ rsa = OpenSSL::PKey::RSA.new(1024){|p, n|
+ next unless self[:verbose]
+ case p
+ when 0; $stderr.putc "." # BN_generate_prime
Oops, something went wrong.

0 comments on commit f07624d

Please sign in to comment.