Fix executable stacks in mmx code #440618 by brian h.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 41 insertions, 13 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/Manifest b/x11-terms/eterm/Manifest
index c07dafb3a60f..f8b87f55e036 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,23 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST Eterm-0.9.5.tar.gz 796872 SHA256 63ad6e3d89571a72d8302274ebb00d569b8789e24fae038beaee7aa4b8362bd2
+AUX eterm-0.9.6-asm-gnu-stack.patch 292 SHA256 21bd47bd0f516144548307e050d5693bb1ca0ca7ca7473d166b2784ff06bf7d1 SHA512 cb4a1d3910fcf23bba51069b0639a1725b375a09d1bd9ae43985c1dfdd29737291888cabcb2ce03961fbd3a219437567509eaea8b3072a297774bf4cdf534baf WHIRLPOOL 284ace264a9c1333a2b60b89c873dea487c2859de22bd7ac6ab4e8808b322528ba61d81591f109abd9d95a7d1c4e02097a5a059780d19632c55b194ec4b270b6
+DIST Eterm-0.9.5.tar.gz 796872 SHA256 63ad6e3d89571a72d8302274ebb00d569b8789e24fae038beaee7aa4b8362bd2 SHA512 ef16ec5ddf0dd91ed4c40eff2289f7a61aa5c0fbf3b95bd14afe38557572f586f1dcd459c258cdfadb1dfbc1c50874492c9cc69ee4152a569b097e86c0d7cc44 WHIRLPOOL a9f9b3ad8343caa084a4cfd9b900d15eb90b657dd5cfdf4746e0d42ab84bc8b7ee6a9e17c4da658cec44d69b30a682900a753d178ad42ae58bc87b15dbb16522
 DIST Eterm-0.9.6.tar.gz 831756 SHA256 72b907aa64f8bcf053f2ecbc8a2e243c6de353a94ecaf579ff2c4e3ae5d7e13c SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe WHIRLPOOL 51a958675fba197ec0dd069028e6a6066ab1133c030ddaad1bccf8c2e541b5063b0612ae7db80e40f30331ab5930da2b7d628b21c7da4d64eb9697163f05d90b
-DIST Eterm-bg-0.9.5.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55
+DIST Eterm-bg-0.9.5.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8 WHIRLPOOL f03b6432d406b7882ab28f80fd0f4b63bee15d8c720a54eb42f400f7cae51c2d96641656b5e779d5ccdc19c098b1c54e03d1dc0cb27a344dad5a5c5181b571a1
 DIST Eterm-bg-0.9.6.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8 WHIRLPOOL f03b6432d406b7882ab28f80fd0f4b63bee15d8c720a54eb42f400f7cae51c2d96641656b5e779d5ccdc19c098b1c54e03d1dc0cb27a344dad5a5c5181b571a1
 EBUILD eterm-0.9.5.ebuild 1849 SHA256 a3d8e000e51e4daa319ec2142761219879c83a40ddb3ac0d2d2c3f766652baf6 SHA512 7b9252f1d02a36bdf1cd5598b52a1f3c522ad58bd65e23e2163fab3bdbb5a92c65390418ee8490ff8c48888bd65a564f507db9ae5bfdffc40c3ac796bde6778f WHIRLPOOL e03aba66110893045c48158307f7d941c2bdbaae8975cd3ae1ce2d666845c4e403fc825a620f98ab1454a9a1140dca2a359268e6efa96d2189615af34c796e01
-EBUILD eterm-0.9.6.ebuild 1924 SHA256 b53f553f854c5c1b2ca1eba4cdf8299bd3472cec573cb4c05bf444c34bf8a961 SHA512 068cd18fc17a03ac60f603e5ec95d5d1ab9efc31a9705e4f98a195736e2ca243340253a4bae3fa34c0ff5bf4fb65118fab788b7229846c0f300643a9533dde59 WHIRLPOOL 6acdc412a7851a4cc90e6d753c71f9fbdc19b80f0c33ca048c2f223ea3e7216a8f01234041880fd41f857bcb7d3d2137337258527bd2ea5faf07b55852ec7000
+EBUILD eterm-0.9.6.ebuild 1998 SHA256 ca72d785c5146ee2c0f21579c41064012941ab772dca48a0f54834d4ceb97be6 SHA512 1022fabf68f1be7a942aa5362ced5467d537007c3f04ee8e3238bf513beac31ebd4004cf711817dc888fb978e586fe0f89150416a85a22667c862fef8ea91db3 WHIRLPOOL d9393bf90c16946ce3694e1adba8efde9ceb058f967d05c369e4057eb5b0f6b94e4963c42848f1f9fd7dab63c706af920ddb0bd381da0224cdc294925bb275f7
 EBUILD eterm-9999.ebuild 1924 SHA256 9f158c15a7b8c69b3a7d2a266b39d1e06f32f4576088d1954436e581deb0f84c SHA512 e6d22404e1dec33d78f8023edf194902fbcbca7530e733347caed64cec80d04d2a140c530ed18cfba8848f9c0cf606ee41e1ffcf07f6dd67e21d3a5616d43f0d WHIRLPOOL 579d4bcfbea0dbd560f1bc078734d75fadbecb504c0dd434c30b43fa05a25a10e5cbcfa67db7d4c02a0f74dc91dec81616a24512d91e77fdadd034dfd4eaca6e
-MISC ChangeLog 10713 SHA256 1bd2dcc297dbb13c22f8df29e7c8ee48f5a2e4aa5c7c8edf160febd6b01099cb SHA512 fb7fbc30f9159c9b2af2fccccca3e5607665e3de818b018e50a0c681a639fd4b93013d250d7d41b2db1590507c3b538a66c4b51a6f28c42d611227fdcf310fae WHIRLPOOL 6a85133f3822a5b51c2f8ebdc58881987bb01438d295b63a94b73bb17b3e902c35a052e6a7a6e84d5fa4d53c09e504e328adb9b8d97aeda1bbbe6aa2f1030b24
+MISC ChangeLog 10882 SHA256 4d491906922fa897f9623df7c99e5906b7aad461fda3e7b7f025f1305d34967a SHA512 46c58b72db4f6afdda908c4624a755cbef7beee08dcc97c8300af6942b800a1b3b484b4f89726e0cfdc322220a957dda00ed5c4c4dfef05e07512bc8464d6ebf WHIRLPOOL 78df4019507fe41a71ac66b65acdfbe38a5b3f99dd0c28491f0b877b66545c3f8cee4604f144093ccafc6acc62f241fad6b80216d484658d7cddfdea0618a9f4
 MISC metadata.xml 763 SHA256 ade3a076e87c55fa72fa0ae897088454d6212f1f594aae3f86e99938cf007f1d SHA512 b2291f95e56ee0fa0ed7490b2156b278966a2cea4d7864055baf7e82fe9b7490d3255aa1759d5fd27b3ea8018e1e902768c4dbdb0962d72b2312adea3de74d98 WHIRLPOOL 84d55eaf5b4bf8a687d37ba78680e7fb884256447c55d8fabf9edafaf8b269f244f0626dc2f7f99616cf4cd740e798e12656bd722aada87ac79667d643fe1de0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQNaxPAAoJEOeBhlrCAAWG+L8H/icDGfUffAMnSMD31cWXI+fE
-tWeFRAW4jigAyWjrkk7Wl/EZfTdYw841nPpGqbciFieLq2uKsSeNpVmCboCz6Ifg
-RfFsDbTUddyr4PaKWlVHqnlmEE5UBMhMrJ2VPt8AUQAwWfkwtboz8hJvsf6y4YnW
-7qsktw051i/jzipev085FZdiuQwaOTJBIDZ8wTDaX5sC04y0h/+emFVVgdEoJHUP
-EaTQz/AXErVcuDTIjz8+5ktdfELJ/fWXzpgroyUWohgGxzGuYGau2fm/3AyJR7wX
-ioJSa4qhsJrW8vhdJ8BGixM0pyq5dsZo/GSppKh6pyt8+uZW9DzccYiL9ot+MV8=
-=4Kno
+iQIcBAEBCAAGBQJQl3NJAAoJELEHsLL7fEFWHaUP/1fJoQl+LF8HQPVt0B9vRSYk
+RPiSnKGhBQTYcWkJn6QJ/Z0NWB7Pm7A31giyoW3cQdd+1WUAYKmoq3rkjtORh53M
+2qhfczHJiw9zwC2U3XTd0WcRAC8EnYSDkfVcXFM39cZ6FwCNLwR8E1Zc+5N394UL
+NvGFwVnBLuUnH5o7LBcx5EBnyYA1tgj1kGk+kwYJ3Pr2iyW0UV356o/9MaP4/z9u
+INc6xqkBCE8pqtIQzHIjF1ev5k6OUq4Bx2X+RurJ2iPnhi9Fot9rxz8jK433hTnl
+1kYkLUdYzgpCAqg7+Ly0ncdsPKU87o8KZQ3I1SBJvC5Qxx3J+WkEURP43Gt+7YFp
+wYhDEyba+cPu6nQIYBmFdJVVSqCJrFiGypZuAZrAMk01QpYPXqpaV7sPg2mkjJes
+g6Ul1LvSBfCn7UlahaPJy0jMG4Dtzs9GUN3vjKhx2iq9cb/BOVGPl2bXJm6cu7aW
+HSXivlEMknSlEurCzSZOyLaxOYsFtHSKBIHz4emz6do3dhnl5B/WNpEjOI23xLWm
+DoqeaNwa9nNleSBw80luSW0zyyrdWebVekcGqCj7doeNijo/FcPEvTfDHdsVHNu/
+aOtgPpdd7njyrlEFU1PGLI+bAuCVIMGoSbxEcI4cHbgUNC5/6siotXt+Gt6imsjt
+3A7w/gE/ZIS4RIXfkykV
+=ta2W
 -----END PGP SIGNATURE-----
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 */