Permalink
Browse files

updated patches for 1.9.3-head

  • Loading branch information...
1 parent f07624d commit 6ffa8dc439df8caabf356ae5fb608a617cc8deb0 @skaes skaes committed Apr 28, 2012
View
@@ -60,7 +60,8 @@ there's no guarantee. The following versions are currently supported:
1.9.2-p180 #
1.9.2-p290 #
1.9.2-p318 # current rvm default for MRI-ruby 1.9.2
- 1.9.3-p125 # current rvm default for MRI-ruby 1.9.3
+ 1.9.3-p125 #
+ 1.9.3-p194 # current rvm default for MRI-ruby 1.9.3
In order to make some patch level n the default for rvm, add the line
@@ -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
@@ -1,5 +1,5 @@
diff --git a/configure.in b/configure.in
-index 9632860..abf1797 100644
+index 6d24689..2e85528 100644
--- a/configure.in
+++ b/configure.in
@@ -2457,6 +2457,10 @@ if test "$EXEEXT" = .exe; then
@@ -51,10 +51,10 @@ index 50451f3..3988869 100644
void rb_gc_set_params(void);
/* hash.c */
diff --git a/process.c b/process.c
-index 2a16757..8a6013c 100644
+index 99cfc69..8bee602 100644
--- a/process.c
+++ b/process.c
-@@ -2782,9 +2782,11 @@ rb_f_fork(VALUE obj)
+@@ -2804,9 +2804,11 @@ rb_f_fork(VALUE obj)
rb_pid_t pid;
rb_secure(2);
@@ -1,4 +1,6 @@
-railsexpress/01-railsbench-gc.patch
-railsexpress/02-display-more-detailed-stack-trace.patch
-railsexpress/03-fork-support-for-gc-logging.patch
-railsexpress/04-track-live-dataset-size.patch
+railsexpress/01-revert-f6b49243eb0c21bea1c4198cdd52a549e6ead075.patch
+railsexpress/02-backport-c2086cc7ff1142b14c95c.patch
+railsexpress/03-railsbench-gc.patch
+railsexpress/04-display-more-detailed-stack-trace.patch
+railsexpress/05-fork-support-for-gc-logging.patch
+railsexpress/06-track-live-dataset-size.patch

0 comments on commit 6ffa8dc

Please sign in to comment.