o Update ruby18-base pacakge to Ruby 1.8 branch 2006/12/05.

	- Many changes from 2006/9/6; see Changes file, please.
	- Fixes another cgi.rb vulnerability:
		http://jvn.jp/jp/JVN%2384798830/index.html

o Introduce ruby-build-ri-db PKG_OPTION which enable installing database
  for Ruby's ri utility.  Default is disabled and should be fix
  PR pkg/34587.

7 files changed, 56 insertions, 37 deletions

diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 2776e622176..7ba59d5de99 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,32 +1,33 @@
-# $NetBSD: Makefile,v 1.28 2006/11/03 05:36:23 taca Exp $
+# $NetBSD: Makefile,v 1.29 2006/12/06 16:24:27 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
-PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=	3
+PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
+#PKGREVISION=
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCHFILES=	ruby-1.8.5-base-${RUBY18_PATCH_DATE}.patch.bz2
+PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Ruby 1.8 based release minimum package
 
-RUBY_VERSION=		${RUBY18_VERSION}
-RUBY_DYNAMIC_DIRS=	${RUBY_RIDIR:S,${PREFIX}/,,}
+RUBY_VERSION=	${RUBY18_VERSION}
 
-CONFLICTS=		${RUBY_PKGPREFIX}-dbm-[0-9]* \
-			${RUBY_PKGPREFIX}-digest-[0-9]* \
-			${RUBY_PKGPREFIX}-iconv-[0-9]* \
-			${RUBY_PKGPREFIX}-openssl-[0-9]* \
-			${RUBY_PKGPREFIX}-tcltk-[0-9]*
+CONFLICTS=	${RUBY_PKGPREFIX}-dbm-[0-9]* \
+		${RUBY_PKGPREFIX}-digest-[0-9]* \
+		${RUBY_PKGPREFIX}-iconv-[0-9]* \
+		${RUBY_PKGPREFIX}-openssl-[0-9]* \
+		${RUBY_PKGPREFIX}-tcltk-[0-9]*
 
-USE_LANGUAGES=		c
-GNU_CONFIGURE=		yes
-TEST_TARGET=		test
-CONFIGURE_ARGS+=	--enable-shared --enable-install-doc \
+USE_LANGUAGES=	c
+USE_TOOLS+=	yacc
+GNU_CONFIGURE=	yes
+TEST_TARGET=	test
+CONFIGURE_ARGS+= --enable-shared \
 		--with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \
 		--with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib"
 CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
@@ -43,6 +44,8 @@ MAKE_DIRS+=	${RUBY_SITERIDIR}
 CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q}
 .endif
 
+.include "options.mk"
+
 FILES_SUBST+=	DATE=${DATE:Q}
 
 #
@@ -68,7 +71,6 @@ DOCS=		COPYING COPYING.ja ChangeLog README \
 		doc/shell.rd doc/shell.rd.ja doc/irb/irb-tools.rd.ja \
 		doc/irb/irb.rd doc/irb/irb.rd.ja
 EXT_DOCS=	bigdecimal/bigdecimal_en.html bigdecimal/bigdecimal_ja.html \
-		digest/digest.txt digest/digest.txt.ja \
 		dl/doc/dl.txt enumerator/enumerator.txt \
 		etc/etc.txt etc/etc.txt.ja syslog/syslog.txt \
 		zlib/doc/zlib.rd
@@ -92,7 +94,8 @@ pre-configure:
 	${RM} -f ${WRKSRC}/ext/tk/extconf.rb
 
 pre-install:
-	cd ${WRKSRC}; ${FIND} . -name '*.orig' -exec ${RM} -f {} \;
+	cd ${WRKSRC}; ${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \
+		-exec ${RM} -f {} \;
 
 post-install:
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/irb
diff --git a/lang/ruby18-base/PLIST b/lang/ruby18-base/PLIST
index e1aa7c0cfd9..f81030e6cbe 100644
--- a/lang/ruby18-base/PLIST
+++ b/lang/ruby18-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/09/07 15:40:00 taca Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/12/06 16:24:27 taca Exp $
 bin/erb${RUBY_VER}
 bin/h2rb${RUBY_VER}
 bin/irb${RUBY_VER}
@@ -26,6 +26,8 @@ ${RUBY_LIBDIR}/cgi-lib.rb
 ${RUBY_LIBDIR}/cgi.rb
 ${RUBY_LIBDIR}/complex.rb
 ${RUBY_LIBDIR}/csv.rb
+${RUBY_LIBDIR}/digest.rb
+${RUBY_LIBDIR}/digest/digest/sha2.rb
 ${RUBY_LIBDIR}/date/format.rb
 ${RUBY_LIBDIR}/date.rb
 ${RUBY_LIBDIR}/date2.rb
@@ -63,8 +65,10 @@ ${RUBY_LIBDIR}/gserver.rb
 ${RUBY_ARCHLIBDIR}/bigdecimal.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/config.h
 ${RUBY_ARCHLIBDIR}/defines.h
+${RUBY_ARCHLIBDIR}/digest.h
 ${RUBY_ARCHLIBDIR}/dbm.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/digest.${RUBY_DLEXT}
+${RUBY_ARCHLIBDIR}/digest/bubblebabble.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/digest/md5.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/digest/rmd160.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/digest/sha1.${RUBY_DLEXT}
@@ -590,8 +594,6 @@ ${RUBY_DOCDIR}/README.ja
 ${RUBY_DOCDIR}/ToDo
 ${RUBY_DOCDIR}/bigdecimal_en.html
 ${RUBY_DOCDIR}/bigdecimal_ja.html
-${RUBY_DOCDIR}/digest.txt
-${RUBY_DOCDIR}/digest.txt.ja
 ${RUBY_DOCDIR}/dl.txt
 ${RUBY_DOCDIR}/enumerator.txt
 ${RUBY_DOCDIR}/etc.txt
diff --git a/lang/ruby18-base/PLIST.common_end b/lang/ruby18-base/PLIST.common_end
index 46ff73414ef..531372e845b 100644
--- a/lang/ruby18-base/PLIST.common_end
+++ b/lang/ruby18-base/PLIST.common_end
@@ -1,7 +1,10 @@
+@comment $NetBSD: PLIST.common_end,v 1.2 2006/12/06 16:24:27 taca Exp $
 @dirrm ${RUBY_LIBDIR}/bigdecimal
 @dirrm ${RUBY_LIBDIR}/cgi/session
 @dirrm ${RUBY_LIBDIR}/cgi
 @dirrm ${RUBY_LIBDIR}/date
+@dirrm ${RUBY_LIBDIR}/digest/digest
+@dirrm ${RUBY_LIBDIR}/digest
 @dirrm ${RUBY_LIBDIR}/dl
 @dirrm ${RUBY_LIBDIR}/drb
 @dirrm ${RUBY_ARCHLIBDIR}/digest
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index ba22f5b1afe..3f61995a175 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.16 2006/11/03 05:36:23 taca Exp $
+$NetBSD: distinfo,v 1.17 2006/12/06 16:24:27 taca Exp $
 
-SHA1 (ruby-1.8.5-base-20060906.patch.bz2) = 99c283e6d9df4f90ab6d765041b91d37c70dd3ee
-RMD160 (ruby-1.8.5-base-20060906.patch.bz2) = 3b51a6b1d9badd76dc50735971411fa0800d2e85
-Size (ruby-1.8.5-base-20060906.patch.bz2) = 27294 bytes
+SHA1 (ruby-1.8.5-base-20061205.patch.bz2) = 48596c5f528b36093d2cf84d5ea449939152a15c
+RMD160 (ruby-1.8.5-base-20061205.patch.bz2) = e13915938f5429d00498690960471eac36c68c7a
+Size (ruby-1.8.5-base-20061205.patch.bz2) = 107370 bytes
 SHA1 (ruby-1.8.5.tar.gz) = 0638ea26e1088fc9f4237abde8c85331689ce77c
 RMD160 (ruby-1.8.5.tar.gz) = 991899146c23c9ea30ac09f41b7077fa0c8686b6
 Size (ruby-1.8.5.tar.gz) = 4438603 bytes
 SHA1 (patch-aa) = c5413c506b93657d909bc3cbdcdb51e7c216491e
 SHA1 (patch-ab) = a1a76abd093a08e76be61678febd5f8c8cba164d
 SHA1 (patch-ae) = dfa9c5296c75f6193c790fca8d3eb15ad4a9f228
-SHA1 (patch-bl) = cfb31ebef08aebf9ce3bc6e44c83e1727950ef76
+SHA1 (patch-af) = 165c8b564311d1ce03722c7c3cf455bbaf1b1a3a
diff --git a/lang/ruby18-base/options.mk b/lang/ruby18-base/options.mk
new file mode 100644
index 00000000000..e0b12744586
--- /dev/null
+++ b/lang/ruby18-base/options.mk
@@ -0,0 +1,11 @@
+# $NetBSD: options.mk,v 1.1 2006/12/06 16:24:27 taca Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.ruby
+PKG_SUPPORTED_OPTIONS=		ruby-build-ri-db
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mruby-build-ri-db)
+CONFIGURE_ARGS+=	--enable-install-doc
+RUBY_DYNAMIC_DIRS+=	${RUBY_RIDIR:S,${PREFIX}/,,}
+.endif
diff --git a/lang/ruby18-base/patches/patch-af b/lang/ruby18-base/patches/patch-af
new file mode 100644
index 00000000000..ca36fb433e0
--- /dev/null
+++ b/lang/ruby18-base/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/12/06 16:24:27 taca Exp $
+
+--- common.mk.orig	2006-12-06 00:02:32.000000000 +0900
++++ common.mk
+@@ -3,7 +3,7 @@ lib: $(LIBRUBY)
+ dll: $(LIBRUBY_SO)
+ 
+ RUBYOPT       =
+-NULLCMD       =
++NULLCMD       = :
+ 
+ STATIC_RUBY   = static-ruby
+ 
diff --git a/lang/ruby18-base/patches/patch-bl b/lang/ruby18-base/patches/patch-bl
deleted file mode 100644
index 1e732a78f4d..00000000000
--- a/lang/ruby18-base/patches/patch-bl
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bl,v 1.3 2006/11/03 05:36:23 taca Exp $
-
---- lib/cgi.rb.orig	2006-11-02 22:44:37.000000000 +0900
-+++ lib/cgi.rb
-@@ -1018,7 +1018,7 @@ class CGI
-               else
-                 stdinput.read(content_length)
-               end
--          if c.nil?
-+          if c.nil? || c.empty?
-             raise EOFError, "bad content body"
-           end
-           buf.concat(c)