Permalink
Browse files

updated 1.9.3-p125 patches

  • Loading branch information...
skaes committed Apr 28, 2012
1 parent 6ffa8dc commit f2a1ae02fa8275450f9b52ca47ff700e5b2fc35c
@@ -0,0 +1,52 @@
+diff --git a/gc.c b/gc.c
+index e526125..0a8ee3a 100644
+--- a/gc.c
++++ b/gc.c
+@@ -1161,6 +1161,7 @@ rb_gc_clear_stats()
+ *
+ */
+
++RUBY_FUNC_EXPORTED
+ VALUE
+ rb_gc_allocated_size()
+ {
+@@ -1182,6 +1183,7 @@ rb_gc_allocated_size()
+ * GC.num_allocations #=> 150
+ *
+ */
++RUBY_FUNC_EXPORTED
+ VALUE
+ rb_gc_num_allocations()
+ {
+@@ -1515,6 +1517,7 @@ rb_gc_heap_slots()
+ *
+ */
+
++RUBY_FUNC_EXPORTED
+ VALUE
+ rb_gc_collections()
+ {
+@@ -1533,6 +1536,7 @@ rb_gc_collections()
+ *
+ */
+
++RUBY_FUNC_EXPORTED
+ VALUE
+ rb_gc_time()
+ {
+@@ -4147,6 +4151,7 @@ VALUE os_live_objects(VALUE self)
+ return ULONG2NUM(live_objects);
+ }
+
++RUBY_FUNC_EXPORTED
+ unsigned long rb_os_live_objects()
+ {
+ rb_objspace_t *objspace = &rb_objspace;
+@@ -4171,6 +4176,7 @@ VALUE os_allocated_objects(VALUE self)
+ #endif
+ }
+
++RUBY_FUNC_EXPORTED
+ unsigned LONG_LONG rb_os_allocated_objects()
+ {
+ rb_objspace_t *objspace = &rb_objspace;
@@ -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
@@ -3,3 +3,6 @@ railsexpress/02-railsbench-gc.patch
railsexpress/03-display-more-detailed-stack-trace.patch
railsexpress/04-fork-support-for-gc-logging.patch
railsexpress/05-track-live-dataset-size.patch
+railsexpress/06-export-some-symbols-for-rubyprof.patch
+railsexpress/07-revert-f6b49243eb0c21bea1c4198cdd52a549e6ead075.patch
+railsexpress/08-backport-c2086cc7ff1142b14c95c.patch

0 comments on commit f2a1ae0

Please sign in to comment.