Last patchlevel bump for Ruby 1.8.6 to 399, fixes CVE-2010-0541 (bug 332957). Also restrict Tk and OpenSSL dependencies and fix rubytests installation path (reported by the x86 team in bug 332597)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 21 insertions, 195 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index d4f2a3e59ce7..2ac72998a855 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.465 2010/08/18 16:51:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.466 2010/08/19 21:35:06 a3li Exp $
+
+*ruby-1.8.6_p399 (19 Aug 2010)
+
+  19 Aug 2010; Alex Legler <a3li@gentoo.org> -ruby-1.8.6_p388.ebuild,
+  -ruby-1.8.6_p388-r1.ebuild, +ruby-1.8.6_p399.ebuild:
+  Last patchlevel bump for Ruby 1.8.6 to 399, fixes CVE-2010-0541 (bug
+  332957). Also restrict Tk and OpenSSL dependencies and fix rubytests
+  installation path (reported by the x86 team in bug 332597)
 
 *ruby-1.9.2_rc2-r1 (18 Aug 2010)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 877131ef92eb..140e5c8e6d48 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,28 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST ruby-1.8.6-p388.tar.bz2 3973412 RMD160 9f451182ef4fb485109d96953e6af388151cadc8 SHA1 175e7f1571761e522e88cc8a8ed123f000c99c59 SHA256 8536b18413f2475698fa275b356daff6ceab5232bc503496f4afbee64e8b4abc
+DIST ruby-1.8.6-p399.tar.bz2 3972399 RMD160 1c0bb41966c9f6011fa40b9de58ef95cb6610710 SHA1 4a7b5ec1ccbeb8c6c0c49c844471a5ee14cdaa98 SHA256 20ca08aeefa21ca2581a9791f8f9ace3addc92bd978cf36f2f95c109085a50a7
 DIST ruby-1.8.7-p249.tar.bz2 4153461 RMD160 96b238bd7194652ec194a505c2e5911441c5c5ee SHA1 2947f21f22e9345a3e94d84e6f88e7d0fc98a871 SHA256 8b89448fc79df6862660e9f77e884f06c76da28f078d8edd2f17567a615f3af5
 DIST ruby-1.8.7-p299.tar.bz2 4183359 RMD160 0ea4a05f439b6a2cf4bf53339df48aed329f9e43 SHA1 9c66c6ee21d427b5f3183b6c42beb02aa8618cef SHA256 3d8a1e4204f1fb69c9e9ffd637c7f7661a062fc2246c559f25fda5312cfd65d8
 DIST ruby-1.9.2-rc2.tar.bz2 8480974 RMD160 d1f1eded267407699d6975bc284f00a6ad7930a5 SHA1 d4cbbb275b0534ccf4da27847972989adcfdb76d SHA256 692ebae991b104482dc9f0d220c1afb6b690a338b3b815aaa4f62954d2fa1b4a
-DIST ruby-patches-1.8.6_p388-r1.tar.bz2 5085 RMD160 bfe19c6c9920181f1957971ea7ec8d6c62a03bf4 SHA1 5ad1ddfcb019b8cf6d46ae39ab4bcbef78737be0 SHA256 f922577613ea96fd51d5656d4ecedf46a09a835e834256a1b3272c68b83c4047
-DIST ruby-patches-1.8.6_p388.tar.bz2 3137 RMD160 6c9b3099687aef29bf9881f11c2915fbd0ba8196 SHA1 7222102440156b9fd0b461bd23828301aa62a5ad SHA256 93053c8fe2e9fcf9fba714780466678c78b42be59547f76055ffea53aef4c4e5
+DIST ruby-patches-1.8.6_p399.tar.bz2 3782 RMD160 d0faa549dc93ed1ff372ea8edac427e948c6c3bd SHA1 f1702eca97623a123ef49e38f21ac4cc0b0fe94e SHA256 d6b8218856ba4aaf0f0724035d13e165b82b17bc6a6f2b89800bf3628062f77b
 DIST ruby-patches-1.8.7_p249.tar.bz2 1499 RMD160 98670658db00a1c4ad563e68bf25263fd7f317fd SHA1 d371f7f25a75ac8626e2e87a570bb52a60579fb8 SHA256 b35ba05fb07c0264a9232e756cd80ff7f284fb8aa464368ce028d67fa11f31af
 DIST ruby-patches-1.8.7_p299.tar.bz2 1781 RMD160 edf80f6ea3809b3a9f2e697b8f78baeb5df2e346 SHA1 29743874ace02f75dc4e1fcf4516cfac589748b3 SHA256 83931a1d9d59a307cf5b173e7b4235a8606f61c86636e6e489f4da15bde8110d
 DIST ruby-patches-1.9.2_rc2-r0.2.tar.bz2 1669 RMD160 2ffb5afed0b83c6057f2a6690126228407464ea8 SHA1 7eeba042beeb7b044b63d4c760aca3ebb7d10f66 SHA256 89e021312256e6d6b2880794b7f15226b5b19709263933dc4bda432908370673
 DIST ruby-patches-1.9.2_rc2-r1.tar.bz2 2403 RMD160 345fcf857e8760f66ded3759a9a84d4a4d94b067 SHA1 985dbbec258c319d1a256c53af1f79148cc7bdf6 SHA256 2b1b45ad4195fc8aba26858fc4ca31769a9c49af9711902bac95732baf26ed0f
-EBUILD ruby-1.8.6_p388-r1.ebuild 5584 RMD160 878fefd6c474d6cbf38d033cd698a1f246006801 SHA1 acb0c0ced98bb37efbe7d40d75a8894315c1e9bd SHA256 5a7e156e9136773f9ef6425718115d1060588d8fbdea1b2cd931331b31ada620
-EBUILD ruby-1.8.6_p388.ebuild 5329 RMD160 91d80731628a54a76254540a816b7be7cb22e91e SHA1 2bfe49e18e9c39cd2fcc79dd6aadbc678073c8b5 SHA256 92c012a949f9d274754f22d0fb80e35f0c22559b2cad2ce5d7c79ab64fa8bce7
+EBUILD ruby-1.8.6_p399.ebuild 5625 RMD160 25224e7efb58c95c9f7dacd95e288ae5f6baca59 SHA1 626f63f1db475535a80654ebfb9751e0bff94538 SHA256 2d7f79c028548b9595641fe77fc3d902f21b0938d03863b24cb997a9ce0e16fd
 EBUILD ruby-1.8.7_p249.ebuild 5344 RMD160 1c78a00aceb9f3ddeb6c18f4c45d289bc507b370 SHA1 34808e3e70b3c0c20f87f991ebdd9d51dd98b848 SHA256 3d2a1eb8198d65adad424198f35e42679408ffb44e5e9c281f98ee9a45c970eb
 EBUILD ruby-1.8.7_p299.ebuild 5593 RMD160 1567275df5ac7d4ff773826fd282ac02cb8da230 SHA1 01302a245f322c65e9d88ababbd5efc0d4bf40f6 SHA256 79611095f6778ab78d53ab1e7dfaa00479d06e0a930d1ff2c8caaeb42e61070b
 EBUILD ruby-1.9.2_rc2-r1.ebuild 5856 RMD160 730f24c7e6215a5f645e580a213c2eb525109725 SHA1 2e2d6a6822c59b353cd11ce8f6843a194b04d0f4 SHA256 299524f03ab280539e0d5fc6ba87facd5e36789977420cf22e0dd653c7f06d48
 EBUILD ruby-1.9.2_rc2.ebuild 5745 RMD160 4c740109d13eb0447d8390ec7791c664da8635c2 SHA1 60663280b00a0f5f963567b09ced755ae722b86f SHA256 ef2c8c819b799a34d6741ca7b81f9aa87477768d5e8d4955cdc1bb12b95229b2
-MISC ChangeLog 72195 RMD160 de4c07585f4cdc683d5895b404511a562b8ae7d0 SHA1 4aa9163548237a1f4619e0f8222fa819766dc605 SHA256 8acf65e3ebf5de3790ff3c00d43c6f745eb3a08863469b6182eb70942a3dc547
+MISC ChangeLog 72551 RMD160 0c31b29d386537e3016cbd483c00be23161079be SHA1 90557f4c3f0097899c72298e05d2f3cca78d1c06 SHA256 70135a0ec01ebfffe3b40b85a405ead70a07c71bf8b693f1581377713070df02
 MISC metadata.xml 1290 RMD160 ec57ec384046e961b936cf75351e9529abf66e59 SHA1 c0c82f3fc28636419f1ed273384560b9b0059f84 SHA256 278a675c46272062d635b79ab226883ac1ccb58db2f3f37cd77bee13f40ff2cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxsD5sACgkQAiZjviIA2Xg8qQCfVQYVrLutI5vLSV1pz77VgZxz
-VfwAoNEoSHNBkz5rsi9eo4+0TCu9TYWQ
-=ljmm
+iF4EAREIAAYFAkxto5EACgkQ3Ca6Xy8+rvSBuwD+MeLgr1PgCLwR9t9u/30pYk+W
+jSohjS8mORrRojOYQLkA/iBM7B5sh+byPt/zdkEYBGGBxaDczRazIFC3/t/TJqCF
+=lyxH
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.8.6_p388.ebuild b/dev-lang/ruby/ruby-1.8.6_p388.ebuild
deleted file mode 100644
index 9015962d669a..000000000000
--- a/dev-lang/ruby/ruby-1.8.6_p388.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p388.ebuild,v 1.7 2010/05/06 19:50:01 a3li Exp $
-
-EAPI=1
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
-http://dev.a3li.li/gentoo/distfiles/${PN}-patches-${PVR}.tar.bz2"
-
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="+berkdb debug doc emacs examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk )
-	>=app-admin/eselect-ruby-20091225
-	!=dev-lang/ruby-cvs-${SLOT}*
-	!<dev-ruby/rdoc-2
-	!dev-ruby/rexml"
-DEPEND="${RDEPEND}"
-PDEPEND="emacs? ( app-emacs/ruby-mode )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-PROVIDE="virtual/ruby"
-
-pkg_setup() {
-	use tk || return
-
-	# Note for EAPI-2 lovers: We'd like to show that custom message.
-	# *If* you can make USE dependencies show that, too, feel free to migrate.
-	if (use threads && ! built_with_use dev-lang/tk threads) \
-		|| (! use threads && built_with_use dev-lang/tk threads) ; then
-		eerror
-		eerror "You have Tk support enabled."
-		eerror
-		eerror "Ruby and Tk need the same 'threads' USE flag settings."
-		eerror "Either change the USE flag on dev-lang/ruby or on dev-lang/tk"
-		eerror "and recompile tk."
-
-		die "threads USE flag mismatch"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches-${PVR}"
-
-	# 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
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# 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
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="--with-lookup-order-hack=INET"
-
-	econf --program-suffix=$MY_SUFFIX --enable-shared \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		$(use_enable threads pthread) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		${myconf} \
-		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
-		--enable-option-checking=no \
-		|| die "econf failed"
-
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	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
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}
-		cp -pPR sample "${D}/usr/share/doc/${PF}"
-	fi
-
-	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
-	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*})
-
-	dodoc ChangeLog NEWS README* ToDo
-
-	if use rubytests; then
-		dodir /usr/share/${PN}-${SLOT}
-		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(18|19|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild b/dev-lang/ruby/ruby-1.8.6_p399.ebuild
index 866db163ada8..199bc0784af8 100644
--- a/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p399.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild,v 1.5 2010/08/13 15:00:43 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p399.ebuild,v 1.1 2010/08/19 21:35:06 a3li Exp $
 
 EAPI=2
 
@@ -36,9 +36,9 @@ IUSE="+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xema
 RDEPEND="
 	berkdb? ( sys-libs/db )
 	gdbm? ( sys-libs/gdbm )
-	ssl? ( >=dev-libs/openssl-0.9.8m )
+	ssl? ( >=dev-libs/openssl-0.9.8m <dev-libs/openssl-1.0 )
 	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk[threads=] )
+	tk? ( dev-lang/tk[threads=] <dev-lang/tk-8.5 )
 	ncurses? ( sys-libs/ncurses )
 	libedit? ( dev-libs/libedit )
 	!libedit? ( readline? ( sys-libs/readline ) )
@@ -175,7 +175,7 @@ src_install() {
 
 	if use rubytests; then
 		pushd test
-		insinto /usr/share/${PN}-${SLOT}
+		insinto /usr/share/${PN}-${SLOT}/test
 		doins -r .
 		popd
 	fi