head	1.3;
access;
symbols
	pkgsrc-2017Q1:1.2.0.54
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.52
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.50
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.48
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.46
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.44
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.42
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.40
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.38
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.36
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.34
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.32
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.30
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.28
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.26
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.24
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.22
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.20
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.18
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.16
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.14
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.12
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.10
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.8
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.6
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.4
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.2
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.1.0.8
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.6
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.4
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.2
	pkgsrc-2009Q3-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2017.04.22.18.23.55;	author taca;	state dead;
branches;
next	1.2;
commitid	tDoWtAVFTjPkJyOz;

1.2
date	2010.09.10.03.29.00;	author taca;	state Exp;
branches;
next	1.1;

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


desc
@@


1.3
log
@Remove ruby18 which is EOL almost 4 years ago.
@
text
@$NetBSD: patch-ds,v 1.2 2010/09/10 03:29:00 taca Exp $

* r18172: suppress warnings.

--- ext/openssl/ossl_x509cert.c.orig	2007-06-08 15:02:04.000000000 +0000
+++ ext/openssl/ossl_x509cert.c
@@@@ -134,7 +134,7 @@@@ static VALUE 
 ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
 {
     BIO *in;
-    X509 *x509;
+    X509 *x509, *x = DATA_PTR(self);;
     VALUE arg;
 
     if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@@@@ -143,10 +143,12 @@@@ ossl_x509_initialize(int argc, VALUE *ar
     }
     arg = ossl_to_der_if_possible(arg);
     in = ossl_obj2bio(arg);
-    x509 = PEM_read_bio_X509(in, (X509 **)&DATA_PTR(self), NULL, NULL);
+    x509 = PEM_read_bio_X509(in, &x, NULL, NULL);
+    DATA_PTR(self) = x;
     if (!x509) {
-	BIO_reset(in);
-	x509 = d2i_X509_bio(in, (X509 **)&DATA_PTR(self));
+	(void)BIO_reset(in);
+	x509 = d2i_X509_bio(in, &x);
+	DATA_PTR(self) = x;
     }
     BIO_free(in);
     if (!x509) ossl_raise(eX509CertError, NULL);
@@@@ -190,7 +192,7 @@@@ ossl_x509_to_der(VALUE self)
     if ((len = i2d_X509(x509, NULL)) <= 0)
 	ossl_raise(eX509CertError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING_PTR(str);
+    p = (unsigned char *)RSTRING_PTR(str);
     if (i2d_X509(x509, &p) <= 0)
 	ossl_raise(eX509CertError, NULL);
     ossl_str_adjust(str, p);
@@@@ -690,7 +692,7 @@@@ static VALUE
 ossl_x509_inspect(VALUE self)
 {
     VALUE str;
-    char *cname = rb_class2name(rb_obj_class(self));
+    const char *cname = rb_class2name(rb_obj_class(self));
 
     str = rb_str_new2("#<");
     rb_str_cat2(str, cname);
@


1.2
log
@Update ruby18-base to 1.8.7.302 (Ruby 1.8.7 patchlevel 302).

Since many changes from previous release, please refer
http://www.ruby-lang.org/en/news/2010/08/16/ruby-1-8-7-p302-is-released/.

Note: Since all security updates are already in previous package,
This update dosen't include any securify fix.
@
text
@d1 1
a1 1
$NetBSD: patch-ds,v 1.1 2009/08/11 14:26:59 taca Exp $
@


1.1
log
@
* Make Ruby's OpenSSL library compatible with OpenSSL 1.0.0 and later,
  focusing to PR pkg/41829.
* Add comments to patches.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
* Constify.
d5 1
a5 1
--- ext/openssl/ossl_x509cert.c.orig	2007-06-09 00:02:04.000000000 +0900
d7 35
a41 1
@@@@ -690,7 +690,7 @@@@ static VALUE
@