Version bump 1.8.7 series, security bug 335439

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

3 files changed, 218 insertions, 3 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index fa41538c345c..f46ba0568c62 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # 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.478 2010/12/31 15:02:50 graaff Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.479 2011/02/19 13:50:33 a3li Exp $
+
+*ruby-1.8.7_p334 (19 Feb 2011)
+
+  19 Feb 2011; Alex Legler <a3li@gentoo.org> +ruby-1.8.7_p334.ebuild:
+  Version bump 1.8.7 series, security bug 335439
 
   31 Dec 2010; Hans de Graaff <graaff@gentoo.org> ruby-1.9.2_rc2-r1.ebuild,
   ruby-1.9.2.ebuild:
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index accb92f336f6..69c94947f87f 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,11 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ruby-1.8.7-p302.tar.bz2 4184764 RMD160 763bc840316cb1080d46445cdc3ca7722d576591 SHA1 d93bd2f1099f3473b496cda2422b27a8da2beb00 SHA256 3537cc81cc2378a2bc319cd16c4237ddee14a2839cfd1515b27dce108d061a68
+DIST ruby-1.8.7-p334.tar.bz2 4190857 RMD160 f3d078d526f1b19d3255dc236f5a46062883e7c9 SHA1 4311ce257f2e54f247bfe07b48e799d293d041f2 SHA256 3e7f1a15fb2c205ac9eb0da804983b83bf8c0ffeb2f146d1eb9e0579ea2507da
 DIST ruby-1.9.2-p0.tar.bz2 8495472 RMD160 dc15937c884b0f93863e9871304bae95e1233e15 SHA1 c0fc7e1047f1eac7e554e9818513593b0d398698 SHA256 e9710990ed8c2e794123aba509010471915fb13c27dae0118831d2001a9c8d3b
 DIST ruby-1.9.2-rc2.tar.bz2 8480974 RMD160 d1f1eded267407699d6975bc284f00a6ad7930a5 SHA1 d4cbbb275b0534ccf4da27847972989adcfdb76d SHA256 692ebae991b104482dc9f0d220c1afb6b690a338b3b815aaa4f62954d2fa1b4a
 DIST ruby-patches-1.8.7_p302.tar.bz2 1768 RMD160 4db5e9d674555f863d71a5e807a39e08b3cfedeb SHA1 31fb976e35253b8e38b7851686fae715f9c197e8 SHA256 4d742cc7aedf6c56eba09e0f3e699ca24e38425944399db131aa49dc8f4f962a
+DIST ruby-patches-1.8.7_p334.tar.bz2 1770 RMD160 80c131ba5ea75941fd038bd8ea74078ff9c2f62c SHA1 85eb95d4bbb451fe403e3edd8c224e61d7c429ba SHA256 a3ce905072d3e0111a59a7901523bb760e3852d1d197cfc6fed80f7434fe8ff2
 DIST ruby-patches-1.9.2.tar.bz2 2272 RMD160 d10f950c40384fe41f7eba14e55621aaa7c0ca06 SHA1 b9eb2d01f49ebf032257f84b00ec56420172234d SHA256 d4dd786cf637e5d4415b850bceca16caa9f6bd0b515fff09a64bdc18bc151de4
 DIST ruby-patches-1.9.2_rc2-r1.tar.bz2 2403 RMD160 345fcf857e8760f66ded3759a9a84d4a4d94b067 SHA1 985dbbec258c319d1a256c53af1f79148cc7bdf6 SHA256 2b1b45ad4195fc8aba26858fc4ca31769a9c49af9711902bac95732baf26ed0f
 EBUILD ruby-1.8.7_p302.ebuild 5589 RMD160 102e3c9b2eda884dd55dc881ba675e29326ee81e SHA1 9224783424b418825d60bf8ddb4013b0133b6c17 SHA256 f115820b90b813850879da466efc6d77f7ee3c482cb4e2031d0451523801c73d
+EBUILD ruby-1.8.7_p334.ebuild 5598 RMD160 57dc4602e37bcb56084fe60f1c9bf8595cace288 SHA1 10b7b704864b4dfb8d61ad5a443637841fe81786 SHA256 3f7c0b545b3a435a2201281304ceedc97721558c73b4a7f21591eb9e91f11d38
 EBUILD ruby-1.9.2.ebuild 6110 RMD160 2796518952d31f58ea95a8149170f801c2926569 SHA1 125a02f8380c9120845852139dfff95d553c09f6 SHA256 56459c5507ce9f8641bc48881810bb978d178c7d27cab87687696b17d1f2a794
 EBUILD ruby-1.9.2_rc2-r1.ebuild 5831 RMD160 0ea468ff652e77e0961c842b9532b5eb38b95572 SHA1 aece647c15994af766adacb44b11e112bfa2306d SHA256 27be9162a4c84a4cb51931cdd6f5d37ddf7331a01a1e5479d56c5e4704c65871
-MISC ChangeLog 74197 RMD160 f94d28ad814c9a5f2ba5ad123c17fc416fb9e5a8 SHA1 094f218b86fcca6d9172ce5eee3c734c11589372 SHA256 0fa4b863eac1f0e0a074497d45e0924b7643db47b6f0bf83b47b5f0a05a47ff5
+MISC ChangeLog 74347 RMD160 f94a768670d069e6abebdfceaf1416ebe2e2a977 SHA1 e7212eb50d703a371f5919d4580dae0dfe38a2ae SHA256 31bf72323c01407b1d99bcebf0599d550aae5bb4318f6ad951030ec99412075a
 MISC metadata.xml 1388 RMD160 2e3de2f87f5bade79976069f8a4e89ecff342d10 SHA1 a0ed685628b1f5de88e81e1aacc56c28bb2bb52f SHA256 365a88ae053d47050b6b50d05eb518755a3aeb0c91ca77d2d8eeabfd24a2447f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAk1fyrMACgkQ3Ca6Xy8+rvR2MQD/ZmV7eYmmExukyVPia+Lda2OE
+DQbdiSBmaEPv6Obs2SAA+wTNtQLykcIu6Vnit+L7wH4h2sgvCIvqkZK8bR9YeCJn
+=IwUI
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.8.7_p334.ebuild b/dev-lang/ruby/ruby-1.8.7_p334.ebuild
new file mode 100644
index 000000000000..51fb0838cdc3
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.7_p334.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p334.ebuild,v 1.1 2011/02/19 13:50:33 a3li Exp $
+
+EAPI=2
+
+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})
+# 1.8 and 1.9 series disagree on this
+RUBYVERSION=$(get_version_component_range 1-2)
+
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby GPL-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	ssl? ( >=dev-libs/openssl-0.9.8m )
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? ( dev-lang/tk[threads=] )
+	ncurses? ( sys-libs/ncurses )
+	libedit? ( dev-libs/libedit )
+	!libedit? ( readline? ( sys-libs/readline ) )
+	sys-libs/zlib
+	>=app-admin/eselect-ruby-20100603
+	!=dev-lang/ruby-cvs-${SLOT}*
+	!<dev-ruby/rdoc-2
+	!dev-ruby/rexml"
+DEPEND="${RDEPEND}"
+PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
+
+PROVIDE="virtual/ruby"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	# 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_configure() {
+	local myconf=
+
+	# -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="${myconf} --with-lookup-order-hack=INET"
+
+	if use libedit; then
+		einfo "Using libedit to provide readline extension"
+		myconf="${myconf} --enable-libedit --with-readline"
+	elif use readline; then
+		einfo "Using readline to provide readline extension"
+		myconf="${myconf} --with-readline"
+	else
+		myconf="${myconf} --without-readline"
+	fi
+
+	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) \
+		$(use_with ncurses curses) \
+		${myconf} \
+		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	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${MY_SUFFIX} -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
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	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"
+
+	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
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	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 || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	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
+}