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-dr,v 1.2 2010/09/10 03:29:00 taca Exp $

* r18172: suppress warnings.
* r18943: (ossl_ocspreq_initialize): fix for initialization of r18168.
* r26838: backport the commit from trunk.

--- ext/openssl/ossl_x509attr.c.orig	2010-06-21 09:18:59.000000000 +0000
+++ ext/openssl/ossl_x509attr.c
@@@@ -92,16 +92,17 @@@@ static VALUE
 ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE oid, value;
-    X509_ATTRIBUTE *attr;
-    unsigned char *p;
+    X509_ATTRIBUTE *attr, *x;
+    const unsigned char *p;
 
     GetX509Attr(self, attr);
     if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){
 	oid = ossl_to_der_if_possible(oid);
 	StringValue(oid);
-	p = RSTRING_PTR(oid);
-	if(!d2i_X509_ATTRIBUTE((X509_ATTRIBUTE**)&DATA_PTR(self),
-			       &p, RSTRING_LEN(oid))){
+	p = (unsigned char *)RSTRING_PTR(oid);
+	x = d2i_X509_ATTRIBUTE(&attr, &p, RSTRING_LEN(oid));
+	DATA_PTR(self) = attr;
+	if(!x){
 	    ossl_raise(eX509AttrError, NULL);
 	}
 	return self;
@@@@ -212,7 +213,7 @@@@ ossl_x509attr_get_value(VALUE self)
     if(OSSL_X509ATTR_IS_SINGLE(attr)){
 	length = i2d_ASN1_TYPE(attr->value.single, NULL);
 	str = rb_str_new(0, length);
-	p = RSTRING_PTR(str);
+	p = (unsigned char *)RSTRING_PTR(str);
 	i2d_ASN1_TYPE(attr->value.single, &p);
 	ossl_str_adjust(str, p);
     }
@@@@ -221,7 +222,7 @@@@ ossl_x509attr_get_value(VALUE self)
 			(unsigned char **) NULL, i2d_ASN1_TYPE,
 			V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
 	str = rb_str_new(0, length);
-	p = RSTRING_PTR(str);
+	p = (unsigned char *)RSTRING_PTR(str);
 	i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p,
 			i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
 	ossl_str_adjust(str, p);
@@@@ -247,7 +248,7 @@@@ ossl_x509attr_to_der(VALUE self)
     if((len = i2d_X509_ATTRIBUTE(attr, NULL)) <= 0)
 	ossl_raise(eX509AttrError, NULL);
     str = rb_str_new(0, len);
-    p = RSTRING_PTR(str);
+    p = (unsigned char *)RSTRING_PTR(str);
     if(i2d_X509_ATTRIBUTE(attr, &p) <= 0)
 	ossl_raise(eX509AttrError, NULL);
     rb_str_set_len(str, p - (unsigned char*)RSTRING_PTR(str)); 
@


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-dr,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 3
a5 1
* Constify.
d7 1
a7 1
--- ext/openssl/ossl_x509attr.c.orig	2007-06-09 00:02:04.000000000 +0900
d9 2
a10 1
@@@@ -93,7 +93,7 @@@@ ossl_x509attr_initialize(int argc, VALUE
d13 1
a13 1
     X509_ATTRIBUTE *attr;
d15 1
d20 39
@