Fix sporadic segmentation faults of temacs when dumping under Linux 2.6.25

or later, bug 236579.
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686

6 files changed, 40 insertions, 16 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/Manifest b/app-editors/emacs/Manifest
index 45fe1faaf4f2..7a2a159986e2 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,26 +9,27 @@ AUX emacs-22.2-heimdal-gentoo.patch 1906 RMD160 004cd91c637df470e5960854b943d2cc
 AUX emacs-22.2-python-nopwd.patch 660 RMD160 c5967762416b3816aaa5fe714d0014223ce4196c SHA1 27d7d7d0aea3ea92e0d4b86cca1f45123ecb6965 SHA256 64607f50aefaba2ffc75fe151f5272306daef3ff34f5ef9070717babe2c47715
 AUX emacs-22.2-sh.patch 761 RMD160 4a65a87cfd31d0714e9f99de91dee1c292ba5159 SHA1 1cf46bd5f2bff3e4cff2d6fb43a05dabca81c276 SHA256 743f9e3fcf0059ff68a5ba704311d8aa1ae09600eb3692de51e0b7105ea1f9b4
 AUX emacs-22.3-freebsd-sparc.patch 448 RMD160 4f131b630ec09e1d9170374fc60a1620f0f718e9 SHA1 5bc71be91bb8008cec2473479184e250e5284c68 SHA256 e2c2e53e2995d4a505c480d17e0a7e5abff61ea96c4d3451a1e019c985a59cd8
+AUX emacs-22.3-linux-random-heap.patch 566 RMD160 6d0df837e04ba6cd712939092626cc067248cae5 SHA1 0313a5b34bb5b868596408af9b71b18c28b227c4 SHA256 76d049df10d1a4789a45297d8a14b2e7b41e700aefd0aec66ab47fbdfe0c0fbd
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
-DIST emacs-18.59-patches-2.tar.bz2 17872 RMD160 bb79f013611768afe79d69c18ce84bae009d04d5 SHA1 ef86046c19aeba889c7c3fd35c83afa76ee8b84b SHA256 d1c7975068b773733fb142e07b86dbf2952a7ff75fe6fa79638d9eee6929b7a4
+DIST emacs-18.59-patches-3.tar.bz2 17323 RMD160 c0a205792f80c34b599c82fe5cf957f10f80956a SHA1 d452c45756e69edf71a46518cfde809eb65955f9 SHA256 679fe1c0e4fbc2ccf44e6c7097aa093c4e575fde15b5416d944916893bd543ff
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
 DIST emacs-21.4-patches-2.tar.bz2 9984 RMD160 fd1a5e24740a9ce230b0898864abea2ef4451db2 SHA1 4042d587210dba95514c18054de4a98ce8d4c231 SHA256 2980bf428e97e34def633ce4c6bf383dbaf09aeb57eea318398144a067c7fa34
-DIST emacs-21.4-patches-5.tar.bz2 12425 RMD160 522aff90dc0b1876ad9a4082aac07053f992e0f0 SHA1 57162cd4f5a02c455d973ede94204e38b88a280a SHA256 c836e88c707310a9b2da13543c25f3895f19ad3f30f634a234fa0789570d9d00
+DIST emacs-21.4-patches-6.tar.bz2 11785 RMD160 01edee136f6cd88611fa632227f685c1b93ed7a9 SHA1 042fddfc02dbd958219382fd42de0f6e20cff6c3 SHA256 495dbcb7bfb4a0dbff57e3d5873adb9eb9a4219dec3136df864ce38a6dc21937
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.2.tar.gz 38694318 RMD160 ec2da7cd7065cbd76773e544da1d1495f33d6ea1 SHA1 7a371332cb8400d44e8eb31f19e432bbc93523a0 SHA256 216839e1fb38ca4f2ed0a07689fb47ee80d90845f34e0a56fe781d6aa462e367
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-18.59-r5.ebuild 2496 RMD160 17f8503f27dc267bd16c4194c341c2285e340026 SHA1 22078c981636f9cf0dfb8dcedf3dd504ec8f25e5 SHA256 59c6163f760c579519801d0d9751c0465a2c368092c0c02238b65e53cb31570d
+EBUILD emacs-18.59-r5.ebuild 2496 RMD160 58c66752c0863567db003cbbdca9b535262bfb05 SHA1 51f6c2a67a4146a09c3913fe26311e0e2bfb97fb SHA256 b2472d594e49c2dd63b445a17b6785d0aea72d2aba8302fc0434a677f24b6388
 EBUILD emacs-21.4-r15.ebuild 5243 RMD160 435bce2284700a04837706304e093528fc4d07cd SHA1 bf2c5fc026a36efe7c60e39ad8bc79534af3060a SHA256 872d3926e1c2189c6635ded30b6fdebb0a70eae26a0f61717c176932e786b0da
-EBUILD emacs-21.4-r17.ebuild 5343 RMD160 7f9b6f9d21bf6ff2f474072c031c7f40d7fe6443 SHA1 a6fa49402d419dec59fa6f145e2e9082ca92a75d SHA256 39484bccfb5ac251b7bc44d39b25f7d21643aab2428107bf124733d04cc7b214
+EBUILD emacs-21.4-r17.ebuild 5341 RMD160 60a1a5bc4b3859206dde0b44aa3155f09fc56c32 SHA1 56b07a794a39d392312a64b2b6f7d9868a023471 SHA256 eaab07bdc4869250b670d054894471e4b9a020d0c9e36d3cadf0bc3c2e4cf187
 EBUILD emacs-22.2-r3.ebuild 8190 RMD160 82e59ee0d7744c470f1b7d1c705528294b9c9efa SHA1 71574c10a21ceb8414b7f99d3587cd6ec718ac75 SHA256 58e5e2c0a4803cfdeb44a66dee84ed5aee4ad57f801a2a0960a9b075e35bda42
-EBUILD emacs-22.3.ebuild 7536 RMD160 f3cc64ca20db2fc3021c0623ca433a4088cb89da SHA1 0c7446ec533686d6e010e337022f8190cadd9f11 SHA256 d3656d5cfeb9c0cbd3a0dbfccdf159343a67da3d5196ed966e4f1ba999bf95d8
-MISC ChangeLog 40479 RMD160 727d5c1b3becd9951fbba58bb57846e741280dee SHA1 eb5b88d9eac82671e7bd5f994dbab45dc7ddbc80 SHA256 528696e32064a17d1198f320500e37f92e2b06402b2b5f0f381baf7a016e3757
+EBUILD emacs-22.3.ebuild 7650 RMD160 9a9c038e503d7ff35207332e592db93627ecc1d1 SHA1 2e6819611da524b97bf7d122f643f0820d279191 SHA256 10ced3ce1ddf4f1602a3d16f60c06399b7824567157ffc45907f0c9abfc82e6d
+MISC ChangeLog 40737 RMD160 1b4887fdb2c08001b3f078d37ce177b4cb9af99b SHA1 c083585b24fd2b8e66e6dc396eca5d53b313f3d2 SHA256 692eb78b7d05bef31188bd804783a59896087a8ed77af4d210d501e5ab40ee2c
 MISC metadata.xml 1652 RMD160 537bd66f869b6306694a2e30a05d15e48e324a54 SHA1 afe373a8a2d21971448fc2480f6f1b77e0bb1f23 SHA256 89dca1423f45221c7df249d7e96e162abd7c3188824b81c0f83c2d8f4fa7a1b5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkjubV4ACgkQkKaRLQcq0GK1pQCfQTb7VLKJ0RwMGq4+7WLUWF6L
-xVwAoKhuD4nCZZ2eBHjY03PWUEbpqzX/
-=GeZu
+iEYEARECAAYFAkj9+2cACgkQOeoy/oIi7uz3ugCgv5e8eIBiq0lhp5jpvQ+5Anod
+ZwgAoM5QlsbK7msID/naZZ1KsoIn4lC/
+=ZVT4
 -----END PGP SIGNATURE-----
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"))
+         {