Add patch to fix executable stack. Bug #118168.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 100 insertions, 10 deletions

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index 9dda1b70246e..be4538cf6bfa 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/musepack-tools
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.27 2005/10/18 21:46:37 chainsaw Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.28 2006/04/18 17:46:49 flameeyes Exp $
+
+  18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/musepack-tools-1.15v-execstack.patch, musepack-tools-1.15v.ebuild:
+  Add patch to fix executable stack. Bug #118168.
 
   18 Oct 2005; Tony Vroon <chainsaw@gentoo.org> musepack-tools-1.15v.ebuild:
   Do not attempt to redirect output to /dev/tty, this makes no sense. Closes
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index e0bd2676940a..69841de8ef3e 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,28 +1,67 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9fc93a1f8febe405a0114b704d0daf9e ChangeLog 5210
+MD5 5e93902553b8348c5a876ce5f1fc0a8a ChangeLog 5391
+RMD160 0d98ca6689dc9eb5818b2fab9058daff70bb890a ChangeLog 5391
+SHA256 02f4de5569206e6716df9397dfea5549bfed94fc9891c1b9004da5d1b979374b ChangeLog 5391
 MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r2 68
+RMD160 732231111efb0ae8b80753df1c83fc0f57f9c41c files/digest-musepack-tools-1.15s-r2 68
+SHA256 9bc7062b9664f9f81a4188999a01405448a153eeace17db4fc7db7461808c439 files/digest-musepack-tools-1.15s-r2 68
 MD5 d81d9df24aeee0d861392505d4941067 files/digest-musepack-tools-1.15t 69
+RMD160 404eb884ce9dd492da692590de6d9e73b5534124 files/digest-musepack-tools-1.15t 69
+SHA256 6657cd0f0f8f95104f9e71e0fde424c281ed725d33e802859831cf8dbb4080e7 files/digest-musepack-tools-1.15t 69
 MD5 ed58f526be4bbd9e940db917d7821d74 files/digest-musepack-tools-1.15u 69
+RMD160 9387caf189d0846e35af280998e4ff8cfd9b6c9e files/digest-musepack-tools-1.15u 69
+SHA256 f0b2a69b2b0b26c64af9fdda6ce94a99ca7970cbbc9a48c9031099a4b0c7f7cd files/digest-musepack-tools-1.15u 69
 MD5 83959d8ebd21d40ec956ac942fa6b9f1 files/digest-musepack-tools-1.15v 69
+RMD160 35d7dc773621bf5ee0b728c8095e11bf8e5b84a4 files/digest-musepack-tools-1.15v 69
+SHA256 1171b190a3b328bfcc219bcefe16c69b0b16b1695bb68bccffbe3c55127719c9 files/digest-musepack-tools-1.15v 69
 MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
+RMD160 b507a50b9c80376cfd92c2dc4bf6a2a00e060d89 files/musepack-tools-1.15r-r1-Makefile.patch 3748
+SHA256 0ef0546982088cc4b42cff05444fe56642cd12230a1a2bf115130c9896e39044 files/musepack-tools-1.15r-r1-Makefile.patch 3748
 MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893
+RMD160 19aa0f779c3dfa80a9a8e22cf962fe7430d3ea5b files/musepack-tools-1.15s-Makefile.patch 2893
+SHA256 3999d79c41a915d9d9ec6f80acd608ff1fc2db9b0066359d17c94f4de15f2047 files/musepack-tools-1.15s-Makefile.patch 2893
 MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15t-Makefile.patch 750
+RMD160 5ae7181be4bbbcb8c3d5dc583cba6abd055ac1e7 files/musepack-tools-1.15t-Makefile.patch 750
+SHA256 ee48fca258816c72da23ea4b300e3f8f058accbcd5975f21d4a89ad232034c89 files/musepack-tools-1.15t-Makefile.patch 750
 MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15t-gcc4.patch 288
+RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 files/musepack-tools-1.15t-gcc4.patch 288
+SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff files/musepack-tools-1.15t-gcc4.patch 288
 MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15u-Makefile.patch 750
+RMD160 5ae7181be4bbbcb8c3d5dc583cba6abd055ac1e7 files/musepack-tools-1.15u-Makefile.patch 750
+SHA256 ee48fca258816c72da23ea4b300e3f8f058accbcd5975f21d4a89ad232034c89 files/musepack-tools-1.15u-Makefile.patch 750
 MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15u-gcc4.patch 288
+RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 files/musepack-tools-1.15u-gcc4.patch 288
+SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff files/musepack-tools-1.15u-gcc4.patch 288
 MD5 22a0f1804346128859f9a99ff9305cf4 files/musepack-tools-1.15v-Makefile.patch 572
+RMD160 c8402ba8d07c2381759ecb2eda1a38b153b28d94 files/musepack-tools-1.15v-Makefile.patch 572
+SHA256 12d9fe1a1980d3172128aae22f1c5919730e28925dd0aa12fceca4dfcb3db434 files/musepack-tools-1.15v-Makefile.patch 572
+MD5 f5c30e83239d2e30cb28e9a0d073a8fa files/musepack-tools-1.15v-execstack.patch 1256
+RMD160 a4d15a6640db2dedf2790e398c2d5309eee1c416 files/musepack-tools-1.15v-execstack.patch 1256
+SHA256 655b7945855d7e65bbaa5dee6be854c45c14e19036ab73ee207a939d3bd25277 files/musepack-tools-1.15v-execstack.patch 1256
 MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15v-gcc4.patch 288
+RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 files/musepack-tools-1.15v-gcc4.patch 288
+SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff files/musepack-tools-1.15v-gcc4.patch 288
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
 MD5 1bae02184cdfee099296b98e4f09a0ba musepack-tools-1.15s-r2.ebuild 1588
+RMD160 c6b1c88a345e73c87ea463e605811c31f96445b2 musepack-tools-1.15s-r2.ebuild 1588
+SHA256 3e1973e6fddf320b0a44c5d6e7b6b4549429c53705c33f9207aee6db20fa66c4 musepack-tools-1.15s-r2.ebuild 1588
 MD5 2c6f59eed8f1893c3be3699b0d7e19e9 musepack-tools-1.15t.ebuild 1427
+RMD160 f446999c9a691fcdb4d9573bf03bb50d739169e7 musepack-tools-1.15t.ebuild 1427
+SHA256 72865c726b13ceb9244b3b614ceaa2b1987631bf6f90425ccd7bb9d4d26f51bf musepack-tools-1.15t.ebuild 1427
 MD5 c6772fd586092e9a311f2b643eafbf3f musepack-tools-1.15u.ebuild 1506
-MD5 4af7abeddbf1aca4eb83f37f3d62660d musepack-tools-1.15v.ebuild 1614
+RMD160 003d1b32f4c7c385adf9fa5f2672e7e717fcc7a8 musepack-tools-1.15u.ebuild 1506
+SHA256 6f2fa46e61b27039648f8493094b43c56ccc8b3928a4bba6de61547b9bce594d musepack-tools-1.15u.ebuild 1506
+MD5 88da761235fb638a3a685d826e70ff77 musepack-tools-1.15v.ebuild 1660
+RMD160 dca9611205a1b83a10f48469377250164c1bc95a musepack-tools-1.15v.ebuild 1660
+SHA256 54d3cb2fa60187f084b5ce7218a3f4e92d84d76a9ad4922f965987de9de85559 musepack-tools-1.15v.ebuild 1660
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFDVW9Xp5vW4rUFj5oRArZLAKCaxEnMSz/i1pRMK7BneY7WZ0gE8QCgjKMB
-VN7AqpbOUhGXDLAYeKH4W+0=
-=nWOt
+iD8DBQFERSVZAiZjviIA2XgRAv1FAKCH/mzmjE7o4XBMoi36jm76oQmU6ACgkbBO
+OigQ1uFYVw02dRhlAJ3v40Y=
+=isuT
 -----END PGP SIGNATURE-----
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-execstack.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-execstack.patch
new file mode 100644
index 000000000000..075fad3efe5c
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15v-execstack.patch
@@ -0,0 +1,44 @@
+Index: sv7/cpu_feat.nas
+===================================================================
+--- sv7.orig/cpu_feat.nas
++++ sv7/cpu_feat.nas
+@@ -140,3 +140,6 @@ proc    Init_FPU2
+ endproc
+ 
+         end
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+Index: sv7/fft4gasm.nas
+===================================================================
+--- sv7.orig/fft4gasm.nas
++++ sv7/fft4gasm.nas
+@@ -422,3 +422,6 @@ lbl5:
+ 
+ 
+ ;##################################################################
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+Index: sv7/list_korr_asm.nas
+===================================================================
+--- sv7.orig/list_korr_asm.nas
++++ sv7/list_korr_asm.nas
+@@ -98,3 +98,6 @@ lbl2:
+         fstp    tword [eax+ 8]          ; x
+         ret
+ ;
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+Index: sv7/synthasm.nas
+===================================================================
+--- sv7.orig/synthasm.nas
++++ sv7/synthasm.nas
+@@ -2225,3 +2225,6 @@ endproc
+ ;
+ ; end of synthasm.nas
+ ;
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
diff --git a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
index d4a4ed3d8a8b..3897f2377947 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.6 2005/10/18 21:46:37 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.7 2006/04/18 17:46:49 flameeyes Exp $
 
 IUSE="static 16bit esd"
 
@@ -47,6 +47,8 @@ src_unpack() {
 
 	# Bug #109699; console redirection to /dev/tty makes no sense
 	sed -i -e 's/$(LDADD) &> $(LOGFILE)/$(LDADD)/' Makefile
+
+	epatch "${FILESDIR}/${P}-execstack.patch"
 }
 
 src_compile() {
@@ -55,6 +57,7 @@ src_compile() {
 	use static && export BLD_STATIC=1
 
 	append-flags -I${S}
+
 	ARCH= emake mppenc mppdec replaygain || die
 }