head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.40
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.38
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.36
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.34
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.32
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.30
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.28
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.26
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.24
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.22
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.20
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.18
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.16
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.14
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.12
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.10
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.8
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.6
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.4
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.2;
locks; strict;
comment	@# @;


1.2
date	2005.11.02.09.02.58;	author taca;	state dead;
branches
	1.2.2.1;
next	1.1;

1.1
date	2005.10.02.06.20.47;	author taca;	state Exp;
branches;
next	;

1.2.2.1
date	2005.11.02.09.02.58;	author salo;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2005.11.15.10.25.29;	author salo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove ruby-digest and ruby-openssl package since they are merged into
ruby18-base package now.
@
text
@$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;
 }
@


1.2.2.1
log
@file patch-ab was added on branch pkgsrc-2005Q3 on 2005-11-02 09:02:58 +0000
@
text
@d1 45
@


1.2.2.2
log
@Pullup ticket 875 - requested by Takahiro Kambe
portability fix for ruby-openssl

Revisions pulled up:
- pkgsrc/security/ruby-openssl/Makefile			1.22
- pkgsrc/security/ruby-openssl/distinfo			1.9
- pkgsrc/security/ruby-openssl/patches/patch-ab		1.1

   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Sun Oct  2 06:20:47 UTC 2005

   Modified Files:
   	pkgsrc/security/ruby-openssl: Makefile distinfo
   Added Files:
   	pkgsrc/security/ruby-openssl/patches: patch-ab

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

   Bump PKGREVISION.
@
text
@a0 45
$NetBSD: patch-ab,v 1.2.2.1 2005/11/15 10:25:29 salo 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;
 }
@


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

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@