diff options
author | Fabian Groffen <grobian@gentoo.org> | 2011-08-27 09:55:51 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2011-08-27 09:55:51 +0000 |
commit | 92a32d0601ffc2d310419393a374787b78c49142 (patch) | |
tree | df50f99acfbd70f4ed69770c02ed2e973e2ddc41 /dev-lang/ruby | |
parent | Add fix for m68k/coldfire bug, backport from 4.5.3, bug #380727 (diff) | |
download | prefix-92a32d0601ffc2d310419393a374787b78c49142.tar.gz prefix-92a32d0601ffc2d310419393a374787b78c49142.tar.bz2 prefix-92a32d0601ffc2d310419393a374787b78c49142.zip |
Sync, security fixes
(Portage version: 2.2.01.19074-prefix/svn/Darwin i386)
Diffstat (limited to 'dev-lang/ruby')
-rw-r--r-- | dev-lang/ruby/ChangeLog | 49 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild | 206 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-1.9.2-r1.ebuild | 229 |
3 files changed, 483 insertions, 1 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index a6d7b5a2d1..d0dbcbde98 100644 --- a/dev-lang/ruby/ChangeLog +++ b/dev-lang/ruby/ChangeLog @@ -1,6 +1,53 @@ # 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.490 2011/03/13 19:20:53 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.502 2011/08/10 18:16:07 xarthisius Exp $ + + 10 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> + ruby-1.8.7_p334-r2.ebuild: + ppc/ppc64 stable wrt #378691 + +*ruby-1.8.7_p334-r2 (22 Jul 2011) + + 22 Jul 2011; Hans de Graaff <graaff@gentoo.org> +ruby-1.8.7_p334-r2.ebuild: + Add patch to fix threading bug on ppc64, bug 375075. Thanks to Kacper Kowalik + for chasing down upstream and us. + + 15 Jul 2011; Matt Turner <mattst88@gentoo.org> ruby-1.9.2-r1.ebuild: + Added ~mips, bug 332593 + + 07 Jun 2011; Kacper Kowalik <xarthisius@gentoo.org> + ruby-1.8.7_p334-r1.ebuild: + ppc64 stable wrt #369141 + + 03 Jun 2011; Raúl Porcel <armin76@gentoo.org> ruby-1.8.7_p334-r1.ebuild: + ia64/s390/sh/sparc stable wrt #369141 + + 03 Jun 2011; Jeroen Roovers <jer@gentoo.org> ruby-1.8.7_p334-r1.ebuild: + Stable for HPPA (bug #369141). + + 03 Jun 2011; Brent Baude <ranger@gentoo.org> ruby-1.8.7_p334-r1.ebuild: + Marking ruby-1.8.7_p334-r1 ppc for bug 369141 + + 02 Jun 2011; Markus Meier <maekke@gentoo.org> ruby-1.8.7_p334-r1.ebuild: + arm/x86 stable, bug #369141 + + 01 Jun 2011; Markos Chandras <hwoarang@gentoo.org> ruby-1.8.7_p334-r1.ebuild: + Stable on amd64 wrt bug #369141 + + 01 Jun 2011; Tobias Klausmann <klausman@gentoo.org> + ruby-1.8.7_p334-r1.ebuild: + Stable on alpha, bug #369141 + +*ruby-1.8.7_p334-r1 (31 May 2011) + + 31 May 2011; Alex Legler <a3li@gentoo.org> +ruby-1.8.7_p334-r1.ebuild: + Revision bump for security bug 369141 (CVE-2011-0188) + +*ruby-1.9.2-r1 (16 May 2011) + + 16 May 2011; Hans de Graaff <graaff@gentoo.org> +ruby-1.9.2-r1.ebuild: + Don't remove racc files since all other ruby targets ship these files + themselves as well. Closes bug 363419. 13 Mar 2011; Hans de Graaff <graaff@gentoo.org> -ruby-1.8.7_p302.ebuild, ruby-1.8.7_p334.ebuild: diff --git a/dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild b/dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild new file mode 100644 index 0000000000..015693d3f3 --- /dev/null +++ b/dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild @@ -0,0 +1,206 @@ +# 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-r2.ebuild,v 1.2 2011/08/10 18:16:07 xarthisius 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="~ppc-aix ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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 )" + +src_prepare() { + EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}/patches" + + epatch "${FILESDIR}/${PN}-1.8.6_p36-only-ncurses.patch" + epatch "${FILESDIR}/${PN}-1.8.6_p36-prefix.patch" + epatch "${FILESDIR}/${PN}-1.8.7_p249-pthread-linking.patch" + epatch "${FILESDIR}/${PN}-1.8.7-darwin9-getsetcontext.patch" + + # 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" + + # Fix hardcoded SHELL var in mkmf library + sed -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" -i lib/mkmf.rb + + 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="${EPREFIX}"/usr/$(get_libdir)/ruby/site_ruby \ + --with-readline-dir="${EPREFIX}"/usr \ + --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="${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" + RUBYLIB="${S}:${ED}/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" + + d=$(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']") + keepdir ${d#${EPREFIX}} + d=$(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']") + keepdir ${d#${EPREFIX}} + + 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 "${EROOT}"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.9.2-r1.ebuild b/dev-lang/ruby/ruby-1.9.2-r1.ebuild new file mode 100644 index 0000000000..f89574d6d7 --- /dev/null +++ b/dev-lang/ruby/ruby-1.9.2-r1.ebuild @@ -0,0 +1,229 @@ +# 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.9.2-r1.ebuild,v 1.2 2011/07/15 17:25:03 mattst88 Exp $ + +EAPI=2 + +#PATCHSET= + +inherit autotools eutils flag-o-matic multilib versionator + +RUBYPL=$(get_version_component_range 4) + +MY_P="${PN}-$(get_version_component_range 1-3)-p${RUBYPL:-0}" +S=${WORKDIR}/${MY_P} + +SLOT=$(get_version_component_range 1-2) +MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) +# 1.9.2 still uses 1.9.1 +RUBYVERSION=1.9.1 + +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/${MY_P}.tar.bz2 + http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" + +LICENSE="|| ( Ruby GPL-2 )" +KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline yaml" #libedit + +# libedit support is removed everywhere because of this upstream bug: +# http://redmine.ruby-lang.org/issues/show/3698 + +RDEPEND=" + berkdb? ( sys-libs/db ) + gdbm? ( sys-libs/gdbm ) + ssl? ( dev-libs/openssl ) + socks5? ( >=net-proxy/dante-1.1.13 ) + tk? ( dev-lang/tk[threads] ) + ncurses? ( sys-libs/ncurses ) + readline? ( sys-libs/readline ) + yaml? ( dev-libs/libyaml ) + virtual/libffi + sys-libs/zlib + >=app-admin/eselect-ruby-20100402 + !=dev-lang/ruby-cvs-${SLOT}* + !<dev-ruby/rdoc-2 + !<dev-ruby/rubygems-1.3.7-r4 + !dev-ruby/rexml" +# libedit? ( dev-libs/libedit ) +# !libedit? ( readline? ( sys-libs/readline ) ) + +DEPEND="${RDEPEND}" +PDEPEND=" + rdoc? ( >=dev-ruby/rdoc-2.5.11[ruby_targets_ruby19] ) + xemacs? ( app-xemacs/ruby-modes )" + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.9.1-only-ncurses.patch" + epatch "${FILESDIR}/${PN}-1.9.1-prefix.patch" + + EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}/patches" + + einfo "Unbundling gems..." + rm -r \ + {bin,lib}/rake \ + ext/json \ + bin/gem \ + || die "removal failed" + + # 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" + + # Fix hardcoded SHELL var in mkmf library + sed -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" -i lib/mkmf.rb + + 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 + # SuperH needs this + use sh && append-flags -mieee + + # 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 + myconf="${myconf} $(use_with readline)" + + econf \ + --program-suffix=${MY_SUFFIX} \ + --with-soname=ruby${MY_SUFFIX} \ + --enable-shared \ + --enable-pthread \ + $(use_enable socks5 socks) \ + $(use_enable doc install-doc) \ + --enable-ipv6 \ + $(use_enable debug) \ + $(use_with berkdb dbm) \ + $(use_with gdbm) \ + $(use_with ssl openssl) \ + $(use_with tk) \ + $(use_with ncurses curses) \ + $(use_with yaml psych) \ + ${myconf} \ + --with-readline-dir="${EPREFIX}"/usr \ + --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="${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" + RUBYLIB="${S}:${ED}/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" + + # Remove installed rubygems copy + rm -r "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" + rm -r "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" + rm -r "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" + + 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 doc/NEWS-1.8.7 README* ToDo || die + + if use rubytests; then + pushd test + insinto /usr/share/${PN}-${SLOT}/test + doins -r . + popd + fi +} + +pkg_postinst() { + if [[ ! -n $(readlink "${EROOT}"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 +} |