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.58;	author taca;	state Exp;
branches;
next	;


desc
@@


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

* r18172: suppress warnings.
* r26835: backport fixes in 1.9.

--- ext/openssl/ossl_asn1.c.orig	2010-05-24 23:58:49.000000000 +0000
+++ ext/openssl/ossl_asn1.c
@@@@ -33,7 +33,7 @@@@ asn1time_to_time(ASN1_TIME *time)
 	
     switch (time->type) {
     case V_ASN1_UTCTIME:
-	if (sscanf(time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
+	if (sscanf((const char *)time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
     		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
 	    ossl_raise(rb_eTypeError, "bad UTCTIME format");
 	} 
@@@@ -44,7 +44,7 @@@@ asn1time_to_time(ASN1_TIME *time)
 	}
 	break;
     case V_ASN1_GENERALIZEDTIME:
-	if (sscanf(time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
+	if (sscanf((const char *)time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
     		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
 	    ossl_raise(rb_eTypeError, "bad GENERALIZEDTIME format" );
 	} 
@@@@ -80,7 +80,7 @@@@ time_to_time_t(VALUE time)
 VALUE
 asn1str_to_str(ASN1_STRING *str)
 {
-    return rb_str_new(str->data, str->length);
+    return rb_str_new((const char *)str->data, str->length);
 }
 
 /*
@@@@ -214,7 +214,7 @@@@ obj_to_asn1bstr(VALUE obj, long unused_b
     StringValue(obj);
     if(!(bstr = ASN1_BIT_STRING_new()))
 	ossl_raise(eASN1Error, NULL);
-    ASN1_BIT_STRING_set(bstr, RSTRING_PTR(obj), RSTRING_LEN(obj));
+    ASN1_BIT_STRING_set(bstr, (unsigned char *)RSTRING_PTR(obj), RSTRING_LEN(obj));
     bstr->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */
     bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT|(unused_bits&0x07);
 
@@@@ -307,7 +307,7 @@@@ static VALUE
 decode_bool(unsigned char* der, int length)
 {
     int val;
-    unsigned char *p;
+    const unsigned char *p;
 
     p = der;
     if((val = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
@@@@ -320,7 +320,7 @@@@ static VALUE
 decode_int(unsigned char* der, int length)
 {
     ASN1_INTEGER *ai;
-    unsigned char *p;
+    const unsigned char *p;
     VALUE ret; 
     int status = 0;
 
@@@@ -360,7 +360,7 @@@@ static VALUE
 decode_enum(unsigned char* der, int length)
 {
     ASN1_ENUMERATED *ai;
-    unsigned char *p;
+    const unsigned char *p;
     VALUE ret; 
     int status = 0;
 
@@@@ -379,7 +379,7 @@@@ static VALUE
 decode_null(unsigned char* der, int length)
 {
     ASN1_NULL *null;
-    unsigned char *p;
+    const unsigned char *p;
 
     p = der;
     if(!(null = d2i_ASN1_NULL(NULL, &p, length)))
@@@@ -393,7 +393,7 @@@@ static VALUE
 decode_obj(unsigned char* der, int length)
 {
     ASN1_OBJECT *obj;
-    unsigned char *p;
+    const unsigned char *p;
     VALUE ret;
     int nid;
     BIO *bio;
@@@@ -422,7 +422,7 @@@@ static VALUE
 decode_time(unsigned char* der, int length)
 {
     ASN1_TIME *time;
-    unsigned char *p;
+    const unsigned char *p;
     VALUE ret;
     int status = 0;
 
@@@@ -697,7 +697,7 @@@@ ossl_asn1data_to_der(VALUE self)
     if((length = ASN1_object_size(1, RSTRING_LEN(value), tag)) <= 0)
 	ossl_raise(eASN1Error, NULL);
     der = rb_str_new(0, length);
-    p = RSTRING_PTR(der);
+    p = (unsigned char *)RSTRING_PTR(der);
     ASN1_put_object(&p, is_cons, RSTRING_LEN(value), tag, tag_class);
     memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
     p += RSTRING_LEN(value);
@@@@ -711,6 +711,7 @@@@ ossl_asn1_decode0(unsigned char **pp, lo
 		  int once, int yield)
 {
     unsigned char *start, *p;
+    const unsigned char *p0;
     long len, off = *offset;
     int hlen, tag, tc, j;
     VALUE ary, asn1data, value, tag_class;
@@@@ -719,7 +720,9 @@@@ ossl_asn1_decode0(unsigned char **pp, lo
     p = *pp;
     while(length > 0){
 	start = p;
-	j = ASN1_get_object(&p, &len, &tag, &tc, length);
+	p0 = p;
+	j = ASN1_get_object(&p0, &len, &tag, &tc, length);
+	p = (unsigned char *)p0;
 	if(j & 0x80) ossl_raise(eASN1Error, NULL);
 	hlen = p - start;
 	if(yield){
@@@@ -754,7 +757,7 @@@@ ossl_asn1_decode0(unsigned char **pp, lo
 	    else value = ossl_asn1_decode0(&p, len, &off, depth+1, 0, yield);
 	}
 	else{
-	    value = rb_str_new(p, len);
+	    value = rb_str_new((const char *)p, len);
 	    p += len;
 	    off += len;
 	}
@@@@ -819,7 +822,7 @@@@ ossl_asn1_traverse(VALUE self, VALUE obj
 
     obj = ossl_to_der_if_possible(obj);
     tmp = rb_str_new4(StringValue(obj));
-    p = RSTRING_PTR(tmp);
+    p = (unsigned char *)RSTRING_PTR(tmp);
     ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 1);
 
     return Qnil;
@@@@ -835,7 +838,7 @@@@ ossl_asn1_decode(VALUE self, VALUE obj)
 
     obj = ossl_to_der_if_possible(obj);
     tmp = rb_str_new4(StringValue(obj));
-    p = RSTRING_PTR(tmp);
+    p = (unsigned char *)RSTRING_PTR(tmp);
     ary = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 1, 0);
     ret = rb_ary_entry(ary, 0);
 
@@@@ -852,7 +855,7 @@@@ ossl_asn1_decode_all(VALUE self, VALUE o
 
     obj = ossl_to_der_if_possible(obj);
     tmp = rb_str_new4(StringValue(obj));
-    p = RSTRING_PTR(tmp);
+    p = (unsigned char *)RSTRING_PTR(tmp);
     ret = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 0);
 
     return ret;
@@@@ -947,7 +950,7 @@@@ ossl_asn1prim_to_der(VALUE self)
     ossl_ASN1_TYPE_free(asn1);
     reallen = p - buf;
     assert(reallen <= len);
-    str = ossl_buf2str(buf, reallen); /* buf will be free in ossl_buf2str */
+    str = ossl_buf2str((char *)buf, reallen); /* buf will be free in ossl_buf2str */
 
     return str;
 }
@@@@ -969,7 +972,7 @@@@ ossl_asn1cons_to_der(VALUE self)
     seq_len = ASN1_object_size(1, RSTRING_LEN(value), tag);
     length = ASN1_object_size(1, seq_len, tn);
     str = rb_str_new(0, length);
-    p = RSTRING_PTR(str);
+    p = (unsigned char *)RSTRING_PTR(str);
     if(tc == V_ASN1_UNIVERSAL)
 	ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc);
     else{
@


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-dl,v 1.1 2009/08/11 14:26:58 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 2
a4 1
* Constify.
d6 1
a6 1
--- ext/openssl/ossl_asn1.c.orig	2007-06-09 00:02:04.000000000 +0900
d8 38
a45 6
@@@@ -304,10 +304,10 @@@@ obj_to_asn1derstr(VALUE obj)
  * DER to Ruby converters
  */
 static VALUE
-decode_bool(unsigned char* der, int length)
+decode_bool(const unsigned char* der, int length)
d47 1
a47 1
     int bool;
d52 3
a54 7
     if((bool = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
@@@@ -317,10 +317,10 @@@@ decode_bool(unsigned char* der, int leng
 }
 
 static VALUE
-decode_int(unsigned char* der, int length)
+decode_int(const unsigned char* der, int length)
d62 2
a63 20
@@@@ -336,10 +336,11 @@@@ decode_int(unsigned char* der, int lengt
 }
 
 static VALUE
-decode_bstr(unsigned char* der, int length, long *unused_bits)
+decode_bstr(const unsigned char* der, int length, long *unused_bits)
 {
     ASN1_BIT_STRING *bstr;
-    unsigned char *p, *buf;
+    const unsigned char *p;
+    unsigned char *buf;
     long len;
     VALUE ret;
 
@@@@ -362,10 +363,10 @@@@ decode_bstr(unsigned char* der, int leng
 }
 
 static VALUE
-decode_enum(unsigned char* der, int length)
+decode_enum(const unsigned char* der, int length)
d71 2
a72 6
@@@@ -381,10 +382,10 @@@@ decode_enum(unsigned char* der, int leng
 }
 
 static VALUE
-decode_null(unsigned char* der, int length)
+decode_null(const unsigned char* der, int length)
d80 2
a81 6
@@@@ -395,10 +396,10 @@@@ decode_null(unsigned char* der, int leng
 }
 
 static VALUE
-decode_obj(unsigned char* der, int length)
+decode_obj(const unsigned char* der, int length)
d89 2
a90 6
@@@@ -424,10 +425,10 @@@@ decode_obj(unsigned char* der, int lengt
 }
 
 static VALUE
-decode_time(unsigned char* der, int length)
+decode_time(const unsigned char* der, int length)
d98 11
a108 8
@@@@ -712,10 +713,10 @@@@ ossl_asn1data_to_der(VALUE self)
 }
 
 static VALUE
-ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
-		  int once, int yield)
+ossl_asn1_decode0(const unsigned char **pp, long length, long *offset,
+		  long depth, int once, int yield)
d110 2
a111 2
-    unsigned char *start, *p;
+    const unsigned char *p, *start;
d115 65
a179 27
@@@@ -818,7 +819,7 @@@@ ossl_asn1_decode0(unsigned char **pp, lo
 static VALUE
 ossl_asn1_traverse(VALUE self, VALUE obj)
 {
-    unsigned char *p;
+    const unsigned char *p;
     long offset = 0;
     volatile VALUE tmp;
 
@@@@ -834,7 +835,7 @@@@ static VALUE
 ossl_asn1_decode(VALUE self, VALUE obj)
 {
     VALUE ret, ary;
-    unsigned char *p;
+    const unsigned char *p;
     long offset = 0;
     volatile VALUE tmp;
 
@@@@ -851,7 +852,7 @@@@ static VALUE
 ossl_asn1_decode_all(VALUE self, VALUE obj)
 {
     VALUE ret;
-    unsigned char *p;
+    const unsigned char *p;
     long offset = 0;
     volatile VALUE tmp;
 
@