Add three patches accidently left on my work area.

- Add two miscellaneous patches for openssl and yaml libraries.
  They were left from last year, sigh.
- Add one more part for CVE-2006-3694.

Bump PKGREVISION.

5 files changed, 46 insertions, 5 deletions

diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 17e77e93cd3..538d14285a0 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2006/07/31 11:29:01 taca Exp $
+# $NetBSD: Makefile,v 1.23 2006/08/02 07:02:44 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index 83557a9d29e..143055a0dd0 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2006/07/31 11:29:03 taca Exp $
+$NetBSD: distinfo,v 1.13 2006/08/02 07:02:44 taca Exp $
 
 SHA1 (ruby-1.8.4.tar.gz) = 93999577c7fc4decc6b2fe8fefa96e743f278fbf
 RMD160 (ruby-1.8.4.tar.gz) = 1c0572a4ee369af57a3db68027b2566052eac944
@@ -7,10 +7,8 @@ SHA1 (patch-aa) = 0f70b20256882d20e7bb52d0892c99b027b35134
 SHA1 (patch-ab) = e7d73482bf2f9d50c260aa9870e443dd0cda6713
 SHA1 (patch-ad) = 07dba86810b8a7e452c5f6c4db06c5241edf3c01
 SHA1 (patch-ae) = dfa9c5296c75f6193c790fca8d3eb15ad4a9f228
-SHA1 (patch-af) = d00e67015793b04498418bfa12a28aaeb0c93d3b
 SHA1 (patch-ag) = fd6d991728011f937ac6d2b99a13cc733f96b8d6
 SHA1 (patch-ah) = 78af1cec735cd1235d4c0d231d423e089bfff268
-SHA1 (patch-ai) = b17295268f67b73711b1b9eaac8728214974564f
 SHA1 (patch-bj) = d7daabc52ed338c4bb2c206e6729059109b8f2c2
 SHA1 (patch-bz) = 8c035d5cd91e72ea95d94e048bbdcd15c663f613
 SHA1 (patch-cc) = d9adab0707c178140e4eb6ab458501a66903d88c
diff --git a/lang/ruby18-base/patches/patch-ag b/lang/ruby18-base/patches/patch-ag
new file mode 100644
index 00000000000..3d7f1f0fd78
--- /dev/null
+++ b/lang/ruby18-base/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2006/08/02 07:02:44 taca Exp $
+
+--- ext/openssl/lib/openssl/ssl.rb.orig	2005-05-22 19:16:56.000000000 +0900
++++ ext/openssl/lib/openssl/ssl.rb
+@@ -82,8 +82,9 @@ module OpenSSL
+         }
+         if check_common_name
+           cert.subject.to_a.each{|oid, value|
+-            if oid == "CN" && value.casecmp(hostname) == 0
+-              return true
++            if oid == "CN"
++              reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+")
++              return true if /\A#{reg}\z/i =~ hostname
+             end
+           }
+         end
diff --git a/lang/ruby18-base/patches/patch-ah b/lang/ruby18-base/patches/patch-ah
new file mode 100644
index 00000000000..34541c9b69e
--- /dev/null
+++ b/lang/ruby18-base/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2006/08/02 07:02:44 taca Exp $
+
+--- lib/yaml.rb.orig	2005-11-07 00:09:06.000000000 +0900
++++ lib/yaml.rb
+@@ -310,7 +310,7 @@ module YAML
+ 	#
+ 	# Add a transfer method for a builtin type
+ 	#
+-	def YAML.add_ruby_type( type, &transfer_proc )
++	def YAML.add_ruby_type( type_tag, &transfer_proc )
+ 	    resolver.add_type( "tag:ruby.yaml.org,2002:#{ type_tag }", transfer_proc )
+ 	end
+ 
diff --git a/lang/ruby18-base/patches/patch-cp b/lang/ruby18-base/patches/patch-cp
new file mode 100644
index 00000000000..fc420e4ae87
--- /dev/null
+++ b/lang/ruby18-base/patches/patch-cp
@@ -0,0 +1,14 @@
+$NetBSD: patch-cp,v 1.1 2006/08/02 07:02:44 taca Exp $
+
+--- re.c.orig	2005-12-13 12:27:51.000000000 +0900
++++ re.c
+@@ -1332,6 +1332,9 @@ rb_reg_initialize(obj, s, len, options)
+ {
+     struct RRegexp *re = RREGEXP(obj);
+ 
++    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)
++	rb_raise(rb_eSecurityError, "Insecure: can't modify regexp");
++    rb_check_frozen(obj);
+     if (re->ptr) re_free_pattern(re->ptr);
+     if (re->str) free(re->str);
+     re->ptr = 0;