<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[69657] trunk/dports/lang/ruby19</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/69657">69657</a></dd>
<dt>Author</dt> <dd>kimuraw@macports.org</dd>
<dt>Date</dt> <dd>2010-07-12 10:38:17 -0700 (Mon, 12 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>lang/ruby19: fix #25611, build failure with openssl 1.0.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangruby19Portfile">trunk/dports/lang/ruby19/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangruby19filespatchbug25611diff">trunk/dports/lang/ruby19/files/patch-bug25611.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangruby19Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/ruby19/Portfile (69656 => 69657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/ruby19/Portfile 2010-07-12 16:37:05 UTC (rev 69656)
+++ trunk/dports/lang/ruby19/Portfile 2010-07-12 17:38:17 UTC (rev 69657)
</span><span class="lines">@@ -45,7 +45,12 @@
</span><span class="cx"> # SocketError "getaddrinfo: nodename nor servname provided, or not
</span><span class="cx"> # known (SocketError)"
</span><span class="cx"> # http://redmine.ruby-lang.org/issues/show/3124
</span><del>-patchfiles patch-ruby_core_29427.diff
</del><ins>+# (note: 1.9.2 does not need this patch)
+# #25611: build failure with openssl 1.0.0
+# patch from http://redmine.ruby-lang.org/issues/show/2022
+# (note: 1.9.2 does not need this patch)
+patchfiles patch-ruby_core_29427.diff \
+ patch-bug25611.diff
</ins><span class="cx">
</span><span class="cx"> # Ignore minor version for archdir, like i686-darwin9.
</span><span class="cx"> # Port "ruby" does the same.
</span></span></pre></div>
<a id="trunkdportslangruby19filespatchbug25611diff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/ruby19/files/patch-bug25611.diff (0 => 69657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/ruby19/files/patch-bug25611.diff (rev 0)
+++ trunk/dports/lang/ruby19/files/patch-bug25611.diff 2010-07-12 17:38:17 UTC (rev 69657)
</span><span class="lines">@@ -0,0 +1,347 @@
</span><ins>+Index: ext/openssl/ossl_x509attr.c
+===================================================================
+--- ext/openssl/ossl_x509attr.c (revision 28618)
++++ ext/openssl/ossl_x509attr.c (working copy)
+@@ -218,8 +218,9 @@
+ ossl_str_adjust(str, p);
+ }
+ else{
+- length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL,
+- i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
++ length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set,
++ (unsigned char **) NULL, i2d_ASN1_TYPE,
++ V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
+ str = rb_str_new(0, length);
+ p = (unsigned char *)RSTRING_PTR(str);
+ i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p,
+Index: ext/openssl/ossl_ssl.c
+===================================================================
+--- ext/openssl/ossl_ssl.c (revision 28618)
++++ ext/openssl/ossl_ssl.c (working copy)
+@@ -1195,10 +1195,10 @@
+ }
+ chain = SSL_get_peer_cert_chain(ssl);
+ if(!chain) return Qnil;
+- num = sk_num(chain);
++ num = sk_X509_num(chain);
+ ary = rb_ary_new2(num);
+ for (i = 0; i < num; i++){
+- cert = (X509*)sk_value(chain, i);
++ cert = sk_X509_value(chain, i);
+ rb_ary_push(ary, ossl_x509_new(cert));
+ }
+
+Index: ext/openssl/ossl.c
+===================================================================
+--- ext/openssl/ossl.c (revision 28618)
++++ ext/openssl/ossl.c (working copy)
+@@ -92,7 +92,7 @@
+
+ #define OSSL_IMPL_SK2ARY(name, type) \
+ VALUE \
+-ossl_##name##_sk2ary(STACK *sk) \
++ossl_##name##_sk2ary(STACK_OF(type) *sk) \
+ { \
+ type *t; \
+ int i, num; \
+@@ -102,7 +102,7 @@
+ OSSL_Debug("empty sk!"); \
+ return Qnil; \
+ } \
+- num = sk_num(sk); \
++ num = sk_##type##_num(sk); \
+ if (num < 0) { \
+ OSSL_Debug("items in sk < -1???"); \
+ return rb_ary_new(); \
+@@ -110,7 +110,7 @@
+ ary = rb_ary_new2(num); \
+ \
+ for (i=0; i<num; i++) { \
+- t = (type *)sk_value(sk, i); \
++ t = sk_##type##_value(sk, i); \
+ rb_ary_push(ary, ossl_##name##_new(t)); \
+ } \
+ return ary; \
+Index: ext/openssl/ossl.h
+===================================================================
+--- ext/openssl/ossl.h (revision 28618)
++++ ext/openssl/ossl.h (working copy)
+@@ -104,6 +104,13 @@
+ } while (0)
+
+ /*
++ * Compatibility
++ */
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#define STACK _STACK
++#endif
++
++/*
+ * String to HEXString conversion
+ */
+ int string2hex(const unsigned char *, int, char **, int *);
+Index: ext/openssl/ossl_x509crl.c
+===================================================================
+--- ext/openssl/ossl_x509crl.c (revision 28618)
++++ ext/openssl/ossl_x509crl.c (working copy)
+@@ -264,7 +264,7 @@
+ VALUE ary, revoked;
+
+ GetX509CRL(self, crl);
+- num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl));
++ num = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl));
+ if (num < 0) {
+ OSSL_Debug("num < 0???");
+ return rb_ary_new();
+@@ -272,7 +272,7 @@
+ ary = rb_ary_new2(num);
+ for(i=0; i<num; i++) {
+ /* NO DUP - don't free! */
+- rev = (X509_REVOKED *)sk_X509_CRL_value(X509_CRL_get_REVOKED(crl), i);
++ rev = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
+ revoked = ossl_x509revoked_new(rev);
+ rb_ary_push(ary, revoked);
+ }
+Index: ext/openssl/ossl_pkcs7.c
+===================================================================
+--- ext/openssl/ossl_pkcs7.c (revision 28618)
++++ ext/openssl/ossl_pkcs7.c (working copy)
+@@ -572,11 +572,33 @@
+ return self;
+ }
+
+-static STACK *
+-pkcs7_get_certs_or_crls(VALUE self, int want_certs)
++static STACK_OF(X509) *
++pkcs7_get_certs(VALUE self)
+ {
+ PKCS7 *pkcs7;
+ STACK_OF(X509) *certs;
++ int i;
++
++ GetPKCS7(self, pkcs7);
++ i = OBJ_obj2nid(pkcs7->type);
++ switch(i){
++ case NID_pkcs7_signed:
++ certs = pkcs7->d.sign->cert;
++ break;
++ case NID_pkcs7_signedAndEnveloped:
++ certs = pkcs7->d.signed_and_enveloped->cert;
++ break;
++ default:
++ certs = NULL;
++ }
++
++ return certs;
++}
++
++static STACK_OF(X509_CRL) *
++pkcs7_get_crls(VALUE self)
++{
++ PKCS7 *pkcs7;
+ STACK_OF(X509_CRL) *crls;
+ int i;
+
+@@ -584,18 +606,16 @@
+ i = OBJ_obj2nid(pkcs7->type);
+ switch(i){
+ case NID_pkcs7_signed:
+- certs = pkcs7->d.sign->cert;
+ crls = pkcs7->d.sign->crl;
+ break;
+ case NID_pkcs7_signedAndEnveloped:
+- certs = pkcs7->d.signed_and_enveloped->cert;
+ crls = pkcs7->d.signed_and_enveloped->crl;
+ break;
+ default:
+- certs = crls = NULL;
++ crls = NULL;
+ }
+
+- return want_certs ? certs : crls;
++ return crls;
+ }
+
+ static VALUE
+@@ -610,7 +630,7 @@
+ STACK_OF(X509) *certs;
+ X509 *cert;
+
+- certs = pkcs7_get_certs_or_crls(self, 1);
++ certs = pkcs7_get_certs(self);
+ while((cert = sk_X509_pop(certs))) X509_free(cert);
+ rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self);
+
+@@ -620,7 +640,7 @@
+ static VALUE
+ ossl_pkcs7_get_certificates(VALUE self)
+ {
+- return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1));
++ return ossl_x509_sk2ary(pkcs7_get_certs(self));
+ }
+
+ static VALUE
+@@ -650,7 +670,7 @@
+ STACK_OF(X509_CRL) *crls;
+ X509_CRL *crl;
+
+- crls = pkcs7_get_certs_or_crls(self, 0);
++ crls = pkcs7_get_crls(self);
+ while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl);
+ rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self);
+
+@@ -660,7 +680,7 @@
+ static VALUE
+ ossl_pkcs7_get_crls(VALUE self)
+ {
+- return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0));
++ return ossl_x509crl_sk2ary(pkcs7_get_crls(self));
+ }
+
+ static VALUE
+Index: test/openssl/test_x509cert.rb
+===================================================================
+--- test/openssl/test_x509cert.rb (revision 28618)
++++ test/openssl/test_x509cert.rb (working copy)
+@@ -134,8 +134,8 @@
+ nil, nil, OpenSSL::Digest::SHA1.new)
+ assert_equal(false, cert.verify(@rsa1024))
+ assert_equal(true, cert.verify(@rsa2048))
+- assert_equal(false, cert.verify(@dsa256))
+- assert_equal(false, cert.verify(@dsa512))
++ assert_equal(false, certificate_error_returns_false { cert.verify(@dsa256) })
++ assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
+ cert.serial = 2
+ assert_equal(false, cert.verify(@rsa2048))
+
+@@ -143,15 +143,15 @@
+ nil, nil, OpenSSL::Digest::MD5.new)
+ assert_equal(false, cert.verify(@rsa1024))
+ assert_equal(true, cert.verify(@rsa2048))
+- assert_equal(false, cert.verify(@dsa256))
+- assert_equal(false, cert.verify(@dsa512))
++ assert_equal(false, certificate_error_returns_false { cert.verify(@dsa256) })
++ assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
+ cert.subject = @ee1
+ assert_equal(false, cert.verify(@rsa2048))
+
+ cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
+ nil, nil, OpenSSL::Digest::DSS1.new)
+- assert_equal(false, cert.verify(@rsa1024))
+- assert_equal(false, cert.verify(@rsa2048))
++ assert_equal(false, certificate_error_returns_false { cert.verify(@rsa1024) })
++ assert_equal(false, certificate_error_returns_false { cert.verify(@rsa2048) })
+ assert_equal(false, cert.verify(@dsa256))
+ assert_equal(true, cert.verify(@dsa512))
+ cert.not_after = Time.now
+@@ -165,11 +165,15 @@
+ cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
+ nil, nil, OpenSSL::Digest::MD5.new)
+ }
+- assert_raise(OpenSSL::X509::CertificateError){
+- cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
+- nil, nil, OpenSSL::Digest::SHA1.new)
+- }
+ end
++
++ private
++
++ def certificate_error_returns_false
++ yield
++ rescue OpenSSL::X509::CertificateError
++ false
++ end
+ end
+
+ end
+Index: test/openssl/test_x509crl.rb
+===================================================================
+--- test/openssl/test_x509crl.rb (revision 28618)
++++ test/openssl/test_x509crl.rb (working copy)
+@@ -197,8 +197,8 @@
+ cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+ assert_equal(false, crl.verify(@rsa1024))
+ assert_equal(true, crl.verify(@rsa2048))
+- assert_equal(false, crl.verify(@dsa256))
+- assert_equal(false, crl.verify(@dsa512))
++ assert_equal(false, crl_error_returns_false { crl.verify(@dsa256) })
++ assert_equal(false, crl_error_returns_false { crl.verify(@dsa512) })
+ crl.version = 0
+ assert_equal(false, crl.verify(@rsa2048))
+
+@@ -206,13 +206,21 @@
+ nil, nil, OpenSSL::Digest::DSS1.new)
+ crl = issue_crl([], 1, Time.now, Time.now+1600, [],
+ cert, @dsa512, OpenSSL::Digest::DSS1.new)
+- assert_equal(false, crl.verify(@rsa1024))
+- assert_equal(false, crl.verify(@rsa2048))
++ assert_equal(false, crl_error_returns_false { crl.verify(@rsa1024) })
++ assert_equal(false, crl_error_returns_false { crl.verify(@rsa2048) })
+ assert_equal(false, crl.verify(@dsa256))
+ assert_equal(true, crl.verify(@dsa512))
+ crl.version = 0
+ assert_equal(false, crl.verify(@dsa512))
+ end
++
++ private
++
++ def crl_error_returns_false
++ yield
++ rescue OpenSSL::X509::CRLError
++ false
++ end
+ end
+
+ end
+Index: test/openssl/test_x509req.rb
+===================================================================
+--- test/openssl/test_x509req.rb (revision 28618)
++++ test/openssl/test_x509req.rb (working copy)
+@@ -107,22 +107,22 @@
+ req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::SHA1.new)
+ assert_equal(true, req.verify(@rsa1024))
+ assert_equal(false, req.verify(@rsa2048))
+- assert_equal(false, req.verify(@dsa256))
+- assert_equal(false, req.verify(@dsa512))
++ assert_equal(false, request_error_returns_false { req.verify(@dsa256) })
++ assert_equal(false, request_error_returns_false { req.verify(@dsa512) })
+ req.version = 1
+ assert_equal(false, req.verify(@rsa1024))
+
+ req = issue_csr(0, @dn, @rsa2048, OpenSSL::Digest::MD5.new)
+ assert_equal(false, req.verify(@rsa1024))
+ assert_equal(true, req.verify(@rsa2048))
+- assert_equal(false, req.verify(@dsa256))
+- assert_equal(false, req.verify(@dsa512))
++ assert_equal(false, request_error_returns_false { req.verify(@dsa256) })
++ assert_equal(false, request_error_returns_false { req.verify(@dsa512) })
+ req.subject = OpenSSL::X509::Name.parse("/C=JP/CN=FooBar")
+ assert_equal(false, req.verify(@rsa2048))
+
+ req = issue_csr(0, @dn, @dsa512, OpenSSL::Digest::DSS1.new)
+- assert_equal(false, req.verify(@rsa1024))
+- assert_equal(false, req.verify(@rsa2048))
++ assert_equal(false, request_error_returns_false { req.verify(@rsa1024) })
++ assert_equal(false, request_error_returns_false { req.verify(@rsa2048) })
+ assert_equal(false, req.verify(@dsa256))
+ assert_equal(true, req.verify(@dsa512))
+ req.public_key = @rsa1024.public_key
+@@ -131,10 +131,16 @@
+ assert_raise(OpenSSL::X509::RequestError){
+ issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::DSS1.new) }
+ assert_raise(OpenSSL::X509::RequestError){
+- issue_csr(0, @dn, @dsa512, OpenSSL::Digest::SHA1.new) }
+- assert_raise(OpenSSL::X509::RequestError){
+ issue_csr(0, @dn, @dsa512, OpenSSL::Digest::MD5.new) }
+ end
++
++ private
++
++ def request_error_returns_false
++ yield
++ rescue OpenSSL::X509::RequestError
++ false
++ end
+ end
+
+ end
</ins></span></pre>
</div>
</div>
</body>
</html>