Fix segmentation faults on ia64, bug #180142.

Package-Manager: portage-2.1.2.7

4 files changed, 34 insertions, 14 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index e5bfdf45a342..2c49911ea071 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.154 2007/05/28 14:42:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.155 2007/05/28 21:12:41 ulm Exp $
+
+  28 May 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-21.4-oldxmenu-malloc.patch, emacs-21.4-r12.ebuild:
+  Fix segmentation faults on ia64, bug #180142.
 
   28 May 2007; Christian Faulhammer <opfer@gentoo.org>
   emacs-18.59-r4.ebuild:
@@ -509,7 +513,7 @@
   don't use deprecated ? : use syntax
 
 *emacs-21.3-r3 (13 May 2004)
-*emacs-18.59 (13 May 2004
+*emacs-18.59 (13 May 2004)
 
   13 May 2004; <mkennedy@gentoo.org> +files/emacs-18.59-gcc-gentoo.patch,
   +files/emacs-18.59-gentoo.patch, +files/emacs-18.59-unexelf.patch,
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index d18953804864..3388f172e803 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -45,6 +45,10 @@ AUX emacs-21.4-libungif-gif-gentoo.patch 1534 RMD160 8bc5ef391e644ad00f46c7d34e7
 MD5 1607d289126ca057110a993cde0e25fd files/emacs-21.4-libungif-gif-gentoo.patch 1534
 RMD160 8bc5ef391e644ad00f46c7d34e7341862572346a files/emacs-21.4-libungif-gif-gentoo.patch 1534
 SHA256 61793086af3c4a56ced40830977ba0d6ebc285d84b4b612798b35ca08f1f1689 files/emacs-21.4-libungif-gif-gentoo.patch 1534
+AUX emacs-21.4-oldxmenu-malloc.patch 519 RMD160 c9223611cffd9892463168ce00426dcec0d06ad8 SHA1 9cbe6c08103477ed493985680b3a5b3441e9de0f SHA256 be942da986b1a1593c7a09db47dce919f5baee27e6425dfc06179ca5b4caf0ea
+MD5 7c4a46d4109a65062ec2b9172360203e files/emacs-21.4-oldxmenu-malloc.patch 519
+RMD160 c9223611cffd9892463168ce00426dcec0d06ad8 files/emacs-21.4-oldxmenu-malloc.patch 519
+SHA256 be942da986b1a1593c7a09db47dce919f5baee27e6425dfc06179ca5b4caf0ea files/emacs-21.4-oldxmenu-malloc.patch 519
 AUX emacs-21.4-ppc64-fix-unexelf.patch 2698 RMD160 ed0d68a88f98631d0a7146f9f23114a5aee6ca48 SHA1 484b2e01ee355e31b2f385eb7fa199f83512fcb0 SHA256 411aefa45cc11dc67eee88f9c0522da207eb4c93598672626462003f695f89dd
 MD5 5828fb42a73d0ee0d5b07cf73085b274 files/emacs-21.4-ppc64-fix-unexelf.patch 2698
 RMD160 ed0d68a88f98631d0a7146f9f23114a5aee6ca48 files/emacs-21.4-ppc64-fix-unexelf.patch 2698
@@ -70,10 +74,10 @@ EBUILD emacs-18.59-r4.ebuild 2550 RMD160 7ca1968659bccb05eadd4ae05a65fec1680dcfd
 MD5 8d0aa7f3f3145cfb8fe4246216c70ed5 emacs-18.59-r4.ebuild 2550
 RMD160 7ca1968659bccb05eadd4ae05a65fec1680dcfd3 emacs-18.59-r4.ebuild 2550
 SHA256 c5e4a6cd90ca3b9125b6bde38f71e8095ede50ab1549f936748434e71bb51432 emacs-18.59-r4.ebuild 2550
-EBUILD emacs-21.4-r12.ebuild 6015 RMD160 8bb35f45e889dbcc74142fdf1ed8e47c6e0524e9 SHA1 554f2e55146e8398ed0d520172cc536368e48ca9 SHA256 b67cfc7c034c02798268348567aaafcc8b7cf1362c37f700ca3121a8d2326d62
-MD5 e0ea1007d51a7d17a8098d87b0e512c4 emacs-21.4-r12.ebuild 6015
-RMD160 8bb35f45e889dbcc74142fdf1ed8e47c6e0524e9 emacs-21.4-r12.ebuild 6015
-SHA256 b67cfc7c034c02798268348567aaafcc8b7cf1362c37f700ca3121a8d2326d62 emacs-21.4-r12.ebuild 6015
+EBUILD emacs-21.4-r12.ebuild 6068 RMD160 a82be39deb1d752328498abe8eb833f4eae0035f SHA1 e12cb6093af19ba5ce6ab58b635e87a82f381cf1 SHA256 94282098726c85e0ddad906161c61b88026f2faaa9747913fc76552bde4243f8
+MD5 0d39616cfd11ac508bd52ac97874d992 emacs-21.4-r12.ebuild 6068
+RMD160 a82be39deb1d752328498abe8eb833f4eae0035f emacs-21.4-r12.ebuild 6068
+SHA256 94282098726c85e0ddad906161c61b88026f2faaa9747913fc76552bde4243f8 emacs-21.4-r12.ebuild 6068
 EBUILD emacs-21.4-r4.ebuild 4535 RMD160 1930ccf03cdc16a70d243ff31f9166c299873abe SHA1 d7edca43277eb3e66a85958e3c21d643cbb248d7 SHA256 843e8efd54938f4390292f9c0efd9dfaa0f55d694e92c1102c36d649fba7b79c
 MD5 2e09f80cc20f1d0da8fe9af115188f9d emacs-21.4-r4.ebuild 4535
 RMD160 1930ccf03cdc16a70d243ff31f9166c299873abe emacs-21.4-r4.ebuild 4535
@@ -82,10 +86,10 @@ EBUILD emacs-21.4-r8.ebuild 5711 RMD160 249b044798438cf45407a262e3f751aea72a2796
 MD5 c26a6d9fbd64864d40dd82cffcde57f6 emacs-21.4-r8.ebuild 5711
 RMD160 249b044798438cf45407a262e3f751aea72a2796 emacs-21.4-r8.ebuild 5711
 SHA256 591014e674fe57645affe5ada46d06ac3ec937fb1862a7ee75e59c015a37e6bc emacs-21.4-r8.ebuild 5711
-MISC ChangeLog 23185 RMD160 a5a3313518e3a03720b133d74c1d06c5ba329d61 SHA1 a31fba862101829daa96a73d37637fb8f2ec7667 SHA256 ec35cef28e1557f0d2d9f18b9d66ebdbe5845ca37f2671cd8fe92f6c9c6570ca
-MD5 721ac173c2b845abfb7b62d44880e065 ChangeLog 23185
-RMD160 a5a3313518e3a03720b133d74c1d06c5ba329d61 ChangeLog 23185
-SHA256 ec35cef28e1557f0d2d9f18b9d66ebdbe5845ca37f2671cd8fe92f6c9c6570ca ChangeLog 23185
+MISC ChangeLog 23346 RMD160 0ed8c4e9551e09207c79c21f0d5089ea267c96f0 SHA1 e3b54dde83be4ca928417681cd39f35c25b30e4f SHA256 ac26a3c1111e1ec504b6d952e0b163101aa283317fab8b5f8820d3ec32522983
+MD5 52cb5011330226a7a0261899a398e9ec ChangeLog 23346
+RMD160 0ed8c4e9551e09207c79c21f0d5089ea267c96f0 ChangeLog 23346
+SHA256 ac26a3c1111e1ec504b6d952e0b163101aa283317fab8b5f8820d3ec32522983 ChangeLog 23346
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -105,7 +109,7 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGWup2NQqtfCuFneMRAhsuAJ9Qaz/+QmCI6Dru6SLGHeRnCpINmwCeOoo1
-AAp/sZX38XSlF0l660g5p34=
-=qWDj
+iD8DBQFGW0XSOeoy/oIi7uwRAqy4AJ9hsHNz0pGtngdV8Af7D5xf5GHaGwCfeNy3
+WyZwxHMJBugZpJlzrmWr0v0=
+=FaPn
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild
index f20377d9d274..602655e3bc25 100644
--- a/app-editors/emacs/emacs-21.4-r12.ebuild
+++ b/app-editors/emacs/emacs-21.4-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.21 2007/05/28 14:09:30 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.22 2007/05/28 21:12:41 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -67,6 +67,7 @@ src_unpack() {
 	epatch "${FILESDIR}/emacs-21.4-qa.patch"
 	epatch "${FILESDIR}/emacs-21.4-Xaw3d-headers.patch"
 	epatch "${FILESDIR}/emacs-21.4-freebsd-terminfo.patch"
+	epatch "${FILESDIR}/emacs-21.4-oldxmenu-malloc.patch"
 
 	# install emacsclient.1 man page (#165466)
 	sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die
diff --git a/app-editors/emacs/files/emacs-21.4-oldxmenu-malloc.patch b/app-editors/emacs/files/emacs-21.4-oldxmenu-malloc.patch
new file mode 100644
index 000000000000..c7d45e677ac2
--- /dev/null
+++ b/app-editors/emacs/files/emacs-21.4-oldxmenu-malloc.patch
@@ -0,0 +1,11 @@
+--- emacs-21.4/oldXMenu/XMakeAssoc.c~	1999-10-03 21:35:22.000000000 +0200
++++ emacs-21.4/oldXMenu/XMakeAssoc.c	2007-05-28 22:21:57.000000000 +0200
+@@ -91,7 +91,7 @@
+ 	/* If we are here then the new entry should be inserted just */
+ 	/* before the current value of "Entry". */
+ 	/* Create a new XAssoc and load it with new provided data. */
+-	new_entry = (XAssoc *) xmalloc(sizeof(XAssoc));
++	new_entry = (XAssoc *) malloc(sizeof(XAssoc));
+ 	new_entry->display = dpy;
+ 	new_entry->x_id = x_id;
+ 	new_entry->data = data;