Fix exec stacks; thanks to Alan Hourihane for reporting; bug 120417

Package-Manager: portage-2.1.2_rc3-r1

6 files changed, 49 insertions, 22 deletions

diff --git a/app-admin/powertweak/ChangeLog b/app-admin/powertweak/ChangeLog
index f81ef18aab6c..4ac1feda5a04 100644
--- a/app-admin/powertweak/ChangeLog
+++ b/app-admin/powertweak/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/powertweak
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/ChangeLog,v 1.22 2005/05/09 16:24:55 herbs Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/ChangeLog,v 1.23 2006/12/14 18:37:36 masterdriverz Exp $
+
+  14 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/powertweak-0.99.5-exec-stack.patch, powertweak-0.99.5-r1.ebuild:
+  Fix exec stacks; thanks to Alan Hourihane for reporting; bug 120417
 
   09 May 2005; Herbie Hopkins <herbs@gentoo.org>
   powertweak-0.99.5-r1.ebuild:
diff --git a/app-admin/powertweak/Manifest b/app-admin/powertweak/Manifest
index 5683b097f1aa..f121e198f215 100644
--- a/app-admin/powertweak/Manifest
+++ b/app-admin/powertweak/Manifest
@@ -2,29 +2,33 @@ AUX powertweak-0.99.4-gentoo.diff 2417 RMD160 95f023aad9bd612e0202256f7ddef2a05b
 MD5 1905168a8b57ae19ab4a2dfe41fddbb4 files/powertweak-0.99.4-gentoo.diff 2417
 RMD160 95f023aad9bd612e0202256f7ddef2a05b41f6c8 files/powertweak-0.99.4-gentoo.diff 2417
 SHA256 410ccf126f30467e1717b0ffe3b45cf82f3f41ba2fba1584e6cc059205c789cb files/powertweak-0.99.4-gentoo.diff 2417
+AUX powertweak-0.99.5-exec-stack.patch 335 RMD160 147c37b36a6d9a0af30204b888b5be6eb604c66c SHA1 b71c5a0017a9ea8c044d974a33fd4d204e0a9b3e SHA256 4c539be1a84199ef7b724167f90f15450574c38a3feb5b0453e9428baee750b7
+MD5 bbcdc45de5c44bace757c11af77450ec files/powertweak-0.99.5-exec-stack.patch 335
+RMD160 147c37b36a6d9a0af30204b888b5be6eb604c66c files/powertweak-0.99.5-exec-stack.patch 335
+SHA256 4c539be1a84199ef7b724167f90f15450574c38a3feb5b0453e9428baee750b7 files/powertweak-0.99.5-exec-stack.patch 335
 AUX powertweakd.rc6 786 RMD160 d9d6376c943d22074c20f7c673bb5f2b0c564902 SHA1 ac42335a848278ca1087bac5367a332bceae9a44 SHA256 a9e47fbf3b086695d1f22e91f09c9dec11a4e38bfc4f01898b7facd004ba3ad3
 MD5 c17ea68bdb81ed345dc0906ae3559c69 files/powertweakd.rc6 786
 RMD160 d9d6376c943d22074c20f7c673bb5f2b0c564902 files/powertweakd.rc6 786
 SHA256 a9e47fbf3b086695d1f22e91f09c9dec11a4e38bfc4f01898b7facd004ba3ad3 files/powertweakd.rc6 786
 DIST powertweak-0.99.4.tar.bz2 486168
-DIST powertweak-0.99.5-cvs20040417.patch.bz2 20901
-DIST powertweak-0.99.5.tar.bz2 573995
+DIST powertweak-0.99.5-cvs20040417.patch.bz2 20901 RMD160 7e64990815b6e7fef3100050825d8a75a02a9068 SHA1 cba1815f00b508e1bc1bedb68201288ad8c4ea5f SHA256 1de1525c90a25059a0664482040f69a8aa4feb72de75454958afefbad53c4fe2
+DIST powertweak-0.99.5.tar.bz2 573995 RMD160 069c268cf4adaee2e577524faf78e114e718ced8 SHA1 23e0ebe181f5aea98f3a38e30b5ab0babb76e24b SHA256 b83a6348f2bdfedac17c9323b56c6438fe3d0321bb6c13acc83bfc5db958dc76
 EBUILD powertweak-0.99.4.ebuild 1524 RMD160 865309dff7192ec0cfda428bfd5d72ccaff49b03 SHA1 0ff10e015d17fe2a6313f49e60ac56b7943cb996 SHA256 9af843de63872e42ec29f1a4a550d48c61f29ce9a2710fcd5e6ea5402b66ed69
 MD5 57841b0bebaa939766c1c7422d1176a9 powertweak-0.99.4.ebuild 1524
 RMD160 865309dff7192ec0cfda428bfd5d72ccaff49b03 powertweak-0.99.4.ebuild 1524
 SHA256 9af843de63872e42ec29f1a4a550d48c61f29ce9a2710fcd5e6ea5402b66ed69 powertweak-0.99.4.ebuild 1524
-EBUILD powertweak-0.99.5-r1.ebuild 1202 RMD160 f250759610df332755a75ac75a81073f4eaada27 SHA1 b56b904273c551ce63cd61970444dd2343d8e9e3 SHA256 2b49dfe6d24463d09c25e1cce0f66f753d20281b1b0950ecfa2e59c21703571c
-MD5 5bebd4142dabecdffc202aef08aae711 powertweak-0.99.5-r1.ebuild 1202
-RMD160 f250759610df332755a75ac75a81073f4eaada27 powertweak-0.99.5-r1.ebuild 1202
-SHA256 2b49dfe6d24463d09c25e1cce0f66f753d20281b1b0950ecfa2e59c21703571c powertweak-0.99.5-r1.ebuild 1202
+EBUILD powertweak-0.99.5-r1.ebuild 1268 RMD160 f082333db523d0f3149453c0fee7f31694e63e70 SHA1 df9bf549f1312e46bd144405a54297a49aea80c5 SHA256 c69c1ad67a0ff6b0a6353b5c1736aed70cb72b2fec9ae35565e91c23eb650ecf
+MD5 2790fd72066207f5bce22d6dac24ee1d powertweak-0.99.5-r1.ebuild 1268
+RMD160 f082333db523d0f3149453c0fee7f31694e63e70 powertweak-0.99.5-r1.ebuild 1268
+SHA256 c69c1ad67a0ff6b0a6353b5c1736aed70cb72b2fec9ae35565e91c23eb650ecf powertweak-0.99.5-r1.ebuild 1268
 EBUILD powertweak-0.99.5.ebuild 1021 RMD160 2289511272d346a800ef92a93358a09959189b34 SHA1 3858141d221c0f7739148a2c4af628d893f32ece SHA256 8d89a32deb18c966d1eec990e310e69eb2eee035dad6db6a86ab0451edeb4a54
 MD5 1e77b1833ff7e16832ddef96699a2312 powertweak-0.99.5.ebuild 1021
 RMD160 2289511272d346a800ef92a93358a09959189b34 powertweak-0.99.5.ebuild 1021
 SHA256 8d89a32deb18c966d1eec990e310e69eb2eee035dad6db6a86ab0451edeb4a54 powertweak-0.99.5.ebuild 1021
-MISC ChangeLog 2952 RMD160 b0a9960e88a29fed75b7e9270c0e0e1526507de2 SHA1 f600a702fec6407a27f97e35e9589cc4aa4e31b6 SHA256 0613a6624cc18e80074511d089bfb30e9cbe070b862fa4d8c1868cf56b639b13
-MD5 fa304563376ae9a4026e012f5ea0bc10 ChangeLog 2952
-RMD160 b0a9960e88a29fed75b7e9270c0e0e1526507de2 ChangeLog 2952
-SHA256 0613a6624cc18e80074511d089bfb30e9cbe070b862fa4d8c1868cf56b639b13 ChangeLog 2952
+MISC ChangeLog 3164 RMD160 23d2b9294fb16a25da2da2bd5f8cbe57fb5d3029 SHA1 b884767196a7fc2d8ef93cea92b246b65a72b5cd SHA256 c565c96b6e17bd9045f9fc5a76de16f9522ba534c0a6c09898a47a20d7d5755a
+MD5 343bebb8721b9c034ecf663f286646d1 ChangeLog 3164
+RMD160 23d2b9294fb16a25da2da2bd5f8cbe57fb5d3029 ChangeLog 3164
+SHA256 c565c96b6e17bd9045f9fc5a76de16f9522ba534c0a6c09898a47a20d7d5755a ChangeLog 3164
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
 MD5 38cacf4270b8a100918bf328ed9154d3 metadata.xml 314
 RMD160 25181cde297628576a9545bea3a76601485bfaf3 metadata.xml 314
@@ -32,9 +36,9 @@ SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7 metadata
 MD5 186537e6997431efc00728e2c4a24229 files/digest-powertweak-0.99.4 70
 RMD160 d45b6168db191ac71cb9938566161bb041a1fd7b files/digest-powertweak-0.99.4 70
 SHA256 cb6b761ad1d0eddb8d83e7df8ba2c26f067f05cd9a6fd0e5bf111ecf019335ad files/digest-powertweak-0.99.4 70
-MD5 1309a0411e6185c8d9ae7590d318c618 files/digest-powertweak-0.99.5 70
-RMD160 445714ab79d39884174aaf3e039fd3a7ae2a9573 files/digest-powertweak-0.99.5 70
-SHA256 b08a5ff6539fec3923ae3eaf71afbde2a32a7e4fdc7a52bd4fa787f44adfa18f files/digest-powertweak-0.99.5 70
-MD5 0dd7674a9a70087adb391022f562b05d files/digest-powertweak-0.99.5-r1 153
-RMD160 1eac1a9710431736d3673571e7f20fdb11442f1a files/digest-powertweak-0.99.5-r1 153
-SHA256 a9f6fbea131e08deaef7d6a3882bf6cae733e83c20f99ff9a35c86bd978b47f7 files/digest-powertweak-0.99.5-r1 153
+MD5 4b61164aa90f33a1989c6136f63a677f files/digest-powertweak-0.99.5 256
+RMD160 5960f6f1c6c6ff064351bc1adf7cecb8baf5101c files/digest-powertweak-0.99.5 256
+SHA256 0c19b5a3bdd4e7743b340ffa550cb8d525e9b083fce0a96177468565bf529982 files/digest-powertweak-0.99.5 256
+MD5 6b82621ecb660e81f4bc0aa466147862 files/digest-powertweak-0.99.5-r1 551
+RMD160 5a5677035ea2f56f8c3a68e469d9e7a60f79eb81 files/digest-powertweak-0.99.5-r1 551
+SHA256 edda028b0041d00dbcca6b240318759825b2b7a78ef9ca156a41b6ad4742085a files/digest-powertweak-0.99.5-r1 551
diff --git a/app-admin/powertweak/files/digest-powertweak-0.99.5 b/app-admin/powertweak/files/digest-powertweak-0.99.5
index 19d8da80e0a1..add219822915 100644
--- a/app-admin/powertweak/files/digest-powertweak-0.99.5
+++ b/app-admin/powertweak/files/digest-powertweak-0.99.5
@@ -1 +1,3 @@
 MD5 fe7e147ae7536846411c6239e33e6959 powertweak-0.99.5.tar.bz2 573995
+RMD160 069c268cf4adaee2e577524faf78e114e718ced8 powertweak-0.99.5.tar.bz2 573995
+SHA256 b83a6348f2bdfedac17c9323b56c6438fe3d0321bb6c13acc83bfc5db958dc76 powertweak-0.99.5.tar.bz2 573995
diff --git a/app-admin/powertweak/files/digest-powertweak-0.99.5-r1 b/app-admin/powertweak/files/digest-powertweak-0.99.5-r1
index c4c4390236a7..1003da6d3e2b 100644
--- a/app-admin/powertweak/files/digest-powertweak-0.99.5-r1
+++ b/app-admin/powertweak/files/digest-powertweak-0.99.5-r1
@@ -1,2 +1,6 @@
-MD5 fe7e147ae7536846411c6239e33e6959 powertweak-0.99.5.tar.bz2 573995
 MD5 411ceb70f9eb6a828dfb9e6a8df090c6 powertweak-0.99.5-cvs20040417.patch.bz2 20901
+RMD160 7e64990815b6e7fef3100050825d8a75a02a9068 powertweak-0.99.5-cvs20040417.patch.bz2 20901
+SHA256 1de1525c90a25059a0664482040f69a8aa4feb72de75454958afefbad53c4fe2 powertweak-0.99.5-cvs20040417.patch.bz2 20901
+MD5 fe7e147ae7536846411c6239e33e6959 powertweak-0.99.5.tar.bz2 573995
+RMD160 069c268cf4adaee2e577524faf78e114e718ced8 powertweak-0.99.5.tar.bz2 573995
+SHA256 b83a6348f2bdfedac17c9323b56c6438fe3d0321bb6c13acc83bfc5db958dc76 powertweak-0.99.5.tar.bz2 573995
diff --git a/app-admin/powertweak/files/powertweak-0.99.5-exec-stack.patch b/app-admin/powertweak/files/powertweak-0.99.5-exec-stack.patch
new file mode 100644
index 000000000000..8483f8d2ac1c
--- /dev/null
+++ b/app-admin/powertweak/files/powertweak-0.99.5-exec-stack.patch
@@ -0,0 +1,11 @@
+diff -ur src/backends/CPU/x86/cpuid_UP.s src/backends/CPU/x86/cpuid_UP.s
+--- src/backends/CPU/x86/cpuid_UP.s	2000-11-18 03:06:55.000000000 +0000
++++ src/backends/CPU/x86/cpuid_UP.s	2006-12-14 18:00:26.000000000 +0000
+@@ -37,3 +37,7 @@
+ 	movl %ebp,%esp
+ 	popl %ebp
+ 	ret
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/app-admin/powertweak/powertweak-0.99.5-r1.ebuild b/app-admin/powertweak/powertweak-0.99.5-r1.ebuild
index ed45f577483a..c8d11b951567 100644
--- a/app-admin/powertweak/powertweak-0.99.5-r1.ebuild
+++ b/app-admin/powertweak/powertweak-0.99.5-r1.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/app-admin/powertweak/powertweak-0.99.5-r1.ebuild,v 1.9 2005/05/09 16:24:55 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/powertweak-0.99.5-r1.ebuild,v 1.10 2006/12/14 18:37:36 masterdriverz Exp $
 
 inherit eutils
 
@@ -23,8 +23,10 @@ RDEPEND=">=sys-apps/pciutils-2.1.0
 
 src_unpack() {
 	unpack ${A}
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 	epatch powertweak-0.99.5-cvs20040417.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-exec-stack.patch"
 }
 
 src_compile() {