Version bump to fix the new security issue with cgi.rb. Bug #157048.

Package-Manager: portage-2.1.2_rc2-r3

4 files changed, 176 insertions, 5 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index ab0a0a76479e..4a826cae5243 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.238 2006/11/25 16:12:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.239 2006/12/04 09:18:32 flameeyes Exp $
+
+*ruby-1.8.5_p2 (04 Dec 2006)
+
+  04 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> +ruby-1.8.5_p2.ebuild:
+  Version bump to fix the new security issue with cgi.rb. Bug #157048.
 
   25 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> ruby-1.8.5-r3.ebuild:
   Stable on ia64.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 97b62391d60d..0bf307a14f09 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX oniguruma-2.3.1-gentoo.patch 593 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f SHA1 a512797b26b023d6fc8d38f70598d90c7b248bce SHA256 cb976a2907e29d25b23fc3e8db18b40f65fbde1f22b6c511cd6cf57f4bca08b3
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f files/oniguruma-2.3.1-gentoo.patch 593
@@ -17,6 +20,7 @@ SHA256 674e426e9ac8f8012fb53c7320276959867c73bb1d01ec1ba2e1faabf51d4059 files/ru
 DIST onigd2_5_0.tar.gz 210448 RMD160 2b3638e6300f8b994f334a064381b8013b286db0 SHA1 73e3f1fc91decd2fb23674c536dc4eb55cadba07 SHA256 83d379f48a9ddb469883e5d78cb06de1ae7b9102e7cebd88a132aad6996163df
 DIST onigd2_5_4.tar.gz 212280 RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 SHA1 68438f08aed58bb4655e9268268a0311ea524df7 SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b
 DIST ruby-1.8.4.tar.gz 4312965 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 SHA1 93999577c7fc4decc6b2fe8fefa96e743f278fbf SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930
+DIST ruby-1.8.5-p2.tar.gz 4519151 RMD160 3ad4c4a4d02930cbb1a582ea5fa19db04f55ab3b SHA1 f614bba73f447ddf35f8a4beb71ccc3df87831a5 SHA256 496844dc90571454a50552912f02a42df7fc4f89cef5bd3cd4854cecf3fd1d30
 DIST ruby-1.8.5.tar.gz 4438603 RMD160 991899146c23c9ea30ac09f41b7077fa0c8686b6 SHA1 0638ea26e1088fc9f4237abde8c85331689ce77c SHA256 19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
 EBUILD ruby-1.8.4-r1.ebuild 3771 RMD160 75635c3b811cf62a939aabd5f160555b7a5c0ef0 SHA1 3e7919428f597dd8c33e0a0b598724e3e8898a40 SHA256 b7174f171b5a08c5aa76726b525ef7710cdf317f1e01e28fddb66fcb28a136ce
 MD5 01ce7f10fbcc7ce0b78c949ae943ceed ruby-1.8.4-r1.ebuild 3771
@@ -42,10 +46,14 @@ EBUILD ruby-1.8.5.ebuild 3845 RMD160 490491505737dfe394b73f851a3a51592de3072b SH
 MD5 c4dd9cb7619ea13a0859d7d62238eb2f ruby-1.8.5.ebuild 3845
 RMD160 490491505737dfe394b73f851a3a51592de3072b ruby-1.8.5.ebuild 3845
 SHA256 4ef73244db14906d94a508f76ad158da30b986b15601ca7ccd180c1871e14118 ruby-1.8.5.ebuild 3845
-MISC ChangeLog 34295 RMD160 8f83db33ac8d9bfb39d7bd1b4a214f24a059db03 SHA1 f806de4c2bf2a4d42e2c1bca62eadce83eabe082 SHA256 aae28f6630d20972798c96c940b637d42e689cbd3483966818f67c78826544db
-MD5 7c64e414b036a05b13be8435f72b0fd8 ChangeLog 34295
-RMD160 8f83db33ac8d9bfb39d7bd1b4a214f24a059db03 ChangeLog 34295
-SHA256 aae28f6630d20972798c96c940b637d42e689cbd3483966818f67c78826544db ChangeLog 34295
+EBUILD ruby-1.8.5_p2.ebuild 3839 RMD160 98363016895653c8532b110330e7100d0dd96f2a SHA1 160819535f0346638c75573340fd6ccb938c1291 SHA256 bc44217da2fb7ba15270be0735ea93140c8c77f5bb996704e556388e7849fc30
+MD5 20d4836734eb6f64a24ef3345d3dfb6b ruby-1.8.5_p2.ebuild 3839
+RMD160 98363016895653c8532b110330e7100d0dd96f2a ruby-1.8.5_p2.ebuild 3839
+SHA256 bc44217da2fb7ba15270be0735ea93140c8c77f5bb996704e556388e7849fc30 ruby-1.8.5_p2.ebuild 3839
+MISC ChangeLog 34476 RMD160 1f0e05012d54f35f03fc5a4f3763112ef452fad9 SHA1 504ee4b89c13ab88baa56a556bbbc6525b4f4acd SHA256 c05750413d167b427804f345c4b310366803dfdaea560e6b5e952cb5633093f3
+MD5 1324fb721215d4ff2f17c457c3c138d8 ChangeLog 34476
+RMD160 1f0e05012d54f35f03fc5a4f3763112ef452fad9 ChangeLog 34476
+SHA256 c05750413d167b427804f345c4b310366803dfdaea560e6b5e952cb5633093f3 ChangeLog 34476
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -68,3 +76,13 @@ SHA256 7c362e231f229a4afbd81fc401069c1411f7833a9b56122c3b3acd9d9de71eee files/di
 MD5 86b5d06a5da72078a1755ad84cf57d56 files/digest-ruby-1.8.5-r3 467
 RMD160 094acdf2c1878e06040137dd5f14a790116dccbd files/digest-ruby-1.8.5-r3 467
 SHA256 7c362e231f229a4afbd81fc401069c1411f7833a9b56122c3b3acd9d9de71eee files/digest-ruby-1.8.5-r3 467
+MD5 1f19a6f6002d866f1c87b6a6c1e67a5e files/digest-ruby-1.8.5_p2 476
+RMD160 d053ec5c6530e87fa7450736cc807161d0c73a1f files/digest-ruby-1.8.5_p2 476
+SHA256 f9a7b50302622bc5e87fbdc0caa22822562dc94774914e9e4b835bbf2fcd5a17 files/digest-ruby-1.8.5_p2 476
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFc+f2AiZjviIA2XgRAk2RAJ9HcXW2CbhlIfefGhKPKMJMwm6tEQCePOiv
+jrO9q/pdjZ87qTVzJz1xE44=
+=BEDz
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.5_p2 b/dev-lang/ruby/files/digest-ruby-1.8.5_p2
new file mode 100644
index 000000000000..3c590f785d96
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.5_p2
@@ -0,0 +1,6 @@
+MD5 b3b6b2d2f77f1f485d055d74f6eb6f2a onigd2_5_4.tar.gz 212280
+RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 onigd2_5_4.tar.gz 212280
+SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b onigd2_5_4.tar.gz 212280
+MD5 a3517a224716f79b14196adda3e88057 ruby-1.8.5-p2.tar.gz 4519151
+RMD160 3ad4c4a4d02930cbb1a582ea5fa19db04f55ab3b ruby-1.8.5-p2.tar.gz 4519151
+SHA256 496844dc90571454a50552912f02a42df7fc4f89cef5bd3cd4854cecf3fd1d30 ruby-1.8.5-p2.tar.gz 4519151
diff --git a/dev-lang/ruby/ruby-1.8.5_p2.ebuild b/dev-lang/ruby/ruby-1.8.5_p2.ebuild
new file mode 100644
index 000000000000..676cf8c9af52
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.5_p2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p2.ebuild,v 1.1 2006/12/04 09:18:32 flameeyes Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+ONIGURUMA="onigd2_5_4"
+
+inherit flag-o-matic alternatives eutils multilib autotools
+
+MY_P="${P/_p/-p}"
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${MY_P}.tar.gz
+	cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+SLOT="1.8"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug socks5 tk cjk doc threads examples ipv6"
+RESTRICT="confcache"
+
+RDEPEND=">=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3
+	!=dev-lang/ruby-cvs-1.8*
+	!dev-ruby/rdoc
+	!dev-ruby/rexml"
+DEPEND="${RDEPEND}"
+PROVIDE="virtual/ruby"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+
+	if use cjk ; then
+		einfo "Applying ${ONIGURUMA}"
+		pushd ${WORKDIR}/oniguruma
+#		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
+		econf --with-rubydir=${S} || die "econf failed"
+		make ${MY_PV/./}
+		popd
+	fi
+
+	cd "${S}"
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_compile() {
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	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
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	econf --program-suffix=${SLOT/./} --enable-shared \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		$(use_enable threads pthread) \
+		$(use_enable ipv6 ipv6) \
+		$(use_enable debug debug) \
+		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	LD_LIBRARY_PATH=${D}/usr/$(get_libdir)
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
+	for d in $(find ${S}/ext -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	make DESTDIR=${D} install || die "make install failed"
+
+	if use doc; then
+		make DESTDIR=${D} install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		dodir ${ROOT}usr/share/doc/${PF}
+		cp -pPR sample ${D}/${ROOT}usr/share/doc/${PF}
+	fi
+
+	if use ppc-macos ; then
+		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%.*}.dylib
+		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%_*}.dylib
+	else
+		dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*}
+		dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%_*}
+	fi
+
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}
+
+pkg_postinst() {
+	if ! use ppc-macos ; then
+		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
+	fi
+}
+
+pkg_postrm() {
+	if ! use ppc-macos ; then
+		if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+			${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+		fi
+	fi
+}