Fix segfault, bug 283508. Thanks to Martin von Gagern

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

4 files changed, 94 insertions, 3 deletions

diff --git a/app-editors/joe/ChangeLog b/app-editors/joe/ChangeLog
index 642dbdff9472..9cd55e425adf 100644
--- a/app-editors/joe/ChangeLog
+++ b/app-editors/joe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/joe
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/ChangeLog,v 1.67 2009/11/15 19:26:48 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/ChangeLog,v 1.68 2010/01/16 22:39:38 pacho Exp $
+
+*joe-3.7-r1 (16 Jan 2010)
+
+  16 Jan 2010; Pacho Ramos <pacho@gentoo.org> +joe-3.7-r1.ebuild,
+  +files/joe-3.7-segfault-fix.patch:
+  Fix segfault, bug 283508. Thanks to Martin von Gagern
 
   15 Nov 2009; Raúl Porcel <armin76@gentoo.org> joe-3.5.ebuild,
   joe-3.7.ebuild:
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index ada48c5e7534..3fda910d6582 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX joe-3.7-segfault-fix.patch 562 RMD160 2e8e889006dbd460e2d473c31f9f3659565dca47 SHA1 c0b24d8abb0ac7eba501fa1831a07f3b93550692 SHA256 bf38cb1db098a7efa880bc4a962b03f180ae5481f2a7a66a5e97f799241c71c3
 DIST joe-3.5.tar.gz 613815 RMD160 c58d2bdd4882bf698722d5a8e840f3d7a0221fc6 SHA1 aeee6bb71ed1e9b9c9a2a64d8e078a06245957e5 SHA256 a295f1c5e0cb0f0ae0446c419a248517cb04ae1881f982964a7a7595cde9f2e6
 DIST joe-3.7.tar.gz 696036 RMD160 7e2c72a750c6aac4732cf4369bceee5333460f15 SHA1 54398578886d4a3d325aece52c308a939d31101d SHA256 cae456e1ad5a8c1d3c94920a3416c2347277739b260e3494d3bc0f2b9b73106f
 EBUILD joe-3.5.ebuild 1495 RMD160 4feadcebe2cc2b93026856975e1728e93b816e3a SHA1 25625c3f5107938ea16a0e75949b7e043c7d9438 SHA256 174fbedb86a85f37cfbe3edd0045643d94a600772aaefac5b507705f1c35f647
+EBUILD joe-3.7-r1.ebuild 1543 RMD160 eb1c9cc2ceb67f8ac67489dfde0f83d8068832f2 SHA1 eb8ac1c9ac730fbb3fa23e7ca537d85f3828852e SHA256 87dfe2d57eadfc00e1513bcba4be5d2e183de87d93653b86390e7af01ec3fa27
 EBUILD joe-3.7.ebuild 1460 RMD160 543e45b738f2e568f3dde8351e60d59f2d263993 SHA1 6f474d5861466e0b87c8cbc582006430f15ee566 SHA256 0790c7aa05e00b09a30b7c6eabce898f72f71d705f49b92a8963d1a00c55aa2e
-MISC ChangeLog 8327 RMD160 401c937291f5f557e3a01af558f515768abcad8e SHA1 eb18ef9743b4a8f0504881e10fcfa8608a96c48c SHA256 b14c9fc70c05d08dc0d56dbce5948ad56e6f439dde01251902c2151c7dd6a793
+MISC ChangeLog 8512 RMD160 2c908387b95abf52a70afccd702db92919e62cfd SHA1 3291b54ba0ef3a09dd6c2f77ee35ca75d604788b SHA256 1b8a65d77c336a83229fbb8d14d30a3338e0ba4da4b8fddb00707bd39c80aedf
 MISC metadata.xml 744 RMD160 57ae49e0dbd2ccfdbb994d1d43ea1b4167ce5637 SHA1 a7f6a18d6ab448a54c88621687d8eb6701ac016e SHA256 a0af8fa4bccf2a9372d5b4d08e3b1745edd2b2a2cc8bfb9ef2ba9dff66d608e7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAktSQDUACgkQCaWpQKGI+9TGkwCgg1/MD/Sh2/q5bEUO9MTCvSlv
+XNMAnipSqD5ZwkclA4Q592Za1m7jimwK
+=xyJK
+-----END PGP SIGNATURE-----
diff --git a/app-editors/joe/files/joe-3.7-segfault-fix.patch b/app-editors/joe/files/joe-3.7-segfault-fix.patch
new file mode 100644
index 000000000000..38efac2e30c4
--- /dev/null
+++ b/app-editors/joe/files/joe-3.7-segfault-fix.patch
@@ -0,0 +1,17 @@
+Index: main.c
+===================================================================
+RCS file: /cvsroot/joe-editor/joe-current/main/main.c,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -r1.5 -r1.6
+--- main.c	27 Oct 2008 01:57:13 -0000	1.5
++++ main.c	23 Nov 2008 21:32:15 -0000	1.6
+@@ -431,7 +431,7 @@
+ 				b->orphan = 1;
+ 				b->oldcur = pdup(b->bof, USTR "main");
+ 				pline(b->oldcur, get_file_pos(b->name));
+-				p_goto_bol(bw->cursor);
++				p_goto_bol(b->oldcur);
+ 				line = b->oldcur->line - (maint->h - 1) / 2;
+ 				if (line < 0)
+ 					line = 0;
diff --git a/app-editors/joe/joe-3.7-r1.ebuild b/app-editors/joe/joe-3.7-r1.ebuild
new file mode 100644
index 000000000000..ae37e2429f92
--- /dev/null
+++ b/app-editors/joe/joe-3.7-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-3.7-r1.ebuild,v 1.1 2010/01/16 22:39:38 pacho Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
+HOMEPAGE="http://sourceforge.net/projects/joe-editor/"
+SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="xterm"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2"
+RDEPEND="xterm? ( >=x11-terms/xterm-239 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix segfault, bug 283508
+	epatch "${FILESDIR}/${P}-segfault-fix.patch"
+
+	cd ./rc
+
+	# Enable xterm mouse support in the rc files
+	if use xterm; then
+		for i in *rc*.in; do
+			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die "sed failed"
+		done
+	fi
+}
+
+src_compile() {
+	# Bug 34609 (joe 2.9.8 editor seg-faults on 'find and replace' when compiled with -Os)
+	replace-flags "-Os" "-O2"
+
+	econf --docdir=/usr/share/doc/${PF} || die
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+	dodoc ChangeLog HACKING HINTS LIST NEWS README TODO
+}
+
+pkg_postinst() {
+	if use xterm; then
+		elog "To enable full xterm clipboard you need to set the allowWindowOps"
+		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
+		elog "This is false by default due to potential security problems on some"
+		elog "architectures (see bug #91453)."
+	fi
+}