diff options
| author | taca <taca@pkgsrc.org> | 2005-10-02 06:20:47 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2005-10-02 06:20:47 +0000 |
| commit | 9480c9965a0a311fd4f2fa7106ab048bfa26a70d (patch) | |
| tree | 09fb5e96efa85701ec77987e1a95b4d74bc4be02 /security | |
| parent | 66c08b418666bc5005d421e92b324be1712095d0 (diff) | |
| download | pkgsrc-9480c9965a0a311fd4f2fa7106ab048bfa26a70d.tar.gz | |
Fix portability problem with newer OpenSSL (on DragonFlyBSD) reported by
PR pkg/31405 from Todd Willey.
Bump PKGREVISION.
Diffstat (limited to 'security')
| -rw-r--r-- | security/ruby-openssl/Makefile | 4 | ||||
| -rw-r--r-- | security/ruby-openssl/distinfo | 3 | ||||
| -rw-r--r-- | security/ruby-openssl/patches/patch-ab | 45 |
3 files changed, 49 insertions, 3 deletions
diff --git a/security/ruby-openssl/Makefile b/security/ruby-openssl/Makefile index a39fadc237e..4c3487e99f8 100644 --- a/security/ruby-openssl/Makefile +++ b/security/ruby-openssl/Makefile @@ -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 --git a/security/ruby-openssl/distinfo b/security/ruby-openssl/distinfo index 6415e6b9ca8..0506a2cab84 100644 --- a/security/ruby-openssl/distinfo +++ b/security/ruby-openssl/distinfo @@ -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 --git a/security/ruby-openssl/patches/patch-ab b/security/ruby-openssl/patches/patch-ab new file mode 100644 index 00000000000..e1d49d2359c --- /dev/null +++ b/security/ruby-openssl/patches/patch-ab @@ -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; + } |