Added a patch to fix segfaults caused by ruby scripting (bug #121247).

Package-Manager: portage-2.1_pre4-r1

4 files changed, 37 insertions, 13 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/Manifest b/www-client/elinks/Manifest
index cc52cd7411f0..e06d5c9407c5 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,6 +1,9 @@
-MD5 5401ba85763dbca08cc48c3d979b5cdf ChangeLog 12610
-RMD160 2a05b97613b5e323019ad88f7f26bf3652458299 ChangeLog 12610
-SHA256 29c6244ffe6706edb80c8addeae69090ebc6cd6081965bb7e7c841355142449a ChangeLog 12610
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1e1577f07ae353e626d4f3048961bb4f ChangeLog 12797
+RMD160 cde0e4edd6d6868d4342c6da87ca1d7978be0aa1 ChangeLog 12797
+SHA256 1b0a9fd63185c429c4490aa28e90b5f11655ce27051bc642fa71002854a09d07 ChangeLog 12797
 MD5 77809539a1fc470b15666ab9b111932b elinks-0.10.5-r1.ebuild 4068
 RMD160 925b9968ea48d2c13be3a3b8e64c9e116c7ef6f1 elinks-0.10.5-r1.ebuild 4068
 SHA256 0a7b26c7fd875dba72dc51b4d3d9a7a0540058cb7b5d240ab73f31d2c8d71731 elinks-0.10.5-r1.ebuild 4068
@@ -10,9 +13,9 @@ SHA256 46cb7c5ef90a64c1dac22fbd827933aa0727c83871c920f7883650059438cd59 elinks-0
 MD5 c6084861e662d899c18583ee74426daf elinks-0.10.6.ebuild 3963
 RMD160 cb54ca1829c497bc7f9196e8c417bdcfad07fc46 elinks-0.10.6.ebuild 3963
 SHA256 e8664bb56d5933a0255ed47e1eb69b148b8d460df687d0740820f5b4bfc5bca0 elinks-0.10.6.ebuild 3963
-MD5 ca7ae26a637be4469f7dde29eca2ce18 elinks-0.11.0.ebuild 4243
-RMD160 02933e815651b15dbef4f837b25ca0b89091e4cd elinks-0.11.0.ebuild 4243
-SHA256 bbbd928c70daecfaada0214026b66c52364d6419719e50b44e0816f0513c8d04 elinks-0.11.0.ebuild 4243
+MD5 77338f81151103e20a55ec3596e751ce elinks-0.11.0.ebuild 4227
+RMD160 96876c6a139d390c9561c7785cfad066745b25ca elinks-0.11.0.ebuild 4227
+SHA256 abc6a4e39b143b57270dbebd9795ce38d0bb64b0c93f9f9353254b7be0e17a30 elinks-0.11.0.ebuild 4227
 MD5 db4038d1a62b31535db38c97c40928d8 files/digest-elinks-0.10.5 132
 RMD160 ebccbdfe4678af05408201c5ca4392fec4390fc2 files/digest-elinks-0.10.5 132
 SHA256 b54ee447d190121ed1413c8d17d23f302795c26ff588821665961e8d1b692b0d files/digest-elinks-0.10.5 132
@@ -31,9 +34,19 @@ SHA256 583d5da585201707b483a3e99c27595b88142d3a5f5c2e65a917d8131bdabe4f files/el
 MD5 94333484d4304521e637c2c5f7a43a67 files/elinks-0.11.0-make.patch 479
 RMD160 f403240b76cd61908729a47003dca3c204dead0a files/elinks-0.11.0-make.patch 479
 SHA256 b9bbe15e67878bb7a99d18bbea40dbe9d7e302c6f2884bdceaaa90502b2e2c73 files/elinks-0.11.0-make.patch 479
+MD5 f34b85265417d19a14aab413ea8bad18 files/elinks-0.11.0-ruby.patch 442
+RMD160 aa981d7f829212a831b9d83eb48ab057a525fda2 files/elinks-0.11.0-ruby.patch 442
+SHA256 f2437074cb1747fb1336cd26cb51732feda1d5ed73b32aec6bd37be6caf0ea48 files/elinks-0.11.0-ruby.patch 442
 MD5 8641dcff9f251387e7eba19875a7077c files/elinks-osx-configure.diff 919
 RMD160 e0007cb59e98d07563f3e888a59732848a75cbd3 files/elinks-osx-configure.diff 919
 SHA256 9c32c7af01203569b75deee06a809e49dc7ef798d4148c4c8dc429b9549f9c8d files/elinks-osx-configure.diff 919
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 RMD160 399f78e98260d4f311124e71c6d294e368a76976 metadata.xml 255
 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5 metadata.xml 255
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD49Fzchej4aZK9/cRAgxCAJ4w7GQlT5zemUlzWks9H7JEVlkbKACfbMYK
+zP7x0lvq+2ddmclrvLaDOk0=
+=NEWs
+-----END PGP SIGNATURE-----
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) {