diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-11-05 08:04:53 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-11-05 08:04:53 +0000 |
| commit | f435ea1f0f5c84e8fa8eac281311161b6bf1bac4 (patch) | |
| tree | dc4d9ef3d0d8bb39cdaa387e1c723b987fa0e0c2 /x11-terms | |
| parent | net-im/gajim: Version BUmp (diff) | |
| download | gentoo-2-f435ea1f0f5c84e8fa8eac281311161b6bf1bac4.tar.gz gentoo-2-f435ea1f0f5c84e8fa8eac281311161b6bf1bac4.tar.bz2 gentoo-2-f435ea1f0f5c84e8fa8eac281311161b6bf1bac4.zip | |
Fix executable stacks in mmx code #440618 by brian h.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'x11-terms')
| -rw-r--r-- | x11-terms/eterm/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-terms/eterm/eterm-0.9.6.ebuild | 6 | ||||
| -rw-r--r-- | x11-terms/eterm/files/eterm-0.9.6-asm-gnu-stack.patch | 13 |
3 files changed, 23 insertions, 2 deletions
diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog index 6b9c09a242e1..7392b26431bb 100644 --- a/x11-terms/eterm/ChangeLog +++ b/x11-terms/eterm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-terms/eterm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.75 2012/08/23 04:06:33 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.76 2012/11/05 08:04:53 vapier Exp $ + + 05 Nov 2012; Mike Frysinger <vapier@gentoo.org> + +files/eterm-0.9.6-asm-gnu-stack.patch, eterm-0.9.6.ebuild: + Fix executable stacks in mmx code #440618 by brian h. 23 Aug 2012; Christoph Junghans <ottxor@gentoo.org> eterm-0.9.6.ebuild, eterm-9999.ebuild, metadata.xml: diff --git a/x11-terms/eterm/eterm-0.9.6.ebuild b/x11-terms/eterm/eterm-0.9.6.ebuild index 6a75a3d45dde..11a0a6034889 100644 --- a/x11-terms/eterm/eterm-0.9.6.ebuild +++ b/x11-terms/eterm/eterm-0.9.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.6.ebuild,v 1.2 2012/08/23 04:06:33 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.6.ebuild,v 1.3 2012/11/05 08:04:53 vapier Exp $ EAPI="3" inherit eutils autotools @@ -56,6 +56,10 @@ src_unpack() { fi } +src_prepare() { + epatch "${FILESDIR}"/${P}-asm-gnu-stack.patch #440618 +} + src_configure() { export TIC="true" econf \ diff --git a/x11-terms/eterm/files/eterm-0.9.6-asm-gnu-stack.patch b/x11-terms/eterm/files/eterm-0.9.6-asm-gnu-stack.patch new file mode 100644 index 000000000000..777397170d30 --- /dev/null +++ b/x11-terms/eterm/files/eterm-0.9.6-asm-gnu-stack.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/440618 + +--- Eterm/src/mmx_cmod.S (revision 78909) ++++ Eterm/src/mmx_cmod.S (working copy) +@@ -485,4 +485,8 @@ shade_ximage_32_mmx: + 3: + LEAVE + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif ++ + #endif /* HAVE_MMX */ |