app-crypt/truecrypt: Revbump. Fix WX stack issues.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 85 insertions, 17 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index bf9d6f2fed4c..da4b920d1517 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/truecrypt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.63 2011/06/01 19:51:23 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.64 2011/06/01 21:24:10 c1pher Exp $
+
+*truecrypt-7.0a-r5 (01 Jun 2011)
+
+  01 Jun 2011; Dane Smith <c1pher@gentoo.org> -truecrypt-7.0a-r4.ebuild,
+  +truecrypt-7.0a-r5.ebuild, +files/execstack-fix.diff:
+  Revbump. Add new patch. Fix WX stack issues.
 
 *truecrypt-7.0a-r4 (01 Jun 2011)
 
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index 663c75d6c86d..7c84a8e30588 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX execstack-fix.diff 1955 RMD160 bac693c2ef2029f3d3ba8fb6fb5943404108c085 SHA1 f77beb975efe8577378a29510b7f530021119a7e SHA256 227c8e0bb04bd5f6915fc2570fbcbf1cca704b4b818bc5de283653197309a5fb
 AUX makefile-archdetect.diff 266 RMD160 9cb64f2d12174d458e6268802aaf92ae6e0de4a9 SHA1 d935b856299a78f1c818b3b989849d9f165015a3 SHA256 aa201bb7c93852c814d71c963b1d416d62aa2d1e685f9f5149b1388dca9ae883
 AUX truecrypt-stop.sh 308 RMD160 4b2e6f47520f701324c03b5a43118cc38ee409a3 SHA1 7139ba403e482a4746e1d545115b74760b1438ea SHA256 243a9d1041b291e12ce2065959838f0cfe01484bffac7915991ebeb90d2ccd2c
 AUX truecrypt.init 729 RMD160 63472dd371afd892e6b00de0e3e516c74ed0075a SHA1 8cb25b2093322e449715abcb3034454fcc6ef77f SHA256 6530577c5f86800a7d92a76b927538006a27f57cf517c6f2bdb793cebaa70b59
 DIST truecrypt-7.0a.tar.gz 1996312 RMD160 92b01f87c725feb43aded666ba44fcbd3e3ac740 SHA1 42be0f333e6791e7a122b3e1183e014cd3860198 SHA256 6c845153ee868429e2a531407383e9349754d1579cf66fc838632c44baaba021
 EBUILD truecrypt-7.0a-r2.ebuild 3458 RMD160 0f1d3b6d529fa89809ca4944cae0e292c015f1a2 SHA1 e8c8aea3b7800df23498096dc485c9ae8a7a62e2 SHA256 0088a216a26381427e8de29354a7a1ad1b5fe28a80192bb7bc71d64f4d89df69
-EBUILD truecrypt-7.0a-r4.ebuild 3572 RMD160 f17930cf342e2df087baae80eebf158851d4fbc9 SHA1 2cf9efae07304d0ed0fc259ab387de17fde5518a SHA256 35371f93a1d38bd008a84ae85aa6b9f28dea2d3e88e5977c09c2dd44fa6cf371
-MISC ChangeLog 12430 RMD160 ef0036d1b6b0d628bab241f7c6369b6621ac80f8 SHA1 6cfe9c01e28993abb78b251d8ea09f4213e6e0d5 SHA256 d7d973de45f75fcafad6fe669e169ee7563a4f99cef54cde80deafb2d83a156f
+EBUILD truecrypt-7.0a-r5.ebuild 3613 RMD160 dac3abffe13f41492882edfbb9eaf42572745ec7 SHA1 5b7edb8c6a93d0769730652486e144223606afcf SHA256 42d0a1a814cc150ac178101dbeb69747b919b0daf138cc5fd68c007c0035f809
+MISC ChangeLog 12641 RMD160 e8a87a7c6a1424a960302f1abc6e75b35a9ae6ad SHA1 fdb053261fc29539e7167d1ee4d34792b4bbf67d SHA256 8064e423277e8f723d62b59f710efbe35e6892d7c49dd1af16edfdb890d6484c
 MISC metadata.xml 250 RMD160 0ed9b992d346dffc7427a6f36ad6db15f099542f SHA1 906ae1d1afaf4c06a5b54cf7e25843dbac2bb5ba SHA256 c4dab52dbdf0558df59853ea282e0b1deb4cb968914468a648070dcd31a456d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJN5pcjAAoJEEsurZwMLhUxV90P/RTMmN8hfaEDxKoYsq3BOS4n
-SeetAU8KJhCBHcxIaSzlrwoxFHkFVgRTSN1HTBj/xibwSHpRBUzeY/fugiE8O78K
-yc/iCy8D4N1Mmw3EX6LFJSTMZ1aV7oH8bdEMtsqV4QSzQzzEX3mnvJPs2YkI/ODa
-+/YxdbouTPID1spULEEKrWu5DT2hHxAvVrmM/yh8IrWDv7N3WLO9am/fjCb3QMMB
-oayVII+c9S1RpIA4nWnaM4nwU6wYSlVFmNQ+Li4SL8SAkOo3hXKYceSbkLtvrCV/
-g/9o5TJSjLp8kqSE0EZeROSviKJK+U6voSjY2vx3VirZKYWHAF39jJ+O3BSJdl1+
-RHzRnBjVEEwXgUHFkin+aQdMyIN4J0qj1maTV93NSS4MwasOE6CAo4nu1tweDFbr
-iX4MRavD6b3BI5gWmJlyCBRfDYfUOvXajSsCZ9RtV8sV7aaid6RaD8W3WSS+kqEA
-dbrz0ZWH32yCa3eFaWJOw+kV2JALhcCRRI62gVlrSgyGjPYNyLvWuSxpL1Q1dhCT
-3d+JzYcrvzUJm6UAIa96kiz929nii4I9q3dGzzJuJutCQewfzK35BPp4peMV2TOo
-jrsUS1tImp5iwa6lzLq6YzyvpB0FjROJaE273Wk+B9ZavScmeD6rTHAo05eeHyaH
-vQ6vS3eS5/6kTnqdhVLW
-=SPwd
+iQIcBAEBAgAGBQJN5qznAAoJEEsurZwMLhUxmtAP/AgxfUF0eSRB+Ji08X7IQIxy
+roPCL4VhRxpyv+WkMzRtkp5oqLSWbn8gOXkRI4NkOWcruCTqiycZhZPAbIPiV5LC
+0AcvguXAkYO4bQLUQabIcdzrL1XY2ch9IDco4LFcusDMwJZX/5XD+pwLleFtwDlC
++7F4Ve/YcY2HE8ovR6h4tmnRbIBCMDB42c7Auc2M6lJ03K4xhbUmcVQ/sc9mec4T
+4g5tqjwpUVn3GL3WIlIfs6znGXWixO38KOq1vQme+lcbgbLR7dna6wjagLVxRW8O
+dPofIODo4nCUb7m55zSClX0jm7Crz8L1Te2pkiIAop5yT/t+/YybBCgCs5s1hMhG
+yQ0GVIAiuof1II4ZC6pdAIyCzd2BcPJfO1zZWnssVrrROl1XuT2pBEJmfmU8/o0s
+4PtNewZ4lu3Y280Zp9BPyJ8Uh1jJWZwkRJkBK6wP5uH7iQSRkOg1wpMzGTBV0EFQ
+CbHSz0TH/wMSvr/Cpxr+fAUpVJLLwEX8oF0CrGCw2s1K+56FCa9uqGCwcdUaXWdw
+7fvJ/+TpPGPegri7UtHReVgwXKoZKbQB/QlFDYUl0i6zGiEBcaCajD27yzQ+CSRG
+5puCtlJJ91k33zxUnN4rZJ59AuMxXjOz0N3qODnpfTJVzK4g6A/QuCNjIgrSCfqd
+EEpK+ponj1l7W/6DsX1P
+=eUSb
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/truecrypt/files/execstack-fix.diff b/app-crypt/truecrypt/files/execstack-fix.diff
new file mode 100644
index 000000000000..b76bfcc580c0
--- /dev/null
+++ b/app-crypt/truecrypt/files/execstack-fix.diff
@@ -0,0 +1,60 @@
+--- Crypto/Aes_hw_cpu.asm.old	2011-06-01 17:12:53.078000001 -0400
++++ Crypto/Aes_hw_cpu.asm	2011-06-01 17:12:53.080000002 -0400
+@@ -328,3 +328,12 @@
+ 

+ 

+ %endif	; __BITS__ != 16

++	%ifidn __OUTPUT_FORMAT__,elf
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf32
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf64
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
+--- Crypto/AesSmall_x86.asm.old	2011-06-01 17:12:53.084000002 -0400
++++ Crypto/AesSmall_x86.asm	2011-06-01 17:12:53.086000002 -0400
+@@ -1442,3 +1442,12 @@
+     db  v8(0xe1),v8(0x69),v8(0x14),v8(0x63),v8(0x55),v8(0x21),v8(0x0c),v8(0x7d)

+ 

+ %endif

++	%ifidn __OUTPUT_FORMAT__,elf
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf32
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf64
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
+--- Crypto/Aes_x64.asm.old	2011-06-01 17:12:53.090000002 -0400
++++ Crypto/Aes_x64.asm	2011-06-01 17:12:53.092000002 -0400
+@@ -905,3 +905,12 @@
+ %endif

+ 

+ %endif

++	%ifidn __OUTPUT_FORMAT__,elf
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf32
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf64
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
+--- Crypto/Aes_x86.asm.old	2011-06-01 17:12:53.096000002 -0400
++++ Crypto/Aes_x86.asm	2011-06-01 17:12:53.097000002 -0400
+@@ -644,3 +644,12 @@
+     do_exit

+ 

+ %endif

++	%ifidn __OUTPUT_FORMAT__,elf
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf32
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf64
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
diff --git a/app-crypt/truecrypt/truecrypt-7.0a-r4.ebuild b/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild
index d0a09329b4f1..bf7fcc7bb11c 100644
--- a/app-crypt/truecrypt/truecrypt-7.0a-r4.ebuild
+++ b/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.0a-r4.ebuild,v 1.1 2011/06/01 19:51:23 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild,v 1.1 2011/06/01 21:24:10 c1pher Exp $
 
 EAPI="2"
 
@@ -53,6 +53,7 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}/makefile-archdetect.diff"
+	epatch "${FILESDIR}/execstack-fix.diff"
 }
 
 src_compile() {