summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2006-02-03 21:55:42 +0000
committerMichael Januszewski <spock@gentoo.org>2006-02-03 21:55:42 +0000
commit1776adddd9c60eeed85b57b35b52bd6202e7d11f (patch)
treed80f2f722094f2e8d79deaf7e0e5c2baa96feb50 /www-client/elinks
parentAdded vdr-1.3.41 support. (diff)
downloadgentoo-2-1776adddd9c60eeed85b57b35b52bd6202e7d11f.tar.gz
gentoo-2-1776adddd9c60eeed85b57b35b52bd6202e7d11f.tar.bz2
gentoo-2-1776adddd9c60eeed85b57b35b52bd6202e7d11f.zip
Added a patch to fix segfaults caused by ruby scripting (bug #121247).
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'www-client/elinks')
-rw-r--r--www-client/elinks/ChangeLog6
-rw-r--r--www-client/elinks/elinks-0.11.0.ebuild8
-rw-r--r--www-client/elinks/files/elinks-0.11.0-ruby.patch11
3 files changed, 18 insertions, 7 deletions
diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 8b745322b212..793edc67563d 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/elinks
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.37 2006/01/31 21:10:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.38 2006/02/03 21:55:42 spock Exp $
+
+ 03 Feb 2006; Michał Januszewski <spock@gentoo.org>
+ +files/elinks-0.11.0-ruby.patch, elinks-0.11.0.ebuild:
+ Added a patch to fix segfaults caused by ruby scripting (bug #121247).
31 Jan 2006; Jeroen Roovers <jer@gentoo.org> elinks-0.10.6.ebuild,
elinks-0.11.0.ebuild:
diff --git a/www-client/elinks/elinks-0.11.0.ebuild b/www-client/elinks/elinks-0.11.0.ebuild
index 0622a1eeb3db..6746fee0f65c 100644
--- a/www-client/elinks/elinks-0.11.0.ebuild
+++ b/www-client/elinks/elinks-0.11.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.0.ebuild,v 1.2 2006/01/31 21:10:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.0.ebuild,v 1.3 2006/02/03 21:55:42 spock Exp $
inherit eutils
@@ -33,11 +33,6 @@ DEPEND=">=dev-libs/expat-1.95.4
samba? ( net-fs/samba )"
PROVIDE="virtual/textbrowser"
-#|| ( ( x11-libs/libX11
-# x11-libs/libXt
-# )
-
-
S=${WORKDIR}/${MY_P}
src_unpack() {
@@ -50,6 +45,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${P}-gcc4-inline.patch
epatch ${FILESDIR}/${P}-make.patch
+ epatch ${FILESDIR}/${P}-ruby.patch
}
src_compile() {
diff --git a/www-client/elinks/files/elinks-0.11.0-ruby.patch b/www-client/elinks/files/elinks-0.11.0-ruby.patch
new file mode 100644
index 000000000000..6ce58a33cbe4
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.11.0-ruby.patch
@@ -0,0 +1,11 @@
+--- elinks-0.11.0.orig/src/scripting/ruby/hooks.c 2006-01-01 17:39:36.000000000 +0100
++++ elinks-0.11.0/src/scripting/ruby/hooks.c 2006-02-03 20:12:06.000000000 +0100
+@@ -160,7 +160,7 @@
+
+ args[0] = rb_str_new2(url);
+ /* FIXME: Use html_len */
+- args[1] = rb_str_new(fragment->data, fragment->length);
++ args[1] = rb_str_new2(fragment->data);
+
+ result = erb_protected_method_call("pre_format_html_hook", 2, args, &error);
+ if (error) {