6 files changed, 149 insertions, 6 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index bc14fad4659b..2506c6872c4d 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,14 @@
 # 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.80 2004/08/18 17:08:21 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.81 2004/08/19 13:25:12 usata Exp $
+
+*ruby-1.8.0-r7 (19 Aug 2004)
+
+  19 Aug 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/ruby-1.8.0-CGI::Session.patch, +ruby-1.8.0-r7.ebuild,
+  ruby-1.8.2_pre2.ebuild:
+  Applied a patch to set safer permission when using CGI::Session and
+  PStore. See bug #60525.
 
 *ruby-1.6.8-r11 (19 Aug 2004)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 67c0eaba7df3..fe59b6f83092 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -4,10 +4,12 @@ MD5 d17e87a1b640bb29da4a014bda4be805 ruby-1.8.1-r7.ebuild 2782
 MD5 6eca81d9bf6a841858edcccf9d8e11b5 ruby-1.8.1-r6.ebuild 2780
 MD5 ff3e3aae8951139857c586aadaa24a39 ruby-1.6.8-r6.ebuild 1741
 MD5 51ee5cf8e69ec26f1e8e2207d1524cf3 ruby-1.6.8-r11.ebuild 1872
-MD5 6b1833b9adfb7afa621d637ad2169968 ruby-1.8.2_pre2.ebuild 2980
+MD5 889dd9e47cfb3680c5b3f8f55d879744 ruby-1.8.2_pre2.ebuild 2972
+MD5 b485fad754bfdc3020f716b8c27f49e4 ruby-1.8.0-r7.ebuild 2673
 MD5 d4c03bbdb7088b3463ec88e0ab435455 ruby-1.8.0-r6.ebuild 2611
 MD5 2a1eaeffe23ec950b79dc2f50ce6d16c ruby-1.8.1-r3.ebuild 2728
 MD5 1a30065f9208a5370becf95e0e829edf ruby-1.6.8-r10.ebuild 1825
+MD5 7f71fa1db8bbbeb93b08628870ddfe85 files/digest-ruby-1.8.0-r7 125
 MD5 b48dff624661317e05cd3ad1d6954096 files/digest-ruby-1.6.8-r6 128
 MD5 e1fe59c9583e8cff244a322c15cee217 files/digest-ruby-1.8.1-r7 137
 MD5 eb455e926861eef9381b885d1679711e files/digest-ruby-1.8.1-r6 199
@@ -15,6 +17,7 @@ MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
 MD5 cc29fb12a2f12f94d88ed90706907e9c files/digest-ruby-1.6.8-r11 136
 MD5 cb7da9e01481e07b2cc8514dd60af9ba files/digest-ruby-1.8.2_pre2 134
 MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
+MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
 MD5 512336d825e446e013bd383519b6559c files/digest-ruby-1.8.0-r6 128
 MD5 e74e6ef0cfcafd538fe1a52f30cae316 files/digest-ruby-1.8.1-r3 200
 MD5 00d694f37ea1e1bb8af28217617df130 files/digest-ruby-1.6.8-r10 199
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.0-r7 b/dev-lang/ruby/files/digest-ruby-1.8.0-r7
new file mode 100644
index 000000000000..a14b5813ff67
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.0-r7
@@ -0,0 +1,2 @@
+MD5 582a65e52598a4a1e9fce523e16e67d6 ruby-1.8.0.tar.gz 1979070
+MD5 3154a12abdbc3ece51b86b8b16c0d2c6 onigd2_3_1.tar.gz 203510
diff --git a/dev-lang/ruby/files/ruby-1.8.0-CGI::Session.patch b/dev-lang/ruby/files/ruby-1.8.0-CGI::Session.patch
new file mode 100644
index 000000000000..a0bcbf8c696f
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-1.8.0-CGI::Session.patch
@@ -0,0 +1,25 @@
+diff -urN ruby-1.8.0.orig/lib/cgi/session/pstore.rb ruby-1.8.0/lib/cgi/session/pstore.rb
+--- ruby-1.8.0.orig/lib/cgi/session/pstore.rb	2003-07-15 14:38:05.000000000 +0900
++++ ruby-1.8.0/lib/cgi/session/pstore.rb	2004-08-19 22:00:06.000000000 +0900
+@@ -32,6 +32,9 @@
+ 	  @hash = {}
+ 	end
+ 	@p = ::PStore.new path 
++	@p.transaction do |p|
++	  File.chmod(0600, p.path)
++	end
+       end
+ 
+       def restore
+diff -urN ruby-1.8.0.orig/lib/cgi/session.rb ruby-1.8.0/lib/cgi/session.rb
+--- ruby-1.8.0.orig/lib/cgi/session.rb	2003-07-24 01:44:55.000000000 +0900
++++ ruby-1.8.0/lib/cgi/session.rb	2004-08-19 21:57:23.000000000 +0900
+@@ -124,7 +124,7 @@
+ 	begin
+ 	  @f = open(path, "r+")
+ 	rescue Errno::ENOENT
+-	  @f = open(path, "w+")
++	  @f = File.open(path, File::CREAT|File::RDWR, 0600)
+ 	end
+       end
+ 
diff --git a/dev-lang/ruby/ruby-1.8.0-r7.ebuild b/dev-lang/ruby/ruby-1.8.0-r7.ebuild
new file mode 100644
index 000000000000..88be93909e5c
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.0-r7.ebuild
@@ -0,0 +1,107 @@
+# 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.8.0-r7.ebuild,v 1.1 2004/08/19 13:25:12 usata Exp $
+
+ONIGURUMA="onigd2_3_1"
+MY_P=${P/_pre/-preview}
+
+inherit flag-o-matic alternatives eutils gnuconfig
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
+	cjk? ( http://www.geocities.jp/kosako1/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+SLOT="1.8"
+KEYWORDS="~alpha ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="socks5 tcltk cjk"
+
+RDEPEND="virtual/libc
+	>=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	socks5? ( >=net-misc/dante-1.1.13 )
+	tcltk?  ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3
+	!=dev-lang/ruby-cvs-1.8*"
+DEPEND="sys-devel/autoconf
+	sys-apps/findutils
+	${RDEPEND}"
+PROVIDE="virtual/ruby"
+
+S=${WORKDIR}/${P%_pre*}
+
+src_unpack() {
+	unpack ${A}
+
+	if use cjk ; then
+		einfo "Applying ${ONIGURUMA}"
+		pushd oniguruma
+		econf --with-rubydir=${S} || die "econf failed"
+		make ${SLOT/./}
+		popd
+	fi
+
+	# Enable build on alpha EV67
+	if [ "${ARCH}" = "alpha" ] ; then
+		gnuconfig_update || die "gnuconfig_update failed"
+	fi
+
+	# bug #60525
+	epatch ${FILESDIR}/${P}-CGI::Session.patch
+}
+
+src_compile() {
+	filter-flags -fomit-frame-pointer
+
+	# Socks support via dante
+	if ! use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		CFLAGS="${CFLAGS} -DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+		export CFLAGS
+	fi
+
+	econf --program-suffix=${SLOT/./} --enable-shared \
+		`use_enable socks5 socks` \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	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() {
+	ewarn
+	ewarn "Warning: Vim won't work if you've just updated ruby from"
+	ewarn "1.6.x to 1.8.x due to the library version change."
+	ewarn "In that case, you will need to remerge vim."
+	ewarn
+
+	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
+}
diff --git a/dev-lang/ruby/ruby-1.8.2_pre2.ebuild b/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
index 75375b062f57..a465bf756d22 100644
--- a/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
@@ -1,6 +1,6 @@
 # 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.8.2_pre2.ebuild,v 1.1 2004/07/31 19:47:36 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre2.ebuild,v 1.2 2004/08/19 13:25:12 usata Exp $
 
 ONIGURUMA="onigd2_3_1"
 MY_P=${P/_pre/-preview}
@@ -67,9 +67,7 @@ src_compile() {
 		export CFLAGS
 	fi
 
-	econf \
-		--program-suffix=${SLOT/./} \
-		--enable-shared \
+	econf --program-suffix=${SLOT/./} --enable-shared \
 		`use_enable socks5 socks` \
 		|| die "econf failed"
 	emake || die "emake failed"