From c346e9a763f2a6ee075a0ad2be55f6488d00ac9a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 8 Jun 2006 09:42:28 +0000 Subject: [PATCH] Make sure yasm doesnt generate exec stacks #134632 by Martin Wegner. Package-Manager: portage-2.1_rc4-r3 --- media-libs/libsdl/ChangeLog | 5 ++++- media-libs/libsdl/Manifest | 22 +++++++++++----------- media-libs/libsdl/libsdl-1.2.10.ebuild | 13 ++++++++++++- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog index 38061eaf03ad..eca3bc223e3f 100644 --- a/media-libs/libsdl/ChangeLog +++ b/media-libs/libsdl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/libsdl # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.103 2006/06/08 09:41:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.104 2006/06/08 09:42:28 vapier Exp $ + + 08 Jun 2006; Mike Frysinger libsdl-1.2.10.ebuild: + Make sure yasm doesnt generate exec stacks #134632 by Martin Wegner. 08 Jun 2006; Mike Frysinger files/libsdl-1.2.10-PIC-hidden-symbols.patch: diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index bced242376fb..fd12a24ac88e 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -129,10 +129,10 @@ DIST SDL-1.2.10.tar.gz 2792344 RMD160 e2e73a580638ab29d4b000152ed80999545e9fb5 S DIST SDL-1.2.7.tar.gz 2470936 RMD160 2e19851fca8dac81c8d07cb39b8757aa54093023 SHA1 1a840c50668f230df9e9163ef1a282d9f3355383 SHA256 f5708b3909261df2043859e771601a5ec973197b2c59d18c6649c1096b5151bd DIST SDL-1.2.8.tar.gz 2602449 RMD160 91aa02f6b52792b3ec7f5478bcaebda1542980dc SHA1 26f2104a60a28914b809d3cb77d5790bfdfd024c SHA256 6508abb6068df597896da4e926606bb80c0b03ebfb8cf0017471fdb41307125a DIST SDL-1.2.9.tar.gz 2688179 RMD160 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7 SHA1 8140de00e73ccdbdee196fa8fd9952ddb3cc75f1 SHA256 d5a168968051536641ab5a3ba5fc234383511c77a8bc5ceb8bed619bdd42e5f9 -EBUILD libsdl-1.2.10.ebuild 4400 RMD160 910eabc1e1e827ddf12f477414e7d79102650cc7 SHA1 0ba2c988c0951e7696513cd7beeea15008f850b4 SHA256 e5792a79b8c12e553451c2290b47aa147a2571892b713632e777ecf989f56831 -MD5 c0249cd71e38d3412ca63d494ca0459d libsdl-1.2.10.ebuild 4400 -RMD160 910eabc1e1e827ddf12f477414e7d79102650cc7 libsdl-1.2.10.ebuild 4400 -SHA256 e5792a79b8c12e553451c2290b47aa147a2571892b713632e777ecf989f56831 libsdl-1.2.10.ebuild 4400 +EBUILD libsdl-1.2.10.ebuild 4672 RMD160 476741637b62c36afabbbcc1596a0b5630b26dd8 SHA1 470b4b4e6a1ab8d46e882f388f20d27017ab1124 SHA256 1aeaa4159db68ed336c902a4ed8093ca8cdddbbef87500a1c1e3494b1454c62a +MD5 e80db5a9964926db629e5fe2887b719c libsdl-1.2.10.ebuild 4672 +RMD160 476741637b62c36afabbbcc1596a0b5630b26dd8 libsdl-1.2.10.ebuild 4672 +SHA256 1aeaa4159db68ed336c902a4ed8093ca8cdddbbef87500a1c1e3494b1454c62a libsdl-1.2.10.ebuild 4672 EBUILD libsdl-1.2.7-r3.ebuild 4269 RMD160 78ca7654af8eca755e73c58b1c5d6d6b6998612e SHA1 61c2d2c90e4e31551fac4c557823b4b25016a557 SHA256 1eb38d7e30a20096b1480a62a6a759a436fa4b40688dbd2ca86da0e434a1fc05 MD5 5c56de3cfb83340e0d889828dd372194 libsdl-1.2.7-r3.ebuild 4269 RMD160 78ca7654af8eca755e73c58b1c5d6d6b6998612e libsdl-1.2.7-r3.ebuild 4269 @@ -149,10 +149,10 @@ EBUILD libsdl-1.2.9.ebuild 4643 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c MD5 62041b7bb258830e75ef4464d7124598 libsdl-1.2.9.ebuild 4643 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c libsdl-1.2.9.ebuild 4643 SHA256 2aa67035dea53f4f861205e03998be56b93980af0783b3cfd1b8c886f2cee74c libsdl-1.2.9.ebuild 4643 -MISC ChangeLog 16496 RMD160 8d70d4ba07a8d17739f0e7ac8226e292eabddacc SHA1 ca2c818d368e00bb4cfde7e9fd11bb45e198b7ee SHA256 340140b16133f7e71d061571e7ceed11f78212b58b71e2a846a8d781b8201937 -MD5 91fd6c8f7ae4546b06f339108b9ea6b2 ChangeLog 16496 -RMD160 8d70d4ba07a8d17739f0e7ac8226e292eabddacc ChangeLog 16496 -SHA256 340140b16133f7e71d061571e7ceed11f78212b58b71e2a846a8d781b8201937 ChangeLog 16496 +MISC ChangeLog 16640 RMD160 320e461ba5561026e34ccfaf62526f264860dbbc SHA1 658ec8762c233ba4b0db37026fb665dd46abff92 SHA256 b363b227ea02a68fde7c044f9095d51ba2bfabf14f0cc0a2251b8f49b8e7beb0 +MD5 29297c9222e3fc5ae20f36cb6e7c2f2f ChangeLog 16640 +RMD160 320e461ba5561026e34ccfaf62526f264860dbbc ChangeLog 16640 +SHA256 b363b227ea02a68fde7c044f9095d51ba2bfabf14f0cc0a2251b8f49b8e7beb0 ChangeLog 16640 MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f metadata.xml 974 @@ -175,7 +175,7 @@ SHA256 8e70be29548aa63e313575f311c63363981a0fb40b69b689a923fd9b80fbeea7 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEh/Gt2+ySkm8kpY0RAvcwAKCYEFNpncwpktahV7cKHodfAuNZXgCgxEWe -G2rjF5thUTNVuFoWMfZrM0U= -=imzL +iD8DBQFEh/H52+ySkm8kpY0RArxuAKCFzTocRNj31WhRN/J//eScCyPkhgCeNY7X +LEeB+8ZhmM/AUdXO8y/5y2E= +=sSKr -----END PGP SIGNATURE----- diff --git a/media-libs/libsdl/libsdl-1.2.10.ebuild b/media-libs/libsdl/libsdl-1.2.10.ebuild index 6aca6043f01d..bfc47dac5fea 100644 --- a/media-libs/libsdl/libsdl-1.2.10.ebuild +++ b/media-libs/libsdl/libsdl-1.2.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.10.ebuild,v 1.2 2006/05/29 18:57:35 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.10.ebuild,v 1.3 2006/06/08 09:42:28 vapier Exp $ inherit flag-o-matic toolchain-funcs eutils libtool @@ -80,6 +80,17 @@ src_unpack() { epatch "${FILESDIR}"/libsdl-1.2.10-PIC-hidden-symbols.patch epatch "${FILESDIR}/${P}"-noxinerama.patch + # add yasm-compatible defines to nasm code (hopefully we + # can get this killed soonish) + local f + for f in "${S}"/src/hermes/*.asm ; do + cat <<-EOF >> "${f}" + %ifidn __YASM_OBJFMT__,elf + section ".note.GNU-stack" noalloc noexec nowrite progbits + %endif + EOF + done + ./autogen.sh || die "autogen failed" elibtoolize } -- 2.26.2