bleak_house 4.2.1 → 4.3

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v4.3. Build against OpenSSL 0.9.8j or later (kennethkalmer). Bugfixes (Pete Hodgson, joshuabates).
+
 v4.2.1. Harden patch/build process. Fix bug.
 
 v4.1.1. Update bundled Ruby to patchlevel 230.

data/Manifest

@@ -13,6 +13,7 @@ LICENSE_BSD
 Manifest
 Rakefile
 README
+ruby/ruby-1.8.6-openssl.patch
 ruby/ruby-1.8.6-p286.tar.bz2
 ruby/ruby.patch
 ruby/valgrind.patch

data/bleak_house.gemspec

@@ -2,39 +2,35 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bleak_house}
-  s.version = "4.2.1"
+  s.version = "4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2009-02-20}
+  s.date = %q{2009-08-15}
   s.default_executable = %q{bleak}
   s.description = %q{A library for finding memory leaks.}
   s.email = %q{}
   s.executables = ["bleak"]
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["CHANGELOG", "ext/snapshot.c", "lib/bleak_house/analyzer.rb", "lib/bleak_house/hook.rb", "lib/bleak_house.rb", "LICENSE", "LICENSE_BSD", "README", "TODO"]
-  s.files = ["bin/bleak", "CHANGELOG", "ext/build_ruby.rb", "ext/build_snapshot.rb", "ext/extconf.rb", "ext/snapshot.c", "ext/snapshot.h", "lib/bleak_house/analyzer.rb", "lib/bleak_house/hook.rb", "lib/bleak_house.rb", "LICENSE", "LICENSE_BSD", "Manifest", "Rakefile", "README", "ruby/ruby-1.8.6-p286.tar.bz2", "ruby/ruby.patch", "ruby/valgrind.patch", "test/benchmark/bench.rb", "test/test_helper.rb", "test/unit/test_bleak_house.rb", "TODO", "bleak_house.gemspec"]
-  s.has_rdoc = true
+  s.files = ["bin/bleak", "CHANGELOG", "ext/build_ruby.rb", "ext/build_snapshot.rb", "ext/extconf.rb", "ext/snapshot.c", "ext/snapshot.h", "lib/bleak_house/analyzer.rb", "lib/bleak_house/hook.rb", "lib/bleak_house.rb", "LICENSE", "LICENSE_BSD", "Manifest", "Rakefile", "README", "ruby/ruby-1.8.6-openssl.patch", "ruby/ruby-1.8.6-p286.tar.bz2", "ruby/ruby.patch", "ruby/valgrind.patch", "test/benchmark/bench.rb", "test/test_helper.rb", "test/unit/test_bleak_house.rb", "TODO", "bleak_house.gemspec"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/bleak_house/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Bleak_house", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{A library for finding memory leaks.}
   s.test_files = ["test/test_helper.rb", "test/unit/test_bleak_house.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/ext/build_ruby.rb

@@ -62,8 +62,29 @@ else
           puts "** Patch Ruby"
           execute("patch -p0 < '#{source_dir}/ruby.patch'")
 
+	  puts "** Determining OpenSSL version"
+	  cmd = open("|openssl version")
+	  openssl_version_string = cmd.gets
+	  cmd.close
+
+          if openssl_version_string.nil?
+	    puts "** Could not determine openssl version, skipping patches"
+	  else
+	    openssl_version = openssl_version_string.split(/\s/)[1]
+	    if openssl_version >= "0.9.8j"
+	      puts "** Applying openssl patches to build against #{openssl_version_string}"
+	      execute( "patch -p3 < '#{source_dir}/ruby-1.8.6-openssl.patch'")
+	    else
+	      puts "** No patching need for #{openssl_version_string}"
+	    end
+	  end
+
+          env = Config::CONFIG.map do |key, value|
+            "#{key}=#{value.inspect}" if key.upcase == key and value
+          end.compact.join(" ")            
+
           puts "** Configure"
-          execute("./configure #{Config::CONFIG['configure_args']}".sub("'--enable-shared'", ""))
+          execute("env #{env} ./configure #{Config::CONFIG['configure_args']}".sub("'--enable-shared'", ""))
 
           puts "Patch Makefile"
           # FIXME Why is this necessary?
@@ -86,25 +107,21 @@ else
           constants.each do | const, key |
             config_h.gsub!(/#define #{const} .*/, "#define #{const} \"#{Config::CONFIG[key]}\"")
           end
-
           File.open('config.h', 'w') do |f| 
             f.puts(config_h)
           end
           
-          env = Config::CONFIG.map do |key, value|
-            "#{key}=#{value.inspect}" if key.upcase == key and value
-          end.compact.join(" ")            
-
           puts "** Make"
           execute("env #{env} make")
 
-          binary = "#{Config::CONFIG['bindir']}/ruby-bleak-house"
+          bleak_binary = "#{Config::CONFIG['bindir']}/ruby-bleak-house"
+          ruby_binary = Config::CONFIG["RUBY_INSTALL_NAME"] || "ruby"
 
           puts "** Install binary"
-          if File.exist? "ruby"
+          if File.exist? ruby_binary
             # Avoid "Text file busy" error
-            File.delete binary if File.exist? binary
-            exec("cp ./ruby #{binary}; chmod 755 #{binary}")
+            File.delete bleak_binary if File.exist? bleak_binary
+            exec("cp ./#{ruby_binary} #{bleak_binary}; chmod 755 #{bleak_binary}")
           else
             raise
           end

data/lib/bleak_house/hook.rb

@@ -3,7 +3,7 @@ module BleakHouse
   # The body of the exit handler and <tt>SIGUSR2</tt> trap. It writes a snapshot to a dumpfile named after the current Process.pid.
   def self.hook
     @count ||= 0
-    filename = "/tmp/bleak.#{Process.pid}.#{@count}.dump"
+    filename = "/tmp/bleak.%s.%03i.dump" % [Process.pid,@count]
     STDERR.puts "** BleakHouse: working..."
     BleakHouse.snapshot(filename)
     STDERR.puts "** BleakHouse: complete\n** Bleakhouse: Run 'bleak #{filename}' to analyze."
@@ -20,4 +20,4 @@ end
 
 Kernel.trap("USR2") do
   BleakHouse.hook
-end
+end

data/ruby/ruby-1.8.6-openssl.patch

@@ -0,0 +1,157 @@
+This patch backports changes from ruby 1.8.7 which only includes the
+openssl prototypes for functions that are not in the system openssl
+library. This fixes #254307 and protects against similar issues with
+future openssl versions.
+
+diff -u ruby-1.8.6_p287-r10/work/ruby-1.8.6-p287/ext/openssl/extconf.rb ruby-1.8.7_p72-r1/work/ruby-1.8.7-p72/ext/openssl/extconf.rb
+--- ruby-1.8.6_p287-r10/work/ruby-1.8.6-p287/ext/openssl/openssl_missing.c	2007-02-13 00:01:19.000000000 +0100
++++ ruby-1.8.7_p72-r1/work/ruby-1.8.7-p72/ext/openssl/openssl_missing.c	2008-05-19 05:00:52.000000000 +0200
+@@ -22,17 +22,15 @@
+ #include "openssl_missing.h"
+ 
+ #if !defined(HAVE_HMAC_CTX_COPY)
+-int
++void
+ HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
+ {
+-    if (!out || !in) return 0;
++    if (!out || !in) return;
+     memcpy(out, in, sizeof(HMAC_CTX));
+ 
+-    if (!EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx)
+-	    || !EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx)
+-	    || !EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx))
+-	return 0;
+-    return 1;
++    EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx);
++    EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx);
++    EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx);
+ }
+ #endif /* HAVE_HMAC_CTX_COPY */
+ #endif /* NO_HMAC */
+diff -u ruby-1.8.6_p287-r10/work/ruby-1.8.6-p287/ext/openssl/openssl_missing.h ruby-1.8.7_p72-r1/work/ruby-1.8.7-p72/ext/openssl/openssl_missing.h
+--- ruby-1.8.6_p287-r10/work/ruby-1.8.6-p287/ext/openssl/openssl_missing.h	2008-08-04 06:43:34.000000000 +0200
++++ ruby-1.8.7_p72-r1/work/ruby-1.8.7-p72/ext/openssl/openssl_missing.h	2008-08-04 06:44:17.000000000 +0200
+@@ -60,14 +60,33 @@
+ 	(char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
+ #endif
+ 
++#if !defined(HAVE_EVP_MD_CTX_INIT)
+ void HMAC_CTX_init(HMAC_CTX *ctx);
+-int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
++#endif
++
++#if !defined(HAVE_HMAC_CTX_COPY)
++void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
++#endif
++
++#if !defined(HAVE_HMAC_CTX_CLEANUP)
+ void HMAC_CTX_cleanup(HMAC_CTX *ctx);
++#endif
+ 
++#if !defined(HAVE_EVP_MD_CTX_CREATE)
+ EVP_MD_CTX *EVP_MD_CTX_create(void);
++#endif
++
++#if !defined(HAVE_EVP_MD_CTX_INIT)
+ void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
++#endif
++
++#if !defined(HAVE_EVP_MD_CTX_CLEANUP)
+ int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
++#endif
++
++#if !defined(HAVE_EVP_MD_CTX_DESTROY)
+ void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
++#endif
+ 
+ #if !defined(HAVE_EVP_CIPHER_CTX_COPY)
+ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
+@@ -111,19 +130,54 @@
+ #define OPENSSL_cleanse(p, l) memset(p, 0, l)
+ #endif
+ 
++#if !defined(HAVE_X509_STORE_SET_EX_DATA)
+ void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
+ int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
++#endif
++
++#if !defined(HAVE_X509_CRL_SET_VERSION)
+ int X509_CRL_set_version(X509_CRL *x, long version);
++#endif
++
++#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME)
+ int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
++#endif
++
++#if !defined(HAVE_X509_CRL_SORT)
+ int X509_CRL_sort(X509_CRL *c);
++#endif
++
++#if !defined(HAVE_X509_CRL_ADD0_REVOKED)
+ int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
++#endif
++
++#if !defined(HAVE_BN_MOD_SQR)
+ int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
++#endif
++
++#if !defined(HAVE_BN_MOD_ADD)
+ int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
++#endif
++
++#if !defined(HAVE_BN_MOD_SUB)
+ int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
++#endif
++
++#if !defined(HAVE_BN_RAND_RANGE)
+ int BN_rand_range(BIGNUM *r, BIGNUM *range);
++#endif
++
++#if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
+ int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
++#endif
++
++#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
+ char *CONF_get1_default_config_file(void);
++#endif
++
++#if !defined(HAVE_PEM_DEF_CALLBACK)
+ int PEM_def_callback(char *buf, int num, int w, void *key);
++#endif
+ 
+ #if defined(__cplusplus)
+ }
+diff -u ruby-1.8.6_p287-r10/work/ruby-1.8.6-p287/ext/openssl/ossl_hmac.c ruby-1.8.7_p72-r1/work/ruby-1.8.7-p72/ext/openssl/ossl_hmac.c
+--- ruby-1.8.6_p287-r10/work/ruby-1.8.6-p287/ext/openssl/ossl_hmac.c	2007-03-12 05:12:32.000000000 +0100
++++ ruby-1.8.7_p72-r1/work/ruby-1.8.7-p72/ext/openssl/ossl_hmac.c	2008-05-19 05:00:52.000000000 +0200
+@@ -81,12 +87,15 @@
+     GetHMAC(self, ctx1);
+     SafeGetHMAC(other, ctx2);
+ 
+-    if (!HMAC_CTX_copy(ctx1, ctx2)) {
+-	ossl_raise(eHMACError, NULL);
+-    }
++    HMAC_CTX_copy(ctx1, ctx2);
+     return self;
+ }
+ 
++/*
++ *  call-seq:
++ *     hmac.update(string) -> self
++ *
++ */
+ static VALUE
+ ossl_hmac_update(VALUE self, VALUE data)
+ {
+@@ -104,9 +113,7 @@
+ {
+     HMAC_CTX final;
+ 
+-    if (!HMAC_CTX_copy(&final, ctx)) {
+-	ossl_raise(eHMACError, NULL);
+-    }
++    HMAC_CTX_copy(&final, ctx);
+     if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) {
+ 	HMAC_CTX_cleanup(&final);
+ 	OSSL_Debug("Allocating %d mem", HMAC_size(&final));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bleak_house
 version: !ruby/object:Gem::Version 
-  version: 4.2.1
+  version: "4.3"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,19 +30,10 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-02-20 00:00:00 -08:00
+date: 2009-08-15 00:00:00 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 description: A library for finding memory leaks.
 email: ""
 executables: 
@@ -75,6 +66,7 @@ files:
 - Manifest
 - Rakefile
 - README
+- ruby/ruby-1.8.6-openssl.patch
 - ruby/ruby-1.8.6-p286.tar.bz2
 - ruby/ruby.patch
 - ruby/valgrind.patch
@@ -85,6 +77,8 @@ files:
 - bleak_house.gemspec
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/bleak_house/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -111,9 +105,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A library for finding memory leaks.
 test_files: 
 - test/test_helper.rb