summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>2010-05-19 01:04:07 +0200
committerDiego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>2010-05-19 01:04:07 +0200
commitdc2b86b9487d41cd90ebf2d0943bb93fdf4f1272 (patch)
tree6896f5a7265c90370bd228f7594e3ef300270cba
parentBackport patches for --no-undefined and BerkDB 5.0 from MRI 1.8.7 patchset. (diff)
downloadruby-scripts-dc2b86b9487d41cd90ebf2d0943bb93fdf4f1272.tar.gz
ruby-scripts-dc2b86b9487d41cd90ebf2d0943bb93fdf4f1272.tar.bz2
ruby-scripts-dc2b86b9487d41cd90ebf2d0943bb93fdf4f1272.zip
Add patch that Alex didn't commit before, to fix OpenSSL extension.
-rw-r--r--patchsets/patches-ee-1.8.7.2010.01/009_openssl_sk_typo.patch19
-rw-r--r--patchsets/patches-ee-1.8.7.2010.01/series1
2 files changed, 20 insertions, 0 deletions
diff --git a/patchsets/patches-ee-1.8.7.2010.01/009_openssl_sk_typo.patch b/patchsets/patches-ee-1.8.7.2010.01/009_openssl_sk_typo.patch
new file mode 100644
index 0000000..9696357
--- /dev/null
+++ b/patchsets/patches-ee-1.8.7.2010.01/009_openssl_sk_typo.patch
@@ -0,0 +1,19 @@
+Fix typos. Upstream bug #39.
+
+Index: source/ext/openssl/ossl_ssl.c
+===================================================================
+--- source.orig/ext/openssl/ossl_ssl.c
++++ source/ext/openssl/ossl_ssl.c
+@@ -1196,10 +1196,10 @@ ossl_ssl_get_peer_cert_chain(VALUE self)
+ }
+ chain = SSL_get_peer_cert_chain(ssl);
+ if(!chain) return Qnil;
+- num = sk_x509_num(chain);
++ num = sk_X509_num(chain);
+ ary = rb_ary_new2(num);
+ for (i = 0; i < num; i++){
+- cert = (X509*)sk_x509_value(chain, i);
++ cert = (X509*)sk_X509_value(chain, i);
+ rb_ary_push(ary, ossl_x509_new(cert));
+ }
+
diff --git a/patchsets/patches-ee-1.8.7.2010.01/series b/patchsets/patches-ee-1.8.7.2010.01/series
index 02e2ce4..723bf46 100644
--- a/patchsets/patches-ee-1.8.7.2010.01/series
+++ b/patchsets/patches-ee-1.8.7.2010.01/series
@@ -6,3 +6,4 @@
006_pathname_warning.patch
007_no-undefined-ext.patch
008_berkdb-5.0.patch
+009_openssl_sk_typo.patch