Fix sporadic segmentation faults of temacs when dumping under Linux 2.6.25

or later, bug 236579.
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686)

5 files changed, 29 insertions, 6 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 2edf88420562..d12ef00b87af 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.282 2008/10/09 20:43:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.283 2008/10/21 15:54:59 ulm Exp $
+
+  21 Oct 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-22.3-linux-random-heap.patch, emacs-18.59-r5.ebuild,
+  emacs-21.4-r17.ebuild, emacs-22.3.ebuild:
+  Fix sporadic segmentation faults of temacs when dumping under Linux 2.6.25
+  or later, bug 236579.
 
   09 Oct 2008; Markus Meier <maekke@gentoo.org> emacs-22.3.ebuild:
   amd64 stable, bug #240300
diff --git a/app-editors/emacs/emacs-18.59-r5.ebuild b/app-editors/emacs/emacs-18.59-r5.ebuild
index 06427f8d2a1e..2a996f4a6672 100644
--- a/app-editors/emacs/emacs-18.59-r5.ebuild
+++ b/app-editors/emacs/emacs-18.59-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r5.ebuild,v 1.3 2008/09/06 05:08:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r5.ebuild,v 1.4 2008/10/21 15:54:59 ulm Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
 	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-	mirror://gentoo/${P}-patches-2.tar.bz2"
+	mirror://gentoo/${P}-patches-3.tar.bz2"
 
 LICENSE="GPL-1 GPL-2 BSD"
 SLOT="18"
diff --git a/app-editors/emacs/emacs-21.4-r17.ebuild b/app-editors/emacs/emacs-21.4-r17.ebuild
index 87562a6fcf5d..a55365098847 100644
--- a/app-editors/emacs/emacs-21.4-r17.ebuild
+++ b/app-editors/emacs/emacs-21.4-r17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v 1.11 2008/09/23 20:21:48 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v 1.12 2008/10/21 15:54:59 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -9,7 +9,7 @@ inherit flag-o-matic eutils toolchain-funcs autotools
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-	mirror://gentoo/${P}-patches-5.tar.bz2
+	mirror://gentoo/${P}-patches-6.tar.bz2
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2 FDL-1.1 BSD"
diff --git a/app-editors/emacs/emacs-22.3.ebuild b/app-editors/emacs/emacs-22.3.ebuild
index 6020277cc31d..024bb05e3ac0 100644
--- a/app-editors/emacs/emacs-22.3.ebuild
+++ b/app-editors/emacs/emacs-22.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3.ebuild,v 1.9 2008/10/09 20:43:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3.ebuild,v 1.10 2008/10/21 15:54:59 ulm Exp $
 
 inherit autotools elisp-common eutils flag-o-matic
 
@@ -56,6 +56,8 @@ src_unpack() {
 	epatch "${FILESDIR}/emacs-22.3-freebsd-sparc.patch"
 	# SuperH support (bug 238210)
 	epatch "${FILESDIR}/emacs-22.2-sh.patch"
+	# Fix sporadic segmentation faults in unexec (bug 236579)
+	epatch "${FILESDIR}/emacs-22.3-linux-random-heap.patch"
 
 	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
 		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
diff --git a/app-editors/emacs/files/emacs-22.3-linux-random-heap.patch b/app-editors/emacs/files/emacs-22.3-linux-random-heap.patch
new file mode 100644
index 000000000000..37bee82385e0
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.3-linux-random-heap.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/236579
+http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=900
+Fixes sporadic segmentation faults in unexec.
+
+--- emacs-22.3-orig/src/emacs.c	2008-05-12 10:30:13.000000000 +0200
++++ emacs-22.3/src/emacs.c	2008-10-21 16:45:50.000000000 +0200
+@@ -883,7 +883,7 @@
+   if (!initialized
+       && (strcmp (argv[argc-1], "dump") == 0
+           || strcmp (argv[argc-1], "bootstrap") == 0)
+-      && heap_bss_diff > MAX_HEAP_BSS_DIFF)
++      /*&& heap_bss_diff > MAX_HEAP_BSS_DIFF*/)
+     {
+       if (! getenv ("EMACS_HEAP_EXEC"))
+         {