From: Hans de Graaff <graaff@gentoo.org>
Date: Wed, 28 Dec 2011 17:33:12 +0000 (+0000)
Subject: Version bump for security bug 396301.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fe35e9393006546a72edfa8ad0475c8c33a7dd91;p=gentoo.git

Version bump for security bug 396301.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64
---

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 8cf44b4ff505..48574d52dcbb 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.518 2011/12/28 15:55:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.519 2011/12/28 17:33:12 graaff Exp $
+
+*ruby-1.8.7_p357 (28 Dec 2011)
+
+  28 Dec 2011; Hans de Graaff <graaff@gentoo.org> +ruby-1.8.7_p357.ebuild:
+  Version bump for security bug 396301.
 
   28 Dec 2011; Hans de Graaff <graaff@gentoo.org> ruby-1.9.3_p0.ebuild:
   Drop alpha, arm, hppa for now since each missing a dependency, bug 332593.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index e6b133f325cb..b156c606e1ab 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -2,17 +2,20 @@
 Hash: SHA256
 
 DIST ruby-1.8.7-p352.tar.bz2 4207576 RMD160 9a0ea7e7eb83c809d2890b08db2e78eeb93dee0d SHA1 9f3d039e9bfeda54ea2c2175bbeace375a1ea1ae SHA256 9df4e9108387f7d24a6ab8950984d0c0f8cdbc1dad63194e744f1a176d1c5576
+DIST ruby-1.8.7-p357.tar.bz2 4208157 RMD160 9034fb641f0260aed590856cd9400f186a3dd56a SHA1 ba5ec0ab663976f00fb405be6cfef546bcf0e4e9 SHA256 5c64b63a597b4cb545887364e1fd1e0601a7aeb545e576e74a6d8e88a2765a37
 DIST ruby-1.9.3-p0.tar.bz2 9554576 RMD160 92e95f1d41f89864e2e4791b522a815e6bf51711 SHA1 f63c116411b981ef54c2caeefb9ccc4d71a5d2cf SHA256 ca8ba4e564fc5f98b210a5784e43dfffef9471222849e46f8e848b37e9f38acf
 DIST ruby-patches-1.8.7_p352.tar.bz2 2646 RMD160 7af0ab7c86c9284ade489d3a07eb592cb8f20827 SHA1 f4df1f011a96153d4e804be1080a493b454a1852 SHA256 695895d4ab77294975669d879f0b03e08af5fcd750b967b44305031b2c115da6
+DIST ruby-patches-1.8.7_p357.tar.bz2 2444 RMD160 4287e30945390ee38ef06e91f4eb560d5e888a0b SHA1 4be75adacd5f912b8a80144a0474da4299bc4246 SHA256 779d98e7c325eaf5bdb652dc7ceebda604792cddcce547766966021e60e68aac
 DIST ruby-patches-1.9.3_p0.tar.bz2 2228 RMD160 5fc6e647ec3f1fe6cbe8014121aa6265c8cd9315 SHA1 10fc10bdde1cc40d4153be840a1314da1d988049 SHA256 22116a403a111701972a5a10d5c31b0bb86dd822c346d0079e86e03866d55df6
 EBUILD ruby-1.8.7_p352.ebuild 5566 RMD160 fe282bd97112fcb877ebb57ee43538dd3c759f97 SHA1 6ec3b45330b15db35672238f7939f1f36ae36b2c SHA256 6b048c8621cd3ee0cf3bb64caf6f1790dd1d853bd7695a7404d7ca08f55b85c8
+EBUILD ruby-1.8.7_p357.ebuild 5529 RMD160 47df2a7b4b663bd858e3403ed954802c87fa7beb SHA1 853f72929005a3aa137a2524261887941fe0b1e7 SHA256 e137e53fa4fcf14b2e263dbe9a02be7648f78d871c974e6c07378e95755aac1b
 EBUILD ruby-1.9.3_p0.ebuild 6251 RMD160 f6eda8a691397d19fb3a8d1c4dd5c95775772f65 SHA1 6834235bc76c3767bdcccc0a925ae678b7301906 SHA256 e6b27a3b25fa2ffb3892d224eb891f4f2b3bd60196bfeb8c2e693733a07dff64
-MISC ChangeLog 79608 RMD160 6ea32e5e7af615cf6d7fb7df1889eecf7e3aadd7 SHA1 5c852f997bcd2d3a106fae2c67e21e9b1e9da29d SHA256 adb7c297f8ef1b7ab1145fc222543d734d2157928d3c20ccf83c447a151fd3f0
+MISC ChangeLog 79756 RMD160 c8d44e89bc4949acc5329f391bdf154b7dd576c8 SHA1 29a94e5439cc7fbcd45ae8cec1dc394aa4ca3d44 SHA256 e958c26ac2bfeed22392d0f6cabd63e1eb78f20dd7c4ba3550dd4248e4bd1cff
 MISC metadata.xml 1388 RMD160 2e3de2f87f5bade79976069f8a4e89ecff342d10 SHA1 a0ed685628b1f5de88e81e1aacc56c28bb2bb52f SHA256 365a88ae053d47050b6b50d05eb518755a3aeb0c91ca77d2d8eeabfd24a2447f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk77O/8ACgkQiIP6VqMIqNcOjAD/UTc1TaxVojJuB4irqxHmu6cx
-YxX92yotSHyjpmJYGooA/0msegwfhYbEcUGgj7gbt7pH6CWmxPVpaB2RpFqXQd7w
-=4qOB
+iF4EAREIAAYFAk77Ut4ACgkQiIP6VqMIqNfWrAD8D2X4013K/sXWLyaKkHsddywM
+9ha1usgZU/yYQjkwy8EA/RaRmKpbLV4Goz0qoGrJAhv2PvdUwIPL75T+XaTPcF8I
+=REvw
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.8.7_p357.ebuild b/dev-lang/ruby/ruby-1.8.7_p357.ebuild
new file mode 100644
index 000000000000..d998c97c9c29
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.7_p357.ebuild
@@ -0,0 +1,193 @@
+# 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_p357.ebuild,v 1.1 2011/12/28 17:33:12 graaff 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-ruby/rdoc-2"
+DEPEND="${RDEPEND}"
+PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
+
+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
+}