Add patch to avoid executable stack on x86 and amd64.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 56 insertions, 8 deletions

diff --git a/media-libs/x264-svn/ChangeLog b/media-libs/x264-svn/ChangeLog
index 2589dbb7448a..ae0dea972dd9 100644
--- a/media-libs/x264-svn/ChangeLog
+++ b/media-libs/x264-svn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/x264-svn
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264-svn/ChangeLog,v 1.14 2006/04/09 16:34:09 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264-svn/ChangeLog,v 1.15 2006/04/10 23:41:42 flameeyes Exp $
+
+  10 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/x264-svn-20060409-gnustack.patch, x264-svn-20060409.ebuild:
+  Add patch to avoid executable stack on x86 and amd64.
 
 *x264-svn-20060409 (09 Apr 2006)
 
diff --git a/media-libs/x264-svn/Manifest b/media-libs/x264-svn/Manifest
index 0b08a00c6600..29cd7b2a00de 100644
--- a/media-libs/x264-svn/Manifest
+++ b/media-libs/x264-svn/Manifest
@@ -1,6 +1,9 @@
-MD5 ede27c6285e153c6b01129dc37f8b0f0 ChangeLog 2064
-RMD160 1db028e97ed7e9f9d8af1db775f2a1b4eb6d886d ChangeLog 2064
-SHA256 ecc627198adfec6dca10988cc3fa566191715e7c5700148d27fd24672a641ac8 ChangeLog 2064
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 252c6dbc0b80b2c10be775984b10ddbd ChangeLog 2245
+RMD160 f070a62b0190a6d632ceae75f9985780e96bda46 ChangeLog 2245
+SHA256 6f6388cf95754f9ce6df2573245e08abbb7df2552980dd60aecdba91b87b7196 ChangeLog 2245
 MD5 1a1c00c8652100411a07386facfc8240 files/digest-x264-svn-20051004-r1 70
 RMD160 501c7402f106000f5f273eea14ff30abbf4603b4 files/digest-x264-svn-20051004-r1 70
 SHA256 c1df53b8af44f27a8cc58198523ee7e174bc9a6f7eb3ed4702f5ff39fee84eb6 files/digest-x264-svn-20051004-r1 70
@@ -16,6 +19,9 @@ SHA256 7b3158a041aee7e25cdca4ad938333ebfd3cd4f583e9b7679835c33e8fd77ea6 files/di
 MD5 57e7820574c843c1c1a93edc16ae58b9 files/x264-svn-20060302-nostrip.patch 551
 RMD160 7a570670550f52d8ef0bfd453a507f4c03a3e113 files/x264-svn-20060302-nostrip.patch 551
 SHA256 c2e37410125dfe3dcd54fb2e0a5f935de6527b1feefc0a1e0740ee29467c6a37 files/x264-svn-20060302-nostrip.patch 551
+MD5 e46cf6df4f836ac86a57509c52c704e0 files/x264-svn-20060409-gnustack.patch 998
+RMD160 c88473f2ad2e701744d19788c673f41e196cb8a7 files/x264-svn-20060409-gnustack.patch 998
+SHA256 77d3d8342d5a90c255901e0fae9cb2295f5fed573d833df48c9b487c1bd12934 files/x264-svn-20060409-gnustack.patch 998
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f metadata.xml 251
@@ -28,6 +34,13 @@ SHA256 c60bd2c77605d596e631c414df3738f6b97b4fc7fddb93bb4ab955a39b3bd28d x264-svn
 MD5 e8fd720b96a28a723208d3ec66104f7b x264-svn-20060302.ebuild 876
 RMD160 53ca49f0c03bf1d1223ffea5a2602a751fd39216 x264-svn-20060302.ebuild 876
 SHA256 c9eb7b60f742b037858d8a7bb67e4f64dd03a4d3b885e7d3431ab77e45f7d5b9 x264-svn-20060302.ebuild 876
-MD5 304bbc94c162f60d36d27114441f1ae7 x264-svn-20060409.ebuild 1212
-RMD160 cba066e7d1e785d82bffc4f40932bab888ef08e4 x264-svn-20060409.ebuild 1212
-SHA256 1039c5cb874a5ffe6c185ea1114a18e5657d26c21fcf8df9a33bbfa8ccafea9f x264-svn-20060409.ebuild 1212
+MD5 f865c6e0767f85f1edf110abd06e005d x264-svn-20060409.ebuild 1254
+RMD160 fdc0b31e2d7b46aa06d118a8a3575641bf57f4fc x264-svn-20060409.ebuild 1254
+SHA256 286e59ea9cd5bd878d166026c7e2e1da6cc2af7d009420d420ba2a3b59c81ff3 x264-svn-20060409.ebuild 1254
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEOu1QAiZjviIA2XgRAqfkAJ94P/FM7VSAE2Aqi5ZSagt5njGD/ACeJZYY
+bK5aCrrACkWdZLyyqgstKdI=
+=NgzR
+-----END PGP SIGNATURE-----
diff --git a/media-libs/x264-svn/files/x264-svn-20060409-gnustack.patch b/media-libs/x264-svn/files/x264-svn-20060409-gnustack.patch
new file mode 100644
index 000000000000..04d5f241488a
--- /dev/null
+++ b/media-libs/x264-svn/files/x264-svn-20060409-gnustack.patch
@@ -0,0 +1,30 @@
+Index: x264-svn/common/amd64/amd64inc.asm
+===================================================================
+--- x264-svn.orig/common/amd64/amd64inc.asm
++++ x264-svn/common/amd64/amd64inc.asm
+@@ -27,6 +27,10 @@ BITS 64
+ ; This is true in practice (since we never do any 64bit arithmetic on strides),
+ ; but is not guaranteed by the ABI.
+ 
++%ifidn __YASM_OBJFMT__,elf
++section ".note.GNU-stack" noalloc noexec nowrite progbits
++%endif
++
+ %macro cglobal 1
+     %ifdef PREFIX
+         global _%1
+Index: x264-svn/common/i386/i386inc.asm
+===================================================================
+--- x264-svn.orig/common/i386/i386inc.asm
++++ x264-svn/common/i386/i386inc.asm
+@@ -26,6 +26,10 @@ BITS 32
+ ; Macros and other preprocessor constants
+ ;=============================================================================
+ 
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++
+ ; Symbol prefix for C linkage
+ %macro cglobal 1
+     %ifdef PREFIX
diff --git a/media-libs/x264-svn/x264-svn-20060409.ebuild b/media-libs/x264-svn/x264-svn-20060409.ebuild
index 4f2b4aeeaf0c..52c0a46a0b12 100644
--- a/media-libs/x264-svn/x264-svn-20060409.ebuild
+++ b/media-libs/x264-svn/x264-svn-20060409.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/x264-svn/x264-svn-20060409.ebuild,v 1.2 2006/04/10 17:42:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264-svn/x264-svn-20060409.ebuild,v 1.3 2006/04/10 23:41:42 flameeyes Exp $
 
 inherit multilib eutils toolchain-funcs
 
@@ -27,6 +27,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch "${FILESDIR}/${PN}-20060302-nostrip.patch"
+	epatch "${FILESDIR}/${P}-gnustack.patch"
 }
 
 src_compile() {