Added a patch to fix CGI issue; bug #69985.

5 files changed, 202 insertions, 10 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 75b77cb9c748..5a02d1efd4b6 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.98 2004/10/27 08:12:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.99 2004/11/04 16:25:59 usata Exp $
+
+*ruby-1.6.8-r12 (05 Nov 2004)
+
+  05 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/ruby-1.6.8-20040728-20041024.diff, +ruby-1.6.8-r12.ebuild:
+  Added a patch to fix CGI issue; bug #69985.
 
   27 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.2_pre2.ebuild:
   Fixed bug #68901.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 86233bd2bfd0..62564d64917e 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,14 +1,27 @@
-MD5 f5f52fddda233f187521a2543738cc59 ruby-1.8.2_pre2.ebuild 3419
-MD5 8f0fe45b59ec7a1bf9d07cf6e42828ed ruby-1.6.8-r11.ebuild 2014
-MD5 4b89f50a9cbac9ffab8b388d96574ff9 ruby-1.8.1-r7.ebuild 2870
-MD5 53d2e0053b26577f8ce296ffd65b9d8e ChangeLog 15751
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 da9d9fb525a457779b786044fc56bcaa ChangeLog 15946
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 4b89f50a9cbac9ffab8b388d96574ff9 ruby-1.8.1-r7.ebuild 2870
+MD5 11ecace5202cab15511d50309f13b118 ruby-1.6.8-r12.ebuild 1993
+MD5 8f0fe45b59ec7a1bf9d07cf6e42828ed ruby-1.6.8-r11.ebuild 2014
+MD5 f5f52fddda233f187521a2543738cc59 ruby-1.8.2_pre2.ebuild 3419
 MD5 a3c17148005564e47795b4928b35c61a ruby-1.8.0-r7.ebuild 2817
-MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
-MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
-MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-fix-ppc.patch 593
-MD5 d604e46a2d8a4c411b03c101e36ee29a files/ruby-rdoc-gentoo.diff 473
-MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
 MD5 19938f076658cc6b4edb91d62ae357f0 files/digest-ruby-1.8.0-r7 125
 MD5 3e8d8ff915f444c975169748675b06c9 files/digest-ruby-1.8.1-r7 137
+MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-fix-ppc.patch 593
+MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
+MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
 MD5 a5d6f26168583bd4fd399f0855323175 files/digest-ruby-1.8.2_pre2 134
+MD5 c712bead7ea215530089c5ee8de9c774 files/ruby-1.6.8-20040728-20041024.diff 3057
+MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
+MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
+MD5 d604e46a2d8a4c411b03c101e36ee29a files/ruby-rdoc-gentoo.diff 473
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBilafVWNWqTUmv+0RAtUaAJ94Anz9IW7Z3sEWo0/fSRVPDsTXjACffJMJ
+tUBalhvwNaC9zxsfRn2KSx0=
+=mKjD
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r12 b/dev-lang/ruby/files/digest-ruby-1.6.8-r12
new file mode 100644
index 000000000000..857a3f7f510b
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.6.8-r12
@@ -0,0 +1,2 @@
+MD5 19eae3f81026270a201004d0decd3bc8 ruby-1.6.8-2004.07.28.tar.gz 1056477
+MD5 a340ae6a721362338a8d8f5a79e470d5 onigd2_3_3.tar.gz 199191
diff --git a/dev-lang/ruby/files/ruby-1.6.8-20040728-20041024.diff b/dev-lang/ruby/files/ruby-1.6.8-20040728-20041024.diff
new file mode 100644
index 000000000000..2edf362414a1
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-1.6.8-20040728-20041024.diff
@@ -0,0 +1,92 @@
+diff --exclude=CVS -urN ruby-1.6.8-20040728/ChangeLog ruby-1.6.8-20041024/ChangeLog
+--- ruby-1.6.8-20040728/ChangeLog	2004-11-04 23:18:54.000000000 +0900
++++ ruby-1.6.8-20041024/ChangeLog	2004-11-05 00:09:04.000000000 +0900
+@@ -54,6 +54,11 @@
+ 
+ 	* gc.c (Init_stack): add safety margin.
+ 
++Sat Jun 14 17:59:59 2003  Guy Decoux  <ts@moulon.inra.fr>
++
++	* eval.c (method_arity): should handle NODE_BMETHOD and
++	  NODE_DMETHOD. [ruby-core:01138]
++
+ Fri May 30 11:25:58 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+ 
+ 	* lib/irb/xmp.rb: sync with 1.8 ("irb/irb" -> "irb").
+diff --exclude=CVS -urN ruby-1.6.8-20040728/eval.c ruby-1.6.8-20041024/eval.c
+--- ruby-1.6.8-20040728/eval.c	2004-11-04 23:18:56.000000000 +0900
++++ ruby-1.6.8-20041024/eval.c	2004-11-05 00:09:05.000000000 +0900
+@@ -3,7 +3,7 @@
+   eval.c -
+ 
+   $Author: matz $
+-  $Date: 2003/05/19 16:19:21 $
++  $Date: 2004/10/24 23:37:20 $
+   created at: Thu Jun 10 14:22:17 JST 1993
+ 
+   Copyright (C) 1993-2001 Yukihiro Matsumoto
+@@ -6827,6 +6827,9 @@
+ 	return INT2FIX(1);
+       case NODE_IVAR:
+ 	return INT2FIX(0);
++      case NODE_BMETHOD:
++      case NODE_DMETHOD:
++       return proc_arity(method);
+       default:
+ 	body = body->nd_next;	/* skip NODE_SCOPE */
+ 	if (nd_type(body) == NODE_BLOCK)
+diff --exclude=CVS -urN ruby-1.6.8-20040728/io.c ruby-1.6.8-20041024/io.c
+--- ruby-1.6.8-20040728/io.c	2004-11-04 23:18:56.000000000 +0900
++++ ruby-1.6.8-20041024/io.c	2004-11-05 00:09:06.000000000 +0900
+@@ -2,8 +2,8 @@
+ 
+   io.c -
+ 
+-  $Author: nobu $
+-  $Date: 2003/07/26 18:10:41 $
++  $Author: matz $
++  $Date: 2004/10/24 23:37:20 $
+   created at: Fri Oct 15 18:08:59 JST 1993
+ 
+   Copyright (C) 1993-2000 Yukihiro Matsumoto
+@@ -2184,7 +2184,8 @@
+ 	    line = rb_obj_as_string(argv[i]);
+ 	}
+ 	rb_io_write(out, line);
+-	if (RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {
++	if (RSTRING(line)->len == 0 ||
++            RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {
+ 	    rb_io_write(out, rb_default_rs);
+ 	}
+     }
+diff --exclude=CVS -urN ruby-1.6.8-20040728/lib/cgi.rb ruby-1.6.8-20041024/lib/cgi.rb
+--- ruby-1.6.8-20040728/lib/cgi.rb	2004-11-04 23:18:57.000000000 +0900
++++ ruby-1.6.8-20041024/lib/cgi.rb	2004-11-05 00:09:07.000000000 +0900
+@@ -182,7 +182,7 @@
+   CR  = "\015"
+   LF  = "\012"
+   EOL = CR + LF
+-  REVISION = '$Id: cgi.rb,v 1.23.2.17 2002/08/25 20:15:54 wakou Exp $'
++  REVISION = '$Id: cgi.rb,v 1.23.2.18 2004/10/24 23:37:19 matz Exp $'
+ 
+   NEEDS_BINMODE = true if /WIN/ni.match(RUBY_PLATFORM)
+   PATH_SEPARATOR = {'UNIX'=>'/', 'WINDOWS'=>'\\', 'MACINTOSH'=>':'}
+@@ -823,13 +823,15 @@
+           end
+ 
+           c = if bufsize < content_length
+-                stdinput.read(bufsize) or ''
++                stdinput.read(bufsize)
+               else
+-                stdinput.read(content_length) or ''
++                stdinput.read(content_length)
+               end
++          if c.nil?
++            raise EOFError, "bad content body"
++          end
+           buf += c
+           content_length -= c.size
+-
+         end
+ 
+         buf = buf.sub(/\A((?:.|\n)*?)(?:#{EOL})?#{boundary}(#{EOL}|--)/n) do
diff --git a/dev-lang/ruby/ruby-1.6.8-r12.ebuild b/dev-lang/ruby/ruby-1.6.8-r12.ebuild
new file mode 100644
index 000000000000..3a2269c5c002
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.6.8-r12.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r12.ebuild,v 1.1 2004/11/04 16:25:59 usata Exp $
+
+IUSE="cjk"
+
+ONIGURUMA="onigd2_3_3"
+SNAP_DATE="2004.07.28"
+MY_P="${P}-${SNAP_DATE}"
+S="${WORKDIR}/${MY_P}"
+
+inherit flag-o-matic alternatives eutils
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+#SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz"
+SRC_URI="mirror://ruby/snapshots/${MY_P}.tar.gz
+	cjk? ( http://www.geocities.jp/kosako1/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+SLOT="1.6"
+KEYWORDS="x86 alpha ppc ~sparc ~hppa ~amd64 -ia64 ~mips"
+
+DEPEND="virtual/libc
+	>=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	>=dev-ruby/ruby-config-0.3"
+PROVIDE="virtual/ruby"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-${SNAP_DATE//./}-20041024.diff
+	use amd64 && epatch ${FILESDIR}/${P}-fix-x86_64.patch
+
+	if use cjk ; then
+		einfo "Applying ${ONIGURUMA}"
+		cd ${WORKDIR}/oniguruma
+		if use ppc || use ppc64 || use alpha ; then
+			epatch ${FILESDIR}/oniguruma-2.3.1-fix-ppc.patch
+		fi
+		econf --with-rubydir=${S} || die "econf failed"
+		make ${SLOT/./}
+	fi
+}
+
+src_compile() {
+	filter-flags -fomit-frame-pointer
+	econf --program-suffix=${SLOT/./} --enable-shared || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV%.*}
+	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV}
+
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}
+
+pkg_postinst() {
+
+	if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+		${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+	fi
+	einfo
+	einfo "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
+	einfo
+}
+
+pkg_postrm() {
+
+	if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+		${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+	fi
+}