summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDane Smith <c1pher@gentoo.org>2011-06-01 21:24:10 +0000
committerDane Smith <c1pher@gentoo.org>2011-06-01 21:24:10 +0000
commitbd14092c0097d87f9dd6df4f0fa09f84b523f2ce (patch)
tree2b3d4bcdaedffca15bc791f4f5e508b00dd38832
parentRemove old 1.8 patches in files directory; a patch tarball has been used for ... (diff)
downloadgentoo-2-bd14092c0097d87f9dd6df4f0fa09f84b523f2ce.tar.gz
gentoo-2-bd14092c0097d87f9dd6df4f0fa09f84b523f2ce.tar.bz2
gentoo-2-bd14092c0097d87f9dd6df4f0fa09f84b523f2ce.zip
app-crypt/truecrypt: Revbump. Fix WX stack issues.
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
-rw-r--r--app-crypt/truecrypt/ChangeLog8
-rw-r--r--app-crypt/truecrypt/files/execstack-fix.diff60
-rw-r--r--app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild (renamed from app-crypt/truecrypt/truecrypt-7.0a-r4.ebuild)3
3 files changed, 69 insertions, 2 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/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() {