[pkgsrc/trunk]: pkgsrc/security/ruby-openssl Fix portability problem with new...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f427817a705d
branches:  trunk
changeset: 500079:f427817a705d
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Oct 02 06:20:47 2005 +0000

description:
Fix portability problem with newer OpenSSL (on DragonFlyBSD) reported by
PR pkg/31405 from Todd Willey.

Bump PKGREVISION.

diffstat:

 security/ruby-openssl/Makefile         |   4 +-
 security/ruby-openssl/distinfo         |   3 +-
 security/ruby-openssl/patches/patch-ab |  45 ++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)

diffs (75 lines):

diff -r fb3f661d7a87 -r f427817a705d security/ruby-openssl/Makefile
--- a/security/ruby-openssl/Makefile    Sun Oct 02 06:17:43 2005 +0000
+++ b/security/ruby-openssl/Makefile    Sun Oct 02 06:20:47 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:18 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/10/02 06:20:47 taca Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-openssl-${RUBY_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
diff -r fb3f661d7a87 -r f427817a705d security/ruby-openssl/distinfo
--- a/security/ruby-openssl/distinfo    Sun Oct 02 06:17:43 2005 +0000
+++ b/security/ruby-openssl/distinfo    Sun Oct 02 06:20:47 2005 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/03/06 16:52:40 taca Exp $
+$NetBSD: distinfo,v 1.9 2005/10/02 06:20:47 taca Exp $
 
 SHA1 (ruby/ruby-1.8.2.tar.gz) = 409a917d3a0aba41f45bd053b767c85b2bc35ffa
 RMD160 (ruby/ruby-1.8.2.tar.gz) = fc4dcdc2dda9bfbcf8ca19ca090aa55a18ea06a4
 Size (ruby/ruby-1.8.2.tar.gz) = 3627349 bytes
 SHA1 (patch-aa) = 5b594089a8c50899f5a50651e59688f0a9c0ce71
+SHA1 (patch-ab) = 9abd9a9286f6282f94602dd98afe94c60c30aacf
diff -r fb3f661d7a87 -r f427817a705d security/ruby-openssl/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/ruby-openssl/patches/patch-ab    Sun Oct 02 06:20:47 2005 +0000
@@ -0,0 +1,45 @@
+$NetBSD: patch-ab,v 1.1 2005/10/02 06:20:47 taca Exp $
+
+--- ossl_x509store.c.orig      2004-12-19 17:28:32.000000000 +0900
++++ ossl_x509store.c
+@@ -347,7 +347,7 @@ static VALUE ossl_x509stctx_set_time(VAL
+ static VALUE
+ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
+ {
+-    VALUE store, cert, chain;
++    VALUE store, cert, chain, t;
+     X509_STORE_CTX *ctx;
+     X509_STORE *x509st;
+     X509 *x509 = NULL;
+@@ -369,7 +369,8 @@ ossl_x509stctx_initialize(int argc, VALU
+     ossl_x509stctx_set_purpose(self, rb_iv_get(store, "@purpose"));
+     ossl_x509stctx_set_trust(self, rb_iv_get(store, "@trust"));
+ #endif
+-    ossl_x509stctx_set_time(self, rb_iv_get(store, "@time"));
++    if (!NIL_P(t = rb_iv_get(store, "@time")))
++      ossl_x509stctx_set_time(self, t);
+     rb_iv_set(self, "@verify_callback", rb_iv_get(store, "@verify_callback"));
+     rb_iv_set(self, "@cert", cert);
+ 
+@@ -535,17 +536,11 @@ static VALUE
+ ossl_x509stctx_set_time(VALUE self, VALUE time)
+ {
+     X509_STORE_CTX *store;
++    long t;
+ 
+-    if(NIL_P(time)) {
+-      GetX509StCtx(self, store);
+-      store->flags &= ~X509_V_FLAG_USE_CHECK_TIME;
+-    }
+-    else {
+-      long t = NUM2LONG(rb_Integer(time));
+-
+-      GetX509StCtx(self, store);
+-      X509_STORE_CTX_set_time(store, 0, t);
+-    }
++    t = NUM2LONG(rb_Integer(time));
++    GetX509StCtx(self, store);
++    X509_STORE_CTX_set_time(store, 0, t);
+ 
+     return time;
+ }