Fixed crash when typing a single quote followed by pressing the down arrow ((bug #151749), depend on ocaml 3.08.4

Package-Manager: portage-2.1.1-r1

5 files changed, 91 insertions, 5 deletions

diff --git a/sci-calculators/orpie/ChangeLog b/sci-calculators/orpie/ChangeLog
index a6a823ae758e..7b9373ecc100 100644
--- a/sci-calculators/orpie/ChangeLog
+++ b/sci-calculators/orpie/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-calculators/orpie
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/orpie/ChangeLog,v 1.4 2006/08/27 03:21:44 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/orpie/ChangeLog,v 1.5 2006/11/02 00:10:38 ribosome Exp $
+
+*orpie-1.4.3-r1 (02 Nov 2006)
+
+  02 Nov 2006; Olivier Fisette <ribosome@gentoo.org>
+  +files/orpie-1.4.3-quote-down-crash.patch, +orpie-1.4.3-r1.ebuild:
+  Fixed crash when typing a single quote followed by pressing the down arrow
+  (bug #151749, thanks to Samuel Tardieu <sam@rfc1149.net> for his patch).
+  Depend on ocaml 3.08.4 as it seems to be the only compatible version.
 
 *orpie-1.4.3 (27 Aug 2006)
 
diff --git a/sci-calculators/orpie/Manifest b/sci-calculators/orpie/Manifest
index ed18ffd7e5b0..002db8adb5d8 100644
--- a/sci-calculators/orpie/Manifest
+++ b/sci-calculators/orpie/Manifest
@@ -1,17 +1,25 @@
+AUX orpie-1.4.3-quote-down-crash.patch 1103 RMD160 ef08f74d2e17f2339cdf7df5450c751229b163ec SHA1 5c4902699234eac9baa04904e3d63bcec04308ef SHA256 47c315cc016e4b5cab86cee9d78422bc23fa9e857e8161924d44bab7dcd7f457
+MD5 b96b5a05d7a41857de8cff887ef2e375 files/orpie-1.4.3-quote-down-crash.patch 1103
+RMD160 ef08f74d2e17f2339cdf7df5450c751229b163ec files/orpie-1.4.3-quote-down-crash.patch 1103
+SHA256 47c315cc016e4b5cab86cee9d78422bc23fa9e857e8161924d44bab7dcd7f457 files/orpie-1.4.3-quote-down-crash.patch 1103
 DIST orpie-1.4.1.tar.gz 373649 RMD160 6a36d7a541b779215c56aa81bf64a42335f20988 SHA1 7415e51899473e1838adb5dbe5a10c50d2a6d97e SHA256 c9e5e8dc37558627337cafb5bf8e3828482b2a6ad473588f6179befedca1fb67
 DIST orpie-1.4.3.tar.gz 356721 RMD160 81a1cf45ea761dd67ca3eae75fa8ff670c2c6989 SHA1 068fd06467b20dea54c230933e2ee391cebe2616 SHA256 beb46341286a8b4c38ce21a2e93cbd9e32924c5d4bb5015baf2dbf756d6dafc3
 EBUILD orpie-1.4.1.ebuild 743 RMD160 c9262463356f3d1d2c8982c75514073bbf42acd0 SHA1 08026be831a38e81fc675c0cf81e35c47ecc3a43 SHA256 5ad45add30b9fb39e19513f37a20ba56cdedc6312f7444d8e5f010ed5ed8ed35
 MD5 7de35ed002cf82b84626d76bd14e16ac orpie-1.4.1.ebuild 743
 RMD160 c9262463356f3d1d2c8982c75514073bbf42acd0 orpie-1.4.1.ebuild 743
 SHA256 5ad45add30b9fb39e19513f37a20ba56cdedc6312f7444d8e5f010ed5ed8ed35 orpie-1.4.1.ebuild 743
+EBUILD orpie-1.4.3-r1.ebuild 844 RMD160 8cd23f38aab2e928b9ff38c963d4444b8ddb8ae4 SHA1 5c60d0d067afb28cb590388ab78d7435f67f0405 SHA256 a3dac0498799e482bf14c5087ff1007386907a5661741fdf621efc8596223dff
+MD5 525243777c535d985c93da641cea28bc orpie-1.4.3-r1.ebuild 844
+RMD160 8cd23f38aab2e928b9ff38c963d4444b8ddb8ae4 orpie-1.4.3-r1.ebuild 844
+SHA256 a3dac0498799e482bf14c5087ff1007386907a5661741fdf621efc8596223dff orpie-1.4.3-r1.ebuild 844
 EBUILD orpie-1.4.3.ebuild 741 RMD160 cf3946f26ea37eaf6d396d66ce13e96ac174315a SHA1 e5d0df1ce0f0afa0439c7f19eff9b775dc3299ed SHA256 525e9581bee4e1f598122c5d9f9787d752c1dd949cc4c9fd55a999c76288fefa
 MD5 9b0fc0d9fe1dcb5c2faab2175d729c92 orpie-1.4.3.ebuild 741
 RMD160 cf3946f26ea37eaf6d396d66ce13e96ac174315a orpie-1.4.3.ebuild 741
 SHA256 525e9581bee4e1f598122c5d9f9787d752c1dd949cc4c9fd55a999c76288fefa orpie-1.4.3.ebuild 741
-MISC ChangeLog 769 RMD160 0079f4aaa161028965b6982d58381d7af1b617a0 SHA1 bc788e41c4162806feab658daa82537db20850d1 SHA256 c04c52c5fd7838fe29418121313d527703442d53855de9b167332c18539e44cd
-MD5 60de88347eb72cfeed5565d1d55c829e ChangeLog 769
-RMD160 0079f4aaa161028965b6982d58381d7af1b617a0 ChangeLog 769
-SHA256 c04c52c5fd7838fe29418121313d527703442d53855de9b167332c18539e44cd ChangeLog 769
+MISC ChangeLog 1147 RMD160 33768b1eb785b1fb9d6f054b69b81ff87bad2857 SHA1 fa5bf8871464a79f1950e7e5939a6e39b14420b7 SHA256 eeda6df328dbb3d40bdbca00ad37fc49742be98136cd9de995704a01663ffd50
+MD5 40874eab3e1c34271954834fc79db531 ChangeLog 1147
+RMD160 33768b1eb785b1fb9d6f054b69b81ff87bad2857 ChangeLog 1147
+SHA256 eeda6df328dbb3d40bdbca00ad37fc49742be98136cd9de995704a01663ffd50 ChangeLog 1147
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -22,3 +30,6 @@ SHA256 79cbcf41b8d90123d32530d88e50dcffad2080559b2d908e575633923692c9ec files/di
 MD5 e85c979ca850ec6d83fde7c11c191d2d files/digest-orpie-1.4.3 235
 RMD160 5aa6137d79890bc3f18b842d7b38bddb09f83c20 files/digest-orpie-1.4.3 235
 SHA256 b8c0bb4dc0c8860ee910496bed76d99812e3e57f66e7bffd311c3936a0f00ef2 files/digest-orpie-1.4.3 235
+MD5 e85c979ca850ec6d83fde7c11c191d2d files/digest-orpie-1.4.3-r1 235
+RMD160 5aa6137d79890bc3f18b842d7b38bddb09f83c20 files/digest-orpie-1.4.3-r1 235
+SHA256 b8c0bb4dc0c8860ee910496bed76d99812e3e57f66e7bffd311c3936a0f00ef2 files/digest-orpie-1.4.3-r1 235
diff --git a/sci-calculators/orpie/files/digest-orpie-1.4.3-r1 b/sci-calculators/orpie/files/digest-orpie-1.4.3-r1
new file mode 100644
index 000000000000..c93bf2b8818d
--- /dev/null
+++ b/sci-calculators/orpie/files/digest-orpie-1.4.3-r1
@@ -0,0 +1,3 @@
+MD5 1c9d87cf3f8d982a9a3662d48e13de55 orpie-1.4.3.tar.gz 356721
+RMD160 81a1cf45ea761dd67ca3eae75fa8ff670c2c6989 orpie-1.4.3.tar.gz 356721
+SHA256 beb46341286a8b4c38ce21a2e93cbd9e32924c5d4bb5015baf2dbf756d6dafc3 orpie-1.4.3.tar.gz 356721
diff --git a/sci-calculators/orpie/files/orpie-1.4.3-quote-down-crash.patch b/sci-calculators/orpie/files/orpie-1.4.3-quote-down-crash.patch
new file mode 100644
index 000000000000..8fff3b98fff8
--- /dev/null
+++ b/sci-calculators/orpie/files/orpie-1.4.3-quote-down-crash.patch
@@ -0,0 +1,26 @@
+diff -r a647c5e4b7c0 interface_main.ml
+--- a/interface_main.ml	Tue Oct 17 22:51:37 2006 +0200
++++ b/interface_main.ml	Tue Oct 17 23:00:25 2006 +0200
+@@ -1677,17 +1677,18 @@ let handle_abbrev_backspace (iface : int
+ 
+ (* handle entry of an arbitrary character in abbrev mode *)
+ let handle_abbrev_character (iface : interface_state_t) key =
+-   let ch = char_of_int key in
+-   let test_buffer = iface.abbrev_entry_buffer ^ (String.make 1 ch) in
+-   (* search through the list of commands for the first one that matches
+-    * iface.abbrev_entry_buffer *)
+    try
++      let ch = char_of_int key in
++      let test_buffer = iface.abbrev_entry_buffer ^ (String.make 1 ch) in
++      (* search through the list of commands for the first one that matches
++       * iface.abbrev_entry_buffer *)
+       iface.matched_abbrev_entry_list <- match_abbrev_buffer iface test_buffer;
+       iface.abbrev_entry_buffer <- test_buffer;
+       draw_help iface;
+       draw_update_entry iface
+    with
+       Not_found -> let err = beep () in ()
++   |  Invalid_argument "char_of_int" -> ()
+ 
+ 
+ (* enter an abbrev entry *)
diff --git a/sci-calculators/orpie/orpie-1.4.3-r1.ebuild b/sci-calculators/orpie/orpie-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..86dd8a161c33
--- /dev/null
+++ b/sci-calculators/orpie/orpie-1.4.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/orpie/orpie-1.4.3-r1.ebuild,v 1.1 2006/11/02 00:10:38 ribosome Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="A fullscreen RPN calculator for the console"
+HOMEPAGE="http://www.eecs.umich.edu/~pelzlpj/orpie/"
+SRC_URI="http://www.eecs.umich.edu/~pelzlpj/orpie/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="~dev-lang/ocaml-3.08.4
+	sci-libs/gsl
+	sys-libs/ncurses"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-quote-down-crash.patch
+}
+
+src_compile() {
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR=${D}
+	dodoc ChangeLog
+	dodoc doc/TODO
+	insinto /usr/share/doc/${PF}
+	doins doc/manual.pdf
+	doins doc/manual.html
+}